From 1119ece4d355e7995ed360f4e7d1e61a1f428046 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 27 Apr 2015 06:49:27 +0000
Subject: [PATCH] Build/install libc, librt, libthr, and msun NetBSD test
 suites on all architectures

MFC after: 1 week
---
 lib/libc/Makefile         | 4 +++-
 lib/libc/Makefile.amd64   | 6 ------
 lib/libc/Makefile.i386    | 6 ------
 lib/librt/Makefile        | 4 +++-
 lib/librt/Makefile.amd64  | 6 ------
 lib/librt/Makefile.i386   | 6 ------
 lib/libthr/Makefile       | 4 +++-
 lib/libthr/Makefile.amd64 | 6 ------
 lib/libthr/Makefile.i386  | 6 ------
 lib/msun/Makefile         | 4 +++-
 lib/msun/Makefile.amd64   | 6 ------
 lib/msun/Makefile.i386    | 6 ------
 12 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 lib/libc/Makefile.amd64
 delete mode 100644 lib/libc/Makefile.i386
 delete mode 100644 lib/librt/Makefile.amd64
 delete mode 100644 lib/librt/Makefile.i386
 delete mode 100644 lib/libthr/Makefile.amd64
 delete mode 100644 lib/libthr/Makefile.i386
 delete mode 100644 lib/msun/Makefile.amd64
 delete mode 100644 lib/msun/Makefile.i386

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 8e0db62504c..93ab138dba9 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -157,7 +157,9 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
 	${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
 
diff --git a/lib/libc/Makefile.amd64 b/lib/libc/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/libc/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libc/Makefile.i386 b/lib/libc/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/libc/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index 36296101a6f..5696610a2b5 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -19,6 +19,8 @@ PRECIOUSLIB=
 
 VERSION_MAP=	${.CURDIR}/Version.map
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/librt/Makefile.amd64 b/lib/librt/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/librt/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/librt/Makefile.i386 b/lib/librt/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/librt/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 0770d062532..17176729b2e 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -61,6 +61,8 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
 SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/libthr/Makefile.amd64 b/lib/libthr/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/libthr/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libthr/Makefile.i386 b/lib/libthr/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/libthr/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index aee0f2d0331..5cb629213a7 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -221,6 +221,8 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
 
 .include <src.opts.mk>
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/msun/Makefile.amd64 b/lib/msun/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/msun/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/msun/Makefile.i386 b/lib/msun/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2..00000000000
--- a/lib/msun/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-