From 9c310a16d768c7e42572fcdbeef5e96f3e6ed62e Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Wed, 13 May 2015 11:32:55 +0000
Subject: MFC r282057,r282092,r282106:

r282057:

Build/install libc, librt, libthr, and msun NetBSD test suites on all
architectures

r282092 (by andrew):

Correct the spelling of MACHINE_CPUARCH, MACHINE_CPU is not set on arm64.

r282106:

Remove per-architecture checks for enabling HAVE_FENV_H

The conditional came from NetBSD, where only select architectures have this
header/support

All architectures on FreeBSD have the necessary support though, so the
conditional's completely unnecessary

make tinderbox done on all architectures (including arm64, where the issue
occurred before) this time
---
 lib/librt/Makefile       | 4 +++-
 lib/librt/Makefile.amd64 | 6 ------
 lib/librt/Makefile.i386  | 6 ------
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 lib/librt/Makefile.amd64
 delete mode 100644 lib/librt/Makefile.i386

(limited to 'lib/librt')

diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index a2b7c5b..b37188d 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -20,6 +20,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 dd0f5b0..0000000
--- 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 dd0f5b0..0000000
--- a/lib/librt/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
-- 
cgit v1.1