diff options
author | ngie <ngie@FreeBSD.org> | 2015-05-13 11:32:55 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-05-13 11:32:55 +0000 |
commit | 9c310a16d768c7e42572fcdbeef5e96f3e6ed62e (patch) | |
tree | 3b74555abdc322fda963f516facb55679ccc33e3 | |
parent | 8071140ed5634ae2c5fbfc741e59327f45e53ff1 (diff) | |
download | FreeBSD-src-9c310a16d768c7e42572fcdbeef5e96f3e6ed62e.zip FreeBSD-src-9c310a16d768c7e42572fcdbeef5e96f3e6ed62e.tar.gz |
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
-rw-r--r-- | lib/libc/Makefile | 4 | ||||
-rw-r--r-- | lib/libc/Makefile.amd64 | 6 | ||||
-rw-r--r-- | lib/libc/Makefile.i386 | 6 | ||||
-rw-r--r-- | lib/librt/Makefile | 4 | ||||
-rw-r--r-- | lib/librt/Makefile.amd64 | 6 | ||||
-rw-r--r-- | lib/librt/Makefile.i386 | 6 | ||||
-rw-r--r-- | lib/libthr/Makefile | 4 | ||||
-rw-r--r-- | lib/libthr/Makefile.amd64 | 6 | ||||
-rw-r--r-- | lib/libthr/Makefile.i386 | 6 | ||||
-rw-r--r-- | lib/msun/Makefile | 4 | ||||
-rw-r--r-- | lib/msun/Makefile.amd64 | 6 | ||||
-rw-r--r-- | lib/msun/Makefile.i386 | 6 | ||||
-rw-r--r-- | lib/msun/tests/Makefile | 5 |
13 files changed, 13 insertions, 56 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 361d7f4..5a2995e 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -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> diff --git a/lib/libc/Makefile.amd64 b/lib/libc/Makefile.amd64 deleted file mode 100644 index dd0f5b0..0000000 --- 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 dd0f5b0..0000000 --- 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 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 - diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 05bf941..51fa291 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -63,6 +63,8 @@ SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a CFLAGS+=-DSYSCALL_COMPAT .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 dd0f5b0..0000000 --- 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 dd0f5b0..0000000 --- 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 71af606..4473623 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -219,6 +219,8 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3 .include <bsd.own.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 dd0f5b0..0000000 --- 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 dd0f5b0..0000000 --- a/lib/msun/Makefile.i386 +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile index 4261e48..7199ea7 100644 --- a/lib/msun/tests/Makefile +++ b/lib/msun/tests/Makefile @@ -6,11 +6,8 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm 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 |