MFhead @ r292618

24 files changed, 187 insertions, 2742 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 779f596..cb51987 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -189,6 +189,7 @@ OLD_DIRS+=usr/share/examples/bhyve
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld
+OLD_FILES+=usr/bin/ld.bfd
 .if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/bin/objcopy
 .endif
@@ -1052,87 +1053,87 @@ OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
-OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
-OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
-OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
-OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
-OLD_DIRS+=usr/lib/clang/3.7.0/include
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.san-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.san-x86_64.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
-OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
-OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
-OLD_DIRS+=usr/lib/clang/3.7.0/lib
-OLD_DIRS+=usr/lib/clang/3.7.0
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/coverage_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/dfsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/linux_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/lsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/msan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/tsan_interface_atomic.h
+OLD_DIRS+=usr/lib/clang/3.7.1/include/sanitizer
+OLD_FILES+=usr/lib/clang/3.7.1/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512cdintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/fxsrintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.7.1/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/vadefs.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/vecintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/3.7.1/include/xtestintrin.h
+OLD_DIRS+=usr/lib/clang/3.7.1/include
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.7.1/lib
+OLD_DIRS+=usr/lib/clang/3.7.1
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
deleted file mode 100644
index 8b301cb..0000000
--- a/tools/regression/lib/msun/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-ctrig \
-	test-exponential test-fma \
-	test-lround test-nearbyint test-next test-rem test-trig
-CFLAGS+= -O0 -lm -Wno-unknown-pragmas
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/msun/test-ctrig.c b/tools/regression/lib/msun/test-ctrig.c
deleted file mode 100644
index 9f9b88d..0000000
--- a/tools/regression/lib/msun/test-ctrig.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*-
- * Copyright (c) 2008-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.
- */
-
-/*
- * Tests for csin[h](), ccos[h](), and ctan[h]().
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <assert.h>
-#include <complex.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-
-#include "test-utils.h"
-
-#pragma STDC FENV_ACCESS	ON
-#pragma	STDC CX_LIMITED_RANGE	OFF
-
-/*
- * Test that a function returns the correct value and sets the
- * exception flags correctly. The exceptmask specifies which
- * exceptions we should check. We need to be lenient for several
- * reasons, but mainly because on some architectures it's impossible
- * to raise FE_OVERFLOW without raising FE_INEXACT.
- *
- * These are macros instead of functions so that assert provides more
- * meaningful error messages.
- *
- * XXX The volatile here is to avoid gcc's bogus constant folding and work
- *     around the lack of support for the FENV_ACCESS pragma.
- */
-#define	test_p(func, z, result, exceptmask, excepts, checksign)	do {	\
-	volatile long double complex _d = z;				\
-	debug("  testing %s(%Lg + %Lg I) == %Lg + %Lg I\n", #func,	\
-	    creall(_d), cimagl(_d), creall(result), cimagl(result));	\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert(cfpequal_cs((func)(_d), (result), (checksign)));		\
-	assert(((void)(func), fetestexcept(exceptmask) == (excepts)));	\
-} while (0)
-
-/*
- * Test within a given tolerance.  The tolerance indicates relative error
- * in ulps.  If result is 0, however, it measures absolute error in units
- * of <format>_EPSILON.
- */
-#define	test_p_tol(func, z, result, tol)			do {	\
-	volatile long double complex _d = z;				\
-	debug("  testing %s(%Lg + %Lg I) ~= %Lg + %Lg I\n", #func,	\
-	    creall(_d), cimagl(_d), creall(result), cimagl(result));	\
-	assert(cfpequal_tol((func)(_d), (result), (tol), FPE_ABS_ZERO)); \
-} while (0)
-
-/* These wrappers apply the identities f(conj(z)) = conj(f(z)). */
-#define	test(func, z, result, exceptmask, excepts, checksign)	do {	\
-	test_p(func, z, result, exceptmask, excepts, checksign);	\
-	test_p(func, conjl(z), conjl(result), exceptmask, excepts, checksign); \
-} while (0)
-#define	test_tol(func, z, result, tol)				do {	\
-	test_p_tol(func, z, result, tol);				\
-	test_p_tol(func, conjl(z), conjl(result), tol);			\
-} while (0)
-#define	test_odd_tol(func, z, result, tol)			do {	\
-	test_tol(func, z, result, tol);					\
-	test_tol(func, -(z), -(result), tol);				\
-} while (0)
-#define	test_even_tol(func, z, result, tol)			do {	\
-	test_tol(func, z, result, tol);					\
-	test_tol(func, -(z), result, tol);				\
-} while (0)
-
-/* Test the given function in all precisions. */
-#define	testall(func, x, result, exceptmask, excepts, checksign) do {	\
-	test(func, x, result, exceptmask, excepts, checksign);		\
-	test(func##f, x, result, exceptmask, excepts, checksign);	\
-} while (0)
-#define	testall_odd(func, x, result, exceptmask, excepts, checksign) do { \
-	testall(func, x, result, exceptmask, excepts, checksign);	\
-	testall(func, -x, -result, exceptmask, excepts, checksign);	\
-} while (0)
-#define	testall_even(func, x, result, exceptmask, excepts, checksign) do { \
-	testall(func, x, result, exceptmask, excepts, checksign);	\
-	testall(func, -x, result, exceptmask, excepts, checksign);	\
-} while (0)
-
-/*
- * Test the given function in all precisions, within a given tolerance.
- * The tolerance is specified in ulps.
- */
-#define	testall_tol(func, x, result, tol)	       		   do { \
-	test_tol(func, x, result, tol * DBL_ULP());			\
-	test_tol(func##f, x, result, tol * FLT_ULP());			\
-} while (0)
-#define	testall_odd_tol(func, x, result, tol)	       		   do { \
-	test_odd_tol(func, x, result, tol * DBL_ULP());			\
-	test_odd_tol(func##f, x, result, tol * FLT_ULP());		\
-} while (0)
-#define	testall_even_tol(func, x, result, tol)	       		   do { \
-	test_even_tol(func, x, result, tol * DBL_ULP());		\
-	test_even_tol(func##f, x, result, tol * FLT_ULP());		\
-} while (0)
-
-
-/* Tests for 0 */
-void
-test_zero(void)
-{
-	long double complex zero = CMPLXL(0.0, 0.0);
-
-	/* csinh(0) = ctanh(0) = 0; ccosh(0) = 1 (no exceptions raised) */
-	testall_odd(csinh, zero, zero, ALL_STD_EXCEPT, 0, CS_BOTH);
-	testall_odd(csin, zero, zero, ALL_STD_EXCEPT, 0, CS_BOTH);
-	testall_even(ccosh, zero, 1.0, ALL_STD_EXCEPT, 0, CS_BOTH);
-	testall_even(ccos, zero, CMPLXL(1.0, -0.0), ALL_STD_EXCEPT, 0, CS_BOTH);
-	testall_odd(ctanh, zero, zero, ALL_STD_EXCEPT, 0, CS_BOTH);
-	testall_odd(ctan, zero, zero, ALL_STD_EXCEPT, 0, CS_BOTH);
-}
-
-/*
- * Tests for NaN inputs.
- */
-void
-test_nan()
-{
-	long double complex nan_nan = CMPLXL(NAN, NAN);
-	long double complex z;
-
-	/*
-	 * IN		CSINH		CCOSH		CTANH
-	 * NaN,NaN	NaN,NaN		NaN,NaN		NaN,NaN
-	 * finite,NaN	NaN,NaN [inval]	NaN,NaN [inval]	NaN,NaN [inval]
-	 * NaN,finite	NaN,NaN [inval]	NaN,NaN [inval]	NaN,NaN [inval]
-	 * NaN,Inf	NaN,NaN [inval]	NaN,NaN	[inval]	NaN,NaN [inval]
-	 * Inf,NaN	+-Inf,NaN	Inf,NaN		1,+-0
-	 * 0,NaN	+-0,NaN		NaN,+-0		NaN,NaN	[inval]
-	 * NaN,0	NaN,0		NaN,+-0		NaN,0
-	 */
-	z = nan_nan;
-	testall_odd(csinh, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccosh, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctanh, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-	testall_odd(csin, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccos, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctan, z, nan_nan, ALL_STD_EXCEPT, 0, 0);
-
-	z = CMPLXL(42, NAN);
-	testall_odd(csinh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccosh, z, nan_nan, OPT_INVALID, 0, 0);
-	/* XXX We allow a spurious inexact exception here. */
-	testall_odd(ctanh, z, nan_nan, OPT_INVALID & ~FE_INEXACT, 0, 0);
-	testall_odd(csin, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccos, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(ctan, z, nan_nan, OPT_INVALID, 0, 0);
-
-	z = CMPLXL(NAN, 42);
-	testall_odd(csinh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccosh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(ctanh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(csin, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccos, z, nan_nan, OPT_INVALID, 0, 0);
-	/* XXX We allow a spurious inexact exception here. */
-	testall_odd(ctan, z, nan_nan, OPT_INVALID & ~FE_INEXACT, 0, 0);
-
-	z = CMPLXL(NAN, INFINITY);
-	testall_odd(csinh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccosh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(ctanh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(csin, z, CMPLXL(NAN, INFINITY), ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccos, z, CMPLXL(INFINITY, NAN), ALL_STD_EXCEPT, 0,
-	    CS_IMAG);
-	testall_odd(ctan, z, CMPLXL(0, 1), ALL_STD_EXCEPT, 0, CS_IMAG);
-
-	z = CMPLXL(INFINITY, NAN);
-	testall_odd(csinh, z, CMPLXL(INFINITY, NAN), ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccosh, z, CMPLXL(INFINITY, NAN), ALL_STD_EXCEPT, 0,
-		     CS_REAL);
-	testall_odd(ctanh, z, CMPLXL(1, 0), ALL_STD_EXCEPT, 0, CS_REAL);
-	testall_odd(csin, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_even(ccos, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(ctan, z, nan_nan, OPT_INVALID, 0, 0);
-
-	z = CMPLXL(0, NAN);
-	testall_odd(csinh, z, CMPLXL(0, NAN), ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccosh, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctanh, z, nan_nan, OPT_INVALID, 0, 0);
-	testall_odd(csin, z, CMPLXL(0, NAN), ALL_STD_EXCEPT, 0, CS_REAL);
-	testall_even(ccos, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctan, z, CMPLXL(0, NAN), ALL_STD_EXCEPT, 0, CS_REAL);
-
-	z = CMPLXL(NAN, 0);
-	testall_odd(csinh, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, CS_IMAG);
-	testall_even(ccosh, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctanh, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, CS_IMAG);
-	testall_odd(csin, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, 0);
-	testall_even(ccos, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, 0, 0);
-	testall_odd(ctan, z, nan_nan, OPT_INVALID, 0, 0);
-}
-
-void
-test_inf(void)
-{
-	static const long double finites[] = {
-	    0, M_PI / 4, 3 * M_PI / 4, 5 * M_PI / 4,
-	};
-	long double complex z, c, s;
-	int i;
-
-	/*
-	 * IN		CSINH		CCOSH		CTANH
-	 * Inf,Inf	+-Inf,NaN inval	+-Inf,NaN inval	1,+-0
-	 * Inf,finite	Inf cis(finite)	Inf cis(finite)	1,0 sin(2 finite)
-	 * 0,Inf	+-0,NaN	inval	NaN,+-0 inval	NaN,NaN	inval
-	 * finite,Inf	NaN,NaN inval	NaN,NaN inval	NaN,NaN inval
-	 */
-	z = CMPLXL(INFINITY, INFINITY);
-	testall_odd(csinh, z, CMPLXL(INFINITY, NAN),
-		    ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccosh, z, CMPLXL(INFINITY, NAN),
-		     ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_odd(ctanh, z, CMPLXL(1, 0), ALL_STD_EXCEPT, 0, CS_REAL);
-	testall_odd(csin, z, CMPLXL(NAN, INFINITY),
-		    ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccos, z, CMPLXL(INFINITY, NAN),
-		     ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_odd(ctan, z, CMPLXL(0, 1), ALL_STD_EXCEPT, 0, CS_REAL);
-
-	/* XXX We allow spurious inexact exceptions here (hard to avoid). */
-	for (i = 0; i < sizeof(finites) / sizeof(finites[0]); i++) {
-		z = CMPLXL(INFINITY, finites[i]);
-		c = INFINITY * cosl(finites[i]);
-		s = finites[i] == 0 ? finites[i] : INFINITY * sinl(finites[i]);
-		testall_odd(csinh, z, CMPLXL(c, s), OPT_INEXACT, 0, CS_BOTH);
-		testall_even(ccosh, z, CMPLXL(c, s), OPT_INEXACT, 0, CS_BOTH);
-		testall_odd(ctanh, z, CMPLXL(1, 0 * sin(finites[i] * 2)),
-			    OPT_INEXACT, 0, CS_BOTH);
-		z = CMPLXL(finites[i], INFINITY);
-		testall_odd(csin, z, CMPLXL(s, c), OPT_INEXACT, 0, CS_BOTH);
-		testall_even(ccos, z, CMPLXL(c, -s), OPT_INEXACT, 0, CS_BOTH);
-		testall_odd(ctan, z, CMPLXL(0 * sin(finites[i] * 2), 1),
-			    OPT_INEXACT, 0, CS_BOTH);
-	}
-
-	z = CMPLXL(0, INFINITY);
-	testall_odd(csinh, z, CMPLXL(0, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccosh, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_odd(ctanh, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	z = CMPLXL(INFINITY, 0);
-	testall_odd(csin, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccos, z, CMPLXL(NAN, 0), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_odd(ctan, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-
-	z = CMPLXL(42, INFINITY);
-	testall_odd(csinh, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccosh, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	/* XXX We allow a spurious inexact exception here. */
-	testall_odd(ctanh, z, CMPLXL(NAN, NAN), OPT_INEXACT, FE_INVALID, 0);
-	z = CMPLXL(INFINITY, 42);
-	testall_odd(csin, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	testall_even(ccos, z, CMPLXL(NAN, NAN), ALL_STD_EXCEPT, FE_INVALID, 0);
-	/* XXX We allow a spurious inexact exception here. */
-	testall_odd(ctan, z, CMPLXL(NAN, NAN), OPT_INEXACT, FE_INVALID, 0);
-}
-
-/* Tests along the real and imaginary axes. */
-void
-test_axes(void)
-{
-	static const long double nums[] = {
-	    M_PI / 4, M_PI / 2, 3 * M_PI / 4,
-	    5 * M_PI / 4, 3 * M_PI / 2, 7 * M_PI / 4,
-	};
-	long double complex z;
-	int i;
-
-	for (i = 0; i < sizeof(nums) / sizeof(nums[0]); i++) {
-		/* Real axis */
-		z = CMPLXL(nums[i], 0.0);
-		test_odd_tol(csinh, z, CMPLXL(sinh(nums[i]), 0), DBL_ULP());
-		test_even_tol(ccosh, z, CMPLXL(cosh(nums[i]), 0), DBL_ULP());
-		test_odd_tol(ctanh, z, CMPLXL(tanh(nums[i]), 0), DBL_ULP());
-		test_odd_tol(csin, z, CMPLXL(sin(nums[i]),
-		    copysign(0, cos(nums[i]))), DBL_ULP());
-		test_even_tol(ccos, z, CMPLXL(cos(nums[i]),
-		    -copysign(0, sin(nums[i]))), DBL_ULP());
-		test_odd_tol(ctan, z, CMPLXL(tan(nums[i]), 0), DBL_ULP());
-
-		test_odd_tol(csinhf, z, CMPLXL(sinhf(nums[i]), 0), FLT_ULP());
-		test_even_tol(ccoshf, z, CMPLXL(coshf(nums[i]), 0), FLT_ULP());
-		printf("%a %a\n", creal(z), cimag(z));
-		printf("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z)));
-		printf("%a\n", nextafterf(tanhf(nums[i]), INFINITY));
-		test_odd_tol(ctanhf, z, CMPLXL(tanhf(nums[i]), 0),
-			     1.3 * FLT_ULP());
-		test_odd_tol(csinf, z, CMPLXL(sinf(nums[i]),
-		    copysign(0, cosf(nums[i]))), FLT_ULP());
-		test_even_tol(ccosf, z, CMPLXL(cosf(nums[i]),
-		    -copysign(0, sinf(nums[i]))), 2 * FLT_ULP());
-		test_odd_tol(ctanf, z, CMPLXL(tanf(nums[i]), 0), FLT_ULP());
-
-		/* Imaginary axis */
-		z = CMPLXL(0.0, nums[i]);
-		test_odd_tol(csinh, z, CMPLXL(copysign(0, cos(nums[i])),
-						 sin(nums[i])), DBL_ULP());
-		test_even_tol(ccosh, z, CMPLXL(cos(nums[i]),
-		    copysign(0, sin(nums[i]))), DBL_ULP());
-		test_odd_tol(ctanh, z, CMPLXL(0, tan(nums[i])), DBL_ULP());
-		test_odd_tol(csin, z, CMPLXL(0, sinh(nums[i])), DBL_ULP());
-		test_even_tol(ccos, z, CMPLXL(cosh(nums[i]), -0.0), DBL_ULP());
-		test_odd_tol(ctan, z, CMPLXL(0, tanh(nums[i])), DBL_ULP());
-
-		test_odd_tol(csinhf, z, CMPLXL(copysign(0, cosf(nums[i])),
-						 sinf(nums[i])), FLT_ULP());
-		test_even_tol(ccoshf, z, CMPLXL(cosf(nums[i]),
-		    copysign(0, sinf(nums[i]))), FLT_ULP());
-		test_odd_tol(ctanhf, z, CMPLXL(0, tanf(nums[i])), FLT_ULP());
-		test_odd_tol(csinf, z, CMPLXL(0, sinhf(nums[i])), FLT_ULP());
-		test_even_tol(ccosf, z, CMPLXL(coshf(nums[i]), -0.0),
-			      FLT_ULP());
-		test_odd_tol(ctanf, z, CMPLXL(0, tanhf(nums[i])),
-			     1.3 * FLT_ULP());
-	}
-}
-
-void
-test_small(void)
-{
-	/*
-	 * z =  0.5 + i Pi/4
-	 *     sinh(z) = (sinh(0.5) + i cosh(0.5)) * sqrt(2)/2
-	 *     cosh(z) = (cosh(0.5) + i sinh(0.5)) * sqrt(2)/2
-	 *     tanh(z) = (2cosh(0.5)sinh(0.5) + i) / (2 cosh(0.5)**2 - 1)
-	 * z = -0.5 + i Pi/2
-	 *     sinh(z) = cosh(0.5)
-	 *     cosh(z) = -i sinh(0.5)
-	 *     tanh(z) = -coth(0.5)
-	 * z =  1.0 + i 3Pi/4
-	 *     sinh(z) = (-sinh(1) + i cosh(1)) * sqrt(2)/2
-	 *     cosh(z) = (-cosh(1) + i sinh(1)) * sqrt(2)/2
-	 *     tanh(z) = (2cosh(1)sinh(1) - i) / (2cosh(1)**2 - 1)
-	 */
-	static const struct {
-		long double a, b;
-		long double sinh_a, sinh_b;
-		long double cosh_a, cosh_b;
-		long double tanh_a, tanh_b;
-	} tests[] = {
-		{  0.5L,
-		   0.78539816339744830961566084581987572L,
-		   0.36847002415910435172083660522240710L,
-		   0.79735196663945774996093142586179334L,
-		   0.79735196663945774996093142586179334L,
-		   0.36847002415910435172083660522240710L,
-		   0.76159415595576488811945828260479359L,
-		   0.64805427366388539957497735322615032L },
-		{ -0.5L,
-		   1.57079632679489661923132169163975144L,
-		   0.0L,
-		   1.12762596520638078522622516140267201L,
-		   0.0L,
-		  -0.52109530549374736162242562641149156L,
-		  -2.16395341373865284877000401021802312L,
-		   0.0L },
-		{  1.0L,
-		   2.35619449019234492884698253745962716L,
-		  -0.83099273328405698212637979852748608L,
-		   1.09112278079550143030545602018565236L,
-		  -1.09112278079550143030545602018565236L,
-		   0.83099273328405698212637979852748609L,
-		   0.96402758007581688394641372410092315L,
-		  -0.26580222883407969212086273981988897L }
-	};
-	long double complex z;
-	int i;
-
-	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-		z = CMPLXL(tests[i].a, tests[i].b);
-		testall_odd_tol(csinh, z,
-		    CMPLXL(tests[i].sinh_a, tests[i].sinh_b), 1.1);
-		testall_even_tol(ccosh, z,
-		    CMPLXL(tests[i].cosh_a, tests[i].cosh_b), 1.1);
-		testall_odd_tol(ctanh, z,
-		    CMPLXL(tests[i].tanh_a, tests[i].tanh_b), 1.4);
-        }
-}
-
-/* Test inputs that might cause overflow in a sloppy implementation. */
-void
-test_large(void)
-{
-	long double complex z;
-
-	/* tanh() uses a threshold around x=22, so check both sides. */
-	z = CMPLXL(21, 0.78539816339744830961566084581987572L);
-	testall_odd_tol(ctanh, z,
-	    CMPLXL(1.0, 1.14990445285871196133287617611468468e-18L), 1.2);
-	z++;
-	testall_odd_tol(ctanh, z,
-	    CMPLXL(1.0, 1.55622644822675930314266334585597964e-19L), 1);
-
-	z = CMPLXL(355, 0.78539816339744830961566084581987572L);
-	test_odd_tol(ctanh, z,
-		     CMPLXL(1.0, 8.95257245135025991216632140458264468e-309L),
-		     DBL_ULP());
-	z = CMPLXL(30, 0x1p1023L);
-	test_odd_tol(ctanh, z,
-		     CMPLXL(1.0, -1.62994325413993477997492170229268382e-26L),
-		     DBL_ULP());
-	z = CMPLXL(1, 0x1p1023L);
-	test_odd_tol(ctanh, z,
-		     CMPLXL(0.878606311888306869546254022621986509L,
-			    -0.225462792499754505792678258169527424L),
-		     DBL_ULP());
-
-	z = CMPLXL(710.6, 0.78539816339744830961566084581987572L);
-	test_odd_tol(csinh, z,
-	    CMPLXL(1.43917579766621073533185387499658944e308L,
-		   1.43917579766621073533185387499658944e308L), DBL_ULP());
-	test_even_tol(ccosh, z,
-	    CMPLXL(1.43917579766621073533185387499658944e308L,
-		   1.43917579766621073533185387499658944e308L), DBL_ULP());
-
-	z = CMPLXL(1500, 0.78539816339744830961566084581987572L);
-	testall_odd(csinh, z, CMPLXL(INFINITY, INFINITY), OPT_INEXACT,
-	    FE_OVERFLOW, CS_BOTH);
-	testall_even(ccosh, z, CMPLXL(INFINITY, INFINITY), OPT_INEXACT,
-	    FE_OVERFLOW, CS_BOTH);
-}
-
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..6\n");
-
-	test_zero();
-	printf("ok 1 - ctrig zero\n");
-
-	test_nan();
-	printf("ok 2 - ctrig nan\n");
-
-	test_inf();
-	printf("ok 3 - ctrig inf\n");
-
-	test_axes();
-	printf("ok 4 - ctrig axes\n");
-
-	test_small();
-	printf("ok 5 - ctrig small\n");
-
-	test_large();
-	printf("ok 6 - ctrig large\n");
-
-	return (0);
-}
diff --git a/tools/regression/lib/msun/test-ctrig.t b/tools/regression/lib/msun/test-ctrig.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/msun/test-ctrig.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-exponential.c b/tools/regression/lib/msun/test-exponential.c
deleted file mode 100644
index 010e0fd..0000000
--- a/tools/regression/lib/msun/test-exponential.c
+++ /dev/null
@@ -1,158 +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.
- */
-
-/*
- * Tests for corner cases in exp*().
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <assert.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-
-#ifdef __i386__
-#include <ieeefp.h>
-#endif
-
-#include "test-utils.h"
-
-#pragma STDC FENV_ACCESS ON
-
-/*
- * Test that a function returns the correct value and sets the
- * exception flags correctly. The exceptmask specifies which
- * exceptions we should check. We need to be lenient for several
- * reasoons, but mainly because on some architectures it's impossible
- * to raise FE_OVERFLOW without raising FE_INEXACT.
- *
- * These are macros instead of functions so that assert provides more
- * meaningful error messages.
- *
- * XXX The volatile here is to avoid gcc's bogus constant folding and work
- *     around the lack of support for the FENV_ACCESS pragma.
- */
-#define	test(func, x, result, exceptmask, excepts)	do {		\
-	volatile long double _d = x;					\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert(fpequal((func)(_d), (result)));				 \
-	assert(((void)(func), fetestexcept(exceptmask) == (excepts)));	\
-} while (0)
-
-/* Test all the functions that compute b^x. */
-#define	testall0(x, result, exceptmask, excepts)	do {		\
-	test(exp, x, result, exceptmask, excepts);			\
-	test(expf, x, result, exceptmask, excepts);			\
-	test(exp2, x, result, exceptmask, excepts);			\
-	test(exp2f, x, result, exceptmask, excepts);			\
-	test(exp2l, x, result, exceptmask, excepts);			\
-} while (0)
-
-/* Test all the functions that compute b^x - 1. */
-#define	testall1(x, result, exceptmask, excepts)	do {		\
-	test(expm1, x, result, exceptmask, excepts);			\
-	test(expm1f, x, result, exceptmask, excepts);			\
-} while (0)
-
-void
-run_generic_tests(void)
-{
-
-	/* exp(0) == 1, no exceptions raised */
-	testall0(0.0, 1.0, ALL_STD_EXCEPT, 0);
-	testall1(0.0, 0.0, ALL_STD_EXCEPT, 0);
-	testall0(-0.0, 1.0, ALL_STD_EXCEPT, 0);
-	testall1(-0.0, -0.0, ALL_STD_EXCEPT, 0);
-
-	/* exp(NaN) == NaN, no exceptions raised */
-	testall0(NAN, NAN, ALL_STD_EXCEPT, 0);
-	testall1(NAN, NAN, ALL_STD_EXCEPT, 0);
-
-	/* exp(Inf) == Inf, no exceptions raised */
-	testall0(INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-	testall1(INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-
-	/* exp(-Inf) == 0, no exceptions raised */
-	testall0(-INFINITY, 0.0, ALL_STD_EXCEPT, 0);
-	testall1(-INFINITY, -1.0, ALL_STD_EXCEPT, 0);
-
-	/* exp(big) == Inf, overflow exception */
-	testall0(50000.0, INFINITY, ALL_STD_EXCEPT & ~FE_INEXACT, FE_OVERFLOW);
-	testall1(50000.0, INFINITY, ALL_STD_EXCEPT & ~FE_INEXACT, FE_OVERFLOW);
-
-	/* exp(small) == 0, underflow and inexact exceptions */
-	testall0(-50000.0, 0.0, ALL_STD_EXCEPT, FE_UNDERFLOW | FE_INEXACT);
-	testall1(-50000.0, -1.0, ALL_STD_EXCEPT, FE_INEXACT);
-}
-
-void
-run_exp2_tests(void)
-{
-	int i;
-
-	/*
-	 * We should insist that exp2() return exactly the correct
-	 * result and not raise an inexact exception for integer
-	 * arguments.
-	 */
-	feclearexcept(FE_ALL_EXCEPT);
-	for (i = FLT_MIN_EXP - FLT_MANT_DIG; i < FLT_MAX_EXP; i++) {
-		assert(exp2f(i) == ldexpf(1.0, i));
-		assert(fetestexcept(ALL_STD_EXCEPT) == 0);
-	}
-	for (i = DBL_MIN_EXP - DBL_MANT_DIG; i < DBL_MAX_EXP; i++) {
-		assert(exp2(i) == ldexp(1.0, i));
-		assert(fetestexcept(ALL_STD_EXCEPT) == 0);
-	}
-	for (i = LDBL_MIN_EXP - LDBL_MANT_DIG; i < LDBL_MAX_EXP; i++) {
-		assert(exp2l(i) == ldexpl(1.0, i));
-		assert(fetestexcept(ALL_STD_EXCEPT) == 0);
-	}
-}
-
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..3\n");
-
-	run_generic_tests();
-	printf("ok 1 - exponential\n");
-
-#ifdef __i386__
-	fpsetprec(FP_PE);
-	run_generic_tests();
-#endif
-	printf("ok 2 - exponential\n");
-
-	run_exp2_tests();
-	printf("ok 3 - exponential\n");
-
-	return (0);
-}
diff --git a/tools/regression/lib/msun/test-exponential.t b/tools/regression/lib/msun/test-exponential.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/msun/test-exponential.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-fma.c b/tools/regression/lib/msun/test-fma.c
deleted file mode 100644
index 1fcf889..0000000
--- a/tools/regression/lib/msun/test-fma.c
+++ /dev/null
@@ -1,522 +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.
- */
-
-/*
- * Tests for fma{,f,l}().
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <assert.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-
-#include "test-utils.h"
-
-#pragma STDC FENV_ACCESS ON
-
-/*
- * Test that a function returns the correct value and sets the
- * exception flags correctly. The exceptmask specifies which
- * exceptions we should check. We need to be lenient for several
- * reasons, but mainly because on some architectures it's impossible
- * to raise FE_OVERFLOW without raising FE_INEXACT.
- *
- * These are macros instead of functions so that assert provides more
- * meaningful error messages.
- */
-#define	test(func, x, y, z, result, exceptmask, excepts) do {		\
-	volatile long double _vx = (x), _vy = (y), _vz = (z);		\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert(fpequal((func)(_vx, _vy, _vz), (result)));		\
-	assert(((void)(func), fetestexcept(exceptmask) == (excepts)));	\
-} while (0)
-
-#define	testall(x, y, z, result, exceptmask, excepts)	do {		\
-	test(fma, (double)(x), (double)(y), (double)(z),		\
-		(double)(result), (exceptmask), (excepts));		\
-	test(fmaf, (float)(x), (float)(y), (float)(z),			\
-		(float)(result), (exceptmask), (excepts));		\
-	test(fmal, (x), (y), (z), (result), (exceptmask), (excepts));	\
-} while (0)
-
-/* Test in all rounding modes. */
-#define	testrnd(func, x, y, z, rn, ru, rd, rz, exceptmask, excepts)	do { \
-	fesetround(FE_TONEAREST);					\
-	test((func), (x), (y), (z), (rn), (exceptmask), (excepts));	\
-	fesetround(FE_UPWARD);						\
-	test((func), (x), (y), (z), (ru), (exceptmask), (excepts));	\
-	fesetround(FE_DOWNWARD);					\
-	test((func), (x), (y), (z), (rd), (exceptmask), (excepts));	\
-	fesetround(FE_TOWARDZERO);					\
-	test((func), (x), (y), (z), (rz), (exceptmask), (excepts));	\
-} while (0)
-
-/*
- * This is needed because clang constant-folds fma in ways that are incorrect
- * in rounding modes other than FE_TONEAREST.
- */
-volatile double one = 1.0;
-
-static void
-test_zeroes(void)
-{
-	const int rd = (fegetround() == FE_DOWNWARD);
-
-	testall(0.0, 0.0, 0.0, 0.0, ALL_STD_EXCEPT, 0);
-	testall(1.0, 0.0, 0.0, 0.0, ALL_STD_EXCEPT, 0);
-	testall(0.0, 1.0, 0.0, 0.0, ALL_STD_EXCEPT, 0);
-	testall(0.0, 0.0, 1.0, 1.0, ALL_STD_EXCEPT, 0);
-
-	testall(-0.0, 0.0, 0.0, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-	testall(0.0, -0.0, 0.0, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-	testall(-0.0, -0.0, 0.0, 0.0, ALL_STD_EXCEPT, 0);
-	testall(0.0, 0.0, -0.0, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-	testall(-0.0, -0.0, -0.0, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-
-	testall(-0.0, 0.0, -0.0, -0.0, ALL_STD_EXCEPT, 0);
-	testall(0.0, -0.0, -0.0, -0.0, ALL_STD_EXCEPT, 0);
-
-	testall(-one, one, one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-	testall(one, -one, one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-	testall(-one, -one, -one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);
-
-	switch (fegetround()) {
-	case FE_TONEAREST:
-	case FE_TOWARDZERO:
-		test(fmaf, -FLT_MIN, FLT_MIN, 0.0, -0.0,
-		     ALL_STD_EXCEPT, FE_INEXACT | FE_UNDERFLOW);
-		test(fma, -DBL_MIN, DBL_MIN, 0.0, -0.0,
-		     ALL_STD_EXCEPT, FE_INEXACT | FE_UNDERFLOW);
-		test(fmal, -LDBL_MIN, LDBL_MIN, 0.0, -0.0,
-		     ALL_STD_EXCEPT, FE_INEXACT | FE_UNDERFLOW);
-	}
-}
-
-static void
-test_infinities(void)
-{
-
-	testall(INFINITY, 1.0, -1.0, INFINITY, ALL_STD_EXCEPT, 0);
-	testall(-1.0, INFINITY, 0.0, -INFINITY, ALL_STD_EXCEPT, 0);
-	testall(0.0, 0.0, INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-	testall(1.0, 1.0, INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-	testall(1.0, 1.0, -INFINITY, -INFINITY, ALL_STD_EXCEPT, 0);
-
-	testall(INFINITY, -INFINITY, 1.0, -INFINITY, ALL_STD_EXCEPT, 0);
-	testall(INFINITY, INFINITY, 1.0, INFINITY, ALL_STD_EXCEPT, 0);
-	testall(-INFINITY, -INFINITY, INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-
-	testall(0.0, INFINITY, 1.0, NAN, ALL_STD_EXCEPT, FE_INVALID);
-	testall(INFINITY, 0.0, -0.0, NAN, ALL_STD_EXCEPT, FE_INVALID);
-
-	/* The invalid exception is optional in this case. */
-	testall(INFINITY, 0.0, NAN, NAN, ALL_STD_EXCEPT & ~FE_INVALID, 0);
-
-	testall(INFINITY, INFINITY, -INFINITY, NAN,
-		ALL_STD_EXCEPT, FE_INVALID);
-	testall(-INFINITY, INFINITY, INFINITY, NAN,
-		ALL_STD_EXCEPT, FE_INVALID);
-	testall(INFINITY, -1.0, INFINITY, NAN,
-		ALL_STD_EXCEPT, FE_INVALID);
-
-	test(fmaf, FLT_MAX, FLT_MAX, -INFINITY, -INFINITY, ALL_STD_EXCEPT, 0);
-	test(fma, DBL_MAX, DBL_MAX, -INFINITY, -INFINITY, ALL_STD_EXCEPT, 0);
-	test(fmal, LDBL_MAX, LDBL_MAX, -INFINITY, -INFINITY,
-	     ALL_STD_EXCEPT, 0);
-	test(fmaf, FLT_MAX, -FLT_MAX, INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-	test(fma, DBL_MAX, -DBL_MAX, INFINITY, INFINITY, ALL_STD_EXCEPT, 0);
-	test(fmal, LDBL_MAX, -LDBL_MAX, INFINITY, INFINITY,
-	     ALL_STD_EXCEPT, 0);
-}
-
-static void
-test_nans(void)
-{
-
-	testall(NAN, 0.0, 0.0, NAN, ALL_STD_EXCEPT, 0);
-	testall(1.0, NAN, 1.0, NAN, ALL_STD_EXCEPT, 0);
-	testall(1.0, -1.0, NAN, NAN, ALL_STD_EXCEPT, 0);
-	testall(0.0, 0.0, NAN, NAN, ALL_STD_EXCEPT, 0);
-	testall(NAN, NAN, NAN, NAN, ALL_STD_EXCEPT, 0);
-
-	/* x*y should not raise an inexact/overflow/underflow if z is NaN. */
-	testall(M_PI, M_PI, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fmaf, FLT_MIN, FLT_MIN, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fma, DBL_MIN, DBL_MIN, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fmal, LDBL_MIN, LDBL_MIN, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fmaf, FLT_MAX, FLT_MAX, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fma, DBL_MAX, DBL_MAX, NAN, NAN, ALL_STD_EXCEPT, 0);
-	test(fmal, LDBL_MAX, LDBL_MAX, NAN, NAN, ALL_STD_EXCEPT, 0);
-}
-
-/*
- * Tests for cases where z is very small compared to x*y.
- */
-static void
-test_small_z(void)
-{
-
-	/* x*y positive, z positive */
-	if (fegetround() == FE_UPWARD) {
-		test(fmaf, one, one, 0x1.0p-100, 1.0 + FLT_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, one, one, 0x1.0p-200, 1.0 + DBL_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, one, one, 0x1.0p-200, 1.0 + LDBL_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(0x1.0p100, one, 0x1.0p-100, 0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* x*y negative, z negative */
-	if (fegetround() == FE_DOWNWARD) {
-		test(fmaf, -one, one, -0x1.0p-100, -(1.0 + FLT_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, -one, one, -0x1.0p-200, -(1.0 + DBL_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, -one, one, -0x1.0p-200, -(1.0 + LDBL_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(0x1.0p100, -one, -0x1.0p-100, -0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* x*y positive, z negative */
-	if (fegetround() == FE_DOWNWARD || fegetround() == FE_TOWARDZERO) {
-		test(fmaf, one, one, -0x1.0p-100, 1.0 - FLT_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, one, one, -0x1.0p-200, 1.0 - DBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, one, one, -0x1.0p-200, 1.0 - LDBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(0x1.0p100, one, -0x1.0p-100, 0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* x*y negative, z positive */
-	if (fegetround() == FE_UPWARD || fegetround() == FE_TOWARDZERO) {
-		test(fmaf, -one, one, 0x1.0p-100, -1.0 + FLT_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, -one, one, 0x1.0p-200, -1.0 + DBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, -one, one, 0x1.0p-200, -1.0 + LDBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(-0x1.0p100, one, 0x1.0p-100, -0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-}
-
-/*
- * Tests for cases where z is very large compared to x*y.
- */
-static void
-test_big_z(void)
-{
-
-	/* z positive, x*y positive */
-	if (fegetround() == FE_UPWARD) {
-		test(fmaf, 0x1.0p-50, 0x1.0p-50, 1.0, 1.0 + FLT_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, 0x1.0p-100, 0x1.0p-100, 1.0, 1.0 + DBL_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, 0x1.0p-100, 0x1.0p-100, 1.0, 1.0 + LDBL_EPSILON,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(-0x1.0p-50, -0x1.0p-50, 0x1.0p100, 0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* z negative, x*y negative */
-	if (fegetround() == FE_DOWNWARD) {
-		test(fmaf, -0x1.0p-50, 0x1.0p-50, -1.0, -(1.0 + FLT_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, -0x1.0p-100, 0x1.0p-100, -1.0, -(1.0 + DBL_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, -0x1.0p-100, 0x1.0p-100, -1.0, -(1.0 + LDBL_EPSILON),
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(0x1.0p-50, -0x1.0p-50, -0x1.0p100, -0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* z negative, x*y positive */
-	if (fegetround() == FE_UPWARD || fegetround() == FE_TOWARDZERO) {
-		test(fmaf, -0x1.0p-50, -0x1.0p-50, -1.0,
-		     -1.0 + FLT_EPSILON / 2, ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, -0x1.0p-100, -0x1.0p-100, -1.0,
-		     -1.0 + DBL_EPSILON / 2, ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, -0x1.0p-100, -0x1.0p-100, -1.0,
-		     -1.0 + LDBL_EPSILON / 2, ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(0x1.0p-50, 0x1.0p-50, -0x1.0p100, -0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-
-	/* z positive, x*y negative */
-	if (fegetround() == FE_DOWNWARD || fegetround() == FE_TOWARDZERO) {
-		test(fmaf, 0x1.0p-50, -0x1.0p-50, 1.0, 1.0 - FLT_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fma, 0x1.0p-100, -0x1.0p-100, 1.0, 1.0 - DBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-		test(fmal, 0x1.0p-100, -0x1.0p-100, 1.0, 1.0 - LDBL_EPSILON / 2,
-		     ALL_STD_EXCEPT, FE_INEXACT);
-	} else {
-		testall(-0x1.0p-50, 0x1.0p-50, 0x1.0p100, 0x1.0p100,
-			ALL_STD_EXCEPT, FE_INEXACT);
-	}
-}
-
-static void
-test_accuracy(void)
-{
-
-	/* ilogb(x*y) - ilogb(z) = 20 */
-	testrnd(fmaf, -0x1.c139d8p-51, -0x1.600e7ap32, 0x1.26558cp-38,
-		0x1.34e48ap-18, 0x1.34e48cp-18, 0x1.34e48ap-18, 0x1.34e48ap-18,
-		ALL_STD_EXCEPT, FE_INEXACT);
-	testrnd(fma, -0x1.c139d7b84f1a3p-51, -0x1.600e7a2a16484p32,
-		0x1.26558cac31580p-38, 0x1.34e48a78aae97p-18,
-		0x1.34e48a78aae97p-18, 0x1.34e48a78aae96p-18,
-		0x1.34e48a78aae96p-18, ALL_STD_EXCEPT, FE_INEXACT);
-#if LDBL_MANT_DIG == 113
-	testrnd(fmal, -0x1.c139d7b84f1a3079263afcc5bae3p-51L,
-		-0x1.600e7a2a164840edbe2e7d301a72p32L,
-		0x1.26558cac315807eb07e448042101p-38L,
-		0x1.34e48a78aae96c76ed36077dd387p-18L,
-		0x1.34e48a78aae96c76ed36077dd388p-18L,
-		0x1.34e48a78aae96c76ed36077dd387p-18L,
-		0x1.34e48a78aae96c76ed36077dd387p-18L,
-		ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 64
-	testrnd(fmal, -0x1.c139d7b84f1a307ap-51L, -0x1.600e7a2a164840eep32L,
-		0x1.26558cac315807ecp-38L, 0x1.34e48a78aae96c78p-18L,
-		0x1.34e48a78aae96c78p-18L, 0x1.34e48a78aae96c76p-18L,
-		0x1.34e48a78aae96c76p-18L, ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 53
-	testrnd(fmal, -0x1.c139d7b84f1a3p-51L, -0x1.600e7a2a16484p32L,
-		0x1.26558cac31580p-38L, 0x1.34e48a78aae97p-18L,
-		0x1.34e48a78aae97p-18L, 0x1.34e48a78aae96p-18L,
-		0x1.34e48a78aae96p-18L, ALL_STD_EXCEPT, FE_INEXACT);
-#endif
-
-	/* ilogb(x*y) - ilogb(z) = -40 */
-	testrnd(fmaf, 0x1.98210ap53, 0x1.9556acp-24, 0x1.d87da4p70,
-		0x1.d87da4p70, 0x1.d87da6p70, 0x1.d87da4p70, 0x1.d87da4p70,
-		ALL_STD_EXCEPT, FE_INEXACT);
-	testrnd(fma, 0x1.98210ac83fe2bp53, 0x1.9556ac1475f0fp-24,
-		0x1.d87da3aafc60ep70, 0x1.d87da3aafda40p70,
-		0x1.d87da3aafda40p70, 0x1.d87da3aafda3fp70,
-		0x1.d87da3aafda3fp70, ALL_STD_EXCEPT, FE_INEXACT);
-#if LDBL_MANT_DIG == 113
-	testrnd(fmal, 0x1.98210ac83fe2a8f65b6278b74cebp53L,
-		0x1.9556ac1475f0f28968b61d0de65ap-24L,
-		0x1.d87da3aafc60d830aa4c6d73b749p70L,
-		0x1.d87da3aafda3f36a69eb86488224p70L,
-		0x1.d87da3aafda3f36a69eb86488225p70L,
-		0x1.d87da3aafda3f36a69eb86488224p70L,
-		0x1.d87da3aafda3f36a69eb86488224p70L,
-		ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 64
-	testrnd(fmal, 0x1.98210ac83fe2a8f6p53L, 0x1.9556ac1475f0f28ap-24L,
-		0x1.d87da3aafc60d83p70L, 0x1.d87da3aafda3f36ap70L,
-		0x1.d87da3aafda3f36ap70L, 0x1.d87da3aafda3f368p70L,
-		0x1.d87da3aafda3f368p70L, ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 53
-	testrnd(fmal, 0x1.98210ac83fe2bp53L, 0x1.9556ac1475f0fp-24L,
-		0x1.d87da3aafc60ep70L, 0x1.d87da3aafda40p70L,
-		0x1.d87da3aafda40p70L, 0x1.d87da3aafda3fp70L,
-		0x1.d87da3aafda3fp70L, ALL_STD_EXCEPT, FE_INEXACT);
-#endif
-
-	/* ilogb(x*y) - ilogb(z) = 0 */
-	testrnd(fmaf, 0x1.31ad02p+100, 0x1.2fbf7ap-42, -0x1.c3e106p+58,
-		-0x1.64c27cp+56, -0x1.64c27ap+56, -0x1.64c27cp+56,
-		-0x1.64c27ap+56, ALL_STD_EXCEPT, FE_INEXACT);
-	testrnd(fma, 0x1.31ad012ede8aap+100, 0x1.2fbf79c839067p-42,
-		-0x1.c3e106929056ep+58, -0x1.64c282b970a5fp+56,
-		-0x1.64c282b970a5ep+56, -0x1.64c282b970a5fp+56,
-		-0x1.64c282b970a5ep+56, ALL_STD_EXCEPT, FE_INEXACT);
-#if LDBL_MANT_DIG == 113
-	testrnd(fmal, 0x1.31ad012ede8aa282fa1c19376d16p+100L,
-		 0x1.2fbf79c839066f0f5c68f6d2e814p-42L,
-		-0x1.c3e106929056ec19de72bfe64215p+58L,
-		-0x1.64c282b970a612598fc025ca8cddp+56L,
-		-0x1.64c282b970a612598fc025ca8cddp+56L,
-		-0x1.64c282b970a612598fc025ca8cdep+56L,
-		-0x1.64c282b970a612598fc025ca8cddp+56L,
-		ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 64
-	testrnd(fmal, 0x1.31ad012ede8aa4eap+100L, 0x1.2fbf79c839066aeap-42L,
-		-0x1.c3e106929056e61p+58L, -0x1.64c282b970a60298p+56L,
-		-0x1.64c282b970a60298p+56L, -0x1.64c282b970a6029ap+56L,
-		-0x1.64c282b970a60298p+56L, ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 53
-	testrnd(fmal, 0x1.31ad012ede8aap+100L, 0x1.2fbf79c839067p-42L,
-		-0x1.c3e106929056ep+58L, -0x1.64c282b970a5fp+56L,
-		-0x1.64c282b970a5ep+56L, -0x1.64c282b970a5fp+56L,
-		-0x1.64c282b970a5ep+56L, ALL_STD_EXCEPT, FE_INEXACT);
-#endif
-
-	/* x*y (rounded) ~= -z */
-	/* XXX spurious inexact exceptions */
-	testrnd(fmaf, 0x1.bbffeep-30, -0x1.1d164cp-74, 0x1.ee7296p-104,
-		-0x1.c46ea8p-128, -0x1.c46ea8p-128, -0x1.c46ea8p-128,
-		-0x1.c46ea8p-128, ALL_STD_EXCEPT & ~FE_INEXACT, 0);
-	testrnd(fma, 0x1.bbffeea6fc7d6p-30, 0x1.1d164c6cbf078p-74,
-		-0x1.ee72993aff948p-104, -0x1.71f72ac7d9d8p-159,
-		-0x1.71f72ac7d9d8p-159, -0x1.71f72ac7d9d8p-159,
-		-0x1.71f72ac7d9d8p-159, ALL_STD_EXCEPT & ~FE_INEXACT, 0);
-#if LDBL_MANT_DIG == 113
-	testrnd(fmal, 0x1.bbffeea6fc7d65927d147f437675p-30L,
-		0x1.1d164c6cbf078b7a22607d1cd6a2p-74L,
-		-0x1.ee72993aff94973876031bec0944p-104L,
-		0x1.64e086175b3a2adc36e607058814p-217L,
-		0x1.64e086175b3a2adc36e607058814p-217L,
-		0x1.64e086175b3a2adc36e607058814p-217L,
-		0x1.64e086175b3a2adc36e607058814p-217L,
-		ALL_STD_EXCEPT & ~FE_INEXACT, 0);
-#elif LDBL_MANT_DIG == 64
-	testrnd(fmal, 0x1.bbffeea6fc7d6592p-30L, 0x1.1d164c6cbf078b7ap-74L,
-		-0x1.ee72993aff949736p-104L, 0x1.af190e7a1ee6ad94p-168L,
-		0x1.af190e7a1ee6ad94p-168L, 0x1.af190e7a1ee6ad94p-168L,
-		0x1.af190e7a1ee6ad94p-168L, ALL_STD_EXCEPT & ~FE_INEXACT, 0);
-#elif LDBL_MANT_DIG == 53
-	testrnd(fmal, 0x1.bbffeea6fc7d6p-30L, 0x1.1d164c6cbf078p-74L,
-		-0x1.ee72993aff948p-104L, -0x1.71f72ac7d9d8p-159L,
-		-0x1.71f72ac7d9d8p-159L, -0x1.71f72ac7d9d8p-159L,
-		-0x1.71f72ac7d9d8p-159L, ALL_STD_EXCEPT & ~FE_INEXACT, 0);
-#endif
-}
-
-static void
-test_double_rounding(void)
-{
-
-	/*
-	 *     a =  0x1.8000000000001p0
-	 *     b =  0x1.8000000000001p0
-	 *     c = -0x0.0000000000000000000000000080...1p+1
-	 * a * b =  0x1.2000000000001800000000000080p+1
-	 *
-	 * The correct behavior is to round DOWN to 0x1.2000000000001p+1 in
-	 * round-to-nearest mode.  An implementation that computes a*b+c in
-	 * double+double precision, however, will get 0x1.20000000000018p+1,
-	 * and then round UP.
-	 */
-	fesetround(FE_TONEAREST);
-	test(fma, 0x1.8000000000001p0, 0x1.8000000000001p0,
-	     -0x1.0000000000001p-104, 0x1.2000000000001p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-	fesetround(FE_DOWNWARD);
-	test(fma, 0x1.8000000000001p0, 0x1.8000000000001p0,
-	     -0x1.0000000000001p-104, 0x1.2000000000001p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-	fesetround(FE_UPWARD);
-	test(fma, 0x1.8000000000001p0, 0x1.8000000000001p0,
-	     -0x1.0000000000001p-104, 0x1.2000000000002p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-
-	fesetround(FE_TONEAREST);
-	test(fmaf, 0x1.800002p+0, 0x1.800002p+0, -0x1.000002p-46, 0x1.200002p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-	fesetround(FE_DOWNWARD);
-	test(fmaf, 0x1.800002p+0, 0x1.800002p+0, -0x1.000002p-46, 0x1.200002p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-	fesetround(FE_UPWARD);
-	test(fmaf, 0x1.800002p+0, 0x1.800002p+0, -0x1.000002p-46, 0x1.200004p+1,
-	     ALL_STD_EXCEPT, FE_INEXACT);
-
-	fesetround(FE_TONEAREST);
-#if LDBL_MANT_DIG == 64
-	test(fmal, 0x1.4p+0L, 0x1.0000000000000004p+0L, 0x1p-128L,
-	     0x1.4000000000000006p+0L, ALL_STD_EXCEPT, FE_INEXACT);
-#elif LDBL_MANT_DIG == 113
-	test(fmal, 0x1.8000000000000000000000000001p+0L,
-	     0x1.8000000000000000000000000001p+0L,
-	     -0x1.0000000000000000000000000001p-224L,
-	     0x1.2000000000000000000000000001p+1L, ALL_STD_EXCEPT, FE_INEXACT);
-#endif
-
-}
-
-int
-main(int argc, char *argv[])
-{
-	int rmodes[] = { FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO };
-	int i;
-
-	printf("1..19\n");
-
-	for (i = 0; i < 4; i++) {
-		fesetround(rmodes[i]);
-		test_zeroes();
-		printf("ok %d - fma zeroes\n", i + 1);
-	}
-
-	for (i = 0; i < 4; i++) {
-		fesetround(rmodes[i]);
-		test_infinities();
-		printf("ok %d - fma infinities\n", i + 5);
-	}
-
-	fesetround(FE_TONEAREST);
-	test_nans();
-	printf("ok 9 - fma NaNs\n");
-
-	for (i = 0; i < 4; i++) {
-		fesetround(rmodes[i]);
-		test_small_z();
-		printf("ok %d - fma small z\n", i + 10);
-	}
-
-	for (i = 0; i < 4; i++) {
-		fesetround(rmodes[i]);
-		test_big_z();
-		printf("ok %d - fma big z\n", i + 14);
-	}
-
-	fesetround(FE_TONEAREST);
-	test_accuracy();
-	printf("ok 18 - fma accuracy\n");
-
-	test_double_rounding();
-	printf("ok 19 - fma double rounding\n");
-
-	/*
-	 * TODO:
-	 * - Tests for subnormals
-	 * - Cancellation tests (e.g., z = (double)x*y, but x*y is inexact)
-	 */
-
-	return (0);
-}
diff --git a/tools/regression/lib/msun/test-fma.t b/tools/regression/lib/msun/test-fma.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/msun/test-fma.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-invtrig.c b/tools/regression/lib/msun/test-invtrig.c
deleted file mode 100644
index 9b41fd5..0000000
--- a/tools/regression/lib/msun/test-invtrig.c
+++ /dev/null
@@ -1,456 +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.
- */
-
-/*
- * Tests for corner cases in the inverse trigonometric functions. Some
- * accuracy tests are included as well, but these are very basic
- * sanity checks, not intended to be comprehensive.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <assert.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-
-#include "test-utils.h"
-
-#pragma STDC FENV_ACCESS ON
-
-/*
- * Test that a function returns the correct value and sets the
- * exception flags correctly. A tolerance specifying the maximum
- * relative error allowed may be specified. For the 'testall'
- * functions, the tolerance is specified in ulps.
- *
- * These are macros instead of functions so that assert provides more
- * meaningful error messages.
- */
-#define	test_tol(func, x, result, tol, excepts) do {			\
-	volatile long double _in = (x), _out = (result);		\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert(fpequal_tol(func(_in), _out, (tol), CS_BOTH));		\
-	assert(((void)func, fetestexcept(ALL_STD_EXCEPT) == (excepts))); \
-} while (0)
-#define test(func, x, result, excepts)					\
-	test_tol(func, (x), (result), 0, (excepts))
-
-#define	testall_tol(prefix, x, result, tol, excepts) do {		\
-	test_tol(prefix, (double)(x), (double)(result),			\
-		 (tol) * ldexp(1.0, 1 - DBL_MANT_DIG), (excepts));	\
-	test_tol(prefix##f, (float)(x), (float)(result),		\
-		 (tol) * ldexpf(1.0, 1 - FLT_MANT_DIG), (excepts));	\
-	test_tol(prefix##l, (x), (result),				\
-		 (tol) * ldexpl(1.0, 1 - LDBL_MANT_DIG), (excepts));	\
-} while (0)
-#define testall(prefix, x, result, excepts)				\
-	testall_tol(prefix, (x), (result), 0, (excepts))
-
-#define	test2_tol(func, y, x, result, tol, excepts) do {		\
-	volatile long double _iny = (y), _inx = (x), _out = (result);	\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert(fpequal_tol(func(_iny, _inx), _out, (tol), CS_BOTH));	\
-	assert(((void)func, fetestexcept(ALL_STD_EXCEPT) == (excepts))); \
-} while (0)
-#define test2(func, y, x, result, excepts)				\
-	test2_tol(func, (y), (x), (result), 0, (excepts))
-
-#define	testall2_tol(prefix, y, x, result, tol, excepts) do {		\
-	test2_tol(prefix, (double)(y), (double)(x), (double)(result),	\
-		  (tol) * ldexp(1.0, 1 - DBL_MANT_DIG), (excepts));	\
-	test2_tol(prefix##f, (float)(y), (float)(x), (float)(result),	\
-		  (tol) * ldexpf(1.0, 1 - FLT_MANT_DIG), (excepts));	\
-	test2_tol(prefix##l, (y), (x), (result),			\
-		  (tol) * ldexpl(1.0, 1 - LDBL_MANT_DIG), (excepts));	\
-} while (0)
-#define testall2(prefix, y, x, result, excepts)				\
-	testall2_tol(prefix, (y), (x), (result), 0, (excepts))
-
-long double
-pi =   3.14159265358979323846264338327950280e+00L,
-pio3 = 1.04719755119659774615421446109316766e+00L,
-c3pi = 9.42477796076937971538793014983850839e+00L,
-c5pi = 1.57079632679489661923132169163975140e+01L,
-c7pi = 2.19911485751285526692385036829565196e+01L,
-c5pio3 = 5.23598775598298873077107230546583851e+00L,
-sqrt2m1 = 4.14213562373095048801688724209698081e-01L;
-
-
-/*
- * Test special case inputs in asin(), acos() and atan(): signed
- * zeroes, infinities, and NaNs.
- */
-static void
-test_special(void)
-{
-
-	testall(asin, 0.0, 0.0, 0);
-	testall(acos, 0.0, pi / 2, FE_INEXACT);
-	testall(atan, 0.0, 0.0, 0);
-	testall(asin, -0.0, -0.0, 0);
-	testall(acos, -0.0, pi / 2, FE_INEXACT);
-	testall(atan, -0.0, -0.0, 0);
-
-	testall(asin, INFINITY, NAN, FE_INVALID);
-	testall(acos, INFINITY, NAN, FE_INVALID);
-	testall(atan, INFINITY, pi / 2, FE_INEXACT);
-	testall(asin, -INFINITY, NAN, FE_INVALID);
-	testall(acos, -INFINITY, NAN, FE_INVALID);
-	testall(atan, -INFINITY, -pi / 2, FE_INEXACT);
-
-	testall(asin, NAN, NAN, 0);
-	testall(acos, NAN, NAN, 0);
-	testall(atan, NAN, NAN, 0);
-}
-
-/*
- * Test special case inputs in atan2(), where the exact value of y/x is
- * zero or non-finite.
- */
-static void
-test_special_atan2(void)
-{
-	long double z;
-	int e;
-
-	testall2(atan2, 0.0, -0.0, pi, FE_INEXACT);
-	testall2(atan2, -0.0, -0.0, -pi, FE_INEXACT);
-	testall2(atan2, 0.0, 0.0, 0.0, 0);
-	testall2(atan2, -0.0, 0.0, -0.0, 0);
-
-	testall2(atan2, INFINITY, -INFINITY, c3pi / 4, FE_INEXACT);
-	testall2(atan2, -INFINITY, -INFINITY, -c3pi / 4, FE_INEXACT);
-	testall2(atan2, INFINITY, INFINITY, pi / 4, FE_INEXACT);
-	testall2(atan2, -INFINITY, INFINITY, -pi / 4, FE_INEXACT);
-
-	/* Tests with one input in the range (0, Inf]. */
-	z = 1.23456789L;
-	for (e = FLT_MIN_EXP - FLT_MANT_DIG; e <= FLT_MAX_EXP; e++) {
-		test2(atan2f, 0.0, ldexpf(z, e), 0.0, 0);
-		test2(atan2f, -0.0, ldexpf(z, e), -0.0, 0);
-		test2(atan2f, 0.0, ldexpf(-z, e), (float)pi, FE_INEXACT);
-		test2(atan2f, -0.0, ldexpf(-z, e), (float)-pi, FE_INEXACT);
-		test2(atan2f, ldexpf(z, e), 0.0, (float)pi / 2, FE_INEXACT);
-		test2(atan2f, ldexpf(z, e), -0.0, (float)pi / 2, FE_INEXACT);
-		test2(atan2f, ldexpf(-z, e), 0.0, (float)-pi / 2, FE_INEXACT);
-		test2(atan2f, ldexpf(-z, e), -0.0, (float)-pi / 2, FE_INEXACT);
-	}
-	for (e = DBL_MIN_EXP - DBL_MANT_DIG; e <= DBL_MAX_EXP; e++) {
-		test2(atan2, 0.0, ldexp(z, e), 0.0, 0);
-		test2(atan2, -0.0, ldexp(z, e), -0.0, 0);
-		test2(atan2, 0.0, ldexp(-z, e), (double)pi, FE_INEXACT);
-		test2(atan2, -0.0, ldexp(-z, e), (double)-pi, FE_INEXACT);
-		test2(atan2, ldexp(z, e), 0.0, (double)pi / 2, FE_INEXACT);
-		test2(atan2, ldexp(z, e), -0.0, (double)pi / 2, FE_INEXACT);
-		test2(atan2, ldexp(-z, e), 0.0, (double)-pi / 2, FE_INEXACT);
-		test2(atan2, ldexp(-z, e), -0.0, (double)-pi / 2, FE_INEXACT);
-	}
-	for (e = LDBL_MIN_EXP - LDBL_MANT_DIG; e <= LDBL_MAX_EXP; e++) {
-		test2(atan2l, 0.0, ldexpl(z, e), 0.0, 0);
-		test2(atan2l, -0.0, ldexpl(z, e), -0.0, 0);
-		test2(atan2l, 0.0, ldexpl(-z, e), pi, FE_INEXACT);
-		test2(atan2l, -0.0, ldexpl(-z, e), -pi, FE_INEXACT);
-		test2(atan2l, ldexpl(z, e), 0.0, pi / 2, FE_INEXACT);
-		test2(atan2l, ldexpl(z, e), -0.0, pi / 2, FE_INEXACT);
-		test2(atan2l, ldexpl(-z, e), 0.0, -pi / 2, FE_INEXACT);
-		test2(atan2l, ldexpl(-z, e), -0.0, -pi / 2, FE_INEXACT);
-	}
-
-	/* Tests with one input in the range (0, Inf). */
-	for (e = FLT_MIN_EXP - FLT_MANT_DIG; e <= FLT_MAX_EXP - 1; e++) {
-		test2(atan2f, ldexpf(z, e), INFINITY, 0.0, 0);
-		test2(atan2f, ldexpf(-z,e), INFINITY, -0.0, 0);
-		test2(atan2f, ldexpf(z, e), -INFINITY, (float)pi, FE_INEXACT);
-		test2(atan2f, ldexpf(-z,e), -INFINITY, (float)-pi, FE_INEXACT);
-		test2(atan2f, INFINITY, ldexpf(z,e), (float)pi/2, FE_INEXACT);
-		test2(atan2f, INFINITY, ldexpf(-z,e), (float)pi/2, FE_INEXACT);
-		test2(atan2f, -INFINITY, ldexpf(z,e), (float)-pi/2,FE_INEXACT);
-		test2(atan2f, -INFINITY, ldexpf(-z,e),(float)-pi/2,FE_INEXACT);
-	}
-	for (e = DBL_MIN_EXP - DBL_MANT_DIG; e <= DBL_MAX_EXP - 1; e++) {
-		test2(atan2, ldexp(z, e), INFINITY, 0.0, 0);
-		test2(atan2, ldexp(-z,e), INFINITY, -0.0, 0);
-		test2(atan2, ldexp(z, e), -INFINITY, (double)pi, FE_INEXACT);
-		test2(atan2, ldexp(-z,e), -INFINITY, (double)-pi, FE_INEXACT);
-		test2(atan2, INFINITY, ldexp(z,e), (double)pi/2, FE_INEXACT);
-		test2(atan2, INFINITY, ldexp(-z,e), (double)pi/2, FE_INEXACT);
-		test2(atan2, -INFINITY, ldexp(z,e), (double)-pi/2,FE_INEXACT);
-		test2(atan2, -INFINITY, ldexp(-z,e),(double)-pi/2,FE_INEXACT);
-	}
-	for (e = LDBL_MIN_EXP - LDBL_MANT_DIG; e <= LDBL_MAX_EXP - 1; e++) {
-		test2(atan2l, ldexpl(z, e), INFINITY, 0.0, 0);
-		test2(atan2l, ldexpl(-z,e), INFINITY, -0.0, 0);
-		test2(atan2l, ldexpl(z, e), -INFINITY, pi, FE_INEXACT);
-		test2(atan2l, ldexpl(-z,e), -INFINITY, -pi, FE_INEXACT);
-		test2(atan2l, INFINITY, ldexpl(z, e), pi / 2, FE_INEXACT);
-		test2(atan2l, INFINITY, ldexpl(-z, e), pi / 2, FE_INEXACT);
-		test2(atan2l, -INFINITY, ldexpl(z, e), -pi / 2, FE_INEXACT);
-		test2(atan2l, -INFINITY, ldexpl(-z, e), -pi / 2, FE_INEXACT);
-	}
-}
-
-/*
- * Test various inputs to asin(), acos() and atan() and verify that the
- * results are accurate to within 1 ulp.
- */
-static void
-test_accuracy(void)
-{
-
-	/* We expect correctly rounded results for these basic cases. */
-	testall(asin, 1.0, pi / 2, FE_INEXACT);
-	testall(acos, 1.0, 0, 0);
-	testall(atan, 1.0, pi / 4, FE_INEXACT);
-	testall(asin, -1.0, -pi / 2, FE_INEXACT);
-	testall(acos, -1.0, pi, FE_INEXACT);
-	testall(atan, -1.0, -pi / 4, FE_INEXACT);
-
-	/*
-	 * Here we expect answers to be within 1 ulp, although inexactness
-	 * in the input, combined with double rounding, could cause larger
-	 * errors.
-	 */
-
-	testall_tol(asin, sqrtl(2) / 2, pi / 4, 1, FE_INEXACT);
-	testall_tol(acos, sqrtl(2) / 2, pi / 4, 1, FE_INEXACT);
-	testall_tol(asin, -sqrtl(2) / 2, -pi / 4, 1, FE_INEXACT);
-	testall_tol(acos, -sqrtl(2) / 2, c3pi / 4, 1, FE_INEXACT);
-
-	testall_tol(asin, sqrtl(3) / 2, pio3, 1, FE_INEXACT);
-	testall_tol(acos, sqrtl(3) / 2, pio3 / 2, 1, FE_INEXACT);
-	testall_tol(atan, sqrtl(3), pio3, 1, FE_INEXACT);
-	testall_tol(asin, -sqrtl(3) / 2, -pio3, 1, FE_INEXACT);
-	testall_tol(acos, -sqrtl(3) / 2, c5pio3 / 2, 1, FE_INEXACT);
-	testall_tol(atan, -sqrtl(3), -pio3, 1, FE_INEXACT);
-
-	testall_tol(atan, sqrt2m1, pi / 8, 1, FE_INEXACT);
-	testall_tol(atan, -sqrt2m1, -pi / 8, 1, FE_INEXACT);
-}
-
-/*
- * Test inputs to atan2() where x is a power of 2. These are easy cases
- * because y/x is exact.
- */
-static void
-test_p2x_atan2(void)
-{
-
-	testall2(atan2, 1.0, 1.0, pi / 4, FE_INEXACT);
-	testall2(atan2, 1.0, -1.0, c3pi / 4, FE_INEXACT);
-	testall2(atan2, -1.0, 1.0, -pi / 4, FE_INEXACT);
-	testall2(atan2, -1.0, -1.0, -c3pi / 4, FE_INEXACT);
-
-	testall2_tol(atan2, sqrt2m1 * 2, 2.0, pi / 8, 1, FE_INEXACT);
-	testall2_tol(atan2, sqrt2m1 * 2, -2.0, c7pi / 8, 1, FE_INEXACT);
-	testall2_tol(atan2, -sqrt2m1 * 2, 2.0, -pi / 8, 1, FE_INEXACT);
-	testall2_tol(atan2, -sqrt2m1 * 2, -2.0, -c7pi / 8, 1, FE_INEXACT);
-
-	testall2_tol(atan2, sqrtl(3) * 0.5, 0.5, pio3, 1, FE_INEXACT);
-	testall2_tol(atan2, sqrtl(3) * 0.5, -0.5, pio3 * 2, 1, FE_INEXACT);
-	testall2_tol(atan2, -sqrtl(3) * 0.5, 0.5, -pio3, 1, FE_INEXACT);
-	testall2_tol(atan2, -sqrtl(3) * 0.5, -0.5, -pio3 * 2, 1, FE_INEXACT);
-}
-
-/*
- * Test inputs very close to 0.
- */
-static void
-test_tiny(void)
-{
-	float tiny = 0x1.23456p-120f;
-
-	testall(asin, tiny, tiny, FE_INEXACT);
-	testall(acos, tiny, pi / 2, FE_INEXACT);
-	testall(atan, tiny, tiny, FE_INEXACT);
-
-	testall(asin, -tiny, -tiny, FE_INEXACT);
-	testall(acos, -tiny, pi / 2, FE_INEXACT);
-	testall(atan, -tiny, -tiny, FE_INEXACT);
-
-	/* Test inputs to atan2() that would cause y/x to underflow. */
-	test2(atan2f, 0x1.0p-100, 0x1.0p100, 0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2, 0x1.0p-1000, 0x1.0p1000, 0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2l, ldexpl(1.0, 100 - LDBL_MAX_EXP),
-	      ldexpl(1.0, LDBL_MAX_EXP - 100), 0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2f, -0x1.0p-100, 0x1.0p100, -0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2, -0x1.0p-1000, 0x1.0p1000, -0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2l, -ldexpl(1.0, 100 - LDBL_MAX_EXP),
-	      ldexpl(1.0, LDBL_MAX_EXP - 100), -0.0, FE_INEXACT | FE_UNDERFLOW);
-	test2(atan2f, 0x1.0p-100, -0x1.0p100, (float)pi, FE_INEXACT);
-	test2(atan2, 0x1.0p-1000, -0x1.0p1000, (double)pi, FE_INEXACT);
-	test2(atan2l, ldexpl(1.0, 100 - LDBL_MAX_EXP),
-	      -ldexpl(1.0, LDBL_MAX_EXP - 100), pi, FE_INEXACT);
-	test2(atan2f, -0x1.0p-100, -0x1.0p100, (float)-pi, FE_INEXACT);
-	test2(atan2, -0x1.0p-1000, -0x1.0p1000, (double)-pi, FE_INEXACT);
-	test2(atan2l, -ldexpl(1.0, 100 - LDBL_MAX_EXP),
-	      -ldexpl(1.0, LDBL_MAX_EXP - 100), -pi, FE_INEXACT);
-}
-
-/*
- * Test very large inputs to atan().
- */
-static void
-test_atan_huge(void)
-{
-	float huge = 0x1.23456p120;
-
-	testall(atan, huge, pi / 2, FE_INEXACT);
-	testall(atan, -huge, -pi / 2, FE_INEXACT);
-
-	/* Test inputs to atan2() that would cause y/x to overflow. */
-	test2(atan2f, 0x1.0p100, 0x1.0p-100, (float)pi / 2, FE_INEXACT);
-	test2(atan2, 0x1.0p1000, 0x1.0p-1000, (double)pi / 2, FE_INEXACT);
-	test2(atan2l, ldexpl(1.0, LDBL_MAX_EXP - 100),
-	      ldexpl(1.0, 100 - LDBL_MAX_EXP), pi / 2, FE_INEXACT);
-	test2(atan2f, -0x1.0p100, 0x1.0p-100, (float)-pi / 2, FE_INEXACT);
-	test2(atan2, -0x1.0p1000, 0x1.0p-1000, (double)-pi / 2, FE_INEXACT);
-	test2(atan2l, -ldexpl(1.0, LDBL_MAX_EXP - 100),
-	      ldexpl(1.0, 100 - LDBL_MAX_EXP), -pi / 2, FE_INEXACT);
-
-	test2(atan2f, 0x1.0p100, -0x1.0p-100, (float)pi / 2, FE_INEXACT);
-	test2(atan2, 0x1.0p1000, -0x1.0p-1000, (double)pi / 2, FE_INEXACT);
-	test2(atan2l, ldexpl(1.0, LDBL_MAX_EXP - 100),
-	      -ldexpl(1.0, 100 - LDBL_MAX_EXP), pi / 2, FE_INEXACT);
-	test2(atan2f, -0x1.0p100, -0x1.0p-100, (float)-pi / 2, FE_INEXACT);
-	test2(atan2, -0x1.0p1000, -0x1.0p-1000, (double)-pi / 2, FE_INEXACT);
-	test2(atan2l, -ldexpl(1.0, LDBL_MAX_EXP - 100),
-	      -ldexpl(1.0, 100 - LDBL_MAX_EXP), -pi / 2, FE_INEXACT);
-}
-
-/*
- * Test that sin(asin(x)) == x, and similarly for acos() and atan().
- * You need to have a working sinl(), cosl(), and tanl() for these
- * tests to pass.
- */
-static long double
-sinasinf(float x)
-{
-
-	return (sinl(asinf(x)));
-}
-
-static long double
-sinasin(double x)
-{
-
-	return (sinl(asin(x)));
-}
-
-static long double
-sinasinl(long double x)
-{
-
-	return (sinl(asinl(x)));
-}
-
-static long double
-cosacosf(float x)
-{
-
-	return (cosl(acosf(x)));
-}
-
-static long double
-cosacos(double x)
-{
-
-	return (cosl(acos(x)));
-}
-
-static long double
-cosacosl(long double x)
-{
-
-	return (cosl(acosl(x)));
-}
-
-static long double
-tanatanf(float x)
-{
-
-	return (tanl(atanf(x)));
-}
-
-static long double
-tanatan(double x)
-{
-
-	return (tanl(atan(x)));
-}
-
-static long double
-tanatanl(long double x)
-{
-
-	return (tanl(atanl(x)));
-}
-
-static void
-test_inverse(void)
-{
-	float i;
-
-	for (i = -1; i <= 1; i += 0x1.0p-12f) {
-		testall_tol(sinasin, i, i, 2, i == 0 ? 0 : FE_INEXACT);
-		/* The relative error for cosacos is very large near x=0. */
-		if (fabsf(i) > 0x1.0p-4f)
-			testall_tol(cosacos, i, i, 16, i == 1 ? 0 : FE_INEXACT);
-		testall_tol(tanatan, i, i, 2, i == 0 ? 0 : FE_INEXACT);
-	}
-}
-
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..7\n");
-
-	test_special();
-	printf("ok 1 - special\n");
-
-	test_special_atan2();
-	printf("ok 2 - atan2 special\n");
-
-	test_accuracy();
-	printf("ok 3 - accuracy\n");
-
-	test_p2x_atan2();
-	printf("ok 4 - atan2 p2x\n");
-
-	test_tiny();
-	printf("ok 5 - tiny inputs\n");
-
-	test_atan_huge();
-	printf("ok 6 - atan huge inputs\n");
-
-	test_inverse();
-	printf("ok 7 - inverse\n");
-
-	return (0);
-}
diff --git a/tools/regression/lib/msun/test-invtrig.t b/tools/regression/lib/msun/test-invtrig.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/msun/test-invtrig.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-lround.c b/tools/regression/lib/msun/test-lround.c
deleted file mode 100644
index 2a37367..0000000
--- a/tools/regression/lib/msun/test-lround.c
+++ /dev/null
@@ -1,115 +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.
- */
-
-/*
- * Test for lround(), lroundf(), llround(), and llroundf().
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <assert.h>
-#include <fenv.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-
-/*
- * XXX The volatile here is to avoid gcc's bogus constant folding and work
- *     around the lack of support for the FENV_ACCESS pragma.
- */
-#define	test(func, x, result, excepts)	do {				\
-	volatile double _d = x;						\
-	assert(feclearexcept(FE_ALL_EXCEPT) == 0);			\
-	assert((func)(_d) == (result) || fetestexcept(FE_INVALID));	\
-	assert(fetestexcept(FE_ALL_EXCEPT) == (excepts));		\
-} while (0)
-
-#define	testall(x, result, excepts)	do {				\
-	test(lround, x, result, excepts);				\
-	test(lroundf, x, result, excepts);				\
-	test(llround, x, result, excepts);				\
-	test(llroundf, x, result, excepts);				\
-} while (0)
-
-#define	IGNORE	0
-
-#pragma STDC FENV_ACCESS ON
-
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..1\n");
-
-	testall(0.0, 0, 0);
-	testall(0.25, 0, FE_INEXACT);
-	testall(0.5, 1, FE_INEXACT);
-	testall(-0.5, -1, FE_INEXACT);
-	testall(1.0, 1, 0);
-	testall(0x12345000p0, 0x12345000, 0);
-	testall(0x1234.fp0, 0x1235, FE_INEXACT);
-	testall(INFINITY, IGNORE, FE_INVALID);
-	testall(NAN, IGNORE, FE_INVALID);
-
-#if (LONG_MAX == 0x7fffffffl)
-	test(lround, 0x7fffffff.8p0, IGNORE, FE_INVALID);
-	test(lround, -0x80000000.8p0, IGNORE, FE_INVALID);
-	test(lround, 0x80000000.0p0, IGNORE, FE_INVALID);
-	test(lround, 0x7fffffff.4p0, 0x7fffffffl, FE_INEXACT);
-	test(lround, -0x80000000.4p0, -0x80000000l, FE_INEXACT);
-	test(lroundf, 0x80000000.0p0f, IGNORE, FE_INVALID);
-	test(lroundf, 0x7fffff80.0p0f, 0x7fffff80l, 0);
-#elif (LONG_MAX == 0x7fffffffffffffffll)
-	test(lround, 0x8000000000000000.0p0, IGNORE, FE_INVALID);
-	test(lroundf, 0x8000000000000000.0p0f, IGNORE, FE_INVALID);
-	test(lround, 0x7ffffffffffffc00.0p0, 0x7ffffffffffffc00l, 0);
-	test(lroundf, 0x7fffff8000000000.0p0f, 0x7fffff8000000000l, 0);
-	test(lround, -0x8000000000000800.0p0, IGNORE, FE_INVALID);
-	test(lroundf, -0x8000010000000000.0p0f, IGNORE, FE_INVALID);
-	test(lround, -0x8000000000000000.0p0, -0x8000000000000000l, 0);
-	test(lroundf, -0x8000000000000000.0p0f, -0x8000000000000000l, 0);
-#else
-#error "Unsupported long size"
-#endif
-
-#if (LLONG_MAX == 0x7fffffffffffffffLL)
-	test(llround, 0x8000000000000000.0p0, IGNORE, FE_INVALID);
-	test(llroundf, 0x8000000000000000.0p0f, IGNORE, FE_INVALID);
-	test(llround, 0x7ffffffffffffc00.0p0, 0x7ffffffffffffc00ll, 0);
-	test(llroundf, 0x7fffff8000000000.0p0f, 0x7fffff8000000000ll, 0);
-	test(llround, -0x8000000000000800.0p0, IGNORE, FE_INVALID);
-	test(llroundf, -0x8000010000000000.0p0f, IGNORE, FE_INVALID);
-	test(llround, -0x8000000000000000.0p0, -0x8000000000000000ll, 0);
-	test(llroundf, -0x8000000000000000.0p0f, -0x8000000000000000ll, 0);
-#else
-#error "Unsupported long long size"
-#endif
-
-	printf("ok 1 - lround\n");
-
-	return (0);
-}
diff --git a/tools/regression/lib/msun/test-lround.t b/tools/regression/lib/msun/test-lround.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/msun/test-lround.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-utils.h b/tools/regression/lib/msun/test-utils.h
deleted file mode 100644
index bf0d6de..0000000
--- a/tools/regression/lib/msun/test-utils.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * Copyright (c) 2005-2013 David Schultz <das@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef	_TEST_UTILS_H_
-#define	_TEST_UTILS_H_
-
-#include <complex.h>
-#include <fenv.h>
-
-/*
- * Implementations are permitted to define additional exception flags
- * not specified in the standard, so it is not necessarily true that
- * FE_ALL_EXCEPT == ALL_STD_EXCEPT.
- */
-#define	ALL_STD_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \
-			 FE_OVERFLOW | FE_UNDERFLOW)
-#define	OPT_INVALID	(ALL_STD_EXCEPT & ~FE_INVALID)
-#define	OPT_INEXACT	(ALL_STD_EXCEPT & ~FE_INEXACT)
-#define	FLT_ULP()	ldexpl(1.0, 1 - FLT_MANT_DIG)
-#define	DBL_ULP()	ldexpl(1.0, 1 - DBL_MANT_DIG)
-#define	LDBL_ULP()	ldexpl(1.0, 1 - LDBL_MANT_DIG)
-
-/*
- * Flags that control the behavior of various fpequal* functions.
- * XXX This is messy due to merging various notions of "close enough"
- * that are best suited for different functions.
- *
- * CS_REAL
- * CS_IMAG
- * CS_BOTH
- *   (cfpequal_cs, fpequal_tol, cfpequal_tol) Whether to check the sign of
- *   the real part of the result, the imaginary part, or both.
- *
- * FPE_ABS_ZERO
- *   (fpequal_tol, cfpequal_tol) If set, treats the tolerance as an absolute
- *   tolerance when the expected value is 0.  This is useful when there is
- *   round-off error in the input, e.g., cos(Pi/2) ~= 0.
- */
-#define	CS_REAL		0x01
-#define	CS_IMAG		0x02
-#define	CS_BOTH		(CS_REAL | CS_IMAG)
-#define	FPE_ABS_ZERO	0x04
-
-#ifdef	DEBUG
-#define	debug(...)	printf(__VA_ARGS__)
-#else
-#define	debug(...)	(void)0
-#endif
-
-/*
- * XXX The ancient version of gcc in the base system doesn't support CMPLXL,
- * but we can fake it most of the time.
- */
-#ifndef CMPLXL
-static inline long double complex
-CMPLXL(long double x, long double y)
-{
-	long double complex z;
-
-	__real__ z = x;
-	__imag__ z = y;
-	return (z);
-}
-#endif
-
-/*
- * Compare d1 and d2 using special rules: NaN == NaN and +0 != -0.
- * Fail an assertion if they differ.
- */
-static int
-fpequal(long double d1, long double d2)
-{
-
-	if (d1 != d2)
-		return (isnan(d1) && isnan(d2));
-	return (copysignl(1.0, d1) == copysignl(1.0, d2));
-}
-
-/*
- * Determine whether x and y are equal, with two special rules:
- *	+0.0 != -0.0
- *	 NaN == NaN
- * If checksign is 0, we compare the absolute values instead.
- */
-static int
-fpequal_cs(long double x, long double y, int checksign)
-{
-	if (isnan(x) && isnan(y))
-		return (1);
-	if (checksign)
-		return (x == y && !signbit(x) == !signbit(y));
-	else
-		return (fabsl(x) == fabsl(y));
-}
-
-static int
-fpequal_tol(long double x, long double y, long double tol, unsigned int flags)
-{
-	fenv_t env;
-	int ret;
-
-	if (isnan(x) && isnan(y))
-		return (1);
-	if (!signbit(x) != !signbit(y) && (flags & CS_BOTH))
-		return (0);
-	if (x == y)
-		return (1);
-	if (tol == 0)
-		return (0);
-
-	/* Hard case: need to check the tolerance. */
-	feholdexcept(&env);
-	/*
-	 * For our purposes here, if y=0, we interpret tol as an absolute
-	 * tolerance. This is to account for roundoff in the input, e.g.,
-	 * cos(Pi/2) ~= 0.
-	 */
-	if ((flags & FPE_ABS_ZERO) && y == 0.0)
-		ret = fabsl(x - y) <= fabsl(tol);
-	else
-		ret = fabsl(x - y) <= fabsl(y * tol);
-	fesetenv(&env);
-	return (ret);
-}
-
-static int
-cfpequal(long double complex d1, long double complex d2)
-{
-
-	return (fpequal(creall(d1), creall(d2)) &&
-		fpequal(cimagl(d1), cimagl(d2)));
-}
-
-static int
-cfpequal_cs(long double complex x, long double complex y, int checksign)
-{
-	return (fpequal_cs(creal(x), creal(y), checksign)
-		&& fpequal_cs(cimag(x), cimag(y), checksign));
-}
-
-static int
-cfpequal_tol(long double complex x, long double complex y, long double tol,
-		     unsigned int flags)
-{
-	return (fpequal_tol(creal(x), creal(y), tol, flags)
-		&& fpequal_tol(cimag(x), cimag(y), tol, flags));
-}
-
-#endif /* _TEST_UTILS_H_ */
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
deleted file mode 100644
index aaa060a..0000000
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	test_ugidfw
-LIBADD=	ugidfw
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mac/mac_bsdextended/test_matches.sh b/tools/regression/mac/mac_bsdextended/test_matches.sh
deleted file mode 100644
index 99d6b62..0000000
--- a/tools/regression/mac/mac_bsdextended/test_matches.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-uidrange="60000:100000"
-gidrange="60000:100000"
-uidinrange="nobody"
-uidoutrange="daemon"
-gidinrange="nobody" # We expect $uidinrange in this group
-gidoutrange="daemon" # We expect $uidinrange in this group
-
-playground="/stuff/nobody/" # Must not be on root fs
-
-#
-# Setup
-#
-rm -f $playground/test*
-ugidfw remove 1
-
-file1=$playground/test-$uidinrange
-file2=$playground/test-$uidoutrange
-cat <<EOF> $playground/test-script.pl
-if (open(F, ">" . shift)) { exit 0; } else { exit 1; }
-EOF
-command1="perl $playground/test-script.pl $file1"
-command2="perl $playground/test-script.pl $file2"
-
-echo -n "$uidinrange file: "
-su -m $uidinrange -c "$command1 && echo good"
-chown "$uidinrange":"$gidinrange" $file1
-chmod a+w $file1
-
-echo -n "$uidoutrange file: "
-$command2 && echo good
-chown "$uidoutrange":"$gidoutrange" $file2
-chmod a+w $file2
-
-#
-# No rules
-#
-echo -n "no rules $uidinrange: "
-su -fm $uidinrange -c "$command1 && echo good"
-echo -n "no rules $uidoutrange: "
-su -fm $uidoutrange -c "$command1 && echo good"
-
-#
-# Subject Match on uid
-#
-ugidfw set 1 subject uid $uidrange object mode rasx
-echo -n "subject uid in range: "
-su -fm $uidinrange -c "$command1 || echo good"
-echo -n "subject uid out range: "
-su -fm $uidoutrange -c "$command1 && echo good"
-
-#
-# Subject Match on gid
-#
-ugidfw set 1 subject gid $gidrange object mode rasx
-echo -n "subject gid in range: "
-su -fm $uidinrange -c "$command1 || echo good"
-echo -n "subject gid out range: "
-su -fm $uidoutrange -c "$command1 && echo good"
-
-#
-# Subject Match on jail
-#
-echo -n "subject matching jailid: "
-rm -f $playground/test-jail
-jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 3; touch $playground/test-jail) &"`
-ugidfw set 1 subject jailid $jailid object mode rasx
-sleep 6
-if [ ! -f $playground/test-jail ] ; then echo good ; fi
-
-echo -n "subject nonmatching jailid: "
-rm -f $playground/test-jail
-jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 3; touch $playground/test-jail) &"`
-sleep 6
-if [ -f $playground/test-jail ] ; then echo good ; fi
-
-#
-# Object uid
-#
-ugidfw set 1 subject object uid $uidrange mode rasx
-echo -n "object uid in range: "
-su -fm $uidinrange -c "$command1 || echo good"
-echo -n "object uid out range: "
-su -fm $uidinrange -c "$command2 && echo good"
-ugidfw set 1 subject object uid $uidrange mode rasx
-echo -n "object uid in range (differennt subject): "
-su -fm $uidoutrange -c "$command1 || echo good"
-echo -n "object uid out range (differennt subject): "
-su -fm $uidoutrange -c "$command2 && echo good"
-
-#
-# Object gid
-#
-ugidfw set 1 subject object gid $uidrange mode rasx
-echo -n "object gid in range: "
-su -fm $uidinrange -c "$command1 || echo good"
-echo -n "object gid out range: "
-su -fm $uidinrange -c "$command2 && echo good"
-echo -n "object gid in range (differennt subject): "
-su -fm $uidoutrange -c "$command1 || echo good"
-echo -n "object gid out range (differennt subject): "
-su -fm $uidoutrange -c "$command2 && echo good"
-
-#
-# Object filesys
-#
-ugidfw set 1 subject uid $uidrange object filesys / mode rasx
-echo -n "object out of filesys: "
-su -fm $uidinrange -c "$command1 && echo good"
-ugidfw set 1 subject uid $uidrange object filesys $playground mode rasx
-echo -n "object in filesys: "
-su -fm $uidinrange -c "$command1 || echo good"
-
-#
-# Object suid
-#
-ugidfw set 1 subject uid $uidrange object suid mode rasx
-echo -n "object notsuid: "
-su -fm $uidinrange -c "$command1 && echo good"
-chmod u+s $file1
-echo -n "object suid: "
-su -fm $uidinrange -c "$command1 || echo good"
-chmod u-s $file1
-
-#
-# Object sgid
-#
-ugidfw set 1 subject uid $uidrange object sgid mode rasx
-echo -n "object notsgid: "
-su -fm $uidinrange -c "$command1 && echo good"
-chmod g+s $file1
-echo -n "object sgid: "
-su -fm $uidinrange -c "$command1 || echo good"
-chmod g-s $file1
-
-#
-# Object uid matches subject
-#
-ugidfw set 1 subject uid $uidrange object uid_of_subject mode rasx
-echo -n "object uid notmatches subject: "
-su -fm $uidinrange -c "$command2 && echo good"
-echo -n "object uid matches subject: "
-su -fm $uidinrange -c "$command1 || echo good"
-
-#
-# Object gid matches subject
-#
-ugidfw set 1 subject uid $uidrange object gid_of_subject mode rasx
-echo -n "object gid notmatches subject: "
-su -fm $uidinrange -c "$command2 && echo good"
-echo -n "object gid matches subject: "
-su -fm $uidinrange -c "$command1 || echo good"
-
-#
-# Object type
-#
-ugidfw set 1 subject uid $uidrange object type dbclsp mode rasx
-echo -n "object not type: "
-su -fm $uidinrange -c "$command1 && echo good"
-ugidfw set 1 subject uid $uidrange object type r mode rasx
-echo -n "object type: "
-su -fm $uidinrange -c "$command1 || echo good"
-
diff --git a/tools/regression/mac/mac_bsdextended/test_ugidfw.c b/tools/regression/mac/mac_bsdextended/test_ugidfw.c
deleted file mode 100644
index 63e25f0..0000000
--- a/tools/regression/mac/mac_bsdextended/test_ugidfw.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * Copyright (c) 2005 McAfee, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/mac.h>
-#include <sys/mount.h>
-
-#include <security/mac_bsdextended/mac_bsdextended.h>
-
-#include <err.h>
-#include <grp.h>
-#include <pwd.h>
-#include <ugidfw.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Starting point for a regression test for mac_bsdextended(4) and the
- * supporting libugidfw(3).
- */
-void
-usage(void)
-{
-
-	fprintf(stderr, "test_ugidfw\n");
-	exit(-1);
-}
-
-/*
- * This section of the regression test passes some test cases through the
- * rule<->string routines to confirm they work approximately as desired.
- */
-
-/*
- * List of users and groups we must check exists before we can begin, since
- * they are used in the string test rules.  We use users and groups that will
- * always exist in a default install used for regression testing.
- */
-static const char *test_users[] = {
-	"root",
-	"daemon",
-	"operator",
-	"bin",
-};
-static const int test_users_len = sizeof(test_users) / sizeof(char *);
-
-static const char *test_groups[] = {
-	"wheel",
-	"daemon",
-	"operator",
-	"bin",
-};
-static const int test_groups_len = sizeof(test_groups) / sizeof(char *);
-
-/*
- * List of test strings that must go in (and come out) of libugidfw intact.
- */
-static const char *test_strings[] = {
-	/* Variations on subject and object uids. */
-	"subject uid root object uid root mode n",
-	"subject uid root object uid daemon mode n",
-	"subject uid daemon object uid root mode n",
-	"subject uid daemon object uid daemon mode n",
-	/* Variations on mode. */
-	"subject uid root object uid root mode a",
-	"subject uid root object uid root mode r",
-	"subject uid root object uid root mode s",
-	"subject uid root object uid root mode w",
-	"subject uid root object uid root mode x",
-	"subject uid root object uid root mode arswx",
-	/* Variations on subject and object gids. */
-	"subject gid wheel object gid wheel mode n",
-	"subject gid wheel object gid daemon mode n",
-	"subject gid daemon object gid wheel mode n",
-	"subject gid daemon object gid daemon mode n",
-	/* Subject uids and subject gids. */
-	"subject uid bin gid daemon object uid operator gid wheel mode n",
-	/* Not */
-	"subject not uid operator object uid bin mode n",
-	"subject uid bin object not uid operator mode n",
-	"subject not uid daemon object not uid operator mode n",
-	/* Ranges */
-	"subject uid root:operator object gid wheel:bin mode n",
-	/* Jail ID */
-	"subject jailid 1 object uid root mode n",
-	/* Filesys */
-	"subject uid root object filesys / mode n",
-	"subject uid root object filesys /dev mode n",
-	/* S/UGID */
-	"subject not uid root object sgid mode n",
-	"subject not uid root object sgid mode n",
-	/* Matching uid/gid */
-	"subject not uid root:operator object not uid_of_subject mode n",
-	"subject not gid wheel:bin object not gid_of_subject mode n",
-	/* Object types */
-	"subject uid root object type a mode a",
-	"subject uid root object type r mode a",
-	"subject uid root object type d mode a",
-	"subject uid root object type b mode a",
-	"subject uid root object type c mode a",
-	"subject uid root object type l mode a",
-	"subject uid root object type s mode a",
-	"subject uid root object type rbc mode a",
-	"subject uid root object type dls mode a",
-	/* Empty rules always match */
-	"subject object mode a",
-	/* Partial negations */
-	"subject ! uid root object mode n",
-	"subject ! gid wheel object mode n",
-	"subject ! jailid 2 object mode n",
-	"subject object ! uid root mode n",
-	"subject object ! gid wheel mode n",
-	"subject object ! filesys / mode n",
-	"subject object ! suid mode n",
-	"subject object ! sgid mode n",
-	"subject object ! uid_of_subject mode n",
-	"subject object ! gid_of_subject mode n",
-	"subject object ! type d mode n",
-	/* All out nonsense */
-	"subject uid root ! gid wheel:bin ! jailid 1 "
-	    "object ! uid root:daemon gid daemon filesys / suid sgid uid_of_subject gid_of_subject ! type r "
-	    "mode rsx",
-};
-static const int test_strings_len = sizeof(test_strings) / sizeof(char *);
-
-static void
-test_libugidfw_strings(void)
-{
-	struct mac_bsdextended_rule rule;
-	char errorstr[256];
-	char rulestr[256];
-	int i, error;
-
-	for (i = 0; i < test_users_len; i++) {
-		if (getpwnam(test_users[i]) == NULL)
-			err(-1, "test_libugidfw_strings: getpwnam: %s",
-			    test_users[i]);
-	}
-
-	for (i = 0; i < test_groups_len; i++) {
-		if (getgrnam(test_groups[i]) == NULL)
-			err(-1, "test_libugidfw_strings: getgrnam: %s",
-			    test_groups[i]);
-	}
-
-	for (i = 0; i < test_strings_len; i++) {
-		error = bsde_parse_rule_string(test_strings[i], &rule,
-		    sizeof(errorstr), errorstr);
-		if (error == -1)
-			errx(-1, "bsde_parse_rule_string: '%s' (%d): %s",
-			    test_strings[i], i, errorstr);
-		error = bsde_rule_to_string(&rule, rulestr, sizeof(rulestr));
-		if (error < 0)
-			errx(-1, "bsde_rule_to_string: rule for '%s' "
-			    "returned %d", test_strings[i], error);
-
-		if (strcmp(test_strings[i], rulestr) != 0)
-			errx(-1, "test_libugidfw: '%s' in, '%s' out",
-			    test_strings[i], rulestr);
-	}
-}
-
-int
-main(int argc, char *argv[])
-{
-	char errorstr[256];
-	int count, slots;
-
-	if (argc != 1)
-		usage();
-
-	/* Print an error if a non-root user attemps to run the tests. */
-	if (getuid() != 0) {
-		fprintf(stderr, "Error!  Only root may run this utility\n");
-		return (EXIT_FAILURE);
-	}
-
-	/*
-	 * We can test some parts of the library without the MAC Framework
-	 * and policy loaded, so run those tests before calling
-	 * mac_is_present().
-	 */
-	test_libugidfw_strings();
-
-	switch (mac_is_present("bsdextended")) {
-	case -1:
-		err(-1, "mac_is_present");
-	case 1:
-		break;
-	case 0:
-	default:
-		errx(-1, "mac_bsdextended not loaded");
-	}
-
-	/*
-	 * Some simple up-front checks to see if we're able to query the
-	 * policy for basic state.  We want the rule count to be 0 before
-	 * starting, but "slots" is a property of prior runs and so we ignore
-	 * the return value.
-	 */
-	count = bsde_get_rule_count(sizeof(errorstr), errorstr);
-	if (count == -1)
-		errx(-1, "bsde_get_rule_count: %s", errorstr);
-	if (count != 0)
-		errx(-1, "bsde_get_rule_count: %d rules", count);
-
-	slots = bsde_get_rule_slots(sizeof(errorstr), errorstr);
-	if (slots == -1)
-		errx(-1, "bsde_get_rule_slots: %s", errorstr);
-
-	return (0);
-}
diff --git a/tools/regression/mac/mac_portacl/LICENSE b/tools/regression/mac/mac_portacl/LICENSE
deleted file mode 100644
index c95c149..0000000
--- a/tools/regression/mac/mac_portacl/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-$FreeBSD$
-
-License for all mac_portacl regression tests:
-
-Copyright (c) 2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/tools/regression/mac/mac_portacl/misc.sh b/tools/regression/mac/mac_portacl/misc.sh
deleted file mode 100755
index a1f152b..0000000
--- a/tools/regression/mac/mac_portacl/misc.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-sysctl security.mac.portacl >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-	echo "1..0 # SKIP MAC_PORTACL is unavailable."
-	exit 0
-fi
-
-ntest=1
-
-check_bind() {
-	idtype=${1}
-	name=${2}
-	proto=${3}
-	port=${4}
-
-	[ "${proto}" = "udp" ] && udpflag="-u"
-
-	out=`(
-		case "${idtype}" in
-		uid|gid)
-			( echo -n | su -m ${name} -c "nc ${udpflag} -o -l 127.0.0.1 $port" 2>&1 ) &
-			;;
-		jail)
-			kill $$
-			;;
-		*)
-			kill $$
-		esac
-		sleep 0.3
-		echo | nc ${udpflag} -o 127.0.0.1 $port >/dev/null 2>&1
-		wait
-	)`
-	case "${out}" in
-	"nc: Permission denied"*|"nc: Operation not permitted"*)
-		echo fl
-		;;
-	"")
-		echo ok
-		;;
-	*)
-		echo ${out}
-		;;
-	esac
-}
-
-bind_test() {
-	expect_without_rule=${1}
-	expect_with_rule=${2}
-	idtype=${3}
-	name=${4}
-	proto=${5}
-	port=${6}
-
-	sysctl security.mac.portacl.rules= >/dev/null
-	out=`check_bind ${idtype} ${name} ${proto} ${port}`
-	if [ "${out}" = "${expect_without_rule}" ]; then
-		echo "ok ${ntest}"
-	elif [ "${out}" = "ok" -o "${out}" = "fl" ]; then
-		echo "not ok ${ntest}"
-	else
-		echo "not ok ${ntest} # ${out}"
-	fi
-	ntest=$((ntest+1))
-
-	if [ "${idtype}" = "uid" ]; then
-		idstr=`id -u ${name}`
-	elif [ "${idtype}" = "gid" ]; then
-		idstr=`id -g ${name}`
-	else
-		idstr=${name}
-	fi
-	sysctl security.mac.portacl.rules=${idtype}:${idstr}:${proto}:${port} >/dev/null
-	out=`check_bind ${idtype} ${name} ${proto} ${port}`
-	if [ "${out}" = "${expect_with_rule}" ]; then
-		echo "ok ${ntest}"
-	elif [ "${out}" = "ok" -o "${out}" = "fl" ]; then
-		echo "not ok ${ntest}"
-	else
-		echo "not ok ${ntest} # ${out}"
-	fi
-	ntest=$((ntest+1))
-
-	sysctl security.mac.portacl.rules= >/dev/null
-}
-
-reserved_high=`sysctl -n net.inet.ip.portrange.reservedhigh`
-suser_exempt=`sysctl -n security.mac.portacl.suser_exempt`
-port_high=`sysctl -n security.mac.portacl.port_high`
-
-restore_settings() {
-	sysctl -n net.inet.ip.portrange.reservedhigh=${reserved_high} >/dev/null
-	sysctl -n security.mac.portacl.suser_exempt=${suser_exempt} >/dev/null
-	sysctl -n security.mac.portacl.port_high=${port_high} >/dev/null
-}
diff --git a/tools/regression/mac/mac_portacl/nobody.t b/tools/regression/mac/mac_portacl/nobody.t
deleted file mode 100755
index c0754eb..0000000
--- a/tools/regression/mac/mac_portacl/nobody.t
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-dir=`dirname $0`
-. ${dir}/misc.sh
-
-echo "1..64"
-
-# security.mac.portacl.suser_exempt value doesn't affect unprivileged users
-# behaviour.
-# mac_portacl has no impact on ports <= net.inet.ip.portrange.reservedhigh.
-
-sysctl security.mac.portacl.suser_exempt=1 >/dev/null
-sysctl net.inet.ip.portrange.reservedhigh=78 >/dev/null
-
-bind_test fl fl uid nobody tcp 77
-bind_test ok ok uid nobody tcp 7777
-bind_test fl fl uid nobody udp 77
-bind_test ok ok uid nobody udp 7777
-
-bind_test fl fl gid nobody tcp 77
-bind_test ok ok gid nobody tcp 7777
-bind_test fl fl gid nobody udp 77
-bind_test ok ok gid nobody udp 7777
-
-sysctl security.mac.portacl.suser_exempt=0 >/dev/null
-
-bind_test fl fl uid nobody tcp 77
-bind_test ok ok uid nobody tcp 7777
-bind_test fl fl uid nobody udp 77
-bind_test ok ok uid nobody udp 7777
-
-bind_test fl fl gid nobody tcp 77
-bind_test ok ok gid nobody tcp 7777
-bind_test fl fl gid nobody udp 77
-bind_test ok ok gid nobody udp 7777
-
-# Verify if security.mac.portacl.port_high works.
-
-sysctl security.mac.portacl.port_high=7778 >/dev/null
-
-bind_test fl fl uid nobody tcp 77
-bind_test fl ok uid nobody tcp 7777
-bind_test fl fl uid nobody udp 77
-bind_test fl ok uid nobody udp 7777
-
-bind_test fl fl gid nobody tcp 77
-bind_test fl ok gid nobody tcp 7777
-bind_test fl fl gid nobody udp 77
-bind_test fl ok gid nobody udp 7777
-
-# Verify if mac_portacl rules work.
-
-sysctl net.inet.ip.portrange.reservedhigh=76 >/dev/null
-sysctl security.mac.portacl.port_high=7776 >/dev/null
-
-bind_test fl ok uid nobody tcp 77
-bind_test ok ok uid nobody tcp 7777
-bind_test fl ok uid nobody udp 77
-bind_test ok ok uid nobody udp 7777
-
-bind_test fl ok gid nobody tcp 77
-bind_test ok ok gid nobody tcp 7777
-bind_test fl ok gid nobody udp 77
-bind_test ok ok gid nobody udp 7777
-
-restore_settings
diff --git a/tools/regression/mac/mac_portacl/root.t b/tools/regression/mac/mac_portacl/root.t
deleted file mode 100755
index 626bdfa..0000000
--- a/tools/regression/mac/mac_portacl/root.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-dir=`dirname $0`
-. ${dir}/misc.sh
-
-echo "1..48"
-
-# Verify if security.mac.portacl.suser_exempt=1 really exempts super-user.
-
-sysctl security.mac.portacl.suser_exempt=1 >/dev/null
-
-bind_test ok ok uid root tcp 77
-bind_test ok ok uid root tcp 7777
-bind_test ok ok uid root udp 77
-bind_test ok ok uid root udp 7777
-
-bind_test ok ok gid root tcp 77
-bind_test ok ok gid root tcp 7777
-bind_test ok ok gid root udp 77
-bind_test ok ok gid root udp 7777
-
-# Verify if security.mac.portacl.suser_exempt=0 really doesn't exempt super-user.
-
-sysctl security.mac.portacl.suser_exempt=0 >/dev/null
-
-bind_test fl ok uid root tcp 77
-bind_test ok ok uid root tcp 7777
-bind_test fl ok uid root udp 77
-bind_test ok ok uid root udp 7777
-
-bind_test fl ok gid root tcp 77
-bind_test ok ok gid root tcp 7777
-bind_test fl ok gid root udp 77
-bind_test ok ok gid root udp 7777
-
-# Verify if security.mac.portacl.port_high works for super-user.
-
-sysctl security.mac.portacl.port_high=7778 >/dev/null
-
-bind_test fl ok uid root tcp 77
-bind_test fl ok uid root tcp 7777
-bind_test fl ok uid root udp 77
-bind_test fl ok uid root udp 7777
-
-bind_test fl ok gid root tcp 77
-bind_test fl ok gid root tcp 7777
-bind_test fl ok gid root udp 77
-bind_test fl ok gid root udp 7777
-
-restore_settings
diff --git a/tools/regression/sockets/unix_passfd/unix_passfd.c b/tools/regression/sockets/unix_passfd/unix_passfd.c
index 07ef589..59c4c29 100644
--- a/tools/regression/sockets/unix_passfd/unix_passfd.c
+++ b/tools/regression/sockets/unix_passfd/unix_passfd.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2005 Robert N. M. Watson
+ * Copyright (c) 2015 Mark Johnston
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,7 +147,7 @@ sendfd_payload(const char *test, int sockfd, int sendfd,
 static void
 sendfd(const char *test, int sockfd, int sendfd)
 {
-	char ch;
+	char ch = 0;
 
 	return (sendfd_payload(test, sockfd, sendfd, &ch, sizeof(ch)));
 }
@@ -199,7 +200,7 @@ recvfd_payload(const char *test, int sockfd, int *recvfd,
 static void
 recvfd(const char *test, int sockfd, int *recvfd)
 {
-	char ch;
+	char ch = 0;
 
 	return (recvfd_payload(test, sockfd, recvfd, &ch, sizeof(ch)));
 }
@@ -369,8 +370,8 @@ main(void)
 			err(-1, "%s: sysctlbyname(net.local.stream.sendspace)",
 			    test);
 
-		if ((buf = malloc(sendspace)) == NULL)
-			err(-1, "%s: malloc", test);
+		if ((buf = calloc(1, sendspace)) == NULL)
+			err(-1, "%s: calloc", test);
 
 		domainsocketpair(test, fd);
 		if (setsockopt(fd[1], 0, LOCAL_CREDS, &on, sizeof(on)) < 0)
@@ -384,6 +385,6 @@ main(void)
 	}
 
 	printf("%s passed\n", test);
-	
+
 	return (0);
 }
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index d26cb2e..fae7c91 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -67,6 +67,7 @@ my %callback = (
 	mdorder => \&callback_mdorder,
 	altmon => \&callback_altmon,
 	cformat => \&callback_cformat,
+	dtformat => \&callback_dtformat,
 	cbabmon => \&callback_abmon,
 	data => undef,
 );
@@ -184,7 +185,7 @@ if ($TYPE eq "timedef") {
 	    "c_fmt"		=> "<cformat<d_t_fmt<s",
 	    "am_pm"		=> "as",
 	    "d_fmt"		=> "s",
-	    "d_t_fmt"		=> "s",
+	    "d_t_fmt"		=> "<dtformat<d_t_fmt<s",
 	    "altmon"		=> "<altmon<mon<as",
 	    "md_order"		=> "<mdorder<d_fmt<s",
 	    "t_fmt_ampm"	=> "s",
@@ -201,6 +202,16 @@ sub callback_cformat {
  	return $s;
 };
 
+sub callback_dtformat {
+ 	my $s = shift;
+	my $nl = $callback{data}{l} . "_" . $callback{data}{c};
+
+	if ($nl eq 'ja_JP') {
+	    $s =~ s/(> )(%H)/$1%A $2/;
+	}
+	return $s;
+};
+
 sub callback_mdorder {
 	my $s = shift;
 	return undef if (!defined $s);
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
index 0a79b6a..6347911 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -86,7 +86,7 @@ NANO_CFG_BASE=$(pwd)
 NANO_CFG_BASE=$(realpath ${NANO_CFG_BASE}/..)
 NANO_SRC=$(realpath ${NANO_CFG_BASE}/../../..)
 #### XXX share obj 
-NANO_OBJ=$(realpath ${NANO_SRC}/../$NANO_NAME/obj)
+NANO_OBJ=${NANO_SRC}/../$NANO_NAME/obj
 # Where cust_pkg() finds packages to install
 #XXX: Is this the right place?
 #NANO_PORTS=$(realpath ${NANO_SRC}/../ports)
@@ -100,21 +100,22 @@ unset MAKEOBJDIRPREFIX
 NANO_PORTS=${NANO_PORTS:-/usr/ports}
 
 mkdir -p ${NANO_OBJ}
+NANO_OBJ=$(realpath ${NANO_OBJ})
+
+NANO_FAT_DIR=${NANO_OBJ}/_.fat
 
 customize_cmd cust_allow_ssh_root
 
-add_etc_make_conf()
-{
+add_etc_make_conf ( ) (
 	touch ${NANO_WORLDDIR}/etc/make.conf
-}
+)
 customize_cmd add_etc_make_conf
 
-cust_install_machine_files()
-{
+cust_install_machine_files ( ) (
 	echo "cd ${NANO_CFG_BASE}/Files"
 	cd ${NANO_CFG_BASE}/Files
 	find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -dumpv ${NANO_WORLDDIR}
-}
+)
 customize_cmd cust_install_files
 customize_cmd cust_install_machine_files 
 
@@ -178,8 +179,7 @@ WITHOUT_RCS=true
 NANO_PACKAGE_ONLY=1
 
 # install a package from a pre-built binary
-do_add_pkg ()
-{
+do_add_pkg ( ) (
 	# Need to create ${NANO_OBJ}/ports in this add_pkg_${port} function
 	set -x
 	mkdir -p ${NANO_OBJ}/ports/distfiles
@@ -197,11 +197,10 @@ do_add_pkg ()
 	rmdir ${NANO_WORLDDIR}/usr/ports/distfiles
 	rmdir ${NANO_WORLDDIR}/usr/ports
 	set +x
-}
+)
 
 # Build a port (with the side effect of creating a package)
-do_add_port ()
-{
+do_add_port ( ) (
 	local port_path
 	port_path=$1
 	shift
@@ -242,11 +241,12 @@ do_add_port ()
 	umount ${NANO_WORLDDIR}/usr/ports
 	umount ${NANO_WORLDDIR}/usr/src
 	set +x
-}
+)
 
 # Need to check if this function works with cross-compiling architecture!!!!
 # Recursive complex fonction: Generate one function for each ports
-add_port () {
+# writes shell functions called later, so don't do in subshell.
+add_port ( ) {
     local port_path=$1
     local port=`echo $1 | sed -e 's/\//_/'`
     shift
@@ -259,7 +259,7 @@ add_port () {
     if [ -f ${NANO_OBJ}/ports/packages/All/${PKG_NAME}.txz ]; then
 	# Pkg file found: Generate add_pkg_NAME function
 	eval "
-	    add_pkg_${port} () {
+	    add_pkg_${port} ( ) {
 	        do_add_pkg ${PKG_NAME}
 	    }
             customize_cmd add_pkg_${port}
@@ -267,7 +267,7 @@ add_port () {
     else
 	# No pkg file: Generate add_port_NAME function
         eval "
-            add_port_${port} () {
+            add_port_${port} ( ) {
 	        do_add_port ${port_path} $*
 	    }
 	    customize_cmd add_port_${port}
@@ -297,12 +297,15 @@ create_diskimage_mbr ( ) (
 	done
 
 	# Populate the FAT partition, if needed
-	if [-n "${NANO_SLICE_FAT}" ]; then
+	if [ -n "${NANO_SLICE_FAT}" ]; then
 		echo Creating MSDOS partition for kernel
 		newfs_msdos -C ${NANO_SLICE_FAT_SIZE} -F 16 -L ${NANO_NAME} \
 			${NANO_OBJ}/_.${NANO_SLICE_FAT}
-		# Need to copy files from ${NANO_FATDIR} with mtools, or use
-		# makefs -t msdos once that's supported
+		if [ -d ${NANO_FAT_DIR} ]; then
+			# Need to copy files from ${NANO_FATDIR} with mtools, or use
+			# makefs -t msdos once that's supported
+			mcopy -i ${NANO_OBJ}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* ::
+		fi
 	fi
 
 	# Populate the Powerpc boot image, if needed
@@ -323,7 +326,7 @@ create_diskimage_mbr ( ) (
 	if [ -z "${NANO_CFGDIR}" ]; then
 		echo "Faking cfg dir, it's empty"
 		NANO_CFGDIR=${NANO_OBJ}/_.empty
-		mkdir ${NANO_CFGDIR}
+		mkdir -p ${NANO_CFGDIR}
 	fi
 	# XXX -F cfg-mtree
 	eval "${NANO_MAKEFS_UFS}" -s ${NANO_SLICE_CFG_SIZE} \
@@ -371,8 +374,7 @@ create_diskimage_mbr ( ) (
 	) > ${NANO_OBJ}/_.di 2>&1
 )
 
-die()
-{
+die( ) {
 	echo "$*"
 	exit 1
 }
@@ -429,19 +431,35 @@ $var=$val"
 	fi
 done
 
-save_build ( )
-{
+typical_embedded ( ) (
+	# Need to create rc.conf before we copy over /etc to /conf/base/etc
+	# so now's a good time.
+
+	local rc=${NANO_WORLDDIR}/etc/rc.conf
+
+	echo "hostname=nanobsd-${NANO_NAME}" > $rc
+	echo "growfs_enable=YES" >> $rc
+	echo "growfs_type=nanobsd-pingpong" >> $rc
+	echo "ntpdate_enable=YES" >> $rc
+	echo "ifconfig_DEFAULT=DHCP" >> $rc
+	echo "ntpdate_hosts='0.freebsd.pool.ntp.org 1.freebsd.pool.ntp.org'" >> $rc
+	# Make sure that firstboot scripts run so growfs works.
+	# Note: still some issues remvoing this XXX
+	touch ${NANO_WORLDDIR}/firstboot
+)
+customize_cmd typical_embedded
+
+save_build ( ) (
 	VERSION_FILE=${NANO_WORLDDIR}/etc/version
 	if [ "${SVNREVISION}" = "${REVISION}" ]; then
 		echo "${NANO_NAME}" > "${VERSION_FILE}"
 	else
 		echo "${NANO_NAME} (${SVNREVISION})" > "${VERSION_FILE}"
 	fi
-}
+)
 customize_cmd save_build
 
-shrink_md_fbsize()
-{
+shrink_md_fbsize ( ) (
 	# We have a lot of little files on our memory disks. Let's decrease
 	# the block and frag size to fit more little files on them (this
 	# halves our space requirement by ~50% on /etc and /var on 8.x --
@@ -449,13 +467,48 @@ shrink_md_fbsize()
 	# are 4 times larger).
 	sed -i '' -e 's,-S -i 4096,-S -i 4096 -b 4096 -f 512,' \
 		${NANO_WORLDDIR}/etc/rc.initdiskless
-}
+)
 customize_cmd shrink_md_fbsize
 
 customize_cmd cust_comconsole
 
-product_custom()
-{
+dos_boot_part ( ) (
+	local d=/usr/local/share/u-boot/${NANO_BOOT_PKG}
+	local f=${NANO_FAT_DIR}
+
+	# For now, just copy all the files. However, for iMX6 and Allwinner,
+	# we'll need to put a special boot block at a fixed location
+	# on the disk as well.
+	rm -rf $f
+	mkdir $f
+	chdir $f
+	cp ${d}/* .
+
+	# Also copy ubldr. u-boot will load it and it will load the kernel
+	# from the ufs partition
+	cp ${NANO_WORLDDIR}/boot/ubldr .
+	cp ${NANO_WORLDDIR}/boot/ubldr.bin .
+
+	# We have to touch the saveenv file
+	touch uEnv.txt
+
+	# Now we need to copy over dtb files from the build.
+	cp ${NANO_WORLDDIR}/boot/dtb/*.dtb .
+)
+
+if [ -n "$NANO_BOOT_PKG" ]; then
+	if [ ! -d ${d} ]; then
+		echo ${NANO_BOOT_PKG} not installed. Sadly, it must be.
+		exit 1
+	fi
+	if [ ! -x /usr/local/bin/mcopy ]; then
+		echo mtools not installed. Sadly, we gotta have it.
+		exit 1
+	fi
+	customize_cmd dos_boot_part
+fi
+
+product_custom ( ) (
 	# not quie ready to tweak these in nopriv build
 	if [ -z ${NANO_NOPRIV_BUILD} ]; then
 		# Last second tweaks -- generally not needed
@@ -467,7 +520,7 @@ product_custom()
 		chown root:wheel ${NANO_WORLDDIR}/
 		chown root:wheel ${NANO_WORLDDIR}/usr
 	fi
-}
+)
 late_customize_cmd product_custom
 
 #
@@ -478,7 +531,8 @@ late_customize_cmd product_custom
 # For each architecture, we have a standard set of settings to the extent
 # it makes sense. For architectures that don't have a standard environment
 # cfg files need to either define a lot of settings, provide their own disk
-# imaging, or set which of the variants we support.
+# imaging, or set which of the variants we support. No subshells, since we
+# set global variables
 #
 
 std_aarch64 ( ) {
diff --git a/tools/tools/nanobsd/embedded/rpi2.cfg b/tools/tools/nanobsd/embedded/rpi2.cfg
index 8415e35..233f3f4 100644
--- a/tools/tools/nanobsd/embedded/rpi2.cfg
+++ b/tools/tools/nanobsd/embedded/rpi2.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=RPI2
 NANO_DRIVE=mmcsd0
 NANO_NAME=rpi2
 NANO_BOOT_PKG=u-boot-rpi2
-NANO_CPUTYPE=cortex-a7
+# NANO_CPUTYPE=cortex-a7
 
 . common	# Pull in common definitions, keep last