svn commit: r282854 - in stable/10/lib: libc librt libthr msun msun/tests

[Garrett Cooper]

Author: ngie
Date: Wed May 13 11:32:55 2015
New Revision: 282854
URL: https://svnweb.freebsd.org/changeset/base/282854

Log:
  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

Deleted:
  stable/10/lib/libc/Makefile.amd64
  stable/10/lib/libc/Makefile.i386
  stable/10/lib/librt/Makefile.amd64
  stable/10/lib/librt/Makefile.i386
  stable/10/lib/libthr/Makefile.amd64
  stable/10/lib/libthr/Makefile.i386
  stable/10/lib/msun/Makefile.amd64
  stable/10/lib/msun/Makefile.i386
Modified:
  stable/10/lib/libc/Makefile
  stable/10/lib/librt/Makefile
  stable/10/lib/libthr/Makefile
  stable/10/lib/msun/Makefile
  stable/10/lib/msun/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/Makefile
==============================================================================
--- stable/10/lib/libc/Makefile	Wed May 13 11:12:06 2015	(r282853)
+++ stable/10/lib/libc/Makefile	Wed May 13 11:32:55 2015	(r282854)
@@ -160,7 +160,9 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
 CFLAGS+=-DSYSCALL_COMPAT
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
 

Modified: stable/10/lib/librt/Makefile
==============================================================================
--- stable/10/lib/librt/Makefile	Wed May 13 11:12:06 2015	(r282853)
+++ stable/10/lib/librt/Makefile	Wed May 13 11:32:55 2015	(r282854)
@@ -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>

Modified: stable/10/lib/libthr/Makefile
==============================================================================
--- stable/10/lib/libthr/Makefile	Wed May 13 11:12:06 2015	(r282853)
+++ stable/10/lib/libthr/Makefile	Wed May 13 11:32:55 2015	(r282854)
@@ -63,6 +63,8 @@ SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpth
 CFLAGS+=-DSYSCALL_COMPAT
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>

Modified: stable/10/lib/msun/Makefile
==============================================================================
--- stable/10/lib/msun/Makefile	Wed May 13 11:12:06 2015	(r282853)
+++ stable/10/lib/msun/Makefile	Wed May 13 11:32:55 2015	(r282854)
@@ -219,6 +219,8 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.
 
 .include <bsd.own.mk>
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>

Modified: stable/10/lib/msun/tests/Makefile
==============================================================================
--- stable/10/lib/msun/tests/Makefile	Wed May 13 11:12:06 2015	(r282853)
+++ stable/10/lib/msun/tests/Makefile	Wed May 13 11:32:55 2015	(r282854)
@@ -6,11 +6,8 @@ TESTSRC=	${SRCTOP}/contrib/netbsd-tests/
 
 TESTSDIR=	${TESTSBASE}/lib/msun
 
-.if ${MACHINE} == "sparc" || ${MACHINE} == "i386" \
-	|| ${MACHINE} == "amd64" || ${MACHINE_CPU} == "arm"	\
-	|| ${MACHINE} == "sparc64"
+# All architectures on FreeBSD have fenv.h
 CFLAGS+=	-DHAVE_FENV_H
-.endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 CFLAGS+=	-D__HAVE_LONG_DOUBLE