svn commit: r274582 - head/tools/regression/lib/libc/gen
Author: ngie Date: Sun Nov 16 07:58:06 2014 New Revision: 274582 URL: https://svnweb.freebsd.org/changeset/base/274582 Log: Remove test-arc4random from this Makefile so others can continue to use this as-is for the time being Modified: head/tools/regression/lib/libc/gen/Makefile Modified: head/tools/regression/lib/libc/gen/Makefile == --- head/tools/regression/lib/libc/gen/Makefile Sun Nov 16 07:55:28 2014 (r274581) +++ head/tools/regression/lib/libc/gen/Makefile Sun Nov 16 07:58:06 2014 (r274582) @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTS= test-arc4random test-fmtcheck test-fmtmsg test-fnmatch \ +TESTS= test-fmtcheck test-fmtmsg test-fnmatch \ test-fpclassify test-ftw test-popen test-posix_spawn test-wordexp .PHONY: tests ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274581 - in head: lib/libc/tests/gen tools/regression/lib/libc/gen
Author: ngie
Date: Sun Nov 16 07:55:28 2014
New Revision: 274581
URL: https://svnweb.freebsd.org/changeset/base/274581
Log:
Convert tools/regression/lib/libc/gen/test-arc4random into an ATF testcase and
rename as lib/libc/gen/arc4random_test
Sponsored by: EMC / Isilon Storage Division
Added:
head/lib/libc/tests/gen/arc4random_test.c
- copied, changed from r274390,
head/tools/regression/lib/libc/gen/test-arc4random.c
Deleted:
head/tools/regression/lib/libc/gen/test-arc4random.c
Modified:
head/lib/libc/tests/gen/Makefile
Modified: head/lib/libc/tests/gen/Makefile
==
--- head/lib/libc/tests/gen/MakefileSun Nov 16 07:03:19 2014
(r274580)
+++ head/lib/libc/tests/gen/MakefileSun Nov 16 07:55:28 2014
(r274581)
@@ -4,6 +4,8 @@
TESTSDIR= ${TESTSBASE}/lib/libc/gen
+ATF_TESTS_C= arc4random_test
+
# TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep
# TODO: t_siginfo (fixes require further inspection)
# TODO: t_sethostname_test (consistently screws up the hostname)
Copied and modified: head/lib/libc/tests/gen/arc4random_test.c (from r274390,
head/tools/regression/lib/libc/gen/test-arc4random.c)
==
--- head/tools/regression/lib/libc/gen/test-arc4random.cTue Nov 11
18:15:05 2014(r274390, copy source)
+++ head/lib/libc/tests/gen/arc4random_test.c Sun Nov 16 07:55:28 2014
(r274581)
@@ -27,13 +27,14 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
+#include
#include
#include
#include
#include
#include
+#include
/*
* BUFSIZE is the number of bytes of rc4 output to compare. The probability
@@ -45,7 +46,9 @@ __FBSDID("$FreeBSD$");
* Test whether arc4random_buf() returns the same sequence of bytes in both
* parent and child processes. (Hint: It shouldn't.)
*/
-int main(int argc, char *argv[]) {
+ATF_TC_WITHOUT_HEAD(test_arc4random);
+ATF_TC_BODY(test_arc4random, tc)
+{
struct shared_page {
char parentbuf[BUFSIZE];
char childbuf[BUFSIZE];
@@ -65,10 +68,7 @@ int main(int argc, char *argv[]) {
arc4random_buf(&c, 1);
pid = fork();
- if (pid < 0) {
- printf("fail 1 - fork\n");
- exit(1);
- }
+ ATF_REQUIRE(0 <= pid);
if (pid == 0) {
/* child */
arc4random_buf(page->childbuf, BUFSIZE);
@@ -79,11 +79,14 @@ int main(int argc, char *argv[]) {
arc4random_buf(page->parentbuf, BUFSIZE);
wait(&status);
}
- if (memcmp(page->parentbuf, page->childbuf, BUFSIZE) == 0) {
- printf("fail 1 - sequences are the same\n");
- exit(1);
- }
+ ATF_CHECK_MSG(memcmp(page->parentbuf, page->childbuf, BUFSIZE) != 0,
+ "sequences are the same");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, test_arc4random);
- printf("ok 1 - sequences are different\n");
- exit(0);
+ return (atf_no_error());
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274580 - in head: etc/mtree lib/librt lib/librt/tests
Author: ngie
Date: Sun Nov 16 07:03:19 2014
New Revision: 274580
URL: https://svnweb.freebsd.org/changeset/base/274580
Log:
Add reachover Makefiles for contrib/netbsd-tests/lib/librt
A variant of this code has been tested on amd64/i386 for some time by
EMC/Isilon on 10-STABLE/11-CURRENT. It builds on other architectures, but the
code will remain off until it's proven it works on virtual hardware or real
hardware on other architectures
Sponsored by: EMC / Isilon Storage Division
Added:
head/lib/librt/Makefile.amd64 (contents, props changed)
head/lib/librt/Makefile.i386 (contents, props changed)
head/lib/librt/tests/
head/lib/librt/tests/Makefile (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/lib/librt/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Sun Nov 16 06:59:58 2014
(r274579)
+++ head/etc/mtree/BSD.tests.dist Sun Nov 16 07:03:19 2014
(r274580)
@@ -149,6 +149,8 @@
..
libproc
..
+librt
+..
libthr
dlopen
..
Modified: head/lib/librt/Makefile
==
--- head/lib/librt/Makefile Sun Nov 16 06:59:58 2014(r274579)
+++ head/lib/librt/Makefile Sun Nov 16 07:03:19 2014(r274580)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include
+
LIB=rt
SHLIB_MAJOR= 1
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
@@ -18,4 +20,6 @@ PRECIOUSLIB=
VERSION_MAP= ${.CURDIR}/Version.map
+.include
+
.include
Added: head/lib/librt/Makefile.amd64
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/librt/Makefile.amd64 Sun Nov 16 07:03:19 2014
(r274580)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
Added: head/lib/librt/Makefile.i386
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/librt/Makefile.i386Sun Nov 16 07:03:19 2014
(r274580)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
Added: head/lib/librt/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/librt/tests/Makefile Sun Nov 16 07:03:19 2014
(r274580)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+OBJTOP=${.OBJDIR:H:H:H}
+SRCTOP=${.CURDIR:H:H:H}
+TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/librt
+
+TESTSDIR= ${TESTSBASE}/lib/librt
+
+DPADD+=${LIBRT}
+LDADD+=-lrt
+
+NETBSD_ATF_TESTS_C=sched_test
+NETBSD_ATF_TESTS_C+= sem_test
+
+.include
+
+.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274579 - head/contrib/netbsd-tests/lib/librt
Author: ngie
Date: Sun Nov 16 06:59:58 2014
New Revision: 274579
URL: https://svnweb.freebsd.org/changeset/base/274579
Log:
Call sem_unlink on semaphores before attempting to create them
Due to the lack of uniqueness in the semaphore name, and the fact that the
tests don't have cleanup routines, an interrupted test can leave a semaphore
"laying around", causing all subsequent attempts to run the test to fail
I will file a NetBSD PR for this issue soon
Modified:
head/contrib/netbsd-tests/lib/librt/t_sem.c
Modified: head/contrib/netbsd-tests/lib/librt/t_sem.c
==
--- head/contrib/netbsd-tests/lib/librt/t_sem.c Sun Nov 16 06:35:20 2014
(r274578)
+++ head/contrib/netbsd-tests/lib/librt/t_sem.c Sun Nov 16 06:59:58 2014
(r274579)
@@ -86,6 +86,9 @@ ATF_TC_BODY(basic, tc)
if (sysconf(_SC_SEMAPHORES) == -1)
atf_tc_skip("POSIX semaphores not supported");
+#ifdef __FreeBSD__
+ sem_unlink("/sem_b");
+#endif
sem_b = sem_open("/sem_b", O_CREAT | O_EXCL, 0644, 0);
ATF_REQUIRE(sem_b != SEM_FAILED);
@@ -127,6 +130,9 @@ ATF_TC_BODY(child, tc)
if (sysconf(_SC_SEMAPHORES) == -1)
atf_tc_skip("POSIX semaphores not supported");
+#ifdef __FreeBSD__
+ sem_unlink("/sem_a");
+#endif
sem_a = sem_open("/sem_a", O_CREAT | O_EXCL, 0644, 0);
ATF_REQUIRE(sem_a != SEM_FAILED);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274578 - in head: etc/mtree lib/libthr lib/libthr/tests lib/libthr/tests/dlopen lib/libthr/tests/dlopen/dso
Author: ngie
Date: Sun Nov 16 06:35:20 2014
New Revision: 274578
URL: https://svnweb.freebsd.org/changeset/base/274578
Log:
Add reachover Makefiles for contrib/netbsd-tests/lib/libpthread as
lib/libthr/tests
A variant of this code has been tested on amd64/i386 for some time by
EMC/Isilon on 10-STABLE/11-CURRENT. It builds on other architectures, but the
code will remain off until it's proven it works on virtual hardware or real
hardware on other architectures
Original work by: pho
Sponsored by: EMC / Isilon Storage Division
Added:
head/lib/libthr/Makefile.amd64 (contents, props changed)
head/lib/libthr/Makefile.i386 (contents, props changed)
head/lib/libthr/tests/
head/lib/libthr/tests/Makefile (contents, props changed)
head/lib/libthr/tests/dlopen/
head/lib/libthr/tests/dlopen/Makefile (contents, props changed)
head/lib/libthr/tests/dlopen/dso/
head/lib/libthr/tests/dlopen/dso/Makefile (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/lib/libthr/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Sun Nov 16 05:13:39 2014
(r274577)
+++ head/etc/mtree/BSD.tests.dist Sun Nov 16 06:35:20 2014
(r274578)
@@ -149,6 +149,10 @@
..
libproc
..
+libthr
+dlopen
+..
+..
libutil
..
..
Modified: head/lib/libthr/Makefile
==
--- head/lib/libthr/MakefileSun Nov 16 05:13:39 2014(r274577)
+++ head/lib/libthr/MakefileSun Nov 16 06:35:20 2014(r274578)
@@ -64,4 +64,6 @@ SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpth
CFLAGS+=-DSYSCALL_COMPAT
.endif
+.include
+
.include
Added: head/lib/libthr/Makefile.amd64
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libthr/Makefile.amd64 Sun Nov 16 06:35:20 2014
(r274578)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
Added: head/lib/libthr/Makefile.i386
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libthr/Makefile.i386 Sun Nov 16 06:35:20 2014
(r274578)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
Added: head/lib/libthr/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libthr/tests/Makefile Sun Nov 16 06:35:20 2014
(r274578)
@@ -0,0 +1,58 @@
+# $FreeBSD$
+
+OBJTOP=${.OBJDIR:H:H:H}
+SRCTOP=${.CURDIR:H:H:H}
+TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread
+
+TESTSDIR= ${TESTSBASE}/lib/libthr
+
+# TODO: t_name (missing pthread_getname_np support in FreeBSD)
+NETBSD_ATF_TESTS_C=barrier_test
+NETBSD_ATF_TESTS_C+= cond_test
+NETBSD_ATF_TESTS_C+= condwait_test
+NETBSD_ATF_TESTS_C+= detach_test
+NETBSD_ATF_TESTS_C+= equal_test
+NETBSD_ATF_TESTS_C+= fork_test
+NETBSD_ATF_TESTS_C+= fpu_test
+NETBSD_ATF_TESTS_C+= join_test
+NETBSD_ATF_TESTS_C+= kill_test
+NETBSD_ATF_TESTS_C+= mutex_test
+NETBSD_ATF_TESTS_C+= once_test
+NETBSD_ATF_TESTS_C+= preempt_test
+NETBSD_ATF_TESTS_C+= rwlock_test
+NETBSD_ATF_TESTS_C+= sem_test
+NETBSD_ATF_TESTS_C+= sigmask_test
+NETBSD_ATF_TESTS_C+= sigsuspend_test
+NETBSD_ATF_TESTS_C+= siglongjmp_test
+NETBSD_ATF_TESTS_C+= sleep_test
+NETBSD_ATF_TESTS_C+= swapcontext_test
+
+NETBSD_ATF_TESTS_SH= atexit_test
+NETBSD_ATF_TESTS_SH+= cancel_test
+NETBSD_ATF_TESTS_SH+= exit_test
+NETBSD_ATF_TESTS_SH+= resolv_test
+
+DPADD+=${LIBPTHREAD}
+LDADD+=-lpthread
+DPADD.fpu_test+= ${LIBM}
+LDADD.fpu_test+= -lm
+DPADD.sem_test+= ${LIBRT}
+LDADD.sem_test+= -lrt
+
+BINDIR=${TESTSDIR}
+
+PROGS= h_atexit
+PROGS+=h_cancel
+PROGS+=h_exit
+PROGS+=h_resolv
+
+FILESDIR= ${TESTSDIR}
+FILES= d_mach
+
+TESTS_SUBDIRS= dlopen
+
+.include
+
+CFLAGS.condwait_test+= -I${SRCTOP}/contrib/netbsd-tests/lib/libc/gen
+
+.include
Added: head/lib/libthr/tests/dlopen/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libthr/tests/dlopen/Makefile Sun Nov 16 06:35:20 2014
(r274578)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+OBJTOP=${.OBJDIR:H:H:H:H}
+SRCTOP=${.CURDIR:H:H:H:H}
+TESTSRC= ${SRCTOP}/contrib/netbsd-t
Re: svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
On Nov 15, 2014, at 21:26, Garrett Cooper wrote: > On Nov 15, 2014, at 21:24, Alfred Perlstein wrote: > >> On 11/15/14, 9:22 PM, Garrett Cooper wrote: >>> On Nov 15, 2014, at 21:19, Alfred Perlstein wrote: >>> This looks easy enough to fix under _thr_find_thread() in libthread. Any interest in fixing it? >>> Yes, if it’s POSIXly correct and doesn’t break everything else. >>> Might be worth hacking _thr_find_thread() to take an ERRNO to return based on NULL until we chase down all the paths into it just in case EINVAL is a valid ptr. >>> K. Thanks for the hint! >>> Also, just wondering what happens on other platforms, does it elicit a crash? Ie. is NULL a safe value to pass in on other platforms? >>> I wish I knew what happened on !x86 platforms… I honestly don’t have access >>> to ARM/MIPS/PowerPC, so I can’t say :/. >>> >>> Thanks! >> >> Oh, I meant Linux and Solaris, or even other BSD. > > Ah, good question. pho@ ran some of the tests in contrib/netbsd-tests on > Linux/OSX before to do a side-by-side comparison, but I haven’t setup the > necessary environment to do that testing [yet]. FWIW, there’s some weirdness with one of the testcases that was never fully integrated in at Isilon where it blocks on a random mutex in libthr… trying to figure out what’s causing it to do that, but this might be related... signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
On Nov 15, 2014, at 21:24, Alfred Perlstein wrote: > On 11/15/14, 9:22 PM, Garrett Cooper wrote: >> On Nov 15, 2014, at 21:19, Alfred Perlstein wrote: >> >>> This looks easy enough to fix under _thr_find_thread() in libthread. >>> >>> Any interest in fixing it? >> Yes, if it’s POSIXly correct and doesn’t break everything else. >> >>> Might be worth hacking _thr_find_thread() to take an ERRNO to return based >>> on NULL until we chase down all the paths into it just in case EINVAL is a >>> valid ptr. >> K. Thanks for the hint! >> >>> Also, just wondering what happens on other platforms, does it elicit a >>> crash? Ie. is NULL a safe value to pass in on other platforms? >> I wish I knew what happened on !x86 platforms… I honestly don’t have access >> to ARM/MIPS/PowerPC, so I can’t say :/. >> >> Thanks! > > Oh, I meant Linux and Solaris, or even other BSD. Ah, good question. pho@ ran some of the tests in contrib/netbsd-tests on Linux/OSX before to do a side-by-side comparison, but I haven’t setup the necessary environment to do that testing [yet]. signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
On 11/15/14, 9:22 PM, Garrett Cooper wrote: On Nov 15, 2014, at 21:19, Alfred Perlstein wrote: This looks easy enough to fix under _thr_find_thread() in libthread. Any interest in fixing it? Yes, if it’s POSIXly correct and doesn’t break everything else. Might be worth hacking _thr_find_thread() to take an ERRNO to return based on NULL until we chase down all the paths into it just in case EINVAL is a valid ptr. K. Thanks for the hint! Also, just wondering what happens on other platforms, does it elicit a crash? Ie. is NULL a safe value to pass in on other platforms? I wish I knew what happened on !x86 platforms… I honestly don’t have access to ARM/MIPS/PowerPC, so I can’t say :/. Thanks! Oh, I meant Linux and Solaris, or even other BSD. -Alfred ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
On Nov 15, 2014, at 21:19, Alfred Perlstein wrote: > This looks easy enough to fix under _thr_find_thread() in libthread. > > Any interest in fixing it? Yes, if it’s POSIXly correct and doesn’t break everything else. > Might be worth hacking _thr_find_thread() to take an ERRNO to return based on > NULL until we chase down all the paths into it just in case EINVAL is a valid > ptr. K. Thanks for the hint! > Also, just wondering what happens on other platforms, does it elicit a crash? > Ie. is NULL a safe value to pass in on other platforms? I wish I knew what happened on !x86 platforms… I honestly don’t have access to ARM/MIPS/PowerPC, so I can’t say :/. Thanks! signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
This looks easy enough to fix under _thr_find_thread() in libthread.
Any interest in fixing it?
Might be worth hacking _thr_find_thread() to take an ERRNO to return
based on NULL until we chase down all the paths into it just in case
EINVAL is a valid ptr.
Also, just wondering what happens on other platforms, does it elicit a
crash? Ie. is NULL a safe value to pass in on other platforms?
-Alfred
On 11/15/14, 9:08 PM, Garrett Cooper wrote:
Author: ngie
Date: Sun Nov 16 05:08:19 2014
New Revision: 274573
URL: https://svnweb.freebsd.org/changeset/base/274573
Log:
Expect :pthread_detach to fail with EINVAL instead of ESRCH on FreeBSD
PR: 191906
In collaboration with: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_detach.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_detach.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_detach.c Sun Nov 16 05:06:35
2014(r274572)
+++ head/contrib/netbsd-tests/lib/libpthread/t_detach.c Sun Nov 16 05:08:19
2014(r274573)
@@ -75,6 +75,10 @@ ATF_TC_BODY(pthread_detach, tc)
rv = pthread_join(t, NULL);
ATF_REQUIRE(rv == EINVAL);
+#if defined(__FreeBSD__)
+ atf_tc_expect_fail("PR # 191906: fails with EINVAL, not ESRCH");
+#endif
+
/*
* As usual, ESRCH should follow if
* we try to detach an invalid thread.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274577 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:13:39 2014
New Revision: 274577
URL: https://svnweb.freebsd.org/changeset/base/274577
Log:
Add missing sys/time.h #include for timespecsub macro in
lib/libnetbsd/sys/time.h
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_condwait.c
head/contrib/netbsd-tests/lib/libpthread/t_once.c
head/contrib/netbsd-tests/lib/libpthread/t_sem.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_condwait.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_condwait.c Sun Nov 16
05:13:10 2014(r274576)
+++ head/contrib/netbsd-tests/lib/libpthread/t_condwait.c Sun Nov 16
05:13:39 2014(r274577)
@@ -40,6 +40,10 @@ __RCSID("$NetBSD: t_condwait.c,v 1.4 201
#include "isqemu.h"
+#ifdef __FreeBSD__
+#include
+#endif
+
#define WAITTIME 2 /* Timeout wait secound */
static const int debug = 1;
Modified: head/contrib/netbsd-tests/lib/libpthread/t_once.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_once.c Sun Nov 16 05:13:10
2014(r274576)
+++ head/contrib/netbsd-tests/lib/libpthread/t_once.c Sun Nov 16 05:13:39
2014(r274577)
@@ -46,6 +46,10 @@ static int x;
#define NTHREADS 25
+#ifdef __FreeBSD__
+#include
+#endif
+
static void
ofunc(void)
{
Modified: head/contrib/netbsd-tests/lib/libpthread/t_sem.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_sem.cSun Nov 16 05:13:10
2014(r274576)
+++ head/contrib/netbsd-tests/lib/libpthread/t_sem.cSun Nov 16 05:13:39
2014(r274577)
@@ -111,6 +111,10 @@ __RCSID("$NetBSD: t_sem.c,v 1.8 2014/11/
static sem_t sem;
+#ifdef __FreeBSD__
+#include
+#endif
+
ATF_TC(named);
ATF_TC_HEAD(named, tc)
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274576 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:13:10 2014
New Revision: 274576
URL: https://svnweb.freebsd.org/changeset/base/274576
Log:
Port helper program to FreeBSD, similar to ../../lib/libc/stdlib/h_atexit.c
Submitted by: pho
In collaboration with: kib
Modified:
head/contrib/netbsd-tests/lib/libpthread/h_atexit.c
Modified: head/contrib/netbsd-tests/lib/libpthread/h_atexit.c
==
--- head/contrib/netbsd-tests/lib/libpthread/h_atexit.c Sun Nov 16 05:11:07
2014(r274575)
+++ head/contrib/netbsd-tests/lib/libpthread/h_atexit.c Sun Nov 16 05:13:10
2014(r274576)
@@ -47,9 +47,19 @@ __RCSID("$NetBSD: h_atexit.c,v 1.1 2010/
extern int __cxa_atexit(void (*func)(void *), void *, void *);
extern void __cxa_finalize(void *);
+#ifdef __FreeBSD__
+/*
+ * See comments in ../../lib/libc/stdlib/h_atexit.c about the deviation
+ * between FreeBSD and NetBSD with this helper program
+ */
+static void *dso_handle_1 = (void *)1;
+static void *dso_handle_2 = (void *)2;
+static void *dso_handle_3 = (void *)3;
+#else
static int dso_handle_1;
static int dso_handle_2;
static int dso_handle_3;
+#endif
static int arg_1;
static int arg_2;
@@ -170,8 +180,17 @@ main(int argc, char *argv[])
exiting_state = 5;
+#if defined(__FreeBSD__)
ASSERT(0 == atexit(normal_handler_0));
ASSERT(0 == atexit(normal_handler_1));
+ ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, dso_handle_1));
+ ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, dso_handle_1));
+ ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, dso_handle_2));
+ ASSERT(0 == __cxa_atexit(cxa_handler_2, &arg_3, dso_handle_3));
+
+ __cxa_finalize(dso_handle_1);
+ __cxa_finalize(dso_handle_2);
+#else
ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, &dso_handle_1));
ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, &dso_handle_1));
ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, &dso_handle_2));
@@ -179,5 +198,6 @@ main(int argc, char *argv[])
__cxa_finalize(&dso_handle_1);
__cxa_finalize(&dso_handle_2);
+#endif
exit(0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274575 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:11:07 2014
New Revision: 274575
URL: https://svnweb.freebsd.org/changeset/base/274575
Log:
#ifdef out a printf on !NetBSD that causes the testcase to fail when comparing
the output from the helper program
Submitted by: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/h_cancel.c
Modified: head/contrib/netbsd-tests/lib/libpthread/h_cancel.c
==
--- head/contrib/netbsd-tests/lib/libpthread/h_cancel.c Sun Nov 16 05:09:23
2014(r274574)
+++ head/contrib/netbsd-tests/lib/libpthread/h_cancel.c Sun Nov 16 05:11:07
2014(r274575)
@@ -42,7 +42,9 @@ main(void)
char str1[] = "You should see this.\n";
char str2[] = "You should not see this.\n";
+#ifdef __NetBSD__
printf("Cancellation test: Self-cancellation and disabling.\n");
+#endif
pthread_cancel(pthread_self());
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274574 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:09:23 2014
New Revision: 274574
URL: https://svnweb.freebsd.org/changeset/base/274574
Log:
Add pthread_np.h #include and initialize the pthread attribute on FreeBSD
Submitted by: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_join.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_join.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_join.c Sun Nov 16 05:08:19
2014(r274573)
+++ head/contrib/netbsd-tests/lib/libpthread/t_join.c Sun Nov 16 05:09:23
2014(r274574)
@@ -37,6 +37,10 @@ __RCSID("$NetBSD: t_join.c,v 1.8 2012/03
#include
+#ifdef __FreeBSD__
+#include
+#endif
+
#include "h_common.h"
#ifdef CHECK_STACK_ALIGNMENT
@@ -152,6 +156,9 @@ threadfunc2(void *arg)
j = (uintptr_t)arg;
+#ifdef __FreeBSD__
+ pthread_attr_init(&attr);
+#endif
ATF_REQUIRE(pthread_attr_get_np(pthread_self(), &attr) == 0);
ATF_REQUIRE(pthread_attr_getstacksize(&attr, &stacksize) == 0);
ATF_REQUIRE(stacksize == STACKSIZE * (j + 1));
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274573 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:08:19 2014
New Revision: 274573
URL: https://svnweb.freebsd.org/changeset/base/274573
Log:
Expect :pthread_detach to fail with EINVAL instead of ESRCH on FreeBSD
PR: 191906
In collaboration with: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_detach.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_detach.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_detach.c Sun Nov 16 05:06:35
2014(r274572)
+++ head/contrib/netbsd-tests/lib/libpthread/t_detach.c Sun Nov 16 05:08:19
2014(r274573)
@@ -75,6 +75,10 @@ ATF_TC_BODY(pthread_detach, tc)
rv = pthread_join(t, NULL);
ATF_REQUIRE(rv == EINVAL);
+#if defined(__FreeBSD__)
+ atf_tc_expect_fail("PR # 191906: fails with EINVAL, not ESRCH");
+#endif
+
/*
* As usual, ESRCH should follow if
* we try to detach an invalid thread.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274572 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:06:35 2014
New Revision: 274572
URL: https://svnweb.freebsd.org/changeset/base/274572
Log:
Only expect timeouts on powerpc with NetBSD
Submitted by: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Sun Nov 16 05:05:18
2014(r274571)
+++ head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Sun Nov 16 05:06:35
2014(r274572)
@@ -117,9 +117,11 @@ ATF_TC(mutex2);
ATF_TC_HEAD(mutex2, tc)
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_set_md_var(tc, "timeout", "40");
#endif
+#endif
}
ATF_TC_BODY(mutex2, tc)
{
@@ -129,9 +131,11 @@ ATF_TC_BODY(mutex2, tc)
printf("1: Mutex-test 2\n");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_expect_timeout("PR port-powerpc/44387");
#endif
+#endif
PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
@@ -158,6 +162,7 @@ ATF_TC_BODY(mutex2, tc)
global_x, (long)joinval);
ATF_REQUIRE_EQ(global_x, 2000);
+#ifdef __NetBSD__
#if defined(__powerpc__)
/* XXX force a timeout in ppc case since an un-triggered race
otherwise looks like a "failure" */
@@ -165,6 +170,7 @@ ATF_TC_BODY(mutex2, tc)
complain about unexpected success */
sleep(41);
#endif
+#endif
}
static void *
@@ -188,9 +194,11 @@ ATF_TC_HEAD(mutex3, tc)
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes using a static "
"initializer");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_set_md_var(tc, "timeout", "40");
#endif
+#endif
}
ATF_TC_BODY(mutex3, tc)
{
@@ -200,9 +208,11 @@ ATF_TC_BODY(mutex3, tc)
printf("1: Mutex-test 3\n");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_expect_timeout("PR port-powerpc/44387");
#endif
+#endif
global_x = 0;
count = count2 = 1000;
@@ -227,6 +237,7 @@ ATF_TC_BODY(mutex3, tc)
global_x, (long)joinval);
ATF_REQUIRE_EQ(global_x, 2000);
+#ifdef __NetBSD__
#if defined(__powerpc__)
/* XXX force a timeout in ppc case since an un-triggered race
otherwise looks like a "failure" */
@@ -234,6 +245,7 @@ ATF_TC_BODY(mutex3, tc)
complain about unexpected success */
sleep(41);
#endif
+#endif
}
static void *
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274571 - head/contrib/netbsd-tests/lib/libpthread
Author: ngie
Date: Sun Nov 16 05:05:18 2014
New Revision: 274571
URL: https://svnweb.freebsd.org/changeset/base/274571
Log:
Use _exit instead of exit so the file descriptors aren't flushed twice in the
child processes
Submitted by: pho
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_fork.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_fork.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_fork.c Sun Nov 16 04:13:44
2014(r274570)
+++ head/contrib/netbsd-tests/lib/libpthread/t_fork.c Sun Nov 16 05:05:18
2014(r274571)
@@ -61,7 +61,11 @@ print_pid(void *arg)
thread_survived = 1;
if (parent != getpid()) {
+#ifdef __FreeBSD__
+ _exit(1);
+#else
exit(1);
+#endif
}
return NULL;
}
@@ -95,7 +99,11 @@ ATF_TC_BODY(fork, tc)
ATF_REQUIRE_EQ_MSG(WEXITSTATUS(status), 0, "thread survived in
child");
} else {
sleep(5);
+#ifdef __FreeBSD__
+ _exit(thread_survived ? 1 : 0);
+#else
exit(thread_survived ? 1 : 0);
+#endif
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274570 - stable/6/share/zoneinfo
Author: edwin Date: Sun Nov 16 04:13:44 2014 New Revision: 274570 URL: https://svnweb.freebsd.org/changeset/base/274570 Log: MFC of 274559,tzdata6: Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Modified: stable/6/share/zoneinfo/africa stable/6/share/zoneinfo/asia stable/6/share/zoneinfo/australasia stable/6/share/zoneinfo/europe stable/6/share/zoneinfo/northamerica stable/6/share/zoneinfo/southamerica Directory Properties: stable/6/share/zoneinfo/ (props changed) Modified: stable/6/share/zoneinfo/africa == --- stable/6/share/zoneinfo/africa Sun Nov 16 04:13:42 2014 (r274569) +++ stable/6/share/zoneinfo/africa Sun Nov 16 04:13:44 2014 (r274570) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania
svn commit: r274569 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: markj Date: Sun Nov 16 04:13:42 2014 New Revision: 274569 URL: https://svnweb.freebsd.org/changeset/base/274569 Log: Only compare visitation counters if they've both been set for the current type graph walk. Reviewed by: Robert Mustacchi MFC after:2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c == --- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sun Nov 16 04:13:09 2014(r274568) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sun Nov 16 04:13:42 2014(r274569) @@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274568 - stable/7/share/zoneinfo
Author: edwin Date: Sun Nov 16 04:13:09 2014 New Revision: 274568 URL: https://svnweb.freebsd.org/changeset/base/274568 Log: MFC of 274559,tzdata7: Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/australasia stable/7/share/zoneinfo/europe stable/7/share/zoneinfo/northamerica stable/7/share/zoneinfo/southamerica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa == --- stable/7/share/zoneinfo/africa Sun Nov 16 04:12:25 2014 (r274567) +++ stable/7/share/zoneinfo/africa Sun Nov 16 04:13:09 2014 (r274568) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania
svn commit: r274567 - stable/8/share/zoneinfo
Author: edwin Date: Sun Nov 16 04:12:25 2014 New Revision: 274567 URL: https://svnweb.freebsd.org/changeset/base/274567 Log: MFC of 274559,tzdata8: Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Modified: stable/8/share/zoneinfo/africa stable/8/share/zoneinfo/asia stable/8/share/zoneinfo/australasia stable/8/share/zoneinfo/europe stable/8/share/zoneinfo/northamerica stable/8/share/zoneinfo/southamerica Directory Properties: stable/8/share/zoneinfo/ (props changed) Modified: stable/8/share/zoneinfo/africa == --- stable/8/share/zoneinfo/africa Sun Nov 16 04:11:37 2014 (r274566) +++ stable/8/share/zoneinfo/africa Sun Nov 16 04:12:25 2014 (r274567) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania
svn commit: r274566 - stable/9/contrib/tzdata
Author: edwin Date: Sun Nov 16 04:11:37 2014 New Revision: 274566 URL: https://svnweb.freebsd.org/changeset/base/274566 Log: MFC of 274559,tzdata9: Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Modified: stable/9/contrib/tzdata/africa stable/9/contrib/tzdata/asia stable/9/contrib/tzdata/australasia stable/9/contrib/tzdata/europe stable/9/contrib/tzdata/northamerica stable/9/contrib/tzdata/southamerica Directory Properties: stable/9/contrib/tzdata/ (props changed) Modified: stable/9/contrib/tzdata/africa == --- stable/9/contrib/tzdata/africa Sun Nov 16 04:10:23 2014 (r274565) +++ stable/9/contrib/tzdata/africa Sun Nov 16 04:11:37 2014 (r274566) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania
svn commit: r274565 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: markj
Date: Sun Nov 16 04:10:23 2014
New Revision: 274565
URL: https://svnweb.freebsd.org/changeset/base/274565
Log:
Remove an incorrect optimization. The type IDs of each member of a struct or
union must be checked when determine whether two types are equivalent. This
bug could cause ctfmerge(1) to incorrectly merge distinct types.
Reviewed by: Robert Mustacchi
MFC after:2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sun Nov 16 04:07:53
2014(r274564)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sun Nov 16 04:10:23
2014(r274565)
@@ -287,19 +287,11 @@ equiv_su(tdesc_t *stdp, tdesc_t *ttdp, e
while (ml1 && ml2) {
if (ml1->ml_offset != ml2->ml_offset ||
- strcmp(ml1->ml_name, ml2->ml_name) != 0)
+ strcmp(ml1->ml_name, ml2->ml_name) != 0 ||
+ ml1->ml_size != ml2->ml_size ||
+ !equiv_node(ml1->ml_type, ml2->ml_type, ed))
return (0);
- /*
-* Don't do the recursive equivalency checking more than
-* we have to.
-*/
- if (olm1 == NULL || olm1->ml_type->t_id != ml1->ml_type->t_id) {
- if (ml1->ml_size != ml2->ml_size ||
- !equiv_node(ml1->ml_type, ml2->ml_type, ed))
- return (0);
- }
-
olm1 = ml1;
ml1 = ml1->ml_next;
ml2 = ml2->ml_next;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274564 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: markj
Date: Sun Nov 16 04:07:53 2014
New Revision: 274564
URL: https://svnweb.freebsd.org/changeset/base/274564
Log:
Fix a couple of bugs around the handling of structs and unions of size zero.
These would cause ctfconvert(1) to return an error when attempting to
resolve valid C types.
Reviewed by: Robert Mustacchi
MFC after:2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sun Nov 16 04:02:50
2014(r274563)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sun Nov 16 04:07:53
2014(r274564)
@@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t
debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
tdp->t_ardef->ad_contents->t_id);
- if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) {
+ if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 &&
+ (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) {
debug(3, "unable to resolve array %s (%d) contents %d\n",
tdesc_name(tdp), tdp->t_id,
tdp->t_ardef->ad_contents->t_id);
@@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **
/*
* For empty members, or GCC/C99 flexible array
-* members, a size of 0 is correct.
+* members, a size of 0 is correct. Structs and unions
+* consisting of flexible array members will also have
+* size 0.
*/
if (mt->t_members == NULL)
continue;
if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
continue;
+ if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
+ (mt->t_type == STRUCT || mt->t_type == UNION))
+ continue;
dw->dw_nunres++;
return (1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274563 - stable/10/contrib/tzdata
Author: edwin Date: Sun Nov 16 04:02:50 2014 New Revision: 274563 URL: https://svnweb.freebsd.org/changeset/base/274563 Log: MFC of 274559,tzdata2014j Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Modified: stable/10/contrib/tzdata/africa stable/10/contrib/tzdata/asia stable/10/contrib/tzdata/australasia stable/10/contrib/tzdata/europe stable/10/contrib/tzdata/northamerica stable/10/contrib/tzdata/southamerica Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tzdata/africa == --- stable/10/contrib/tzdata/africa Sun Nov 16 01:47:43 2014 (r274562) +++ stable/10/contrib/tzdata/africa Sun Nov 16 04:02:50 2014 (r274563) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania, ma
svn commit: r274562 - stable/10/sys/cam/ctl
Author: mav
Date: Sun Nov 16 01:47:43 2014
New Revision: 274562
URL: https://svnweb.freebsd.org/changeset/base/274562
Log:
MFC r274333: Handle PREEMPT AND ABORT service action equal to PREEMPT.
With command serialization used in CTL, there are no other commands to abort
when PREEMPT AND ABORT gets to run, so it is practically equal to PREEMPT.
Modified:
stable/10/sys/cam/ctl/ctl.c
stable/10/sys/cam/ctl/ctl_cmd_table.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==
--- stable/10/sys/cam/ctl/ctl.c Sun Nov 16 01:29:18 2014(r274561)
+++ stable/10/sys/cam/ctl/ctl.c Sun Nov 16 01:47:43 2014(r274562)
@@ -8691,7 +8691,8 @@ ctl_persistent_reserve_out(struct ctl_sc
}
break;
- case SPRO_PREEMPT: {
+ case SPRO_PREEMPT:
+ case SPRO_PRE_ABO: {
int nretval;
nretval = ctl_pro_preempt(softc, lun, res_key, sa_res_key, type,
Modified: stable/10/sys/cam/ctl/ctl_cmd_table.c
==
--- stable/10/sys/cam/ctl/ctl_cmd_table.c Sun Nov 16 01:29:18 2014
(r274561)
+++ stable/10/sys/cam/ctl/ctl_cmd_table.c Sun Nov 16 01:47:43 2014
(r274562)
@@ -180,7 +180,16 @@ const struct ctl_cmd_entry ctl_cmd_table
10, { 0x04, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
/* 05 PREEMPT AND ABORT */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_CMD_FLAG_OK_ON_STOPPED |
+ CTL_CMD_FLAG_OK_ON_INOPERABLE |
+ CTL_CMD_FLAG_OK_ON_OFFLINE |
+ CTL_CMD_FLAG_OK_ON_SECONDARY |
+ CTL_FLAG_DATA_OUT |
+ CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x05, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
/* 06 REGISTER AND IGNORE EXISTING KEY */
{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274561 - in stable/10/tools/tools/nanobsd: . dhcpd rescue
Author: imp
Date: Sun Nov 16 01:29:18 2014
New Revision: 274561
URL: https://svnweb.freebsd.org/changeset/base/274561
Log:
MFC from the last few months:
Note: didn't merge r274331 removing gif/faith on purpose.
r268246 | mr | use mkimg and build into separate directories
r269355 | imp | Fix typo in example script
r269362 | imp | use rm -x on 10 and newer
r269363 | imp | NANO_OBJ shouldn't end with '/'
r269423 | imp | -K to suppress installkernel
r269424 | imp | sort usage
r269425 | imp | sort switch
r269983 | imp | only install bootloader if it exists
r269984 | imp | create_diskimage since it never was $ARCH dependent
r270162 | imp | Add support for -X which instales cross native tools
Added:
stable/10/tools/tools/nanobsd/rescue/R32
- copied unchanged from r268246, head/tools/tools/nanobsd/rescue/R32
stable/10/tools/tools/nanobsd/rescue/R64
- copied unchanged from r268246, head/tools/tools/nanobsd/rescue/R64
Modified:
stable/10/tools/tools/nanobsd/dhcpd/README
stable/10/tools/tools/nanobsd/dhcpd/common
stable/10/tools/tools/nanobsd/nanobsd.sh
stable/10/tools/tools/nanobsd/rescue/build.sh
stable/10/tools/tools/nanobsd/rescue/common
stable/10/tools/tools/nanobsd/rescue/merge.sh
stable/10/tools/tools/nanobsd/rescue/rescue_amd64.conf
stable/10/tools/tools/nanobsd/rescue/rescue_i386.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/tools/tools/nanobsd/dhcpd/README
==
--- stable/10/tools/tools/nanobsd/dhcpd/README Sun Nov 16 01:18:41 2014
(r274560)
+++ stable/10/tools/tools/nanobsd/dhcpd/README Sun Nov 16 01:29:18 2014
(r274561)
@@ -9,6 +9,6 @@ and DHCPd.
This is a work in progress. Generally, to build this you should
cd tools/tools/nanobsd/dhcpd
- sudo sh ../nandobsd.sh -C os-base
+ sudo sh ../nanobsd.sh -C os-base
but do be careful if things are interrupted. There may still be
bugs lurking that cause your entire FreeBSD tree to disappear.
Modified: stable/10/tools/tools/nanobsd/dhcpd/common
==
--- stable/10/tools/tools/nanobsd/dhcpd/common Sun Nov 16 01:18:41 2014
(r274560)
+++ stable/10/tools/tools/nanobsd/dhcpd/common Sun Nov 16 01:29:18 2014
(r274561)
@@ -261,11 +261,6 @@ die()
exit 1
}
-create_amd64_diskimage()
-{
- create_i386_diskimage "$*"
-}
-
# Automatically include the packaging port here so it is always first so it
# builds the port and adds the package so we can add other packages.
add_port ports-mgmt/pkg
Modified: stable/10/tools/tools/nanobsd/nanobsd.sh
==
--- stable/10/tools/tools/nanobsd/nanobsd.shSun Nov 16 01:18:41 2014
(r274560)
+++ stable/10/tools/tools/nanobsd/nanobsd.shSun Nov 16 01:29:18 2014
(r274561)
@@ -178,6 +178,15 @@ SRCCONF=${SRCCONF:=/dev/null}
#
###
+# rm doesn't know -x prior to FreeBSD 10, so cope with a variety of build
+# hosts for now.
+nano_rm ( ) {
+ case $(uname -r) in
+ 7*|8*|9*) rm $* ;;
+ *) rm -x $* ;;
+ esac
+}
+
# run in the world chroot, errors fatal
CR()
{
@@ -200,9 +209,9 @@ nano_cleanup ( ) (
clean_build ( ) (
pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})"
- if ! rm -xrf ${MAKEOBJDIRPREFIX}/ > /dev/null 2>&1 ; then
+ if ! nano_rm -rf ${MAKEOBJDIRPREFIX}/ > /dev/null 2>&1 ; then
chflags -R noschg ${MAKEOBJDIRPREFIX}/
- rm -xr ${MAKEOBJDIRPREFIX}/
+ nano_rm -r ${MAKEOBJDIRPREFIX}/
fi
mkdir -p ${MAKEOBJDIRPREFIX}
printenv > ${MAKEOBJDIRPREFIX}/_.env
@@ -256,17 +265,17 @@ build_kernel ( ) (
clean_world ( ) (
if [ "${NANO_OBJ}" != "${MAKEOBJDIRPREFIX}" ]; then
pprint 2 "Clean and create object directory (${NANO_OBJ})"
- if ! rm -rxf ${NANO_OBJ}/ > /dev/null 2>&1 ; then
+ if ! nano_rm -rf ${NANO_OBJ}/ > /dev/null 2>&1 ; then
chflags -R noschg ${NANO_OBJ}
- rm -xr ${NANO_OBJ}/
+ nano_rm -r ${NANO_OBJ}/
fi
mkdir -p ${NANO_OBJ} ${NANO_WORLDDIR}
printenv > ${NANO_OBJ}/_.env
else
pprint 2 "Clean and create world directory (${NANO_WORLDDIR})"
- if ! rm -rxf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then
+ if ! nano_rm -rf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then
chflags -R noschg ${NANO_WORLDDIR}
- rm -rxf ${NANO_WORLDDIR}/
+ nano_rm -rf ${NANO_WORLDDIR}/
fi
mkdir -p ${NANO_WORLDDIR}
fi
@@ -338,6 +347,18 @@ install_kernel ( ) (
) >
svn commit: r274560 - in head/sys: kern sys
Author: jmg
Date: Sun Nov 16 01:18:41 2014
New Revision: 274560
URL: https://svnweb.freebsd.org/changeset/base/274560
Log:
prevent doing filter ops locking for staticly compiled filter ops...
This significantly reduces lock contention when adding/removing knotes
on busy multi-kq system... Next step is to cache these references per
kq.. i.e. kq refs it once and keeps a local ref count so that the same
refs don't get accessed by many cpus...
only allocate a knote when we might use it...
Add a new flag, _FORCEONESHOT.. This allows a thread to force the
delivery of another event in a safe manner, say waking up an idle http
connection to force it to be reaped...
If we are _DISABLE'ing a knote, don't bother to call f_event on it, it's
disabled, so won't be delivered anyways..
Tested by:adrian
Modified:
head/sys/kern/kern_event.c
head/sys/sys/event.h
Modified: head/sys/kern/kern_event.c
==
--- head/sys/kern/kern_event.c Sun Nov 16 01:00:39 2014(r274559)
+++ head/sys/kern/kern_event.c Sun Nov 16 01:18:41 2014(r274560)
@@ -281,19 +281,20 @@ MTX_SYSINIT(kqueue_filterops, &filterops
MTX_DEF);
static struct {
struct filterops *for_fop;
+ int for_nolock;
int for_refcnt;
} sysfilt_ops[EVFILT_SYSCOUNT] = {
- { &file_filtops }, /* EVFILT_READ */
- { &file_filtops }, /* EVFILT_WRITE */
+ { &file_filtops, 1 }, /* EVFILT_READ */
+ { &file_filtops, 1 }, /* EVFILT_WRITE */
{ &null_filtops }, /* EVFILT_AIO */
- { &file_filtops }, /* EVFILT_VNODE */
- { &proc_filtops }, /* EVFILT_PROC */
- { &sig_filtops }, /* EVFILT_SIGNAL */
- { &timer_filtops }, /* EVFILT_TIMER */
- { &file_filtops }, /* EVFILT_PROCDESC */
- { &fs_filtops },/* EVFILT_FS */
+ { &file_filtops, 1 }, /* EVFILT_VNODE */
+ { &proc_filtops, 1 }, /* EVFILT_PROC */
+ { &sig_filtops, 1 },/* EVFILT_SIGNAL */
+ { &timer_filtops, 1 }, /* EVFILT_TIMER */
+ { &file_filtops, 1 }, /* EVFILT_PROCDESC */
+ { &fs_filtops, 1 }, /* EVFILT_FS */
{ &null_filtops }, /* EVFILT_LIO */
- { &user_filtops }, /* EVFILT_USER */
+ { &user_filtops, 1 }, /* EVFILT_USER */
{ &null_filtops }, /* EVFILT_SENDFILE */
};
@@ -465,6 +466,10 @@ knote_fork(struct knlist *list, int pid)
list->kl_lock(list->kl_lockarg);
SLIST_FOREACH(kn, &list->kl_list, kn_selnext) {
+ /*
+* XXX - Why do we skip the kn if it is _INFLUX? Does this
+* mean we will not properly wake up some notes?
+*/
if ((kn->kn_status & KN_INFLUX) == KN_INFLUX)
continue;
kq = kn->kn_kq;
@@ -1002,6 +1007,9 @@ kqueue_fo_find(int filt)
if (filt > 0 || filt + EVFILT_SYSCOUNT < 0)
return NULL;
+ if (sysfilt_ops[~filt].for_nolock)
+ return sysfilt_ops[~filt].for_fop;
+
mtx_lock(&filterops_lock);
sysfilt_ops[~filt].for_refcnt++;
if (sysfilt_ops[~filt].for_fop == NULL)
@@ -1018,6 +1026,9 @@ kqueue_fo_release(int filt)
if (filt > 0 || filt + EVFILT_SYSCOUNT < 0)
return;
+ if (sysfilt_ops[~filt].for_nolock)
+ return;
+
mtx_lock(&filterops_lock);
KASSERT(sysfilt_ops[~filt].for_refcnt > 0,
("filter object refcount not valid on release"));
@@ -1051,7 +1062,10 @@ kqueue_register(struct kqueue *kq, struc
if (fops == NULL)
return EINVAL;
- tkn = knote_alloc(waitok); /* prevent waiting with locks */
+ if (kev->flags & EV_ADD)
+ tkn = knote_alloc(waitok); /* prevent waiting with locks */
+ else
+ tkn = NULL;
findkn:
if (fops->f_isfd) {
@@ -1162,7 +1176,7 @@ findkn:
kev->data = 0;
kn->kn_kevent = *kev;
kn->kn_kevent.flags &= ~(EV_ADD | EV_DELETE |
- EV_ENABLE | EV_DISABLE);
+ EV_ENABLE | EV_DISABLE | EV_FORCEONESHOT);
kn->kn_status = KN_INFLUX|KN_DETACHED;
error = knote_attach(kn, kq);
@@ -1195,6 +1209,11 @@ findkn:
goto done;
}
+ if (kev->flags & EV_FORCEONESHOT) {
+ kn->kn_flags |= EV_ONESHOT;
+ KNOTE_ACTIVATE(kn, 1);
+ }
+
svn commit: r274559 - head/contrib/tzdata
Author: edwin
Date: Sun Nov 16 01:00:39 2014
New Revision: 274559
URL: https://svnweb.freebsd.org/changeset/base/274559
Log:
MFV of 274557,tzdata{2014j}
Release 2014j - 2014-11-10 17:37:11 -0800
Changes affecting current and future time stamps
Turks & Caicos' switch from US eastern time to UTC-4 year-round
did not occur on 2014-11-02 at 02:00. It's currently scheduled
for 2015-11-01 at 02:00. (Thanks to Chris Walton.)
Changes affecting past time stamps
Many pre-1989 time stamps have been corrected for Asia/Seoul and
Asia/Pyongyang, based on sources for the Korean-language Wikipedia
entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no
longer guess that Pyongyang mimicked Seoul time after World War II,
as this is politically implausible.
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
Indian/Mayotte.
Changes affecting commentary
The commentary is less enthusiastic about Shanks as a source,
and is more careful to distinguish UT from UTC.
Modified:
head/contrib/tzdata/africa
head/contrib/tzdata/asia
head/contrib/tzdata/australasia
head/contrib/tzdata/europe
head/contrib/tzdata/northamerica
head/contrib/tzdata/southamerica
Directory Properties:
head/contrib/tzdata/ (props changed)
Modified: head/contrib/tzdata/africa
==
--- head/contrib/tzdata/africa Sun Nov 16 00:50:02 2014(r274558)
+++ head/contrib/tzdata/africa Sun Nov 16 01:00:39 2014(r274559)
@@ -6,20 +6,19 @@
# t...@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time
Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -65,7 +64,6 @@
# 3:00 CASTCentral Africa Summer Time (no longer used)
# 3:00 SASTSouth Africa Summer Time (no longer used)
# 3:00 EAT East Africa Time
-# 4:00 EASTEast Africa Summer Time (no longer used)
# Algeria
# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S
@@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912
1:00- WAT
# Comoros
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
- 3:00- EAT
+# See Africa/Nairobi.
# Democratic Republic of the Congo
# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
@@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S�
Link Africa/Abidjan Atlantic/St_Helena # St Helena
# Djibouti
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
- 3:00- EAT
+# See Africa/Nairobi.
###
@@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct
# See Africa/Lagos.
# Eritrea
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Asmara 2:35:32 - LMT 1870
- 2:35:32 - AMT 1890# Asmara Mean Time
- 2:35:20 - ADMT1936 May 5 # Adis Dera MT
- 3:00- EAT
-
# Ethiopia
-# From Paul Eggert (2014-07-31):
-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
-# 12-hour clock sta
svn commit: r274558 - vendor/tzdata/tzdata2014j
Author: edwin Date: Sun Nov 16 00:50:02 2014 New Revision: 274558 URL: https://svnweb.freebsd.org/changeset/base/274558 Log: Tag of tzdata 2014j Added: vendor/tzdata/tzdata2014j/ - copied from r274557, vendor/tzdata/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r274557 - vendor/tzdata/dist
Author: edwin Date: Sun Nov 16 00:43:41 2014 New Revision: 274557 URL: https://svnweb.freebsd.org/changeset/base/274557 Log: Vendor import of tzdata2014j: Release 2014j - 2014-11-10 17:37:11 -0800 Changes affecting current and future time stamps Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Obtained from: ftp://ftp.iana.org/tz/releases/ Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/europe vendor/tzdata/dist/northamerica vendor/tzdata/dist/southamerica Modified: vendor/tzdata/dist/africa == --- vendor/tzdata/dist/africa Sat Nov 15 23:40:44 2014(r274556) +++ vendor/tzdata/dist/africa Sun Nov 16 00:43:41 2014(r274557) @@ -6,20 +6,19 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2014-10-31): # -# A good source for time zone historical data outside the U.S. is +# Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. # # Gwillim Law writes that a good source # for recent time zone data is the International Air Transport # Association's Standard Schedules Information Manual (IATA SSIM), # published semiannually. Law sent in several helpful summaries -# of the IATA's data after 1990. -# -# Except where otherwise noted, Shanks & Pottenger is the source for -# entries through 1990, and IATA SSIM is the source for entries afterwards. +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. # # Another source occasionally used is Edward W. Whitman, World Time Differences, # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which @@ -65,7 +64,6 @@ # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time -# 4:00 EASTEast Africa Summer Time (no longer used) # Algeria # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912 1:00- WAT # Comoros -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro - 3:00- EAT +# See Africa/Nairobi. # Democratic Republic of the Congo # See Africa/Lagos for the western part and Africa/Maputo for the eastern. @@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S� Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul - 3:00- EAT +# See Africa/Nairobi. ### @@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct # See Africa/Lagos. # Eritrea -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890# Asmara Mean Time - 2:35:20 - ADMT1936 May 5 # Adis Dera MT - 3:00- EAT - # Ethiopia -# From Paul Eggert (2014-07-31): -# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a -# 12-hour clock starting at our 06:
svn commit: r274556 - in head/sys: amd64/amd64 i386/i386 i386/include vm
Author: alc
Date: Sat Nov 15 23:40:44 2014
New Revision: 274556
URL: https://svnweb.freebsd.org/changeset/base/274556
Log:
Enable the use of VM_PHYSSEG_SPARSE on amd64 and i386, making it the default
on i386 PAE. Previously, VM_PHYSSEG_SPARSE could not be used on amd64 and
i386 because vm_page_startup() would not create vm_page structures for the
kernel page table pages allocated during pmap_bootstrap() but those vm_page
structures are needed when the kernel attempts to promote the corresponding
kernel virtual addresses to superpage mappings. To address this problem, a
new public function, vm_phys_add_seg(), is introduced and vm_phys_init() is
updated to reflect the creation of vm_phys_seg structures by calls to
vm_phys_add_seg().
Discussed with: Svatopluk Kraus
MFC after:3 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/amd64/amd64/pmap.c
head/sys/i386/i386/pmap.c
head/sys/i386/include/vmparam.h
head/sys/vm/vm_page.c
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Sat Nov 15 21:25:17 2014(r274555)
+++ head/sys/amd64/amd64/pmap.c Sat Nov 15 23:40:44 2014(r274556)
@@ -833,6 +833,15 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
*/
create_pagetables(firstaddr);
+ /*
+* Add a physical memory segment (vm_phys_seg) corresponding to the
+* preallocated kernel page table pages so that vm_page structures
+* representing these pages will be created. The vm_page structures
+* are required for promotion of the corresponding kernel virtual
+* addresses to superpage mappings.
+*/
+ vm_phys_add_seg(KPTphys, KPTphys + ptoa(nkpt));
+
virtual_avail = (vm_offset_t) KERNBASE + *firstaddr;
virtual_avail = pmap_kmem_choose(virtual_avail);
Modified: head/sys/i386/i386/pmap.c
==
--- head/sys/i386/i386/pmap.c Sat Nov 15 21:25:17 2014(r274555)
+++ head/sys/i386/i386/pmap.c Sat Nov 15 23:40:44 2014(r274556)
@@ -375,6 +375,15 @@ pmap_bootstrap(vm_paddr_t firstaddr)
int i;
/*
+* Add a physical memory segment (vm_phys_seg) corresponding to the
+* preallocated kernel page table pages so that vm_page structures
+* representing these pages will be created. The vm_page structures
+* are required for promotion of the corresponding kernel virtual
+* addresses to superpage mappings.
+*/
+ vm_phys_add_seg(KPTphys, KPTphys + ptoa(nkpt));
+
+ /*
* Initialize the first available kernel virtual address. However,
* using "firstaddr" may waste a few pages of the kernel virtual
* address space, because locore may not have mapped every physical
Modified: head/sys/i386/include/vmparam.h
==
--- head/sys/i386/include/vmparam.h Sat Nov 15 21:25:17 2014
(r274555)
+++ head/sys/i386/include/vmparam.h Sat Nov 15 23:40:44 2014
(r274556)
@@ -64,9 +64,15 @@
#endif
/*
- * The physical address space is densely populated.
+ * Choose between DENSE and SPARSE based on whether lower execution time or
+ * lower kernel address space consumption is desired. Under PAE, kernel
+ * address space is often in short supply.
*/
+#ifdef PAE
+#defineVM_PHYSSEG_SPARSE
+#else
#defineVM_PHYSSEG_DENSE
+#endif
/*
* The number of PHYSSEG entries must be one greater than the number
Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c Sat Nov 15 21:25:17 2014(r274555)
+++ head/sys/vm/vm_page.c Sat Nov 15 23:40:44 2014(r274556)
@@ -304,9 +304,23 @@ vm_page_startup(vm_offset_t vaddr)
phys_avail[i + 1] = trunc_page(phys_avail[i + 1]);
}
+#ifdef XEN
+ /*
+* There is no obvious reason why i386 PV Xen needs vm_page structs
+* created for these pseudo-physical addresses. XXX
+*/
+ vm_phys_add_seg(0, phys_avail[0]);
+#endif
+
low_water = phys_avail[0];
high_water = phys_avail[1];
+ for (i = 0; i < vm_phys_nsegs; i++) {
+ if (vm_phys_segs[i].start < low_water)
+ low_water = vm_phys_segs[i].start;
+ if (vm_phys_segs[i].end > high_water)
+ high_water = vm_phys_segs[i].end;
+ }
for (i = 0; phys_avail[i + 1]; i += 2) {
vm_paddr_t size = phys_avail[i + 1] - phys_avail[i];
@@ -320,10 +334,6 @@ vm_page_startup(vm_offset_t vaddr)
high_water = phys_avail[i + 1];
}
-#ifdef XEN
- low_water = 0;
-#endif
-
end =
svn commit: r274555 - head/sys/amd64/amd64
Author: kib Date: Sat Nov 15 21:25:17 2014 New Revision: 274555 URL: https://svnweb.freebsd.org/changeset/base/274555 Log: Fix END()s for fueword and fueword64, match the name in END() with entry. Submitted by: Jeroen Hofstee MFC after:1 week Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S == --- head/sys/amd64/amd64/support.S Sat Nov 15 20:02:22 2014 (r274554) +++ head/sys/amd64/amd64/support.S Sat Nov 15 21:25:17 2014 (r274555) @@ -426,8 +426,8 @@ ENTRY(fueword) movq%r11,(%rsi) POP_FRAME_POINTER ret -END(fuword64) -END(fuword) +END(fueword64) +END(fueword) ENTRY(fueword32) PUSH_FRAME_POINTER ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r274552 - head/usr.bin/sort
On Nov 15, 2014, at 10:03, Sean Bruno wrote: > Author: sbruno > Date: Sat Nov 15 18:03:38 2014 > New Revision: 274552 > URL: https://svnweb.freebsd.org/changeset/base/274552 > > Log: > Change LDFLAGS to LDADD in order to allow static builds. This is more > proper way to ensure that the command line compile works the way we intend. > > Add explicity DPADD statemens on LIBMD and LIBPTHREAD depending on which > options are used in the build. > > Reviewed by: andrew > MFC after: 2 weeks > > Modified: > head/usr.bin/sort/Makefile Thank you Sean! signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r274552 - head/usr.bin/sort
Author: sbruno
Date: Sat Nov 15 18:03:38 2014
New Revision: 274552
URL: https://svnweb.freebsd.org/changeset/base/274552
Log:
Change LDFLAGS to LDADD in order to allow static builds. This is more
proper way to ensure that the command line compile works the way we intend.
Add explicity DPADD statemens on LIBMD and LIBPTHREAD depending on which
options are used in the build.
Reviewed by: andrew
MFC after:2 weeks
Modified:
head/usr.bin/sort/Makefile
Modified: head/usr.bin/sort/Makefile
==
--- head/usr.bin/sort/Makefile Sat Nov 15 14:55:05 2014(r274551)
+++ head/usr.bin/sort/Makefile Sat Nov 15 18:03:38 2014(r274552)
@@ -13,10 +13,12 @@ CLEANFILES+= sort.1
.if ${MK_SORT_THREADS} != "no"
CFLAGS+= -DSORT_THREADS
-LDFLAGS+= -lpthread -lmd
+LDADD= -lpthread -lmd
+DPADD= ${LIBPTHREAD} ${LIBMD}
MAN_SUB+= -e 's|%%THREADS%%||g'
.else
-LDFLAGS+= -lmd
+LDADD= -lmd
+DPADD= ${LIBMD}
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r274529 - in head/sys: conf modules/if_gif
On Nov 15, 2014, at 12:00 AM, Gleb Smirnoff wrote: > On Fri, Nov 14, 2014 at 09:10:46PM +, Warner Losh wrote: > W> Author: imp > W> Date: Fri Nov 14 21:10:45 2014 > W> New Revision: 274529 > W> URL: https://svnweb.freebsd.org/changeset/base/274529 > W> > W> Log: > W> Automate options INET/INET6 turning into MK_$opt_SUPPORT > W> correctly. Fixes if_gfe when building without INET6 and > W> simplifies if_gif's Makefile. > W> > W> Sponsored by: Netflix, Inc > > Thanks a lot! > > Can the crutch be removed from modules/if_gre/Makefile as well? Yes. I thought I’d caught them all, but missed this one. Will fix, test and commit. Warner signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r274551 - head/usr.sbin/wpa/wpa_cli
Author: bapt
Date: Sat Nov 15 14:55:05 2014
New Revision: 274551
URL: https://svnweb.freebsd.org/changeset/base/274551
Log:
wpa_cli does not use libedit anymore since version 1.0
Modified:
head/usr.sbin/wpa/wpa_cli/Makefile
Modified: head/usr.sbin/wpa/wpa_cli/Makefile
==
--- head/usr.sbin/wpa/wpa_cli/Makefile Sat Nov 15 10:45:10 2014
(r274550)
+++ head/usr.sbin/wpa/wpa_cli/Makefile Sat Nov 15 14:55:05 2014
(r274551)
@@ -14,8 +14,8 @@ CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
# enable use of d_type to identify unix domain sockets
CFLAGS+= -D_DIRENT_HAVE_D_TYPE
-CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit
-LDADD+= -ledit -ltermcapw -lutil
-DPADD+= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL}
+CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
