From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 05:31:27 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B24178D; Sun, 18 Jan 2015 05:31:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48737BD5; Sun, 18 Jan 2015 05:31:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0I5VRZ8005694; Sun, 18 Jan 2015 05:31:27 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0I5VRk7005693; Sun, 18 Jan 2015 05:31:27 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201501180531.t0I5VRk7005693@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Sun, 18 Jan 2015 05:31:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277312 - user/dchagin/lemul/usr.bin/kdump X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 05:31:27 -0000 Author: allanjude (doc committer) Date: Sun Jan 18 05:31:26 2015 New Revision: 277312 URL: https://svnweb.freebsd.org/changeset/base/277312 Log: Fix typo introduced by my previous commit Sponsored by: ScaleEngine Inc. Modified: user/dchagin/lemul/usr.bin/kdump/kdump.c Modified: user/dchagin/lemul/usr.bin/kdump/kdump.c ============================================================================== --- user/dchagin/lemul/usr.bin/kdump/kdump.c Sun Jan 18 03:43:47 2015 (r277311) +++ user/dchagin/lemul/usr.bin/kdump/kdump.c Sun Jan 18 05:31:26 2015 (r277312) @@ -175,7 +175,7 @@ static int bsd_to_linux_errno[ELAST + 1] #if defined(__amd64__) extern const char *linux32_syscallnames[]; #include -static int nlinux_syscalls = sizeof(linux32_syscallnames) / \ +static int nlinux32_syscalls = sizeof(linux32_syscallnames) / \ sizeof(linux32_syscallnames[0]); #endif From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 20:15:48 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2B9A840; Sun, 18 Jan 2015 20:15:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F345A2B; Sun, 18 Jan 2015 20:15:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IKFmx7027701; Sun, 18 Jan 2015 20:15:48 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IKFmiZ027700; Sun, 18 Jan 2015 20:15:48 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501182015.t0IKFmiZ027700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 18 Jan 2015 20:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277336 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 20:15:48 -0000 Author: pho Date: Sun Jan 18 20:15:47 2015 New Revision: 277336 URL: https://svnweb.freebsd.org/changeset/base/277336 Log: Cleanup script: Use full path for test program, fix trailing space and use sig_atomic_t in signal handler. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/alternativeFlushPath.sh Modified: user/pho/stress2/misc/alternativeFlushPath.sh ============================================================================== --- user/pho/stress2/misc/alternativeFlushPath.sh Sun Jan 18 20:00:33 2015 (r277335) +++ user/pho/stress2/misc/alternativeFlushPath.sh Sun Jan 18 20:15:47 2015 (r277336) @@ -48,20 +48,20 @@ rm -rf $dir mkdir -p $dir cd $dir sed '1,/^EOF/d' < $odir/$0 > $dir/alternativeFlushPath.c -cc -o alternativeFlushPath -Wall -Wextra alternativeFlushPath.c +cc -o /tmp/alternativeFlushPath -Wall -Wextra alternativeFlushPath.c rm -f alternativeFlushPath.c for j in `jot 10`; do - ./alternativeFlushPath & + /tmp/alternativeFlushPath & done for j in `jot 10`; do wait done sysctl vfs.altbufferflushes -rm -rf alternativeFlushPath $dir +rm -rf /tmp/alternativeFlushPath $dir -exit +exit EOF #include @@ -74,7 +74,7 @@ EOF #include #include -int more; +static volatile sig_atomic_t more; static void handler(int i __unused) { From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 20:20:50 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4A4BABE; Sun, 18 Jan 2015 20:20:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D157DA51; Sun, 18 Jan 2015 20:20:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IKKoCH030733; Sun, 18 Jan 2015 20:20:50 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IKKo68030732; Sun, 18 Jan 2015 20:20:50 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501182020.t0IKKo68030732@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 18 Jan 2015 20:20:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277338 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 20:20:51 -0000 Author: pho Date: Sun Jan 18 20:20:49 2015 New Revision: 277338 URL: https://svnweb.freebsd.org/changeset/base/277338 Log: Remove trailing blanks. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/f_offset.sh Modified: user/pho/stress2/misc/f_offset.sh ============================================================================== --- user/pho/stress2/misc/f_offset.sh Sun Jan 18 20:20:27 2015 (r277337) +++ user/pho/stress2/misc/f_offset.sh Sun Jan 18 20:20:49 2015 (r277338) @@ -114,7 +114,7 @@ t3(void *arg __unused) if ((offset = lseek(fd, 0, SEEK_CUR)) == -1) err(1, "lseek error"); if (offset != 1 && offset != START + 2) - fprintf(stderr, "FAIL #%d offset = %10jd (0x%09jx)\n", + fprintf(stderr, "FAIL #%d offset = %10jd (0x%09jx)\n", errors++, offset, offset); } @@ -155,6 +155,6 @@ main(void) close(fd); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + return (0); } From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 20:25:42 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5809E36; Sun, 18 Jan 2015 20:25:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2161AFC; Sun, 18 Jan 2015 20:25:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IKPg6k032753; Sun, 18 Jan 2015 20:25:42 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IKPg7V032752; Sun, 18 Jan 2015 20:25:42 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501182025.t0IKPg7V032752@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 18 Jan 2015 20:25:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277339 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 20:25:42 -0000 Author: pho Date: Sun Jan 18 20:25:41 2015 New Revision: 277339 URL: https://svnweb.freebsd.org/changeset/base/277339 Log: Remove trailing blanks and use sig_atomic_t in handler. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/fragments.sh Modified: user/pho/stress2/misc/fragments.sh ============================================================================== --- user/pho/stress2/misc/fragments.sh Sun Jan 18 20:20:49 2015 (r277338) +++ user/pho/stress2/misc/fragments.sh Sun Jan 18 20:25:41 2015 (r277339) @@ -57,7 +57,7 @@ mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint cd $mntpoint -su $testuser -c "/tmp/fragments" +su $testuser -c "/tmp/fragments" cd $here umount $mntpoint @@ -87,7 +87,7 @@ EOF static pid_t pid; static char *buf; -static int stop; +static volatile sig_atomic_t stop; void handler(int i __unused) { @@ -117,7 +117,7 @@ cleanup(int n) sprintf(file,"t%05d", j); if (stat(file, &sb) != 0) continue; - + if (sb.st_size == 0) { unlink(file); continue; @@ -269,7 +269,7 @@ main() alarm(30 * 60); for (j = 0; j < 50 && stop == 0; j++) { for (i = 0; i < PARALLEL; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < PARALLEL; i++) From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 20:28:20 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51886D7; Sun, 18 Jan 2015 20:28:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E058B15; Sun, 18 Jan 2015 20:28:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IKSKRj033160; Sun, 18 Jan 2015 20:28:20 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IKSKn7033159; Sun, 18 Jan 2015 20:28:20 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501182028.t0IKSKn7033159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 18 Jan 2015 20:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277341 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 20:28:20 -0000 Author: pho Date: Sun Jan 18 20:28:19 2015 New Revision: 277341 URL: https://svnweb.freebsd.org/changeset/base/277341 Log: Remove trailing blanks. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/kinfo3.sh Modified: user/pho/stress2/misc/kinfo3.sh ============================================================================== --- user/pho/stress2/misc/kinfo3.sh Sun Jan 18 20:26:27 2015 (r277340) +++ user/pho/stress2/misc/kinfo3.sh Sun Jan 18 20:28:19 2015 (r277341) @@ -37,7 +37,7 @@ odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > kinfo3.c -cc -o kinfo3 -Wall kinfo3.c -lutil -pthread +mycc -o kinfo3 -Wall kinfo3.c -lutil -pthread rm -f kinfo3.c mount | grep -q procfs || mount -t procfs procfs /procfs @@ -181,13 +181,13 @@ main(int argc, char **argv) alarm(30); while(more) churning(); - } + } if (r < 0) { perror("fork"); exit(2); } - while(more) + while(more) list(); return (0); From owner-svn-src-user@FreeBSD.ORG Sun Jan 18 20:32:52 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AFF3256; Sun, 18 Jan 2015 20:32:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77A66BCD; Sun, 18 Jan 2015 20:32:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IKWqec037203; Sun, 18 Jan 2015 20:32:52 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IKWq8H037202; Sun, 18 Jan 2015 20:32:52 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501182032.t0IKWq8H037202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 18 Jan 2015 20:32:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277342 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2015 20:32:52 -0000 Author: pho Date: Sun Jan 18 20:32:51 2015 New Revision: 277342 URL: https://svnweb.freebsd.org/changeset/base/277342 Log: cc was changed to mycc in previous commit, by mistake. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/kinfo3.sh Modified: user/pho/stress2/misc/kinfo3.sh ============================================================================== --- user/pho/stress2/misc/kinfo3.sh Sun Jan 18 20:28:19 2015 (r277341) +++ user/pho/stress2/misc/kinfo3.sh Sun Jan 18 20:32:51 2015 (r277342) @@ -37,7 +37,7 @@ odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > kinfo3.c -mycc -o kinfo3 -Wall kinfo3.c -lutil -pthread +cc -o kinfo3 -Wall kinfo3.c -lutil -pthread rm -f kinfo3.c mount | grep -q procfs || mount -t procfs procfs /procfs From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 12:48:45 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0D93616; Mon, 19 Jan 2015 12:48:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D21B07C5; Mon, 19 Jan 2015 12:48:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JCmibI001452; Mon, 19 Jan 2015 12:48:44 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JCmifs001451; Mon, 19 Jan 2015 12:48:44 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501191248.t0JCmifs001451@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 19 Jan 2015 12:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277381 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 12:48:45 -0000 Author: pho Date: Mon Jan 19 12:48:43 2015 New Revision: 277381 URL: https://svnweb.freebsd.org/changeset/base/277381 Log: Replace killall with pkill, make sure we have RLIMIT_NPTS, add VM pressure, only allow zero or one argument and fix white spaces. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/syscall4.sh Modified: user/pho/stress2/misc/syscall4.sh ============================================================================== --- user/pho/stress2/misc/syscall4.sh Mon Jan 19 11:52:08 2015 (r277380) +++ user/pho/stress2/misc/syscall4.sh Mon Jan 19 12:48:43 2015 (r277381) @@ -35,13 +35,12 @@ . ../default.cfg -killall 2>&1 | grep -q q && q="-q" odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > syscall4.c rm -f /tmp/syscall4 cc -o syscall4 -Wall -Wextra -O2 -g syscall4.c -lpthread || exit 1 -rm -f syscall4.c +#rm -f syscall4.c kldstat -v | grep -q sysvmsg || kldload sysvmsg kldstat -v | grep -q sysvsem || kldload sysvsem @@ -61,24 +60,24 @@ chmod 777 $mntpoint sleeptime=${sleeptime:-12} st=`date '+%s'` while [ $((`date '+%s'` - st)) -lt $((10 * sleeptime)) ]; do + daemon sh -c "(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -k -h)" > /dev/null (cd $mntpoint; /tmp/syscall4 $* ) & start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt $sleeptime ]; do ps aux | grep -v grep | egrep -q "syscall4$" || break sleep .5 done - if ps aux | grep -v grep | egrep -q "syscall4$"; then - killall $q syscall4 - ps aux | grep -v grep | egrep -q "syscall4 " && - killall $q -9 syscall4 - fi + while pkill -9 syscall4; do + : + done wait + pkill -9 swap ipcs | grep nobody | awk '/^(q|m|s)/ {print " -" $1, $2}' | xargs -L 1 ipcrm done -killall $q -9 syscall4 -ps aux | grep -v grep | egrep "syscall4" | egrep -v "\.sh" && - killall $q -9 syscall4 +while pkill -9 syscall4; do + : +done for i in `jot 10`; do mount | grep -q md${mdstart}$part && \ @@ -298,8 +297,10 @@ main(int argc, char **argv) endpwent(); limit.rlim_cur = limit.rlim_max = 1000; +#if defined(RLIMIT_NPTS) if (setrlimit(RLIMIT_NPTS, &limit) < 0) err(1, "setrlimit"); +#endif signal(SIGALRM, hand); signal(SIGILL, hand); @@ -310,10 +311,12 @@ main(int argc, char **argv) signal(SIGSYS, hand); signal(SIGTRAP, hand); + if (argc > 2) + errx(1, "Usage: %s {}", argv[0]); if (argc == 2) { syscallno = atoi(argv[1]); for (j = 0; j < (int)nitems(ignore); j++) - if (syscallno == ignore[j]) + if (syscallno == ignore[j]) errx(0, "syscall #%d is on the ignore list.", syscallno); } @@ -327,11 +330,11 @@ main(int argc, char **argv) if (pthread_create(&rp, NULL, test, NULL) != 0) perror("pthread_create"); usleep(1000); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) if (pthread_create(&cp[j], NULL, calls, NULL) != 0) perror("pthread_create"); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) pthread_join(cp[j], NULL); _exit(0); } From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 12:50:55 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB679796; Mon, 19 Jan 2015 12:50:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D8D6D7F2; Mon, 19 Jan 2015 12:50:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JCotOm004605; Mon, 19 Jan 2015 12:50:55 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JCotxd004604; Mon, 19 Jan 2015 12:50:55 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501191250.t0JCotxd004604@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 19 Jan 2015 12:50:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277382 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 12:50:56 -0000 Author: pho Date: Mon Jan 19 12:50:55 2015 New Revision: 277382 URL: https://svnweb.freebsd.org/changeset/base/277382 Log: Fix error in what should have been a comment. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/sethostname.sh Modified: user/pho/stress2/misc/sethostname.sh ============================================================================== --- user/pho/stress2/misc/sethostname.sh Mon Jan 19 12:48:43 2015 (r277381) +++ user/pho/stress2/misc/sethostname.sh Mon Jan 19 12:50:55 2015 (r277382) @@ -35,4 +35,4 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 export sleeptime=18 -./syscall4.sh 88 /* 88 is old sethostname */ +./syscall4.sh 88 # 88 is old sethostname From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 16:33:59 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DD84C09; Mon, 19 Jan 2015 16:33:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A668632; Mon, 19 Jan 2015 16:33:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JGXxXJ015483; Mon, 19 Jan 2015 16:33:59 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JGXxA3015482; Mon, 19 Jan 2015 16:33:59 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201501191633.t0JGXxA3015482@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Mon, 19 Jan 2015 16:33:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277387 - user/uqs/git_conv X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 16:33:59 -0000 Author: uqs Date: Mon Jan 19 16:33:58 2015 New Revision: 277387 URL: https://svnweb.freebsd.org/changeset/base/277387 Log: Stop pushing to googlecode, it's too unreliable; use the ports' version of svn2git and shut up git 2.0 push warnings. Modified: user/uqs/git_conv/git_conv Modified: user/uqs/git_conv/git_conv ============================================================================== --- user/uqs/git_conv/git_conv Mon Jan 19 16:15:12 2015 (r277386) +++ user/uqs/git_conv/git_conv Mon Jan 19 16:33:58 2015 (r277387) @@ -4,6 +4,7 @@ # # Simple for svn2git repos, need to run against local paths, using rules files in ~git/*.rules # - First svn2git run will create target git repo, then +# - git config --global push.default matching # - git remote add github github.com:freebsd/freebsd.git # - git config --add remote.github.push '+refs/heads/master:refs/heads/master' # - git config --add remote.github.push '+refs/heads/stable/*:refs/heads/stable/*' @@ -19,6 +20,7 @@ # - git svn init -Thead -rewrite-root=svn+ssh://svn.freebsd.org/base file:///home/svn/base src-head.git # - cd src-head.git # - git svn fetch -r 0:1000 +# - git config --global push.default matching # - git remote add github github.com:freebsd/freebsd.git # - git config --add remote.github.push '+refs/remotes/trunk:refs/heads/svn_head' # - git svn rebase @@ -26,7 +28,7 @@ : ${BASE=/home/git} : ${RULES_DIR=${BASE}} -: ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export} +: ${SVN2GIT=/usr/local/bin/svn2git} : ${SRC_REPO=/home/svn/base} : ${DOC_REPO=/home/svn/doc} @@ -128,7 +130,7 @@ esac case "$TYPE" in base) - svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode + svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket #googlecode ;; doc) svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 21:45:52 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3ED01E52; Mon, 19 Jan 2015 21:45:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BA2EDC8; Mon, 19 Jan 2015 21:45:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JLjqHb067284; Mon, 19 Jan 2015 21:45:52 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JLjqk8067283; Mon, 19 Jan 2015 21:45:52 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201501192145.t0JLjqk8067283@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Mon, 19 Jan 2015 21:45:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277400 - user/uqs/git_conv X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 21:45:52 -0000 Author: uqs Date: Mon Jan 19 21:45:51 2015 New Revision: 277400 URL: https://svnweb.freebsd.org/changeset/base/277400 Log: Fix the freebsd-ports git conversion by also handling the new project branches. Modified: user/uqs/git_conv/freebsd-ports.rules Modified: user/uqs/git_conv/freebsd-ports.rules ============================================================================== --- user/uqs/git_conv/freebsd-ports.rules Mon Jan 19 21:40:13 2015 (r277399) +++ user/uqs/git_conv/freebsd-ports.rules Mon Jan 19 21:45:51 2015 (r277400) @@ -16,6 +16,11 @@ match /(branches|tags)/([A-Z0-9_]+)/ branch \1/\2 end match +match /(projects)/([^/]+)/ + repository freebsd-ports.git + branch \1/\2 +end match + # ignore the rest, XXX temp only #match .* #end match From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 21:47:19 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6593F44; Mon, 19 Jan 2015 21:47:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D310BDD8; Mon, 19 Jan 2015 21:47:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JLlJ2K067514; Mon, 19 Jan 2015 21:47:19 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JLlJug067513; Mon, 19 Jan 2015 21:47:19 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201501192147.t0JLlJug067513@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Mon, 19 Jan 2015 21:47:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277401 - user/uqs/git_conv/freebsd-ports.git X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 21:47:20 -0000 Author: uqs Date: Mon Jan 19 21:47:18 2015 New Revision: 277401 URL: https://svnweb.freebsd.org/changeset/base/277401 Log: ... and also export the project branches to github Modified: user/uqs/git_conv/freebsd-ports.git/config Modified: user/uqs/git_conv/freebsd-ports.git/config ============================================================================== --- user/uqs/git_conv/freebsd-ports.git/config Mon Jan 19 21:45:51 2015 (r277400) +++ user/uqs/git_conv/freebsd-ports.git/config Mon Jan 19 21:47:18 2015 (r277401) @@ -6,4 +6,5 @@ url = ports.github.com:freebsd/freebsd-ports.git push = +refs/heads/master:refs/heads/master push = +refs/heads/branches/*:refs/heads/branches/* + push = +refs/heads/projects/*:refs/heads/projects/* push = +refs/notes/*:refs/notes/* From owner-svn-src-user@FreeBSD.ORG Thu Jan 22 19:03:53 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3ADE1393; Thu, 22 Jan 2015 19:03:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21597683; Thu, 22 Jan 2015 19:03:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0MJ3r4F054113; Thu, 22 Jan 2015 19:03:53 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MJ3ipG054066; Thu, 22 Jan 2015 19:03:44 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201501221903.t0MJ3ipG054066@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 22 Jan 2015 19:03:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277535 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2015 19:03:53 -0000 Author: pho Date: Thu Jan 22 19:03:43 2015 New Revision: 277535 URL: https://svnweb.freebsd.org/changeset/base/277535 Log: Remove trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/extattr_set_fd.sh user/pho/stress2/misc/fifo2.sh user/pho/stress2/misc/jail3.sh user/pho/stress2/misc/jail4.sh user/pho/stress2/misc/kevent.sh user/pho/stress2/misc/kevent5.sh user/pho/stress2/misc/kinfo.sh user/pho/stress2/misc/kinfo2.sh user/pho/stress2/misc/linger.sh user/pho/stress2/misc/linger4.sh user/pho/stress2/misc/namecache2.sh user/pho/stress2/misc/nullfs11.sh user/pho/stress2/misc/nullfs5.sh user/pho/stress2/misc/posix_fadvise.sh user/pho/stress2/misc/rename10.sh user/pho/stress2/misc/rename5.sh user/pho/stress2/misc/rename7.sh user/pho/stress2/misc/sem.sh user/pho/stress2/misc/sendfile.sh user/pho/stress2/misc/sendfile2.sh user/pho/stress2/misc/sigstop.sh user/pho/stress2/misc/suj10.sh user/pho/stress2/misc/suj17.sh user/pho/stress2/misc/suj32.sh user/pho/stress2/misc/suj5.sh user/pho/stress2/misc/swap2.sh user/pho/stress2/misc/symlink.sh user/pho/stress2/misc/truncate.sh user/pho/stress2/misc/truncate2.sh user/pho/stress2/misc/truncate3.sh user/pho/stress2/misc/vunref.sh Modified: user/pho/stress2/misc/extattr_set_fd.sh ============================================================================== --- user/pho/stress2/misc/extattr_set_fd.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/extattr_set_fd.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -69,7 +69,7 @@ char buf[4096]; int main(void) { - int fd; + int fd; if ((fd = open("theFile", O_RDWR | O_CREAT, 0622)) == -1) err(1, "open(%s)", "theFile"); Modified: user/pho/stress2/misc/fifo2.sh ============================================================================== --- user/pho/stress2/misc/fifo2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/fifo2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -200,11 +200,11 @@ main(void) while ((time(NULL) - start) < 120) { if (fork() == 0) { arc4random_stir(); - for (j = 0; j < 1; j++) + for (j = 0; j < 1; j++) if (pthread_create(&cp[j], NULL, calls, NULL) != 0) perror("pthread_create"); - for (j = 0; j < 1; j++) + for (j = 0; j < 1; j++) pthread_join(cp[j], NULL); _exit(0); } Modified: user/pho/stress2/misc/jail3.sh ============================================================================== --- user/pho/stress2/misc/jail3.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/jail3.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -56,7 +56,7 @@ main() version = 0x0, path = 0x2809cd61
, hostname = 0x2809b650
, - jailname = 0x0, + jailname = 0x0, ip4s = 0x1, ip6s = 0x0, ip4 = 0x0, Modified: user/pho/stress2/misc/jail4.sh ============================================================================== --- user/pho/stress2/misc/jail4.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/jail4.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -57,7 +57,7 @@ main() /* version = 0x2, path = 0x28190cb1
, - hostname = 0x28167b90
, + hostname = 0x28167b90
, jailname = 0x28198700
, ip4s = 0x0, ip6s = 0x0, Modified: user/pho/stress2/misc/kevent.sh ============================================================================== --- user/pho/stress2/misc/kevent.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kevent.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -170,6 +170,6 @@ main(int argc, char **argv) if (pthread_cond_destroy(&cond) == -1) err(1, "pthread_condattr_destroy"); } - + return (0); } Modified: user/pho/stress2/misc/kevent5.sh ============================================================================== --- user/pho/stress2/misc/kevent5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kevent5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -99,7 +99,7 @@ test(void) { close(kq); /* Once the rendezvous file is gone create a new kevent */ - + if ((fd = open(file2, O_RDONLY, 0)) == -1) err(1, "open(%s)(2)", file2); Modified: user/pho/stress2/misc/kinfo.sh ============================================================================== --- user/pho/stress2/misc/kinfo.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kinfo.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -151,13 +151,13 @@ main(int argc, char **argv) alarm(60); for (;;) churning(); - } + } if (r < 0) { perror("fork"); exit(2); } - for (;;) + for (;;) list(); return (0); Modified: user/pho/stress2/misc/kinfo2.sh ============================================================================== --- user/pho/stress2/misc/kinfo2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kinfo2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -127,7 +127,7 @@ list(void) for (;;) { #if 0 printf("name: %-10s, inode %7d, type %2d, namelen %d, d_reclen %d\n", - dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, + dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, dp->d_reclen); fflush(stdout); #endif @@ -163,13 +163,13 @@ main(int argc, char **argv) alarm(60); for (;;) churning(); - } + } if (r < 0) { perror("fork"); exit(2); } - for (;;) + for (;;) list(); return (0); Modified: user/pho/stress2/misc/linger.sh ============================================================================== --- user/pho/stress2/misc/linger.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/linger.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -120,7 +120,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) warn("unlink(%s)", file); - + } return (0); } @@ -145,7 +145,7 @@ main(void) if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); - + for (j = 0; j < PARALLEL; j++) { wait(&status); error += status; Modified: user/pho/stress2/misc/linger4.sh ============================================================================== --- user/pho/stress2/misc/linger4.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/linger4.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -115,7 +115,7 @@ Creat(int loopno) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } chdir (".."); if (rmdir(path) == -1) Modified: user/pho/stress2/misc/namecache2.sh ============================================================================== --- user/pho/stress2/misc/namecache2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/namecache2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -128,7 +128,7 @@ statThread(void *arg __unused) return 0; } -int +int main(void) { char filename1 [20], filename2[20], filename3[20]; Modified: user/pho/stress2/misc/nullfs11.sh ============================================================================== --- user/pho/stress2/misc/nullfs11.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/nullfs11.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -73,7 +73,7 @@ test() { s=`date '+%s'` for i in `jot $parallel`; do (mkdir $mp2/test$i; cd $mp2/test$i; \ - /tmp/fstool -l -f 50 -n 500 -s $((i * 4))k) & + /tmp/fstool -l -f 50 -n 500 -s $((i * 4))k) & done for i in `jot $parallel`; do wait Modified: user/pho/stress2/misc/nullfs5.sh ============================================================================== --- user/pho/stress2/misc/nullfs5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/nullfs5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -59,7 +59,7 @@ mount -t nullfs `dirname $RUNDIR` $mp export RUNDIR=`pwd`/mp1/stressX export runRUNTIME=10m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) umount $mp 2>&1 | grep -v busy Modified: user/pho/stress2/misc/posix_fadvise.sh ============================================================================== --- user/pho/stress2/misc/posix_fadvise.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/posix_fadvise.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -39,7 +39,7 @@ sed '1,/^EOF/d' < $odir/$0 > posix_fadvi cc -o posix_fadvise -Wall -Wextra -O2 -g posix_fadvise.c n1=`vmstat -m | grep fadvise | awk '{print $2 + 0}'` -/tmp/posix_fadvise +/tmp/posix_fadvise n2=`vmstat -m | grep fadvise | awk '{print $2 + 0}'` if [ $((n2 - n1)) -gt 10 ]; then echo FAIL Modified: user/pho/stress2/misc/rename10.sh ============================================================================== --- user/pho/stress2/misc/rename10.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename10.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -131,7 +131,7 @@ spin(void) _exit(0); } -void +void renamer() { int fd, i; @@ -176,6 +176,6 @@ main() { for (i = 0; i < PARALLEL * 2; i++) wait(NULL); wait(NULL); - + return (0); } Modified: user/pho/stress2/misc/rename5.sh ============================================================================== --- user/pho/stress2/misc/rename5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -122,7 +122,7 @@ main() } for (i = 0; i < 2; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 2; i++) Modified: user/pho/stress2/misc/rename7.sh ============================================================================== --- user/pho/stress2/misc/rename7.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename7.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -34,7 +34,7 @@ # $ umount /mnt # umount: unmount of /mnt failed: Device busy # $ umount -f /mnt -# $ +# $ . ../default.cfg Modified: user/pho/stress2/misc/sem.sh ============================================================================== --- user/pho/stress2/misc/sem.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sem.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); int semid = -1; key_t semkey; -struct sembuf sop[2]; +struct sembuf sop[2]; size_t pgsize; pid_t pid; Modified: user/pho/stress2/misc/sendfile.sh ============================================================================== --- user/pho/stress2/misc/sendfile.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sendfile.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -208,7 +208,7 @@ main(int argc, char **argv) } else if (pid > 0) { reader(); kill(pid, SIGINT); - } else + } else err(1, "fork(), %s:%d", __FILE__, __LINE__); return (0); Modified: user/pho/stress2/misc/sendfile2.sh ============================================================================== --- user/pho/stress2/misc/sendfile2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sendfile2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -141,4 +141,4 @@ main () { } return (0); -} +} Modified: user/pho/stress2/misc/sigstop.sh ============================================================================== --- user/pho/stress2/misc/sigstop.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sigstop.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -42,7 +42,7 @@ cc -o sigstop -Wall -Wextra sigstop.c || rm -f sigstop.c cd $here -su $testuser -c "/tmp/sigstop" +su $testuser -c "/tmp/sigstop" rm -f /tmp/sigstop exit Modified: user/pho/stress2/misc/suj10.sh ============================================================================== --- user/pho/stress2/misc/suj10.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj10.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -140,7 +140,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (rmdir(file) == -1) err(3, "unlink(%s)", file); - + } chdir(".."); sprintf(file,"d%05d", pid); @@ -168,7 +168,7 @@ main(void) if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); - + for (j = 0; j < PARALLEL; j++) wait(NULL); Modified: user/pho/stress2/misc/suj17.sh ============================================================================== --- user/pho/stress2/misc/suj17.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj17.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -121,7 +121,7 @@ main() for (i = 0; i < 1; i++) { for (j = 0; j < 6; j++) { - if (fork() == 0) + if (fork() == 0) test(); } if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) Modified: user/pho/stress2/misc/suj32.sh ============================================================================== --- user/pho/stress2/misc/suj32.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj32.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -90,6 +90,6 @@ main(void) if (mkdir(name, 00700) == -1) err(1, "mkdir(%s)", name); } - + return (0); } Modified: user/pho/stress2/misc/suj5.sh ============================================================================== --- user/pho/stress2/misc/suj5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -103,7 +103,7 @@ test(int size) sprintf(file,"p%05d", getpid()); - if ((fd = creat(file, 0660)) == -1) + if ((fd = creat(file, 0660)) == -1) err(1, "creat(%s)", file); to = sizeof(buf); Modified: user/pho/stress2/misc/swap2.sh ============================================================================== --- user/pho/stress2/misc/swap2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/swap2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -114,7 +114,7 @@ setup(void) printf("setup: pid %d. Total %luMb\n", getpid(), size / 1024 / 1024 * INCARNATIONS); #endif - + if (size == 0) errx(1, "Argument too small"); Modified: user/pho/stress2/misc/symlink.sh ============================================================================== --- user/pho/stress2/misc/symlink.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/symlink.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -123,7 +123,7 @@ main(int argc, char **argv) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } return (0); } Modified: user/pho/stress2/misc/truncate.sh ============================================================================== --- user/pho/stress2/misc/truncate.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -91,7 +91,7 @@ main(void) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/truncate2.sh ============================================================================== --- user/pho/stress2/misc/truncate2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -42,7 +42,7 @@ cd $RUNDIR sleep 1 while ps | grep -v grep | egrep -q "truncate2$"; do - $here/../testcases/swap/swap -t 2m -i 20 + $here/../testcases/swap/swap -t 2m -i 20 done rm -f /tmp/truncate2 @@ -91,7 +91,7 @@ main(int argc, char **argv) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/truncate3.sh ============================================================================== --- user/pho/stress2/misc/truncate3.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate3.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -114,7 +114,7 @@ main(int argc, char **argv) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/vunref.sh ============================================================================== --- user/pho/stress2/misc/vunref.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/vunref.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -72,7 +72,7 @@ if [ $# -eq 0 ]; then sleep 2 while [ ! -z "`ls $RUNDIR/active.* 2>/dev/null`" ] ; do - ../testcases/swap/swap -t 2m -i 20 + ../testcases/swap/swap -t 2m -i 20 done for i in `jot $mounts`; do @@ -215,7 +215,7 @@ main() return (1); for (i = 0; i < 2; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 2; i++) From owner-svn-src-user@FreeBSD.ORG Fri Jan 23 21:44:53 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60739F92; Fri, 23 Jan 2015 21:44:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40E2A89D; Fri, 23 Jan 2015 21:44:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NLireF018466; Fri, 23 Jan 2015 21:44:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NLiqjq018463; Fri, 23 Jan 2015 21:44:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201501232144.t0NLiqjq018463@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 23 Jan 2015 21:44:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277613 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2015 21:44:53 -0000 Author: gjb Date: Fri Jan 23 21:44:52 2015 New Revision: 277613 URL: https://svnweb.freebsd.org/changeset/base/277613 Log: Syncronize thermite.sh after recent changes: - Prefix output lines with a timestamp in info() and verbose(). - In prebuild_setup(), fix output when creating work directories. - Use 'releasesrc' to determine from which branch to checkout the release/ directory, which defaults to 'head'. - In build_release(), use set(1) instead of printenv(1) to print the environment to the log file for debugging - Remove build_vmimage(), which is no longer needed. - Add '-d' flag for debugging, which invokes verbose(). Update the configuration file to closer match what is used for weekly snapshot builds. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/master.conf user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/master.conf ============================================================================== --- user/gjb/thermite/master.conf Fri Jan 23 21:34:08 2015 (r277612) +++ user/gjb/thermite/master.conf Fri Jan 23 21:44:52 2015 (r277613) @@ -10,26 +10,42 @@ use_zfs=1 emailgoesto= scriptdir="$(dirname $(realpath ${0}))" -mkdir -p ${scriptdir}/../release -srcdir="$(realpath ${scriptdir}/../release)" -mkdir -p ${scriptdir}/../logs -logdir="$(realpath ${scriptdir}/../logs)" -mkdir -p ${scriptdir}/../chroots -chroots="$(realpath ${scriptdir}/../chroots)" +srcdir="${scriptdir}/../release" +logdir="${scriptdir}/../logs" +chroots="${scriptdir}/../chroots" +releasesrc="head" heads="11" -stables="10 9" +stables= revs="${heads} ${stables}" -archs="amd64 i386 ia64 powerpc powerpc64 sparc64 armv6" +archs="amd64 i386 powerpc powerpc64 sparc64 armv6" types="snap" x86_kernels="GENERIC" -armv6_kernels="BEAGLEBONE RPI-B PANDABOARD WANDBOARD-QUAD" +armv6_kernels="BEAGLEBONE RPI-B PANDABOARD WANDBOARD-QUAD ZEDBOARD" kernels="${x86_kernels} GENERIC64 ${armv6_kernels}" +ftpdir="/relengftp" +ftpsubdir= + zfs_root="zroot" zfs_mount="releng" zfs_parent="${zfs_root}/${zfs_mount}" +relengdir="/releng" + +__WRKDIR_PREFIX="${relengdir}" +BUILDSVNREV="rHEAD" +BUILDDATE="$(date +%Y%m%d)" +SVNROOT="svn://svn.FreeBSD.org/" + +KERNEL="GENERIC" +WORLD_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" +KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))" + +CHROOTBUILD_SKIP=1 +SRC_UPDATE_SKIP=1 +PORTS_UPDATE_SKIP=1 +DOC_UPDATE_SKIP=1 Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Fri Jan 23 21:34:08 2015 (r277612) +++ user/gjb/thermite/thermite.sh Fri Jan 23 21:44:52 2015 (r277613) @@ -42,7 +42,7 @@ usage() { info() { out="${@}" - printf "INFO:\t${out}\n" >/dev/stdout + printf "$(date +%Y%m%d-%H:%M:%S)\tINFO:\t${out}\n" >/dev/stdout unset out } @@ -51,7 +51,7 @@ verbose() { return 0 fi out="${@}" - printf "DEBUG:\t${out}\n" >/dev/stdout + printf "$(date +%Y%m%d-%H:%M:%S)\tDEBUG:\t${out}\n" >/dev/stdout unset out } @@ -218,10 +218,14 @@ zfs_bootstrap() { prebuild_setup() { info "Creating ${logdir}" + mkdir -p ${logdir} info "Creating ${srcdir}" - mkdir -p "${logdir}" "${srcdir}" + mkdir -p ${srcdir} + info "Creating ${chroots}" + mkdir -p ${chroots} info "Checking out src/release to ${srcdir}" - svn co -q --force svn://svn.freebsd.org/base/head/release ${srcdir} + svn co -q --force svn://svn.freebsd.org/base/${releasesrc}/release \ + ${srcdir} info "Reverting any changes to ${srcdir}" svn revert -R ${srcdir} } @@ -244,8 +248,9 @@ build_release() { _conf="${scriptdir}/${_build}.conf" source_config || return 0 info "Building release: ${_build}" - printenv >> ${logdir}/${_build}.log - env -i /bin/sh ${srcdir}/release.sh -c ${_conf} \ + set >> ${logdir}/${_build}.log + env -i __BUILDCONFDIR="${__BUILDCONFDIR}" \ + /bin/sh ${srcdir}/release.sh -c ${_conf} \ >> ${logdir}/${_build}.log 2>&1 send_logmail ${logdir}/${_build}.log ${_build} @@ -264,33 +269,6 @@ build_release() { unset _build _conf } -build_vmimage() { - _build="${rev}-${arch}-${kernel}-${type}" - _conf="${scriptdir}/${_build}.conf" - source_config || return 0 - - case ${arch} in - amd64|i386) - # continue - ;; - *) - return 0 - ;; - esac - case ${kernel} in - GENERIC) - info "Building vm image: ${_build}" - env -i /bin/sh ${scriptdir}/mk-vmimage.sh -c ${_conf} \ - >> ${logdir}/${_build}.log 2>&1 - ;; - *) - return 0 - ;; - esac - send_logmail ${logdir}/${_build}.log ${_build} - unset _build _conf -} - # Install amd64/i386 "seed" chroots for all branches being built. install_chroots() { source_config || return 0 @@ -379,13 +357,18 @@ build_chroots() { } main() { - mkdir -p ../chroots/ ../logs/ ../release/ - while getopts c: opt; do + releasesrc="head" + export __BUILDCONFDIR="$(dirname $(realpath ${0}))" + + while getopts "c:d" opt; do case ${opt} in c) CONF=${OPTARG} [ -e ${CONF} ] && . $(realpath ${CONF}) ;; + d) + debug=1 + ;; \?) usage ;; @@ -400,7 +383,6 @@ main() { runall build_chroots runall install_chroots runall build_release - runall build_vmimage } main "$@" From owner-svn-src-user@FreeBSD.ORG Fri Jan 23 21:46:00 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB66BFB; Fri, 23 Jan 2015 21:46:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9868E8B0; Fri, 23 Jan 2015 21:46:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NLk0GH018697; Fri, 23 Jan 2015 21:46:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NLk0Ne018696; Fri, 23 Jan 2015 21:46:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201501232146.t0NLk0Ne018696@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 23 Jan 2015 21:46:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277614 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2015 21:46:00 -0000 Author: gjb Date: Fri Jan 23 21:45:59 2015 New Revision: 277614 URL: https://svnweb.freebsd.org/changeset/base/277614 Log: Update copyright year. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Fri Jan 23 21:44:52 2015 (r277613) +++ user/gjb/thermite/thermite.sh Fri Jan 23 21:45:59 2015 (r277614) @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013, 2014 The FreeBSD Foundation +# Copyright (c) 2013-2015 The FreeBSD Foundation # Copyright (c) 2012, 2013 Glen Barber # All rights reserved. # From owner-svn-src-user@FreeBSD.ORG Fri Jan 23 21:47:53 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1ECB01FA; Fri, 23 Jan 2015 21:47:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 053988C6; Fri, 23 Jan 2015 21:47:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NLlqI4019049; Fri, 23 Jan 2015 21:47:52 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NLlkFn018950; Fri, 23 Jan 2015 21:47:46 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201501232147.t0NLlkFn018950@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Fri, 23 Jan 2015 21:47:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277615 - in user/dchagin/lemul: . bin/expr bin/expr/tests bin/freebsd-version bin/ln cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2015 21:47:53 -0000 Author: dchagin Date: Fri Jan 23 21:47:44 2015 New Revision: 277615 URL: https://svnweb.freebsd.org/changeset/base/277615 Log: Merge from head. Added: user/dchagin/lemul/bin/expr/tests/ - copied from r277611, head/bin/expr/tests/ user/dchagin/lemul/contrib/libxo/libxo/xo_error.3 - copied unchanged from r277611, head/contrib/libxo/libxo/xo_error.3 user/dchagin/lemul/contrib/libxo/packaging/libxo.rb.base.in - copied unchanged from r277611, head/contrib/libxo/packaging/libxo.rb.base.in user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.H.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.H.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.H.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.H.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.HIPx.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.HIPx.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.HIPx.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.HIPx.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.HP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.HP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.HP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.HP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.J.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.J.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.J.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.J.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.JP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.JP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.JP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.JP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.T.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.T.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.T.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.T.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.X.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.X.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.X.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.X.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.XP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.XP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_08.XP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_08.XP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.H.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.H.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.H.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.H.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.HIPx.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.HIPx.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.HIPx.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.HIPx.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.HP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.HP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.HP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.HP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.J.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.J.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.J.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.J.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.JP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.JP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.JP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.JP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.T.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.T.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.T.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.T.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.X.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.X.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.X.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.X.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.XP.err - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.XP.err user/dchagin/lemul/contrib/libxo/tests/core/saved/test_09.XP.out - copied unchanged from r277611, head/contrib/libxo/tests/core/saved/test_09.XP.out user/dchagin/lemul/contrib/libxo/tests/core/test_08.c - copied unchanged from r277611, head/contrib/libxo/tests/core/test_08.c user/dchagin/lemul/contrib/libxo/tests/core/test_09.c - copied unchanged from r277611, head/contrib/libxo/tests/core/test_09.c user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsABIInfo.cpp - copied unchanged from r277611, head/contrib/llvm/lib/Target/Mips/MipsABIInfo.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsABIInfo.h - copied unchanged from r277611, head/contrib/llvm/lib/Target/Mips/MipsABIInfo.h user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsCCState.cpp - copied unchanged from r277611, head/contrib/llvm/lib/Target/Mips/MipsCCState.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsCCState.h - copied unchanged from r277611, head/contrib/llvm/lib/Target/Mips/MipsCCState.h user/dchagin/lemul/contrib/llvm/patches/patch-07-llvm-r216989-r216990-fix-movw-armv6.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-07-llvm-r216989-r216990-fix-movw-armv6.diff user/dchagin/lemul/contrib/llvm/patches/patch-08-clang-r217410-i386-garbage-float.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-08-clang-r217410-i386-garbage-float.diff user/dchagin/lemul/contrib/llvm/patches/patch-09-llvm-r221709-debug-oom.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-09-llvm-r221709-debug-oom.diff user/dchagin/lemul/contrib/llvm/patches/patch-10-llvm-r222562-loop-rotate.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-10-llvm-r222562-loop-rotate.diff user/dchagin/lemul/contrib/llvm/patches/patch-11-add-llvm-gvn-option.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-11-add-llvm-gvn-option.diff user/dchagin/lemul/contrib/llvm/patches/patch-12-llvm-r218241-dwarf2-warning.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-12-llvm-r218241-dwarf2-warning.diff user/dchagin/lemul/contrib/llvm/patches/patch-13-llvm-r215352-aarch64-dyn-loader.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-13-llvm-r215352-aarch64-dyn-loader.diff user/dchagin/lemul/contrib/llvm/patches/patch-14-llvm-r216571-dynamiclib-usability.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-14-llvm-r216571-dynamiclib-usability.diff user/dchagin/lemul/contrib/llvm/patches/patch-15-clang-r221900-freebsd-aarch64.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-15-clang-r221900-freebsd-aarch64.diff user/dchagin/lemul/contrib/llvm/patches/patch-16-llvm-r222856-libapr-miscompile.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-16-llvm-r222856-libapr-miscompile.diff user/dchagin/lemul/contrib/llvm/patches/patch-17-llvm-r214802-armv6-cp10-cp11.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-17-llvm-r214802-armv6-cp10-cp11.diff user/dchagin/lemul/contrib/llvm/patches/patch-18-llvm-r215811-arm-fpu-directive.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-18-llvm-r215811-arm-fpu-directive.diff user/dchagin/lemul/contrib/llvm/patches/patch-19-enable-armv6-clrex.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-19-enable-armv6-clrex.diff user/dchagin/lemul/contrib/llvm/patches/patch-20-llvm-r223147-arm-cpu-directive.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-20-llvm-r223147-arm-cpu-directive.diff user/dchagin/lemul/contrib/llvm/patches/patch-21-llvm-r221170-ppc-vaarg.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-21-llvm-r221170-ppc-vaarg.diff user/dchagin/lemul/contrib/llvm/patches/patch-22-llvm-r221791-ppc-small-pic.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-22-llvm-r221791-ppc-small-pic.diff user/dchagin/lemul/contrib/llvm/patches/patch-23-llvm-r224415-ppc-local.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-23-llvm-r224415-ppc-local.diff user/dchagin/lemul/contrib/llvm/patches/patch-24-llvm-r213890-ppc-eh_frame.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-24-llvm-r213890-ppc-eh_frame.diff user/dchagin/lemul/contrib/llvm/patches/patch-25-llvm-r224890-ppc-ctr-tls-loop.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-25-llvm-r224890-ppc-ctr-tls-loop.diff user/dchagin/lemul/contrib/llvm/patches/patch-26-clang-r213790-type_traits-crash.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-26-clang-r213790-type_traits-crash.diff user/dchagin/lemul/contrib/llvm/patches/patch-27-llvm-r222587-arm-add-pc.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-27-llvm-r222587-arm-add-pc.diff user/dchagin/lemul/contrib/llvm/patches/patch-28-llvm-r222292-aarch64-no-neon.diff - copied unchanged from r277611, head/contrib/llvm/patches/patch-28-llvm-r222292-aarch64-no-neon.diff user/dchagin/lemul/etc/newsyslog.conf.d/ - copied from r277611, head/etc/newsyslog.conf.d/ user/dchagin/lemul/lib/libc/sys/futimens.c - copied unchanged from r277611, head/lib/libc/sys/futimens.c user/dchagin/lemul/lib/libc/sys/utimensat.2 - copied unchanged from r277611, head/lib/libc/sys/utimensat.2 user/dchagin/lemul/lib/libc/sys/utimensat.c - copied unchanged from r277611, head/lib/libc/sys/utimensat.c user/dchagin/lemul/lib/libthr/arch/common/ - copied from r277611, head/lib/libthr/arch/common/ user/dchagin/lemul/lib/libthr/thread/thr_ctrdtr.c - copied unchanged from r277611, head/lib/libthr/thread/thr_ctrdtr.c user/dchagin/lemul/release/Makefile.vm - copied unchanged from r277611, head/release/Makefile.vm user/dchagin/lemul/release/scripts/mk-vmimage.sh - copied unchanged from r277611, head/release/scripts/mk-vmimage.sh user/dchagin/lemul/release/tools/gce.conf - copied unchanged from r277611, head/release/tools/gce.conf user/dchagin/lemul/release/tools/openstack.conf - copied unchanged from r277611, head/release/tools/openstack.conf user/dchagin/lemul/release/tools/vmimage.subr - copied unchanged from r277611, head/release/tools/vmimage.subr user/dchagin/lemul/sys/arm/arm/bus_space_base.c - copied unchanged from r277611, head/sys/arm/arm/bus_space_base.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_stolen.c - copied unchanged from r277611, head/sys/dev/drm2/i915/i915_gem_stolen.c user/dchagin/lemul/sys/dev/drm2/i915/intel_ddi.c - copied unchanged from r277611, head/sys/dev/drm2/i915/intel_ddi.c user/dchagin/lemul/sys/dev/drm2/i915/intel_pm.c - copied unchanged from r277611, head/sys/dev/drm2/i915/intel_pm.c user/dchagin/lemul/sys/modules/linuxapi/ - copied from r277611, head/sys/modules/linuxapi/ user/dchagin/lemul/sys/net/rss_config.c - copied unchanged from r277611, head/sys/net/rss_config.c user/dchagin/lemul/sys/net/rss_config.h - copied unchanged from r277611, head/sys/net/rss_config.h user/dchagin/lemul/sys/net/toeplitz.c - copied unchanged from r277611, head/sys/net/toeplitz.c user/dchagin/lemul/sys/net/toeplitz.h - copied unchanged from r277611, head/sys/net/toeplitz.h user/dchagin/lemul/sys/netinet6/in6_rss.c - copied unchanged from r277611, head/sys/netinet6/in6_rss.c user/dchagin/lemul/sys/netinet6/in6_rss.h - copied unchanged from r277611, head/sys/netinet6/in6_rss.h user/dchagin/lemul/sys/ofed/include/linux/linux_kmod.c - copied unchanged from r277611, head/sys/ofed/include/linux/linux_kmod.c user/dchagin/lemul/sys/ofed/include/linux/linux_pci.c - copied unchanged from r277611, head/sys/ofed/include/linux/linux_pci.c Deleted: user/dchagin/lemul/contrib/llvm/patches/patch-07-llvm-r213960-ppc32-tls.diff user/dchagin/lemul/contrib/llvm/patches/patch-08-llvm-r216989-r216990-fix-movw-armv6.diff user/dchagin/lemul/contrib/llvm/patches/patch-09-clang-r217410-i386-garbage-float.diff user/dchagin/lemul/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff user/dchagin/lemul/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff user/dchagin/lemul/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff user/dchagin/lemul/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff user/dchagin/lemul/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff user/dchagin/lemul/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff user/dchagin/lemul/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff user/dchagin/lemul/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff user/dchagin/lemul/contrib/llvm/patches/patch-18-llvm-r214802-armv6-cp10-cp11.diff user/dchagin/lemul/contrib/llvm/patches/patch-19-llvm-r215811-arm-fpu-directive.diff user/dchagin/lemul/contrib/llvm/patches/patch-20-enable-armv6-clrex.diff user/dchagin/lemul/contrib/llvm/patches/patch-21-llvm-r223171-fix-vectorizer.diff user/dchagin/lemul/contrib/llvm/patches/patch-22-llvm-r223147-arm-cpu-directive.diff user/dchagin/lemul/contrib/llvm/patches/patch-23-llvm-r221170-ppc-vaarg.diff user/dchagin/lemul/contrib/llvm/patches/patch-24-llvm-r221791-ppc-small-pic.diff user/dchagin/lemul/contrib/llvm/patches/patch-25-llvm-r224415-ppc-local.diff user/dchagin/lemul/contrib/llvm/patches/patch-26-llvm-r213890-ppc-eh_frame.diff user/dchagin/lemul/contrib/llvm/patches/patch-27-llvm-r221703-ppc-tls_get_addr.diff user/dchagin/lemul/contrib/llvm/patches/patch-28-llvm-r224890-ppc-ctr-tls-loop.diff user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-r213790-type_traits-crash.diff user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r222587-arm-add-pc.diff user/dchagin/lemul/contrib/llvm/patches/patch-31-llvm-r222292-aarch64-no-neon.diff user/dchagin/lemul/lib/libthr/arch/amd64/amd64/pthread_md.c user/dchagin/lemul/lib/libthr/arch/arm/Makefile.inc user/dchagin/lemul/lib/libthr/arch/arm/arm/ user/dchagin/lemul/lib/libthr/arch/i386/i386/pthread_md.c user/dchagin/lemul/lib/libthr/arch/mips/Makefile.inc user/dchagin/lemul/lib/libthr/arch/mips/mips/ user/dchagin/lemul/lib/libthr/arch/powerpc/Makefile.inc user/dchagin/lemul/lib/libthr/arch/powerpc/powerpc/ user/dchagin/lemul/lib/libthr/arch/sparc64/sparc64/pthread_md.c user/dchagin/lemul/release/amd64/mk-azure.sh user/dchagin/lemul/release/amd64/mk-vmimage.sh user/dchagin/lemul/release/i386/mk-azure.sh user/dchagin/lemul/release/i386/mk-vmimage.sh user/dchagin/lemul/sys/arm/arm/bus_space-v6.c user/dchagin/lemul/sys/arm/lpc/lpc_space.c user/dchagin/lemul/sys/arm/mv/bus_space.c user/dchagin/lemul/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c user/dchagin/lemul/sys/arm/versatile/bus_space.c user/dchagin/lemul/sys/arm/versatile/versatile_pci_bus_space.c user/dchagin/lemul/sys/arm/versatile/versatile_pci_bus_space.h user/dchagin/lemul/sys/arm/xilinx/zy7_bus_space.c user/dchagin/lemul/sys/arm/xscale/i80321/obio_space.c user/dchagin/lemul/sys/arm/xscale/i8134x/obio_space.c user/dchagin/lemul/sys/netinet/toeplitz.c user/dchagin/lemul/sys/netinet/toeplitz.h user/dchagin/lemul/tools/regression/lib/libc/stdio/test-fmemopen.t Modified: user/dchagin/lemul/Makefile.inc1 user/dchagin/lemul/ObsoleteFiles.inc user/dchagin/lemul/UPDATING user/dchagin/lemul/bin/expr/Makefile user/dchagin/lemul/bin/freebsd-version/Makefile user/dchagin/lemul/bin/ln/symlink.7 user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/sym.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h user/dchagin/lemul/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/alist.h user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c user/dchagin/lemul/cddl/contrib/opensolaris/common/util/strtolctype.h user/dchagin/lemul/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/output.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/util.c user/dchagin/lemul/contrib/ee/ee.1 user/dchagin/lemul/contrib/elftoolchain/common/elfdefinitions.h user/dchagin/lemul/contrib/elftoolchain/readelf/readelf.c user/dchagin/lemul/contrib/gdb/gdb/remote.c user/dchagin/lemul/contrib/gdb/gdb/std-regs.c user/dchagin/lemul/contrib/libxo/Makefile.am user/dchagin/lemul/contrib/libxo/bin/Zaliases user/dchagin/lemul/contrib/libxo/configure.ac user/dchagin/lemul/contrib/libxo/doc/libxo.txt user/dchagin/lemul/contrib/libxo/libxo/libxo.3 user/dchagin/lemul/contrib/libxo/libxo/libxo.c user/dchagin/lemul/contrib/libxo/libxo/xo.h user/dchagin/lemul/contrib/libxo/libxo/xo_attr.3 user/dchagin/lemul/contrib/libxo/libxo/xo_create.3 user/dchagin/lemul/contrib/libxo/libxo/xo_emit.3 user/dchagin/lemul/contrib/libxo/libxo/xo_err.3 user/dchagin/lemul/contrib/libxo/libxo/xo_finish.3 user/dchagin/lemul/contrib/libxo/libxo/xo_flush.3 user/dchagin/lemul/contrib/libxo/libxo/xo_format.5 user/dchagin/lemul/contrib/libxo/libxo/xo_no_setlocale.3 user/dchagin/lemul/contrib/libxo/libxo/xo_open_container.3 user/dchagin/lemul/contrib/libxo/libxo/xo_open_list.3 user/dchagin/lemul/contrib/libxo/libxo/xo_parse_args.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_allocator.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_flags.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_info.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_options.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_style.3 user/dchagin/lemul/contrib/libxo/libxo/xo_set_writer.3 user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h.in user/dchagin/lemul/contrib/libxo/libxo/xoversion.h user/dchagin/lemul/contrib/libxo/tests/core/Makefile.am user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.H.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.HIPx.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.HP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.J.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.JP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.T.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.X.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_01.XP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_02.J.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_02.JP.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.J.out user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.JP.out user/dchagin/lemul/contrib/libxo/tests/core/test_01.c user/dchagin/lemul/contrib/libxo/tests/core/test_07.c user/dchagin/lemul/contrib/libxo/xo/xo.1 user/dchagin/lemul/contrib/libxo/xo/xo.c user/dchagin/lemul/contrib/libxo/xolint/Makefile.am user/dchagin/lemul/contrib/libxo/xolint/xolint.1 user/dchagin/lemul/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h user/dchagin/lemul/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h user/dchagin/lemul/contrib/llvm/include/llvm/Target/TargetCallingConv.td user/dchagin/lemul/contrib/llvm/lib/Analysis/AliasSetTracker.cpp user/dchagin/lemul/contrib/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp user/dchagin/lemul/contrib/llvm/lib/Analysis/ValueTracking.cpp user/dchagin/lemul/contrib/llvm/lib/MC/MCObjectFileInfo.cpp user/dchagin/lemul/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h user/dchagin/lemul/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/Mips.td user/dchagin/lemul/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.h user/dchagin/lemul/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsCallingConv.td user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsISelLowering.h user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp user/dchagin/lemul/contrib/llvm/lib/Target/Mips/MipsSubtarget.h user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td user/dchagin/lemul/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td user/dchagin/lemul/contrib/llvm/lib/Target/X86/X86FastISel.cpp user/dchagin/lemul/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp user/dchagin/lemul/contrib/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp user/dchagin/lemul/contrib/llvm/lib/Transforms/Scalar/SROA.cpp user/dchagin/lemul/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp user/dchagin/lemul/contrib/llvm/patches/README.TXT user/dchagin/lemul/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td user/dchagin/lemul/contrib/llvm/tools/clang/lib/Basic/Version.cpp user/dchagin/lemul/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp user/dchagin/lemul/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp user/dchagin/lemul/contrib/llvm/tools/clang/lib/Driver/Tools.cpp user/dchagin/lemul/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp user/dchagin/lemul/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp user/dchagin/lemul/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp user/dchagin/lemul/contrib/netbsd-tests/bin/expr/t_expr.sh user/dchagin/lemul/etc/Makefile user/dchagin/lemul/etc/mtree/BSD.debug.dist user/dchagin/lemul/etc/mtree/BSD.include.dist user/dchagin/lemul/etc/mtree/BSD.tests.dist user/dchagin/lemul/etc/mtree/BSD.usr.dist user/dchagin/lemul/lib/clang/include/Makefile user/dchagin/lemul/lib/clang/include/clang/Basic/Version.inc user/dchagin/lemul/lib/clang/include/clang/Config/config.h user/dchagin/lemul/lib/clang/include/llvm/Config/config.h user/dchagin/lemul/lib/clang/libllvmmipscodegen/Makefile user/dchagin/lemul/lib/libc/include/libc_private.h user/dchagin/lemul/lib/libc/sys/Makefile.inc user/dchagin/lemul/lib/libc/sys/Symbol.map user/dchagin/lemul/lib/libc/sys/procctl.2 user/dchagin/lemul/lib/libclang_rt/Makefile.inc user/dchagin/lemul/lib/libelftc/elftc_version.c user/dchagin/lemul/lib/libstand/libstand.3 user/dchagin/lemul/lib/libstand/printf.c user/dchagin/lemul/lib/libthr/Makefile user/dchagin/lemul/lib/libthr/arch/amd64/Makefile.inc user/dchagin/lemul/lib/libthr/arch/amd64/include/pthread_md.h user/dchagin/lemul/lib/libthr/arch/arm/include/pthread_md.h user/dchagin/lemul/lib/libthr/arch/i386/Makefile.inc user/dchagin/lemul/lib/libthr/arch/i386/include/pthread_md.h user/dchagin/lemul/lib/libthr/arch/mips/include/pthread_md.h user/dchagin/lemul/lib/libthr/arch/powerpc/include/pthread_md.h user/dchagin/lemul/lib/libthr/arch/sparc64/Makefile.inc user/dchagin/lemul/lib/libthr/arch/sparc64/include/pthread_md.h user/dchagin/lemul/lib/libthr/thread/Makefile.inc user/dchagin/lemul/lib/libthr/thread/thr_private.h user/dchagin/lemul/lib/libthr/thread/thr_sig.c user/dchagin/lemul/lib/libvmmapi/vmmapi.c user/dchagin/lemul/lib/libvmmapi/vmmapi.h user/dchagin/lemul/lib/libxo/Makefile user/dchagin/lemul/release/Makefile user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml user/dchagin/lemul/release/release.conf.sample user/dchagin/lemul/release/release.sh user/dchagin/lemul/release/tools/azure.conf user/dchagin/lemul/sbin/ping/ping.c user/dchagin/lemul/share/examples/bhyve/vmrun.sh user/dchagin/lemul/share/man/man4/rights.4 user/dchagin/lemul/share/man/man7/release.7 user/dchagin/lemul/share/man/man9/Makefile user/dchagin/lemul/share/man/man9/device_get_softc.9 user/dchagin/lemul/share/man/man9/printf.9 user/dchagin/lemul/share/man/man9/timeout.9 user/dchagin/lemul/share/misc/committers-ports.dot user/dchagin/lemul/share/mk/bsd.cpu.mk user/dchagin/lemul/sys/amd64/include/vmm.h (contents, props changed) user/dchagin/lemul/sys/amd64/include/vmm_dev.h (contents, props changed) user/dchagin/lemul/sys/amd64/vmm/intel/vmx.c user/dchagin/lemul/sys/amd64/vmm/vmm.c user/dchagin/lemul/sys/amd64/vmm/vmm_dev.c user/dchagin/lemul/sys/amd64/vmm/vmm_instruction_emul.c user/dchagin/lemul/sys/arm/allwinner/a20/files.a20 user/dchagin/lemul/sys/arm/allwinner/files.a10 user/dchagin/lemul/sys/arm/altera/socfpga/files.socfpga user/dchagin/lemul/sys/arm/arm/bus_space_asm_generic.S user/dchagin/lemul/sys/arm/arm/bus_space_generic.c user/dchagin/lemul/sys/arm/arm/locore-v4.S user/dchagin/lemul/sys/arm/arm/locore-v6.S user/dchagin/lemul/sys/arm/arm/physmem.c user/dchagin/lemul/sys/arm/arm/trap-v6.c user/dchagin/lemul/sys/arm/at91/at91.c user/dchagin/lemul/sys/arm/at91/files.at91 user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/files.bcm2835 user/dchagin/lemul/sys/arm/cavium/cns11xx/econa.c user/dchagin/lemul/sys/arm/cavium/cns11xx/files.econa user/dchagin/lemul/sys/arm/conf/RK3188 user/dchagin/lemul/sys/arm/freescale/imx/files.imx51 user/dchagin/lemul/sys/arm/freescale/imx/files.imx53 user/dchagin/lemul/sys/arm/freescale/imx/files.imx6 user/dchagin/lemul/sys/arm/freescale/imx/imx6_ccm.c user/dchagin/lemul/sys/arm/freescale/imx/imx_iomux.c user/dchagin/lemul/sys/arm/freescale/vybrid/files.vybrid user/dchagin/lemul/sys/arm/include/bus.h user/dchagin/lemul/sys/arm/include/cpu-v6.h user/dchagin/lemul/sys/arm/include/md_var.h user/dchagin/lemul/sys/arm/lpc/files.lpc user/dchagin/lemul/sys/arm/mv/files.mv user/dchagin/lemul/sys/arm/rockchip/files.rk30xx user/dchagin/lemul/sys/arm/samsung/exynos/files.exynos5 user/dchagin/lemul/sys/arm/samsung/s3c2xx0/files.s3c2xx0 user/dchagin/lemul/sys/arm/samsung/s3c2xx0/s3c24x0.c user/dchagin/lemul/sys/arm/samsung/s3c2xx0/s3c2xx0var.h user/dchagin/lemul/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c user/dchagin/lemul/sys/arm/ti/am335x/am335x_lcd.c user/dchagin/lemul/sys/arm/ti/files.ti user/dchagin/lemul/sys/arm/ti/ti_mbox.c user/dchagin/lemul/sys/arm/ti/ti_pruss.c user/dchagin/lemul/sys/arm/versatile/files.versatile user/dchagin/lemul/sys/arm/versatile/versatile_pci.c user/dchagin/lemul/sys/arm/xilinx/files.zynq7 user/dchagin/lemul/sys/arm/xscale/i80321/ep80219_machdep.c user/dchagin/lemul/sys/arm/xscale/i80321/files.ep80219 user/dchagin/lemul/sys/arm/xscale/i80321/files.i80219 user/dchagin/lemul/sys/arm/xscale/i80321/files.i80321 user/dchagin/lemul/sys/arm/xscale/i80321/files.iq31244 user/dchagin/lemul/sys/arm/xscale/i80321/i80321_space.c user/dchagin/lemul/sys/arm/xscale/i80321/iq31244_machdep.c user/dchagin/lemul/sys/arm/xscale/i80321/obio.c user/dchagin/lemul/sys/arm/xscale/i80321/obiovar.h user/dchagin/lemul/sys/arm/xscale/i80321/uart_cpu_i80321.c user/dchagin/lemul/sys/arm/xscale/i8134x/crb_machdep.c user/dchagin/lemul/sys/arm/xscale/i8134x/files.i81342 user/dchagin/lemul/sys/arm/xscale/i8134x/i81342_space.c user/dchagin/lemul/sys/arm/xscale/i8134x/obio.c user/dchagin/lemul/sys/arm/xscale/i8134x/obiovar.h user/dchagin/lemul/sys/arm/xscale/i8134x/uart_cpu_i81342.c user/dchagin/lemul/sys/arm/xscale/ixp425/avila_ata.c user/dchagin/lemul/sys/arm/xscale/ixp425/cambria_exp_space.c user/dchagin/lemul/sys/arm/xscale/ixp425/ixp425_a4x_space.c user/dchagin/lemul/sys/arm/xscale/ixp425/ixp425_pci_space.c user/dchagin/lemul/sys/arm/xscale/ixp425/ixp425_space.c user/dchagin/lemul/sys/arm/xscale/pxa/pxa_space.c user/dchagin/lemul/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/rk3188-radxa.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/rk3188.dtsi user/dchagin/lemul/sys/boot/i386/libi386/bootinfo64.c user/dchagin/lemul/sys/cam/cam_xpt.c user/dchagin/lemul/sys/cam/ctl/ctl.c user/dchagin/lemul/sys/cam/scsi/scsi_da.c user/dchagin/lemul/sys/cddl/compat/opensolaris/sys/sunddi.h user/dchagin/lemul/sys/cddl/compat/opensolaris/sys/time.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/common/util/strtolctype.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/os/callb.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/os/fm.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/dchagin/lemul/sys/cddl/dev/dtrace/amd64/instr_size.c user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_ioctl.c user/dchagin/lemul/sys/cddl/dev/dtrace/i386/instr_size.c user/dchagin/lemul/sys/cddl/dev/dtrace/x86/regset.h user/dchagin/lemul/sys/compat/freebsd32/freebsd32_misc.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_systrace_args.c user/dchagin/lemul/sys/compat/freebsd32/syscalls.master user/dchagin/lemul/sys/conf/files user/dchagin/lemul/sys/conf/ldscript.powerpc user/dchagin/lemul/sys/conf/ldscript.powerpc64 user/dchagin/lemul/sys/conf/options user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h user/dchagin/lemul/sys/contrib/rdma/krping/krping.c user/dchagin/lemul/sys/dev/acpica/acpi_cpu.c user/dchagin/lemul/sys/dev/acpica/acpi_ec.c user/dchagin/lemul/sys/dev/agp/agp_nvidia.c user/dchagin/lemul/sys/dev/cx/cxddk.c user/dchagin/lemul/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/dchagin/lemul/sys/dev/cxgbe/iw_cxgbe/device.c user/dchagin/lemul/sys/dev/dc/if_dc.c user/dchagin/lemul/sys/dev/dcons/dcons.c user/dchagin/lemul/sys/dev/dcons/dcons_crom.c user/dchagin/lemul/sys/dev/dcons/dcons_os.h user/dchagin/lemul/sys/dev/drm2/drm.h user/dchagin/lemul/sys/dev/drm2/drmP.h user/dchagin/lemul/sys/dev/drm2/drm_crtc.c user/dchagin/lemul/sys/dev/drm2/drm_crtc.h user/dchagin/lemul/sys/dev/drm2/drm_crtc_helper.c user/dchagin/lemul/sys/dev/drm2/drm_crtc_helper.h user/dchagin/lemul/sys/dev/drm2/drm_drv.c user/dchagin/lemul/sys/dev/drm2/drm_edid.c user/dchagin/lemul/sys/dev/drm2/drm_edid.h user/dchagin/lemul/sys/dev/drm2/drm_edid_modes.h user/dchagin/lemul/sys/dev/drm2/drm_fb_helper.c user/dchagin/lemul/sys/dev/drm2/drm_ioctl.c user/dchagin/lemul/sys/dev/drm2/drm_irq.c user/dchagin/lemul/sys/dev/drm2/drm_memory.c user/dchagin/lemul/sys/dev/drm2/drm_mode.h user/dchagin/lemul/sys/dev/drm2/drm_pciids.h user/dchagin/lemul/sys/dev/drm2/drm_stub.c user/dchagin/lemul/sys/dev/drm2/i915/i915_debug.c user/dchagin/lemul/sys/dev/drm2/i915/i915_dma.c user/dchagin/lemul/sys/dev/drm2/i915/i915_drm.h user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.c user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.h user/dchagin/lemul/sys/dev/drm2/i915/i915_gem.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_context.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_evict.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_execbuffer.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_gtt.c user/dchagin/lemul/sys/dev/drm2/i915/i915_gem_tiling.c user/dchagin/lemul/sys/dev/drm2/i915/i915_irq.c user/dchagin/lemul/sys/dev/drm2/i915/i915_reg.h user/dchagin/lemul/sys/dev/drm2/i915/i915_suspend.c user/dchagin/lemul/sys/dev/drm2/i915/intel_bios.c user/dchagin/lemul/sys/dev/drm2/i915/intel_crt.c user/dchagin/lemul/sys/dev/drm2/i915/intel_display.c user/dchagin/lemul/sys/dev/drm2/i915/intel_dp.c user/dchagin/lemul/sys/dev/drm2/i915/intel_drv.h user/dchagin/lemul/sys/dev/drm2/i915/intel_fb.c user/dchagin/lemul/sys/dev/drm2/i915/intel_hdmi.c user/dchagin/lemul/sys/dev/drm2/i915/intel_iic.c user/dchagin/lemul/sys/dev/drm2/i915/intel_lvds.c user/dchagin/lemul/sys/dev/drm2/i915/intel_modes.c user/dchagin/lemul/sys/dev/drm2/i915/intel_overlay.c user/dchagin/lemul/sys/dev/drm2/i915/intel_panel.c user/dchagin/lemul/sys/dev/drm2/i915/intel_ringbuffer.c user/dchagin/lemul/sys/dev/drm2/i915/intel_ringbuffer.h user/dchagin/lemul/sys/dev/drm2/i915/intel_sdvo.c user/dchagin/lemul/sys/dev/drm2/i915/intel_sprite.c user/dchagin/lemul/sys/dev/drm2/i915/intel_tv.c user/dchagin/lemul/sys/dev/drm2/radeon/atombios_encoders.c user/dchagin/lemul/sys/dev/drm2/radeon/radeon_legacy_encoders.c user/dchagin/lemul/sys/dev/e1000/if_igb.c user/dchagin/lemul/sys/dev/firewire/firewire.c user/dchagin/lemul/sys/dev/firewire/fwmem.c user/dchagin/lemul/sys/dev/firewire/fwohci.c user/dchagin/lemul/sys/dev/hwpmc/hwpmc_core.c user/dchagin/lemul/sys/dev/hwpmc/pmc_events.h user/dchagin/lemul/sys/dev/iicbus/adt746x.c user/dchagin/lemul/sys/dev/isp/isp.c user/dchagin/lemul/sys/dev/isp/isp_freebsd.c user/dchagin/lemul/sys/dev/ixgbe/ixgbe.c user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c user/dchagin/lemul/sys/dev/mii/mii.c user/dchagin/lemul/sys/dev/mmc/host/dwmmc.c user/dchagin/lemul/sys/dev/mmc/host/dwmmc.h user/dchagin/lemul/sys/dev/ofw/ofw_cpu.c user/dchagin/lemul/sys/dev/sdhci/sdhci.c user/dchagin/lemul/sys/dev/sdhci/sdhci.h user/dchagin/lemul/sys/dev/usb/controller/ehci_ixp4xx.c user/dchagin/lemul/sys/dev/usb/net/if_cdce.c user/dchagin/lemul/sys/dev/usb/net/if_cdcereg.h user/dchagin/lemul/sys/dev/usb/usb_generic.c user/dchagin/lemul/sys/fs/devfs/devfs_devs.c user/dchagin/lemul/sys/fs/devfs/devfs_int.h user/dchagin/lemul/sys/fs/devfs/devfs_vnops.c user/dchagin/lemul/sys/fs/ext2fs/ext2_alloc.c user/dchagin/lemul/sys/fs/ext2fs/ext2_bmap.c user/dchagin/lemul/sys/fs/ext2fs/ext2_extents.c user/dchagin/lemul/sys/fs/ext2fs/ext2_hash.c user/dchagin/lemul/sys/fs/ext2fs/ext2_htree.c user/dchagin/lemul/sys/fs/ext2fs/ext2_inode.c user/dchagin/lemul/sys/fs/ext2fs/ext2_lookup.c user/dchagin/lemul/sys/fs/ext2fs/ext2_vfsops.c user/dchagin/lemul/sys/fs/ext2fs/ext2_vnops.c user/dchagin/lemul/sys/fs/fifofs/fifo_vnops.c user/dchagin/lemul/sys/kern/capabilities.conf user/dchagin/lemul/sys/kern/init_main.c user/dchagin/lemul/sys/kern/init_sysent.c user/dchagin/lemul/sys/kern/kern_condvar.c user/dchagin/lemul/sys/kern/kern_conf.c user/dchagin/lemul/sys/kern/kern_descrip.c user/dchagin/lemul/sys/kern/kern_exec.c user/dchagin/lemul/sys/kern/kern_fork.c user/dchagin/lemul/sys/kern/kern_lock.c user/dchagin/lemul/sys/kern/kern_procctl.c user/dchagin/lemul/sys/kern/kern_prot.c user/dchagin/lemul/sys/kern/kern_sig.c user/dchagin/lemul/sys/kern/kern_switch.c user/dchagin/lemul/sys/kern/kern_synch.c user/dchagin/lemul/sys/kern/kern_tc.c user/dchagin/lemul/sys/kern/kern_thread.c user/dchagin/lemul/sys/kern/kern_timeout.c user/dchagin/lemul/sys/kern/subr_dummy_vdso_tc.c user/dchagin/lemul/sys/kern/subr_prf.c user/dchagin/lemul/sys/kern/subr_sleepqueue.c user/dchagin/lemul/sys/kern/sys_pipe.c user/dchagin/lemul/sys/kern/syscalls.c user/dchagin/lemul/sys/kern/syscalls.master user/dchagin/lemul/sys/kern/systrace_args.c user/dchagin/lemul/sys/kern/vfs_syscalls.c user/dchagin/lemul/sys/mips/include/cache_mipsNN.h user/dchagin/lemul/sys/mips/mips/cache.c user/dchagin/lemul/sys/mips/mips/cache_mipsNN.c user/dchagin/lemul/sys/modules/Makefile user/dchagin/lemul/sys/modules/drm2/i915kms/Makefile user/dchagin/lemul/sys/modules/ibcore/Makefile user/dchagin/lemul/sys/modules/ipoib/Makefile user/dchagin/lemul/sys/modules/mlx4/Makefile user/dchagin/lemul/sys/modules/mlx4ib/Makefile user/dchagin/lemul/sys/net/ieee8023ad_lacp.c user/dchagin/lemul/sys/net/if_ethersubr.c user/dchagin/lemul/sys/net/if_lagg.c user/dchagin/lemul/sys/net/pfvar.h user/dchagin/lemul/sys/netinet/in_pcb.c user/dchagin/lemul/sys/netinet/in_pcbgroup.c user/dchagin/lemul/sys/netinet/in_rss.c user/dchagin/lemul/sys/netinet/in_rss.h user/dchagin/lemul/sys/netinet/ip_carp.c user/dchagin/lemul/sys/netinet/ip_input.c user/dchagin/lemul/sys/netinet/ip_output.c user/dchagin/lemul/sys/netinet/sctp_asconf.c user/dchagin/lemul/sys/netinet/sctp_input.c user/dchagin/lemul/sys/netinet/sctp_output.c user/dchagin/lemul/sys/netinet/sctp_sysctl.c user/dchagin/lemul/sys/netinet/sctp_timer.c user/dchagin/lemul/sys/netinet/sctp_usrreq.c user/dchagin/lemul/sys/netinet/tcp_timer.c user/dchagin/lemul/sys/netinet/udp_usrreq.c user/dchagin/lemul/sys/netinet6/in6_pcbgroup.c user/dchagin/lemul/sys/netinet6/ip6_output.c user/dchagin/lemul/sys/netinet6/udp6_usrreq.c user/dchagin/lemul/sys/netpfil/pf/pf.c user/dchagin/lemul/sys/netpfil/pf/pf_if.c user/dchagin/lemul/sys/netpfil/pf/pf_ioctl.c user/dchagin/lemul/sys/netpfil/pf/pf_norm.c user/dchagin/lemul/sys/netpfil/pf/pf_table.c user/dchagin/lemul/sys/ofed/drivers/infiniband/core/device.c user/dchagin/lemul/sys/ofed/drivers/infiniband/hw/mlx4/main.c user/dchagin/lemul/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c user/dchagin/lemul/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c user/dchagin/lemul/sys/ofed/drivers/net/mlx4/en_main.c user/dchagin/lemul/sys/ofed/drivers/net/mlx4/main.c user/dchagin/lemul/sys/ofed/include/linux/bitops.h user/dchagin/lemul/sys/ofed/include/linux/cache.h user/dchagin/lemul/sys/ofed/include/linux/completion.h user/dchagin/lemul/sys/ofed/include/linux/dma-mapping.h user/dchagin/lemul/sys/ofed/include/linux/etherdevice.h user/dchagin/lemul/sys/ofed/include/linux/gfp.h user/dchagin/lemul/sys/ofed/include/linux/io.h user/dchagin/lemul/sys/ofed/include/linux/kernel.h user/dchagin/lemul/sys/ofed/include/linux/ktime.h user/dchagin/lemul/sys/ofed/include/linux/linux_compat.c user/dchagin/lemul/sys/ofed/include/linux/module.h user/dchagin/lemul/sys/ofed/include/linux/pci.h user/dchagin/lemul/sys/ofed/include/linux/slab.h user/dchagin/lemul/sys/powerpc/aim/locore32.S user/dchagin/lemul/sys/powerpc/aim/locore64.S user/dchagin/lemul/sys/powerpc/aim/machdep.c user/dchagin/lemul/sys/powerpc/aim/mmu_oea64.c user/dchagin/lemul/sys/powerpc/aim/mp_cpudep.c user/dchagin/lemul/sys/powerpc/aim/trap_subr32.S user/dchagin/lemul/sys/powerpc/aim/trap_subr64.S user/dchagin/lemul/sys/powerpc/booke/locore.S user/dchagin/lemul/sys/powerpc/include/asm.h user/dchagin/lemul/sys/powerpc/include/trap.h user/dchagin/lemul/sys/powerpc/ofw/ofw_machdep.c user/dchagin/lemul/sys/powerpc/ofw/ofwcall64.S user/dchagin/lemul/sys/powerpc/ofw/rtas.c user/dchagin/lemul/sys/powerpc/powerpc/elf64_machdep.c user/dchagin/lemul/sys/powerpc/powerpc/intr_machdep.c user/dchagin/lemul/sys/powerpc/powerpc/mem.c user/dchagin/lemul/sys/powerpc/powerpc/swtch64.S user/dchagin/lemul/sys/powerpc/powerpc/vm_machdep.c user/dchagin/lemul/sys/sys/_callout.h user/dchagin/lemul/sys/sys/callout.h user/dchagin/lemul/sys/sys/capsicum.h user/dchagin/lemul/sys/sys/elf_common.h user/dchagin/lemul/sys/sys/param.h user/dchagin/lemul/sys/sys/pmc.h user/dchagin/lemul/sys/sys/priv.h user/dchagin/lemul/sys/sys/proc.h user/dchagin/lemul/sys/sys/procctl.h user/dchagin/lemul/sys/sys/signalvar.h user/dchagin/lemul/sys/sys/stat.h user/dchagin/lemul/sys/sys/syscall.h user/dchagin/lemul/sys/sys/syscall.mk user/dchagin/lemul/sys/sys/syscallsubr.h user/dchagin/lemul/sys/sys/sysproto.h user/dchagin/lemul/sys/sys/vdso.h user/dchagin/lemul/sys/x86/isa/atpic.c user/dchagin/lemul/sys/x86/x86/tsc.c user/dchagin/lemul/sys/x86/xen/pv.c user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc user/dchagin/lemul/tools/regression/file/flock/flock.c user/dchagin/lemul/tools/tools/nanobsd/nanobsd.sh (contents, props changed) user/dchagin/lemul/usr.bin/grep/file.c user/dchagin/lemul/usr.bin/kdump/kdump.c user/dchagin/lemul/usr.bin/vmstat/vmstat.c user/dchagin/lemul/usr.sbin/bhyve/bhyverun.c user/dchagin/lemul/usr.sbin/bhyve/bhyverun.h user/dchagin/lemul/usr.sbin/bhyve/inout.c user/dchagin/lemul/usr.sbin/bhyve/task_switch.c user/dchagin/lemul/usr.sbin/bhyvectl/bhyvectl.c user/dchagin/lemul/usr.sbin/bsdinstall/scripts/zfsboot user/dchagin/lemul/usr.sbin/config/config.y user/dchagin/lemul/usr.sbin/iostat/iostat.c user/dchagin/lemul/usr.sbin/mountd/mountd.c user/dchagin/lemul/usr.sbin/pmcstudy/pmcstudy.c user/dchagin/lemul/usr.sbin/rpc.lockd/lockd.c user/dchagin/lemul/usr.sbin/rpc.statd/statd.c Directory Properties: user/dchagin/lemul/ (props changed) user/dchagin/lemul/cddl/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/dchagin/lemul/contrib/ee/ (props changed) user/dchagin/lemul/contrib/elftoolchain/ (props changed) user/dchagin/lemul/contrib/gdb/ (props changed) user/dchagin/lemul/contrib/llvm/ (props changed) user/dchagin/lemul/contrib/llvm/tools/clang/ (props changed) user/dchagin/lemul/etc/ (props changed) user/dchagin/lemul/lib/libc/ (props changed) user/dchagin/lemul/lib/libvmmapi/ (props changed) user/dchagin/lemul/sbin/ (props changed) user/dchagin/lemul/share/ (props changed) user/dchagin/lemul/share/man/man4/ (props changed) user/dchagin/lemul/sys/ (props changed) user/dchagin/lemul/sys/amd64/vmm/ (props changed) user/dchagin/lemul/sys/boot/ (props changed) user/dchagin/lemul/sys/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/sys/conf/ (props changed) user/dchagin/lemul/usr.sbin/bhyve/ (props changed) user/dchagin/lemul/usr.sbin/bhyvectl/ (props changed) Modified: user/dchagin/lemul/Makefile.inc1 ============================================================================== --- user/dchagin/lemul/Makefile.inc1 Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/Makefile.inc1 Fri Jan 23 21:47:44 2015 (r277615) @@ -1292,12 +1292,16 @@ _clang_tblgen= \ usr.bin/clang/clang-tblgen .endif +# ELF Tool Chain libraries are needed for ELF tools and dtrace tools. # dtrace tools are required for older bootstrap env and cross-build # pre libdwarf -.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \ - || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) -_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ - lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge +.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \ + ${MACHINE_ARCH} != ${TARGET_ARCH}) +_elftoolchain_libs= lib/libelf lib/libdwarf +.if ${MK_CDDL} != "no" +_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \ + cddl/usr.bin/ctfmerge +.endif .endif # Default to building the GPL DTC, but build the BSDL one if users explicitly @@ -1324,6 +1328,7 @@ bootstrap-tools: .MAKE .for _tool in \ ${_clang_tblgen} \ ${_kerberos5_bootstrap_tools} \ + ${_elftoolchain_libs} \ ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ @@ -1428,7 +1433,6 @@ _binutils= gnu/usr.bin/binutils .endif .if ${MK_ELFTOOLCHAIN_TOOLS} != "no" _elftctools= lib/libelftc \ - usr.bin/addr2line \ usr.bin/elfcopy \ usr.bin/nm \ usr.bin/size \ Modified: user/dchagin/lemul/ObsoleteFiles.inc ============================================================================== --- user/dchagin/lemul/ObsoleteFiles.inc Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/ObsoleteFiles.inc Fri Jan 23 21:47:44 2015 (r277615) @@ -38,6 +38,60 @@ # xargs -n1 | sort | uniq -d; # done +# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. +OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h +OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h +OLD_FILES+=usr/include/clang/3.5.0/altivec.h +OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h +OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h +OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h +OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h +OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h +OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h +OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h +OLD_FILES+=usr/include/clang/3.5.0/cpuid.h +OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h +OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h +OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h +OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h +OLD_FILES+=usr/include/clang/3.5.0/immintrin.h +OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h +OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h +OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h +OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/module.modulemap +OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h +OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h +OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h +OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h +OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h +OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h +OLD_DIRS+=usr/include/clang/3.5.0 +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.5.0/lib +OLD_DIRS+=usr/lib/clang/3.5.0 # 20150102: removal of texinfo OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey Modified: user/dchagin/lemul/UPDATING ============================================================================== --- user/dchagin/lemul/UPDATING Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/UPDATING Fri Jan 23 21:47:44 2015 (r277615) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150118: + Clang and llvm have been upgraded to 3.5.1 release. This is a bugfix + only release, no new features have been added. Please see the 20141231 + entry below for information about prerequisites and upgrading, if you + are not already using 3.5.0. + 20150107: ELF tools addr2line, elfcopy (strip), nm, size, and strings are now taken from the ELF Tool Chain project rather than GNU binutils. They Modified: user/dchagin/lemul/bin/expr/Makefile ============================================================================== --- user/dchagin/lemul/bin/expr/Makefile Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/bin/expr/Makefile Fri Jan 23 21:47:44 2015 (r277615) @@ -1,9 +1,15 @@ # $FreeBSD$ +.include + PROG= expr SRCS= expr.y YFLAGS= NO_WMISSING_VARIABLE_DECLARATIONS= +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: user/dchagin/lemul/bin/freebsd-version/Makefile ============================================================================== --- user/dchagin/lemul/bin/freebsd-version/Makefile Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/bin/freebsd-version/Makefile Fri Jan 23 21:47:44 2015 (r277615) @@ -11,7 +11,7 @@ freebsd-version.sh: ${.CURDIR}/freebsd-v s/@@TYPE@@/$${TYPE}/g; \ s/@@REVISION@@/$${REVISION}/g; \ s/@@BRANCH@@/$${BRANCH}/g; \ - " ${.ALLSRC} >${.TARGET} ; then \ + " ${.CURDIR}/freebsd-version.sh.in >${.TARGET} ; then \ rm -f ${.TARGET} ; \ exit 1 ; \ fi Modified: user/dchagin/lemul/bin/ln/symlink.7 ============================================================================== --- user/dchagin/lemul/bin/ln/symlink.7 Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/bin/ln/symlink.7 Fri Jan 23 21:47:44 2015 (r277615) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd December 29, 2014 +.Dd January 23, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -147,9 +147,10 @@ unless given the .Dv AT_SYMLINK_NOFOLLOW flag: .Xr fchmodat 2 , -.Xr fchownat 2 +.Xr fchownat 2 , +.Xr fstatat 2 and -.Xr fstatat 2 . +.Xr utimensat 2 . .Pp The owner and group of an existing symbolic link can be changed by means of the Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Fri Jan 23 21:47:44 2015 (r277615) @@ -43,11 +43,11 @@ #include #include #include -#if defined(sun) +#ifdef illumos #include #endif #include -#if defined(sun) +#ifdef illumos #include #endif @@ -101,7 +101,7 @@ static int g_grabanon = 0; static const char *g_ofile = NULL; static FILE *g_ofp; static dtrace_hdl_t *g_dtp; -#if defined(sun) +#ifdef illumos static char *g_etcfile = "/etc/system"; static const char *g_etcbegin = "* vvvv Added by DTrace"; static const char *g_etcend = "* ^^^^ Added by DTrace"; @@ -211,7 +211,7 @@ fatal(const char *fmt, ...) static void dfatal(const char *fmt, ...) { -#if !defined(sun) && defined(NEED_ERRLOC) +#if !defined(illumos) && defined(NEED_ERRLOC) char *p_errfile = NULL; int errline = 0; #endif @@ -232,7 +232,7 @@ dfatal(const char *fmt, ...) (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } -#if !defined(sun) && defined(NEED_ERRLOC) +#if !defined(illumos) && defined(NEED_ERRLOC) dt_get_errloc(g_dtp, &p_errfile, &errline); if (p_errfile != NULL) printf("File '%s', line %d\n", p_errfile, errline); @@ -397,7 +397,7 @@ dof_prune(const char *fname) free(buf); } -#if defined(sun) +#ifdef illumos static void etcsystem_prune(void) { @@ -508,7 +508,7 @@ etcsystem_add(void) error("added forceload directives to %s\n", g_ofile); } -#endif +#endif /* illumos */ static void print_probe_info(const dtrace_probeinfo_t *p) @@ -643,7 +643,7 @@ anon_prog(const dtrace_cmd_t *dcp, dof_h p = (uchar_t *)dof; q = p + dof->dofh_loadsz; -#if defined(sun) +#ifdef illumos oprintf("dof-data-%d=0x%x", n, *p++); while (p < q) @@ -793,7 +793,7 @@ compile_str(dtrace_cmd_t *dcp) static void prochandler(struct ps_prochandle *P, const char *msg, void *arg) { -#if defined(sun) +#ifdef illumos const psinfo_t *prp = Ppsinfo(P); int pid = Pstatus(P)->pr_pid; char name[SIG2STR_MAX]; @@ -807,13 +807,13 @@ prochandler(struct ps_prochandle *P, con return; } -#if defined(sun) +#ifdef illumos switch (Pstate(P)) { #else switch (proc_state(P)) { #endif case PS_UNDEAD: -#if defined(sun) +#ifdef illumos /* * Ideally we would like to always report pr_wstat here, but it * isn't possible given current /proc semantics. If we grabbed @@ -831,7 +831,7 @@ prochandler(struct ps_prochandle *P, con notice("pid %d terminated by %d\n", pid, WTERMSIG(wstatus)); #endif -#if defined(sun) +#ifdef illumos } else if (prp != NULL && WEXITSTATUS(prp->pr_wstat) != 0) { notice("pid %d exited with status %d\n", pid, WEXITSTATUS(prp->pr_wstat)); @@ -1238,7 +1238,7 @@ installsighands(void) if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGTERM, &act, NULL); -#if !defined(sun) +#ifndef illumos if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGPIPE, &act, NULL); @@ -1720,7 +1720,7 @@ main(int argc, char *argv[]) case DMODE_ANON: if (g_ofile == NULL) -#if defined(sun) +#ifdef illumos g_ofile = "/kernel/drv/dtrace.conf"; #else /* @@ -1732,7 +1732,7 @@ main(int argc, char *argv[]) #endif dof_prune(g_ofile); /* strip out any old DOF directives */ -#if defined(sun) +#ifdef illumos etcsystem_prune(); /* string out any forceload directives */ #endif @@ -1765,7 +1765,7 @@ main(int argc, char *argv[]) * that itself contains a #pragma D option quiet. */ error("saved anonymous enabling in %s\n", g_ofile); -#if defined(sun) +#ifdef illumos etcsystem_add(); error("run update_drv(1M) or reboot to enable changes\n"); #endif Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Fri Jan 23 21:47:44 2015 (r277615) @@ -46,10 +46,9 @@ #include #include -#if defined(sun) +#ifdef illumos #define GETOPT_EOF EOF #else -/* FreeBSD */ #include #include @@ -57,7 +56,7 @@ #define GETOPT_EOF (-1) typedef uintptr_t pc_t; -#endif /* defined(sun) */ +#endif #define LOCKSTAT_OPTSTR "x:bths:n:d:i:l:f:e:ckwWgCHEATID:RpPo:V" @@ -214,10 +213,9 @@ static ls_event_info_t g_event_info[LS_M { 'H', "Lock", "Unknown event (type 53)", "units" }, { 'H', "Lock", "Unknown event (type 54)", "units" }, { 'H', "Lock", "Unknown event (type 55)", "units" }, -#if defined(sun) +#ifdef illumos { 'I', "CPU+PIL", "Profiling interrupt", "nsec", #else - /* FreeBSD */ { 'I', "CPU+Pri_Class", "Profiling interrupt", "nsec", #endif "profile:::profile-97", NULL }, @@ -231,7 +229,7 @@ static ls_event_info_t g_event_info[LS_M { 'E', "Lock", "Lockstat record failure", "(N/A)" }, }; -#if !defined(sun) +#ifndef illumos static char *g_pri_class[] = { "", "Intr", @@ -598,7 +596,7 @@ filter_add(char **filt, char *what, uint *filt[0] = '\0'; } -#if defined(sun) +#ifdef illumos (void) sprintf(c, "%s(%s >= 0x%p && %s < 0x%p)", *filt[0] != '\0' ? " || " : "", what, (void *)base, what, (void *)(base + size)); #else @@ -676,7 +674,7 @@ dprog_addevent(int event) * the number of nanoseconds) is the number of nanoseconds * late -- and it's stored in arg2. */ -#if defined(sun) +#ifdef illumos arg0 = "(uintptr_t)curthread->t_cpu + \n" "\t curthread->t_cpu->cpu_profile_pil"; #else @@ -824,7 +822,7 @@ dprog_compile() } static void -#if defined(sun) +#ifdef illumos status_fire(void) #else status_fire(int i) @@ -1423,7 +1421,7 @@ main(int argc, char **argv) exit(127); } -#if defined(sun) +#ifdef illumos while (waitpid(child, &status, WEXITED) != child) #else while (waitpid(child, &status, 0) != child) @@ -1468,7 +1466,7 @@ main(int argc, char **argv) dfail("failed to walk aggregate"); } -#if defined(sun) +#ifdef illumos if ((data_buf = memalign(sizeof (uint64_t), (g_nrecs + 1) * g_recsize)) == NULL) #else @@ -1500,7 +1498,7 @@ main(int argc, char **argv) if (g_gflag) { lsrec_t *newlsp, *oldlsp; -#if defined(sun) +#ifdef illumos newlsp = memalign(sizeof (uint64_t), g_nrecs_used * LS_TIME * (g_stkdepth + 1)); #else @@ -1664,7 +1662,7 @@ format_symbol(char *buf, uintptr_t addr, else if (symoff == 0) (void) sprintf(buf, "%s", symname); else if (symoff < 16 && bcmp(symname, "cpu[", 4) == 0) /* CPU+PIL */ -#if defined(sun) +#ifdef illumos (void) sprintf(buf, "%s+%ld", symname, (long)symoff); #else (void) sprintf(buf, "%s+%s", symname, g_pri_class[(int)symoff]); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/sym.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/sym.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/lockstat/sym.c Fri Jan 23 21:47:44 2015 (r277615) @@ -42,12 +42,11 @@ #include #include #include -#if defined(sun) +#ifdef illumos #include #include #else -/* FreeBSD */ #include #include #include @@ -66,7 +65,7 @@ static syment_t *symbol_table; static int nsyms, maxsyms; static char maxsymname[64]; -#if defined(sun) +#ifdef illumos #ifdef _ELF64 #define elf_getshdr elf64_getshdr #else @@ -105,7 +104,7 @@ remove_symbol(uintptr_t addr) sep->addr = 0; } -#if defined(sun) +#ifdef illumos static void fake_up_certain_popular_kernel_symbols(void) { @@ -133,8 +132,7 @@ fake_up_certain_popular_kernel_symbols(v } (void) kstat_close(kc); } -#else -/* FreeBSD */ +#else /* !illumos */ static void fake_up_certain_popular_kernel_symbols(void) { @@ -151,7 +149,7 @@ fake_up_certain_popular_kernel_symbols(v add_symbol(name, addr, sizeof (uintptr_t)); } } -#endif /* !defined(sun) */ +#endif /* illumos */ static int symcmp(const void *p1, const void *p2) @@ -177,12 +175,12 @@ symtab_init(void) int fd; int i; int strindex = -1; -#if !defined(sun) +#ifndef illumos void *ksyms; size_t sz; #endif -#if defined(__FreeBSD__) +#ifndef illumos if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) { if (errno == ENOENT && modfind("ksyms") == -1) { kldload("ksyms"); @@ -196,12 +194,11 @@ symtab_init(void) return (-1); #endif -#if defined(sun) +#ifdef illumos (void) elf_version(EV_CURRENT); elf = elf_begin(fd, ELF_C_READ, NULL); #else - /* FreeBSD */ /* * XXX - libelf needs to be fixed so it will work with * non 'ordinary' files like /dev/ksyms. The following Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c Fri Jan 23 21:47:44 2015 (r277615) @@ -40,7 +40,7 @@ die(char *format, ...) { va_list ap; int err = errno; -#if !defined(sun) +#ifndef illumos const char *progname = getprogname(); #endif @@ -54,7 +54,7 @@ die(char *format, ...) if (format[strlen(format) - 1] != '\n') (void) fprintf(stderr, ": %s\n", strerror(err)); -#if defined(__FreeBSD__) +#ifndef illumos exit(0); #else exit(1); @@ -65,7 +65,7 @@ void elfdie(char *format, ...) { va_list ap; -#if !defined(sun) +#ifndef illumos const char *progname = getprogname(); #endif @@ -79,7 +79,7 @@ elfdie(char *format, ...) if (format[strlen(format) - 1] != '\n') (void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno())); -#if defined(__FreeBSD__) +#ifndef illumos exit(0); #else exit(1); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h Fri Jan 23 21:47:44 2015 (r277615) @@ -40,7 +40,7 @@ extern int findelfsecidx(Elf *, char *); extern void die(char *, ...); extern void elfdie(char *, ...); -#if defined(sun) +#ifdef illumos extern const char *progname; #endif Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c Fri Jan 23 21:47:44 2015 (r277615) @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#if defined(sun) +#ifdef illumos #pragma ident "%Z%%M% %I% %E% SMI" #endif @@ -505,7 +505,7 @@ getsym(struct ps_prochandle *P, uintptr_ { char name[256]; GElf_Sym sym; -#if defined(sun) +#ifdef illumos prsyminfo_t info; #else prmap_t *map; @@ -518,7 +518,7 @@ getsym(struct ps_prochandle *P, uintptr_ (void) snprintf(buf, size, "%#lx", addr); return (0); } -#if defined(sun) +#ifdef illumos if (info.prs_object == NULL) info.prs_object = ""; @@ -668,7 +668,7 @@ process_aggregate(const dtrace_aggdata_t static void prochandler(struct ps_prochandle *P, const char *msg, void *arg) { -#if defined(sun) +#ifdef illumos const psinfo_t *prp = Ppsinfo(P); int pid = Pstatus(P)->pr_pid; #else @@ -773,7 +773,7 @@ intr(int signo) int main(int argc, char **argv) { -#if defined(sun) +#ifdef illumos ucred_t *ucp; #endif int err; @@ -785,7 +785,7 @@ main(int argc, char **argv) g_pname = basename(argv[0]); argv[0] = g_pname; /* rewrite argv[0] for getopt errors */ -#if defined(sun) +#ifdef illumos /* * Make sure we have the required dtrace_proc privilege. */ @@ -988,7 +988,7 @@ main(int argc, char **argv) if (opt_v) (void) printf("%s: tracing enabled for pid %d\n", g_pname, -#if defined(sun) +#ifdef illumos (int)Pstatus(g_pr)->pr_pid); #else (int)proc_getpid(g_pr)); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/alist.h ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/alist.h Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/alist.h Fri Jan 23 21:47:44 2015 (r277615) @@ -39,7 +39,7 @@ extern "C" { #endif #include -#if defined(sun) +#ifdef illumos #include #else #include Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h Fri Jan 23 21:47:44 2015 (r277615) @@ -48,7 +48,7 @@ extern "C" { #ifndef _ASM #include -#if defined(sun) +#ifdef illumos #include #else #include Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Jan 23 21:47:44 2015 (r277615) @@ -65,7 +65,7 @@ #include #include #include -#ifdef sun +#ifdef illumos #include #include #include @@ -2391,7 +2391,7 @@ userspace_cb(void *arg, const char *doma /* SMB */ char sid[ZFS_MAXNAMELEN + 32]; uid_t id; -#ifdef sun +#ifdef illumos int err; int flag = IDMAP_REQ_FLG_USE_CACHE; #endif @@ -2402,17 +2402,17 @@ userspace_cb(void *arg, const char *doma if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) { type = USTYPE_SMB_GRP; -#ifdef sun +#ifdef illumos err = sid_to_id(sid, B_FALSE, &id); #endif } else { type = USTYPE_SMB_USR; -#ifdef sun +#ifdef illumos err = sid_to_id(sid, B_TRUE, &id); #endif } -#ifdef sun +#ifdef illumos if (err == 0) { rid = id; if (!cb->cb_sid2posix) { @@ -6110,7 +6110,7 @@ unshare_unmount_path(int op, char *path, /* * Search for the given (major,minor) pair in the mount table. */ -#ifdef sun +#ifdef illumos rewind(mnttab_file); while ((ret = getextmntent(mnttab_file, &entry, 0)) == 0) { if (entry.mnt_major == major(statbuf.st_dev) && Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Fri Jan 23 21:47:44 2015 (r277615) @@ -112,7 +112,7 @@ vdev_error(const char *fmt, ...) va_end(ap); } -#ifdef sun +#ifdef illumos static void libdiskmgt_error(int error) { @@ -274,7 +274,7 @@ check_device(const char *path, boolean_t return (check_slice(path, force, B_FALSE, isspare)); } -#endif /* sun */ +#endif /* illumos */ /* * Check that a file is valid. All we can do in this case is check that it's @@ -290,7 +290,7 @@ check_file(const char *file, boolean_t f pool_state_t state; boolean_t inuse; -#ifdef sun +#ifdef illumos if (dm_inuse_swap(file, &err)) { if (err) libdiskmgt_error(err); @@ -377,7 +377,7 @@ check_device(const char *name, boolean_t static boolean_t is_whole_disk(const char *arg) { -#ifdef sun +#ifdef illumos struct dk_gpt *label; int fd; char path[MAXPATHLEN]; @@ -915,7 +915,7 @@ check_replication(nvlist_t *config, nvli return (ret); } -#ifdef sun +#ifdef illumos /* * Go through and find any whole disks in the vdev specification, labelling them * as appropriate. When constructing the vdev spec, we were unable to open this @@ -1019,7 +1019,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t return (0); } -#endif /* sun */ +#endif /* illumos */ /* * Determine if the given path is a hot spare within the given configuration. @@ -1098,7 +1098,7 @@ is_device_in_use(nvlist_t *config, nvlis * regardless of what libdiskmgt or zpool_in_use() says. */ if (replacing) { -#ifdef sun +#ifdef illumos if (nvlist_lookup_uint64(nv, ZPOOL_CONFIG_WHOLE_DISK, &wholedisk) == 0 && wholedisk) (void) snprintf(buf, sizeof (buf), "%ss0", @@ -1422,7 +1422,7 @@ split_mirror_vdev(zpool_handle_t *zhp, c return (NULL); } -#ifdef sun +#ifdef illumos if (!flags.dryrun && make_disks(zhp, newroot) != 0) { nvlist_free(newroot); return (NULL); @@ -1507,7 +1507,7 @@ make_root_vdev(zpool_handle_t *zhp, int return (NULL); } -#ifdef sun +#ifdef illumos /* * Run through the vdev specification and label any whole disks found. */ Modified: user/dchagin/lemul/cddl/contrib/opensolaris/common/util/strtolctype.h ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/common/util/strtolctype.h Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/common/util/strtolctype.h Fri Jan 23 21:47:44 2015 (r277615) @@ -44,7 +44,7 @@ extern "C" { * safe in probe context. */ -#if defined(sun) && (defined(_KERNEL) || defined(_BOOT)) +#if defined(illumos) && (defined(_KERNEL) || defined(_BOOT)) #define isalnum(ch) (isalpha(ch) || isdigit(ch)) #define isalpha(ch) (isupper(ch) || islower(ch)) Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Fri Jan 23 21:47:44 2015 (r277615) @@ -34,14 +34,14 @@ #include #include #include -#if defined(sun) +#ifdef illumos #include #else #include #endif #include -#if defined(sun) +#ifdef illumos #ifdef _LP64 static const char *_libctf_zlib = "/usr/lib/64/libz.so"; #else @@ -58,7 +58,7 @@ static struct { static size_t _PAGESIZE; static size_t _PAGEMASK; -#if defined(sun) +#ifdef illumos #pragma init(_libctf_init) #else void _libctf_init(void) __attribute__ ((constructor)); @@ -66,7 +66,7 @@ void _libctf_init(void) __attribute__ void _libctf_init(void) { -#if defined(sun) +#ifdef illumos const char *p = getenv("LIBCTF_DECOMPRESSOR"); if (p != NULL) @@ -87,7 +87,7 @@ _libctf_init(void) void * ctf_zopen(int *errp) { -#if defined(sun) +#ifdef illumos ctf_dprintf("decompressing CTF data using %s\n", _libctf_zlib); if (zlib.z_dlp != NULL) Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Fri Jan 23 21:47:44 2015 (r277615) @@ -56,13 +56,13 @@ */ static const char *devnamep = "/dev/dtrace/helper"; -#if defined(sun) +#ifdef illumos static const char *olddevname = "/devices/pseudo/dtrace@0:helper"; #endif static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#if defined(sun) +#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ #endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ @@ -90,7 +90,7 @@ dprintf(int debug, const char *fmt, ...) va_end(ap); } -#if defined(sun) +#ifdef illumos #pragma init(dtrace_dof_init) #else static void dtrace_dof_init(void) __attribute__ ((constructor)); @@ -99,7 +99,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#if defined(sun) +#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; #else dof_hdr_t *dof = NULL; @@ -111,14 +111,14 @@ dtrace_dof_init(void) #endif dof_helper_t dh; Link_map *lmp = NULL; -#if defined(sun) +#ifdef illumos Lmid_t lmid; #else u_long lmid = 0; #endif int fd; const char *p; -#if !defined(sun) +#ifndef illumos Elf *e; Elf_Scn *scn = NULL; Elf_Data *dofdata = NULL; @@ -141,7 +141,7 @@ dtrace_dof_init(void) return; } -#if defined(sun) +#ifdef illumos if (dlinfo(RTLD_SELF, RTLD_DI_LMID, &lmid) == -1) { dprintf(1, "couldn't discover link map ID\n"); return; @@ -152,7 +152,7 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#if !defined(sun) +#ifndef illumos elf_version(EV_CURRENT); if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { dprintf(1, "couldn't open file for reading\n"); @@ -215,7 +215,7 @@ dtrace_dof_init(void) if ((fd = open64(devnamep, O_RDWR)) < 0) { dprintf(1, "failed to open helper device %s", devnamep); -#if defined(sun) +#ifdef illumos /* * If the device path wasn't explicitly set, try again with * the old device path. @@ -237,14 +237,14 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); -#if !defined(sun) +#ifndef illumos gen = dh.gen; #endif } (void) close(fd); -#if !defined(sun) +#ifndef illumos /* End of while loop */ dof = dof_next; } @@ -254,7 +254,7 @@ dtrace_dof_init(void) #endif } -#if defined(sun) +#ifdef illumos #pragma fini(dtrace_dof_fini) #else static void dtrace_dof_fini(void) __attribute__ ((destructor)); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Jan 23 21:47:44 2015 (r277615) @@ -35,7 +35,7 @@ #include #include #include -#if defined(sun) +#ifdef illumos #include #else #include @@ -453,7 +453,7 @@ dt_aggregate_snap_cpu(dtrace_hdl_t *dtp, buf->dtbd_cpu = cpu; -#if defined(sun) +#ifdef illumos if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, buf) == -1) { #else if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, &buf) == -1) { Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Jan 23 21:47:44 2015 (r277615) @@ -1888,7 +1888,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp) char **argv = malloc(sizeof (char *) * (argc + 5)); FILE *ofp = tmpfile(); -#if defined(sun) +#ifdef illumos char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */ #endif char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */ @@ -1898,7 +1898,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp) int wstat, estat; pid_t pid; -#if defined(sun) +#ifdef illumos off64_t off; #else off_t off = 0; @@ -1929,7 +1929,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp) (void) fseeko64(ifp, off, SEEK_SET); } -#if defined(sun) +#ifdef illumos (void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp)); (void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp)); #endif @@ -1940,7 +1940,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp) "-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax); argv[argc++] = verdef; -#if defined(sun) +#ifdef illumos switch (dtp->dt_stdcmode) { case DT_STDC_XA: case DT_STDC_XT: @@ -1982,7 +1982,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp) } if (pid == 0) { -#if !defined(sun) +#ifndef illumos if (isatty(fileno(ifp)) == 0) lseek(fileno(ifp), off, SEEK_SET); dup2(fileno(ifp), 0); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Jan 23 21:45:59 2015 (r277614) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Jan 23 21:47:44 2015 (r277615) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***