From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 01:19:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CAA4C4F3; Sun, 9 Jun 2013 01:19:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BCCEB12F0; Sun, 9 Jun 2013 01:19:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r591JNBY090801; Sun, 9 Jun 2013 01:19:23 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r591JNnx090799; Sun, 9 Jun 2013 01:19:23 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201306090119.r591JNnx090799@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Sun, 9 Jun 2013 01:19:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251561 - head/lib/libstand X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 01:19:23 -0000 Author: pfg Date: Sun Jun 9 01:19:22 2013 New Revision: 251561 URL: http://svnweb.freebsd.org/changeset/base/251561 Log: libstand: Reset the seek pointer in ext2fs as done in UFS. Based on r134760: Reset the seek pointer to 0 when a file is successfully opened, since otherwise the initial seek offset will contain the directory offset of the filesystem block that contained its directory entry. This bug was mostly harmless because typically the directory is less than one filesystem block in size so the offset would be zero. It did however generally break loading a kernel from the (large) kernel compile directory. Also reset the seek pointer when a new inode is opened in read_inode(), though this is not actually necessary now because all callers set it afterwards. PR: 177328 Submitted by: Eric van Gyzen Reviewed by: iedowse MFC after: 5 days Modified: head/lib/libstand/ext2fs.c Modified: head/lib/libstand/ext2fs.c ============================================================================== --- head/lib/libstand/ext2fs.c Sat Jun 8 23:48:13 2013 (r251560) +++ head/lib/libstand/ext2fs.c Sun Jun 9 01:19:22 2013 (r251561) @@ -536,6 +536,7 @@ ext2fs_open(const char *upath, struct op * Found terminal component. */ error = 0; + fp->f_seekp = 0; out: if (buf) free(buf); @@ -584,6 +585,7 @@ read_inode(ino_t inumber, struct open_fi for (level = 0; level < NIADDR; level++) fp->f_blkno[level] = -1; fp->f_buf_blkno = -1; + fp->f_seekp = 0; out: free(buf); From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 01:38:52 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F217CB60; Sun, 9 Jun 2013 01:38:51 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E37F91388; Sun, 9 Jun 2013 01:38:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r591cpIX097010; Sun, 9 Jun 2013 01:38:51 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r591cpJe097009; Sun, 9 Jun 2013 01:38:51 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201306090138.r591cpJe097009@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Sun, 9 Jun 2013 01:38:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251562 - head/sys/fs/ext2fs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 01:38:52 -0000 Author: pfg Date: Sun Jun 9 01:38:51 2013 New Revision: 251562 URL: http://svnweb.freebsd.org/changeset/base/251562 Log: e2fs_bpg and e2fs_isize are always unsigned. The superblock in ext2fs defines all the fields as unsigned but for some reason the in-memory superblock was carrying e2fs_bpg and e2fs_isize as signed. We should preserve the specified types for consistency. MFC after: 5 days Modified: head/sys/fs/ext2fs/ext2fs.h Modified: head/sys/fs/ext2fs/ext2fs.h ============================================================================== --- head/sys/fs/ext2fs/ext2fs.h Sun Jun 9 01:19:22 2013 (r251561) +++ head/sys/fs/ext2fs/ext2fs.h Sun Jun 9 01:38:51 2013 (r251562) @@ -153,7 +153,7 @@ struct m_ext2fs { char e2fs_fmod; /* super block modified flag */ uint32_t e2fs_bsize; /* Block size */ uint32_t e2fs_bshift; /* calc of logical block no */ - int32_t e2fs_bpg; /* Number of blocks per group */ + uint32_t e2fs_bpg; /* Number of blocks per group */ int64_t e2fs_qbmask; /* = s_blocksize -1 */ uint32_t e2fs_fsbtodb; /* Shift to get disk block */ uint32_t e2fs_ipg; /* Number of inodes per group */ @@ -164,7 +164,7 @@ struct m_ext2fs { uint32_t e2fs_fpg; /* Number of fragments per group */ uint32_t e2fs_gdbcount; /* Number of group descriptors */ uint32_t e2fs_gcount; /* Number of groups */ - int32_t e2fs_isize; /* Size of inode */ + uint32_t e2fs_isize; /* Size of inode */ uint32_t e2fs_total_dir; /* Total number of directories */ uint8_t *e2fs_contigdirs; /* (u) # of contig. allocated dirs */ char e2fs_wasvalid; /* valid at mount time */ From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 06:13:51 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D9742631; Sun, 9 Jun 2013 06:13:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CCB14180D; Sun, 9 Jun 2013 06:13:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r596Dp6t084526; Sun, 9 Jun 2013 06:13:51 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r596DpSs084525; Sun, 9 Jun 2013 06:13:51 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201306090613.r596DpSs084525@svn.freebsd.org> From: Glen Barber Date: Sun, 9 Jun 2013 06:13:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251563 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 06:13:51 -0000 Author: gjb Date: Sun Jun 9 06:13:51 2013 New Revision: 251563 URL: http://svnweb.freebsd.org/changeset/base/251563 Log: Add freebsd-update.conf(5) to OptionalObsoleteFiles.inc PR: 179437 Approved by: kib (mentor) MFC after: 1 week Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jun 9 01:38:51 2013 (r251562) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jun 9 06:13:51 2013 (r251563) @@ -1516,6 +1516,7 @@ OLD_FILES+=usr/share/man/man8/fdcontrol. OLD_FILES+=etc/freebsd-update.conf OLD_FILES+=usr/sbin/freebsd-update OLD_FILES+=usr/share/examples/etc/freebsd-update.conf +OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz .endif From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 07:15:44 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3AE484FA; Sun, 9 Jun 2013 07:15:44 +0000 (UTC) (envelope-from joel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2D9661BB6; Sun, 9 Jun 2013 07:15:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r597FhmY003781; Sun, 9 Jun 2013 07:15:43 GMT (envelope-from joel@svn.freebsd.org) Received: (from joel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r597FhAN003780; Sun, 9 Jun 2013 07:15:43 GMT (envelope-from joel@svn.freebsd.org) Message-Id: <201306090715.r597FhAN003780@svn.freebsd.org> From: Joel Dahl Date: Sun, 9 Jun 2013 07:15:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251564 - head/lib/libc/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 07:15:44 -0000 Author: joel (doc committer) Date: Sun Jun 9 07:15:43 2013 New Revision: 251564 URL: http://svnweb.freebsd.org/changeset/base/251564 Log: Minor mdoc fixes. Modified: head/lib/libc/sys/aio_mlock.2 Modified: head/lib/libc/sys/aio_mlock.2 ============================================================================== --- head/lib/libc/sys/aio_mlock.2 Sun Jun 9 06:13:51 2013 (r251563) +++ head/lib/libc/sys/aio_mlock.2 Sun Jun 9 07:15:43 2013 (r251564) @@ -60,7 +60,7 @@ and in order to determine return or error status for the enqueued operation while it is in progress. .Pp -If the request could not be enqueued (generally due to +If the request could not be enqueued (generally due to .Xr aio 4 limits), then the call returns without having enqueued the request. @@ -115,8 +115,8 @@ if the request was explicitly cancelled .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_return 2 , -.Xr aio 4 , -.Xr mlock 2 +.Xr mlock 2 , +.Xr aio 4 .Sh PORTABILITY The .Fn aio_mlock From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 07:23:55 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CA0A7858; Sun, 9 Jun 2013 07:23:55 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from ns.kevlo.org (kevlo.org [220.128.136.52]) by mx1.freebsd.org (Postfix) with ESMTP id 64C251BFC; Sun, 9 Jun 2013 07:23:54 +0000 (UTC) Received: from [127.0.0.1] (ns.kevlo.org [220.128.136.52]) by ns.kevlo.org (8.14.6/8.14.6) with ESMTP id r597Na7n068856; Sun, 9 Jun 2013 15:23:36 +0800 (CST) (envelope-from kevlo@FreeBSD.org) Message-ID: <51B42D83.40706@FreeBSD.org> Date: Sun, 09 Jun 2013 15:23:47 +0800 From: Kevin Lo User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: hiren panchasara Subject: Re: svn commit: r251538 - in head: share/man/man4 sys/conf sys/dev/usb sys/dev/usb/wlan sys/modules/usb sys/modules/usb/urtwn References: <201306081602.r58G2WcG014325@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head , svn-src-all , src-committers , Rui Paulo X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 07:23:55 -0000 Hiren Panchasara wrote: > On Sat, Jun 8, 2013 at 9:02 AM, Rui Paulo wrote: >> Author: rpaulo >> Date: Sat Jun 8 16:02:31 2013 >> New Revision: 251538 >> URL: http://svnweb.freebsd.org/changeset/base/251538 >> >> Log: >> Import Kevin Lo's port of urtwn(4) from OpenBSD. urtwn(4) is a driver for the >> Realtek RTL8188CU/RTL8192CU USB IEEE 802.11b/g/n wireless cards. >> This driver requires microcode which is available in FreeBSD ports: >> net/urtwn-firmware-kmod. >> >> Hiren ported the urtwn(4) man page from OpenBSD and Glen just commited a port >> for the firmware. >> >> TODO: >> - 802.11n support >> - Stability fixes - the driver can sustain lots of traffic but has trouble >> coping with simultaneous iperf sessions. >> - fix debugging >> >> MFC after: 2 months >> Tested by: kevlo, hiren, gjb > Yay! > > Great work Kevin for initial port and Rui for tuning it up to stable > state and fixing performance issues. A big thanks to Rui for fixing the rx performance and mbuf leak!!! > > cheers, > Hiren > > PS: Time for creating new image with the changes for beaglebone! Kevin From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 08:06:27 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5A11AD19; Sun, 9 Jun 2013 08:06:27 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 315B71CC3; Sun, 9 Jun 2013 08:06:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5986RbT019425; Sun, 9 Jun 2013 08:06:27 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5986QRl019421; Sun, 9 Jun 2013 08:06:26 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201306090806.r5986QRl019421@svn.freebsd.org> From: Jaakko Heinonen Date: Sun, 9 Jun 2013 08:06:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251565 - head/usr.bin/tail X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 08:06:27 -0000 Author: jh Date: Sun Jun 9 08:06:26 2013 New Revision: 251565 URL: http://svnweb.freebsd.org/changeset/base/251565 Log: Print file names without stdio buffering to avoid mixing buffered and unbuffered ouput. PR: bin/176886 Reviewed by: mjg Modified: head/usr.bin/tail/extern.h head/usr.bin/tail/forward.c head/usr.bin/tail/misc.c head/usr.bin/tail/tail.c Modified: head/usr.bin/tail/extern.h ============================================================================== --- head/usr.bin/tail/extern.h Sun Jun 9 07:15:43 2013 (r251564) +++ head/usr.bin/tail/extern.h Sun Jun 9 08:06:26 2013 (r251565) @@ -67,5 +67,6 @@ void ierr(const char *); void oerr(void); int mapprint(struct mapinfo *, off_t, off_t); int maparound(struct mapinfo *, off_t); +void printfn(const char *, int); extern int Fflag, fflag, qflag, rflag, rval, no_files; Modified: head/usr.bin/tail/forward.c ============================================================================== --- head/usr.bin/tail/forward.c Sun Jun 9 07:15:43 2013 (r251564) +++ head/usr.bin/tail/forward.c Sun Jun 9 08:06:26 2013 (r251565) @@ -243,7 +243,7 @@ show(file_info_t *file) while ((ch = getc(file->fp)) != EOF) { if (last != file && no_files > 1) { if (!qflag) - (void)printf("\n==> %s <==\n", file->file_name); + printfn(file->file_name, 1); last = file; } if (putchar(ch) == EOF) @@ -320,7 +320,7 @@ follow(file_info_t *files, enum STYLE st active = 1; n++; if (no_files > 1 && !qflag) - (void)printf("\n==> %s <==\n", file->file_name); + printfn(file->file_name, 1); forward(file->fp, file->file_name, style, off, &file->st); if (Fflag && fileno(file->fp) != STDIN_FILENO) n++; Modified: head/usr.bin/tail/misc.c ============================================================================== --- head/usr.bin/tail/misc.c Sun Jun 9 07:15:43 2013 (r251564) +++ head/usr.bin/tail/misc.c Sun Jun 9 08:06:26 2013 (r251565) @@ -113,3 +113,17 @@ maparound(struct mapinfo *mip, off_t off return (0); } + +/* + * Print the file name without stdio buffering. + */ +void +printfn(const char *fn, int print_nl) +{ + + if (print_nl) + WR("\n", 1); + WR("==> ", 4); + WR(fn, strlen(fn)); + WR(" <==\n", 5); +} Modified: head/usr.bin/tail/tail.c ============================================================================== --- head/usr.bin/tail/tail.c Sun Jun 9 07:15:43 2013 (r251564) +++ head/usr.bin/tail/tail.c Sun Jun 9 08:06:26 2013 (r251565) @@ -203,10 +203,8 @@ main(int argc, char *argv[]) continue; } if (argc > 1 && !qflag) { - (void)printf("%s==> %s <==\n", - first ? "" : "\n", fn); + printfn(fn, !first); first = 0; - (void)fflush(stdout); } if (rflag) From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 08:28:24 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C93F6F27; Sun, 9 Jun 2013 08:28:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BC1101D1A; Sun, 9 Jun 2013 08:28:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r598SOro026011; Sun, 9 Jun 2013 08:28:24 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r598SORB026010; Sun, 9 Jun 2013 08:28:24 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201306090828.r598SORB026010@svn.freebsd.org> From: Ed Schouten Date: Sun, 9 Jun 2013 08:28:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251566 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 08:28:24 -0000 Author: ed Date: Sun Jun 9 08:28:23 2013 New Revision: 251566 URL: http://svnweb.freebsd.org/changeset/base/251566 Log: Fix the way atomic_is_lock_free() is defined for Clang. When using Clang atomics, atomic types are not placed in a structure. There is thus no reason why we should get the __val member. Modified: head/sys/sys/stdatomic.h Modified: head/sys/sys/stdatomic.h ============================================================================== --- head/sys/sys/stdatomic.h Sun Jun 9 08:06:26 2013 (r251565) +++ head/sys/sys/stdatomic.h Sun Jun 9 08:28:23 2013 (r251566) @@ -156,7 +156,10 @@ enum memory_order { * 7.17.5 Lock-free property. */ -#if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS) +#if defined(__CLANG_ATOMICS) +#define atomic_is_lock_free(obj) \ + __atomic_is_lock_free(sizeof(*(obj)), obj) +#elif defined(__GNUC_ATOMICS) #define atomic_is_lock_free(obj) \ __atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val) #else From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 12:39:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DEC6873D; Sun, 9 Jun 2013 12:39:23 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CF96A172F; Sun, 9 Jun 2013 12:39:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59CdNMQ004397; Sun, 9 Jun 2013 12:39:23 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59CdMBD004384; Sun, 9 Jun 2013 12:39:22 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091239.r59CdMBD004384@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 12:39:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251567 - in stable/9/sys: dev/ata modules/usb/umass modules/usb/urio modules/usb/usfs powerpc/powermac powerpc/psim X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 12:39:24 -0000 Author: marius Date: Sun Jun 9 12:39:21 2013 New Revision: 251567 URL: http://svnweb.freebsd.org/changeset/base/251567 Log: MFC: r249213 (partial) - Remove unused headers from the SRCS of some modules. - Use __FBSDID. - Use DEVMETHOD_END. - Use NULL instead of 0 for pointers. Modified: stable/9/sys/dev/ata/ata-cbus.c stable/9/sys/dev/ata/ata-isa.c stable/9/sys/modules/usb/umass/Makefile stable/9/sys/modules/usb/urio/Makefile stable/9/sys/modules/usb/usfs/Makefile stable/9/sys/powerpc/powermac/ata_dbdma.c stable/9/sys/powerpc/powermac/ata_kauai.c stable/9/sys/powerpc/powermac/ata_macio.c stable/9/sys/powerpc/psim/ata_iobus.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/dev/ata/ata-cbus.c ============================================================================== --- stable/9/sys/dev/ata/ata-cbus.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/dev/ata/ata-cbus.c Sun Jun 9 12:39:21 2013 (r251567) @@ -273,7 +273,7 @@ static driver_t ata_cbus_driver = { static devclass_t ata_cbus_devclass; -DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, 0, 0); +DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, NULL, NULL); static int ata_cbuschannel_probe(device_t dev) Modified: stable/9/sys/dev/ata/ata-isa.c ============================================================================== --- stable/9/sys/dev/ata/ata-isa.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/dev/ata/ata-isa.c Sun Jun 9 12:39:21 2013 (r251567) @@ -195,7 +195,7 @@ static device_method_t ata_isa_methods[] DEVMETHOD(device_suspend, ata_isa_suspend), DEVMETHOD(device_resume, ata_isa_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_isa_driver = { @@ -204,5 +204,5 @@ static driver_t ata_isa_driver = { sizeof(struct ata_channel), }; -DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); Modified: stable/9/sys/modules/usb/umass/Makefile ============================================================================== --- stable/9/sys/modules/usb/umass/Makefile Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/modules/usb/umass/Makefile Sun Jun 9 12:39:21 2013 (r251567) @@ -30,8 +30,7 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= umass -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ - umass.c +SRCS= bus_if.h device_if.h opt_bus.h opt_cam.h opt_usb.h umass.c usb_if.h \ + usbdevs.h vnode_if.h .include Modified: stable/9/sys/modules/usb/urio/Makefile ============================================================================== --- stable/9/sys/modules/usb/urio/Makefile Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/modules/usb/urio/Makefile Sun Jun 9 12:39:21 2013 (r251567) @@ -30,8 +30,6 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= urio -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ - urio.c +SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h urio.c .include Modified: stable/9/sys/modules/usb/usfs/Makefile ============================================================================== --- stable/9/sys/modules/usb/usfs/Makefile Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/modules/usb/usfs/Makefile Sun Jun 9 12:39:21 2013 (r251567) @@ -30,8 +30,7 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= usfs -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ +SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h \ ustorage_fs.c .include Modified: stable/9/sys/powerpc/powermac/ata_dbdma.c ============================================================================== --- stable/9/sys/powerpc/powermac/ata_dbdma.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/powerpc/powermac/ata_dbdma.c Sun Jun 9 12:39:21 2013 (r251567) @@ -23,10 +23,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("* $FreeBSD$"); + /* * Common routines for the DMA engine on both the Apple Kauai and MacIO * ATA controllers. Modified: stable/9/sys/powerpc/powermac/ata_kauai.c ============================================================================== --- stable/9/sys/powerpc/powermac/ata_kauai.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/powerpc/powermac/ata_kauai.c Sun Jun 9 12:39:21 2013 (r251567) @@ -99,7 +99,7 @@ static device_method_t ata_kauai_methods /* ATA interface */ DEVMETHOD(ata_setmode, ata_kauai_setmode), - { 0, 0 } + DEVMETHOD_END }; struct ata_kauai_softc { @@ -120,15 +120,15 @@ static driver_t ata_kauai_driver = { sizeof(struct ata_kauai_softc), }; -DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); /* * PCI ID search table */ -static struct kauai_pci_dev { - u_int32_t kpd_devid; - char *kpd_desc; +static const struct kauai_pci_dev { + u_int32_t kpd_devid; + const char *kpd_desc; } kauai_pci_devlist[] = { { 0x0033106b, "Uninorth2 Kauai ATA Controller" }, { 0x003b106b, "Intrepid Kauai ATA Controller" }, @@ -152,6 +152,7 @@ static const u_int pio_timing_kauai[] = 0x05000249, /* PIO3 */ 0x04000148 /* PIO4 */ }; + static const u_int pio_timing_shasta[] = { 0x0a000c97, /* PIO0 */ 0x07000712, /* PIO1 */ @@ -165,6 +166,7 @@ static const u_int dma_timing_kauai[] = 0x00209000, /* WDMA1 */ 0x00148000 /* WDMA2 */ }; + static const u_int dma_timing_shasta[] = { 0x00820800, /* WDMA0 */ 0x0028b000, /* WDMA1 */ @@ -179,6 +181,7 @@ static const u_int udma_timing_kauai[] = 0x00002a31, /* UDMA4 */ 0x00002921 /* UDMA5 */ }; + static const u_int udma_timing_shasta[] = { 0x00035901, /* UDMA0 */ 0x000348b1, /* UDMA1 */ @@ -368,4 +371,3 @@ ata_kauai_begin_transaction(struct ata_r return ata_begin_transaction(request); } - Modified: stable/9/sys/powerpc/powermac/ata_macio.c ============================================================================== --- stable/9/sys/powerpc/powermac/ata_macio.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/powerpc/powermac/ata_macio.c Sun Jun 9 12:39:21 2013 (r251567) @@ -23,10 +23,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* * Mac-io ATA controller */ @@ -85,7 +86,7 @@ struct ide_timings { int active; /* minimum command active time [ns] */ }; -struct ide_timings pio_timings[5] = { +static const struct ide_timings pio_timings[5] = { { 600, 180 }, /* PIO 0 */ { 390, 150 }, /* PIO 1 */ { 240, 105 }, /* PIO 2 */ @@ -122,7 +123,7 @@ static device_method_t ata_macio_methods /* ATA interface */ DEVMETHOD(ata_setmode, ata_macio_setmode), - { 0, 0 } + DEVMETHOD_END }; struct ata_macio_softc { @@ -143,7 +144,7 @@ static driver_t ata_macio_driver = { sizeof(struct ata_macio_softc), }; -DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); static int @@ -332,4 +333,3 @@ ata_macio_begin_transaction(struct ata_r return ata_begin_transaction(request); } - Modified: stable/9/sys/powerpc/psim/ata_iobus.c ============================================================================== --- stable/9/sys/powerpc/psim/ata_iobus.c Sun Jun 9 08:28:23 2013 (r251566) +++ stable/9/sys/powerpc/psim/ata_iobus.c Sun Jun 9 12:39:21 2013 (r251567) @@ -23,10 +23,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* * PSIM local bus ATA controller */ @@ -80,7 +81,7 @@ static device_method_t ata_iobus_methods DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_iobus_driver = { @@ -91,7 +92,8 @@ static driver_t ata_iobus_driver = { static devclass_t ata_iobus_devclass; -DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, 0, 0); +DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, NULL, + NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); static int @@ -221,7 +223,7 @@ static device_method_t ata_iobus_sub_met /* ATA interface */ DEVMETHOD(ata_setmode, ata_iobus_sub_setmode), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_iobus_sub_driver = { @@ -230,7 +232,7 @@ static driver_t ata_iobus_sub_driver = { sizeof(struct ata_channel), }; -DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, NULL, NULL); static int ata_iobus_sub_probe(device_t dev) From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 12:46:43 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 219C8B0A; Sun, 9 Jun 2013 12:46:43 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 10E6F1797; Sun, 9 Jun 2013 12:46:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59Ckgg0007236; Sun, 9 Jun 2013 12:46:42 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59Ckgs8007232; Sun, 9 Jun 2013 12:46:42 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091246.r59Ckgs8007232@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 12:46:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251568 - stable/9/sys/dev/aac X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 12:46:43 -0000 Author: marius Date: Sun Jun 9 12:46:41 2013 New Revision: 251568 URL: http://svnweb.freebsd.org/changeset/base/251568 Log: MFC: r251115 - Remove pointless returns. - Make cm_data a void pointer and cm_flags unsigned as appropriate. Modified: stable/9/sys/dev/aac/aac.c stable/9/sys/dev/aac/aac_cam.c stable/9/sys/dev/aac/aac_disk.c stable/9/sys/dev/aac/aacvar.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/aac/aac.c ============================================================================== --- stable/9/sys/dev/aac/aac.c Sun Jun 9 12:39:21 2013 (r251567) +++ stable/9/sys/dev/aac/aac.c Sun Jun 9 12:46:41 2013 (r251568) @@ -379,8 +379,6 @@ aac_add_event(struct aac_softc *sc, stru event->ev_type); break; } - - return; } /* @@ -1631,8 +1629,6 @@ aac_map_command_sg(void *arg, bus_dma_se aac_requeue_ready(cm); } } - - return; } /* @@ -2362,7 +2358,6 @@ aac_timeout(struct aac_softc *sc) "longer running! code= 0x%x\n", code); } } - return; } /* @@ -3372,8 +3367,6 @@ aac_handle_aif(struct aac_softc *sc, str /* Wakeup any poll()ers */ selwakeuppri(&sc->rcv_select, PRIBIO); mtx_unlock(&sc->aac_aifq_lock); - - return; } /* @@ -3788,6 +3781,4 @@ aac_get_bus_info(struct aac_softc *sc) if (found) bus_generic_attach(sc->aac_dev); - - return; } Modified: stable/9/sys/dev/aac/aac_cam.c ============================================================================== --- stable/9/sys/dev/aac/aac_cam.c Sun Jun 9 12:39:21 2013 (r251567) +++ stable/9/sys/dev/aac/aac_cam.c Sun Jun 9 12:46:41 2013 (r251568) @@ -163,8 +163,6 @@ aac_cam_event(struct aac_softc *sc, stru event->ev_type); break; } - - return; } static int @@ -513,8 +511,6 @@ aac_cam_action(struct cam_sim *sim, unio aac_enqueue_ready(cm); aac_startio(cm->cm_sc); - - return; } static void @@ -623,8 +619,6 @@ aac_cam_complete(struct aac_command *cm) aac_release_command(cm); xpt_done(ccb); - - return; } static u_int32_t Modified: stable/9/sys/dev/aac/aac_disk.c ============================================================================== --- stable/9/sys/dev/aac/aac_disk.c Sun Jun 9 12:39:21 2013 (r251567) +++ stable/9/sys/dev/aac/aac_disk.c Sun Jun 9 12:46:41 2013 (r251568) @@ -167,8 +167,6 @@ aac_disk_strategy(struct bio *bp) mtx_lock(&sc->ad_controller->aac_io_lock); aac_submit_bio(bp); mtx_unlock(&sc->ad_controller->aac_io_lock); - - return; } /* Modified: stable/9/sys/dev/aac/aacvar.h ============================================================================== --- stable/9/sys/dev/aac/aacvar.h Sun Jun 9 12:39:21 2013 (r251567) +++ stable/9/sys/dev/aac/aacvar.h Sun Jun 9 12:46:41 2013 (r251568) @@ -158,13 +158,13 @@ struct aac_command struct aac_fib *cm_fib; /* FIB associated with this * command */ u_int64_t cm_fibphys; /* bus address of the FIB */ - struct bio *cm_data; /* pointer to data in kernel + void *cm_data; /* pointer to data in kernel * space */ u_int32_t cm_datalen; /* data length */ bus_dmamap_t cm_datamap; /* DMA map for bio data */ struct aac_sg_table *cm_sgtable; /* pointer to s/g table in * command */ - int cm_flags; + u_int cm_flags; #define AAC_CMD_MAPPED (1<<0) /* command has had its data * mapped */ #define AAC_CMD_DATAIN (1<<1) /* command involves data moving @@ -182,7 +182,7 @@ struct aac_command #define AAC_QUEUE_FRZN (1<<9) /* Freeze the processing of * commands on the queue. */ - void (* cm_complete)(struct aac_command *cm); + void (*cm_complete)(struct aac_command *cm); void *cm_private; time_t cm_timestamp; /* command creation time */ int cm_queue; From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 12:51:43 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E5FAFEAC; Sun, 9 Jun 2013 12:51:43 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C9E30181B; Sun, 9 Jun 2013 12:51:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59Cphc7009555; Sun, 9 Jun 2013 12:51:43 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59Cphp2009552; Sun, 9 Jun 2013 12:51:43 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091251.r59Cphp2009552@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 12:51:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251569 - in stable/9/sys/dev: msk sk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 12:51:44 -0000 Author: marius Date: Sun Jun 9 12:51:42 2013 New Revision: 251569 URL: http://svnweb.freebsd.org/changeset/base/251569 Log: MFC: r251133 - Merge from r249476: Ensure that PCI bus BUS_GET_DMA_TAG() method sees the actual PCI device which makes the request for DMA tag, instead of some descendant of the PCI device, by creating a pass-through trampoline. - Sprinkle const on tables. - Use NULL instead of 0 for pointers. - Take advantage of nitems(). Modified: stable/9/sys/dev/msk/if_msk.c stable/9/sys/dev/sk/if_sk.c stable/9/sys/dev/sk/if_skreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/msk/if_msk.c ============================================================================== --- stable/9/sys/dev/msk/if_msk.c Sun Jun 9 12:46:41 2013 (r251568) +++ stable/9/sys/dev/msk/if_msk.c Sun Jun 9 12:51:42 2013 (r251569) @@ -162,7 +162,7 @@ TUNABLE_INT("hw.msk.jumbo_disable", &jum /* * Devices supported by this driver. */ -static struct msk_product { +static const struct msk_product { uint16_t msk_vendorid; uint16_t msk_deviceid; const char *msk_name; @@ -257,6 +257,7 @@ static int mskc_shutdown(device_t); static int mskc_setup_rambuffer(struct msk_softc *); static int mskc_suspend(device_t); static int mskc_resume(device_t); +static bus_dma_tag_t mskc_get_dma_tag(device_t, device_t); static void mskc_reset(struct msk_softc *); static int msk_probe(device_t); @@ -334,6 +335,8 @@ static device_method_t mskc_methods[] = DEVMETHOD(device_resume, mskc_resume), DEVMETHOD(device_shutdown, mskc_shutdown), + DEVMETHOD(bus_get_dma_tag, mskc_get_dma_tag), + DEVMETHOD_END }; @@ -368,9 +371,9 @@ static driver_t msk_driver = { static devclass_t msk_devclass; -DRIVER_MODULE(mskc, pci, mskc_driver, mskc_devclass, 0, 0); -DRIVER_MODULE(msk, mskc, msk_driver, msk_devclass, 0, 0); -DRIVER_MODULE(miibus, msk, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(mskc, pci, mskc_driver, mskc_devclass, NULL, NULL); +DRIVER_MODULE(msk, mskc, msk_driver, msk_devclass, NULL, NULL); +DRIVER_MODULE(miibus, msk, miibus_driver, miibus_devclass, NULL, NULL); static struct resource_spec msk_res_spec_io[] = { { SYS_RES_IOPORT, PCIR_BAR(1), RF_ACTIVE }, @@ -1180,15 +1183,14 @@ msk_ioctl(struct ifnet *ifp, u_long comm static int mskc_probe(device_t dev) { - struct msk_product *mp; + const struct msk_product *mp; uint16_t vendor, devid; int i; vendor = pci_get_vendor(dev); devid = pci_get_device(dev); mp = msk_products; - for (i = 0; i < sizeof(msk_products)/sizeof(msk_products[0]); - i++, mp++) { + for (i = 0; i < nitems(msk_products); i++, mp++) { if (vendor == mp->msk_vendorid && devid == mp->msk_deviceid) { device_set_desc(dev, mp->msk_name); return (BUS_PROBE_DEFAULT); @@ -2119,6 +2121,13 @@ mskc_detach(device_t dev) return (0); } +static bus_dma_tag_t +mskc_get_dma_tag(device_t bus, device_t child __unused) +{ + + return (bus_get_dma_tag(bus)); +} + struct msk_dmamap_arg { bus_addr_t msk_busaddr; }; Modified: stable/9/sys/dev/sk/if_sk.c ============================================================================== --- stable/9/sys/dev/sk/if_sk.c Sun Jun 9 12:46:41 2013 (r251568) +++ stable/9/sys/dev/sk/if_sk.c Sun Jun 9 12:51:42 2013 (r251569) @@ -143,7 +143,7 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static struct sk_type sk_devs[] = { +static const struct sk_type sk_devs[] = { { VENDORID_SK, DEVICEID_SK_V1, @@ -193,6 +193,7 @@ static int skc_detach(device_t); static int skc_shutdown(device_t); static int skc_suspend(device_t); static int skc_resume(device_t); +static bus_dma_tag_t skc_get_dma_tag(device_t, device_t); static int sk_detach(device_t); static int sk_probe(device_t); static int sk_attach(device_t); @@ -296,6 +297,8 @@ static device_method_t skc_methods[] = { DEVMETHOD(device_resume, skc_resume), DEVMETHOD(device_shutdown, skc_shutdown), + DEVMETHOD(bus_get_dma_tag, skc_get_dma_tag), + DEVMETHOD_END }; @@ -330,9 +333,9 @@ static driver_t sk_driver = { static devclass_t sk_devclass; -DRIVER_MODULE(skc, pci, skc_driver, skc_devclass, 0, 0); -DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0); -DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(skc, pci, skc_driver, skc_devclass, NULL, NULL); +DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, NULL, NULL); +DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, NULL, NULL); static struct resource_spec sk_res_spec_io[] = { { SYS_RES_IOPORT, PCIR_BAR(1), RF_ACTIVE }, @@ -1186,7 +1189,7 @@ static int skc_probe(dev) device_t dev; { - struct sk_type *t = sk_devs; + const struct sk_type *t = sk_devs; while(t->sk_name != NULL) { if ((pci_get_vendor(dev) == t->sk_vid) && @@ -1889,6 +1892,13 @@ skc_detach(dev) return(0); } +static bus_dma_tag_t +skc_get_dma_tag(device_t bus, device_t child __unused) +{ + + return (bus_get_dma_tag(bus)); +} + struct sk_dmamap_arg { bus_addr_t sk_busaddr; }; @@ -3186,7 +3196,7 @@ sk_init_xmac(sc_if) struct sk_softc *sc; struct ifnet *ifp; u_int16_t eaddr[(ETHER_ADDR_LEN+1)/2]; - struct sk_bcom_hack bhack[] = { + static const struct sk_bcom_hack bhack[] = { { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 }, { 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 }, { 0x15, 0x0232 }, { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 }, Modified: stable/9/sys/dev/sk/if_skreg.h ============================================================================== --- stable/9/sys/dev/sk/if_skreg.h Sun Jun 9 12:46:41 2013 (r251568) +++ stable/9/sys/dev/sk/if_skreg.h Sun Jun 9 12:51:42 2013 (r251569) @@ -1289,7 +1289,7 @@ struct sk_type { u_int16_t sk_vid; u_int16_t sk_did; - char *sk_name; + const char *sk_name; }; #define SK_ADDR_LO(x) ((u_int64_t) (x) & 0xffffffff) From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 12:55:45 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8E767313; Sun, 9 Jun 2013 12:55:45 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7197F1876; Sun, 9 Jun 2013 12:55:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59CtjkP010298; Sun, 9 Jun 2013 12:55:45 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59CtiWG010295; Sun, 9 Jun 2013 12:55:44 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091255.r59CtiWG010295@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 12:55:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251570 - stable/9/sys/dev/bce X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 12:55:45 -0000 Author: marius Date: Sun Jun 9 12:55:44 2013 New Revision: 251570 URL: http://svnweb.freebsd.org/changeset/base/251570 Log: MFC: r251142 - As a follow-up to r247565 (MFC'ed to stable/9 in r248036), make firmware images that do not require patching at runtime actually const. - Remove pointless softc members by employing the corresponding constants directly. - Remove pointless returns. - Remove unnecessary inclusion of opt_device_polling.h. - Replace an outdated and now bogus comment in bce_tick() with the appropriate one. Modified: stable/9/sys/dev/bce/if_bce.c stable/9/sys/dev/bce/if_bcefw.h stable/9/sys/dev/bce/if_bcereg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bce/if_bce.c ============================================================================== --- stable/9/sys/dev/bce/if_bce.c Sun Jun 9 12:51:42 2013 (r251569) +++ stable/9/sys/dev/bce/if_bce.c Sun Jun 9 12:55:44 2013 (r251570) @@ -375,7 +375,8 @@ static void bce_release_resources (struc /****************************************************************************/ static void bce_fw_cap_init (struct bce_softc *); static int bce_fw_sync (struct bce_softc *, u32); -static void bce_load_rv2p_fw (struct bce_softc *, u32 *, u32, u32); +static void bce_load_rv2p_fw (struct bce_softc *, const u32 *, u32, + u32); static void bce_load_cpu_fw (struct bce_softc *, struct cpu_reg *, struct fw_info *); static void bce_start_cpu (struct bce_softc *, struct cpu_reg *); @@ -1019,7 +1020,6 @@ bce_set_tunables(struct bce_softc *sc) sc->bce_tx_ticks = DEFAULT_TX_TICKS; sc->bce_tx_quick_cons_trip = DEFAULT_TX_QUICK_CONS_TRIP; } - } @@ -1332,23 +1332,6 @@ bce_attach(device_t dev) /* Fetch the permanent Ethernet MAC address. */ bce_get_mac_addr(sc); - /* - * Trip points control how many BDs - * should be ready before generating an - * interrupt while ticks control how long - * a BD can sit in the chain before - * generating an interrupt. Set the default - * values for the RX and TX chains. - */ - - /* Not used for L2. */ - sc->bce_comp_prod_trip_int = 0; - sc->bce_comp_prod_trip = 0; - sc->bce_com_ticks_int = 0; - sc->bce_com_ticks = 0; - sc->bce_cmd_ticks_int = 0; - sc->bce_cmd_ticks = 0; - /* Update statistics once every second. */ sc->bce_stats_ticks = 1000000 & 0xffff00; @@ -1935,7 +1918,6 @@ bce_miibus_read_reg(device_t dev, int ph DB_PRINT_PHY_REG(reg, val); return (val & 0xffff); - } @@ -3037,7 +3019,6 @@ bce_get_rx_buffer_sizes(struct bce_softc roundup2((MSIZE - MHLEN), 16) - (MSIZE - MHLEN); sc->rx_bd_mbuf_data_len = sc->rx_bd_mbuf_alloc_size - sc->rx_bd_mbuf_align_pad; - sc->pg_bd_mbuf_alloc_size = MCLBYTES; } else { if ((mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + ETHER_CRC_LEN) > MCLBYTES) { @@ -3067,7 +3048,6 @@ bce_get_rx_buffer_sizes(struct bce_softc sc->rx_bd_mbuf_align_pad); DBEXIT(BCE_VERBOSE_LOAD); - } /****************************************************************************/ @@ -3484,8 +3464,6 @@ bce_dma_map_addr(void *arg, bus_dma_segm } else { *busaddr = segs->ds_addr; } - - return; } @@ -3793,21 +3771,17 @@ bce_dma_alloc(device_t dev) * Create a DMA tag for RX mbufs. */ if (bce_hdr_split == TRUE) - max_size = max_seg_size = ((sc->rx_bd_mbuf_alloc_size < MCLBYTES) ? + max_size = ((sc->rx_bd_mbuf_alloc_size < MCLBYTES) ? MCLBYTES : sc->rx_bd_mbuf_alloc_size); else - max_size = max_seg_size = MJUM9BYTES; - max_segments = 1; + max_size = MJUM9BYTES; DBPRINT(sc, BCE_INFO_LOAD, "%s(): Creating rx_mbuf_tag " - "(max size = 0x%jX max segments = %d, max segment " - "size = 0x%jX)\n", __FUNCTION__, (uintmax_t) max_size, - max_segments, (uintmax_t) max_seg_size); + "(max size = 0x%jX)\n", __FUNCTION__, (uintmax_t)max_size); if (bus_dma_tag_create(sc->parent_tag, BCE_RX_BUF_ALIGN, BCE_DMA_BOUNDARY, sc->max_bus_addr, BUS_SPACE_MAXADDR, NULL, NULL, - max_size, max_segments, max_seg_size, 0, NULL, NULL, - &sc->rx_mbuf_tag)) { + max_size, 1, max_size, 0, NULL, NULL, &sc->rx_mbuf_tag)) { BCE_PRINTF("%s(%d): Could not allocate RX mbuf DMA tag!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3873,12 +3847,9 @@ bce_dma_alloc(device_t dev) /* * Create a DMA tag for page mbufs. */ - max_size = max_seg_size = ((sc->pg_bd_mbuf_alloc_size < MCLBYTES) ? - MCLBYTES : sc->pg_bd_mbuf_alloc_size); - if (bus_dma_tag_create(sc->parent_tag, 1, BCE_DMA_BOUNDARY, - sc->max_bus_addr, BUS_SPACE_MAXADDR, NULL, NULL, - max_size, 1, max_seg_size, 0, NULL, NULL, &sc->pg_mbuf_tag)) { + sc->max_bus_addr, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, + 1, MCLBYTES, 0, NULL, NULL, &sc->pg_mbuf_tag)) { BCE_PRINTF("%s(%d): Could not allocate page mbuf " "DMA tag!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -4028,7 +3999,7 @@ bce_fw_sync_exit: /* Nothing. */ /****************************************************************************/ static void -bce_load_rv2p_fw(struct bce_softc *sc, u32 *rv2p_code, +bce_load_rv2p_fw(struct bce_softc *sc, const u32 *rv2p_code, u32 rv2p_code_len, u32 rv2p_proc) { int i; @@ -5244,24 +5215,28 @@ bce_blockinit(struct bce_softc *sc) REG_WR(sc, BCE_HC_STATISTICS_ADDR_H, BCE_ADDR_HI(sc->stats_block_paddr)); - /* Program various host coalescing parameters. */ + /* + * Program various host coalescing parameters. + * Trip points control how many BDs should be ready before generating + * an interrupt while ticks control how long a BD can sit in the chain + * before generating an interrupt. + */ REG_WR(sc, BCE_HC_TX_QUICK_CONS_TRIP, - (sc->bce_tx_quick_cons_trip_int << 16) | sc->bce_tx_quick_cons_trip); + (sc->bce_tx_quick_cons_trip_int << 16) | + sc->bce_tx_quick_cons_trip); REG_WR(sc, BCE_HC_RX_QUICK_CONS_TRIP, - (sc->bce_rx_quick_cons_trip_int << 16) | sc->bce_rx_quick_cons_trip); - REG_WR(sc, BCE_HC_COMP_PROD_TRIP, - (sc->bce_comp_prod_trip_int << 16) | sc->bce_comp_prod_trip); + (sc->bce_rx_quick_cons_trip_int << 16) | + sc->bce_rx_quick_cons_trip); REG_WR(sc, BCE_HC_TX_TICKS, (sc->bce_tx_ticks_int << 16) | sc->bce_tx_ticks); REG_WR(sc, BCE_HC_RX_TICKS, (sc->bce_rx_ticks_int << 16) | sc->bce_rx_ticks); - REG_WR(sc, BCE_HC_COM_TICKS, - (sc->bce_com_ticks_int << 16) | sc->bce_com_ticks); - REG_WR(sc, BCE_HC_CMD_TICKS, - (sc->bce_cmd_ticks_int << 16) | sc->bce_cmd_ticks); - REG_WR(sc, BCE_HC_STATS_TICKS, - (sc->bce_stats_ticks & 0xffff00)); + REG_WR(sc, BCE_HC_STATS_TICKS, sc->bce_stats_ticks & 0xffff00); REG_WR(sc, BCE_HC_STAT_COLLECT_TICKS, 0xbb8); /* 3ms */ + /* Not used for L2. */ + REG_WR(sc, BCE_HC_COMP_PROD_TRIP, 0); + REG_WR(sc, BCE_HC_COM_TICKS, 0); + REG_WR(sc, BCE_HC_CMD_TICKS, 0); /* Configure the Host Coalescing block. */ val = BCE_HC_CONFIG_RX_TMR_MODE | BCE_HC_CONFIG_TX_TMR_MODE | @@ -5554,15 +5529,14 @@ bce_get_pg_buf(struct bce_softc *sc, str m_new->m_data = m_new->m_ext.ext_buf; } - m_new->m_len = sc->pg_bd_mbuf_alloc_size; + m_new->m_len = MCLBYTES; /* ToDo: Consider calling m_fragment() to test error handling. */ /* Map the mbuf cluster into device memory. */ map = sc->pg_mbuf_map[*prod_idx]; error = bus_dmamap_load(sc->pg_mbuf_tag, map, mtod(m_new, void *), - sc->pg_bd_mbuf_alloc_size, bce_dma_map_addr, - &busaddr, BUS_DMA_NOWAIT); + MCLBYTES, bce_dma_map_addr, &busaddr, BUS_DMA_NOWAIT); /* Handle any mapping errors. */ if (error) { @@ -5586,7 +5560,7 @@ bce_get_pg_buf(struct bce_softc *sc, str pgbd->rx_bd_haddr_lo = htole32(BCE_ADDR_LO(busaddr)); pgbd->rx_bd_haddr_hi = htole32(BCE_ADDR_HI(busaddr)); - pgbd->rx_bd_len = htole32(sc->pg_bd_mbuf_alloc_size); + pgbd->rx_bd_len = htole32(MCLBYTES); pgbd->rx_bd_flags = htole32(RX_BD_FLAGS_START | RX_BD_FLAGS_END); /* Save the mbuf and update our counter. */ @@ -5974,10 +5948,9 @@ bce_free_rx_chain(struct bce_softc *sc) /* Clear each RX chain page. */ for (i = 0; i < sc->rx_pages; i++) - if (sc->rx_bd_chain[i] != NULL) { + if (sc->rx_bd_chain[i] != NULL) bzero((char *)sc->rx_bd_chain[i], BCE_RX_CHAIN_PAGE_SZ); - } sc->free_rx_bd = sc->max_rx_bd; @@ -6041,7 +6014,7 @@ bce_init_pg_chain(struct bce_softc *sc) CTX_WR(sc, GET_CID_ADDR(RX_CID), BCE_L2CTX_RX_PG_BUF_SIZE, 0); /* Configure the rx_bd and page chain mbuf cluster size. */ - val = (sc->rx_bd_mbuf_data_len << 16) | sc->pg_bd_mbuf_alloc_size; + val = (sc->rx_bd_mbuf_data_len << 16) | MCLBYTES; CTX_WR(sc, GET_CID_ADDR(RX_CID), BCE_L2CTX_RX_PG_BUF_SIZE, val); /* Configure the context reserved for jumbo support. */ @@ -7163,10 +7136,9 @@ bce_init_locked(struct bce_softc *sc) ether_mtu = ifp->if_mtu; else { if (bce_hdr_split == TRUE) { - if (ifp->if_mtu <= (sc->rx_bd_mbuf_data_len + - sc->pg_bd_mbuf_alloc_size)) - ether_mtu = sc->rx_bd_mbuf_data_len + - sc->pg_bd_mbuf_alloc_size; + if (ifp->if_mtu <= sc->rx_bd_mbuf_data_len + MCLBYTES) + ether_mtu = sc->rx_bd_mbuf_data_len + + MCLBYTES; else ether_mtu = ifp->if_mtu; } else { @@ -7194,9 +7166,6 @@ bce_init_locked(struct bce_softc *sc) bce_set_rx_mode(sc); if (bce_hdr_split == TRUE) { - DBPRINT(sc, BCE_INFO_LOAD, "%s(): pg_bd_mbuf_alloc_size = %d\n", - __FUNCTION__, sc->pg_bd_mbuf_alloc_size); - /* Init page buffer descriptor chain. */ bce_init_pg_chain(sc); } @@ -7690,7 +7659,6 @@ bce_start_locked(struct ifnet *ifp) bce_start_locked_exit: DBEXIT(BCE_VERBOSE_SEND | BCE_VERBOSE_CTX); - return; } @@ -8491,11 +8459,7 @@ bce_tick(void *xsc) /* Update the statistics from the hardware statistics block. */ bce_stats_update(sc); - /* - * ToDo: This is a safety measure. Need to re-evaluate - * high level processing logic and eliminate this code. - */ - /* Top off the receive and page chains. */ + /* Ensure page and RX chains get refilled in low-memory situations. */ if (bce_hdr_split == TRUE) bce_fill_pg_chain(sc); bce_fill_rx_chain(sc); @@ -8544,7 +8508,6 @@ bce_tick(void *xsc) bce_tick_exit: DBEXIT(BCE_EXTREME_MISC); - return; } static void @@ -11627,7 +11590,5 @@ bce_breakpoint(struct bce_softc *sc) /* Call the debugger. */ breakpoint(); - - return; } #endif Modified: stable/9/sys/dev/bce/if_bcefw.h ============================================================================== --- stable/9/sys/dev/bce/if_bcefw.h Sun Jun 9 12:51:42 2013 (r251569) +++ stable/9/sys/dev/bce/if_bcefw.h Sun Jun 9 12:55:44 2013 (r251570) @@ -57,7 +57,7 @@ u32 bce_COM_b06FwSbssAddr = 0x08004aa0; int bce_COM_b06FwSbssLen = 0x38; u32 bce_COM_b06FwSDataAddr = 0x00000000; int bce_COM_b06FwSDataLen = 0x0; -u32 bce_COM_b06FwText[(0x4a68/4) + 1] = { +const u32 bce_COM_b06FwText[(0x4a68/4) + 1] = { 0xa000046, 0x0, 0x0, 0xd, 0x636f6d36, 0x2e302e31, 0x35000000, 0x6000f02, 0x0, 0x3, 0xc8, @@ -1249,14 +1249,14 @@ u32 bce_COM_b06FwText[(0x4a68/4) + 1] = 0x440fffe, 0x24020002, 0xaf5101c0, 0xa34201c4, 0x3c021000, 0xaf4201f8, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0020, 0x0 }; -u32 bce_COM_b06FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_COM_b06FwRodata[(0x14/4) + 1] = { +const u32 bce_COM_b06FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_COM_b06FwRodata[(0x14/4) + 1] = { 0x8000acc, 0x8000b14, 0x8000b98, 0x8000be4, 0x8000c20, 0x0 }; -u32 bce_COM_b06FwBss[(0xc4/4) + 1] = { 0x0 }; -u32 bce_COM_b06FwSbss[(0x38/4) + 1] = { 0x0 }; -u32 bce_COM_b06FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_COM_b06FwBss[(0xc4/4) + 1] = { 0x0 }; +const u32 bce_COM_b06FwSbss[(0x38/4) + 1] = { 0x0 }; +const u32 bce_COM_b06FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_RXP_b06FwReleaseMajor = 0x6; @@ -1275,7 +1275,7 @@ u32 bce_RXP_b06FwSbssAddr = 0x08007320; int bce_RXP_b06FwSbssLen = 0x4c; u32 bce_RXP_b06FwSDataAddr = 0x00000000; int bce_RXP_b06FwSDataLen = 0x0; -u32 bce_RXP_b06FwText[(0x72d0/4) + 1] = { +const u32 bce_RXP_b06FwText[(0x72d0/4) + 1] = { 0xa000c84, 0x0, 0x0, 0xd, 0x72787036, 0x2e302e31, 0x35000000, 0x6000f03, 0x0, 0x1, 0x0, @@ -3114,15 +3114,15 @@ u32 bce_RXP_b06FwText[(0x72d0/4) + 1] = 0x8fbf0020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x3c021000, 0x27bd0028, 0x3e00008, 0xaf4201b8, 0x0 }; -u32 bce_RXP_b06FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_RXP_b06FwRodata[(0x24/4) + 1] = { +const u32 bce_RXP_b06FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_RXP_b06FwRodata[(0x24/4) + 1] = { 0x8003430, 0x8003430, 0x80033a8, 0x80033e0, 0x8003414, 0x8003438, 0x8003438, 0x8003438, 0x8003318, 0x0 }; -u32 bce_RXP_b06FwBss[(0x440/4) + 1] = { 0x0 }; -u32 bce_RXP_b06FwSbss[(0x4c/4) + 1] = { 0x0 }; -u32 bce_RXP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_RXP_b06FwBss[(0x440/4) + 1] = { 0x0 }; +const u32 bce_RXP_b06FwSbss[(0x4c/4) + 1] = { 0x0 }; +const u32 bce_RXP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_TPAT_b06FwReleaseMajor = 0x6; @@ -3141,7 +3141,7 @@ u32 bce_TPAT_b06FwSbssAddr = 0x08001c00; int bce_TPAT_b06FwSbssLen = 0x44; u32 bce_TPAT_b06FwSDataAddr = 0x00000000; int bce_TPAT_b06FwSDataLen = 0x0; -u32 bce_TPAT_b06FwText[(0x17d4/4) + 1] = { +const u32 bce_TPAT_b06FwText[(0x17d4/4) + 1] = { 0xa000124, 0x0, 0x0, 0xd, 0x74706136, 0x2e302e31, 0x35000000, 0x6000f01, 0x0, 0x0, 0x0, @@ -3524,11 +3524,11 @@ u32 bce_TPAT_b06FwText[(0x17d4/4) + 1] = 0x14a0fffb, 0x42042, 0xc35021, 0x8fbf0010, 0xa4c02, 0x312200ff, 0x27bd0018, 0xaf8a002c, 0x3e00008, 0xaf890030, 0x0 }; -u32 bce_TPAT_b06FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 }; -u32 bce_TPAT_b06FwBss[(0x450/4) + 1] = { 0x0 }; -u32 bce_TPAT_b06FwSbss[(0x44/4) + 1] = { 0x0 }; -u32 bce_TPAT_b06FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b06FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b06FwBss[(0x450/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b06FwSbss[(0x44/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b06FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_TXP_b06FwReleaseMajor = 0x6; @@ -3547,7 +3547,7 @@ u32 bce_TXP_b06FwSbssAddr = 0x08003c20; int bce_TXP_b06FwSbssLen = 0x68; u32 bce_TXP_b06FwSDataAddr = 0x00000000; int bce_TXP_b06FwSDataLen = 0x0; -u32 bce_TXP_b06FwText[(0x3bfc/4) + 1] = { +const u32 bce_TXP_b06FwText[(0x3bfc/4) + 1] = { 0xa00002a, 0x0, 0x0, 0xd, 0x74787036, 0x2e302e31, 0x35000000, 0x6000f00, 0x0, 0x136, 0xea60, @@ -4509,11 +4509,11 @@ u32 bce_TXP_b06FwText[(0x3bfc/4) + 1] = 0x3c010800, 0xac243d58, 0x3c010800, 0xac233d68, 0x3c010800, 0xac223d60, 0x3e00008, 0x0, 0x0 }; -u32 bce_TXP_b06FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_TXP_b06FwRodata[(0x0/4) + 1] = { 0x0 }; -u32 bce_TXP_b06FwBss[(0x14c/4) + 1] = { 0x0 }; -u32 bce_TXP_b06FwSbss[(0x68/4) + 1] = { 0x0 }; -u32 bce_TXP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TXP_b06FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TXP_b06FwRodata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TXP_b06FwBss[(0x14c/4) + 1] = { 0x0 }; +const u32 bce_TXP_b06FwSbss[(0x68/4) + 1] = { 0x0 }; +const u32 bce_TXP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_CP_b06FwReleaseMajor = 0x6; @@ -4532,7 +4532,7 @@ u32 bce_CP_b06FwSbssAddr = 0x08005884; int bce_CP_b06FwSbssLen = 0xf1; u32 bce_CP_b06FwSDataAddr = 0x00000000; int bce_CP_b06FwSDataLen = 0x0; -u32 bce_CP_b06FwText[(0x5688/4) + 1] = { +const u32 bce_CP_b06FwText[(0x5688/4) + 1] = { 0xa000028, 0x0, 0x0, 0xd, 0x6370362e, 0x302e3135, 0x0, 0x6000f04, 0x0, 0x0, 0x0, @@ -5918,7 +5918,7 @@ u32 bce_CP_b06FwText[(0x5688/4) + 1] = { 0x27bd0030, 0x8f83001c, 0x8c620004, 0x10400003, 0x0, 0x3e00008, 0x0, 0x8c640010, 0x8c650008, 0xa001527, 0x8c66000c, 0x0 }; -u32 bce_CP_b06FwData[(0x84/4) + 1] = { +const u32 bce_CP_b06FwData[(0x84/4) + 1] = { 0x0, 0x1b, 0xf, 0xa, 0x8, 0x6, 0x5, 0x5, 0x4, 0x4, 0x3, @@ -5928,7 +5928,7 @@ u32 bce_CP_b06FwData[(0x84/4) + 1] = { 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x1, 0x1, 0x1, 0x0 }; -u32 bce_CP_b06FwRodata[(0x158/4) + 1] = { +const u32 bce_CP_b06FwRodata[(0x158/4) + 1] = { 0x8000f24, 0x8000d6c, 0x8000fb8, 0x8001060, 0x8000f4c, 0x8000f8c, 0x8001194, 0x8000d88, 0x80011b8, 0x8000dd8, 0x8001554, @@ -5951,12 +5951,12 @@ u32 bce_CP_b06FwRodata[(0x158/4) + 1] = 0x8002e1c, 0x8002de4, 0x8002df0, 0x8002dfc, 0x8002e08, 0x80052e8, 0x80052a8, 0x8005274, 0x8005248, 0x8005224, 0x80051e0, 0x0 }; -u32 bce_CP_b06FwBss[(0x5d8/4) + 1] = { 0x0 }; -u32 bce_CP_b06FwSbss[(0xf1/4) + 1] = { 0x0 }; -u32 bce_CP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_CP_b06FwBss[(0x5d8/4) + 1] = { 0x0 }; +const u32 bce_CP_b06FwSbss[(0xf1/4) + 1] = { 0x0 }; +const u32 bce_CP_b06FwSdata[(0x0/4) + 1] = { 0x0 }; -u32 bce_rv2p_proc1[] = { +const u32 bce_rv2p_proc1[] = { 0x00000010, 0xb1800006, 0x0000001f, 0x0106000f, 0x00000008, 0x0500ffff, @@ -6681,7 +6681,7 @@ u32 bce_TXP_b09FwSbssAddr = 0x08003d88; int bce_TXP_b09FwSbssLen = 0x64; u32 bce_TXP_b09FwSDataAddr = 0x00000000; int bce_TXP_b09FwSDataLen = 0x0; -u32 bce_TXP_b09FwText[(0x3d28/4) + 1] = { +const u32 bce_TXP_b09FwText[(0x3d28/4) + 1] = { 0xa00002a, 0x0, 0x0, 0xd, 0x74787036, 0x2e302e31, 0x37000000, 0x6001100, 0x0, 0x136, 0xea60, @@ -7661,15 +7661,15 @@ u32 bce_TXP_b09FwText[(0x3d28/4) + 1] = 0xac263fcc, 0x3c010800, 0xac253fc4, 0x3c010800, 0xac243fc0, 0x3c010800, 0xac233fd0, 0x3c010800, 0xac223fc8, 0x3e00008, 0x0, 0x0 }; -u32 bce_TXP_b09FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_TXP_b09FwRodata[(0x30/4) + 1] = { +const u32 bce_TXP_b09FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TXP_b09FwRodata[(0x30/4) + 1] = { 0x80000940, 0x80000900, 0x80080100, 0x80080080, 0x80080000, 0x800e0000, 0x80080080, 0x80080000, 0x80000a80, 0x80000a00, 0x80000980, 0x80000900, 0x0 }; -u32 bce_TXP_b09FwBss[(0x24c/4) + 1] = { 0x0 }; -u32 bce_TXP_b09FwSbss[(0x64/4) + 1] = { 0x0 }; -u32 bce_TXP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TXP_b09FwBss[(0x24c/4) + 1] = { 0x0 }; +const u32 bce_TXP_b09FwSbss[(0x64/4) + 1] = { 0x0 }; +const u32 bce_TXP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_TPAT_b09FwReleaseMajor = 0x6; @@ -7688,7 +7688,7 @@ u32 bce_TPAT_b09FwSbssAddr = 0x08001720; int bce_TPAT_b09FwSbssLen = 0x3c; u32 bce_TPAT_b09FwSDataAddr = 0x00000000; int bce_TPAT_b09FwSDataLen = 0x0; -u32 bce_TPAT_b09FwText[(0x12fc/4) + 1] = { +const u32 bce_TPAT_b09FwText[(0x12fc/4) + 1] = { 0xa000124, 0x0, 0x0, 0xd, 0x74706136, 0x2e302e31, 0x37000000, 0x6001101, 0x0, 0x0, 0x0, @@ -7994,12 +7994,12 @@ u32 bce_TPAT_b09FwText[(0x12fc/4) + 1] = 0x0, 0x0, 0x2402ffff, 0x2463ffff, 0x1462fffa, 0x24840004, 0x3e00008, 0x0, 0x0 }; -u32 bce_TPAT_b09FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_TPAT_b09FwRodata[(0x4/4) + 1] = { +const u32 bce_TPAT_b09FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b09FwRodata[(0x4/4) + 1] = { 0x1, 0x0 }; -u32 bce_TPAT_b09FwBss[(0x12b4/4) + 1] = { 0x0 }; -u32 bce_TPAT_b09FwSbss[(0x3c/4) + 1] = { 0x0 }; -u32 bce_TPAT_b09FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b09FwBss[(0x12b4/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b09FwSbss[(0x3c/4) + 1] = { 0x0 }; +const u32 bce_TPAT_b09FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_COM_b09FwReleaseMajor = 0x6; @@ -8018,7 +8018,7 @@ u32 bce_COM_b09FwSbssAddr = 0x08005608; int bce_COM_b09FwSbssLen = 0x30; u32 bce_COM_b09FwSDataAddr = 0x00000000; int bce_COM_b09FwSDataLen = 0x0; -u32 bce_COM_b09FwText[(0x5594/4) + 1] = { +const u32 bce_COM_b09FwText[(0x5594/4) + 1] = { 0xa000046, 0x0, 0x0, 0xd, 0x636f6d36, 0x2e302e31, 0x37000000, 0x6001102, 0x0, 0x3, 0xc8, @@ -9389,15 +9389,15 @@ u32 bce_COM_b09FwText[(0x5594/4) + 1] = 0x40f809, 0x0, 0xa001560, 0x0, 0xd, 0x3c1c0800, 0x279c5608, 0x8fbf0010, 0x3e00008, 0x27bd0018, 0x0 }; -u32 bce_COM_b09FwData[(0x0/4) + 1] = { 0x0 }; -u32 bce_COM_b09FwRodata[(0x38/4) + 1] = { +const u32 bce_COM_b09FwData[(0x0/4) + 1] = { 0x0 }; +const u32 bce_COM_b09FwRodata[(0x38/4) + 1] = { 0x80080240, 0x80080100, 0x80080080, 0x80080000, 0xc80, 0x3200, 0x8000e98, 0x8000ef4, 0x8000f88, 0x8001028, 0x8001074, 0x80080100, 0x80080080, 0x80080000, 0x0 }; -u32 bce_COM_b09FwBss[(0x11c/4) + 1] = { 0x0 }; -u32 bce_COM_b09FwSbss[(0x30/4) + 1] = { 0x0 }; -u32 bce_COM_b09FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_COM_b09FwBss[(0x11c/4) + 1] = { 0x0 }; +const u32 bce_COM_b09FwSbss[(0x30/4) + 1] = { 0x0 }; +const u32 bce_COM_b09FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_RXP_b09FwReleaseMajor = 0x6; @@ -9416,7 +9416,7 @@ u32 bce_RXP_b09FwSbssAddr = 0x08009400; int bce_RXP_b09FwSbssLen = 0x78; u32 bce_RXP_b09FwSDataAddr = 0x00000000; int bce_RXP_b09FwSDataLen = 0x0; -u32 bce_RXP_b09FwText[(0x9090/4) + 1] = { +const u32 bce_RXP_b09FwText[(0x9090/4) + 1] = { 0xa000c84, 0x0, 0x0, 0xd, 0x72787036, 0x2e302e31, 0x37000000, 0x6001103, 0x0, 0x1, 0x0, @@ -11786,9 +11786,9 @@ u32 bce_RXP_b09FwRodata[(0x33c/4) + 1] = 0x8007fc0, 0x8007fc0, 0x8007fc0, 0x8007fc0, 0x8007fe8, 0x8008b6c, 0x8008cc8, 0x8008ca8, 0x8008710, 0x8008b84, 0x0 }; -u32 bce_RXP_b09FwBss[(0x1bc/4) + 1] = { 0x0 }; -u32 bce_RXP_b09FwSbss[(0x78/4) + 1] = { 0x0 }; -u32 bce_RXP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_RXP_b09FwBss[(0x1bc/4) + 1] = { 0x0 }; +const u32 bce_RXP_b09FwSbss[(0x78/4) + 1] = { 0x0 }; +const u32 bce_RXP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; int bce_CP_b09FwReleaseMajor = 0x6; @@ -11807,7 +11807,7 @@ u32 bce_CP_b09FwSbssAddr = 0x080059b0; int bce_CP_b09FwSbssLen = 0xa8; u32 bce_CP_b09FwSDataAddr = 0x00000000; int bce_CP_b09FwSDataLen = 0x0; -u32 bce_CP_b09FwText[(0x5744/4) + 1] = { +const u32 bce_CP_b09FwText[(0x5744/4) + 1] = { 0xa000028, 0x0, 0x0, 0xd, 0x6370362e, 0x302e3137, 0x0, 0x6001104, 0x0, 0x0, 0x0, @@ -13205,7 +13205,7 @@ u32 bce_CP_b09FwText[(0x5744/4) + 1] = { 0xa00156a, 0x8fbf001c, 0xe0010d1, 0x0, 0x5040ff9e, 0x8fbf001c, 0x9259007d, 0x3330003f, 0xa0015c6, 0x36020040, 0x0 }; -u32 bce_CP_b09FwData[(0x84/4) + 1] = { +const u32 bce_CP_b09FwData[(0x84/4) + 1] = { 0x0, 0x1b, 0xf, 0xa, 0x8, 0x6, 0x5, 0x5, 0x4, 0x4, 0x3, @@ -13215,7 +13215,7 @@ u32 bce_CP_b09FwData[(0x84/4) + 1] = { 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x1, 0x1, 0x1, 0x0 }; -u32 bce_CP_b09FwRodata[(0x1c0/4) + 1] = { +const u32 bce_CP_b09FwRodata[(0x1c0/4) + 1] = { 0x80080100, 0x80080080, 0x80080000, 0xc00, 0x3080, 0x80011d0, 0x800127c, 0x8001294, 0x80012a8, @@ -13245,12 +13245,12 @@ u32 bce_CP_b09FwRodata[(0x1c0/4) + 1] = 0x80080080, 0x80080000, 0x80080080, 0x8004c64, 0x8004c9c, 0x8004be4, 0x8004c64, 0x8004c64, 0x80049b8, 0x8004c64, 0x8005050, 0x0 }; -u32 bce_CP_b09FwBss[(0x19c/4) + 1] = { 0x0 }; -u32 bce_CP_b09FwSbss[(0xa8/4) + 1] = { 0x0 }; -u32 bce_CP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; +const u32 bce_CP_b09FwBss[(0x19c/4) + 1] = { 0x0 }; +const u32 bce_CP_b09FwSbss[(0xa8/4) + 1] = { 0x0 }; +const u32 bce_CP_b09FwSdata[(0x0/4) + 1] = { 0x0 }; -u32 bce_xi_rv2p_proc1[] = { +const u32 bce_xi_rv2p_proc1[] = { 0x00000010, 0xb1800006, 0x0000001f, 0x05060011, 0x00000008, 0x0500ffff, @@ -13541,7 +13541,7 @@ u32 bce_xi_rv2p_proc1[] = { }; -u32 bce_xi_rv2p_proc2[] = { +const u32 bce_xi_rv2p_proc2[] = { 0x00000010, 0xb1800004, 0x0000001f, 0x05060011, 0x00000008, 0x050000ff, @@ -14008,9 +14008,9 @@ u32 bce_xi_rv2p_proc2[] = { 0x00000010, 0x001f0000, 0x00000018, 0x8000fe35, }; - -u32 bce_xi90_rv2p_proc1[] = { + +const u32 bce_xi90_rv2p_proc1[] = { 0x00000010, 0xb1800006, 0x0000001f, 0x03060011, 0x00000008, 0x0500ffff, @@ -14316,7 +14316,7 @@ u32 bce_xi90_rv2p_proc1[] = { }; -u32 bce_xi90_rv2p_proc2[] = { +const u32 bce_xi90_rv2p_proc2[] = { 0x00000010, 0xb1800004, 0x0000001f, 0x03060011, 0x00000008, 0x050000ff, @@ -14849,6 +14849,3 @@ u32 bce_xi90_rv2p_proc2[] = { bce_rv2p_proc2[BCE_RV2P_PROC2_MAX_BD_PAGE_LOC] = \ (bce_rv2p_proc2[BCE_RV2P_PROC2_MAX_BD_PAGE_LOC] & ~0xFFFF) | (value); \ } - - - Modified: stable/9/sys/dev/bce/if_bcereg.h ============================================================================== --- stable/9/sys/dev/bce/if_bcereg.h Sun Jun 9 12:51:42 2013 (r251569) +++ stable/9/sys/dev/bce/if_bcereg.h Sun Jun 9 12:55:44 2013 (r251570) @@ -32,10 +32,6 @@ #ifndef _BCEREG_H_DEFINED #define _BCEREG_H_DEFINED -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_device_polling.h" -#endif - #include #include #include @@ -6337,13 +6333,13 @@ struct fw_info { u32 bss_addr; u32 bss_len; u32 bss_index; - u32 *bss; + const u32 *bss; /* Read-only section. */ u32 rodata_addr; u32 rodata_len; u32 rodata_index; - u32 *rodata; + const u32 *rodata; }; #define RV2P_PROC1 0 @@ -6422,6 +6418,8 @@ struct fw_info { struct bce_softc { + struct mtx bce_mtx; + /* Interface info */ struct ifnet *bce_ifp; @@ -6449,8 +6447,6 @@ struct bce_softc /* IRQ Resource Handle */ struct resource *bce_res_irq; - struct mtx bce_mtx; - /* Interrupt handler. */ void *bce_intrhand; @@ -6564,14 +6560,6 @@ struct bce_softc u16 bce_rx_ticks; u32 bce_stats_ticks; - /* ToDo: Can these be removed? */ - u16 bce_comp_prod_trip_int; - u16 bce_comp_prod_trip; - u16 bce_com_ticks_int; - u16 bce_com_ticks; - u16 bce_cmd_ticks_int; - u16 bce_cmd_ticks; - /* The address of the integrated PHY on the MII bus. */ int bce_phy_addr; @@ -6604,11 +6592,9 @@ struct bce_softc int watchdog_timer; /* Frame size and mbuf allocation size for RX frames. */ - u32 max_frame_size; int rx_bd_mbuf_alloc_size; int rx_bd_mbuf_data_len; int rx_bd_mbuf_align_pad; - int pg_bd_mbuf_alloc_size; /* Receive mode settings (i.e promiscuous, multicast, etc.). */ u32 rx_mode; From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 13:17:53 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 58190E4; Sun, 9 Jun 2013 13:17:53 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4A89B1999; Sun, 9 Jun 2013 13:17:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59DHrAv017774; Sun, 9 Jun 2013 13:17:53 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59DHrGg017773; Sun, 9 Jun 2013 13:17:53 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091317.r59DHrGg017773@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 13:17:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251571 - stable/9/sys/dev/sym X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 13:17:53 -0000 Author: marius Date: Sun Jun 9 13:17:52 2013 New Revision: 251571 URL: http://svnweb.freebsd.org/changeset/base/251571 Log: MFC: r251394 CAM_DEV_QFREEZE handling should only be done on request submission but neither on completion nor by SIM drivers in the first place. This issue has been revealed by r249466. Modified: stable/9/sys/dev/sym/sym_hipd.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sym/sym_hipd.c ============================================================================== --- stable/9/sys/dev/sym/sym_hipd.c Sun Jun 9 12:55:44 2013 (r251570) +++ stable/9/sys/dev/sym/sym_hipd.c Sun Jun 9 13:17:52 2013 (r251571) @@ -2349,17 +2349,6 @@ static void sym_enqueue_cam_ccb(ccb_p cp /* * Complete a pending CAM CCB. */ -static void _sym_xpt_done(hcb_p np, union ccb *ccb) -{ - SYM_LOCK_ASSERT(MA_OWNED); - - KASSERT((ccb->ccb_h.status & CAM_SIM_QUEUED) == 0, - ("%s: status=CAM_SIM_QUEUED", __func__)); - - if (ccb->ccb_h.flags & CAM_DEV_QFREEZE) - sym_freeze_cam_ccb(ccb); - xpt_done(ccb); -} static void sym_xpt_done(hcb_p np, union ccb *ccb, ccb_p cp) { @@ -2371,7 +2360,7 @@ static void sym_xpt_done(hcb_p np, union ccb->ccb_h.status &= ~CAM_SIM_QUEUED; ccb->ccb_h.sym_hcb_ptr = NULL; } - _sym_xpt_done(np, ccb); + xpt_done(ccb); } static void sym_xpt_done2(hcb_p np, union ccb *ccb, int cam_status) @@ -2379,7 +2368,7 @@ static void sym_xpt_done2(hcb_p np, unio SYM_LOCK_ASSERT(MA_OWNED); sym_set_cam_status(ccb, cam_status); - _sym_xpt_done(np, ccb); + xpt_done(ccb); } /* @@ -8969,7 +8958,7 @@ static int sym_cam_attach(hcb_p np) goto fail; np->sim = sim; - if (xpt_create_path(&path, 0, + if (xpt_create_path(&path, NULL, cam_sim_path(np->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { goto fail; From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 13:24:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9A96A2E1; Sun, 9 Jun 2013 13:24:16 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7D58A19BD; Sun, 9 Jun 2013 13:24:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59DOGwT020333; Sun, 9 Jun 2013 13:24:16 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59DOG5j020332; Sun, 9 Jun 2013 13:24:16 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091324.r59DOG5j020332@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 13:24:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251572 - stable/9/sys/dev/sym X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 13:24:16 -0000 Author: marius Date: Sun Jun 9 13:24:16 2013 New Revision: 251572 URL: http://svnweb.freebsd.org/changeset/base/251572 Log: MFC: r251402 (partial) Handle/mark/nuke unused arguments. Modified: stable/9/sys/dev/sym/sym_hipd.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sym/sym_hipd.c ============================================================================== --- stable/9/sys/dev/sym/sym_hipd.c Sun Jun 9 13:17:52 2013 (r251571) +++ stable/9/sys/dev/sym/sym_hipd.c Sun Jun 9 13:24:16 2013 (r251572) @@ -592,11 +592,18 @@ static void sym_mfree(void *ptr, int siz * BUS handle. A reverse table (hashed) is maintained for virtual * to BUS address translation. */ -static void getbaddrcb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +static void getbaddrcb(void *arg, bus_dma_segment_t *segs, int nseg __unused, + int error) { bus_addr_t *baddr; + + KASSERT(nseg == 1, ("%s: too many DMA segments (%d)", __func__, nseg)); + baddr = (bus_addr_t *)arg; - *baddr = segs->ds_addr; + if (error) + *baddr = 0; + else + *baddr = segs->ds_addr; } static m_addr_t ___dma_getp(m_pool_s *mp) @@ -1162,6 +1169,14 @@ struct sym_tcb { }; /* + * Assert some alignments required by the chip. + */ +CTASSERT(((offsetof(struct sym_reg, nc_sxfer) ^ + offsetof(struct sym_tcb, head.sval)) &3) == 0); +CTASSERT(((offsetof(struct sym_reg, nc_scntl3) ^ + offsetof(struct sym_tcb, head.wval)) &3) == 0); + +/* * Global LCB HEADER. * * Due to lack of indirect addressing on earlier NCR chips, @@ -1262,9 +1277,9 @@ struct sym_pmc { * LUN(s) > 0. */ #if SYM_CONF_MAX_LUN <= 1 -#define sym_lp(np, tp, lun) (!lun) ? (tp)->lun0p : 0 +#define sym_lp(tp, lun) (!lun) ? (tp)->lun0p : 0 #else -#define sym_lp(np, tp, lun) \ +#define sym_lp(tp, lun) \ (!lun) ? (tp)->lun0p : (tp)->lunmp ? (tp)->lunmp[(lun)] : 0 #endif @@ -2219,11 +2234,11 @@ static void sym_int_par (hcb_p np, u_sho static void sym_int_ma (hcb_p np); static int sym_dequeue_from_squeue(hcb_p np, int i, int target, int lun, int task); -static void sym_sir_bad_scsi_status (hcb_p np, int num, ccb_p cp); +static void sym_sir_bad_scsi_status (hcb_p np, ccb_p cp); static int sym_clear_tasks (hcb_p np, int status, int targ, int lun, int task); static void sym_sir_task_recovery (hcb_p np, int num); static int sym_evaluate_dp (hcb_p np, ccb_p cp, u32 scr, int *ofs); -static void sym_modify_dp (hcb_p np, tcb_p tp, ccb_p cp, int ofs); +static void sym_modify_dp(hcb_p np, ccb_p cp, int ofs); static int sym_compute_residual (hcb_p np, ccb_p cp); static int sym_show_msg (u_char * msg); static void sym_print_msg (ccb_p cp, char *label, u_char *msg); @@ -2257,7 +2272,7 @@ static int sym_fast_scatter_sg_physical( static int sym_scatter_sg_physical (hcb_p np, ccb_p cp, bus_dma_segment_t *psegs, int nsegs); static void sym_action2 (struct cam_sim *sim, union ccb *ccb); -static void sym_update_trans (hcb_p np, tcb_p tp, struct sym_trans *tip, +static void sym_update_trans(hcb_p np, struct sym_trans *tip, struct ccb_trans_settings *cts); static void sym_update_dflags(hcb_p np, u_char *flags, struct ccb_trans_settings *cts); @@ -2352,6 +2367,7 @@ static void sym_enqueue_cam_ccb(ccb_p cp static void sym_xpt_done(hcb_p np, union ccb *ccb, ccb_p cp) { + SYM_LOCK_ASSERT(MA_OWNED); if (ccb->ccb_h.status & CAM_SIM_QUEUED) { @@ -2365,6 +2381,7 @@ static void sym_xpt_done(hcb_p np, union static void sym_xpt_done2(hcb_p np, union ccb *ccb, int cam_status) { + SYM_LOCK_ASSERT(MA_OWNED); sym_set_cam_status(ccb, cam_status); @@ -4657,7 +4674,7 @@ sym_flush_comp_queue(hcb_p np, int cam_s * SCRATCHA is assumed to have been loaded with STARTPOS * before the SCRIPTS called the C code. */ -static void sym_sir_bad_scsi_status(hcb_p np, int num, ccb_p cp) +static void sym_sir_bad_scsi_status(hcb_p np, ccb_p cp) { tcb_p tp = &np->target[cp->target]; u32 startp; @@ -5084,7 +5101,7 @@ static void sym_sir_task_recovery(hcb_p * an IDENTIFY(lun) + ABORT MESSAGE. */ if (lun != -1) { - lcb_p lp = sym_lp(np, tp, lun); + lcb_p lp = sym_lp(tp, lun); lp->to_clear = 0; /* We donnot expect to fail here */ np->abrt_msg[0] = M_IDENTIFY | lun; np->abrt_msg[1] = M_ABORT; @@ -5377,7 +5394,7 @@ out_err: * Btw, we assume in that situation that such a message * is equivalent to a MODIFY DATA POINTER (offset=-1). */ -static void sym_modify_dp(hcb_p np, tcb_p tp, ccb_p cp, int ofs) +static void sym_modify_dp(hcb_p np, ccb_p cp, int ofs) { int dp_ofs = ofs; u32 dp_scr = INL (nc_temp); @@ -6106,7 +6123,7 @@ static void sym_int_sir (hcb_p np) case SIR_BAD_SCSI_STATUS: if (!cp) goto out; - sym_sir_bad_scsi_status(np, num, cp); + sym_sir_bad_scsi_status(np, cp); return; /* * We are asked by the SCRIPTS to prepare a @@ -6180,7 +6197,7 @@ static void sym_int_sir (hcb_p np) sym_print_msg(cp,"modify DP",np->msgin); tmp = (np->msgin[3]<<24) + (np->msgin[4]<<16) + (np->msgin[5]<<8) + (np->msgin[6]); - sym_modify_dp(np, tp, cp, tmp); + sym_modify_dp(np, cp, tmp); return; case M_X_SYNC_REQ: sym_sync_nego(np, tp, cp); @@ -6205,7 +6222,7 @@ static void sym_int_sir (hcb_p np) case M_IGN_RESIDUE: if (DEBUG_FLAGS & DEBUG_POINTER) sym_print_msg(cp,"ign wide residue", np->msgin); - sym_modify_dp(np, tp, cp, -1); + sym_modify_dp(np, cp, -1); return; case M_REJECT: if (INB (HS_PRT) == HS_NEGOTIATE) @@ -6264,7 +6281,7 @@ out_stuck: static ccb_p sym_get_ccb (hcb_p np, u_char tn, u_char ln, u_char tag_order) { tcb_p tp = &np->target[tn]; - lcb_p lp = sym_lp(np, tp, ln); + lcb_p lp = sym_lp(tp, ln); u_short tag = NO_TAG; SYM_QUEHEAD *qp; ccb_p cp = (ccb_p) NULL; @@ -6387,10 +6404,10 @@ out_free: /* * Release one control block */ -static void sym_free_ccb (hcb_p np, ccb_p cp) +static void sym_free_ccb(hcb_p np, ccb_p cp) { tcb_p tp = &np->target[cp->target]; - lcb_p lp = sym_lp(np, tp, cp->lun); + lcb_p lp = sym_lp(tp, cp->lun); if (DEBUG_FLAGS & DEBUG_TAGS) { PRINT_LUN(np, cp->target, cp->lun); @@ -6575,27 +6592,12 @@ static ccb_p sym_ccb_from_dsa(hcb_p np, } /* - * Target control block initialisation. - * Nothing important to do at the moment. - */ -static void sym_init_tcb (hcb_p np, u_char tn) -{ - /* - * Check some alignments required by the chip. - */ - assert (((offsetof(struct sym_reg, nc_sxfer) ^ - offsetof(struct sym_tcb, head.sval)) &3) == 0); - assert (((offsetof(struct sym_reg, nc_scntl3) ^ - offsetof(struct sym_tcb, head.wval)) &3) == 0); -} - -/* * Lun control block allocation and initialization. */ static lcb_p sym_alloc_lcb (hcb_p np, u_char tn, u_char ln) { tcb_p tp = &np->target[tn]; - lcb_p lp = sym_lp(np, tp, ln); + lcb_p lp = sym_lp(tp, ln); /* * Already done, just return. @@ -6608,11 +6610,6 @@ static lcb_p sym_alloc_lcb (hcb_p np, u_ assert(!sym_is_bit(tp->busy0_map, ln)); /* - * Initialize the target control block if not yet. - */ - sym_init_tcb (np, tn); - - /* * Allocate the LCB bus address array. * Compute the bus address of this table. */ @@ -6678,7 +6675,7 @@ fail: static void sym_alloc_lcb_tags (hcb_p np, u_char tn, u_char ln) { tcb_p tp = &np->target[tn]; - lcb_p lp = sym_lp(np, tp, ln); + lcb_p lp = sym_lp(tp, ln); int i; /* @@ -7288,7 +7285,7 @@ static void sym_complete_ok (hcb_p np, c */ csio = &cp->cam_ccb->csio; tp = &np->target[cp->target]; - lp = sym_lp(np, tp, cp->lun); + lp = sym_lp(tp, cp->lun); /* * Assume device discovered on first success. @@ -7487,7 +7484,7 @@ static void sym_action(struct cam_sim *s * Retrieve the target and lun descriptors. */ tp = &np->target[ccb_h->target_id]; - lp = sym_lp(np, tp, ccb_h->target_lun); + lp = sym_lp(tp, ccb_h->target_lun); /* * Complete the 1st INQUIRY command with error @@ -8025,14 +8022,14 @@ static void sym_action2(struct cam_sim * * Update SPI transport settings in TARGET control block. * Update SCSI device settings in LUN control block. */ - lp = sym_lp(np, tp, ccb_h->target_lun); + lp = sym_lp(tp, ccb_h->target_lun); if (cts->type == CTS_TYPE_CURRENT_SETTINGS) { - sym_update_trans(np, tp, &tp->tinfo.goal, cts); + sym_update_trans(np, &tp->tinfo.goal, cts); if (lp) sym_update_dflags(np, &lp->current_flags, cts); } if (cts->type == CTS_TYPE_USER_SETTINGS) { - sym_update_trans(np, tp, &tp->tinfo.user, cts); + sym_update_trans(np, &tp->tinfo.user, cts); if (lp) sym_update_dflags(np, &lp->user_flags, cts); } @@ -8042,7 +8039,7 @@ static void sym_action2(struct cam_sim * case XPT_GET_TRAN_SETTINGS: cts = &ccb->cts; tp = &np->target[ccb_h->target_id]; - lp = sym_lp(np, tp, ccb_h->target_lun); + lp = sym_lp(tp, ccb_h->target_lun); #define cts__scsi (&cts->proto_specific.scsi) #define cts__spi (&cts->xport_specific.spi) @@ -8167,7 +8164,7 @@ static void sym_action2(struct cam_sim * * Asynchronous notification handler. */ static void -sym_async(void *cb_arg, u32 code, struct cam_path *path, void *arg) +sym_async(void *cb_arg, u32 code, struct cam_path *path, void *args __unused) { hcb_p np; struct cam_sim *sim; @@ -8206,9 +8203,10 @@ sym_async(void *cb_arg, u32 code, struct /* * Update transfer settings of a target. */ -static void sym_update_trans(hcb_p np, tcb_p tp, struct sym_trans *tip, - struct ccb_trans_settings *cts) +static void sym_update_trans(hcb_p np, struct sym_trans *tip, + struct ccb_trans_settings *cts) { + SYM_LOCK_ASSERT(MA_OWNED); /* @@ -8285,6 +8283,7 @@ static void sym_update_trans(hcb_p np, t static void sym_update_dflags(hcb_p np, u_char *flags, struct ccb_trans_settings *cts) { + SYM_LOCK_ASSERT(MA_OWNED); #define cts__scsi (&cts->proto_specific.scsi) @@ -8882,7 +8881,7 @@ static void sym_pci_free(hcb_p np) for (target = 0; target < SYM_CONF_MAX_TARGET ; target++) { tp = &np->target[target]; for (lun = 0 ; lun < SYM_CONF_MAX_LUN ; lun++) { - lp = sym_lp(np, tp, lun); + lp = sym_lp(tp, lun); if (!lp) continue; if (lp->itlq_tbl) @@ -9001,6 +9000,7 @@ fail: */ static void sym_cam_free(hcb_p np) { + SYM_LOCK_ASSERT(MA_NOTOWNED); if (np->intr) { From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 13:50:15 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 07A2B6CE; Sun, 9 Jun 2013 13:50:15 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EDDEA1A50; Sun, 9 Jun 2013 13:50:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59DoEqN027331; Sun, 9 Jun 2013 13:50:14 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59DoExI027330; Sun, 9 Jun 2013 13:50:14 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091350.r59DoExI027330@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 13:50:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251573 - stable/9/sys/dev/bce X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 13:50:15 -0000 Author: marius Date: Sun Jun 9 13:50:14 2013 New Revision: 251573 URL: http://svnweb.freebsd.org/changeset/base/251573 Log: MFC: r251146 (partial) - Do not supply arguments as pointers to bce_get_{pg,rx}_buf() that are not altered or actually needed there any longer. - Honor errors passed to the DMA mapping callbacks. - In bce_get_rx_buf(), do not reserve stack space for more DMA segments than actually necessary. - In bce_rx_intr(), remove a pointless check for an empty mbuf pointer which can only happen in case of a severe programming error. Moreover, recovering from that situation would require way more actions with header splitting enabled (which it is by default). - Fix VLAN tagging in the RX path; do not attach the VLAN tag twice if the firmware has been told to keep it. [1] Obtained from: OpenBSD [1] Modified: stable/9/sys/dev/bce/if_bce.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bce/if_bce.c ============================================================================== --- stable/9/sys/dev/bce/if_bce.c Sun Jun 9 13:24:16 2013 (r251572) +++ stable/9/sys/dev/bce/if_bce.c Sun Jun 9 13:50:14 2013 (r251573) @@ -399,14 +399,12 @@ static int bce_blockinit (struct bce static int bce_init_tx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); -static int bce_get_rx_buf (struct bce_softc *, - struct mbuf *, u16 *, u16 *, u32 *); +static int bce_get_rx_buf (struct bce_softc *, u16, u16, u32 *); static int bce_init_rx_chain (struct bce_softc *); static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); -static int bce_get_pg_buf (struct bce_softc *, - struct mbuf *, u16 *, u16 *); +static int bce_get_pg_buf (struct bce_softc *, u16, u16); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); static void bce_free_pg_chain (struct bce_softc *); @@ -3544,7 +3542,7 @@ bce_dma_alloc(device_t dev) sc->status_block, BCE_STATUS_BLK_SZ, bce_dma_map_addr, &sc->status_block_paddr, BUS_DMA_NOWAIT); - if (error) { + if (error || sc->status_block_paddr == 0) { BCE_PRINTF("%s(%d): Could not map status block " "DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3581,7 +3579,7 @@ bce_dma_alloc(device_t dev) sc->stats_block, BCE_STATS_BLK_SZ, bce_dma_map_addr, &sc->stats_block_paddr, BUS_DMA_NOWAIT); - if(error) { + if (error || sc->stats_block_paddr == 0) { BCE_PRINTF("%s(%d): Could not map statistics block " "DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3633,7 +3631,7 @@ bce_dma_alloc(device_t dev) sc->ctx_block[i], BCM_PAGE_SIZE, bce_dma_map_addr, &sc->ctx_paddr[i], BUS_DMA_NOWAIT); - if (error) { + if (error || sc->ctx_paddr[i] == 0) { BCE_PRINTF("%s(%d): Could not map CTX " "DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3678,7 +3676,7 @@ bce_dma_alloc(device_t dev) BCE_TX_CHAIN_PAGE_SZ, bce_dma_map_addr, &sc->tx_bd_chain_paddr[i], BUS_DMA_NOWAIT); - if (error) { + if (error || sc->tx_bd_chain_paddr[i] == 0) { BCE_PRINTF("%s(%d): Could not map TX descriptor " "chain DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3755,7 +3753,7 @@ bce_dma_alloc(device_t dev) BCE_RX_CHAIN_PAGE_SZ, bce_dma_map_addr, &sc->rx_bd_chain_paddr[i], BUS_DMA_NOWAIT); - if (error) { + if (error || sc->rx_bd_chain_paddr[i] == 0) { BCE_PRINTF("%s(%d): Could not map RX descriptor " "chain DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -3832,7 +3830,7 @@ bce_dma_alloc(device_t dev) BCE_PG_CHAIN_PAGE_SZ, bce_dma_map_addr, &sc->pg_bd_chain_paddr[i], BUS_DMA_NOWAIT); - if (error) { + if (error || sc->pg_bd_chain_paddr[i] == 0) { BCE_PRINTF("%s(%d): Could not map page descriptor " "chain DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -5351,29 +5349,27 @@ bce_blockinit_exit: /* 0 for success, positive value for failure. */ /****************************************************************************/ static int -bce_get_rx_buf(struct bce_softc *sc, struct mbuf *m, u16 *prod, - u16 *chain_prod, u32 *prod_bseq) +bce_get_rx_buf(struct bce_softc *sc, u16 prod, u16 chain_prod, u32 *prod_bseq) { - bus_dmamap_t map; - bus_dma_segment_t segs[BCE_MAX_SEGMENTS]; + bus_dma_segment_t segs[1]; struct mbuf *m_new = NULL; struct rx_bd *rxbd; int nsegs, error, rc = 0; #ifdef BCE_DEBUG - u16 debug_chain_prod = *chain_prod; + u16 debug_chain_prod = chain_prod; #endif DBENTER(BCE_EXTREME_RESET | BCE_EXTREME_RECV | BCE_EXTREME_LOAD); /* Make sure the inputs are valid. */ - DBRUNIF((*chain_prod > MAX_RX_BD_ALLOC), + DBRUNIF((chain_prod > MAX_RX_BD_ALLOC), BCE_PRINTF("%s(%d): RX producer out of range: " "0x%04X > 0x%04X\n", __FILE__, __LINE__, - *chain_prod, (u16) MAX_RX_BD_ALLOC)); + chain_prod, (u16)MAX_RX_BD_ALLOC)); DBPRINT(sc, BCE_EXTREME_RECV, "%s(enter): prod = 0x%04X, " "chain_prod = 0x%04X, prod_bseq = 0x%08X\n", __FUNCTION__, - *prod, *chain_prod, *prod_bseq); + prod, chain_prod, *prod_bseq); /* Update some debug statistic counters */ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark), @@ -5381,35 +5377,28 @@ bce_get_rx_buf(struct bce_softc *sc, str DBRUNIF((sc->free_rx_bd == sc->max_rx_bd), sc->rx_empty_count++); - /* Check whether this is a new mbuf allocation. */ - if (m == NULL) { - - /* Simulate an mbuf allocation failure. */ - DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control), - sc->mbuf_alloc_failed_count++; - sc->mbuf_alloc_failed_sim_count++; - rc = ENOBUFS; - goto bce_get_rx_buf_exit); - - /* This is a new mbuf allocation. */ - if (bce_hdr_split == TRUE) - MGETHDR(m_new, M_NOWAIT, MT_DATA); - else - m_new = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, - sc->rx_bd_mbuf_alloc_size); + /* Simulate an mbuf allocation failure. */ + DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control), + sc->mbuf_alloc_failed_count++; + sc->mbuf_alloc_failed_sim_count++; + rc = ENOBUFS; + goto bce_get_rx_buf_exit); - if (m_new == NULL) { - sc->mbuf_alloc_failed_count++; - rc = ENOBUFS; - goto bce_get_rx_buf_exit; - } + /* This is a new mbuf allocation. */ + if (bce_hdr_split == TRUE) + MGETHDR(m_new, M_NOWAIT, MT_DATA); + else + m_new = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, + sc->rx_bd_mbuf_alloc_size); - DBRUN(sc->debug_rx_mbuf_alloc++); - } else { - /* Reuse an existing mbuf. */ - m_new = m; + if (m_new == NULL) { + sc->mbuf_alloc_failed_count++; + rc = ENOBUFS; + goto bce_get_rx_buf_exit; } + DBRUN(sc->debug_rx_mbuf_alloc++); + /* Make sure we have a valid packet header. */ M_ASSERTPKTHDR(m_new); @@ -5420,9 +5409,8 @@ bce_get_rx_buf(struct bce_softc *sc, str /* ToDo: Consider calling m_fragment() to test error handling. */ /* Map the mbuf cluster into device memory. */ - map = sc->rx_mbuf_map[*chain_prod]; - error = bus_dmamap_load_mbuf_sg(sc->rx_mbuf_tag, map, m_new, - segs, &nsegs, BUS_DMA_NOWAIT); + error = bus_dmamap_load_mbuf_sg(sc->rx_mbuf_tag, + sc->rx_mbuf_map[chain_prod], m_new, segs, &nsegs, BUS_DMA_NOWAIT); /* Handle any mapping errors. */ if (error) { @@ -5443,7 +5431,7 @@ bce_get_rx_buf(struct bce_softc *sc, str __FUNCTION__, nsegs)); /* Setup the rx_bd for the segment. */ - rxbd = &sc->rx_bd_chain[RX_PAGE(*chain_prod)][RX_IDX(*chain_prod)]; + rxbd = &sc->rx_bd_chain[RX_PAGE(chain_prod)][RX_IDX(chain_prod)]; rxbd->rx_bd_haddr_lo = htole32(BCE_ADDR_LO(segs[0].ds_addr)); rxbd->rx_bd_haddr_hi = htole32(BCE_ADDR_HI(segs[0].ds_addr)); @@ -5452,15 +5440,15 @@ bce_get_rx_buf(struct bce_softc *sc, str *prod_bseq += segs[0].ds_len; /* Save the mbuf and update our counter. */ - sc->rx_mbuf_ptr[*chain_prod] = m_new; + sc->rx_mbuf_ptr[chain_prod] = m_new; sc->free_rx_bd -= nsegs; DBRUNMSG(BCE_INSANE_RECV, bce_dump_rx_mbuf_chain(sc, debug_chain_prod, nsegs)); DBPRINT(sc, BCE_EXTREME_RECV, "%s(exit): prod = 0x%04X, " - "chain_prod = 0x%04X, prod_bseq = 0x%08X\n", - __FUNCTION__, *prod, *chain_prod, *prod_bseq); + "chain_prod = 0x%04X, prod_bseq = 0x%08X\n", __FUNCTION__, prod, + chain_prod, *prod_bseq); bce_get_rx_buf_exit: DBEXIT(BCE_EXTREME_RESET | BCE_EXTREME_RECV | BCE_EXTREME_LOAD); @@ -5476,70 +5464,60 @@ bce_get_rx_buf_exit: /* 0 for success, positive value for failure. */ /****************************************************************************/ static int -bce_get_pg_buf(struct bce_softc *sc, struct mbuf *m, u16 *prod, - u16 *prod_idx) +bce_get_pg_buf(struct bce_softc *sc, u16 prod, u16 prod_idx) { - bus_dmamap_t map; bus_addr_t busaddr; struct mbuf *m_new = NULL; struct rx_bd *pgbd; int error, rc = 0; #ifdef BCE_DEBUG - u16 debug_prod_idx = *prod_idx; + u16 debug_prod_idx = prod_idx; #endif DBENTER(BCE_EXTREME_RESET | BCE_EXTREME_RECV | BCE_EXTREME_LOAD); /* Make sure the inputs are valid. */ - DBRUNIF((*prod_idx > MAX_PG_BD_ALLOC), + DBRUNIF((prod_idx > MAX_PG_BD_ALLOC), BCE_PRINTF("%s(%d): page producer out of range: " "0x%04X > 0x%04X\n", __FILE__, __LINE__, - *prod_idx, (u16) MAX_PG_BD_ALLOC)); + prod_idx, (u16)MAX_PG_BD_ALLOC)); DBPRINT(sc, BCE_EXTREME_RECV, "%s(enter): prod = 0x%04X, " - "chain_prod = 0x%04X\n", __FUNCTION__, *prod, *prod_idx); + "chain_prod = 0x%04X\n", __FUNCTION__, prod, prod_idx); /* Update counters if we've hit a new low or run out of pages. */ DBRUNIF((sc->free_pg_bd < sc->pg_low_watermark), sc->pg_low_watermark = sc->free_pg_bd); DBRUNIF((sc->free_pg_bd == sc->max_pg_bd), sc->pg_empty_count++); - /* Check whether this is a new mbuf allocation. */ - if (m == NULL) { - - /* Simulate an mbuf allocation failure. */ - DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control), - sc->mbuf_alloc_failed_count++; - sc->mbuf_alloc_failed_sim_count++; - rc = ENOBUFS; - goto bce_get_pg_buf_exit); - - /* This is a new mbuf allocation. */ - m_new = m_getcl(M_NOWAIT, MT_DATA, 0); - if (m_new == NULL) { - sc->mbuf_alloc_failed_count++; - rc = ENOBUFS; - goto bce_get_pg_buf_exit; - } - - DBRUN(sc->debug_pg_mbuf_alloc++); - } else { - /* Reuse an existing mbuf. */ - m_new = m; - m_new->m_data = m_new->m_ext.ext_buf; + /* Simulate an mbuf allocation failure. */ + DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control), + sc->mbuf_alloc_failed_count++; + sc->mbuf_alloc_failed_sim_count++; + rc = ENOBUFS; + goto bce_get_pg_buf_exit); + + /* This is a new mbuf allocation. */ + m_new = m_getcl(M_NOWAIT, MT_DATA, 0); + if (m_new == NULL) { + sc->mbuf_alloc_failed_count++; + rc = ENOBUFS; + goto bce_get_pg_buf_exit; } + DBRUN(sc->debug_pg_mbuf_alloc++); + m_new->m_len = MCLBYTES; /* ToDo: Consider calling m_fragment() to test error handling. */ /* Map the mbuf cluster into device memory. */ - map = sc->pg_mbuf_map[*prod_idx]; - error = bus_dmamap_load(sc->pg_mbuf_tag, map, mtod(m_new, void *), - MCLBYTES, bce_dma_map_addr, &busaddr, BUS_DMA_NOWAIT); + error = bus_dmamap_load(sc->pg_mbuf_tag, sc->pg_mbuf_map[prod_idx], + mtod(m_new, void *), MCLBYTES, bce_dma_map_addr, &busaddr, + BUS_DMA_NOWAIT); /* Handle any mapping errors. */ - if (error) { + if (error || busaddr == 0) { BCE_PRINTF("%s(%d): Error mapping mbuf into page chain!\n", __FILE__, __LINE__); @@ -5556,7 +5534,7 @@ bce_get_pg_buf(struct bce_softc *sc, str * The page chain uses the same rx_bd data structure * as the receive chain but doesn't require a byte sequence (bseq). */ - pgbd = &sc->pg_bd_chain[PG_PAGE(*prod_idx)][PG_IDX(*prod_idx)]; + pgbd = &sc->pg_bd_chain[PG_PAGE(prod_idx)][PG_IDX(prod_idx)]; pgbd->rx_bd_haddr_lo = htole32(BCE_ADDR_LO(busaddr)); pgbd->rx_bd_haddr_hi = htole32(BCE_ADDR_HI(busaddr)); @@ -5564,14 +5542,14 @@ bce_get_pg_buf(struct bce_softc *sc, str pgbd->rx_bd_flags = htole32(RX_BD_FLAGS_START | RX_BD_FLAGS_END); /* Save the mbuf and update our counter. */ - sc->pg_mbuf_ptr[*prod_idx] = m_new; + sc->pg_mbuf_ptr[prod_idx] = m_new; sc->free_pg_bd--; DBRUNMSG(BCE_INSANE_RECV, bce_dump_pg_mbuf_chain(sc, debug_prod_idx, 1)); DBPRINT(sc, BCE_EXTREME_RECV, "%s(exit): prod = 0x%04X, " - "prod_idx = 0x%04X\n", __FUNCTION__, *prod, *prod_idx); + "prod_idx = 0x%04X\n", __FUNCTION__, prod, prod_idx); bce_get_pg_buf_exit: DBEXIT(BCE_EXTREME_RESET | BCE_EXTREME_RECV | BCE_EXTREME_LOAD); @@ -5893,7 +5871,7 @@ bce_fill_rx_chain(struct bce_softc *sc) /* Keep filling the RX chain until it's full. */ while (sc->free_rx_bd > 0) { prod_idx = RX_CHAIN_IDX(prod); - if (bce_get_rx_buf(sc, NULL, &prod, &prod_idx, &prod_bseq)) { + if (bce_get_rx_buf(sc, prod, prod_idx, &prod_bseq)) { /* Bail out if we can't add an mbuf to the chain. */ break; } @@ -5907,13 +5885,11 @@ bce_fill_rx_chain(struct bce_softc *sc) /* We should never end up pointing to a next page pointer. */ DBRUNIF(((prod & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE), BCE_PRINTF("%s(): Invalid rx_prod value: 0x%04X\n", - __FUNCTION__, sc->rx_prod)); + __FUNCTION__, rx_prod)); /* Write the mailbox and tell the chip about the waiting rx_bd's. */ - REG_WR16(sc, MB_GET_CID_ADDR(RX_CID) + - BCE_L2MQ_RX_HOST_BDIDX, sc->rx_prod); - REG_WR(sc, MB_GET_CID_ADDR(RX_CID) + - BCE_L2MQ_RX_HOST_BSEQ, sc->rx_prod_bseq); + REG_WR16(sc, MB_GET_CID_ADDR(RX_CID) + BCE_L2MQ_RX_HOST_BDIDX, prod); + REG_WR(sc, MB_GET_CID_ADDR(RX_CID) + BCE_L2MQ_RX_HOST_BSEQ, prod_bseq); DBEXIT(BCE_VERBOSE_RESET | BCE_EXTREME_RECV | BCE_VERBOSE_LOAD | BCE_VERBOSE_CTX); @@ -6064,7 +6040,7 @@ bce_fill_pg_chain(struct bce_softc *sc) /* Keep filling the page chain until it's full. */ while (sc->free_pg_bd > 0) { prod_idx = PG_CHAIN_IDX(prod); - if (bce_get_pg_buf(sc, NULL, &prod, &prod_idx)) { + if (bce_get_pg_buf(sc, prod, prod_idx)) { /* Bail out if we can't add an mbuf to the chain. */ break; } @@ -6076,14 +6052,14 @@ bce_fill_pg_chain(struct bce_softc *sc) DBRUNIF(((prod & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE), BCE_PRINTF("%s(): Invalid pg_prod value: 0x%04X\n", - __FUNCTION__, sc->pg_prod)); + __FUNCTION__, pg_prod)); /* * Write the mailbox and tell the chip about * the new rx_bd's in the page chain. */ - REG_WR16(sc, MB_GET_CID_ADDR(RX_CID) + - BCE_L2MQ_RX_HOST_PG_BDIDX, sc->pg_prod); + REG_WR16(sc, MB_GET_CID_ADDR(RX_CID) + BCE_L2MQ_RX_HOST_PG_BDIDX, + prod); DBEXIT(BCE_VERBOSE_RESET | BCE_EXTREME_RECV | BCE_VERBOSE_LOAD | BCE_VERBOSE_CTX); @@ -6598,14 +6574,6 @@ bce_rx_intr(struct bce_softc *sc) DBRUN(sc->debug_rx_mbuf_alloc--); sc->free_rx_bd++; - if(m0 == NULL) { - DBPRINT(sc, BCE_EXTREME_RECV, - "%s(): Oops! Empty mbuf pointer " - "found in sc->rx_mbuf_ptr[0x%04X]!\n", - __FUNCTION__, sw_rx_cons_idx); - goto bce_rx_int_next_rx; - } - /* * Frames received on the NetXteme II are prepended * with an l2_fhdr structure which provides status @@ -6764,7 +6732,7 @@ bce_rx_intr(struct bce_softc *sc) m_freem(m0); m0 = NULL; - goto bce_rx_int_next_rx; + goto bce_rx_intr_next_rx; } /* Send the packet to the appropriate interface. */ @@ -6775,7 +6743,6 @@ bce_rx_intr(struct bce_softc *sc) /* Validate the checksum if offload enabled. */ if (ifp->if_capenable & IFCAP_RXCSUM) { - /* Check for an IP datagram. */ if (!(status & L2_FHDR_STATUS_SPLIT) && (status & L2_FHDR_STATUS_IP_DATAGRAM)) { @@ -6805,7 +6772,8 @@ bce_rx_intr(struct bce_softc *sc) } /* Attach the VLAN tag. */ - if (status & L2_FHDR_STATUS_L2_VLAN_TAG) { + if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && + !(sc->rx_mode & BCE_EMAC_RX_MODE_KEEP_VLAN_TAG)) { DBRUN(sc->vlan_tagged_frames_rcvd++); if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) { DBRUN(sc->vlan_tagged_frames_stripped++); @@ -6844,7 +6812,7 @@ bce_rx_intr(struct bce_softc *sc) /* Increment received packet statistics. */ ifp->if_ipackets++; -bce_rx_int_next_rx: +bce_rx_intr_next_rx: sw_rx_cons = NEXT_RX_BD(sw_rx_cons); /* If we have a packet, pass it up the stack */ @@ -8094,8 +8062,9 @@ bce_set_rx_mode(struct bce_softc *sc) /* Enable all multicast addresses. */ for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) { - REG_WR(sc, BCE_EMAC_MULTICAST_HASH0 + (i * 4), 0xffffffff); - } + REG_WR(sc, BCE_EMAC_MULTICAST_HASH0 + (i * 4), + 0xffffffff); + } sort_mode |= BCE_RPM_SORT_USER0_MC_EN; } else { /* Accept one or more multicast(s). */ From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 13:58:37 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EECDF931; Sun, 9 Jun 2013 13:58:37 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E0B4F1A88; Sun, 9 Jun 2013 13:58:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59DwbVI030184; Sun, 9 Jun 2013 13:58:37 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59Dwbm0030183; Sun, 9 Jun 2013 13:58:37 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306091358.r59Dwbm0030183@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 13:58:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251574 - stable/9/sys/dev/bce X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 13:58:38 -0000 Author: marius Date: Sun Jun 9 13:58:37 2013 New Revision: 251574 URL: http://svnweb.freebsd.org/changeset/base/251574 Log: MFC: r251159 - Checking for spurious interrupts is only necessary when using INTx. Actually, this may be further optimized for controller variants supporting one-shot MSIs but I'm lacking the necessary hardware for testing. - Add some missing synchronization of the statistics and status DMA maps. Modified: stable/9/sys/dev/bce/if_bce.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bce/if_bce.c ============================================================================== --- stable/9/sys/dev/bce/if_bce.c Sun Jun 9 13:50:14 2013 (r251573) +++ stable/9/sys/dev/bce/if_bce.c Sun Jun 9 13:58:37 2013 (r251574) @@ -7873,7 +7873,7 @@ bce_watchdog_exit: /* interrupt causes (PHY, TX, RX). */ /* */ /* Returns: */ -/* 0 for success, positive value for failure. */ +/* Nothing. */ /****************************************************************************/ static void bce_intr(void *xsc) @@ -7895,16 +7895,16 @@ bce_intr(void *xsc) DBRUN(sc->interrupts_generated++); /* Synchnorize before we read from interface's status block */ - bus_dmamap_sync(sc->status_tag, sc->status_map, - BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(sc->status_tag, sc->status_map, BUS_DMASYNC_POSTREAD); /* - * If the hardware status block index - * matches the last value read by the - * driver and we haven't asserted our - * interrupt then there's nothing to do. + * If the hardware status block index matches the last value read + * by the driver and we haven't asserted our interrupt then there's + * nothing to do. This may only happen in case of INTx due to the + * interrupt arriving at the CPU before the status block is updated. */ - if ((sc->status_block->status_idx == sc->last_status_idx) && + if ((sc->bce_flags & (BCE_USING_MSI_FLAG | BCE_USING_MSIX_FLAG)) == 0 && + sc->status_block->status_idx == sc->last_status_idx && (REG_RD(sc, BCE_PCICFG_MISC_STATUS) & BCE_PCICFG_MISC_STATUS_INTA_VALUE)) { DBPRINT(sc, BCE_VERBOSE_INTR, "%s(): Spurious interrupt.\n", @@ -7992,11 +7992,9 @@ bce_intr(void *xsc) if ((hw_rx_cons == sc->hw_rx_cons) && (hw_tx_cons == sc->hw_tx_cons)) break; - } - bus_dmamap_sync(sc->status_tag, sc->status_map, - BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->status_tag, sc->status_map, BUS_DMASYNC_PREREAD); /* Re-enable interrupts. */ bce_enable_intr(sc, 0); @@ -8121,6 +8119,8 @@ bce_stats_update(struct bce_softc *sc) ifp = sc->bce_ifp; + bus_dmamap_sync(sc->stats_tag, sc->stats_map, BUS_DMASYNC_POSTREAD); + stats = (struct statistics_block *) sc->stats_block; /* @@ -8648,6 +8648,8 @@ bce_sysctl_stats_clear(SYSCTL_HANDLER_AR stats = (struct statistics_block *) sc->stats_block; bzero(stats, sizeof(struct statistics_block)); + bus_dmamap_sync(sc->stats_tag, sc->stats_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Clear the internal H/W statistics counters. */ REG_WR(sc, BCE_HC_COMMAND, BCE_HC_COMMAND_CLR_STAT_NOW); @@ -10633,6 +10635,8 @@ bce_dump_status_block(struct bce_softc * { struct status_block *sblk; + bus_dmamap_sync(sc->status_tag, sc->status_map, BUS_DMASYNC_POSTREAD); + sblk = sc->status_block; BCE_PRINTF( @@ -10695,6 +10699,8 @@ bce_dump_stats_block(struct bce_softc *s { struct statistics_block *sblk; + bus_dmamap_sync(sc->stats_tag, sc->stats_map, BUS_DMASYNC_POSTREAD); + sblk = sc->stats_block; BCE_PRINTF( From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 14:32:00 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 88F05F9F; Sun, 9 Jun 2013 14:32:00 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6209F1B81; Sun, 9 Jun 2013 14:32:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59EW08m042027; Sun, 9 Jun 2013 14:32:00 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59EW0ZX042025; Sun, 9 Jun 2013 14:32:00 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201306091432.r59EW0ZX042025@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 9 Jun 2013 14:32:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251575 - head/lib/libc/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 14:32:00 -0000 Author: jilles Date: Sun Jun 9 14:31:59 2013 New Revision: 251575 URL: http://svnweb.freebsd.org/changeset/base/251575 Log: Make recv() and send() cancellation points, as required by POSIX. Call the recvfrom() and sendto() functions overridden by libthr instead of the _recvfrom() and _sendto() versions that are not cancellation points. Modified: head/lib/libc/net/recv.c head/lib/libc/net/send.c Modified: head/lib/libc/net/recv.c ============================================================================== --- head/lib/libc/net/recv.c Sun Jun 9 13:58:37 2013 (r251574) +++ head/lib/libc/net/recv.c Sun Jun 9 14:31:59 2013 (r251575) @@ -33,12 +33,10 @@ static char sccsid[] = "@(#)recv.c 8.2 ( #include __FBSDID("$FreeBSD$"); -#include "namespace.h" #include #include #include -#include "un-namespace.h" ssize_t recv(s, buf, len, flags) @@ -46,5 +44,9 @@ recv(s, buf, len, flags) size_t len; void *buf; { - return (_recvfrom(s, buf, len, flags, NULL, 0)); + /* + * POSIX says recv() shall be a cancellation point, so call the + * cancellation-enabled recvfrom() and not _recvfrom(). + */ + return (recvfrom(s, buf, len, flags, NULL, 0)); } Modified: head/lib/libc/net/send.c ============================================================================== --- head/lib/libc/net/send.c Sun Jun 9 13:58:37 2013 (r251574) +++ head/lib/libc/net/send.c Sun Jun 9 14:31:59 2013 (r251575) @@ -33,12 +33,10 @@ static char sccsid[] = "@(#)send.c 8.2 ( #include __FBSDID("$FreeBSD$"); -#include "namespace.h" #include #include #include -#include "un-namespace.h" ssize_t send(s, msg, len, flags) @@ -46,5 +44,9 @@ send(s, msg, len, flags) size_t len; const void *msg; { - return (_sendto(s, msg, len, flags, NULL, 0)); + /* + * POSIX says send() shall be a cancellation point, so call the + * cancellation-enabled sendto() and not _sendto(). + */ + return (sendto(s, msg, len, flags, NULL, 0)); } From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 15:08:51 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C1090A22; Sun, 9 Jun 2013 15:08:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B17551D1C; Sun, 9 Jun 2013 15:08:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59F8plu052806; Sun, 9 Jun 2013 15:08:51 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59F8pPO052805; Sun, 9 Jun 2013 15:08:51 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201306091508.r59F8pPO052805@svn.freebsd.org> From: Hiroki Sato Date: Sun, 9 Jun 2013 15:08:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r251576 - stable/8/release/doc/en_US.ISO8859-1/errata X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 15:08:51 -0000 Author: hrs Date: Sun Jun 9 15:08:51 2013 New Revision: 251576 URL: http://svnweb.freebsd.org/changeset/base/251576 Log: - Remove bge(4) item [*]. - Add jail_parameters incompatibility. Discussed with: yongari [*] Modified: stable/8/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/8/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/errata/article.xml Sun Jun 9 14:31:59 2013 (r251575) +++ stable/8/release/doc/en_US.ISO8859-1/errata/article.xml Sun Jun 9 15:08:51 2013 (r251576) @@ -206,6 +206,54 @@ Open Issues + [20130609] There is incompatibility in &man.jail.8; + configuration because the &man.jail.8; utility and + rc.d/jail script has been changed. More + specifically, the following &man.sysctl.8; variables cannot be + used to set the default parameters for jails: + + security.jail.mount_zfs_allowed +security.jail.mount_procfs_allowed +security.jail.mount_nullfs_allowed +security.jail.mount_devfs_allowed +security.jail.mount_allowed +security.jail.chflags_allowed +security.jail.allow_raw_sockets +security.jail.sysvipc_allowed +security.jail.socket_unixiproute_only +security.jail.set_hostname_allowed + + These could be set by manually using &man.sysctl.8; utility, + the &man.sysctl.conf.5; file, or for some of them the following + variables in &man.rc.conf.5;: + + jail_set_hostname_allow="yes" +jail_socket_unixiproute_only="yes" +jail_sysvipc_allow="yes" + + These parameters must now be specified in + jail_parameters (or + jail_jailname_parameters + for per-jail configuration) in &man.rc.conf.5;. For + example: + + jail_parameters="allow.sysvipc allow.raw_sockets" + + The valid keywords are the following. For more detail, see + &man.jail.8; manual page. + + allow.set_hostname +allow.sysvipc +allow.raw_sockets +allow.chflags +allow.mount +allow.mount.devfs +allow.mount.nullfs +allow.mount.procfs +allow.mount.zfs +allow.quotas +allow.socket_af + [20130608] &os; &release; no longer supports &os; CVS repository. Some documents mistakenly refer to RELENG_8_4_0_RELEASE as CVS tag for the release and @@ -220,22 +268,8 @@ Please note that &os; source tree for &release; and its security branch cannot be updated by using official CVSup servers. - [20130607] The &man.bge.4; network interface driver has an - issue when TSO (TCP Segmentation Offload) is enabled. It causes - intermittent reset and re-initialization. - - A workaround is disabling the TSO feature. One can disable - it by adding the following line into the &man.rc.conf.5; - file: - - ifconfig_bge0="-tso" - - or by using the &man.ifconfig.8; utility manually: - - &prompt.root; ifconfig bge0 -tso - - A patch to fix this issue will be released as an Errata - Notice. + [20130607] (removed about a &man.bge.4; network interface + driver issue because it was incorrect) [20130606] The &man.fxp.4; network interface driver may not work well with the &man.dhclient.8; utility. More specifically, From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 15:36:14 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 60DBD2E5; Sun, 9 Jun 2013 15:36:14 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 42AB11E31; Sun, 9 Jun 2013 15:36:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59FaDaH061969; Sun, 9 Jun 2013 15:36:13 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59FaDR8061966; Sun, 9 Jun 2013 15:36:13 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306091536.r59FaDR8061966@svn.freebsd.org> From: Devin Teske Date: Sun, 9 Jun 2013 15:36:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251579 - in head/usr.sbin/bsdconfig/startup: . share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 15:36:14 -0000 Author: dteske Date: Sun Jun 9 15:36:13 2013 New Revision: 251579 URL: http://svnweb.freebsd.org/changeset/base/251579 Log: Fix a bug introduced by r251236; product of bug was the following error in "Startup"->"View/Edit Startup Configuration"->"Add New"->"Add From List": [: -eq: unexpected operator NOTE: Previously mentioned in r251557 Problem caused by removal of $retval to capture exit status of call to f_dialog_input_rclist(). While we're here, enhance f_dialog_input_rclist() to accept a default-item to make selecting multiple values to-add more efficient. Modified: head/usr.sbin/bsdconfig/startup/rcadd head/usr.sbin/bsdconfig/startup/share/rcconf.subr Modified: head/usr.sbin/bsdconfig/startup/rcadd ============================================================================== --- head/usr.sbin/bsdconfig/startup/rcadd Sun Jun 9 15:19:33 2013 (r251578) +++ head/usr.sbin/bsdconfig/startup/rcadd Sun Jun 9 15:36:13 2013 (r251579) @@ -120,27 +120,25 @@ while :; do case "$mtag" in 1) # Add From List - # Loop for easy return + # Loop to allow adding multiple variables quickly + defaultitem= while :; do - f_dialog_input_rclist || break + f_dialog_input_rclist "$defaultitem" || f_die f_dialog_menutag_fetch mtag + defaultitem="$mtag" case "$mtag" in "X $msg_exit" ) break ;; *) # Anything else is a directive rcvar="${mtag# }" $BSDCFG_LIBE/$APP_DIR/rcedit \ - ${USE_XDIALOG:+-X} \ - "$rcvar" || continue + ${USE_XDIALOG:+-X} "$rcvar" esac - break done - [ $retval -eq 0 ] || continue ;; 2) # Add Custom f_dialog_input_rcvar || continue - $BSDCFG_LIBE/$APP_DIR/rcedit ${USE_XDIALOG:+-X} "$rcvar" || - continue + $BSDCFG_LIBE/$APP_DIR/rcedit ${USE_XDIALOG:+-X} "$rcvar" ;; esac done Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr ============================================================================== --- head/usr.sbin/bsdconfig/startup/share/rcconf.subr Sun Jun 9 15:19:33 2013 (r251578) +++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr Sun Jun 9 15:36:13 2013 (r251579) @@ -365,12 +365,12 @@ f_dialog_input_view_details() esac } -# f_dialog_input_rclist +# f_dialog_input_rclist [$default] # # Presents a menu of rc.conf(5) defaults (with, or without descriptions). This # function should be treated like a call to dialog(1) (the exit status should # be captured and f_dialog_menutag_fetch() should be used to get the user's -# response). +# response). Optionally if present and non-null, highlight $default rcvar. # f_dialog_input_rclist() { @@ -378,6 +378,7 @@ f_dialog_input_rclist() local menu_list=" 'X $msg_exit' '' ${SHOW_DESC:+'$msg_exit_this_menu'} " # END-QUOTE + local defaultitem="$1" local hline="$hline_arrows_tab_enter" if [ ! "$_RCCONF_MAP" ]; then @@ -434,6 +435,7 @@ f_dialog_input_rclist() --title \"\$DIALOG_TITLE\" \ --backtitle \"\$DIALOG_BACKTITLE\" \ --hline \"\$hline\" \ + --default-item \"\$defaultitem\" \ --ok-label \"\$msg_ok\" \ --cancel-label \"\$msg_cancel\" \ ${SHOW_DESC:+--item-help} \ From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 16:33:32 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D7DCAF14; Sun, 9 Jun 2013 16:33:32 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C9F9610A0; Sun, 9 Jun 2013 16:33:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59GXWhx080573; Sun, 9 Jun 2013 16:33:32 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59GXWFe080571; Sun, 9 Jun 2013 16:33:32 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201306091633.r59GXWFe080571@svn.freebsd.org> From: Hiroki Sato Date: Sun, 9 Jun 2013 16:33:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251580 - head/usr.bin/lsvfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 16:33:32 -0000 Author: hrs Date: Sun Jun 9 16:33:32 2013 New Revision: 251580 URL: http://svnweb.freebsd.org/changeset/base/251580 Log: - Add file system type number (vfc_typenum) in the list. This is useful for debugging when changing vfs.typenumhash configuration. - Refactor fmt_flags(). MFC after: 1 week Modified: head/usr.bin/lsvfs/lsvfs.1 head/usr.bin/lsvfs/lsvfs.c Modified: head/usr.bin/lsvfs/lsvfs.1 ============================================================================== --- head/usr.bin/lsvfs/lsvfs.1 Sun Jun 9 15:36:13 2013 (r251579) +++ head/usr.bin/lsvfs/lsvfs.1 Sun Jun 9 16:33:32 2013 (r251580) @@ -2,7 +2,7 @@ .\" Garrett A. Wollman, September 1994 .\" This file is in the public domain. .\" -.Dd March 16, 1995 +.Dd June 9, 2013 .Dt LSVFS 1 .Os .Sh NAME @@ -36,6 +36,8 @@ and the .Fl t option to .Xr mount 8 +.It Num +the filesystem type number. .It Refs the number of references to this VFS; i.e., the number of currently mounted file systems of this type @@ -44,6 +46,7 @@ flag bits. .El .Sh SEE ALSO .Xr mount 2 , +.Xr getvfsbyname 3 , .Xr mount 8 .Sh HISTORY A Modified: head/usr.bin/lsvfs/lsvfs.c ============================================================================== --- head/usr.bin/lsvfs/lsvfs.c Sun Jun 9 15:36:13 2013 (r251579) +++ head/usr.bin/lsvfs/lsvfs.c Sun Jun 9 16:33:32 2013 (r251580) @@ -17,9 +17,24 @@ __FBSDID("$FreeBSD$"); #include #include -#define FMT "%-32.32s %5d %s\n" -#define HDRFMT "%-32.32s %5.5s %s\n" -#define DASHES "-------------------------------- ----- ---------------\n" +#define FMT "%-32.32s 0x%08x %5d %s\n" +#define HDRFMT "%-32.32s %10s %5.5s %s\n" +#define DASHES "-------------------------------- " \ + "---------- ----- ---------------\n" + +static struct flaglist { + int flag; + const char str[32]; /* must be longer than the longest one. */ +} fl[] = { + { .flag = VFCF_STATIC, .str = "static", }, + { .flag = VFCF_NETWORK, .str = "network", }, + { .flag = VFCF_READONLY, .str = "read-only", }, + { .flag = VFCF_SYNTHETIC, .str = "synthetic", }, + { .flag = VFCF_LOOPBACK, .str = "loopback", }, + { .flag = VFCF_UNICODE, .str = "unicode", }, + { .flag = VFCF_JAIL, .str = "jail", }, + { .flag = VFCF_DELEGADMIN, .str = "delegated-administration", }, +}; static const char *fmt_flags(int); @@ -31,13 +46,14 @@ main(int argc, char **argv) size_t buflen; argc--, argv++; - printf(HDRFMT, "Filesystem", "Refs", "Flags"); + printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags"); fputs(DASHES, stdout); if(argc) { for(; argc; argc--, argv++) { if (getvfsbyname(*argv, &vfc) == 0) { - printf(FMT, vfc.vfc_name, vfc.vfc_refcount, fmt_flags(vfc.vfc_flags)); + printf(FMT, vfc.vfc_name, vfc.vfc_typenum, vfc.vfc_refcount, + fmt_flags(vfc.vfc_flags)); } else { warnx("VFS %s unknown or not loaded", *argv); rv++; @@ -54,8 +70,8 @@ main(int argc, char **argv) cnt = buflen / sizeof(struct xvfsconf); for (i = 0; i < cnt; i++) { - printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_refcount, - fmt_flags(xvfsp[i].vfc_flags)); + printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, + xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags)); } free(xvfsp); } @@ -66,34 +82,16 @@ main(int argc, char **argv) static const char * fmt_flags(int flags) { - /* - * NB: if you add new flags, don't forget to add them here vvvvvv too. - */ - static char buf[sizeof - "static, network, read-only, synthetic, loopback, unicode, jail"]; - size_t len; - - buf[0] = '\0'; - - if(flags & VFCF_STATIC) - strlcat(buf, "static, ", sizeof(buf)); - if(flags & VFCF_NETWORK) - strlcat(buf, "network, ", sizeof(buf)); - if(flags & VFCF_READONLY) - strlcat(buf, "read-only, ", sizeof(buf)); - if(flags & VFCF_SYNTHETIC) - strlcat(buf, "synthetic, ", sizeof(buf)); - if(flags & VFCF_LOOPBACK) - strlcat(buf, "loopback, ", sizeof(buf)); - if(flags & VFCF_UNICODE) - strlcat(buf, "unicode, ", sizeof(buf)); - if(flags & VFCF_JAIL) - strlcat(buf, "jail, ", sizeof(buf)); - if(flags & VFCF_DELEGADMIN) - strlcat(buf, "delegated-administration, ", sizeof(buf)); - len = strlen(buf); - if (len > 2 && buf[len - 2] == ',') - buf[len - 2] = '\0'; + static char buf[sizeof(struct flaglist) * sizeof(fl)]; + int i; - return buf; + buf[0] = '\0'; + for (i = 0; i < (int)nitems(fl); i++) + if (flags & fl[i].flag) { + strlcat(buf, fl[i].str, sizeof(buf)); + strlcat(buf, ", ", sizeof(buf)); + } + if (buf[0] != '\0') + buf[strlen(buf) - 2] = '\0'; + return (buf); } From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 17:40:07 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 797D820F; Sun, 9 Jun 2013 17:40:07 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C44B1662; Sun, 9 Jun 2013 17:40:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59He7te001538; Sun, 9 Jun 2013 17:40:07 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59He7K1001537; Sun, 9 Jun 2013 17:40:07 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201306091740.r59He7K1001537@svn.freebsd.org> From: Hiroki Sato Date: Sun, 9 Jun 2013 17:40:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251581 - head/sbin/route X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 17:40:07 -0000 Author: hrs Date: Sun Jun 9 17:40:06 2013 New Revision: 251581 URL: http://svnweb.freebsd.org/changeset/base/251581 Log: Fix a bug that the gateway address was not shown when a -gateway modifier was used. Modified: head/sbin/route/route.c Modified: head/sbin/route/route.c ============================================================================== --- head/sbin/route/route.c Sun Jun 9 16:33:32 2013 (r251580) +++ head/sbin/route/route.c Sun Jun 9 17:40:06 2013 (r251581) @@ -848,6 +848,7 @@ newroute(int argc, char **argv) if (!--argc) usage(NULL); getaddr(RTA_GATEWAY, *++argv, 0, nrflags); + gateway = *argv; break; case K_DST: if (!--argc) From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 17:47:02 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3EC71903; Sun, 9 Jun 2013 17:47:02 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 204C316C1; Sun, 9 Jun 2013 17:47:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59Hl2Ov004406; Sun, 9 Jun 2013 17:47:02 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59Hl1Lx004405; Sun, 9 Jun 2013 17:47:01 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201306091747.r59Hl1Lx004405@svn.freebsd.org> From: Mark Johnston Date: Sun, 9 Jun 2013 17:47:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251582 - stable/9/lib/libelf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 17:47:02 -0000 Author: markj Date: Sun Jun 9 17:47:01 2013 New Revision: 251582 URL: http://svnweb.freebsd.org/changeset/base/251582 Log: MFC r247221: Merge part of r1712 from elftoolchain, making it possible to resize ELF sections and indirectly change the layout of an ELF file when ELF_F_LAYOUT is not set. Modified: stable/9/lib/libelf/elf_update.c Directory Properties: stable/9/lib/libelf/ (props changed) Modified: stable/9/lib/libelf/elf_update.c ============================================================================== --- stable/9/lib/libelf/elf_update.c Sun Jun 9 17:40:06 2013 (r251581) +++ stable/9/lib/libelf/elf_update.c Sun Jun 9 17:47:01 2013 (r251582) @@ -41,89 +41,79 @@ __FBSDID("$FreeBSD$"); #include "_libelf.h" /* - * Update the internal data structures associated with an ELF object. - * Returns the size in bytes the ELF object would occupy in its file - * representation. + * Layout strategy: * - * After a successful call to this function, the following structures - * are updated: + * - Case 1: ELF_F_LAYOUT is asserted + * In this case the application has full control over where the + * section header table, program header table, and section data + * will reside. The library only perform error checks. * - * - The ELF header is updated. - * - All sections are sorted in order of ascending addresses and their - * section header table entries updated. An error is signalled - * if an overlap was detected among sections. - * - All data descriptors associated with a section are sorted in order - * of ascending addresses. Overlaps, if detected, are signalled as - * errors. Other sanity checks for alignments, section types etc. are - * made. + * - Case 2: ELF_F_LAYOUT is not asserted * - * After a resync_elf() successfully returns, the ELF descriptor is - * ready for being handed over to _libelf_write_elf(). + * The library will do the object layout using the following + * ordering: + * - The executable header is placed first, are required by the + * ELF specification. + * - The program header table is placed immediately following the + * executable header. + * - Section data, if any, is placed after the program header + * table, aligned appropriately. + * - The section header table, if needed, is placed last. * - * File alignments: - * PHDR - Addr - * SHDR - Addr + * There are two sub-cases to be taken care of: * - * XXX: how do we handle 'flags'. + * - Case 2a: e->e_cmd == ELF_C_READ or ELF_C_RDWR + * + * In this sub-case, the underlying ELF object may already have + * content in it, which the application may have modified. The + * library will retrieve content from the existing object as + * needed. + * + * - Case 2b: e->e_cmd == ELF_C_WRITE + * + * The ELF object is being created afresh in this sub-case; + * there is no pre-existing content in the underlying ELF + * object. */ /* * Compute the extents of a section, by looking at the data - * descriptors associated with it. The function returns zero if an - * error was detected. `*rc' holds the maximum file extent seen so - * far. + * descriptors associated with it. The function returns 1 if + * successful, or zero if an error was detected. */ static int -_libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t *rc) +_libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t rc) { int ec; - Elf_Data *d, *td; + size_t fsz, msz; + Elf_Data *d; + Elf32_Shdr *shdr32; + Elf64_Shdr *shdr64; unsigned int elftype; uint32_t sh_type; uint64_t d_align; uint64_t sh_align, sh_entsize, sh_offset, sh_size; uint64_t scn_size, scn_alignment; - /* - * We need to recompute library private data structures if one - * or more of the following is true: - * - The underlying Shdr structure has been marked `dirty'. Significant - * fields include: `sh_offset', `sh_type', `sh_size', `sh_addralign'. - * - The Elf_Data structures part of this section have been marked - * `dirty'. Affected members include `d_align', `d_offset', `d_type', - * and `d_size'. - * - The section as a whole is `dirty', e.g., it has been allocated - * using elf_newscn(), or if a new Elf_Data structure was added using - * elf_newdata(). - * - * Each of these conditions would result in the ELF_F_DIRTY bit being - * set on the section descriptor's `s_flags' field. - */ - ec = e->e_class; + shdr32 = &s->s_shdr.s_shdr32; + shdr64 = &s->s_shdr.s_shdr64; if (ec == ELFCLASS32) { - sh_type = s->s_shdr.s_shdr32.sh_type; - sh_align = (uint64_t) s->s_shdr.s_shdr32.sh_addralign; - sh_entsize = (uint64_t) s->s_shdr.s_shdr32.sh_entsize; - sh_offset = (uint64_t) s->s_shdr.s_shdr32.sh_offset; - sh_size = (uint64_t) s->s_shdr.s_shdr32.sh_size; + sh_type = shdr32->sh_type; + sh_align = (uint64_t) shdr32->sh_addralign; + sh_entsize = (uint64_t) shdr32->sh_entsize; + sh_offset = (uint64_t) shdr32->sh_offset; + sh_size = (uint64_t) shdr32->sh_size; } else { - sh_type = s->s_shdr.s_shdr64.sh_type; - sh_align = s->s_shdr.s_shdr64.sh_addralign; - sh_entsize = s->s_shdr.s_shdr64.sh_entsize; - sh_offset = s->s_shdr.s_shdr64.sh_offset; - sh_size = s->s_shdr.s_shdr64.sh_size; + sh_type = shdr64->sh_type; + sh_align = shdr64->sh_addralign; + sh_entsize = shdr64->sh_entsize; + sh_offset = shdr64->sh_offset; + sh_size = shdr64->sh_size; } - if (sh_type == SHT_NULL || sh_type == SHT_NOBITS) - return (1); - - if ((s->s_flags & ELF_F_DIRTY) == 0) { - if ((size_t) *rc < sh_offset + sh_size) - *rc = sh_offset + sh_size; - return (1); - } + assert(sh_type != SHT_NULL && sh_type != SHT_NOBITS); elftype = _libelf_xlate_shtype(sh_type); if (elftype > ELF_T_LAST) { @@ -131,15 +121,52 @@ _libelf_compute_section_extents(Elf *e, return (0); } - /* - * Compute the extent of the data descriptors associated with - * this section. - */ - scn_alignment = 0; if (sh_align == 0) sh_align = _libelf_falign(elftype, ec); - /* Compute the section alignment. */ + /* + * Check the section's data buffers for sanity and compute the + * section's alignment. + * Compute the section's size and alignment using the data + * descriptors associated with the section. + */ + if (STAILQ_EMPTY(&s->s_data)) { + /* + * The section's content (if any) has not been read in + * yet. If section is not dirty marked dirty, we can + * reuse the values in the 'sh_size' and 'sh_offset' + * fields of the section header. + */ + if ((s->s_flags & ELF_F_DIRTY) == 0) { + /* + * If the library is doing the layout, then we + * compute the new start offset for the + * section based on the current offset and the + * section's alignment needs. + * + * If the application is doing the layout, we + * can use the value in the 'sh_offset' field + * in the section header directly. + */ + if (e->e_flags & ELF_F_LAYOUT) + goto updatedescriptor; + else + goto computeoffset; + } + + /* + * Otherwise, we need to bring in the section's data + * from the underlying ELF object. + */ + if (e->e_cmd != ELF_C_WRITE && elf_getdata(s, NULL) == NULL) + return (0); + } + + /* + * Loop through the section's data descriptors. + */ + scn_size = 0L; + scn_alignment = 0L; STAILQ_FOREACH(d, &s->s_data, d_next) { if (d->d_type > ELF_T_LAST) { LIBELF_SET_ERROR(DATA, 0); @@ -153,23 +180,40 @@ _libelf_compute_section_extents(Elf *e, LIBELF_SET_ERROR(DATA, 0); return (0); } - if (d_align > scn_alignment) - scn_alignment = d_align; - } - scn_size = 0L; + /* + * The buffer's size should be a multiple of the + * memory size of the underlying type. + */ + msz = _libelf_msize(d->d_type, ec, e->e_version); + if (d->d_size % msz) { + LIBELF_SET_ERROR(DATA, 0); + return (0); + } - STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) { + /* + * Compute the section's size. + */ if (e->e_flags & ELF_F_LAYOUT) { if ((uint64_t) d->d_off + d->d_size > scn_size) scn_size = d->d_off + d->d_size; } else { scn_size = roundup2(scn_size, d->d_align); d->d_off = scn_size; - scn_size += d->d_size; + fsz = _libelf_fsize(d->d_type, ec, d->d_version, + d->d_size / msz); + scn_size += fsz; } + + /* + * The section's alignment is the maximum alignment + * needed for its data buffers. + */ + if (d_align > scn_alignment) + scn_alignment = d_align; } + /* * If the application is requesting full control over the layout * of the section, check its values for sanity. @@ -180,46 +224,60 @@ _libelf_compute_section_extents(Elf *e, LIBELF_SET_ERROR(LAYOUT, 0); return (0); } - } else { - /* - * Otherwise compute the values in the section header. - */ + goto updatedescriptor; + } - if (scn_alignment > sh_align) - sh_align = scn_alignment; + /* + * Otherwise compute the values in the section header. + * + * The section alignment is the maximum alignment for any of + * its contained data descriptors. + */ + if (scn_alignment > sh_align) + sh_align = scn_alignment; - /* - * If the section entry size is zero, try and fill in an - * appropriate entry size. Per the elf(5) manual page - * sections without fixed-size entries should have their - * 'sh_entsize' field set to zero. - */ - if (sh_entsize == 0 && - (sh_entsize = _libelf_fsize(elftype, ec, e->e_version, - (size_t) 1)) == 1) - sh_entsize = 0; + /* + * If the section entry size is zero, try and fill in an + * appropriate entry size. Per the elf(5) manual page + * sections without fixed-size entries should have their + * 'sh_entsize' field set to zero. + */ + if (sh_entsize == 0 && + (sh_entsize = _libelf_fsize(elftype, ec, e->e_version, + (size_t) 1)) == 1) + sh_entsize = 0; - sh_size = scn_size; - sh_offset = roundup(*rc, sh_align); + sh_size = scn_size; - if (ec == ELFCLASS32) { - s->s_shdr.s_shdr32.sh_addralign = (uint32_t) sh_align; - s->s_shdr.s_shdr32.sh_entsize = (uint32_t) sh_entsize; - s->s_shdr.s_shdr32.sh_offset = (uint32_t) sh_offset; - s->s_shdr.s_shdr32.sh_size = (uint32_t) sh_size; - } else { - s->s_shdr.s_shdr64.sh_addralign = sh_align; - s->s_shdr.s_shdr64.sh_entsize = sh_entsize; - s->s_shdr.s_shdr64.sh_offset = sh_offset; - s->s_shdr.s_shdr64.sh_size = sh_size; - } - } +computeoffset: + /* + * Compute the new offset for the section based on + * the section's alignment needs. + */ + sh_offset = roundup(rc, sh_align); - if ((size_t) *rc < sh_offset + sh_size) - *rc = sh_offset + sh_size; + /* + * Update the section header. + */ + if (ec == ELFCLASS32) { + shdr32->sh_addralign = (uint32_t) sh_align; + shdr32->sh_entsize = (uint32_t) sh_entsize; + shdr32->sh_offset = (uint32_t) sh_offset; + shdr32->sh_size = (uint32_t) sh_size; + } else { + shdr64->sh_addralign = sh_align; + shdr64->sh_entsize = sh_entsize; + shdr64->sh_offset = sh_offset; + shdr64->sh_size = sh_size; + } +updatedescriptor: + /* + * Update the section descriptor. + */ s->s_size = sh_size; s->s_offset = sh_offset; + return (1); } @@ -267,13 +325,16 @@ _libelf_insert_section(Elf *e, Elf_Scn * return (1); } +/* + * Recompute section layout. + */ + static off_t _libelf_resync_sections(Elf *e, off_t rc) { int ec; - off_t nrc; + Elf_Scn *s; size_t sh_type, shdr_start, shdr_end; - Elf_Scn *s, *ts; ec = e->e_class; @@ -281,13 +342,7 @@ _libelf_resync_sections(Elf *e, off_t rc * Make a pass through sections, computing the extent of each * section. Order in increasing order of addresses. */ - - nrc = rc; - STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) - if (_libelf_compute_section_extents(e, s, &nrc) == 0) - return ((off_t) -1); - - STAILQ_FOREACH_SAFE(s, &e->e_u.e_elf.e_scn, s_next, ts) { + STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) { if (ec == ELFCLASS32) sh_type = s->s_shdr.s_shdr32.sh_type; else @@ -296,21 +351,22 @@ _libelf_resync_sections(Elf *e, off_t rc if (sh_type == SHT_NOBITS || sh_type == SHT_NULL) continue; - if (s->s_offset < (uint64_t) rc) { - if (s->s_offset + s->s_size < (uint64_t) rc) { - /* - * Try insert this section in the - * correct place in the list, - * detecting overlaps if any. - */ - STAILQ_REMOVE(&e->e_u.e_elf.e_scn, s, _Elf_Scn, - s_next); - if (_libelf_insert_section(e, s) == 0) - return ((off_t) -1); - } else { - LIBELF_SET_ERROR(LAYOUT, 0); + if (_libelf_compute_section_extents(e, s, rc) == 0) + return ((off_t) -1); + + if (s->s_size == 0) + continue; + + if (s->s_offset + s->s_size < (size_t) rc) { + /* + * Try insert this section in the + * correct place in the list, + * detecting overlaps if any. + */ + STAILQ_REMOVE(&e->e_u.e_elf.e_scn, s, _Elf_Scn, + s_next); + if (_libelf_insert_section(e, s) == 0) return ((off_t) -1); - } } else rc = s->s_offset + s->s_size; } @@ -338,8 +394,6 @@ _libelf_resync_sections(Elf *e, off_t rc } } - assert(nrc == rc); - return (rc); } From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 17:47:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BAF2EA6C; Sun, 9 Jun 2013 17:47:16 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9F08D16C3; Sun, 9 Jun 2013 17:47:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59HlGct004479; Sun, 9 Jun 2013 17:47:16 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59HlGAY004478; Sun, 9 Jun 2013 17:47:16 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201306091747.r59HlGAY004478@svn.freebsd.org> From: Mark Johnston Date: Sun, 9 Jun 2013 17:47:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r251583 - stable/8/lib/libelf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 17:47:16 -0000 Author: markj Date: Sun Jun 9 17:47:16 2013 New Revision: 251583 URL: http://svnweb.freebsd.org/changeset/base/251583 Log: MFC r247221: Merge part of r1712 from elftoolchain, making it possible to resize ELF sections and indirectly change the layout of an ELF file when ELF_F_LAYOUT is not set. Modified: stable/8/lib/libelf/elf_update.c Directory Properties: stable/8/lib/libelf/ (props changed) Modified: stable/8/lib/libelf/elf_update.c ============================================================================== --- stable/8/lib/libelf/elf_update.c Sun Jun 9 17:47:01 2013 (r251582) +++ stable/8/lib/libelf/elf_update.c Sun Jun 9 17:47:16 2013 (r251583) @@ -41,89 +41,79 @@ __FBSDID("$FreeBSD$"); #include "_libelf.h" /* - * Update the internal data structures associated with an ELF object. - * Returns the size in bytes the ELF object would occupy in its file - * representation. + * Layout strategy: * - * After a successful call to this function, the following structures - * are updated: + * - Case 1: ELF_F_LAYOUT is asserted + * In this case the application has full control over where the + * section header table, program header table, and section data + * will reside. The library only perform error checks. * - * - The ELF header is updated. - * - All sections are sorted in order of ascending addresses and their - * section header table entries updated. An error is signalled - * if an overlap was detected among sections. - * - All data descriptors associated with a section are sorted in order - * of ascending addresses. Overlaps, if detected, are signalled as - * errors. Other sanity checks for alignments, section types etc. are - * made. + * - Case 2: ELF_F_LAYOUT is not asserted * - * After a resync_elf() successfully returns, the ELF descriptor is - * ready for being handed over to _libelf_write_elf(). + * The library will do the object layout using the following + * ordering: + * - The executable header is placed first, are required by the + * ELF specification. + * - The program header table is placed immediately following the + * executable header. + * - Section data, if any, is placed after the program header + * table, aligned appropriately. + * - The section header table, if needed, is placed last. * - * File alignments: - * PHDR - Addr - * SHDR - Addr + * There are two sub-cases to be taken care of: * - * XXX: how do we handle 'flags'. + * - Case 2a: e->e_cmd == ELF_C_READ or ELF_C_RDWR + * + * In this sub-case, the underlying ELF object may already have + * content in it, which the application may have modified. The + * library will retrieve content from the existing object as + * needed. + * + * - Case 2b: e->e_cmd == ELF_C_WRITE + * + * The ELF object is being created afresh in this sub-case; + * there is no pre-existing content in the underlying ELF + * object. */ /* * Compute the extents of a section, by looking at the data - * descriptors associated with it. The function returns zero if an - * error was detected. `*rc' holds the maximum file extent seen so - * far. + * descriptors associated with it. The function returns 1 if + * successful, or zero if an error was detected. */ static int -_libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t *rc) +_libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t rc) { int ec; - Elf_Data *d, *td; + size_t fsz, msz; + Elf_Data *d; + Elf32_Shdr *shdr32; + Elf64_Shdr *shdr64; unsigned int elftype; uint32_t sh_type; uint64_t d_align; uint64_t sh_align, sh_entsize, sh_offset, sh_size; uint64_t scn_size, scn_alignment; - /* - * We need to recompute library private data structures if one - * or more of the following is true: - * - The underlying Shdr structure has been marked `dirty'. Significant - * fields include: `sh_offset', `sh_type', `sh_size', `sh_addralign'. - * - The Elf_Data structures part of this section have been marked - * `dirty'. Affected members include `d_align', `d_offset', `d_type', - * and `d_size'. - * - The section as a whole is `dirty', e.g., it has been allocated - * using elf_newscn(), or if a new Elf_Data structure was added using - * elf_newdata(). - * - * Each of these conditions would result in the ELF_F_DIRTY bit being - * set on the section descriptor's `s_flags' field. - */ - ec = e->e_class; + shdr32 = &s->s_shdr.s_shdr32; + shdr64 = &s->s_shdr.s_shdr64; if (ec == ELFCLASS32) { - sh_type = s->s_shdr.s_shdr32.sh_type; - sh_align = (uint64_t) s->s_shdr.s_shdr32.sh_addralign; - sh_entsize = (uint64_t) s->s_shdr.s_shdr32.sh_entsize; - sh_offset = (uint64_t) s->s_shdr.s_shdr32.sh_offset; - sh_size = (uint64_t) s->s_shdr.s_shdr32.sh_size; + sh_type = shdr32->sh_type; + sh_align = (uint64_t) shdr32->sh_addralign; + sh_entsize = (uint64_t) shdr32->sh_entsize; + sh_offset = (uint64_t) shdr32->sh_offset; + sh_size = (uint64_t) shdr32->sh_size; } else { - sh_type = s->s_shdr.s_shdr64.sh_type; - sh_align = s->s_shdr.s_shdr64.sh_addralign; - sh_entsize = s->s_shdr.s_shdr64.sh_entsize; - sh_offset = s->s_shdr.s_shdr64.sh_offset; - sh_size = s->s_shdr.s_shdr64.sh_size; + sh_type = shdr64->sh_type; + sh_align = shdr64->sh_addralign; + sh_entsize = shdr64->sh_entsize; + sh_offset = shdr64->sh_offset; + sh_size = shdr64->sh_size; } - if (sh_type == SHT_NULL || sh_type == SHT_NOBITS) - return (1); - - if ((s->s_flags & ELF_F_DIRTY) == 0) { - if ((size_t) *rc < sh_offset + sh_size) - *rc = sh_offset + sh_size; - return (1); - } + assert(sh_type != SHT_NULL && sh_type != SHT_NOBITS); elftype = _libelf_xlate_shtype(sh_type); if (elftype > ELF_T_LAST) { @@ -131,15 +121,52 @@ _libelf_compute_section_extents(Elf *e, return (0); } - /* - * Compute the extent of the data descriptors associated with - * this section. - */ - scn_alignment = 0; if (sh_align == 0) sh_align = _libelf_falign(elftype, ec); - /* Compute the section alignment. */ + /* + * Check the section's data buffers for sanity and compute the + * section's alignment. + * Compute the section's size and alignment using the data + * descriptors associated with the section. + */ + if (STAILQ_EMPTY(&s->s_data)) { + /* + * The section's content (if any) has not been read in + * yet. If section is not dirty marked dirty, we can + * reuse the values in the 'sh_size' and 'sh_offset' + * fields of the section header. + */ + if ((s->s_flags & ELF_F_DIRTY) == 0) { + /* + * If the library is doing the layout, then we + * compute the new start offset for the + * section based on the current offset and the + * section's alignment needs. + * + * If the application is doing the layout, we + * can use the value in the 'sh_offset' field + * in the section header directly. + */ + if (e->e_flags & ELF_F_LAYOUT) + goto updatedescriptor; + else + goto computeoffset; + } + + /* + * Otherwise, we need to bring in the section's data + * from the underlying ELF object. + */ + if (e->e_cmd != ELF_C_WRITE && elf_getdata(s, NULL) == NULL) + return (0); + } + + /* + * Loop through the section's data descriptors. + */ + scn_size = 0L; + scn_alignment = 0L; STAILQ_FOREACH(d, &s->s_data, d_next) { if (d->d_type > ELF_T_LAST) { LIBELF_SET_ERROR(DATA, 0); @@ -153,23 +180,40 @@ _libelf_compute_section_extents(Elf *e, LIBELF_SET_ERROR(DATA, 0); return (0); } - if (d_align > scn_alignment) - scn_alignment = d_align; - } - scn_size = 0L; + /* + * The buffer's size should be a multiple of the + * memory size of the underlying type. + */ + msz = _libelf_msize(d->d_type, ec, e->e_version); + if (d->d_size % msz) { + LIBELF_SET_ERROR(DATA, 0); + return (0); + } - STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) { + /* + * Compute the section's size. + */ if (e->e_flags & ELF_F_LAYOUT) { if ((uint64_t) d->d_off + d->d_size > scn_size) scn_size = d->d_off + d->d_size; } else { scn_size = roundup2(scn_size, d->d_align); d->d_off = scn_size; - scn_size += d->d_size; + fsz = _libelf_fsize(d->d_type, ec, d->d_version, + d->d_size / msz); + scn_size += fsz; } + + /* + * The section's alignment is the maximum alignment + * needed for its data buffers. + */ + if (d_align > scn_alignment) + scn_alignment = d_align; } + /* * If the application is requesting full control over the layout * of the section, check its values for sanity. @@ -180,46 +224,60 @@ _libelf_compute_section_extents(Elf *e, LIBELF_SET_ERROR(LAYOUT, 0); return (0); } - } else { - /* - * Otherwise compute the values in the section header. - */ + goto updatedescriptor; + } - if (scn_alignment > sh_align) - sh_align = scn_alignment; + /* + * Otherwise compute the values in the section header. + * + * The section alignment is the maximum alignment for any of + * its contained data descriptors. + */ + if (scn_alignment > sh_align) + sh_align = scn_alignment; - /* - * If the section entry size is zero, try and fill in an - * appropriate entry size. Per the elf(5) manual page - * sections without fixed-size entries should have their - * 'sh_entsize' field set to zero. - */ - if (sh_entsize == 0 && - (sh_entsize = _libelf_fsize(elftype, ec, e->e_version, - (size_t) 1)) == 1) - sh_entsize = 0; + /* + * If the section entry size is zero, try and fill in an + * appropriate entry size. Per the elf(5) manual page + * sections without fixed-size entries should have their + * 'sh_entsize' field set to zero. + */ + if (sh_entsize == 0 && + (sh_entsize = _libelf_fsize(elftype, ec, e->e_version, + (size_t) 1)) == 1) + sh_entsize = 0; - sh_size = scn_size; - sh_offset = roundup(*rc, sh_align); + sh_size = scn_size; - if (ec == ELFCLASS32) { - s->s_shdr.s_shdr32.sh_addralign = (uint32_t) sh_align; - s->s_shdr.s_shdr32.sh_entsize = (uint32_t) sh_entsize; - s->s_shdr.s_shdr32.sh_offset = (uint32_t) sh_offset; - s->s_shdr.s_shdr32.sh_size = (uint32_t) sh_size; - } else { - s->s_shdr.s_shdr64.sh_addralign = sh_align; - s->s_shdr.s_shdr64.sh_entsize = sh_entsize; - s->s_shdr.s_shdr64.sh_offset = sh_offset; - s->s_shdr.s_shdr64.sh_size = sh_size; - } - } +computeoffset: + /* + * Compute the new offset for the section based on + * the section's alignment needs. + */ + sh_offset = roundup(rc, sh_align); - if ((size_t) *rc < sh_offset + sh_size) - *rc = sh_offset + sh_size; + /* + * Update the section header. + */ + if (ec == ELFCLASS32) { + shdr32->sh_addralign = (uint32_t) sh_align; + shdr32->sh_entsize = (uint32_t) sh_entsize; + shdr32->sh_offset = (uint32_t) sh_offset; + shdr32->sh_size = (uint32_t) sh_size; + } else { + shdr64->sh_addralign = sh_align; + shdr64->sh_entsize = sh_entsize; + shdr64->sh_offset = sh_offset; + shdr64->sh_size = sh_size; + } +updatedescriptor: + /* + * Update the section descriptor. + */ s->s_size = sh_size; s->s_offset = sh_offset; + return (1); } @@ -267,13 +325,16 @@ _libelf_insert_section(Elf *e, Elf_Scn * return (1); } +/* + * Recompute section layout. + */ + static off_t _libelf_resync_sections(Elf *e, off_t rc) { int ec; - off_t nrc; + Elf_Scn *s; size_t sh_type, shdr_start, shdr_end; - Elf_Scn *s, *ts; ec = e->e_class; @@ -281,13 +342,7 @@ _libelf_resync_sections(Elf *e, off_t rc * Make a pass through sections, computing the extent of each * section. Order in increasing order of addresses. */ - - nrc = rc; - STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) - if (_libelf_compute_section_extents(e, s, &nrc) == 0) - return ((off_t) -1); - - STAILQ_FOREACH_SAFE(s, &e->e_u.e_elf.e_scn, s_next, ts) { + STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) { if (ec == ELFCLASS32) sh_type = s->s_shdr.s_shdr32.sh_type; else @@ -296,21 +351,22 @@ _libelf_resync_sections(Elf *e, off_t rc if (sh_type == SHT_NOBITS || sh_type == SHT_NULL) continue; - if (s->s_offset < (uint64_t) rc) { - if (s->s_offset + s->s_size < (uint64_t) rc) { - /* - * Try insert this section in the - * correct place in the list, - * detecting overlaps if any. - */ - STAILQ_REMOVE(&e->e_u.e_elf.e_scn, s, _Elf_Scn, - s_next); - if (_libelf_insert_section(e, s) == 0) - return ((off_t) -1); - } else { - LIBELF_SET_ERROR(LAYOUT, 0); + if (_libelf_compute_section_extents(e, s, rc) == 0) + return ((off_t) -1); + + if (s->s_size == 0) + continue; + + if (s->s_offset + s->s_size < (size_t) rc) { + /* + * Try insert this section in the + * correct place in the list, + * detecting overlaps if any. + */ + STAILQ_REMOVE(&e->e_u.e_elf.e_scn, s, _Elf_Scn, + s_next); + if (_libelf_insert_section(e, s) == 0) return ((off_t) -1); - } } else rc = s->s_offset + s->s_size; } @@ -338,8 +394,6 @@ _libelf_resync_sections(Elf *e, off_t rc } } - assert(nrc == rc); - return (rc); } From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 18:11:37 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 82A17495; Sun, 9 Jun 2013 18:11:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 648611804; Sun, 9 Jun 2013 18:11:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59IBbpE013634; Sun, 9 Jun 2013 18:11:37 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59IBasZ013629; Sun, 9 Jun 2013 18:11:36 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201306091811.r59IBasZ013629@svn.freebsd.org> From: Hiroki Sato Date: Sun, 9 Jun 2013 18:11:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251584 - in head: etc/rc.d share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 18:11:37 -0000 Author: hrs Date: Sun Jun 9 18:11:36 2013 New Revision: 251584 URL: http://svnweb.freebsd.org/changeset/base/251584 Log: Add :ifname modifier to specify interface-specific routes into {,ipv6_}static_routes and rc.d/routing. For example: static_routes="foo bar:em0" route_foo="-net 10.0.0.0/24 -gateway 192.168.2.1" route_bar="-net 192.168.1.0/24 -gateway 192.168.0.2" At boot time, all of the static routes are installed as before. The differences are: - "/etc/rc.d/netif start/stop " now configures static routes with : if any. - "/etc/rc.d/routing start/stop " works as well. cannot be omitted when is specified, but a keyword "any" or "all" can be used for and . Modified: head/etc/rc.d/netif head/etc/rc.d/routing head/share/man/man5/rc.conf.5 Modified: head/etc/rc.d/netif ============================================================================== --- head/etc/rc.d/netif Sun Jun 9 17:47:16 2013 (r251583) +++ head/etc/rc.d/netif Sun Jun 9 18:11:36 2013 (r251584) @@ -46,6 +46,8 @@ set_rcvar_obsolete ipv6_prefer network_start() { + local _if + # Set the list of interfaces to work on. # cmdifn=$* @@ -81,16 +83,29 @@ network_start() if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then /etc/rc.d/bridge start $cmdifn fi + if [ -f /etc/rc.d/routing -a -n "$cmdifn" ] ; then + for _if in $cmdifn; do + /etc/rc.d/routing start any $_if + done + fi } network_stop() { + local _if + # Set the list of interfaces to work on. # cmdifn=$* # Deconfigure the interface(s) network_common ifn_stop + + if [ -f /etc/rc.d/routing -a -n "$cmdifn" ] ; then + for _if in $cmdifn; do + /etc/rc.d/routing stop any $_if + done + fi } # network_common routine Modified: head/etc/rc.d/routing ============================================================================== --- head/etc/rc.d/routing Sun Jun 9 17:47:16 2013 (r251583) +++ head/etc/rc.d/routing Sun Jun 9 18:11:36 2013 (r251584) @@ -19,56 +19,73 @@ extra_commands="options static" static_cmd="routing_start static" options_cmd="routing_start options" -afcheck() -{ - case $_af in - ""|inet|inet6|ipx|atm) - ;; - *) - err 1 "Unsupported address family: $_af." - ;; - esac -} +ROUTE_CMD="/sbin/route" routing_start() { - local _cmd _af _a + local _cmd _af _if _a _cmd=$1 _af=$2 + _if=$3 - afcheck + case $_if in + ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) _if="" ;; + esac case $_af in inet|inet6|ipx|atm) - setroutes $_cmd $_af + if afexists $_af; then + setroutes $_cmd $_af $_if + else + err 1 "Unsupported address family: $_af." + fi ;; - "") + ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) for _a in inet inet6 ipx atm; do - afexists $_a && setroutes $_cmd $_a + afexists $_a && setroutes $_cmd $_a $_if done ;; + *) + err 1 "Unsupported address family: $_af." + ;; esac } routing_stop() { - local _af _a + local _af _if _a _af=$1 + _if=$2 - afcheck + case $_if in + ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) _if="" ;; + esac case $_af in inet|inet6|ipx|atm) - eval static_${_af} delete - eval routing_stop_${_af} + if afexists $_af; then + eval static_${_af} delete $_if + # When $_if is specified, do not flush routes. + if ! [ -n "$_if" ]; then + eval routing_stop_${_af} + fi + else + err 1 "Unsupported address family: $_af." + fi ;; - "") + ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) for _a in inet inet6 ipx atm; do afexists $_a || continue - eval static_${_a} delete - eval routing_stop_${_a} + eval static_${_a} delete $_if + # When $_if is specified, do not flush routes. + if ! [ -n "$_if" ]; then + eval routing_stop_${_a} + fi done ;; + *) + err 1 "Unsupported address family: $_af." + ;; esac } @@ -76,13 +93,13 @@ setroutes() { case $1 in static) - static_$2 add + static_$2 add $3 ;; options) options_$2 ;; doall) - static_$2 add + static_$2 add $3 options_$2 ;; esac @@ -90,14 +107,14 @@ setroutes() routing_stop_inet() { - route -n flush -inet + ${ROUTE_CMD} -n flush -inet } routing_stop_inet6() { local i - route -n flush -inet6 + ${ROUTE_CMD} -n flush -inet6 for i in `list_net_interfaces`; do if ipv6if $i; then ifconfig $i inet6 -defaultif @@ -117,30 +134,47 @@ routing_stop_ipx() static_inet() { - local _action + local _action _if _skip _action=$1 + _if=$2 + # Add default route. case ${defaultrouter} in [Nn][Oo] | '') ;; *) - static_routes="default ${static_routes}" - route_default="default ${defaultrouter}" + static_routes="_default ${static_routes}" + route__default="default ${defaultrouter}" ;; esac + # Install configured routes. if [ -n "${static_routes}" ]; then for i in ${static_routes}; do - route_args=`get_if_var $i route_IF` - route ${_action} ${route_args} + _skip=0 + if [ -n "$_if" ]; then + case $i in + *:$_if) ;; + *) _skip=1 ;; + esac + fi + if [ $_skip = 0 ]; then + route_args=`get_if_var ${i%:*} route_IF` + if [ -n "$route_args" ]; then + ${ROUTE_CMD} ${_action} ${route_args} + else + warn "route_${i%:*} not found." + fi + fi done fi } static_inet6() { - local _action fibmod fibs + local _action _if _skip fibmod fibs _action=$1 + _if=$2 # get the number of FIBs supported. fibs=$((`${SYSCTL_N} net.fibs` - 1)) @@ -150,58 +184,74 @@ static_inet6() fibmod= fi + # Add pre-defined static routes first. + ipv6_static_routes="_v4mapped _v4compat ${ipv6_static_routes}" + ipv6_static_routes="_lla _llma ${ipv6_static_routes}" + # disallow "internal" addresses to appear on the wire - route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod} - route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod} + ipv6_route__v4mapped="::ffff:0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}" + ipv6_route__v4compat="::0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}" + # Disallow link-local unicast packets without outgoing scope + # identifiers. However, if you set "ipv6_default_interface", + # for the host case, you will allow to omit the identifiers. + # Under this configuration, the packets will go to the default + # interface. + ipv6_route__lla="fe80:: -prefixlen 10 ::1 -reject ${fibmod}" + ipv6_route__llma="ff02:: -prefixlen 16 ::1 -reject ${fibmod}" + + # Add default route. case ${ipv6_defaultrouter} in [Nn][Oo] | '') ;; *) - ipv6_static_routes="default ${ipv6_static_routes}" - ipv6_route_default="default ${ipv6_defaultrouter}" + ipv6_static_routes="_default ${ipv6_static_routes}" + ipv6_route__default="default ${ipv6_defaultrouter}" ;; esac + # Install configured routes. if [ -n "${ipv6_static_routes}" ]; then for i in ${ipv6_static_routes}; do - ipv6_route_args=`get_if_var $i ipv6_route_IF` - route ${_action} -inet6 ${ipv6_route_args} + _skip=0 + if [ -n "$_if" ]; then + case $i in + *:$_if) ;; + *) _skip=1 ;; + esac + fi + if [ $_skip = 0 ]; then + ipv6_route_args=`get_if_var ${i%:*} ipv6_route_IF` + if [ -n "$ipv6_route_args" ]; then + ${ROUTE_CMD} ${_action} \ + -inet6 ${ipv6_route_args} + else + warn "route_${i%:*} not found" + fi + fi done fi - # Fixup $ipv6_network_interfaces - case ${ipv6_network_interfaces} in - [Nn][Oo][Nn][Ee]) - ipv6_network_interfaces='' - ;; - esac + # Install the "default interface" to kernel, which will be used + # as the default route when there's no router. + # Disable installing the default interface when we act + # as router to avoid conflict between the default + # router list and the manual configured default route. if checkyesno ipv6_gateway_enable; then - for i in ${ipv6_network_interfaces}; do - - laddr=`network6_getladdr $i exclude_tentative` - case ${laddr} in - '') - ;; - *) - ipv6_working_interfaces="$i \ - ${ipv6_working_interfaces}" - ;; - esac - done - ipv6_network_interfaces=${ipv6_working_interfaces} + return fi - # Install the "default interface" to kernel, which will be used - # as the default route when there's no router. case "${ipv6_default_interface}" in [Nn][Oo] | [Nn][Oo][Nn][Ee]) - ipv6_default_interface="" + return ;; [Aa][Uu][Tt][Oo] | "") for i in ${ipv6_network_interfaces}; do case $i in + [Nn][Oo][Nn][Ee]) + return + ;; lo0|faith[0-9]*) continue ;; @@ -219,27 +269,8 @@ static_inet6() ;; esac - # Disallow link-local unicast packets without outgoing scope - # identifiers. However, if you set "ipv6_default_interface", - # for the host case, you will allow to omit the identifiers. - # Under this configuration, the packets will go to the default - # interface. - route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject ${fibmod} - route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject ${fibmod} - - case ${ipv6_default_interface} in - '') - ;; - *) - # Disable installing the default interface when we act - # as router to avoid conflict between the default - # router list and the manual configured default route. - if ! checkyesno ipv6_gateway_enable; then - ifconfig ${ipv6_default_interface} inet6 defaultif - sysctl net.inet6.ip6.use_defaultzone=1 - fi - ;; - esac + ifconfig ${ipv6_default_interface} inet6 defaultif + sysctl net.inet6.ip6.use_defaultzone=1 } static_atm() @@ -250,7 +281,11 @@ static_atm() if [ -n "${natm_static_routes}" ]; then for i in ${natm_static_routes}; do route_args=`get_if_var $i route_IF` - atmconfig natm ${_action} ${route_args} + if [ -n "$route_args" ]; then + atmconfig natm ${_action} ${route_args} + else + warn "route_${i} not found." + fi done fi } Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Sun Jun 9 17:47:16 2013 (r251583) +++ head/share/man/man5/rc.conf.5 Sun Jun 9 18:11:36 2013 (r251584) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 27, 2012 +.Dd June 9, 2013 .Dt RC.CONF 5 .Os .Sh NAME @@ -2689,10 +2689,18 @@ whose contents will later be passed to a operation. For example: .Bd -literal -static_routes="mcast gif0local" +static_routes="ext mcast:gif0 gif0local:gif0" +route_ext="-net 10.0.0.0/24 -gateway 192.168.0.1" route_mcast="-net 224.0.0.0/4 -iface gif0" route_gif0local="-host 169.254.1.1 -iface lo0" .Ed +.Pp +When an +.Ar element +is in the form of +.Li name:ifname , +the route is specific to the interface +.Li ifname . .It Va ipv6_static_routes .Pq Vt str The IPv6 equivalent of From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 21:54:20 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 792C7F1A; Sun, 9 Jun 2013 21:54:20 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6BCD41664; Sun, 9 Jun 2013 21:54:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59LsKBh087755; Sun, 9 Jun 2013 21:54:20 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59LsKeY087754; Sun, 9 Jun 2013 21:54:20 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201306092154.r59LsKeY087754@svn.freebsd.org> From: Rick Macklem Date: Sun, 9 Jun 2013 21:54:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251585 - head/usr.bin/nfsstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 21:54:20 -0000 Author: rmacklem Date: Sun Jun 9 21:54:19 2013 New Revision: 251585 URL: http://svnweb.freebsd.org/changeset/base/251585 Log: Modify nfsstat.c so that it prints out an error when a non-root user attempts to use the "-m" option and it fails. Requested by: danny@cs.huji.ac.il MFC after: 2 weeks Modified: head/usr.bin/nfsstat/nfsstat.c Modified: head/usr.bin/nfsstat/nfsstat.c ============================================================================== --- head/usr.bin/nfsstat/nfsstat.c Sun Jun 9 18:11:36 2013 (r251584) +++ head/usr.bin/nfsstat/nfsstat.c Sun Jun 9 21:54:19 2013 (r251585) @@ -133,6 +133,9 @@ main(int argc, char **argv) printf("%s on %s\n%s\n", mntbuf->f_mntfromname, mntbuf->f_mntonname, buf); + else if (errno == EPERM) + errx(1, "Only priviledged users" + " can use the -m option"); } mntbuf++; } From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 22:51:12 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3E0ED6A; Sun, 9 Jun 2013 22:51:12 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 300671AA4; Sun, 9 Jun 2013 22:51:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59MpC1X006163; Sun, 9 Jun 2013 22:51:12 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59MpCmW006162; Sun, 9 Jun 2013 22:51:12 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201306092251.r59MpCmW006162@svn.freebsd.org> From: Olivier Houchard Date: Sun, 9 Jun 2013 22:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251586 - head/sys/arm/ti X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 22:51:12 -0000 Author: cognet Date: Sun Jun 9 22:51:11 2013 New Revision: 251586 URL: http://svnweb.freebsd.org/changeset/base/251586 Log: Increase the maximum KVM available on TI chips. Not sure why we suddenly need that much, but that lets me boot with 1GB of RAM. Modified: head/sys/arm/ti/ti_machdep.c Modified: head/sys/arm/ti/ti_machdep.c ============================================================================== --- head/sys/arm/ti/ti_machdep.c Sun Jun 9 21:54:19 2013 (r251585) +++ head/sys/arm/ti/ti_machdep.c Sun Jun 9 22:51:11 2013 (r251586) @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include /* Start of address space used for bootstrap map */ -#define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000 +#define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000 void (*ti_cpu_reset)(void); @@ -92,14 +92,14 @@ platform_devmap_init(void) { int i = 0; #if defined(SOC_OMAP4) - fdt_devmap[i].pd_va = 0xE8000000; + fdt_devmap[i].pd_va = 0xF8000000; fdt_devmap[i].pd_pa = 0x48000000; fdt_devmap[i].pd_size = 0x1000000; fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE; fdt_devmap[i].pd_cache = PTE_DEVICE; i++; #elif defined(SOC_TI_AM335X) - fdt_devmap[i].pd_va = 0xE4C00000; + fdt_devmap[i].pd_va = 0xF4C00000; fdt_devmap[i].pd_pa = 0x44C00000; /* L4_WKUP */ fdt_devmap[i].pd_size = 0x400000; /* 4 MB */ fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE; From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 23:12:44 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 187B7791; Sun, 9 Jun 2013 23:12:44 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0B2E21D6C; Sun, 9 Jun 2013 23:12:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59NChpF012987; Sun, 9 Jun 2013 23:12:43 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59NChZh012986; Sun, 9 Jun 2013 23:12:43 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201306092312.r59NChZh012986@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 9 Jun 2013 23:12:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251587 - head/sys/geom/part X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 23:12:44 -0000 Author: marcel Date: Sun Jun 9 23:12:43 2013 New Revision: 251587 URL: http://svnweb.freebsd.org/changeset/base/251587 Log: Remove stub implementation. Modified: head/sys/geom/part/g_part_ldm.c Modified: head/sys/geom/part/g_part_ldm.c ============================================================================== --- head/sys/geom/part/g_part_ldm.c Sun Jun 9 22:51:11 2013 (r251586) +++ head/sys/geom/part/g_part_ldm.c Sun Jun 9 23:12:43 2013 (r251587) @@ -336,8 +336,6 @@ static const char *g_part_ldm_name(struc char *, size_t); static int g_part_ldm_probe(struct g_part_table *, struct g_consumer *); static int g_part_ldm_read(struct g_part_table *, struct g_consumer *); -static int g_part_ldm_setunset(struct g_part_table *, struct g_part_entry *, - const char *, unsigned int); static const char *g_part_ldm_type(struct g_part_table *, struct g_part_entry *, char *, size_t); static int g_part_ldm_write(struct g_part_table *, struct g_consumer *); @@ -356,7 +354,6 @@ static kobj_method_t g_part_ldm_methods[ KOBJMETHOD(g_part_name, g_part_ldm_name), KOBJMETHOD(g_part_probe, g_part_ldm_probe), KOBJMETHOD(g_part_read, g_part_ldm_read), - KOBJMETHOD(g_part_setunset, g_part_ldm_setunset), KOBJMETHOD(g_part_type, g_part_ldm_type), KOBJMETHOD(g_part_write, g_part_ldm_write), { 0, 0 } @@ -1476,14 +1473,6 @@ gpt_cleanup: return (error); } -static int -g_part_ldm_setunset(struct g_part_table *table, struct g_part_entry *baseentry, - const char *attrib, unsigned int set) -{ - - return (ENOSYS); -} - static const char * g_part_ldm_type(struct g_part_table *basetable, struct g_part_entry *baseentry, char *buf, size_t bufsz) From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 23:34:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0CB2DD3F; Sun, 9 Jun 2013 23:34:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E20D81F0C; Sun, 9 Jun 2013 23:34:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59NYRUA019298; Sun, 9 Jun 2013 23:34:27 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59NYQHG019290; Sun, 9 Jun 2013 23:34:26 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201306092334.r59NYQHG019290@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 9 Jun 2013 23:34:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251588 - in head: sbin/geom/class/part sys/geom/part X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 23:34:28 -0000 Author: marcel Date: Sun Jun 9 23:34:26 2013 New Revision: 251588 URL: http://svnweb.freebsd.org/changeset/base/251588 Log: Change the set and unset ctlreqs by making the index argument optional. This allows setting attributes on tables. One simply does not provide an index in that case. Otherwise the entry corresponding the index has the attribute set or unset. Use this change to fix a relatively longstanding bug in our GPT scheme that's the result of rev 198097 (relatively harmless) followed by rev 237057 (damaging). The damaging part being that our GPT scheme always has the active flag set on the PMBR slice. This is in violation with EFI. Existing EFI implementions for both x86 and ia64 reject the GPT. As such, GPT disks created by us aren't usable under EFI because of that. After this change, GPT disks never have the active flag set on the PMBR slice. In order to make the GPT disk bootable under some x86 BIOSes, the reason of rev 198097, one must now set the active attribute on the gpt table. The kernel will apply this to the PMBR slice For (S)ATA: gpart set -a active ada0 To fix an existing GPT disk that has the active flag set in the PMBR, and that does not need the flag, use (again for (S)ATA): gpart unset -a active ada0 The EBR, MBR & PC98 schemes, which also impement at least 1 attribute, now check to make sure the entry passed is valid. They do not have attributes that apply to the table. Modified: head/sbin/geom/class/part/geom_part.c head/sys/geom/part/g_part.c head/sys/geom/part/g_part_ebr.c head/sys/geom/part/g_part_gpt.c head/sys/geom/part/g_part_mbr.c head/sys/geom/part/g_part_pc98.c Modified: head/sbin/geom/class/part/geom_part.c ============================================================================== --- head/sbin/geom/class/part/geom_part.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sbin/geom/class/part/geom_part.c Sun Jun 9 23:34:26 2013 (r251588) @@ -147,10 +147,10 @@ struct g_command PUBSYM(class_commands)[ }, { "set", 0, gpart_issue, { { 'a', "attrib", NULL, G_TYPE_STRING }, - { 'i', GPART_PARAM_INDEX, NULL, G_TYPE_NUMBER }, + { 'i', GPART_PARAM_INDEX, G_VAL_OPTIONAL, G_TYPE_NUMBER }, { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, G_OPT_SENTINEL }, - "-a attrib -i index [-f flags] geom" + "-a attrib [-i index] [-f flags] geom" }, { "show", 0, gpart_show, { { 'l', "show_label", NULL, G_TYPE_BOOL }, @@ -164,10 +164,10 @@ struct g_command PUBSYM(class_commands)[ }, { "unset", 0, gpart_issue, { { 'a', "attrib", NULL, G_TYPE_STRING }, - { 'i', GPART_PARAM_INDEX, NULL, G_TYPE_NUMBER }, + { 'i', GPART_PARAM_INDEX, G_VAL_OPTIONAL, G_TYPE_NUMBER }, { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, G_OPT_SENTINEL }, - "-a attrib -i index [-f flags] geom" + "-a attrib [-i index] [-f flags] geom" }, { "resize", 0, gpart_issue, { { 'a', "alignment", GPART_AUTOFILL, G_TYPE_STRING }, Modified: head/sys/geom/part/g_part.c ============================================================================== --- head/sys/geom/part/g_part.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sys/geom/part/g_part.c Sun Jun 9 23:34:26 2013 (r251588) @@ -1352,16 +1352,20 @@ g_part_ctl_setunset(struct gctl_req *req table = gp->softc; - LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { - if (entry->gpe_deleted || entry->gpe_internal) - continue; - if (entry->gpe_index == gpp->gpp_index) - break; - } - if (entry == NULL) { - gctl_error(req, "%d index '%d'", ENOENT, gpp->gpp_index); - return (ENOENT); - } + if (gpp->gpp_parms & G_PART_PARM_INDEX) { + LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { + if (entry->gpe_deleted || entry->gpe_internal) + continue; + if (entry->gpe_index == gpp->gpp_index) + break; + } + if (entry == NULL) { + gctl_error(req, "%d index '%d'", ENOENT, + gpp->gpp_index); + return (ENOENT); + } + } else + entry = NULL; error = G_PART_SETUNSET(table, entry, gpp->gpp_attrib, set); if (error) { @@ -1374,8 +1378,11 @@ g_part_ctl_setunset(struct gctl_req *req sb = sbuf_new_auto(); sbuf_printf(sb, "%s %sset on ", gpp->gpp_attrib, (set) ? "" : "un"); - G_PART_FULLNAME(table, entry, sb, gp->name); - sbuf_printf(sb, "\n"); + if (entry) + G_PART_FULLNAME(table, entry, sb, gp->name); + else + sbuf_cat(sb, gp->name); + sbuf_cat(sb, "\n"); sbuf_finish(sb); gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); @@ -1581,8 +1588,8 @@ g_part_ctlreq(struct gctl_req *req, stru case 's': if (!strcmp(verb, "set")) { ctlreq = G_PART_CTL_SET; - mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | - G_PART_PARM_INDEX; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM; + oparms |= G_PART_PARM_INDEX; } break; case 'u': @@ -1592,8 +1599,8 @@ g_part_ctlreq(struct gctl_req *req, stru modifies = 0; } else if (!strcmp(verb, "unset")) { ctlreq = G_PART_CTL_UNSET; - mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | - G_PART_PARM_INDEX; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM; + oparms |= G_PART_PARM_INDEX; } break; } Modified: head/sys/geom/part/g_part_ebr.c ============================================================================== --- head/sys/geom/part/g_part_ebr.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sys/geom/part/g_part_ebr.c Sun Jun 9 23:34:26 2013 (r251588) @@ -540,6 +540,8 @@ g_part_ebr_setunset(struct g_part_table struct g_part_ebr_entry *entry; int changed; + if (baseentry == NULL) + return (ENODEV); if (strcasecmp(attrib, "active") != 0) return (EINVAL); Modified: head/sys/geom/part/g_part_gpt.c ============================================================================== --- head/sys/geom/part/g_part_gpt.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sys/geom/part/g_part_gpt.c Sun Jun 9 23:34:26 2013 (r251588) @@ -260,6 +260,16 @@ gpt_map_type(struct uuid *t) return (0); } +static void +gpt_create_pmbr(struct g_part_gpt_table *table, struct g_provider *pp) +{ + + bzero(table->mbr + DOSPARTOFF, DOSPARTSIZE * NDOSPART); + gpt_write_mbr_entry(table->mbr, 0, 0xee, 1, + MIN(pp->mediasize / pp->sectorsize - 1, UINT32_MAX)); + le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); +} + /* * Under Boot Camp the PMBR partition (type 0xEE) doesn't cover the * whole disk anymore. Rather, it covers the GPT table and the EFI @@ -284,7 +294,7 @@ gpt_is_bootcamp(struct g_part_gpt_table } static void -gpt_update_bootcamp(struct g_part_table *basetable) +gpt_update_bootcamp(struct g_part_table *basetable, struct g_provider *pp) { struct g_part_entry *baseentry; struct g_part_gpt_entry *entry; @@ -341,6 +351,7 @@ gpt_update_bootcamp(struct g_part_table disable: table->bootcamp = 0; + gpt_create_pmbr(table, pp); } static struct gpt_hdr * @@ -609,6 +620,8 @@ g_part_gpt_create(struct g_part_table *b pp->sectorsize) return (ENOSPC); + gpt_create_pmbr(table, pp); + /* Allocate space for the header */ table->hdr = g_malloc(sizeof(struct gpt_hdr), M_WAITOK | M_ZERO); @@ -936,9 +949,13 @@ g_part_gpt_read(struct g_part_table *bas static int g_part_gpt_recover(struct g_part_table *basetable) { + struct g_part_gpt_table *table; + struct g_provider *pp; - g_gpt_set_defaults(basetable, - LIST_FIRST(&basetable->gpt_gp->consumer)->provider); + table = (struct g_part_gpt_table *)basetable; + pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider; + gpt_create_pmbr(table, pp); + g_gpt_set_defaults(basetable, pp); basetable->gpt_corrupt = 0; return (0); } @@ -949,6 +966,7 @@ g_part_gpt_setunset(struct g_part_table { struct g_part_gpt_entry *entry; struct g_part_gpt_table *table; + uint8_t *p; uint64_t attr; int i; @@ -956,15 +974,32 @@ g_part_gpt_setunset(struct g_part_table entry = (struct g_part_gpt_entry *)baseentry; if (strcasecmp(attrib, "active") == 0) { - if (!table->bootcamp || baseentry->gpe_index > NDOSPART) - return (EINVAL); - for (i = 0; i < NDOSPART; i++) { - table->mbr[DOSPARTOFF + i * DOSPARTSIZE] = - (i == baseentry->gpe_index - 1) ? 0x80 : 0; + if (table->bootcamp) { + /* The active flag must be set on a valid entry. */ + if (entry == NULL) + return (ENXIO); + if (baseentry->gpe_index > NDOSPART) + return (EINVAL); + for (i = 0; i < NDOSPART; i++) { + p = &table->mbr[DOSPARTOFF + i * DOSPARTSIZE]; + p[0] = (i == baseentry->gpe_index - 1) + ? ((set) ? 0x80 : 0) : 0; + } + } else { + /* The PMBR is marked as active without an entry. */ + if (entry != NULL) + return (ENXIO); + for (i = 0; i < NDOSPART; i++) { + p = &table->mbr[DOSPARTOFF + i * DOSPARTSIZE]; + p[0] = (p[4] == 0xee) ? ((set) ? 0x80 : 0) : 0; + } } return (0); } + if (entry == NULL) + return (ENODEV); + attr = 0; if (strcasecmp(attrib, "bootme") == 0) { attr |= GPT_ENT_ATTR_BOOTME; @@ -1032,17 +1067,7 @@ g_part_gpt_write(struct g_part_table *ba /* Reconstruct the MBR from the GPT if under Boot Camp. */ if (table->bootcamp) - gpt_update_bootcamp(basetable); - - /* Update partition entries in the PMBR if Boot Camp disabled. */ - if (!table->bootcamp) { - bzero(table->mbr + DOSPARTOFF, DOSPARTSIZE * NDOSPART); - gpt_write_mbr_entry(table->mbr, 0, 0xee, 1, - MIN(pp->mediasize / pp->sectorsize - 1, UINT32_MAX)); - /* Mark the PMBR active since some BIOS require it. */ - table->mbr[DOSPARTOFF] = 0x80; - } - le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); + gpt_update_bootcamp(basetable, pp); /* Write the PMBR */ buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); Modified: head/sys/geom/part/g_part_mbr.c ============================================================================== --- head/sys/geom/part/g_part_mbr.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sys/geom/part/g_part_mbr.c Sun Jun 9 23:34:26 2013 (r251588) @@ -497,6 +497,8 @@ g_part_mbr_setunset(struct g_part_table struct g_part_mbr_entry *entry; int changed; + if (baseentry == NULL) + return (ENODEV); if (strcasecmp(attrib, "active") != 0) return (EINVAL); Modified: head/sys/geom/part/g_part_pc98.c ============================================================================== --- head/sys/geom/part/g_part_pc98.c Sun Jun 9 23:12:43 2013 (r251587) +++ head/sys/geom/part/g_part_pc98.c Sun Jun 9 23:34:26 2013 (r251588) @@ -498,6 +498,9 @@ g_part_pc98_setunset(struct g_part_table struct g_part_pc98_entry *entry; int changed, mid, sid; + if (baseentry == NULL) + return (ENODEV); + mid = sid = 0; if (strcasecmp(attrib, "active") == 0) sid = 1; From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 23:50:31 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 557F217D; Sun, 9 Jun 2013 23:50:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 485581F88; Sun, 9 Jun 2013 23:50:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59NoVBn024722; Sun, 9 Jun 2013 23:50:31 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59NoVMI024721; Sun, 9 Jun 2013 23:50:31 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201306092350.r59NoVMI024721@svn.freebsd.org> From: Marius Strobl Date: Sun, 9 Jun 2013 23:50:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251589 - head/sys/boot/sparc64/loader X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 23:50:31 -0000 Author: marius Date: Sun Jun 9 23:50:30 2013 New Revision: 251589 URL: http://svnweb.freebsd.org/changeset/base/251589 Log: - The method introduced as part of r234898 for not altering the boot path when booting from ZFS turned out to also cause the boot path not being adjusted if booting from CD-ROM with firmware versions that do not employ the "cdrom" alias in that case. So shuffle the code around instead in order to achieve the original intent. Ideally, we shouldn't fiddle with the boot path when booting from UFS on a disk either; unfortunately, there doesn't seem to be an universal way of telling disks and CD-ROMs apart, though. [1] - Use NULL instead of 0 for pointers. PR: 179289 MFC after: 1 week Modified: head/sys/boot/sparc64/loader/main.c Modified: head/sys/boot/sparc64/loader/main.c ============================================================================== --- head/sys/boot/sparc64/loader/main.c Sun Jun 9 23:34:26 2013 (r251588) +++ head/sys/boot/sparc64/loader/main.c Sun Jun 9 23:50:30 2013 (r251589) @@ -160,17 +160,19 @@ struct devsw *devsw[] = { #ifdef LOADER_ZFS_SUPPORT &zfs_dev, #endif - 0 + NULL }; + struct arch_switch archsw; static struct file_format sparc64_elf = { __elfN(loadfile), __elfN(exec) }; + struct file_format *file_formats[] = { &sparc64_elf, - 0 + NULL }; struct fs_ops *file_system[] = { @@ -198,19 +200,20 @@ struct fs_ops *file_system[] = { #ifdef LOADER_TFTP_SUPPORT &tftp_fsops, #endif - 0 + NULL }; + struct netif_driver *netif_drivers[] = { #ifdef LOADER_NET_SUPPORT &ofwnet, #endif - 0 + NULL }; extern struct console ofwconsole; struct console *consoles[] = { &ofwconsole, - 0 + NULL }; #ifdef LOADER_DEBUG @@ -854,24 +857,6 @@ main(int (*openfirm)(void *)) OF_getprop(chosen, "bootpath", bootpath, sizeof(bootpath)); /* - * Sun compatible bootable CD-ROMs have a disk label placed - * before the cd9660 data, with the actual filesystem being - * in the first partition, while the other partitions contain - * pseudo disk labels with embedded boot blocks for different - * architectures, which may be followed by UFS filesystems. - * The firmware will set the boot path to the partition it - * boots from ('f' in the sun4u case), but we want the kernel - * to be loaded from the cd9660 fs ('a'), so the boot path - * needs to be altered. - */ - if (bootpath[strlen(bootpath) - 2] == ':' && - bootpath[strlen(bootpath) - 1] == 'f' && - strstr(bootpath, "cdrom") != NULL) { - bootpath[strlen(bootpath) - 1] = 'a'; - printf("Boot path set to %s\n", bootpath); - } - - /* * Initialize devices. */ for (dp = devsw; *dp != 0; dp++) @@ -883,9 +868,24 @@ main(int (*openfirm)(void *)) (void)strncpy(bootpath, zfs_fmtdev(&zfs_currdev), sizeof(bootpath) - 1); bootpath[sizeof(bootpath) - 1] = '\0'; - } + } else #endif + /* + * Sun compatible bootable CD-ROMs have a disk label placed before + * the ISO 9660 data, with the actual file system being in the first + * partition, while the other partitions contain pseudo disk labels + * with embedded boot blocks for different architectures, which may + * be followed by UFS file systems. + * The firmware will set the boot path to the partition it boots from + * ('f' in the sun4u/sun4v case), but we want the kernel to be loaded + * from the ISO 9660 file system ('a'), so the boot path needs to be + * altered. + */ + if (bootpath[strlen(bootpath) - 2] == ':' && + bootpath[strlen(bootpath) - 1] == 'f') + bootpath[strlen(bootpath) - 1] = 'a'; + env_setenv("currdev", EV_VOLATILE, bootpath, ofw_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, bootpath, From owner-svn-src-all@FreeBSD.ORG Sun Jun 9 23:51:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2D8DA2FA; Sun, 9 Jun 2013 23:51:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 065CB1F92; Sun, 9 Jun 2013 23:51:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59NpRLk024890; Sun, 9 Jun 2013 23:51:27 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59NpRTZ024888; Sun, 9 Jun 2013 23:51:27 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201306092351.r59NpRTZ024888@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 9 Jun 2013 23:51:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251590 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 23:51:28 -0000 Author: marcel Date: Sun Jun 9 23:51:26 2013 New Revision: 251590 URL: http://svnweb.freebsd.org/changeset/base/251590 Log: Add vfs_mounted and vfs_unmounted events so that components can be informed about mount and unmount events. This is used by Juniper to implement a more optimal implementation of NetBSD's veriexec. Submitted by: stevek@juniper.net Obtained from: Juniper Networks, Inc Modified: head/sys/kern/vfs_mount.c head/sys/sys/mount.h Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Sun Jun 9 23:50:30 2013 (r251589) +++ head/sys/kern/vfs_mount.c Sun Jun 9 23:51:26 2013 (r251590) @@ -864,6 +864,7 @@ vfs_domount_first( VOP_UNLOCK(newdp, 0); VOP_UNLOCK(vp, 0); mountcheckdirs(vp, newdp); + EVENTHANDLER_INVOKE(vfs_mounted, mp, newdp, td); vrele(newdp); if ((mp->mnt_flag & MNT_RDONLY) == 0) vfs_allocate_syncvnode(mp); @@ -1355,6 +1356,7 @@ dounmount(mp, flags, td) mtx_lock(&mountlist_mtx); TAILQ_REMOVE(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); + EVENTHANDLER_INVOKE(vfs_unmounted, mp, td); if (coveredvp != NULL) { coveredvp->v_mountedhere = NULL; vput(coveredvp); Modified: head/sys/sys/mount.h ============================================================================== --- head/sys/sys/mount.h Sun Jun 9 23:50:30 2013 (r251589) +++ head/sys/sys/mount.h Sun Jun 9 23:51:26 2013 (r251590) @@ -39,6 +39,7 @@ #include #include #include +#include #endif /* @@ -798,6 +799,17 @@ vfs_statfs_t __vfs_statfs; extern char *mountrootfsname; /* + * Event handlers + */ + +typedef void (*vfs_mounted_notify_fn)(void *, struct mount *, struct vnode *, + struct thread *); +typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *, + struct thread *); +EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); +EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn); + +/* * exported vnode operations */ From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 01:06:58 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 37D73DB8; Mon, 10 Jun 2013 01:06:58 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72]) by mx1.freebsd.org (Postfix) with ESMTP id C266F1224; Mon, 10 Jun 2013 01:06:57 +0000 (UTC) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) by mail.dawidek.net (Postfix) with ESMTPSA id BAA85F13; Mon, 10 Jun 2013 03:02:29 +0200 (CEST) Date: Mon, 10 Jun 2013 03:06:52 +0200 From: Pawel Jakub Dawidek To: Marcel Moolenaar Subject: Re: svn commit: r251590 - in head/sys: kern sys Message-ID: <20130610010652.GD2468@garage.freebsd.pl> References: <201306092351.r59NpRTZ024888@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pQhZXvAqiZgbeUkD" Content-Disposition: inline In-Reply-To: <201306092351.r59NpRTZ024888@svn.freebsd.org> X-OS: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 01:06:58 -0000 --pQhZXvAqiZgbeUkD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 09, 2013 at 11:51:27PM +0000, Marcel Moolenaar wrote: > Author: marcel > Date: Sun Jun 9 23:51:26 2013 > New Revision: 251590 > URL: http://svnweb.freebsd.org/changeset/base/251590 >=20 > Log: > Add vfs_mounted and vfs_unmounted events so that components can be info= rmed > about mount and unmount events. This is used by Juniper to implement a = more > optimal implementation of NetBSD's veriexec. Both handlers are executes after dropping the locks. How can you safely use 'newdp' in vfs_mounted and 'mp' in vfs_unmounted? > Submitted by: stevek@juniper.net > Obtained from: Juniper Networks, Inc >=20 > Modified: > head/sys/kern/vfs_mount.c > head/sys/sys/mount.h >=20 > Modified: head/sys/kern/vfs_mount.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/vfs_mount.c Sun Jun 9 23:50:30 2013 (r251589) > +++ head/sys/kern/vfs_mount.c Sun Jun 9 23:51:26 2013 (r251590) > @@ -864,6 +864,7 @@ vfs_domount_first( > VOP_UNLOCK(newdp, 0); > VOP_UNLOCK(vp, 0); > mountcheckdirs(vp, newdp); > + EVENTHANDLER_INVOKE(vfs_mounted, mp, newdp, td); > vrele(newdp); > if ((mp->mnt_flag & MNT_RDONLY) =3D=3D 0) > vfs_allocate_syncvnode(mp); > @@ -1355,6 +1356,7 @@ dounmount(mp, flags, td) > mtx_lock(&mountlist_mtx); > TAILQ_REMOVE(&mountlist, mp, mnt_list); > mtx_unlock(&mountlist_mtx); > + EVENTHANDLER_INVOKE(vfs_unmounted, mp, td); > if (coveredvp !=3D NULL) { > coveredvp->v_mountedhere =3D NULL; > vput(coveredvp); >=20 > Modified: head/sys/sys/mount.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/sys/mount.h Sun Jun 9 23:50:30 2013 (r251589) > +++ head/sys/sys/mount.h Sun Jun 9 23:51:26 2013 (r251590) > @@ -39,6 +39,7 @@ > #include > #include > #include > +#include > #endif > =20 > /* > @@ -798,6 +799,17 @@ vfs_statfs_t __vfs_statfs; > extern char *mountrootfsname; > =20 > /* > + * Event handlers > + */ > + > +typedef void (*vfs_mounted_notify_fn)(void *, struct mount *, struct vno= de *, > + struct thread *); > +typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *, > + struct thread *); > +EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); > +EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn); > + > +/* > * exported vnode operations > */ > =20 --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://mobter.com --pQhZXvAqiZgbeUkD Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iEYEARECAAYFAlG1JqwACgkQForvXbEpPzTvdACeN3YIWDvAiASUDmJJ2NvqvIw6 RVYAnR69oB9B12DqNsw++tT1+RuitQB7 =L4vi -----END PGP SIGNATURE----- --pQhZXvAqiZgbeUkD-- From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 01:48:22 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 55645B2F; Mon, 10 Jun 2013 01:48:22 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 373E21353; Mon, 10 Jun 2013 01:48:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A1mMrP062133; Mon, 10 Jun 2013 01:48:22 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A1mLVk062130; Mon, 10 Jun 2013 01:48:21 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201306100148.r5A1mLVk062130@svn.freebsd.org> From: Alan Cox Date: Mon, 10 Jun 2013 01:48:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251591 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 01:48:22 -0000 Author: alc Date: Mon Jun 10 01:48:21 2013 New Revision: 251591 URL: http://svnweb.freebsd.org/changeset/base/251591 Log: Revise the interface between vm_object_madvise() and vm_page_dontneed() so that pointless calls to pmap_is_modified() can be easily avoided when performing madvise(..., MADV_FREE). Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/vm_object.c head/sys/vm/vm_page.c head/sys/vm/vm_page.h Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Sun Jun 9 23:51:26 2013 (r251590) +++ head/sys/vm/vm_object.c Mon Jun 10 01:48:21 2013 (r251591) @@ -1175,28 +1175,8 @@ shadowlookup: } if (advise == MADV_WILLNEED) { vm_page_activate(m); - } else if (advise == MADV_DONTNEED) { - vm_page_dontneed(m); - } else if (advise == MADV_FREE) { - /* - * Mark the page clean. This will allow the page - * to be freed up by the system. However, such pages - * are often reused quickly by malloc()/free() - * so we do not do anything that would cause - * a page fault if we can help it. - * - * Specifically, we do not try to actually free - * the page now nor do we try to put it in the - * cache (which would cause a page fault on reuse). - * - * But we do make the page is freeable as we - * can without actually taking the step of unmapping - * it. - */ - pmap_clear_modify(m); - m->dirty = 0; - m->act_count = 0; - vm_page_dontneed(m); + } else { + vm_page_advise(m, advise); } vm_page_unlock(m); if (advise == MADV_FREE && tobject->type == OBJT_SWAP) Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Sun Jun 9 23:51:26 2013 (r251590) +++ head/sys/vm/vm_page.c Mon Jun 10 01:48:21 2013 (r251591) @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2238,15 +2239,15 @@ vm_page_cache(vm_page_t m) } /* - * vm_page_dontneed + * vm_page_advise * * Cache, deactivate, or do nothing as appropriate. This routine - * is typically used by madvise() MADV_DONTNEED. + * is used by madvise(). * * Generally speaking we want to move the page into the cache so * it gets reused quickly. However, this can result in a silly syndrome * due to the page recycling too quickly. Small objects will not be - * fully cached. On the otherhand, if we move the page to the inactive + * fully cached. On the other hand, if we move the page to the inactive * queue we wind up with a problem whereby very large objects * unnecessarily blow away our inactive and cache queues. * @@ -2261,13 +2262,31 @@ vm_page_cache(vm_page_t m) * The object and page must be locked. */ void -vm_page_dontneed(vm_page_t m) +vm_page_advise(vm_page_t m, int advice) { - int dnw; - int head; + int dnw, head; - vm_page_lock_assert(m, MA_OWNED); + vm_page_assert_locked(m); VM_OBJECT_ASSERT_WLOCKED(m->object); + if (advice == MADV_FREE) { + /* + * Mark the page clean. This will allow the page to be freed + * up by the system. However, such pages are often reused + * quickly by malloc() so we do not do anything that would + * cause a page fault if we can help it. + * + * Specifically, we do not try to actually free the page now + * nor do we try to put it in the cache (which would cause a + * page fault on reuse). + * + * But we do make the page is freeable as we can without + * actually taking the step of unmapping it. + */ + pmap_clear_modify(m); + m->dirty = 0; + m->act_count = 0; + } else if (advice != MADV_DONTNEED) + return; dnw = PCPU_GET(dnweight); PCPU_INC(dnweight); @@ -2294,7 +2313,7 @@ vm_page_dontneed(vm_page_t m) pmap_clear_reference(m); vm_page_aflag_clear(m, PGA_REFERENCED); - if (m->dirty == 0 && pmap_is_modified(m)) + if (advice != MADV_FREE && m->dirty == 0 && pmap_is_modified(m)) vm_page_dirty(m); if (m->dirty || (dnw & 0x0070) == 0) { Modified: head/sys/vm/vm_page.h ============================================================================== --- head/sys/vm/vm_page.h Sun Jun 9 23:51:26 2013 (r251590) +++ head/sys/vm/vm_page.h Mon Jun 10 01:48:21 2013 (r251591) @@ -370,6 +370,7 @@ void vm_page_free_zero(vm_page_t m); void vm_page_wakeup(vm_page_t m); void vm_page_activate (vm_page_t); +void vm_page_advise(vm_page_t m, int advice); vm_page_t vm_page_alloc (vm_object_t, vm_pindex_t, int); vm_page_t vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, @@ -381,7 +382,6 @@ void vm_page_cache_free(vm_object_t, vm_ void vm_page_cache_transfer(vm_object_t, vm_pindex_t, vm_object_t); int vm_page_try_to_cache (vm_page_t); int vm_page_try_to_free (vm_page_t); -void vm_page_dontneed(vm_page_t); void vm_page_deactivate (vm_page_t); void vm_page_dequeue(vm_page_t m); void vm_page_dequeue_locked(vm_page_t m); From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 03:55:59 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5C850CF; Mon, 10 Jun 2013 03:55:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id C5FB8199C; Mon, 10 Jun 2013 03:55:58 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r5A3tmWR010613; Mon, 10 Jun 2013 06:55:48 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r5A3tmWR010613 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r5A3tlFt010611; Mon, 10 Jun 2013 06:55:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 10 Jun 2013 06:55:47 +0300 From: Konstantin Belousov To: Olivier Houchard Subject: Re: svn commit: r251586 - head/sys/arm/ti Message-ID: <20130610035547.GX3047@kib.kiev.ua> References: <201306092251.r59MpCmW006162@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RF5hBp8jldNhGZp7" Content-Disposition: inline In-Reply-To: <201306092251.r59MpCmW006162@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 03:55:59 -0000 --RF5hBp8jldNhGZp7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote: > Author: cognet > Date: Sun Jun 9 22:51:11 2013 > New Revision: 251586 > URL: http://svnweb.freebsd.org/changeset/base/251586 >=20 > Log: > Increase the maximum KVM available on TI chips. Not sure why we suddenl= y need > that much, but that lets me boot with 1GB of RAM. I suspect that the cause is the combination of limited KVA and lack of any limitation for the buffer map. I noted that ARM lacks VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a day ago. In essence, the buffer map is allowed to take up to ~330MB when no upper limit from VM_BCACHE_SIZE_MAX is specified. --RF5hBp8jldNhGZp7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBAgAGBQJRtU5DAAoJEJDCuSvBvK1BFUIP/2/3Kc49fpYKN9A99RywRF2F TZJZ4N71isosToXejrd66C83VIVifSLIz3l0D/zHfaLdKjX6LlqYNA5X+FrM36p8 k5v99AADRcwDodyE3jkq2o3t6fXhojxj1zmtqXeP5c8qEhrptqaWUvYZ0KMbexUI UTcmE38U+b26zfRSdbzkhmiqxw4QANvv/SFoqFRVhXjjIIe7LIWUWe9c9UV2G+H3 Ti7z3zVLJGH5r3GuFGVx0mymSaPOlZdejvwBjgiW6+z2UN3K5Y8hOuoxiSt5sQQY bJOOSQXxDf1hHcsDFIE4b8bVbm4gyUvxUyosKIEwXpleMtLlbx4kqRU0NGHPvPJD +FGbjFWIfUOdP3jbMbTJ42EZy9E95CQOKg9+2Z/rVM0v9ZFwjChCIXV0U5d0rsy1 OSLIVJVUbm2PVq+kMPFSMdrM5Vg2GnJtvBDJApu8sI0/0UNeaBDlsUvxiBGySSHs TU5QwcfqI2V0ypqW0SdH5FVcFUkZijJukmfSAAUhybbYOKIe9baLzLBl+w/TAKlq cE/EcRY8W162JkQ8UDy+LRuE78JAlvF3yr/95A5ce6AD3nQ8DmJSk4uvf0aUFtCq IBkf8oDLxHK+49b+Ydom9HMUyH5k661YftxDe3e/Tw/xwBHohBza+7pKtgSedSsE DYPXyp4ncs6LWK/d91OZ =uOUo -----END PGP SIGNATURE----- --RF5hBp8jldNhGZp7-- From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 04:05:19 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1C4962B2; Mon, 10 Jun 2013 04:05:19 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0DDEF19DB; Mon, 10 Jun 2013 04:05:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A45INx006647; Mon, 10 Jun 2013 04:05:18 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A45IEl006646; Mon, 10 Jun 2013 04:05:18 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201306100405.r5A45IEl006646@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 10 Jun 2013 04:05:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251592 - stable/9/sys/dev/drm2/i915 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 04:05:19 -0000 Author: kib Date: Mon Jun 10 04:05:18 2013 New Revision: 251592 URL: http://svnweb.freebsd.org/changeset/base/251592 Log: MFC r251591: The vm_page lock is not needed around the call to vm_page_insert(). Modified: stable/9/sys/dev/drm2/i915/i915_gem.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/drm2/i915/i915_gem.c ============================================================================== --- stable/9/sys/dev/drm2/i915/i915_gem.c Mon Jun 10 01:48:21 2013 (r251591) +++ stable/9/sys/dev/drm2/i915/i915_gem.c Mon Jun 10 04:05:18 2013 (r251592) @@ -1426,9 +1426,7 @@ unlocked_vmobj: } m->valid = VM_PAGE_BITS_ALL; *mres = m; - vm_page_lock(m); vm_page_insert(m, vm_obj, OFF_TO_IDX(offset)); - vm_page_unlock(m); vm_page_busy(m); CTR4(KTR_DRM, "fault %p %jx %x phys %x", gem_obj, offset, prot, From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 04:09:14 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9AB6843E; Mon, 10 Jun 2013 04:09:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8C48B19F0; Mon, 10 Jun 2013 04:09:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A49EL4007405; Mon, 10 Jun 2013 04:09:14 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A49E0v007404; Mon, 10 Jun 2013 04:09:14 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201306100409.r5A49E0v007404@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 10 Jun 2013 04:09:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251593 - stable/9/sys/i386/i386 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 04:09:14 -0000 Author: kib Date: Mon Jun 10 04:09:14 2013 New Revision: 251593 URL: http://svnweb.freebsd.org/changeset/base/251593 Log: MFC r251283: MFamd64: when printing the trap information, show the %esp value. Modified: stable/9/sys/i386/i386/trap.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/i386/i386/trap.c ============================================================================== --- stable/9/sys/i386/i386/trap.c Mon Jun 10 04:05:18 2013 (r251592) +++ stable/9/sys/i386/i386/trap.c Mon Jun 10 04:09:14 2013 (r251593) @@ -766,10 +766,10 @@ trap(struct trapframe *frame) ksi.ksi_trapno = type; if (uprintf_signal) { uprintf("pid %d comm %s: signal %d err %x code %d type %d " - "addr 0x%x eip 0x%08x " + "addr 0x%x esp 0x%08x eip 0x%08x " "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, i, frame->tf_err, ucode, type, addr, - frame->tf_eip, + frame->tf_esp, frame->tf_eip, fubyte((void *)(frame->tf_eip + 0)), fubyte((void *)(frame->tf_eip + 1)), fubyte((void *)(frame->tf_eip + 2)), From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 04:12:49 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0927E5EA; Mon, 10 Jun 2013 04:12:49 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EFBEE1A12; Mon, 10 Jun 2013 04:12:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A4Cm4J009689; Mon, 10 Jun 2013 04:12:48 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A4CmOF009687; Mon, 10 Jun 2013 04:12:48 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201306100412.r5A4CmOF009687@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 10 Jun 2013 04:12:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251594 - in stable/9/sys: amd64/amd64 i386/i386 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 04:12:49 -0000 Author: kib Date: Mon Jun 10 04:12:48 2013 New Revision: 251594 URL: http://svnweb.freebsd.org/changeset/base/251594 Log: MFC r251324: Assert that interrupts are enabled in the trap handlers on x86 before calling generic code to deliver signals. Modified: stable/9/sys/amd64/amd64/trap.c stable/9/sys/i386/i386/trap.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/trap.c ============================================================================== --- stable/9/sys/amd64/amd64/trap.c Mon Jun 10 04:09:14 2013 (r251593) +++ stable/9/sys/amd64/amd64/trap.c Mon Jun 10 04:12:48 2013 (r251594) @@ -630,6 +630,7 @@ trap(struct trapframe *frame) fubyte((void *)(frame->tf_rip + 6)), fubyte((void *)(frame->tf_rip + 7))); } + KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); user: Modified: stable/9/sys/i386/i386/trap.c ============================================================================== --- stable/9/sys/i386/i386/trap.c Mon Jun 10 04:09:14 2013 (r251593) +++ stable/9/sys/i386/i386/trap.c Mon Jun 10 04:12:48 2013 (r251594) @@ -779,6 +779,7 @@ trap(struct trapframe *frame) fubyte((void *)(frame->tf_eip + 6)), fubyte((void *)(frame->tf_eip + 7))); } + KASSERT((read_eflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); #ifdef DEBUG From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 04:23:12 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8E8D17B2; Mon, 10 Jun 2013 04:23:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 812691A45; Mon, 10 Jun 2013 04:23:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A4NCiM012791; Mon, 10 Jun 2013 04:23:12 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A4NCen012789; Mon, 10 Jun 2013 04:23:12 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201306100423.r5A4NCen012789@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 10 Jun 2013 04:23:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r251595 - in stable/8/sys: amd64/amd64 i386/i386 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 04:23:12 -0000 Author: kib Date: Mon Jun 10 04:23:11 2013 New Revision: 251595 URL: http://svnweb.freebsd.org/changeset/base/251595 Log: MFC r251324: Assert that interrupts are enabled in the trap handlers on x86 before calling generic code to deliver signals. Modified: stable/8/sys/amd64/amd64/trap.c stable/8/sys/i386/i386/trap.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/ (props changed) stable/8/sys/i386/ (props changed) Modified: stable/8/sys/amd64/amd64/trap.c ============================================================================== --- stable/8/sys/amd64/amd64/trap.c Mon Jun 10 04:12:48 2013 (r251594) +++ stable/8/sys/amd64/amd64/trap.c Mon Jun 10 04:23:11 2013 (r251595) @@ -610,6 +610,7 @@ trap(struct trapframe *frame) ksi.ksi_code = ucode; ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; + KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); user: Modified: stable/8/sys/i386/i386/trap.c ============================================================================== --- stable/8/sys/i386/i386/trap.c Mon Jun 10 04:12:48 2013 (r251594) +++ stable/8/sys/i386/i386/trap.c Mon Jun 10 04:23:11 2013 (r251595) @@ -755,6 +755,7 @@ trap(struct trapframe *frame) ksi.ksi_code = ucode; ksi.ksi_addr = (void *)addr; ksi.ksi_trapno = type; + KASSERT((read_eflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); #ifdef DEBUG From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 05:37:27 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BD79CCE2; Mon, 10 Jun 2013 05:37:27 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id 857DD1BFA; Mon, 10 Jun 2013 05:37:26 +0000 (UTC) Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id B064823F848; Mon, 10 Jun 2013 01:37:21 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.8.3 onyx.glenbarber.us B064823F848 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Mon, 10 Jun 2013 01:37:19 -0400 From: Glen Barber To: Marcel Moolenaar Subject: Re: svn commit: r251590 - in head/sys: kern sys Message-ID: <20130610053719.GU13292@glenbarber.us> References: <201306092351.r59NpRTZ024888@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hSsVBZHIO2Q9XETc" Content-Disposition: inline In-Reply-To: <201306092351.r59NpRTZ024888@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 05:37:27 -0000 --hSsVBZHIO2Q9XETc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 09, 2013 at 11:51:27PM +0000, Marcel Moolenaar wrote: > Author: marcel > Date: Sun Jun 9 23:51:26 2013 > New Revision: 251590 > URL: http://svnweb.freebsd.org/changeset/base/251590 >=20 > Log: > Add vfs_mounted and vfs_unmounted events so that components can be info= rmed > about mount and unmount events. This is used by Juniper to implement a = more > optimal implementation of NetBSD's veriexec. > =20 > Submitted by: stevek@juniper.net > Obtained from: Juniper Networks, Inc >=20 > Modified: > head/sys/kern/vfs_mount.c > head/sys/sys/mount.h >=20 This breaks head/ for me. Script started on Mon Jun 10 01:32:13 2013 root@kaos:/zbuilder/buildd # svn info head Path: head Working Copy Root Path: /zbuilder/buildd/head URL: http://svn0.us-east.freebsd.org/base/head Repository Root: http://svn0.us-east.freebsd.org/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 251590 Node Kind: directory Schedule: normal Last Changed Author: marcel Last Changed Rev: 251590 Last Changed Date: 2013-06-09 19:51:26 -0400 (Sun, 09 Jun 2013) root@kaos:/zbuilder/buildd # make __MAKE_CONF=3D/dev/null SRCCONF=3D/dev/nu= ll -C head -DNO_CLEAN buildworld -------------------------------------------------------------- >>> World build started on Mon Jun 10 01:32:24 EDT 2013 -------------------------------------------------------------- -------------------------------------------------------------- >>> Rebuilding the temporary build tree -------------------------------------------------------------- rm -rf /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/include rm -f /usr/obj/zbuilder/buildd/head/usr.bin/kdump/ioctl.c rm -f /usr/obj/zbuilder/buildd/head/usr.bin/kdump/kdump_subr.c rm -f /usr/obj/zbuilder/buildd/head/usr.bin/truss/ioctl.c mkdir -p /usr/obj/zbuilder/buildd/head/tmp/lib mkdir -p /usr/obj/zbuilder/buildd/head/tmp/usr mkdir -p /usr/obj/zbuilder/buildd/head/tmp/legacy/bin mkdir -p /usr/obj/zbuilder/buildd/head/tmp/legacy/usr mtree -deU -f /zbuilder/buildd/head/etc/mtree/BSD.usr.dist -p /usr/obj/zbu= ilder/buildd/head/tmp/legacy/usr >/dev/null mtree -deU -f /zbuilder/buildd/head/etc/mtree/BSD.groff.dist -p /usr/obj/z= builder/buildd/head/tmp/legacy/usr >/dev/null mtree -deU -f /zbuilder/buildd/head/etc/mtree/BSD.usr.dist -p /usr/obj/zbu= ilder/buildd/head/tmp/usr >/dev/null mtree -deU -f /zbuilder/buildd/head/etc/mtree/BSD.include.dist -p /usr/obj= /zbuilder/buildd/head/tmp/usr/include >/dev/null ln -sf /zbuilder/buildd/head/sys /usr/obj/zbuilder/buildd/head/tmp -------------------------------------------------------------- >>> stage 1.1: legacy release compatibility shims -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/= tmp INSTALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj= /zbuilder/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp= /legacy/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj= /zbuilder/buildd/head/tmp/legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTM= P=3D/usr/obj/zbuilder/buildd/head/tmp VERSION=3D"FreeBSD 10.0-CURRENT amd6= 4 1000035" MAKEFLAGS=3D"-m /zbuilder/buildd/head/tools/build/mk -D NO_CLE= AN -m /zbuilder/buildd/head/share/mk" COMPILER_TYPE=3Dgcc /usr/obj/zbuilde= r/buildd/head/make.amd64/make -f Makefile.inc1 DESTDIR=3D BOOTSTRAPPING= =3D1000035 SSP_CFLAGS=3D -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOU= T_MAN -DNO_PIC -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS -DNO_C= TF -DEARLY_BUILD legacy =3D=3D=3D> tools/build (obj,includes,depend,all,install) set -e; cd /zbuilder/buildd/head/tools/build; /usr/obj/zbuilder/buildd/head= /make.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/ma= ke installincludes sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libe= gacy.a /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/lib -------------------------------------------------------------- >>> stage 1.2: bootstrap tools -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/= tmp INSTALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj= /zbuilder/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp= /legacy/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj= /zbuilder/buildd/head/tmp/legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTM= P=3D/usr/obj/zbuilder/buildd/head/tmp VERSION=3D"FreeBSD 10.0-CURRENT amd6= 4 1000035" MAKEFLAGS=3D"-m /zbuilder/buildd/head/tools/build/mk -D NO_CLE= AN -m /zbuilder/buildd/head/share/mk" COMPILER_TYPE=3Dgcc /usr/obj/zbuilde= r/buildd/head/make.amd64/make -f Makefile.inc1 DESTDIR=3D BOOTSTRAPPING= =3D1000035 SSP_CFLAGS=3D -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOU= T_MAN -DNO_PIC -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS -DNO_C= TF -DEARLY_BUILD bootstrap-tools =3D=3D=3D> lib/clang/libllvmsupport (obj,depend,all,install) =3D=3D=3D> lib/clang/libllvmtablegen (obj,depend,all,install) =3D=3D=3D> usr.bin/clang/tblgen (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 tblg= en /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/tblgen =3D=3D=3D> usr.bin/clang/clang-tblgen (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 clan= g-tblgen /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/clang-tblgen =3D=3D=3D> kerberos5/tools/make-roken (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 make= -roken /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/make-roken =3D=3D=3D> kerberos5/lib/libroken (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= oken.a /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/lib sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 roken= =2Eh /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/roken-common.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../= =2E./crypto/heimdal/lib/roken/base64.h /zbuilder/buildd/head/kerberos5/lib/= libroken/../../../crypto/heimdal/lib/roken/getarg.h /zbuilder/buildd/head/k= erberos5/lib/libroken/../../../crypto/heimdal/lib/roken/hex.h /zbuilder/bui= ldd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/parse_byt= es.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/parse_time.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../..= /crypto/heimdal/lib/roken/parse_units.h /zbuilder/buildd/head/kerberos5/lib= /libroken/../../../crypto/heimdal/lib/roken/resolve.h /zbuilder/buildd/head= /kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/rtbl.h /zbuilder/= buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/xdbm.h= /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/include =3D=3D=3D> kerberos5/lib/libvers (obj,depend,all,install) =3D=3D=3D> kerberos5/tools/asn1_compile (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 asn1= _compile /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/asn1_compile =3D=3D=3D> kerberos5/tools/slc (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 slc = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/slc =3D=3D=3D> usr.bin/compile_et (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 comp= ile_et /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/compile_et =3D=3D=3D> games/fortune/strfile (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 strf= ile /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games/strfile =3D=3D=3D> gnu/usr.bin/gperf (obj,depend,all,install) =3D=3D=3D> gnu/usr.bin/gperf/doc (obj) =3D=3D=3D> gnu/usr.bin/gperf/doc (depend) =3D=3D=3D> gnu/usr.bin/gperf/doc (all) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 gper= f /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/gperf =3D=3D=3D> gnu/usr.bin/gperf/doc (install) =3D=3D=3D> gnu/usr.bin/groff (obj,depend,all,install) =3D=3D=3D> gnu/usr.bin/groff/contrib (obj) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (obj) =3D=3D=3D> gnu/usr.bin/groff/doc (obj) =3D=3D=3D> gnu/usr.bin/groff/font (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devps (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (obj) =3D=3D=3D> gnu/usr.bin/groff/man (obj) =3D=3D=3D> gnu/usr.bin/groff/src (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (obj) =3D=3D=3D> gnu/usr.bin/groff/tmac (obj) =3D=3D=3D> gnu/usr.bin/groff/contrib (depend) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (depend) =3D=3D=3D> gnu/usr.bin/groff/doc (depend) =3D=3D=3D> gnu/usr.bin/groff/font (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devps (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (depend) =3D=3D=3D> gnu/usr.bin/groff/man (depend) =3D=3D=3D> gnu/usr.bin/groff/src (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (depend) =3D=3D=3D> gnu/usr.bin/groff/tmac (depend) =3D=3D=3D> gnu/usr.bin/groff/contrib (all) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (all) =3D=3D=3D> gnu/usr.bin/groff/doc (all) =3D=3D=3D> gnu/usr.bin/groff/font (all) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (all) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (all) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (all) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (all) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (all) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (all) =3D=3D=3D> gnu/usr.bin/groff/font/devps (all) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (all) =3D=3D=3D> gnu/usr.bin/groff/man (all) =3D=3D=3D> gnu/usr.bin/groff/src (all) =3D=3D=3D> gnu/usr.bin/groff/src/libs (all) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (all) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (all) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (all) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (all) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (all) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (all) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (all) =3D=3D=3D> gnu/usr.bin/groff/tmac (all) =3D=3D=3D> gnu/usr.bin/groff/contrib (install) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/co= ntrib/mm/mmroff.pl /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/mmroff sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuild= er/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/co= ntrib/mm/m.tmac /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/m.= tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuild= er/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/co= ntrib/mm/mse.tmac /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/= mse.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/con= trib/mm/mm.tmac /zbuilder/buildd/head/gnu/usr.bin/groff/contrib/mm/../../..= /../../contrib/groff/contrib/mm/mmse.tmac /zbuilder/buildd/head/gnu/usr.bin= /groff/contrib/mm/../../../../../contrib/groff/contrib/mm/mm/0.MT /zbuilder= /buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/cont= rib/mm/mm/5.MT /zbuilder/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../= =2E./../contrib/groff/contrib/mm/mm/4.MT /zbuilder/buildd/head/gnu/usr.bin/= groff/contrib/mm/../../../../../contrib/groff/contrib/mm/mm/ms.cov /zbuilde= r/buildd/head/gnu/usr.bin/groff/contrib/mm/../../../../../contrib/groff/con= trib/mm/mm/se_ms.cov /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tma= c/mm =3D=3D=3D> gnu/usr.bin/groff/doc (install) =3D=3D=3D> gnu/usr.bin/groff/font (install) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX100/../../../../../contrib/groff/f= ont/devX100/DESC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../..= /../../../contrib/groff/font/devX100/TR /zbuilder/buildd/head/gnu/usr.bin/g= roff/font/devX100/../../../../../contrib/groff/font/devX100/TI /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devX100/../../../../../contrib/groff/font/= devX100/TB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../../../..= /../contrib/groff/font/devX100/TBI /zbuilder/buildd/head/gnu/usr.bin/groff/= font/devX100/../../../../../contrib/groff/font/devX100/CR /zbuilder/buildd/= head/gnu/usr.bin/groff/font/devX100/../../../../../contrib/groff/font/devX1= 00/CI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../../../../../c= ontrib/groff/font/devX100/CB /zbuilder/buildd/head/gnu/usr.bin/groff/font/d= evX100/../../../../../contrib/groff/font/devX100/CBI /zbuilder/buildd/head/= gnu/usr.bin/groff/font/devX100/../../../../../contrib/groff/font/devX100/HR= /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../../../../../contri= b/groff/font/devX100/HI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX10= 0/../../../../../contrib/groff/font/devX100/HB /zbuilder/buildd/head/gnu/us= r.bin/groff/font/devX100/../../../../../contrib/groff/font/devX100/HBI /zbu= ilder/buildd/head/gnu/usr.bin/groff/font/devX100/../../../../../contrib/gro= ff/font/devX100/NR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../= =2E./../../../contrib/groff/font/devX100/NI /zbuilder/buildd/head/gnu/usr.b= in/groff/font/devX100/../../../../../contrib/groff/font/devX100/NB /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX100/../../../../../contrib/groff/f= ont/devX100/NBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100/../../= =2E./../../contrib/groff/font/devX100/S /usr/obj/zbuilder/buildd/head/tmp/l= egacy/usr/share/groff_font/devX100 =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../contrib/grof= f/font/devX100-12/DESC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100= -12/../../../../../contrib/groff/font/devX100-12/TR /zbuilder/buildd/head/g= nu/usr.bin/groff/font/devX100-12/../../../../../contrib/groff/font/devX100-= 12/TI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../.= =2E/contrib/groff/font/devX100-12/TB /zbuilder/buildd/head/gnu/usr.bin/grof= f/font/devX100-12/../../../../../contrib/groff/font/devX100-12/TBI /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../contrib/grof= f/font/devX100-12/CR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-1= 2/../../../../../contrib/groff/font/devX100-12/CI /zbuilder/buildd/head/gnu= /usr.bin/groff/font/devX100-12/../../../../../contrib/groff/font/devX100-12= /CB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../= contrib/groff/font/devX100-12/CBI /zbuilder/buildd/head/gnu/usr.bin/groff/f= ont/devX100-12/../../../../../contrib/groff/font/devX100-12/HR /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../contrib/groff/fo= nt/devX100-12/HI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-12/..= /../../../../contrib/groff/font/devX100-12/HB /zbuilder/buildd/head/gnu/usr= =2Ebin/groff/font/devX100-12/../../../../../contrib/groff/font/devX100-12/H= BI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../c= ontrib/groff/font/devX100-12/NR /zbuilder/buildd/head/gnu/usr.bin/groff/fon= t/devX100-12/../../../../../contrib/groff/font/devX100-12/NI /zbuilder/buil= dd/head/gnu/usr.bin/groff/font/devX100-12/../../../../../contrib/groff/font= /devX100-12/NB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX100-12/../.= =2E/../../../contrib/groff/font/devX100-12/NBI /zbuilder/buildd/head/gnu/us= r.bin/groff/font/devX100-12/../../../../../contrib/groff/font/devX100-12/S = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/devX100-12 =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/fo= nt/devX75/DESC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75/../../..= /../../contrib/groff/font/devX75/TR /zbuilder/buildd/head/gnu/usr.bin/groff= /font/devX75/../../../../../contrib/groff/font/devX75/TI /zbuilder/buildd/h= ead/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/font/devX75/= TB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75/../../../../../contr= ib/groff/font/devX75/TBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX7= 5/../../../../../contrib/groff/font/devX75/CR /zbuilder/buildd/head/gnu/usr= =2Ebin/groff/font/devX75/../../../../../contrib/groff/font/devX75/CI /zbuil= der/buildd/head/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/= font/devX75/CB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75/../../..= /../../contrib/groff/font/devX75/CBI /zbuilder/buildd/head/gnu/usr.bin/grof= f/font/devX75/../../../../../contrib/groff/font/devX75/HR /zbuilder/buildd/= head/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/font/devX75= /HI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75/../../../../../cont= rib/groff/font/devX75/HB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX7= 5/../../../../../contrib/groff/font/devX75/HBI /zbuilder/buildd/head/gnu/us= r.bin/groff/font/devX75/../../../../../contrib/groff/font/devX75/NR /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/f= ont/devX75/NI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75/../../../= =2E./../contrib/groff/font/devX75/NB /zbuilder/buildd/head/gnu/usr.bin/grof= f/font/devX75/../../../../../contrib/groff/font/devX75/NBI /zbuilder/buildd= /head/gnu/usr.bin/groff/font/devX75/../../../../../contrib/groff/font/devX7= 5/S /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/devX75 =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../../contrib/groff= /font/devX75-12/DESC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12= /../../../../../contrib/groff/font/devX75-12/TR /zbuilder/buildd/head/gnu/u= sr.bin/groff/font/devX75-12/../../../../../contrib/groff/font/devX75-12/TI = /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../../contr= ib/groff/font/devX75-12/TB /zbuilder/buildd/head/gnu/usr.bin/groff/font/dev= X75-12/../../../../../contrib/groff/font/devX75-12/TBI /zbuilder/buildd/hea= d/gnu/usr.bin/groff/font/devX75-12/../../../../../contrib/groff/font/devX75= -12/CR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../.= =2E/contrib/groff/font/devX75-12/CI /zbuilder/buildd/head/gnu/usr.bin/groff= /font/devX75-12/../../../../../contrib/groff/font/devX75-12/CB /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../../contrib/groff/fon= t/devX75-12/CBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../.= =2E/../../../contrib/groff/font/devX75-12/HR /zbuilder/buildd/head/gnu/usr.= bin/groff/font/devX75-12/../../../../../contrib/groff/font/devX75-12/HI /zb= uilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../../contrib/= groff/font/devX75-12/HB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75= -12/../../../../../contrib/groff/font/devX75-12/HBI /zbuilder/buildd/head/g= nu/usr.bin/groff/font/devX75-12/../../../../../contrib/groff/font/devX75-12= /NR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../../../c= ontrib/groff/font/devX75-12/NI /zbuilder/buildd/head/gnu/usr.bin/groff/font= /devX75-12/../../../../../contrib/groff/font/devX75-12/NB /zbuilder/buildd/= head/gnu/usr.bin/groff/font/devX75-12/../../../../../contrib/groff/font/dev= X75-12/NBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devX75-12/../../../= =2E./../contrib/groff/font/devX75-12/S /usr/obj/zbuilder/buildd/head/tmp/le= gacy/usr/share/groff_font/devX75-12 =3D=3D=3D> gnu/usr.bin/groff/font/devascii (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= S L CW DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/= devascii =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= S L CW DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/= devcp1047 =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/f= ont/devdvi/generate/CompileFonts /usr/obj/zbuilder/buildd/head/tmp/legacy/= usr/share/groff_font/devdvi/CompileFonts sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 DESC /zb= uilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/gro= ff/font/devdvi/TR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../..= /../../../contrib/groff/font/devdvi/TI /zbuilder/buildd/head/gnu/usr.bin/gr= off/font/devdvi/../../../../../contrib/groff/font/devdvi/TB /zbuilder/build= d/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devd= vi/TBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../c= ontrib/groff/font/devdvi/CW /zbuilder/buildd/head/gnu/usr.bin/groff/font/de= vdvi/../../../../../contrib/groff/font/devdvi/CWI /zbuilder/buildd/head/gnu= /usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/HR /zbu= ilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/grof= f/font/devdvi/HI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../= =2E./../../contrib/groff/font/devdvi/HB /zbuilder/buildd/head/gnu/usr.bin/g= roff/font/devdvi/../../../../../contrib/groff/font/devdvi/HBI /zbuilder/bui= ldd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/de= vdvi/TREC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../.= =2E/contrib/groff/font/devdvi/TIEC /zbuilder/buildd/head/gnu/usr.bin/groff/= font/devdvi/../../../../../contrib/groff/font/devdvi/TBEC /zbuilder/buildd/= head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi= /TBIEC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../c= ontrib/groff/font/devdvi/CWEC /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devdvi/../../../../../contrib/groff/font/devdvi/CWIEC /zbuilder/buildd/head= /gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/HRE= C /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contri= b/groff/font/devdvi/HIEC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdv= i/../../../../../contrib/groff/font/devdvi/HBEC /zbuilder/buildd/head/gnu/u= sr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/HBIEC /zb= uilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/gro= ff/font/devdvi/TRTC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../= =2E./../../../contrib/groff/font/devdvi/TITC /zbuilder/buildd/head/gnu/usr.= bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/TBTC /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/f= ont/devdvi/TBITC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../= =2E./../../contrib/groff/font/devdvi/CWTC /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devdvi/../../../../../contrib/groff/font/devdvi/CWITC /zbuilder= /buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/fon= t/devdvi/HRTC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../= =2E./../contrib/groff/font/devdvi/HITC /zbuilder/buildd/head/gnu/usr.bin/gr= off/font/devdvi/../../../../../contrib/groff/font/devdvi/HBTC /zbuilder/bui= ldd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/de= vdvi/HBITC /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../= =2E./contrib/groff/font/devdvi/MI /zbuilder/buildd/head/gnu/usr.bin/groff/f= ont/devdvi/../../../../../contrib/groff/font/devdvi/S /zbuilder/buildd/head= /gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/EX = /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/= groff/font/devdvi/SA /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/..= /../../../../contrib/groff/font/devdvi/SB /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devdvi/../../../../../contrib/groff/font/devdvi/SC /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/d= evdvi/generate/Makefile /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi= /../../../../../contrib/groff/font/devdvi/generate/msam.map /zbuilder/build= d/head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devd= vi/generate/msbm.map /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/..= /../../../../contrib/groff/font/devdvi/generate/texb.map /zbuilder/buildd/h= ead/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/= generate/texex.map /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../.= =2E/../../../contrib/groff/font/devdvi/generate/texi.map /zbuilder/buildd/h= ead/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/= generate/texmi.map /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../.= =2E/../../../contrib/groff/font/devdvi/generate/texr.map /zbuilder/buildd/h= ead/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/= generate/texsy.map /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/../.= =2E/../../../contrib/groff/font/devdvi/generate/textt.map /zbuilder/buildd/= head/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi= /generate/textex.map /zbuilder/buildd/head/gnu/usr.bin/groff/font/devdvi/..= /../../../../contrib/groff/font/devdvi/generate/ec.map /zbuilder/buildd/hea= d/gnu/usr.bin/groff/font/devdvi/../../../../../contrib/groff/font/devdvi/ge= nerate/tc.map /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font= /devdvi =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= CR CI CB CBI S DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/gro= ff_font/devhtml =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= S L CW DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/= devkoi8-r =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= S L CW DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/= devlatin1 =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 DESC /zb= uilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/gro= ff/font/devlbp/HB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../..= /../../../contrib/groff/font/devlbp/HBI /zbuilder/buildd/head/gnu/usr.bin/g= roff/font/devlbp/../../../../../contrib/groff/font/devlbp/HI /zbuilder/buil= dd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/groff/font/dev= lbp/HR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../c= ontrib/groff/font/devlbp/HNB /zbuilder/buildd/head/gnu/usr.bin/groff/font/d= evlbp/../../../../../contrib/groff/font/devlbp/HNBI /zbuilder/buildd/head/g= nu/usr.bin/groff/font/devlbp/../../../../../contrib/groff/font/devlbp/HNI /= zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/g= roff/font/devlbp/HNR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/..= /../../../../contrib/groff/font/devlbp/TB /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devlbp/../../../../../contrib/groff/font/devlbp/TBI /zbuilder/b= uildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/groff/font/= devlbp/TI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../../../../.= =2E/contrib/groff/font/devlbp/TR /zbuilder/buildd/head/gnu/usr.bin/groff/fo= nt/devlbp/../../../../../contrib/groff/font/devlbp/CR /zbuilder/buildd/head= /gnu/usr.bin/groff/font/devlbp/../../../../../contrib/groff/font/devlbp/CB = /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/= groff/font/devlbp/CI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlbp/..= /../../../../contrib/groff/font/devlbp/ER /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devlbp/../../../../../contrib/groff/font/devlbp/EB /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devlbp/../../../../../contrib/groff/font/d= evlbp/EI /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/devl= bp =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 DESC /zb= uilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/gro= ff/font/devlj4/AB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../..= /../../../contrib/groff/font/devlj4/ABI /zbuilder/buildd/head/gnu/usr.bin/g= roff/font/devlj4/../../../../../contrib/groff/font/devlj4/AI /zbuilder/buil= dd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/dev= lj4/AR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../c= ontrib/groff/font/devlj4/ALBB /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devlj4/../../../../../contrib/groff/font/devlj4/ALBR /zbuilder/buildd/head/= gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/AOB = /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/= groff/font/devlj4/AOI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/.= =2E/../../../../contrib/groff/font/devlj4/AOR /zbuilder/buildd/head/gnu/usr= =2Ebin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/CB /zbuil= der/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/= font/devlj4/CBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../.= =2E/../../contrib/groff/font/devlj4/CI /zbuilder/buildd/head/gnu/usr.bin/gr= off/font/devlj4/../../../../../contrib/groff/font/devlj4/CR /zbuilder/build= d/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devl= j4/GB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../co= ntrib/groff/font/devlj4/GBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/de= vlj4/../../../../../contrib/groff/font/devlj4/GI /zbuilder/buildd/head/gnu/= usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/GR /zbui= lder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff= /font/devlj4/LGB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../= =2E./../../contrib/groff/font/devlj4/LGI /zbuilder/buildd/head/gnu/usr.bin/= groff/font/devlj4/../../../../../contrib/groff/font/devlj4/LGR /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/d= evlj4/OB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../..= /contrib/groff/font/devlj4/OBI /zbuilder/buildd/head/gnu/usr.bin/groff/font= /devlj4/../../../../../contrib/groff/font/devlj4/OI /zbuilder/buildd/head/g= nu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/OR /z= builder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/gr= off/font/devlj4/TB /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../.= =2E/../../../contrib/groff/font/devlj4/TBI /zbuilder/buildd/head/gnu/usr.bi= n/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/TI /zbuilder/b= uildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/= devlj4/TR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../.= =2E/contrib/groff/font/devlj4/TNRB /zbuilder/buildd/head/gnu/usr.bin/groff/= font/devlj4/../../../../../contrib/groff/font/devlj4/TNRBI /zbuilder/buildd= /head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj= 4/TNRI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../c= ontrib/groff/font/devlj4/TNRR /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devlj4/../../../../../contrib/groff/font/devlj4/UB /zbuilder/buildd/head/gn= u/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/UBI /z= builder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/gr= off/font/devlj4/UI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../.= =2E/../../../contrib/groff/font/devlj4/UR /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devlj4/../../../../../contrib/groff/font/devlj4/UCB /zbuilder/b= uildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/= devlj4/UCBI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../..= /../contrib/groff/font/devlj4/UCI /zbuilder/buildd/head/gnu/usr.bin/groff/f= ont/devlj4/../../../../../contrib/groff/font/devlj4/UCR /zbuilder/buildd/he= ad/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/devlj4/C= LARENDON /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../..= /contrib/groff/font/devlj4/CORONET /zbuilder/buildd/head/gnu/usr.bin/groff/= font/devlj4/../../../../../contrib/groff/font/devlj4/MARIGOLD /zbuilder/bui= ldd/head/gnu/usr.bin/groff/font/devlj4/../../../../../contrib/groff/font/de= vlj4/S /zbuilder/buildd/head/gnu/usr.bin/groff/font/devlj4/../../../../../c= ontrib/groff/font/devlj4/SYMBOL /zbuilder/buildd/head/gnu/usr.bin/groff/fon= t/devlj4/../../../../../contrib/groff/font/devlj4/WINGDINGS /usr/obj/zbuild= er/buildd/head/tmp/legacy/usr/share/groff_font/devlj4 =3D=3D=3D> gnu/usr.bin/groff/font/devps (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/fo= nt/devps/generate/afmname /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/sha= re/groff_font/devps/afmname sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/fo= nt/devps/generate/symbol.sed /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/= share/groff_font/devps/symbol.sed sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 DESC pro= logue symbolsl.pfa zapfdr.pfa /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devps/../../../../../contrib/groff/font/devps/text.enc /zbuilder/buildd/hea= d/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/down= load /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../cont= rib/groff/font/devps/S /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/.= =2E/../../../../contrib/groff/font/devps/ZD /zbuilder/buildd/head/gnu/usr.b= in/groff/font/devps/../../../../../contrib/groff/font/devps/ZDR /zbuilder/b= uildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/d= evps/SS /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../c= ontrib/groff/font/devps/AB /zbuilder/buildd/head/gnu/usr.bin/groff/font/dev= ps/../../../../../contrib/groff/font/devps/ABI /zbuilder/buildd/head/gnu/us= r.bin/groff/font/devps/../../../../../contrib/groff/font/devps/AI /zbuilder= /buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font= /devps/AR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../..= /contrib/groff/font/devps/BMB /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devps/../../../../../contrib/groff/font/devps/BMBI /zbuilder/buildd/head/gn= u/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/BMI /zbu= ilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff= /font/devps/BMR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../..= /../../contrib/groff/font/devps/CB /zbuilder/buildd/head/gnu/usr.bin/groff/= font/devps/../../../../../contrib/groff/font/devps/CBI /zbuilder/buildd/hea= d/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/CI /= zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/gr= off/font/devps/CR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../= =2E./../../contrib/groff/font/devps/HB /zbuilder/buildd/head/gnu/usr.bin/gr= off/font/devps/../../../../../contrib/groff/font/devps/HBI /zbuilder/buildd= /head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/= HI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contri= b/groff/font/devps/HR /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/..= /../../../../contrib/groff/font/devps/HNB /zbuilder/buildd/head/gnu/usr.bin= /groff/font/devps/../../../../../contrib/groff/font/devps/HNBI /zbuilder/bu= ildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/de= vps/HNI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../c= ontrib/groff/font/devps/HNR /zbuilder/buildd/head/gnu/usr.bin/groff/font/de= vps/../../../../../contrib/groff/font/devps/NB /zbuilder/buildd/head/gnu/us= r.bin/groff/font/devps/../../../../../contrib/groff/font/devps/NBI /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/fon= t/devps/NI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../.= =2E/contrib/groff/font/devps/NR /zbuilder/buildd/head/gnu/usr.bin/groff/fon= t/devps/../../../../../contrib/groff/font/devps/PB /zbuilder/buildd/head/gn= u/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/PBI /zbu= ilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff= /font/devps/PI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../= =2E./../contrib/groff/font/devps/PR /zbuilder/buildd/head/gnu/usr.bin/groff= /font/devps/../../../../../contrib/groff/font/devps/TB /zbuilder/buildd/hea= d/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/TBI = /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/g= roff/font/devps/TI /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../..= /../../../contrib/groff/font/devps/TR /zbuilder/buildd/head/gnu/usr.bin/gro= ff/font/devps/../../../../../contrib/groff/font/devps/ZCMI /zbuilder/buildd= /head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/font/devps/= EURO /zbuilder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../cont= rib/groff/font/devps/freeeuro.pfa /zbuilder/buildd/head/gnu/usr.bin/groff/f= ont/devps/../../../../../contrib/groff/font/devps/generate/Makefile /zbuild= er/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/fo= nt/devps/generate/dingbats.map /zbuilder/buildd/head/gnu/usr.bin/groff/font= /devps/../../../../../contrib/groff/font/devps/generate/dingbats.rmap /zbui= lder/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/= font/devps/generate/lgreekmap /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devps/../../../../../contrib/groff/font/devps/generate/symbolchars /zbuilde= r/buildd/head/gnu/usr.bin/groff/font/devps/../../../../../contrib/groff/fon= t/devps/generate/symbolsl.afm /zbuilder/buildd/head/gnu/usr.bin/groff/font/= devps/../../../../../contrib/groff/font/devps/generate/textmap /usr/obj/zbu= ilder/buildd/head/tmp/legacy/usr/share/groff_font/devps =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 R I B BI= S L CW DESC /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/groff_font/= devutf8 =3D=3D=3D> gnu/usr.bin/groff/man (install) =3D=3D=3D> gnu/usr.bin/groff/src (install) =3D=3D=3D> gnu/usr.bin/groff/src/libs (install) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (install) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (install) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (install) =3D=3D=3D> gnu/usr.bin/groff/src/devices (install) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grod= vi /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grodvi =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 post= -grohtml /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/post-grohtml =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grol= bp /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grolbp =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grol= j4 /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grolj4 =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grop= s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grops =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grot= ty /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grotty =3D=3D=3D> gnu/usr.bin/groff/src/preproc (install) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 eqn = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/eqn sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 neqn /= usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/neqn =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grn = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grn =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 pre-= grohtml /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/pre-grohtml =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 pic = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/pic =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 refe= r /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/refer =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 soel= im /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/soelim =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 tbl = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/tbl =3D=3D=3D> gnu/usr.bin/groff/src/roff (install) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 grof= f /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/groff =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 grog /= usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/grog =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 nroff = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/nroff =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/gnu/usr.bin/groff/src/roff/psroff/psroff.sh /usr/obj/zbuild= er/buildd/head/tmp/legacy/usr/bin/psroff =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 trof= f /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/troff =3D=3D=3D> gnu/usr.bin/groff/src/utils (install) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 addf= tinfo /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/addftinfo =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 afmtodi= t /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/afmtodit =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 hpft= odit /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/hpftodit =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilde= r/buildd/head/gnu/usr.bin/groff/src/utils/indxbib/../../../../../../contrib= /groff/src/utils/indxbib/eign /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/= share/dict/ sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 indx= bib /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/indxbib =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 lkbi= b /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/lkbib =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 look= bib /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/lookbib =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 pfbt= ops /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/pfbtops =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 tfmt= odit /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/tfmtodit =3D=3D=3D> gnu/usr.bin/groff/tmac (install) (cd /zbuilder/buildd/head/gnu/usr.bin/groff/tmac/../../../../contrib/groff/= tmac && sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 = mandoc.tmac andoc.tmac an-old.tmac me.tmac mdoc.tmac pic.tmac a4.tmac = papersize.tmac ec.tmac safer.tmac trace.tmac ps.tmac psold.tmac pspic.= tmac psatk.tmac dvi.tmac tty.tmac tty-char.tmac latin1.tmac latin2.tmac = latin9.tmac cp1047.tmac unicode.tmac X.tmac Xps.tmac lj4.tmac lbp.tmac = html.tmac html-end.tmac devtag.tmac europs.tmac composite.tmac eqnrc = troffrc troffrc-end hyphen.us hyphenex.us /usr/obj/zbuilder/buildd/head/tm= p/legacy/usr/share/tmac) (cd /zbuilder/buildd/head/gnu/usr.bin/groff/tmac && sh /zbuilder/buildd/he= ad/tools/install.sh -o root -g wheel -m 444 koi8-r.tmac hyphen.ru /usr/obj= /zbuilder/buildd/head/tmp/legacy/usr/share/tmac) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 e.tmac-s= /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/e.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 doc.tmac= -s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/doc.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 mdoc.loc= al-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc.local sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 an.tmac-= s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/an.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 man.tmac= -s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/man.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 s.tmac-s= /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/s.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ms.tmac-= s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/ms.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 www.tmac= -s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/www.tmac sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 doc-comm= on-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/doc-common sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 doc-ditr= off-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/doc-ditr= off sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 doc-nrof= f-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/doc-nroff sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 doc-syms= -s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/doc-syms sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 fr.ISO88= 59-1-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/fr.ISO8= 859-1 sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ru.KOI8-= R-s /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/share/tmac/mdoc/ru.KOI8-R =3D=3D=3D> usr.bin/dtc (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 dtc = /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/dtc =3D=3D=3D> usr.bin/lorder (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/usr.bin/lorder/lorder.sh /usr/obj/zbuilder/buildd/head/tmp/= legacy/usr/bin/lorder =3D=3D=3D> usr.bin/makewhatis (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 make= whatis /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/makewhatis sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 555 /zbuild= er/buildd/head/usr.bin/makewhatis/makewhatis.local.sh /usr/obj/zbuilder/bu= ildd/head/tmp/legacy/usr/libexec/makewhatis.local /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/libexec/catman.local -> /usr/o= bj/zbuilder/buildd/head/tmp/legacy/usr/libexec/makewhatis.local =3D=3D=3D> usr.bin/rpcgen (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 rpcg= en /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/rpcgen =3D=3D=3D> lib/libmd (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= d.a /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/lib sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmd/md4.h /zbuilder/buildd/head/lib/libmd/md5.h /zbu= ilder/buildd/head/lib/libmd/ripemd.h /zbuilder/buildd/head/lib/libmd/sha.h = /zbuilder/buildd/head/lib/libmd/sha256.h /zbuilder/buildd/head/lib/libmd/sh= a512.h /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/include =3D=3D=3D> usr.bin/xinstall (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 xins= tall /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin/install =3D=3D=3D> usr.sbin/config (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 conf= ig /usr/obj/zbuilder/buildd/head/tmp/legacy/usr/sbin/config -------------------------------------------------------------- >>> stage 2.2: rebuilding the object tree -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARCH=3Damd64= MACHINE=3Damd64 CPUTYPE=3D GROFF_BIN_PATH=3D/usr/obj/zbuilder/buildd/hea= d/tmp/legacy/usr/bin GROFF_FONT_PATH=3D/usr/obj/zbuilder/buildd/head/tmp/l= egacy/usr/share/groff_font GROFF_TMAC_PATH=3D/usr/obj/zbuilder/buildd/head= /tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=3D/usr/obj/zbuilder/buildd/head= /tmp _LDSCRIPTROOT=3D VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" INS= TALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilde= r/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/= usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilde= r/buildd/head/tmp/legacy/bin:/usr/obj/zbuilder/buildd/head/tmp/usr/sbin:/us= r/obj/zbuilder/buildd/head/tmp/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/us= r/games:/sbin:/bin:/usr/sbin:/usr/bin CC=3D"cc " CXX=3D"c++ " CPP=3D"cpp "= AS=3D"as" AR=3D"ar" LD=3D"ld" NM=3Dnm OBJDUMP=3D RANLIB=3Dranlib STRINGS= =3D COMPILER_TYPE=3Dclang /usr/obj/zbuilder/buildd/head/make.amd64/make -f= Makefile.inc1 DESTDIR=3D/usr/obj/zbuilder/buildd/head/tmp par-obj =3D=3D=3D> share/info (obj) =3D=3D=3D> lib (obj) =3D=3D=3D> lib/csu/amd64 (obj) =3D=3D=3D> lib/libc (obj) =3D=3D=3D> lib/libbsm (obj) =3D=3D=3D> lib/libauditd (obj) =3D=3D=3D> lib/libcompiler_rt (obj) =3D=3D=3D> lib/libcrypt (obj) =3D=3D=3D> lib/libelf (obj) =3D=3D=3D> lib/libkvm (obj) =3D=3D=3D> lib/msun (obj) =3D=3D=3D> lib/libmd (obj) =3D=3D=3D> lib/ncurses (obj) =3D=3D=3D> lib/ncurses/ncurses (obj) =3D=3D=3D> lib/ncurses/form (obj) =3D=3D=3D> lib/ncurses/menu (obj) =3D=3D=3D> lib/ncurses/panel (obj) =3D=3D=3D> lib/ncurses/ncursesw (obj) =3D=3D=3D> lib/ncurses/formw (obj) =3D=3D=3D> lib/ncurses/menuw (obj) =3D=3D=3D> lib/ncurses/panelw (obj) =3D=3D=3D> lib/libnetgraph (obj) =3D=3D=3D> lib/libradius (obj) =3D=3D=3D> lib/librpcsvc (obj) =3D=3D=3D> lib/libsbuf (obj) =3D=3D=3D> lib/libtacplus (obj) =3D=3D=3D> lib/libutil (obj) =3D=3D=3D> lib/libypclnt (obj) =3D=3D=3D> lib/libcxxrt (obj) =3D=3D=3D> lib/libc++ (obj) =3D=3D=3D> lib/libcom_err (obj) =3D=3D=3D> lib/libcom_err/doc (obj) =3D=3D=3D> lib/libalias (obj) =3D=3D=3D> lib/libalias/libalias (obj) =3D=3D=3D> lib/libalias/modules (obj) =3D=3D=3D> lib/libalias/modules/cuseeme (obj) =3D=3D=3D> lib/libalias/modules/dummy (obj) =3D=3D=3D> lib/libalias/modules/ftp (obj) =3D=3D=3D> lib/libalias/modules/irc (obj) =3D=3D=3D> lib/libalias/modules/nbt (obj) =3D=3D=3D> lib/libalias/modules/pptp (obj) =3D=3D=3D> lib/libalias/modules/skinny (obj) =3D=3D=3D> lib/libalias/modules/smedia (obj) =3D=3D=3D> lib/libarchive (obj) =3D=3D=3D> lib/libbegemot (obj) =3D=3D=3D> lib/libblocksruntime (obj) =3D=3D=3D> lib/libbluetooth (obj) =3D=3D=3D> lib/libbsnmp (obj) =3D=3D=3D> lib/libbsnmp/libbsnmp (obj) =3D=3D=3D> lib/libbz2 (obj) =3D=3D=3D> lib/libcalendar (obj) =3D=3D=3D> lib/libcam (obj) =3D=3D=3D> lib/libcompat (obj) =3D=3D=3D> lib/libdevinfo (obj) =3D=3D=3D> lib/libdevstat (obj) =3D=3D=3D> lib/libdwarf (obj) =3D=3D=3D> lib/libedit (obj) =3D=3D=3D> lib/libedit/edit/readline (obj) =3D=3D=3D> lib/libexpat (obj) =3D=3D=3D> lib/libfetch (obj) =3D=3D=3D> lib/libgeom (obj) =3D=3D=3D> lib/libgpib (obj) =3D=3D=3D> lib/libgssapi (obj) =3D=3D=3D> lib/librpcsec_gss (obj) =3D=3D=3D> lib/libipsec (obj) =3D=3D=3D> lib/libipx (obj) =3D=3D=3D> lib/libjail (obj) =3D=3D=3D> lib/libkiconv (obj) =3D=3D=3D> lib/libldns (obj) =3D=3D=3D> lib/liblzma (obj) =3D=3D=3D> lib/libmagic (obj) =3D=3D=3D> lib/libmandoc (obj) =3D=3D=3D> lib/libmemstat (obj) =3D=3D=3D> lib/libmilter (obj) =3D=3D=3D> lib/libmp (obj) =3D=3D=3D> lib/libnetbsd (obj) =3D=3D=3D> lib/libngatm (obj) =3D=3D=3D> lib/libopie (obj) =3D=3D=3D> lib/libpam (obj) =3D=3D=3D> lib/libpam/modules (obj) =3D=3D=3D> lib/libpam/modules/pam_chroot (obj) =3D=3D=3D> lib/libpam/modules/pam_deny (obj) =3D=3D=3D> lib/libpam/modules/pam_echo (obj) =3D=3D=3D> lib/libpam/modules/pam_exec (obj) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (obj) =3D=3D=3D> lib/libpam/modules/pam_group (obj) =3D=3D=3D> lib/libpam/modules/pam_guest (obj) =3D=3D=3D> lib/libpam/modules/pam_krb5 (obj) =3D=3D=3D> lib/libpam/modules/pam_ksu (obj) =3D=3D=3D> lib/libpam/modules/pam_lastlog (obj) =3D=3D=3D> lib/libpam/modules/pam_login_access (obj) =3D=3D=3D> lib/libpam/modules/pam_nologin (obj) =3D=3D=3D> lib/libpam/modules/pam_opie (obj) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (obj) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (obj) =3D=3D=3D> lib/libpam/modules/pam_permit (obj) =3D=3D=3D> lib/libpam/modules/pam_radius (obj) =3D=3D=3D> lib/libpam/modules/pam_rhosts (obj) =3D=3D=3D> lib/libpam/modules/pam_rootok (obj) =3D=3D=3D> lib/libpam/modules/pam_securetty (obj) =3D=3D=3D> lib/libpam/modules/pam_self (obj) =3D=3D=3D> lib/libpam/modules/pam_ssh (obj) =3D=3D=3D> lib/libpam/modules/pam_tacplus (obj) =3D=3D=3D> lib/libpam/modules/pam_unix (obj) =3D=3D=3D> lib/libpam/libpam (obj) =3D=3D=3D> lib/libpcap (obj) =3D=3D=3D> lib/libpmc (obj) =3D=3D=3D> lib/libproc (obj) =3D=3D=3D> lib/libprocstat (obj) =3D=3D=3D> lib/libprocstat/zfs (obj) =3D=3D=3D> lib/librt (obj) =3D=3D=3D> lib/librtld_db (obj) =3D=3D=3D> lib/libsdp (obj) =3D=3D=3D> lib/libsm (obj) =3D=3D=3D> lib/libsmdb (obj) =3D=3D=3D> lib/libsmutil (obj) =3D=3D=3D> lib/libstand (obj) =3D=3D=3D> lib/libstdbuf (obj) =3D=3D=3D> lib/libstdthreads (obj) =3D=3D=3D> lib/libtelnet (obj) =3D=3D=3D> lib/libthr (obj) =3D=3D=3D> lib/libthread_db (obj) =3D=3D=3D> lib/libufs (obj) =3D=3D=3D> lib/libugidfw (obj) =3D=3D=3D> lib/libulog (obj) =3D=3D=3D> lib/libusbhid (obj) =3D=3D=3D> lib/libusb (obj) =3D=3D=3D> lib/libvgl (obj) =3D=3D=3D> lib/libvmmapi (obj) =3D=3D=3D> lib/libwrap (obj) =3D=3D=3D> lib/liby (obj) =3D=3D=3D> lib/libyaml (obj) =3D=3D=3D> lib/libz (obj) =3D=3D=3D> lib/atf (obj) =3D=3D=3D> lib/atf/libatf-c (obj) =3D=3D=3D> lib/atf/libatf-c++ (obj) =3D=3D=3D> lib/bind (obj) =3D=3D=3D> lib/bind/isc (obj) =3D=3D=3D> lib/bind/isccc (obj) =3D=3D=3D> lib/bind/dns (obj) =3D=3D=3D> lib/bind/isccfg (obj) =3D=3D=3D> lib/bind/bind9 (obj) =3D=3D=3D> lib/bind/lwres (obj) =3D=3D=3D> lib/clang (obj) =3D=3D=3D> lib/clang/libclanganalysis (obj) =3D=3D=3D> lib/clang/libclangarcmigrate (obj) =3D=3D=3D> lib/clang/libclangast (obj) =3D=3D=3D> lib/clang/libclangbasic (obj) =3D=3D=3D> lib/clang/libclangcodegen (obj) =3D=3D=3D> lib/clang/libclangdriver (obj) =3D=3D=3D> lib/clang/libclangedit (obj) =3D=3D=3D> lib/clang/libclangfrontend (obj) =3D=3D=3D> lib/clang/libclangfrontendtool (obj) =3D=3D=3D> lib/clang/libclanglex (obj) =3D=3D=3D> lib/clang/libclangparse (obj) =3D=3D=3D> lib/clang/libclangrewritecore (obj) =3D=3D=3D> lib/clang/libclangrewritefrontend (obj) =3D=3D=3D> lib/clang/libclangsema (obj) =3D=3D=3D> lib/clang/libclangserialization (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (obj) =3D=3D=3D> lib/clang/libllvmanalysis (obj) =3D=3D=3D> lib/clang/libllvmarchive (obj) =3D=3D=3D> lib/clang/libllvmasmparser (obj) =3D=3D=3D> lib/clang/libllvmasmprinter (obj) =3D=3D=3D> lib/clang/libllvmbitreader (obj) =3D=3D=3D> lib/clang/libllvmbitwriter (obj) =3D=3D=3D> lib/clang/libllvmcodegen (obj) =3D=3D=3D> lib/clang/libllvmcore (obj) =3D=3D=3D> lib/clang/libllvminstcombine (obj) =3D=3D=3D> lib/clang/libllvminstrumentation (obj) =3D=3D=3D> lib/clang/libllvmipa (obj) =3D=3D=3D> lib/clang/libllvmipo (obj) =3D=3D=3D> lib/clang/libllvmirreader (obj) =3D=3D=3D> lib/clang/libllvmlinker (obj) =3D=3D=3D> lib/clang/libllvmmc (obj) =3D=3D=3D> lib/clang/libllvmmcparser (obj) =3D=3D=3D> lib/clang/libllvmobjcarcopts (obj) =3D=3D=3D> lib/clang/libllvmobject (obj) =3D=3D=3D> lib/clang/libllvmscalaropts (obj) =3D=3D=3D> lib/clang/libllvmselectiondag (obj) =3D=3D=3D> lib/clang/libllvmsupport (obj) =3D=3D=3D> lib/clang/libllvmtablegen (obj) =3D=3D=3D> lib/clang/libllvmtarget (obj) =3D=3D=3D> lib/clang/libllvmtransformutils (obj) =3D=3D=3D> lib/clang/libllvmvectorize (obj) =3D=3D=3D> lib/clang/libllvmarmasmparser (obj) =3D=3D=3D> lib/clang/libllvmarmcodegen (obj) =3D=3D=3D> lib/clang/libllvmarmdesc (obj) =3D=3D=3D> lib/clang/libllvmarmdisassembler (obj) =3D=3D=3D> lib/clang/libllvmarminfo (obj) =3D=3D=3D> lib/clang/libllvmarminstprinter (obj) =3D=3D=3D> lib/clang/libllvmmipsasmparser (obj) =3D=3D=3D> lib/clang/libllvmmipscodegen (obj) =3D=3D=3D> lib/clang/libllvmmipsdesc (obj) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (obj) =3D=3D=3D> lib/clang/libllvmmipsinfo (obj) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (obj) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (obj) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (obj) =3D=3D=3D> lib/clang/libllvmx86asmparser (obj) =3D=3D=3D> lib/clang/libllvmx86codegen (obj) =3D=3D=3D> lib/clang/libllvmx86desc (obj) =3D=3D=3D> lib/clang/libllvmx86disassembler (obj) =3D=3D=3D> lib/clang/libllvmx86info (obj) =3D=3D=3D> lib/clang/libllvmx86instprinter (obj) =3D=3D=3D> lib/clang/libllvmx86utils (obj) =3D=3D=3D> lib/clang/include (obj) =3D=3D=3D> libexec (obj) =3D=3D=3D> libexec/atf (obj) =3D=3D=3D> libexec/atf/atf-check (obj) =3D=3D=3D> libexec/atrun (obj) =3D=3D=3D> libexec/bootpd (obj) =3D=3D=3D> libexec/bootpd/bootpgw (obj) =3D=3D=3D> libexec/bootpd/tools (obj) =3D=3D=3D> libexec/bootpd/tools/bootpef (obj) =3D=3D=3D> libexec/bootpd/tools/bootptest (obj) =3D=3D=3D> libexec/comsat (obj) =3D=3D=3D> libexec/fingerd (obj) =3D=3D=3D> libexec/ftpd (obj) =3D=3D=3D> libexec/getty (obj) =3D=3D=3D> libexec/mail.local (obj) =3D=3D=3D> libexec/mknetid (obj) =3D=3D=3D> libexec/pppoed (obj) =3D=3D=3D> libexec/rbootd (obj) =3D=3D=3D> libexec/revnetgroup (obj) =3D=3D=3D> libexec/rlogind (obj) =3D=3D=3D> libexec/rpc.rquotad (obj) =3D=3D=3D> libexec/rpc.rstatd (obj) =3D=3D=3D> libexec/rpc.rusersd (obj) =3D=3D=3D> libexec/rpc.rwalld (obj) =3D=3D=3D> libexec/rpc.sprayd (obj) =3D=3D=3D> libexec/rshd (obj) =3D=3D=3D> libexec/rtld-elf (obj) =3D=3D=3D> libexec/save-entropy (obj) =3D=3D=3D> libexec/smrsh (obj) =3D=3D=3D> libexec/talkd (obj) =3D=3D=3D> libexec/tcpd (obj) =3D=3D=3D> libexec/telnetd (obj) =3D=3D=3D> libexec/tftpd (obj) =3D=3D=3D> libexec/tftp-proxy (obj) =3D=3D=3D> libexec/ulog-helper (obj) =3D=3D=3D> libexec/ypxfr (obj) =3D=3D=3D> bin (obj) =3D=3D=3D> bin/cat (obj) =3D=3D=3D> bin/chflags (obj) =3D=3D=3D> bin/chio (obj) =3D=3D=3D> bin/chmod (obj) =3D=3D=3D> bin/cp (obj) =3D=3D=3D> bin/csh (obj) =3D=3D=3D> bin/date (obj) =3D=3D=3D> bin/dd (obj) =3D=3D=3D> bin/df (obj) =3D=3D=3D> bin/domainname (obj) =3D=3D=3D> bin/echo (obj) =3D=3D=3D> bin/ed (obj) =3D=3D=3D> bin/expr (obj) =3D=3D=3D> bin/getfacl (obj) =3D=3D=3D> bin/hostname (obj) =3D=3D=3D> bin/kenv (obj) =3D=3D=3D> bin/kill (obj) =3D=3D=3D> bin/ln (obj) =3D=3D=3D> bin/ls (obj) =3D=3D=3D> bin/mkdir (obj) =3D=3D=3D> bin/mv (obj) =3D=3D=3D> bin/pax (obj) =3D=3D=3D> bin/pkill (obj) =3D=3D=3D> bin/ps (obj) =3D=3D=3D> bin/pwait (obj) =3D=3D=3D> bin/pwd (obj) =3D=3D=3D> bin/rcp (obj) =3D=3D=3D> bin/realpath (obj) =3D=3D=3D> bin/rm (obj) =3D=3D=3D> bin/rmail (obj) =3D=3D=3D> bin/rmdir (obj) =3D=3D=3D> bin/setfacl (obj) =3D=3D=3D> bin/sh (obj) =3D=3D=3D> bin/sleep (obj) =3D=3D=3D> bin/stty (obj) =3D=3D=3D> bin/sync (obj) =3D=3D=3D> bin/test (obj) =3D=3D=3D> bin/uuidgen (obj) =3D=3D=3D> games (obj) =3D=3D=3D> games/bcd (obj) =3D=3D=3D> games/caesar (obj) =3D=3D=3D> games/factor (obj) =3D=3D=3D> games/fortune (obj) =3D=3D=3D> games/fortune/fortune (obj) =3D=3D=3D> games/fortune/strfile (obj) =3D=3D=3D> games/fortune/datfiles (obj) =3D=3D=3D> games/fortune/unstr (obj) =3D=3D=3D> games/grdc (obj) =3D=3D=3D> games/morse (obj) =3D=3D=3D> games/number (obj) =3D=3D=3D> games/pom (obj) =3D=3D=3D> games/ppt (obj) =3D=3D=3D> games/primes (obj) =3D=3D=3D> games/random (obj) =3D=3D=3D> cddl (obj) =3D=3D=3D> cddl/lib (obj) =3D=3D=3D> cddl/lib/drti (obj) =3D=3D=3D> cddl/lib/libavl (obj) =3D=3D=3D> cddl/lib/libctf (obj) =3D=3D=3D> cddl/lib/libdtrace (obj) =3D=3D=3D> cddl/lib/libnvpair (obj) =3D=3D=3D> cddl/lib/libumem (obj) =3D=3D=3D> cddl/lib/libuutil (obj) =3D=3D=3D> cddl/lib/libzfs_core (obj) =3D=3D=3D> cddl/lib/libzfs (obj) =3D=3D=3D> cddl/lib/libzpool (obj) =3D=3D=3D> cddl/sbin (obj) =3D=3D=3D> cddl/sbin/zfs (obj) =3D=3D=3D> cddl/sbin/zpool (obj) =3D=3D=3D> cddl/usr.bin (obj) =3D=3D=3D> cddl/usr.bin/ctfconvert (obj) =3D=3D=3D> cddl/usr.bin/ctfdump (obj) =3D=3D=3D> cddl/usr.bin/ctfmerge (obj) =3D=3D=3D> cddl/usr.bin/sgsmsg (obj) =3D=3D=3D> cddl/usr.bin/zinject (obj) =3D=3D=3D> cddl/usr.bin/zstreamdump (obj) =3D=3D=3D> cddl/usr.bin/ztest (obj) =3D=3D=3D> cddl/usr.sbin (obj) =3D=3D=3D> cddl/usr.sbin/dtrace (obj) =3D=3D=3D> cddl/usr.sbin/dtruss (obj) =3D=3D=3D> cddl/usr.sbin/lockstat (obj) =3D=3D=3D> cddl/usr.sbin/zdb (obj) =3D=3D=3D> cddl/usr.sbin/zhack (obj) =3D=3D=3D> gnu (obj) =3D=3D=3D> gnu/lib (obj) =3D=3D=3D> gnu/lib/csu (obj) =3D=3D=3D> gnu/lib/libgcc (obj) =3D=3D=3D> gnu/lib/libgcov (obj) =3D=3D=3D> gnu/lib/libdialog (obj) =3D=3D=3D> gnu/lib/libgomp (obj) =3D=3D=3D> gnu/lib/libregex (obj) =3D=3D=3D> gnu/lib/libregex/doc (obj) =3D=3D=3D> gnu/lib/libreadline (obj) =3D=3D=3D> gnu/lib/libreadline/history (obj) =3D=3D=3D> gnu/lib/libreadline/history/doc (obj) =3D=3D=3D> gnu/lib/libreadline/readline (obj) =3D=3D=3D> gnu/lib/libreadline/readline/doc (obj) =3D=3D=3D> gnu/lib/libssp (obj) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (obj) =3D=3D=3D> gnu/lib/libstdc++ (obj) =3D=3D=3D> gnu/lib/libsupc++ (obj) =3D=3D=3D> gnu/usr.bin (obj) =3D=3D=3D> gnu/usr.bin/binutils (obj) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (obj) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (obj) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (obj) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (obj) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (obj) =3D=3D=3D> gnu/usr.bin/binutils/ar (obj) =3D=3D=3D> gnu/usr.bin/binutils/as (obj) =3D=3D=3D> gnu/usr.bin/binutils/ld (obj) =3D=3D=3D> gnu/usr.bin/binutils/nm (obj) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (obj) =3D=3D=3D> gnu/usr.bin/binutils/objdump (obj) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (obj) =3D=3D=3D> gnu/usr.bin/binutils/readelf (obj) =3D=3D=3D> gnu/usr.bin/binutils/size (obj) =3D=3D=3D> gnu/usr.bin/binutils/strings (obj) =3D=3D=3D> gnu/usr.bin/binutils/strip (obj) =3D=3D=3D> gnu/usr.bin/binutils/doc (obj) =3D=3D=3D> gnu/usr.bin/cc (obj) =3D=3D=3D> gnu/usr.bin/cc/cc_tools (obj) =3D=3D=3D> gnu/usr.bin/cc/libiberty (obj) =3D=3D=3D> gnu/usr.bin/cc/libcpp (obj) =3D=3D=3D> gnu/usr.bin/cc/libdecnumber (obj) =3D=3D=3D> gnu/usr.bin/cc/cc_int (obj) =3D=3D=3D> gnu/usr.bin/cc/cc (obj) =3D=3D=3D> gnu/usr.bin/cc/cc1 (obj) =3D=3D=3D> gnu/usr.bin/cc/include (obj) =3D=3D=3D> gnu/usr.bin/cc/doc (obj) =3D=3D=3D> gnu/usr.bin/cc/cpp (obj) =3D=3D=3D> gnu/usr.bin/cc/cc1plus (obj) =3D=3D=3D> gnu/usr.bin/cc/c++ (obj) =3D=3D=3D> gnu/usr.bin/cc/c++filt (obj) =3D=3D=3D> gnu/usr.bin/cc/gcov (obj) =3D=3D=3D> gnu/usr.bin/cvs (obj) =3D=3D=3D> gnu/usr.bin/cvs/lib (obj) =3D=3D=3D> gnu/usr.bin/cvs/libdiff (obj) =3D=3D=3D> gnu/usr.bin/cvs/cvs (obj) =3D=3D=3D> gnu/usr.bin/cvs/contrib (obj) =3D=3D=3D> gnu/usr.bin/cvs/cvsbug (obj) =3D=3D=3D> gnu/usr.bin/cvs/doc (obj) =3D=3D=3D> gnu/usr.bin/dialog (obj) =3D=3D=3D> gnu/usr.bin/diff (obj) =3D=3D=3D> gnu/usr.bin/diff/doc (obj) =3D=3D=3D> gnu/usr.bin/diff3 (obj) =3D=3D=3D> gnu/usr.bin/gdb (obj) =3D=3D=3D> gnu/usr.bin/gdb/doc (obj) =3D=3D=3D> gnu/usr.bin/gdb/libgdb (obj) =3D=3D=3D> gnu/usr.bin/gdb/gdb (obj) =3D=3D=3D> gnu/usr.bin/gdb/gdbtui (obj) =3D=3D=3D> gnu/usr.bin/gdb/kgdb (obj) =3D=3D=3D> gnu/usr.bin/gdb/gdbserver (obj) =3D=3D=3D> gnu/usr.bin/gperf (obj) =3D=3D=3D> gnu/usr.bin/gperf/doc (obj) =3D=3D=3D> gnu/usr.bin/grep (obj) =3D=3D=3D> gnu/usr.bin/grep/doc (obj) =3D=3D=3D> gnu/usr.bin/groff (obj) =3D=3D=3D> gnu/usr.bin/groff/contrib (obj) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (obj) =3D=3D=3D> gnu/usr.bin/groff/doc (obj) =3D=3D=3D> gnu/usr.bin/groff/font (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devps (obj) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (obj) =3D=3D=3D> gnu/usr.bin/groff/man (obj) =3D=3D=3D> gnu/usr.bin/groff/src (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (obj) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (obj) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (obj) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (obj) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (obj) =3D=3D=3D> gnu/usr.bin/groff/tmac (obj) =3D=3D=3D> gnu/usr.bin/patch (obj) =3D=3D=3D> gnu/usr.bin/rcs (obj) =3D=3D=3D> gnu/usr.bin/rcs/lib (obj) =3D=3D=3D> gnu/usr.bin/rcs/ci (obj) =3D=3D=3D> gnu/usr.bin/rcs/co (obj) =3D=3D=3D> gnu/usr.bin/rcs/ident (obj) =3D=3D=3D> gnu/usr.bin/rcs/merge (obj) =3D=3D=3D> gnu/usr.bin/rcs/rcs (obj) =3D=3D=3D> gnu/usr.bin/rcs/rcsclean (obj) =3D=3D=3D> gnu/usr.bin/rcs/rcsdiff (obj) =3D=3D=3D> gnu/usr.bin/rcs/rcsmerge (obj) =3D=3D=3D> gnu/usr.bin/rcs/rlog (obj) =3D=3D=3D> gnu/usr.bin/rcs/rcsfreeze (obj) =3D=3D=3D> gnu/usr.bin/sdiff (obj) =3D=3D=3D> gnu/usr.bin/send-pr (obj) =3D=3D=3D> gnu/usr.bin/send-pr/doc (obj) =3D=3D=3D> gnu/usr.bin/texinfo (obj) =3D=3D=3D> gnu/usr.bin/texinfo/libtxi (obj) =3D=3D=3D> gnu/usr.bin/texinfo/makeinfo (obj) =3D=3D=3D> gnu/usr.bin/texinfo/info (obj) =3D=3D=3D> gnu/usr.bin/texinfo/infokey (obj) =3D=3D=3D> gnu/usr.bin/texinfo/install-info (obj) =3D=3D=3D> gnu/usr.bin/texinfo/texindex (obj) =3D=3D=3D> gnu/usr.bin/texinfo/doc (obj) =3D=3D=3D> include (obj) =3D=3D=3D> include/arpa (obj) =3D=3D=3D> include/gssapi (obj) =3D=3D=3D> include/protocols (obj) =3D=3D=3D> include/rpcsvc (obj) =3D=3D=3D> include/rpc (obj) =3D=3D=3D> include/xlocale (obj) =3D=3D=3D> kerberos5 (obj) =3D=3D=3D> kerberos5/doc (obj) =3D=3D=3D> kerberos5/lib (obj) =3D=3D=3D> kerberos5/lib/libasn1 (obj) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (obj) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (obj) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (obj) =3D=3D=3D> kerberos5/lib/libhdb (obj) =3D=3D=3D> kerberos5/lib/libheimntlm (obj) =3D=3D=3D> kerberos5/lib/libhx509 (obj) =3D=3D=3D> kerberos5/lib/libkadm5clnt (obj) =3D=3D=3D> kerberos5/lib/libkadm5srv (obj) =3D=3D=3D> kerberos5/lib/libkafs5 (obj) =3D=3D=3D> kerberos5/lib/libkrb5 (obj) =3D=3D=3D> kerberos5/lib/libroken (obj) =3D=3D=3D> kerberos5/lib/libsl (obj) =3D=3D=3D> kerberos5/lib/libvers (obj) =3D=3D=3D> kerberos5/lib/libkdc (obj) =3D=3D=3D> kerberos5/lib/libwind (obj) =3D=3D=3D> kerberos5/lib/libheimsqlite (obj) =3D=3D=3D> kerberos5/lib/libheimbase (obj) =3D=3D=3D> kerberos5/lib/libheimipcc (obj) =3D=3D=3D> kerberos5/lib/libheimipcs (obj) =3D=3D=3D> kerberos5/libexec (obj) =3D=3D=3D> kerberos5/libexec/digest-service (obj) =3D=3D=3D> kerberos5/libexec/ipropd-master (obj) =3D=3D=3D> kerberos5/libexec/ipropd-slave (obj) =3D=3D=3D> kerberos5/libexec/hprop (obj) =3D=3D=3D> kerberos5/libexec/hpropd (obj) =3D=3D=3D> kerberos5/libexec/kadmind (obj) =3D=3D=3D> kerberos5/libexec/kdc (obj) =3D=3D=3D> kerberos5/libexec/kdigest (obj) =3D=3D=3D> kerberos5/libexec/kfd (obj) =3D=3D=3D> kerberos5/libexec/kimpersonate (obj) =3D=3D=3D> kerberos5/libexec/kpasswdd (obj) =3D=3D=3D> kerberos5/libexec/kcm (obj) =3D=3D=3D> kerberos5/tools (obj) =3D=3D=3D> kerberos5/tools/make-roken (obj) =3D=3D=3D> kerberos5/tools/asn1_compile (obj) =3D=3D=3D> kerberos5/tools/slc (obj) =3D=3D=3D> kerberos5/usr.bin (obj) =3D=3D=3D> kerberos5/usr.bin/hxtool (obj) =3D=3D=3D> kerberos5/usr.bin/kadmin (obj) =3D=3D=3D> kerberos5/usr.bin/kcc (obj) =3D=3D=3D> kerberos5/usr.bin/kdestroy (obj) =3D=3D=3D> kerberos5/usr.bin/kgetcred (obj) =3D=3D=3D> kerberos5/usr.bin/kf (obj) =3D=3D=3D> kerberos5/usr.bin/kinit (obj) =3D=3D=3D> kerberos5/usr.bin/kpasswd (obj) =3D=3D=3D> kerberos5/usr.bin/krb5-config (obj) =3D=3D=3D> kerberos5/usr.bin/ksu (obj) =3D=3D=3D> kerberos5/usr.bin/string2key (obj) =3D=3D=3D> kerberos5/usr.bin/verify_krb5_conf (obj) =3D=3D=3D> kerberos5/usr.sbin (obj) =3D=3D=3D> kerberos5/usr.sbin/iprop-log (obj) =3D=3D=3D> kerberos5/usr.sbin/kstash (obj) =3D=3D=3D> kerberos5/usr.sbin/ktutil (obj) =3D=3D=3D> rescue (obj) =3D=3D=3D> rescue/librescue (obj) =3D=3D=3D> rescue/rescue (obj) cd /zbuilder/buildd/head/rescue/rescue/../../bin/cat && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/cat/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chflags && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/chflags/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chio && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/chio/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chmod && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/chmod/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/cp && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/cp/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/date && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/date/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/dd && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/dd/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/df && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/df/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/echo && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/echo/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ed && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ed/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/expr && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/expr/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/getfacl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/getfacl/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/hostname && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/hostname/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/kenv && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/kenv/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/kill && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/kill/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ln && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ln/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ls && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ls/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/mkdir && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/mkdir/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/mv && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/mv/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/pkill && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/pkill/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ps && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ps/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/pwd && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/pwd/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/realpath && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/realpath/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rm && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/rm/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rmdir && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/rmdir/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/setfacl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/setfacl/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/sh && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/sh/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/stty && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/stty/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/sync && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/sync/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/test && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/test/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rcp && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/rcp/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/csh && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/csh/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/badsect && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/badsect/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/camcontrol && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/camcontrol/ -DRESCUE CRUNC= H_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ccdconfig && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/ccdconfig/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/clri && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/clri/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/devfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/devfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dmesg && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/dmesg/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dump && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/dump/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dumpfs && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/dumpfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dumpon && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/dumpon/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/fsck/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck_ffs && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/fsck_ffs/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck_msdosfs && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/fsck_msdosfs/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsdb && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/fsdb/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsirand && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/fsirand/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/gbde && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/gbde/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/geom && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/geom/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ifconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/ifconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/init && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/init/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldconfig && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/kldconfig/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldload && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/kldload/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldstat && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/kldstat/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldunload && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/kldunload/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ldconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/ldconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/md5 && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/md5/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mdconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/mdconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mdmfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mdmfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mknod && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mknod/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mount/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_cd9660 && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_cd9660/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_msdosfs && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_msdosfs/ -DRESCUE= CRUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_nfs && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_nfs/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_nullfs && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_nullfs/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_udf && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_udf/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_unionfs && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_unionfs/ -DRESCUE= CRUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/newfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/newfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/newfs_msdos && MAKEOBJDI= RPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bui= ldd/head/make.amd64/make DIRPRFX=3Drescue/rescue/newfs_msdos/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/nos-tun && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/nos-tun/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ping && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/ping/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/reboot && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/reboot/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/restore && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/restore/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/rcorder && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/rcorder/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/route && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/route/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/routed && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/routed/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj =3D=3D=3D> rescue/rescue/routed/rtquery (obj) cd /zbuilder/buildd/head/rescue/rescue/../../sbin/routed/rtquery && MAKEOB= JDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/= buildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/rtquery/ -DRESCUE CRUN= CH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/rtsol && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/rtsol/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/savecore && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/savecore/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/spppcontrol && MAKEOBJDI= RPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bui= ldd/head/make.amd64/make DIRPRFX=3Drescue/rescue/spppcontrol/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/swapon && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/swapon/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/sysctl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/sysctl/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/tunefs && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tunefs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/umount && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/umount/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/atm/atmconfig && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/atmconfig/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ping6 && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/ping6/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ipf/ipf && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/ipf/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../cddl/sbin/zfs && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/zfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../cddl/sbin/zpool && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/zpool/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/bsdlabel && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/bsdlabel/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fdisk && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/fdisk/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dhclient && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/dhclient/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/head && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/head/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/mt && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mt/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/nc && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/nc/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/sed && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/sed/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tail && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/tail/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tee && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tee/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/gzip && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/gzip/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/bzip2 && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/bzip2/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/less && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/less/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/xz && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/xz/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tar && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tar/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/vi && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/vi/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/id && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/id/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.sbin/chroot && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/chroot/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.sbin/chown && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/chown/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj =3D=3D=3D> sbin (obj) =3D=3D=3D> sbin/adjkerntz (obj) =3D=3D=3D> sbin/atm (obj) =3D=3D=3D> sbin/atm/atmconfig (obj) =3D=3D=3D> sbin/badsect (obj) =3D=3D=3D> sbin/bsdlabel (obj) =3D=3D=3D> sbin/camcontrol (obj) =3D=3D=3D> sbin/ccdconfig (obj) =3D=3D=3D> sbin/clri (obj) =3D=3D=3D> sbin/comcontrol (obj) =3D=3D=3D> sbin/conscontrol (obj) =3D=3D=3D> sbin/ddb (obj) =3D=3D=3D> sbin/devd (obj) =3D=3D=3D> sbin/devfs (obj) =3D=3D=3D> sbin/dhclient (obj) =3D=3D=3D> sbin/dmesg (obj) =3D=3D=3D> sbin/dump (obj) =3D=3D=3D> sbin/dumpfs (obj) =3D=3D=3D> sbin/dumpon (obj) =3D=3D=3D> sbin/etherswitchcfg (obj) =3D=3D=3D> sbin/fdisk (obj) =3D=3D=3D> sbin/ffsinfo (obj) =3D=3D=3D> sbin/fsck (obj) =3D=3D=3D> sbin/fsck_ffs (obj) =3D=3D=3D> sbin/fsck_msdosfs (obj) =3D=3D=3D> sbin/fsdb (obj) =3D=3D=3D> sbin/fsirand (obj) =3D=3D=3D> sbin/gbde (obj) =3D=3D=3D> sbin/geom (obj) =3D=3D=3D> sbin/geom/core (obj) =3D=3D=3D> sbin/geom/class (obj) =3D=3D=3D> sbin/geom/class/cache (obj) =3D=3D=3D> sbin/geom/class/concat (obj) =3D=3D=3D> sbin/geom/class/eli (obj) =3D=3D=3D> sbin/geom/class/journal (obj) =3D=3D=3D> sbin/geom/class/label (obj) =3D=3D=3D> sbin/geom/class/mirror (obj) =3D=3D=3D> sbin/geom/class/mountver (obj) =3D=3D=3D> sbin/geom/class/multipath (obj) =3D=3D=3D> sbin/geom/class/nop (obj) =3D=3D=3D> sbin/geom/class/part (obj) =3D=3D=3D> sbin/geom/class/raid (obj) =3D=3D=3D> sbin/geom/class/raid3 (obj) =3D=3D=3D> sbin/geom/class/sched (obj) =3D=3D=3D> sbin/geom/class/shsec (obj) =3D=3D=3D> sbin/geom/class/stripe (obj) =3D=3D=3D> sbin/geom/class/virstor (obj) =3D=3D=3D> sbin/ggate (obj) =3D=3D=3D> sbin/ggate/ggatec (obj) =3D=3D=3D> sbin/ggate/ggated (obj) =3D=3D=3D> sbin/ggate/ggatel (obj) =3D=3D=3D> sbin/growfs (obj) =3D=3D=3D> sbin/gvinum (obj) =3D=3D=3D> sbin/hastctl (obj) =3D=3D=3D> sbin/hastd (obj) =3D=3D=3D> sbin/ifconfig (obj) =3D=3D=3D> sbin/init (obj) =3D=3D=3D> sbin/ipf (obj) =3D=3D=3D> sbin/ipf/libipf (obj) =3D=3D=3D> sbin/ipf/ipf (obj) =3D=3D=3D> sbin/ipf/ipfs (obj) =3D=3D=3D> sbin/ipf/ipfstat (obj) =3D=3D=3D> sbin/ipf/ipftest (obj) =3D=3D=3D> sbin/ipf/ipmon (obj) =3D=3D=3D> sbin/ipf/ipnat (obj) =3D=3D=3D> sbin/ipf/ippool (obj) =3D=3D=3D> sbin/ipf/ipresend (obj) =3D=3D=3D> sbin/ipfw (obj) =3D=3D=3D> sbin/iscontrol (obj) =3D=3D=3D> sbin/kldconfig (obj) =3D=3D=3D> sbin/kldload (obj) =3D=3D=3D> sbin/kldstat (obj) =3D=3D=3D> sbin/kldunload (obj) =3D=3D=3D> sbin/ldconfig (obj) =3D=3D=3D> sbin/md5 (obj) =3D=3D=3D> sbin/mdconfig (obj) =3D=3D=3D> sbin/mdmfs (obj) =3D=3D=3D> sbin/mknod (obj) =3D=3D=3D> sbin/mksnap_ffs (obj) =3D=3D=3D> sbin/mount (obj) =3D=3D=3D> sbin/mount_cd9660 (obj) =3D=3D=3D> sbin/mount_fusefs (obj) =3D=3D=3D> sbin/mount_msdosfs (obj) =3D=3D=3D> sbin/mount_nfs (obj) =3D=3D=3D> sbin/mount_nullfs (obj) =3D=3D=3D> sbin/mount_udf (obj) =3D=3D=3D> sbin/mount_unionfs (obj) =3D=3D=3D> sbin/natd (obj) =3D=3D=3D> sbin/newfs (obj) =3D=3D=3D> sbin/newfs_msdos (obj) =3D=3D=3D> sbin/nfsiod (obj) =3D=3D=3D> sbin/nos-tun (obj) =3D=3D=3D> sbin/nvmecontrol (obj) =3D=3D=3D> sbin/pfctl (obj) =3D=3D=3D> sbin/pflogd (obj) =3D=3D=3D> sbin/ping (obj) =3D=3D=3D> sbin/ping6 (obj) =3D=3D=3D> sbin/quotacheck (obj) =3D=3D=3D> sbin/rcorder (obj) =3D=3D=3D> sbin/reboot (obj) =3D=3D=3D> sbin/recoverdisk (obj) =3D=3D=3D> sbin/resolvconf (obj) =3D=3D=3D> sbin/restore (obj) =3D=3D=3D> sbin/route (obj) =3D=3D=3D> sbin/routed (obj) =3D=3D=3D> sbin/routed/rtquery (obj) =3D=3D=3D> sbin/rtsol (obj) =3D=3D=3D> sbin/savecore (obj) =3D=3D=3D> sbin/setkey (obj) =3D=3D=3D> sbin/shutdown (obj) =3D=3D=3D> sbin/spppcontrol (obj) =3D=3D=3D> sbin/swapon (obj) =3D=3D=3D> sbin/sysctl (obj) =3D=3D=3D> sbin/tunefs (obj) =3D=3D=3D> sbin/umount (obj) =3D=3D=3D> secure (obj) =3D=3D=3D> secure/lib (obj) =3D=3D=3D> secure/lib/libcrypto (obj) =3D=3D=3D> secure/lib/libcrypto/engines (obj) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (obj) =3D=3D=3D> secure/lib/libssl (obj) =3D=3D=3D> secure/lib/libssh (obj) =3D=3D=3D> secure/libexec (obj) =3D=3D=3D> secure/libexec/sftp-server (obj) =3D=3D=3D> secure/libexec/ssh-keysign (obj) =3D=3D=3D> secure/libexec/ssh-pkcs11-helper (obj) =3D=3D=3D> secure/usr.bin (obj) =3D=3D=3D> secure/usr.bin/bdes (obj) =3D=3D=3D> secure/usr.bin/openssl (obj) =3D=3D=3D> secure/usr.bin/scp (obj) =3D=3D=3D> secure/usr.bin/sftp (obj) =3D=3D=3D> secure/usr.bin/ssh (obj) =3D=3D=3D> secure/usr.bin/ssh-add (obj) =3D=3D=3D> secure/usr.bin/ssh-agent (obj) =3D=3D=3D> secure/usr.bin/ssh-keygen (obj) =3D=3D=3D> secure/usr.bin/ssh-keyscan (obj) =3D=3D=3D> secure/usr.sbin (obj) =3D=3D=3D> secure/usr.sbin/sshd (obj) =3D=3D=3D> share (obj) =3D=3D=3D> share/atf (obj) =3D=3D=3D> share/colldef (obj) =3D=3D=3D> share/dict (obj) =3D=3D=3D> share/doc (obj) =3D=3D=3D> share/doc/IPv6 (obj) =3D=3D=3D> share/doc/atf (obj) =3D=3D=3D> share/doc/bind9 (obj) =3D=3D=3D> share/doc/legal (obj) =3D=3D=3D> share/doc/legal/intel_ipw (obj) =3D=3D=3D> share/doc/legal/intel_iwi (obj) =3D=3D=3D> share/doc/legal/intel_iwn (obj) =3D=3D=3D> share/doc/legal/intel_wpi (obj) =3D=3D=3D> share/doc/llvm (obj) =3D=3D=3D> share/doc/llvm/clang (obj) =3D=3D=3D> share/doc/papers (obj) =3D=3D=3D> share/doc/papers/beyond4.3 (obj) =3D=3D=3D> share/doc/papers/bufbio (obj) =3D=3D=3D> share/doc/papers/contents (obj) =3D=3D=3D> share/doc/papers/devfs (obj) =3D=3D=3D> share/doc/papers/diskperf (obj) =3D=3D=3D> share/doc/papers/fsinterface (obj) =3D=3D=3D> share/doc/papers/hwpmc (obj) =3D=3D=3D> share/doc/papers/jail (obj) =3D=3D=3D> share/doc/papers/kernmalloc (obj) =3D=3D=3D> share/doc/papers/kerntune (obj) =3D=3D=3D> share/doc/papers/malloc (obj) =3D=3D=3D> share/doc/papers/newvm (obj) =3D=3D=3D> share/doc/papers/relengr (obj) =3D=3D=3D> share/doc/papers/sysperf (obj) =3D=3D=3D> share/doc/papers/timecounter (obj) =3D=3D=3D> share/doc/psd (obj) =3D=3D=3D> share/doc/psd/title (obj) =3D=3D=3D> share/doc/psd/contents (obj) =3D=3D=3D> share/doc/psd/01.cacm (obj) =3D=3D=3D> share/doc/psd/02.implement (obj) =3D=3D=3D> share/doc/psd/03.iosys (obj) =3D=3D=3D> share/doc/psd/04.uprog (obj) =3D=3D=3D> share/doc/psd/05.sysman (obj) =3D=3D=3D> share/doc/psd/06.Clang (obj) =3D=3D=3D> share/doc/psd/12.make (obj) =3D=3D=3D> share/doc/psd/13.rcs (obj) =3D=3D=3D> share/doc/psd/13.rcs/rcs (obj) =3D=3D=3D> share/doc/psd/13.rcs/rcs_func (obj) =3D=3D=3D> share/doc/psd/15.yacc (obj) =3D=3D=3D> share/doc/psd/16.lex (obj) =3D=3D=3D> share/doc/psd/17.m4 (obj) =3D=3D=3D> share/doc/psd/18.gprof (obj) =3D=3D=3D> share/doc/psd/20.ipctut (obj) =3D=3D=3D> share/doc/psd/21.ipc (obj) =3D=3D=3D> share/doc/psd/22.rpcgen (obj) =3D=3D=3D> share/doc/psd/23.rpc (obj) =3D=3D=3D> share/doc/psd/24.xdr (obj) =3D=3D=3D> share/doc/psd/25.xdrrfc (obj) =3D=3D=3D> share/doc/psd/26.rpcrfc (obj) =3D=3D=3D> share/doc/psd/27.nfsrpc (obj) =3D=3D=3D> share/doc/psd/28.cvs (obj) =3D=3D=3D> share/doc/smm (obj) =3D=3D=3D> share/doc/smm/title (obj) =3D=3D=3D> share/doc/smm/contents (obj) =3D=3D=3D> share/doc/smm/01.setup (obj) =3D=3D=3D> share/doc/smm/02.config (obj) =3D=3D=3D> share/doc/smm/03.fsck (obj) =3D=3D=3D> share/doc/smm/04.quotas (obj) =3D=3D=3D> share/doc/smm/05.fastfs (obj) =3D=3D=3D> share/doc/smm/06.nfs (obj) =3D=3D=3D> share/doc/smm/07.lpd (obj) =3D=3D=3D> share/doc/smm/08.sendmailop (obj) =3D=3D=3D> share/doc/smm/11.timedop (obj) =3D=3D=3D> share/doc/smm/12.timed (obj) =3D=3D=3D> share/doc/smm/18.net (obj) =3D=3D=3D> share/doc/usd (obj) =3D=3D=3D> share/doc/usd/title (obj) =3D=3D=3D> share/doc/usd/contents (obj) =3D=3D=3D> share/doc/usd/04.csh (obj) =3D=3D=3D> share/doc/usd/05.dc (obj) =3D=3D=3D> share/doc/usd/06.bc (obj) =3D=3D=3D> share/doc/usd/07.mail (obj) =3D=3D=3D> share/doc/usd/10.exref (obj) =3D=3D=3D> share/doc/usd/10.exref/exref (obj) =3D=3D=3D> share/doc/usd/10.exref/summary (obj) =3D=3D=3D> share/doc/usd/11.vitut (obj) =3D=3D=3D> share/doc/usd/12.vi (obj) =3D=3D=3D> share/doc/usd/12.vi/vi (obj) =3D=3D=3D> share/doc/usd/12.vi/viapwh (obj) =3D=3D=3D> share/doc/usd/12.vi/summary (obj) =3D=3D=3D> share/doc/usd/13.viref (obj) =3D=3D=3D> share/doc/usd/18.msdiffs (obj) =3D=3D=3D> share/doc/usd/19.memacros (obj) =3D=3D=3D> share/doc/usd/20.meref (obj) =3D=3D=3D> share/doc/usd/21.troff (obj) =3D=3D=3D> share/doc/usd/22.trofftut (obj) =3D=3D=3D> share/dtrace (obj) =3D=3D=3D> share/dtrace/toolkit (obj) =3D=3D=3D> share/examples (obj) =3D=3D=3D> share/examples/atf (obj) =3D=3D=3D> share/examples/ipfilter (obj) =3D=3D=3D> share/examples/pf (obj) =3D=3D=3D> share/man (obj) =3D=3D=3D> share/man/man1 (obj) =3D=3D=3D> share/man/man3 (obj) =3D=3D=3D> share/man/man4 (obj) =3D=3D=3D> share/man/man5 (obj) =3D=3D=3D> share/man/man6 (obj) =3D=3D=3D> share/man/man7 (obj) =3D=3D=3D> share/man/man8 (obj) =3D=3D=3D> share/man/man9 (obj) =3D=3D=3D> share/me (obj) =3D=3D=3D> share/misc (obj) =3D=3D=3D> share/mk (obj) =3D=3D=3D> share/mklocale (obj) =3D=3D=3D> share/monetdef (obj) =3D=3D=3D> share/msgdef (obj) =3D=3D=3D> share/numericdef (obj) =3D=3D=3D> share/sendmail (obj) =3D=3D=3D> share/skel (obj) =3D=3D=3D> share/snmp (obj) =3D=3D=3D> share/snmp/mibs (obj) =3D=3D=3D> share/syscons (obj) =3D=3D=3D> share/syscons/fonts (obj) =3D=3D=3D> share/syscons/keymaps (obj) =3D=3D=3D> share/syscons/scrnmaps (obj) =3D=3D=3D> share/tabset (obj) =3D=3D=3D> share/termcap (obj) =3D=3D=3D> share/timedef (obj) =3D=3D=3D> share/xml (obj) =3D=3D=3D> share/xml/atf (obj) =3D=3D=3D> share/xsl (obj) =3D=3D=3D> share/xsl/atf (obj) =3D=3D=3D> share/zoneinfo (obj) =3D=3D=3D> sys (obj) =3D=3D=3D> sys/boot (obj) =3D=3D=3D> sys/boot/efi (obj) =3D=3D=3D> sys/boot/efi/libefi (obj) =3D=3D=3D> sys/boot/zfs (obj) =3D=3D=3D> sys/boot/userboot (obj) =3D=3D=3D> sys/boot/userboot/ficl (obj) =3D=3D=3D> sys/boot/userboot/libstand (obj) =3D=3D=3D> sys/boot/userboot/test (obj) =3D=3D=3D> sys/boot/userboot/userboot (obj) =3D=3D=3D> sys/boot/ficl (obj) =3D=3D=3D> sys/boot/i386 (obj) =3D=3D=3D> sys/boot/i386/mbr (obj) =3D=3D=3D> sys/boot/i386/pmbr (obj) =3D=3D=3D> sys/boot/i386/boot0 (obj) =3D=3D=3D> sys/boot/i386/boot0sio (obj) =3D=3D=3D> sys/boot/i386/btx (obj) =3D=3D=3D> sys/boot/i386/btx/btx (obj) =3D=3D=3D> sys/boot/i386/btx/btxldr (obj) =3D=3D=3D> sys/boot/i386/btx/lib (obj) =3D=3D=3D> sys/boot/i386/boot2 (obj) =3D=3D=3D> sys/boot/i386/cdboot (obj) =3D=3D=3D> sys/boot/i386/gptboot (obj) =3D=3D=3D> sys/boot/i386/kgzldr (obj) =3D=3D=3D> sys/boot/i386/libi386 (obj) =3D=3D=3D> sys/boot/i386/libfirewire (obj) =3D=3D=3D> sys/boot/i386/loader (obj) =3D=3D=3D> sys/boot/i386/pxeldr (obj) =3D=3D=3D> sys/boot/i386/zfsboot (obj) =3D=3D=3D> sys/boot/i386/gptzfsboot (obj) =3D=3D=3D> sys/boot/i386/zfsloader (obj) =3D=3D=3D> usr.bin (obj) =3D=3D=3D> usr.bin/alias (obj) =3D=3D=3D> usr.bin/apply (obj) =3D=3D=3D> usr.bin/ar (obj) =3D=3D=3D> usr.bin/asa (obj) =3D=3D=3D> usr.bin/at (obj) =3D=3D=3D> usr.bin/atf (obj) =3D=3D=3D> usr.bin/atf/atf-config (obj) =3D=3D=3D> usr.bin/atf/atf-report (obj) =3D=3D=3D> usr.bin/atf/atf-run (obj) =3D=3D=3D> usr.bin/atf/atf-sh (obj) =3D=3D=3D> usr.bin/atf/atf-version (obj) =3D=3D=3D> usr.bin/atm (obj) =3D=3D=3D> usr.bin/atm/sscop (obj) =3D=3D=3D> usr.bin/awk (obj) =3D=3D=3D> usr.bin/banner (obj) =3D=3D=3D> usr.bin/basename (obj) =3D=3D=3D> usr.bin/bc (obj) =3D=3D=3D> usr.bin/biff (obj) =3D=3D=3D> usr.bin/bluetooth (obj) =3D=3D=3D> usr.bin/bluetooth/bthost (obj) =3D=3D=3D> usr.bin/bluetooth/btsockstat (obj) =3D=3D=3D> usr.bin/bluetooth/rfcomm_sppd (obj) =3D=3D=3D> usr.bin/bmake (obj) =3D=3D=3D> usr.bin/bmake/unit-tests (obj) =3D=3D=3D> usr.bin/brandelf (obj) =3D=3D=3D> usr.bin/bsdiff (obj) =3D=3D=3D> usr.bin/bsdiff/bsdiff (obj) =3D=3D=3D> usr.bin/bsdiff/bspatch (obj) =3D=3D=3D> usr.bin/bzip2 (obj) =3D=3D=3D> usr.bin/bzip2recover (obj) =3D=3D=3D> usr.bin/c89 (obj) =3D=3D=3D> usr.bin/c99 (obj) =3D=3D=3D> usr.bin/calendar (obj) =3D=3D=3D> usr.bin/cap_mkdb (obj) =3D=3D=3D> usr.bin/catman (obj) =3D=3D=3D> usr.bin/chat (obj) =3D=3D=3D> usr.bin/checknr (obj) =3D=3D=3D> usr.bin/chkey (obj) =3D=3D=3D> usr.bin/chpass (obj) =3D=3D=3D> usr.bin/cksum (obj) =3D=3D=3D> usr.bin/clang (obj) =3D=3D=3D> usr.bin/clang/clang (obj) =3D=3D=3D> usr.bin/clang/clang-tblgen (obj) =3D=3D=3D> usr.bin/clang/tblgen (obj) =3D=3D=3D> usr.bin/cmp (obj) =3D=3D=3D> usr.bin/col (obj) =3D=3D=3D> usr.bin/colcrt (obj) =3D=3D=3D> usr.bin/colldef (obj) =3D=3D=3D> usr.bin/colrm (obj) =3D=3D=3D> usr.bin/column (obj) =3D=3D=3D> usr.bin/comm (obj) =3D=3D=3D> usr.bin/compile_et (obj) =3D=3D=3D> usr.bin/compress (obj) =3D=3D=3D> usr.bin/cpio (obj) =3D=3D=3D> usr.bin/cpuset (obj) =3D=3D=3D> usr.bin/csplit (obj) =3D=3D=3D> usr.bin/csup (obj) =3D=3D=3D> usr.bin/ctags (obj) =3D=3D=3D> usr.bin/ctlstat (obj) =3D=3D=3D> usr.bin/cut (obj) =3D=3D=3D> usr.bin/dc (obj) =3D=3D=3D> usr.bin/dig (obj) =3D=3D=3D> usr.bin/dirname (obj) =3D=3D=3D> usr.bin/dtc (obj) =3D=3D=3D> usr.bin/du (obj) =3D=3D=3D> usr.bin/ee (obj) =3D=3D=3D> usr.bin/elf2aout (obj) =3D=3D=3D> usr.bin/elfdump (obj) =3D=3D=3D> usr.bin/enigma (obj) =3D=3D=3D> usr.bin/env (obj) =3D=3D=3D> usr.bin/expand (obj) =3D=3D=3D> usr.bin/false (obj) =3D=3D=3D> usr.bin/fetch (obj) =3D=3D=3D> usr.bin/file (obj) =3D=3D=3D> usr.bin/file2c (obj) =3D=3D=3D> usr.bin/find (obj) =3D=3D=3D> usr.bin/finger (obj) =3D=3D=3D> usr.bin/fmt (obj) =3D=3D=3D> usr.bin/fold (obj) =3D=3D=3D> usr.bin/from (obj) =3D=3D=3D> usr.bin/fstat (obj) =3D=3D=3D> usr.bin/fsync (obj) =3D=3D=3D> usr.bin/ftp (obj) =3D=3D=3D> usr.bin/gcore (obj) =3D=3D=3D> usr.bin/gencat (obj) =3D=3D=3D> usr.bin/getconf (obj) =3D=3D=3D> usr.bin/getent (obj) =3D=3D=3D> usr.bin/getopt (obj) =3D=3D=3D> usr.bin/gprof (obj) =3D=3D=3D> usr.bin/grep (obj) =3D=3D=3D> usr.bin/gzip (obj) =3D=3D=3D> usr.bin/head (obj) =3D=3D=3D> usr.bin/hexdump (obj) =3D=3D=3D> usr.bin/host (obj) =3D=3D=3D> usr.bin/id (obj) =3D=3D=3D> usr.bin/indent (obj) =3D=3D=3D> usr.bin/ipcrm (obj) =3D=3D=3D> usr.bin/ipcs (obj) =3D=3D=3D> usr.bin/join (obj) =3D=3D=3D> usr.bin/jot (obj) =3D=3D=3D> usr.bin/kdump (obj) =3D=3D=3D> usr.bin/keylogin (obj) =3D=3D=3D> usr.bin/keylogout (obj) =3D=3D=3D> usr.bin/killall (obj) =3D=3D=3D> usr.bin/ktrace (obj) =3D=3D=3D> usr.bin/ktrdump (obj) =3D=3D=3D> usr.bin/lam (obj) =3D=3D=3D> usr.bin/last (obj) =3D=3D=3D> usr.bin/lastcomm (obj) =3D=3D=3D> usr.bin/ldd (obj) =3D=3D=3D> usr.bin/leave (obj) =3D=3D=3D> usr.bin/less (obj) =3D=3D=3D> usr.bin/lessecho (obj) =3D=3D=3D> usr.bin/lesskey (obj) =3D=3D=3D> usr.bin/lex (obj) =3D=3D=3D> usr.bin/lex/lib (obj) =3D=3D=3D> usr.bin/limits (obj) =3D=3D=3D> usr.bin/locale (obj) =3D=3D=3D> usr.bin/locate (obj) =3D=3D=3D> usr.bin/locate/bigram (obj) =3D=3D=3D> usr.bin/locate/code (obj) =3D=3D=3D> usr.bin/locate/locate (obj) =3D=3D=3D> usr.bin/lock (obj) =3D=3D=3D> usr.bin/lockf (obj) =3D=3D=3D> usr.bin/logger (obj) =3D=3D=3D> usr.bin/login (obj) =3D=3D=3D> usr.bin/logins (obj) =3D=3D=3D> usr.bin/logname (obj) =3D=3D=3D> usr.bin/look (obj) =3D=3D=3D> usr.bin/lorder (obj) =3D=3D=3D> usr.bin/lsvfs (obj) =3D=3D=3D> usr.bin/lzmainfo (obj) =3D=3D=3D> usr.bin/m4 (obj) =3D=3D=3D> usr.bin/mail (obj) =3D=3D=3D> usr.bin/makewhatis (obj) =3D=3D=3D> usr.bin/man (obj) =3D=3D=3D> usr.bin/mandoc (obj) =3D=3D=3D> usr.bin/mesg (obj) =3D=3D=3D> usr.bin/minigzip (obj) =3D=3D=3D> usr.bin/ministat (obj) =3D=3D=3D> usr.bin/mkdep (obj) =3D=3D=3D> usr.bin/mkfifo (obj) =3D=3D=3D> usr.bin/mklocale (obj) =3D=3D=3D> usr.bin/mkstr (obj) =3D=3D=3D> usr.bin/mktemp (obj) =3D=3D=3D> usr.bin/mkulzma (obj) =3D=3D=3D> usr.bin/mkuzip (obj) =3D=3D=3D> usr.bin/msgs (obj) =3D=3D=3D> usr.bin/mt (obj) =3D=3D=3D> usr.bin/nc (obj) =3D=3D=3D> usr.bin/ncal (obj) =3D=3D=3D> usr.bin/netstat (obj) =3D=3D=3D> usr.bin/newgrp (obj) =3D=3D=3D> usr.bin/newkey (obj) =3D=3D=3D> usr.bin/nfsstat (obj) =3D=3D=3D> usr.bin/nice (obj) =3D=3D=3D> usr.bin/nl (obj) =3D=3D=3D> usr.bin/nohup (obj) =3D=3D=3D> usr.bin/nslookup (obj) =3D=3D=3D> usr.bin/nsupdate (obj) =3D=3D=3D> usr.bin/opieinfo (obj) =3D=3D=3D> usr.bin/opiekey (obj) =3D=3D=3D> usr.bin/opiepasswd (obj) =3D=3D=3D> usr.bin/pagesize (obj) =3D=3D=3D> usr.bin/passwd (obj) =3D=3D=3D> usr.bin/paste (obj) =3D=3D=3D> usr.bin/patch (obj) =3D=3D=3D> usr.bin/pathchk (obj) =3D=3D=3D> usr.bin/perror (obj) =3D=3D=3D> usr.bin/pr (obj) =3D=3D=3D> usr.bin/printenv (obj) =3D=3D=3D> usr.bin/printf (obj) =3D=3D=3D> usr.bin/procstat (obj) =3D=3D=3D> usr.bin/quota (obj) =3D=3D=3D> usr.bin/rctl (obj) =3D=3D=3D> usr.bin/renice (obj) =3D=3D=3D> usr.bin/rev (obj) =3D=3D=3D> usr.bin/revoke (obj) =3D=3D=3D> usr.bin/rlogin (obj) =3D=3D=3D> usr.bin/rpcgen (obj) =3D=3D=3D> usr.bin/rpcinfo (obj) =3D=3D=3D> usr.bin/rs (obj) =3D=3D=3D> usr.bin/rsh (obj) =3D=3D=3D> usr.bin/rup (obj) =3D=3D=3D> usr.bin/ruptime (obj) =3D=3D=3D> usr.bin/rusers (obj) =3D=3D=3D> usr.bin/rwall (obj) =3D=3D=3D> usr.bin/rwho (obj) =3D=3D=3D> usr.bin/script (obj) =3D=3D=3D> usr.bin/sed (obj) =3D=3D=3D> usr.bin/seq (obj) =3D=3D=3D> usr.bin/shar (obj) =3D=3D=3D> usr.bin/showmount (obj) =3D=3D=3D> usr.bin/sockstat (obj) =3D=3D=3D> usr.bin/sort (obj) =3D=3D=3D> usr.bin/split (obj) =3D=3D=3D> usr.bin/ssh-copy-id (obj) =3D=3D=3D> usr.bin/stat (obj) =3D=3D=3D> usr.bin/stdbuf (obj) =3D=3D=3D> usr.bin/su (obj) =3D=3D=3D> usr.bin/systat (obj) =3D=3D=3D> usr.bin/tabs (obj) =3D=3D=3D> usr.bin/tail (obj) =3D=3D=3D> usr.bin/talk (obj) =3D=3D=3D> usr.bin/tar (obj) =3D=3D=3D> usr.bin/tcopy (obj) =3D=3D=3D> usr.bin/tee (obj) =3D=3D=3D> usr.bin/telnet (obj) =3D=3D=3D> usr.bin/tftp (obj) =3D=3D=3D> usr.bin/time (obj) =3D=3D=3D> usr.bin/tip (obj) =3D=3D=3D> usr.bin/tip/tip (obj) =3D=3D=3D> usr.bin/top (obj) =3D=3D=3D> usr.bin/touch (obj) =3D=3D=3D> usr.bin/tput (obj) =3D=3D=3D> usr.bin/tr (obj) =3D=3D=3D> usr.bin/true (obj) =3D=3D=3D> usr.bin/truncate (obj) =3D=3D=3D> usr.bin/truss (obj) =3D=3D=3D> usr.bin/tset (obj) =3D=3D=3D> usr.bin/tsort (obj) =3D=3D=3D> usr.bin/tty (obj) =3D=3D=3D> usr.bin/ul (obj) =3D=3D=3D> usr.bin/uname (obj) =3D=3D=3D> usr.bin/unexpand (obj) =3D=3D=3D> usr.bin/unifdef (obj) =3D=3D=3D> usr.bin/uniq (obj) =3D=3D=3D> usr.bin/units (obj) =3D=3D=3D> usr.bin/unvis (obj) =3D=3D=3D> usr.bin/unzip (obj) =3D=3D=3D> usr.bin/usbhidaction (obj) =3D=3D=3D> usr.bin/usbhidctl (obj) =3D=3D=3D> usr.bin/users (obj) =3D=3D=3D> usr.bin/uudecode (obj) =3D=3D=3D> usr.bin/uuencode (obj) =3D=3D=3D> usr.bin/vacation (obj) =3D=3D=3D> usr.bin/vgrind (obj) =3D=3D=3D> usr.bin/vi (obj) =3D=3D=3D> usr.bin/vis (obj) =3D=3D=3D> usr.bin/vmstat (obj) =3D=3D=3D> usr.bin/w (obj) =3D=3D=3D> usr.bin/wall (obj) =3D=3D=3D> usr.bin/wc (obj) =3D=3D=3D> usr.bin/what (obj) =3D=3D=3D> usr.bin/whereis (obj) =3D=3D=3D> usr.bin/which (obj) =3D=3D=3D> usr.bin/who (obj) =3D=3D=3D> usr.bin/whois (obj) =3D=3D=3D> usr.bin/write (obj) =3D=3D=3D> usr.bin/xargs (obj) =3D=3D=3D> usr.bin/xinstall (obj) =3D=3D=3D> usr.bin/xlint (obj) =3D=3D=3D> usr.bin/xlint/lint1 (obj) =3D=3D=3D> usr.bin/xlint/lint2 (obj) =3D=3D=3D> usr.bin/xlint/xlint (obj) =3D=3D=3D> usr.bin/xlint/llib (obj) =3D=3D=3D> usr.bin/xstr (obj) =3D=3D=3D> usr.bin/xz (obj) =3D=3D=3D> usr.bin/xzdec (obj) =3D=3D=3D> usr.bin/yacc (obj) =3D=3D=3D> usr.bin/yes (obj) =3D=3D=3D> usr.bin/ypcat (obj) =3D=3D=3D> usr.bin/ypmatch (obj) =3D=3D=3D> usr.bin/ypwhich (obj) =3D=3D=3D> usr.sbin (obj) =3D=3D=3D> usr.sbin/IPXrouted (obj) =3D=3D=3D> usr.sbin/ac (obj) =3D=3D=3D> usr.sbin/accton (obj) =3D=3D=3D> usr.sbin/acpi (obj) =3D=3D=3D> usr.sbin/acpi/acpiconf (obj) =3D=3D=3D> usr.sbin/acpi/acpidb (obj) =3D=3D=3D> usr.sbin/acpi/acpidump (obj) =3D=3D=3D> usr.sbin/acpi/iasl (obj) =3D=3D=3D> usr.sbin/adduser (obj) =3D=3D=3D> usr.sbin/amd (obj) =3D=3D=3D> usr.sbin/amd/include (obj) =3D=3D=3D> usr.sbin/amd/libamu (obj) =3D=3D=3D> usr.sbin/amd/amd (obj) =3D=3D=3D> usr.sbin/amd/amq (obj) =3D=3D=3D> usr.sbin/amd/doc (obj) =3D=3D=3D> usr.sbin/amd/fixmount (obj) =3D=3D=3D> usr.sbin/amd/fsinfo (obj) =3D=3D=3D> usr.sbin/amd/hlfsd (obj) =3D=3D=3D> usr.sbin/amd/mk-amd-map (obj) =3D=3D=3D> usr.sbin/amd/pawd (obj) =3D=3D=3D> usr.sbin/amd/scripts (obj) =3D=3D=3D> usr.sbin/amd/wire-test (obj) =3D=3D=3D> usr.sbin/ancontrol (obj) =3D=3D=3D> usr.sbin/apm (obj) =3D=3D=3D> usr.sbin/arp (obj) =3D=3D=3D> usr.sbin/arpaname (obj) =3D=3D=3D> usr.sbin/asf (obj) =3D=3D=3D> usr.sbin/audit (obj) =3D=3D=3D> usr.sbin/auditd (obj) =3D=3D=3D> usr.sbin/auditdistd (obj) =3D=3D=3D> usr.sbin/auditreduce (obj) =3D=3D=3D> usr.sbin/authpf (obj) =3D=3D=3D> usr.sbin/bhyve (obj) =3D=3D=3D> usr.sbin/bhyvectl (obj) =3D=3D=3D> usr.sbin/bhyveload (obj) =3D=3D=3D> usr.sbin/bluetooth (obj) =3D=3D=3D> usr.sbin/bluetooth/ath3kfw (obj) =3D=3D=3D> usr.sbin/bluetooth/bcmfw (obj) =3D=3D=3D> usr.sbin/bluetooth/bt3cfw (obj) =3D=3D=3D> usr.sbin/bluetooth/bthidcontrol (obj) =3D=3D=3D> usr.sbin/bluetooth/bthidd (obj) =3D=3D=3D> usr.sbin/bluetooth/btpand (obj) =3D=3D=3D> usr.sbin/bluetooth/hccontrol (obj) =3D=3D=3D> usr.sbin/bluetooth/hcsecd (obj) =3D=3D=3D> usr.sbin/bluetooth/hcseriald (obj) =3D=3D=3D> usr.sbin/bluetooth/l2control (obj) =3D=3D=3D> usr.sbin/bluetooth/l2ping (obj) =3D=3D=3D> usr.sbin/bluetooth/rfcomm_pppd (obj) =3D=3D=3D> usr.sbin/bluetooth/sdpcontrol (obj) =3D=3D=3D> usr.sbin/bluetooth/sdpd (obj) =3D=3D=3D> usr.sbin/boot0cfg (obj) =3D=3D=3D> usr.sbin/bootparamd (obj) =3D=3D=3D> usr.sbin/bootparamd/bootparamd (obj) =3D=3D=3D> usr.sbin/bootparamd/callbootd (obj) =3D=3D=3D> usr.sbin/bsdinstall (obj) =3D=3D=3D> usr.sbin/bsdinstall/distextract (obj) =3D=3D=3D> usr.sbin/bsdinstall/distfetch (obj) =3D=3D=3D> usr.sbin/bsdinstall/partedit (obj) =3D=3D=3D> usr.sbin/bsdinstall/scripts (obj) =3D=3D=3D> usr.sbin/bsnmpd (obj) =3D=3D=3D> usr.sbin/bsnmpd/gensnmptree (obj) =3D=3D=3D> usr.sbin/bsnmpd/bsnmpd (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_atm (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_bridge (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hast (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hostres (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_mibII (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_pf (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_target (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_usm (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_vacm (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_wlan (obj) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_netgraph (obj) =3D=3D=3D> usr.sbin/bsnmpd/tools (obj) =3D=3D=3D> usr.sbin/bsnmpd/tools/libbsnmptools (obj) =3D=3D=3D> usr.sbin/bsnmpd/tools/bsnmptools (obj) =3D=3D=3D> usr.sbin/btxld (obj) =3D=3D=3D> usr.sbin/cdcontrol (obj) =3D=3D=3D> usr.sbin/chkgrp (obj) =3D=3D=3D> usr.sbin/chown (obj) =3D=3D=3D> usr.sbin/chroot (obj) =3D=3D=3D> usr.sbin/ckdist (obj) =3D=3D=3D> usr.sbin/clear_locks (obj) =3D=3D=3D> usr.sbin/config (obj) =3D=3D=3D> usr.sbin/cpucontrol (obj) =3D=3D=3D> usr.sbin/crashinfo (obj) =3D=3D=3D> usr.sbin/cron (obj) =3D=3D=3D> usr.sbin/cron/lib (obj) =3D=3D=3D> usr.sbin/cron/cron (obj) =3D=3D=3D> usr.sbin/cron/crontab (obj) =3D=3D=3D> usr.sbin/crunch (obj) =3D=3D=3D> usr.sbin/crunch/crunchgen (obj) =3D=3D=3D> usr.sbin/crunch/crunchide (obj) =3D=3D=3D> usr.sbin/ctladm (obj) =3D=3D=3D> usr.sbin/ctm (obj) =3D=3D=3D> usr.sbin/ctm/ctm (obj) =3D=3D=3D> usr.sbin/ctm/ctm_rmail (obj) =3D=3D=3D> usr.sbin/ctm/ctm_smail (obj) =3D=3D=3D> usr.sbin/ctm/ctm_dequeue (obj) =3D=3D=3D> usr.sbin/daemon (obj) =3D=3D=3D> usr.sbin/dconschat (obj) =3D=3D=3D> usr.sbin/ddns-confgen (obj) =3D=3D=3D> usr.sbin/devinfo (obj) =3D=3D=3D> usr.sbin/digictl (obj) =3D=3D=3D> usr.sbin/diskinfo (obj) =3D=3D=3D> usr.sbin/dnssec-dsfromkey (obj) =3D=3D=3D> usr.sbin/dnssec-keyfromlabel (obj) =3D=3D=3D> usr.sbin/dnssec-keygen (obj) =3D=3D=3D> usr.sbin/dnssec-revoke (obj) =3D=3D=3D> usr.sbin/dnssec-settime (obj) =3D=3D=3D> usr.sbin/dnssec-signzone (obj) =3D=3D=3D> usr.sbin/dumpcis (obj) =3D=3D=3D> usr.sbin/editmap (obj) =3D=3D=3D> usr.sbin/edquota (obj) =3D=3D=3D> usr.sbin/etcupdate (obj) =3D=3D=3D> usr.sbin/extattr (obj) =3D=3D=3D> usr.sbin/extattrctl (obj) =3D=3D=3D> usr.sbin/faithd (obj) =3D=3D=3D> usr.sbin/fdcontrol (obj) =3D=3D=3D> usr.sbin/fdformat (obj) =3D=3D=3D> usr.sbin/fdread (obj) =3D=3D=3D> usr.sbin/fdwrite (obj) =3D=3D=3D> usr.sbin/fifolog (obj) =3D=3D=3D> usr.sbin/fifolog/lib (obj) =3D=3D=3D> usr.sbin/fifolog/fifolog_create (obj) =3D=3D=3D> usr.sbin/fifolog/fifolog_writer (obj) =3D=3D=3D> usr.sbin/fifolog/fifolog_reader (obj) =3D=3D=3D> usr.sbin/flowctl (obj) =3D=3D=3D> usr.sbin/freebsd-update (obj) =3D=3D=3D> usr.sbin/ftp-proxy (obj) =3D=3D=3D> usr.sbin/ftp-proxy/libevent (obj) =3D=3D=3D> usr.sbin/ftp-proxy/ftp-proxy (obj) =3D=3D=3D> usr.sbin/fwcontrol (obj) =3D=3D=3D> usr.sbin/genrandom (obj) =3D=3D=3D> usr.sbin/getfmac (obj) =3D=3D=3D> usr.sbin/getpmac (obj) =3D=3D=3D> usr.sbin/gpioctl (obj) =3D=3D=3D> usr.sbin/gssd (obj) =3D=3D=3D> usr.sbin/gstat (obj) =3D=3D=3D> usr.sbin/i2c (obj) =3D=3D=3D> usr.sbin/ifmcstat (obj) =3D=3D=3D> usr.sbin/inetd (obj) =3D=3D=3D> usr.sbin/iostat (obj) =3D=3D=3D> usr.sbin/ip6addrctl (obj) =3D=3D=3D> usr.sbin/ipfwpcap (obj) =3D=3D=3D> usr.sbin/isc-hmac-fixup (obj) =3D=3D=3D> usr.sbin/isfctl (obj) =3D=3D=3D> usr.sbin/jail (obj) =3D=3D=3D> usr.sbin/jexec (obj) =3D=3D=3D> usr.sbin/jls (obj) =3D=3D=3D> usr.sbin/kbdcontrol (obj) =3D=3D=3D> usr.sbin/kbdmap (obj) =3D=3D=3D> usr.sbin/keyserv (obj) =3D=3D=3D> usr.sbin/kgmon (obj) =3D=3D=3D> usr.sbin/kldxref (obj) =3D=3D=3D> usr.sbin/lastlogin (obj) =3D=3D=3D> usr.sbin/lmcconfig (obj) =3D=3D=3D> usr.sbin/lpr (obj) =3D=3D=3D> usr.sbin/lpr/common_source (obj) =3D=3D=3D> usr.sbin/lpr/chkprintcap (obj) =3D=3D=3D> usr.sbin/lpr/lp (obj) =3D=3D=3D> usr.sbin/lpr/lpc (obj) =3D=3D=3D> usr.sbin/lpr/lpd (obj) =3D=3D=3D> usr.sbin/lpr/lpq (obj) =3D=3D=3D> usr.sbin/lpr/lpr (obj) =3D=3D=3D> usr.sbin/lpr/lprm (obj) =3D=3D=3D> usr.sbin/lpr/lptest (obj) =3D=3D=3D> usr.sbin/lpr/pac (obj) =3D=3D=3D> usr.sbin/lpr/filters (obj) =3D=3D=3D> usr.sbin/lpr/filters.ru (obj) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2alt (obj) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2855 (obj) =3D=3D=3D> usr.sbin/lptcontrol (obj) =3D=3D=3D> usr.sbin/mailstats (obj) =3D=3D=3D> usr.sbin/mailwrapper (obj) =3D=3D=3D> usr.sbin/makefs (obj) =3D=3D=3D> usr.sbin/makemap (obj) =3D=3D=3D> usr.sbin/manctl (obj) =3D=3D=3D> usr.sbin/memcontrol (obj) =3D=3D=3D> usr.sbin/mergemaster (obj) =3D=3D=3D> usr.sbin/mfiutil (obj) =3D=3D=3D> usr.sbin/mixer (obj) =3D=3D=3D> usr.sbin/mld6query (obj) =3D=3D=3D> usr.sbin/mlxcontrol (obj) =3D=3D=3D> usr.sbin/mountd (obj) =3D=3D=3D> usr.sbin/moused (obj) =3D=3D=3D> usr.sbin/mptable (obj) =3D=3D=3D> usr.sbin/mptutil (obj) =3D=3D=3D> usr.sbin/mtest (obj) =3D=3D=3D> usr.sbin/mtree (obj) =3D=3D=3D> usr.sbin/named (obj) =3D=3D=3D> usr.sbin/named-checkconf (obj) =3D=3D=3D> usr.sbin/named-checkzone (obj) =3D=3D=3D> usr.sbin/named-journalprint (obj) =3D=3D=3D> usr.sbin/ndiscvt (obj) =3D=3D=3D> usr.sbin/ndp (obj) =3D=3D=3D> usr.sbin/newsyslog (obj) =3D=3D=3D> usr.sbin/nfscbd (obj) =3D=3D=3D> usr.sbin/nfsd (obj) =3D=3D=3D> usr.sbin/nfsdumpstate (obj) =3D=3D=3D> usr.sbin/nfsrevoke (obj) =3D=3D=3D> usr.sbin/nfsuserd (obj) =3D=3D=3D> usr.sbin/ngctl (obj) =3D=3D=3D> usr.sbin/nghook (obj) =3D=3D=3D> usr.sbin/nmtree (obj) =3D=3D=3D> usr.sbin/nologin (obj) =3D=3D=3D> usr.sbin/nscd (obj) =3D=3D=3D> usr.sbin/nsec3hash (obj) =3D=3D=3D> usr.sbin/ntp (obj) =3D=3D=3D> usr.sbin/ntp/libopts (obj) =3D=3D=3D> usr.sbin/ntp/libntp (obj) =3D=3D=3D> usr.sbin/ntp/libparse (obj) =3D=3D=3D> usr.sbin/ntp/ntpd (obj) =3D=3D=3D> usr.sbin/ntp/ntpdc (obj) =3D=3D=3D> usr.sbin/ntp/ntpq (obj) =3D=3D=3D> usr.sbin/ntp/ntpdate (obj) =3D=3D=3D> usr.sbin/ntp/ntptime (obj) =3D=3D=3D> usr.sbin/ntp/ntp-keygen (obj) =3D=3D=3D> usr.sbin/ntp/sntp (obj) =3D=3D=3D> usr.sbin/ntp/doc (obj) =3D=3D=3D> usr.sbin/pc-sysinstall (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/backend (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-partmanager (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-query (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/conf (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/doc (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/examples (obj) =3D=3D=3D> usr.sbin/pc-sysinstall/pc-sysinstall (obj) =3D=3D=3D> usr.sbin/pciconf (obj) =3D=3D=3D> usr.sbin/periodic (obj) =3D=3D=3D> usr.sbin/pkg (obj) =3D=3D=3D> usr.sbin/pkg_install (obj) =3D=3D=3D> usr.sbin/pkg_install/lib (obj) =3D=3D=3D> usr.sbin/pkg_install/add (obj) =3D=3D=3D> usr.sbin/pkg_install/create (obj) =3D=3D=3D> usr.sbin/pkg_install/delete (obj) =3D=3D=3D> usr.sbin/pkg_install/info (obj) =3D=3D=3D> usr.sbin/pkg_install/updating (obj) =3D=3D=3D> usr.sbin/pkg_install/version (obj) =3D=3D=3D> usr.sbin/pmcannotate (obj) =3D=3D=3D> usr.sbin/pmccontrol (obj) =3D=3D=3D> usr.sbin/pmcstat (obj) =3D=3D=3D> usr.sbin/portsnap (obj) =3D=3D=3D> usr.sbin/portsnap/portsnap (obj) =3D=3D=3D> usr.sbin/portsnap/make_index (obj) =3D=3D=3D> usr.sbin/portsnap/phttpget (obj) =3D=3D=3D> usr.sbin/powerd (obj) =3D=3D=3D> usr.sbin/ppp (obj) =3D=3D=3D> usr.sbin/pppctl (obj) =3D=3D=3D> usr.sbin/praliases (obj) =3D=3D=3D> usr.sbin/praudit (obj) =3D=3D=3D> usr.sbin/procctl (obj) =3D=3D=3D> usr.sbin/pstat (obj) =3D=3D=3D> usr.sbin/pw (obj) =3D=3D=3D> usr.sbin/pwd_mkdb (obj) =3D=3D=3D> usr.sbin/quot (obj) =3D=3D=3D> usr.sbin/quotaon (obj) =3D=3D=3D> usr.sbin/rarpd (obj) =3D=3D=3D> usr.sbin/repquota (obj) =3D=3D=3D> usr.sbin/rip6query (obj) =3D=3D=3D> usr.sbin/rmt (obj) =3D=3D=3D> usr.sbin/rndc (obj) =3D=3D=3D> usr.sbin/rndc-confgen (obj) =3D=3D=3D> usr.sbin/route6d (obj) =3D=3D=3D> usr.sbin/rpc.lockd (obj) =3D=3D=3D> usr.sbin/rpc.statd (obj) =3D=3D=3D> usr.sbin/rpc.umntall (obj) =3D=3D=3D> usr.sbin/rpc.yppasswdd (obj) =3D=3D=3D> usr.sbin/rpc.ypupdated (obj) =3D=3D=3D> usr.sbin/rpc.ypxfrd (obj) =3D=3D=3D> usr.sbin/rpcbind (obj) =3D=3D=3D> usr.sbin/rrenumd (obj) =3D=3D=3D> usr.sbin/rtadvctl (obj) =3D=3D=3D> usr.sbin/rtadvd (obj) =3D=3D=3D> usr.sbin/rtprio (obj) =3D=3D=3D> usr.sbin/rtsold (obj) =3D=3D=3D> usr.sbin/rwhod (obj) =3D=3D=3D> usr.sbin/sa (obj) =3D=3D=3D> usr.sbin/sendmail (obj) =3D=3D=3D> usr.sbin/service (obj) =3D=3D=3D> usr.sbin/services_mkdb (obj) =3D=3D=3D> usr.sbin/setfib (obj) =3D=3D=3D> usr.sbin/setfmac (obj) =3D=3D=3D> usr.sbin/setpmac (obj) =3D=3D=3D> usr.sbin/sicontrol (obj) =3D=3D=3D> usr.sbin/smbmsg (obj) =3D=3D=3D> usr.sbin/snapinfo (obj) =3D=3D=3D> usr.sbin/spkrtest (obj) =3D=3D=3D> usr.sbin/spray (obj) =3D=3D=3D> usr.sbin/syslogd (obj) =3D=3D=3D> usr.sbin/tcpdchk (obj) =3D=3D=3D> usr.sbin/tcpdmatch (obj) =3D=3D=3D> usr.sbin/tcpdrop (obj) =3D=3D=3D> usr.sbin/tcpdump (obj) =3D=3D=3D> usr.sbin/tcpdump/tcpdump (obj) =3D=3D=3D> usr.sbin/timed (obj) =3D=3D=3D> usr.sbin/timed/timed (obj) =3D=3D=3D> usr.sbin/timed/timedc (obj) =3D=3D=3D> usr.sbin/traceroute (obj) =3D=3D=3D> usr.sbin/traceroute6 (obj) =3D=3D=3D> usr.sbin/trpt (obj) =3D=3D=3D> usr.sbin/tzsetup (obj) =3D=3D=3D> usr.sbin/uathload (obj) =3D=3D=3D> usr.sbin/ugidfw (obj) =3D=3D=3D> usr.sbin/uhsoctl (obj) =3D=3D=3D> usr.sbin/usbconfig (obj) =3D=3D=3D> usr.sbin/usbdump (obj) =3D=3D=3D> usr.sbin/utx (obj) =3D=3D=3D> usr.sbin/vidcontrol (obj) =3D=3D=3D> usr.sbin/vipw (obj) =3D=3D=3D> usr.sbin/wake (obj) =3D=3D=3D> usr.sbin/watch (obj) =3D=3D=3D> usr.sbin/watchdogd (obj) =3D=3D=3D> usr.sbin/wlandebug (obj) =3D=3D=3D> usr.sbin/wpa (obj) =3D=3D=3D> usr.sbin/wpa/wpa_supplicant (obj) =3D=3D=3D> usr.sbin/wpa/wpa_cli (obj) =3D=3D=3D> usr.sbin/wpa/wpa_passphrase (obj) =3D=3D=3D> usr.sbin/wpa/hostapd (obj) =3D=3D=3D> usr.sbin/wpa/hostapd_cli (obj) =3D=3D=3D> usr.sbin/wpa/ndis_events (obj) =3D=3D=3D> usr.sbin/yp_mkdb (obj) =3D=3D=3D> usr.sbin/ypbind (obj) =3D=3D=3D> usr.sbin/yppoll (obj) =3D=3D=3D> usr.sbin/yppush (obj) =3D=3D=3D> usr.sbin/ypserv (obj) =3D=3D=3D> usr.sbin/ypset (obj) =3D=3D=3D> usr.sbin/zic (obj) =3D=3D=3D> usr.sbin/zic/zic (obj) =3D=3D=3D> usr.sbin/zic/zdump (obj) =3D=3D=3D> usr.sbin/zzz (obj) =3D=3D=3D> etc (obj) =3D=3D=3D> etc/sendmail (obj) -------------------------------------------------------------- >>> stage 2.3: build tools -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj INSTALL=3D"sh /zbuil= der/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilder/buildd/head/tmp= /legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin:/usr/obj/= zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilder/buildd/head/tmp= /legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTMP=3D/usr/obj/zbuilder/bui= ldd/head/tmp VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" MAKEFLAGS=3D"= -m /zbuilder/buildd/head/tools/build/mk -D NO_CLEAN -m /zbuilder/buildd/he= ad/share/mk" COMPILER_TYPE=3Dgcc /usr/obj/zbuilder/buildd/head/make.amd64/= make -f Makefile.inc1 TARGET=3Damd64 TARGET_ARCH=3Damd64 DESTDIR=3D BOO= TSTRAPPING=3D1000035 SSP_CFLAGS=3D -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS = -DNO_CTF -DEARLY_BUILD build-tools =3D=3D=3D> bin/csh (obj,build-tools) =3D=3D=3D> bin/sh (obj,build-tools) =3D=3D=3D> rescue/rescue (obj,build-tools) cd /zbuilder/buildd/head/rescue/rescue/../../bin/cat && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/cat/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chflags && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/chflags/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chio && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/chio/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/chmod && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/chmod/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/cp && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/cp/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/date && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/date/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/dd && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/dd/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/df && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/df/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/echo && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/echo/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ed && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ed/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/expr && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/expr/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/getfacl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/getfacl/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/hostname && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/hostname/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/kenv && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/kenv/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/kill && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/kill/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ln && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ln/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ls && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ls/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/mkdir && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/mkdir/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/mv && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/mv/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/pkill && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/pkill/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/ps && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/ps/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/pwd && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/pwd/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/realpath && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/realpath/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rm && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/rm/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rmdir && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/rmdir/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/setfacl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/setfacl/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/sh && MAKEOBJDIRPREFIX=3D= /usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/m= ake.amd64/make DIRPRFX=3Drescue/rescue/sh/ -DRESCUE CRUNCH_CFLAGS=3D-DRESC= UE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/stty && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/stty/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/sync && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/sync/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/test && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/test/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/rcp && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/rcp/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/csh && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/csh/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/badsect && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/badsect/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/camcontrol && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/camcontrol/ -DRESCUE CRUNC= H_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ccdconfig && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/ccdconfig/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/clri && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/clri/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/devfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/devfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dmesg && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/dmesg/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dump && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/dump/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dumpfs && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/dumpfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dumpon && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/dumpon/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/fsck/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck_ffs && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/fsck_ffs/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsck_msdosfs && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/fsck_msdosfs/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsdb && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/fsdb/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fsirand && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/fsirand/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/gbde && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/gbde/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/geom && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/geom/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ifconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/ifconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/init && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/init/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldconfig && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/kldconfig/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldload && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/kldload/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldstat && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/kldstat/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/kldunload && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/kldunload/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ldconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/ldconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/md5 && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/md5/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mdconfig && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/mdconfig/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mdmfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mdmfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mknod && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mknod/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mount/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_cd9660 && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_cd9660/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_msdosfs && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_msdosfs/ -DRESCUE= CRUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_nfs && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_nfs/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_nullfs && MAKEOBJD= IRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bu= ildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_nullfs/ -DRESCUE C= RUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_udf && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_udf/ -DRESCUE CRUNCH_= CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/mount_unionfs && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/mount_unionfs/ -DRESCUE= CRUNCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/newfs && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/newfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/newfs_msdos && MAKEOBJDI= RPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bui= ldd/head/make.amd64/make DIRPRFX=3Drescue/rescue/newfs_msdos/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/nos-tun && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/nos-tun/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ping && MAKEOBJDIRPREFIX= =3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/hea= d/make.amd64/make DIRPRFX=3Drescue/rescue/ping/ -DRESCUE CRUNCH_CFLAGS=3D-= DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/reboot && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/reboot/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/restore && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/restore/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/rcorder && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/rcorder/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/route && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/route/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/routed && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/routed/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj =3D=3D=3D> rescue/rescue/routed/rtquery (obj) cd /zbuilder/buildd/head/rescue/rescue/../../sbin/routed/rtquery && MAKEOB= JDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/= buildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/rtquery/ -DRESCUE CRUN= CH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/rtsol && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/rtsol/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/savecore && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/savecore/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/spppcontrol && MAKEOBJDI= RPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/bui= ldd/head/make.amd64/make DIRPRFX=3Drescue/rescue/spppcontrol/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/swapon && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/swapon/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/sysctl && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/sysctl/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/tunefs && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tunefs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/umount && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/umount/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/atm/atmconfig && MAKEOBJ= DIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/b= uildd/head/make.amd64/make DIRPRFX=3Drescue/rescue/atmconfig/ -DRESCUE CRU= NCH_CFLAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ping6 && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/ping6/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/ipf/ipf && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/ipf/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../cddl/sbin/zfs && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/zfs/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../cddl/sbin/zpool && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/zpool/ -DRESCUE CRUNCH_CFL= AGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/bsdlabel && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/bsdlabel/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/fdisk && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/fdisk/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../sbin/dhclient && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/dhclient/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/head && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/head/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/mt && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/mt/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/nc && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/nc/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/sed && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/sed/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tail && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/tail/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tee && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tee/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/gzip && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/gzip/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/bzip2 && MAKEOBJDIRPR= EFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd= /head/make.amd64/make DIRPRFX=3Drescue/rescue/bzip2/ -DRESCUE CRUNCH_CFLAG= S=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/less && MAKEOBJDIRPRE= FIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/= head/make.amd64/make DIRPRFX=3Drescue/rescue/less/ -DRESCUE CRUNCH_CFLAGS= =3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/xz && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/xz/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/tar && MAKEOBJDIRPREF= IX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/h= ead/make.amd64/make DIRPRFX=3Drescue/rescue/tar/ -DRESCUE CRUNCH_CFLAGS=3D= -DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/vi && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/vi/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.bin/id && MAKEOBJDIRPREFI= X=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/he= ad/make.amd64/make DIRPRFX=3Drescue/rescue/id/ -DRESCUE CRUNCH_CFLAGS=3D-D= RESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.sbin/chroot && MAKEOBJDIR= PREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buil= dd/head/make.amd64/make DIRPRFX=3Drescue/rescue/chroot/ -DRESCUE CRUNCH_CF= LAGS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../usr.sbin/chown && MAKEOBJDIRP= REFIX=3D/usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/build= d/head/make.amd64/make DIRPRFX=3Drescue/rescue/chown/ -DRESCUE CRUNCH_CFLA= GS=3D-DRESCUE obj cd /zbuilder/buildd/head/rescue/rescue/../../bin/sh; MAKEOBJDIRPREFIX=3D/u= sr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/mak= e.amd64/make obj; MAKEOBJDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue/= rescue /usr/obj/zbuilder/buildd/head/make.amd64/make build-tools cd /zbuilder/buildd/head/rescue/rescue/../../bin/csh; MAKEOBJDIRPREFIX=3D/= usr/obj/zbuilder/buildd/head/rescue/rescue /usr/obj/zbuilder/buildd/head/ma= ke.amd64/make obj; MAKEOBJDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/rescue= /rescue /usr/obj/zbuilder/buildd/head/make.amd64/make build-tools =3D=3D=3D> lib/ncurses/ncurses (obj,build-tools) =3D=3D=3D> lib/ncurses/ncursesw (obj,build-tools) =3D=3D=3D> share/syscons/scrnmaps (obj,build-tools) =3D=3D=3D> usr.bin/awk (obj,build-tools) =3D=3D=3D> lib/libmagic (obj,build-tools) =3D=3D=3D> usr.bin/mkesdb_static (obj,build-tools) =3D=3D=3D> usr.bin/mkcsmapper_static (obj,build-tools) =3D=3D=3D> gnu/usr.bin/cc/cc_tools (obj,depend,all) -------------------------------------------------------------- >>> stage 3: cross tools -------------------------------------------------------------- cd /zbuilder/buildd/head; TOOLS_PREFIX=3D/usr/obj/zbuilder/buildd/head/tmp = MAKEOBJDIRPREFIX=3D/usr/obj/zbuilder/buildd/head/tmp INSTALL=3D"sh /zbuild= er/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilder/buildd/head/tmp/= legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/bin:/usr/obj/z= builder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilder/buildd/head/tmp/= legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTMP=3D/usr/obj/zbuilder/buil= dd/head/tmp VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" MAKEFLAGS=3D"-= m /zbuilder/buildd/head/tools/build/mk -D NO_CLEAN -m /zbuilder/buildd/hea= d/share/mk" COMPILER_TYPE=3Dgcc /usr/obj/zbuilder/buildd/head/make.amd64/m= ake -f Makefile.inc1 DESTDIR=3D BOOTSTRAPPING=3D1000035 SSP_CFLAGS=3D = -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN -DNO_PIC -DNO_PROFIL= E -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD TARGET=3D= amd64 TARGET_ARCH=3Damd64 -DWITHOUT_GDB cross-tools =3D=3D=3D> lib/clang (obj,depend,all,install) =3D=3D=3D> lib/clang/libclanganalysis (obj) =3D=3D=3D> lib/clang/libclangast (obj) =3D=3D=3D> lib/clang/libclangbasic (obj) =3D=3D=3D> lib/clang/libclangcodegen (obj) =3D=3D=3D> lib/clang/libclangdriver (obj) =3D=3D=3D> lib/clang/libclangedit (obj) =3D=3D=3D> lib/clang/libclangfrontend (obj) =3D=3D=3D> lib/clang/libclangfrontendtool (obj) =3D=3D=3D> lib/clang/libclanglex (obj) =3D=3D=3D> lib/clang/libclangparse (obj) =3D=3D=3D> lib/clang/libclangsema (obj) =3D=3D=3D> lib/clang/libclangserialization (obj) =3D=3D=3D> lib/clang/libllvmanalysis (obj) =3D=3D=3D> lib/clang/libllvmarchive (obj) =3D=3D=3D> lib/clang/libllvmasmparser (obj) =3D=3D=3D> lib/clang/libllvmasmprinter (obj) =3D=3D=3D> lib/clang/libllvmbitreader (obj) =3D=3D=3D> lib/clang/libllvmbitwriter (obj) =3D=3D=3D> lib/clang/libllvmcodegen (obj) =3D=3D=3D> lib/clang/libllvmcore (obj) =3D=3D=3D> lib/clang/libllvminstcombine (obj) =3D=3D=3D> lib/clang/libllvminstrumentation (obj) =3D=3D=3D> lib/clang/libllvmipa (obj) =3D=3D=3D> lib/clang/libllvmipo (obj) =3D=3D=3D> lib/clang/libllvmirreader (obj) =3D=3D=3D> lib/clang/libllvmlinker (obj) =3D=3D=3D> lib/clang/libllvmmc (obj) =3D=3D=3D> lib/clang/libllvmmcparser (obj) =3D=3D=3D> lib/clang/libllvmobjcarcopts (obj) =3D=3D=3D> lib/clang/libllvmobject (obj) =3D=3D=3D> lib/clang/libllvmscalaropts (obj) =3D=3D=3D> lib/clang/libllvmselectiondag (obj) =3D=3D=3D> lib/clang/libllvmsupport (obj) =3D=3D=3D> lib/clang/libllvmtablegen (obj) =3D=3D=3D> lib/clang/libllvmtarget (obj) =3D=3D=3D> lib/clang/libllvmtransformutils (obj) =3D=3D=3D> lib/clang/libllvmvectorize (obj) =3D=3D=3D> lib/clang/libllvmarmasmparser (obj) =3D=3D=3D> lib/clang/libllvmarmcodegen (obj) =3D=3D=3D> lib/clang/libllvmarmdesc (obj) =3D=3D=3D> lib/clang/libllvmarmdisassembler (obj) =3D=3D=3D> lib/clang/libllvmarminfo (obj) =3D=3D=3D> lib/clang/libllvmarminstprinter (obj) =3D=3D=3D> lib/clang/libllvmmipsasmparser (obj) =3D=3D=3D> lib/clang/libllvmmipscodegen (obj) =3D=3D=3D> lib/clang/libllvmmipsdesc (obj) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (obj) =3D=3D=3D> lib/clang/libllvmmipsinfo (obj) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (obj) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (obj) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (obj) =3D=3D=3D> lib/clang/libllvmx86asmparser (obj) =3D=3D=3D> lib/clang/libllvmx86codegen (obj) =3D=3D=3D> lib/clang/libllvmx86desc (obj) =3D=3D=3D> lib/clang/libllvmx86disassembler (obj) =3D=3D=3D> lib/clang/libllvmx86info (obj) =3D=3D=3D> lib/clang/libllvmx86instprinter (obj) =3D=3D=3D> lib/clang/libllvmx86utils (obj) =3D=3D=3D> lib/clang/include (obj) =3D=3D=3D> lib/clang/libclanganalysis (depend) =3D=3D=3D> lib/clang/libclangast (depend) =3D=3D=3D> lib/clang/libclangbasic (depend) =3D=3D=3D> lib/clang/libclangcodegen (depend) =3D=3D=3D> lib/clang/libclangdriver (depend) =3D=3D=3D> lib/clang/libclangedit (depend) =3D=3D=3D> lib/clang/libclangfrontend (depend) =3D=3D=3D> lib/clang/libclangfrontendtool (depend) =3D=3D=3D> lib/clang/libclanglex (depend) =3D=3D=3D> lib/clang/libclangparse (depend) =3D=3D=3D> lib/clang/libclangsema (depend) =3D=3D=3D> lib/clang/libclangserialization (depend) =3D=3D=3D> lib/clang/libllvmanalysis (depend) =3D=3D=3D> lib/clang/libllvmarchive (depend) =3D=3D=3D> lib/clang/libllvmasmparser (depend) =3D=3D=3D> lib/clang/libllvmasmprinter (depend) =3D=3D=3D> lib/clang/libllvmbitreader (depend) =3D=3D=3D> lib/clang/libllvmbitwriter (depend) =3D=3D=3D> lib/clang/libllvmcodegen (depend) =3D=3D=3D> lib/clang/libllvmcore (depend) =3D=3D=3D> lib/clang/libllvminstcombine (depend) =3D=3D=3D> lib/clang/libllvminstrumentation (depend) =3D=3D=3D> lib/clang/libllvmipa (depend) =3D=3D=3D> lib/clang/libllvmipo (depend) =3D=3D=3D> lib/clang/libllvmirreader (depend) =3D=3D=3D> lib/clang/libllvmlinker (depend) =3D=3D=3D> lib/clang/libllvmmc (depend) =3D=3D=3D> lib/clang/libllvmmcparser (depend) =3D=3D=3D> lib/clang/libllvmobjcarcopts (depend) =3D=3D=3D> lib/clang/libllvmobject (depend) =3D=3D=3D> lib/clang/libllvmscalaropts (depend) =3D=3D=3D> lib/clang/libllvmselectiondag (depend) =3D=3D=3D> lib/clang/libllvmsupport (depend) =3D=3D=3D> lib/clang/libllvmtablegen (depend) =3D=3D=3D> lib/clang/libllvmtarget (depend) =3D=3D=3D> lib/clang/libllvmtransformutils (depend) =3D=3D=3D> lib/clang/libllvmvectorize (depend) =3D=3D=3D> lib/clang/libllvmarmasmparser (depend) =3D=3D=3D> lib/clang/libllvmarmcodegen (depend) =3D=3D=3D> lib/clang/libllvmarmdesc (depend) =3D=3D=3D> lib/clang/libllvmarmdisassembler (depend) =3D=3D=3D> lib/clang/libllvmarminfo (depend) =3D=3D=3D> lib/clang/libllvmarminstprinter (depend) =3D=3D=3D> lib/clang/libllvmmipsasmparser (depend) =3D=3D=3D> lib/clang/libllvmmipscodegen (depend) =3D=3D=3D> lib/clang/libllvmmipsdesc (depend) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (depend) =3D=3D=3D> lib/clang/libllvmmipsinfo (depend) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (depend) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (depend) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (depend) =3D=3D=3D> lib/clang/libllvmx86asmparser (depend) =3D=3D=3D> lib/clang/libllvmx86codegen (depend) =3D=3D=3D> lib/clang/libllvmx86desc (depend) =3D=3D=3D> lib/clang/libllvmx86disassembler (depend) =3D=3D=3D> lib/clang/libllvmx86info (depend) =3D=3D=3D> lib/clang/libllvmx86instprinter (depend) =3D=3D=3D> lib/clang/libllvmx86utils (depend) =3D=3D=3D> lib/clang/include (depend) =3D=3D=3D> lib/clang/libclanganalysis (all) =3D=3D=3D> lib/clang/libclangast (all) =3D=3D=3D> lib/clang/libclangbasic (all) =3D=3D=3D> lib/clang/libclangcodegen (all) =3D=3D=3D> lib/clang/libclangdriver (all) =3D=3D=3D> lib/clang/libclangedit (all) =3D=3D=3D> lib/clang/libclangfrontend (all) =3D=3D=3D> lib/clang/libclangfrontendtool (all) =3D=3D=3D> lib/clang/libclanglex (all) =3D=3D=3D> lib/clang/libclangparse (all) =3D=3D=3D> lib/clang/libclangsema (all) =3D=3D=3D> lib/clang/libclangserialization (all) =3D=3D=3D> lib/clang/libllvmanalysis (all) =3D=3D=3D> lib/clang/libllvmarchive (all) =3D=3D=3D> lib/clang/libllvmasmparser (all) =3D=3D=3D> lib/clang/libllvmasmprinter (all) =3D=3D=3D> lib/clang/libllvmbitreader (all) =3D=3D=3D> lib/clang/libllvmbitwriter (all) =3D=3D=3D> lib/clang/libllvmcodegen (all) =3D=3D=3D> lib/clang/libllvmcore (all) =3D=3D=3D> lib/clang/libllvminstcombine (all) =3D=3D=3D> lib/clang/libllvminstrumentation (all) =3D=3D=3D> lib/clang/libllvmipa (all) =3D=3D=3D> lib/clang/libllvmipo (all) =3D=3D=3D> lib/clang/libllvmirreader (all) =3D=3D=3D> lib/clang/libllvmlinker (all) =3D=3D=3D> lib/clang/libllvmmc (all) =3D=3D=3D> lib/clang/libllvmmcparser (all) =3D=3D=3D> lib/clang/libllvmobjcarcopts (all) =3D=3D=3D> lib/clang/libllvmobject (all) =3D=3D=3D> lib/clang/libllvmscalaropts (all) =3D=3D=3D> lib/clang/libllvmselectiondag (all) =3D=3D=3D> lib/clang/libllvmsupport (all) =3D=3D=3D> lib/clang/libllvmtablegen (all) =3D=3D=3D> lib/clang/libllvmtarget (all) =3D=3D=3D> lib/clang/libllvmtransformutils (all) =3D=3D=3D> lib/clang/libllvmvectorize (all) =3D=3D=3D> lib/clang/libllvmarmasmparser (all) =3D=3D=3D> lib/clang/libllvmarmcodegen (all) =3D=3D=3D> lib/clang/libllvmarmdesc (all) =3D=3D=3D> lib/clang/libllvmarmdisassembler (all) =3D=3D=3D> lib/clang/libllvmarminfo (all) =3D=3D=3D> lib/clang/libllvmarminstprinter (all) =3D=3D=3D> lib/clang/libllvmmipsasmparser (all) =3D=3D=3D> lib/clang/libllvmmipscodegen (all) =3D=3D=3D> lib/clang/libllvmmipsdesc (all) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (all) =3D=3D=3D> lib/clang/libllvmmipsinfo (all) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (all) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (all) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (all) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (all) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (all) =3D=3D=3D> lib/clang/libllvmx86asmparser (all) =3D=3D=3D> lib/clang/libllvmx86codegen (all) =3D=3D=3D> lib/clang/libllvmx86desc (all) =3D=3D=3D> lib/clang/libllvmx86disassembler (all) =3D=3D=3D> lib/clang/libllvmx86info (all) =3D=3D=3D> lib/clang/libllvmx86instprinter (all) =3D=3D=3D> lib/clang/libllvmx86utils (all) =3D=3D=3D> lib/clang/include (all) =3D=3D=3D> lib/clang/include (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/He= aders/__wmmintrin_aes.h /zbuilder/buildd/head/lib/clang/include/../../../co= ntrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h /zbuilder/buildd/he= ad/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/altivec.= h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang= /lib/Headers/ammintrin.h /zbuilder/buildd/head/lib/clang/include/../../../c= ontrib/llvm/tools/clang/lib/Headers/avx2intrin.h /zbuilder/buildd/head/lib/= clang/include/../../../contrib/llvm/tools/clang/lib/Headers/avxintrin.h /zb= uilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/= Headers/bmi2intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contr= ib/llvm/tools/clang/lib/Headers/bmiintrin.h /zbuilder/buildd/head/lib/clang= /include/../../../contrib/llvm/tools/clang/lib/Headers/cpuid.h /zbuilder/bu= ildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/e= mmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/to= ols/clang/lib/Headers/f16cintrin.h /zbuilder/buildd/head/lib/clang/include/= =2E./../../contrib/llvm/tools/clang/lib/Headers/fma4intrin.h /zbuilder/buil= dd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/fma= intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tool= s/clang/lib/Headers/immintrin.h /zbuilder/buildd/head/lib/clang/include/../= =2E./../contrib/llvm/tools/clang/lib/Headers/lzcntintrin.h /zbuilder/buildd= /head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/mm3dn= ow.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/cl= ang/lib/Headers/mm_malloc.h /zbuilder/buildd/head/lib/clang/include/../../.= =2E/contrib/llvm/tools/clang/lib/Headers/mmintrin.h /zbuilder/buildd/head/l= ib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/module.map /= zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/li= b/Headers/nmmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/pmmintrin.h /zbuilder/buildd/head/lib/clan= g/include/../../../contrib/llvm/tools/clang/lib/Headers/popcntintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/prfchwintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/rdseedintrin.h /zbuilder/buildd/head/lib/c= lang/include/../../../contrib/llvm/tools/clang/lib/Headers/rtmintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/smmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib= /llvm/tools/clang/lib/Headers/tmmintrin.h /zbuilder/buildd/head/lib/clang/i= nclude/../../../contrib/llvm/tools/clang/lib/Headers/wmmintrin.h /zbuilder/= buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers= /x86intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/= tools/clang/lib/Headers/xmmintrin.h /zbuilder/buildd/head/lib/clang/include= /../../../contrib/llvm/tools/clang/lib/Headers/xopintrin.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/clang/3.3 =3D=3D=3D> usr.bin/clang (obj,depend,all,install) =3D=3D=3D> usr.bin/clang/clang (obj) =3D=3D=3D> usr.bin/clang/clang-tblgen (obj) =3D=3D=3D> usr.bin/clang/tblgen (obj) =3D=3D=3D> usr.bin/clang/clang (depend) =3D=3D=3D> usr.bin/clang/clang-tblgen (depend) =3D=3D=3D> usr.bin/clang/tblgen (depend) =3D=3D=3D> usr.bin/clang/clang (all) =3D=3D=3D> usr.bin/clang/clang-tblgen (all) =3D=3D=3D> usr.bin/clang/tblgen (all) =3D=3D=3D> usr.bin/clang/clang (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 clan= g /usr/obj/zbuilder/buildd/head/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/clang++ -> /usr/obj/zbuilder/buil= dd/head/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/clang-cpp -> /usr/obj/zbuilder/bu= ildd/head/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/cc -> /usr/obj/zbuilder/buildd/he= ad/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/c++ -> /usr/obj/zbuilder/buildd/h= ead/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/CC -> /usr/obj/zbuilder/buildd/he= ad/tmp/usr/bin/clang /usr/obj/zbuilder/buildd/head/tmp/usr/bin/cpp -> /usr/obj/zbuilder/buildd/h= ead/tmp/usr/bin/clang =3D=3D=3D> usr.bin/clang/clang-tblgen (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 clan= g-tblgen /usr/obj/zbuilder/buildd/head/tmp/usr/bin/clang-tblgen =3D=3D=3D> usr.bin/clang/tblgen (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 tblg= en /usr/obj/zbuilder/buildd/head/tmp/usr/bin/tblgen =3D=3D=3D> gnu/usr.bin/binutils (obj,depend,all,install) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (obj) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (obj) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (obj) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (obj) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (obj) =3D=3D=3D> gnu/usr.bin/binutils/ar (obj) =3D=3D=3D> gnu/usr.bin/binutils/as (obj) =3D=3D=3D> gnu/usr.bin/binutils/ld (obj) =3D=3D=3D> gnu/usr.bin/binutils/nm (obj) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (obj) =3D=3D=3D> gnu/usr.bin/binutils/objdump (obj) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (obj) =3D=3D=3D> gnu/usr.bin/binutils/readelf (obj) =3D=3D=3D> gnu/usr.bin/binutils/size (obj) =3D=3D=3D> gnu/usr.bin/binutils/strings (obj) =3D=3D=3D> gnu/usr.bin/binutils/strip (obj) =3D=3D=3D> gnu/usr.bin/binutils/doc (obj) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (depend) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (depend) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (depend) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (depend) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (depend) =3D=3D=3D> gnu/usr.bin/binutils/ar (depend) =3D=3D=3D> gnu/usr.bin/binutils/as (depend) =3D=3D=3D> gnu/usr.bin/binutils/ld (depend) =3D=3D=3D> gnu/usr.bin/binutils/nm (depend) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (depend) =3D=3D=3D> gnu/usr.bin/binutils/objdump (depend) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (depend) =3D=3D=3D> gnu/usr.bin/binutils/readelf (depend) =3D=3D=3D> gnu/usr.bin/binutils/size (depend) =3D=3D=3D> gnu/usr.bin/binutils/strings (depend) =3D=3D=3D> gnu/usr.bin/binutils/strip (depend) =3D=3D=3D> gnu/usr.bin/binutils/doc (depend) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (all) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (all) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (all) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (all) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (all) =3D=3D=3D> gnu/usr.bin/binutils/ar (all) =3D=3D=3D> gnu/usr.bin/binutils/as (all) =3D=3D=3D> gnu/usr.bin/binutils/ld (all) =3D=3D=3D> gnu/usr.bin/binutils/nm (all) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (all) =3D=3D=3D> gnu/usr.bin/binutils/objdump (all) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (all) =3D=3D=3D> gnu/usr.bin/binutils/readelf (all) =3D=3D=3D> gnu/usr.bin/binutils/size (all) =3D=3D=3D> gnu/usr.bin/binutils/strings (all) =3D=3D=3D> gnu/usr.bin/binutils/strip (all) =3D=3D=3D> gnu/usr.bin/binutils/doc (all) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (install) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (install) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (install) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (install) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 addr= 2line /usr/obj/zbuilder/buildd/head/tmp/usr/bin/addr2line =3D=3D=3D> gnu/usr.bin/binutils/ar (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 ar /= usr/obj/zbuilder/buildd/head/tmp/usr/bin/gnu-ar =3D=3D=3D> gnu/usr.bin/binutils/as (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 as /= usr/obj/zbuilder/buildd/head/tmp/usr/bin/as =3D=3D=3D> gnu/usr.bin/binutils/ld (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 ld /= usr/obj/zbuilder/buildd/head/tmp/usr/bin/ld sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ldscript= s/elf_x86_64_fbsd.x ldscripts/elf_x86_64_fbsd.xbn ldscripts/elf_x86_64_fbsd= =2Exc ldscripts/elf_x86_64_fbsd.xd ldscripts/elf_x86_64_fbsd.xdc ldscripts/= elf_x86_64_fbsd.xdw ldscripts/elf_x86_64_fbsd.xn ldscripts/elf_x86_64_fbsd.= xr ldscripts/elf_x86_64_fbsd.xs ldscripts/elf_x86_64_fbsd.xsc ldscripts/elf= _x86_64_fbsd.xsw ldscripts/elf_x86_64_fbsd.xu ldscripts/elf_x86_64_fbsd.xw = /usr/obj/zbuilder/buildd/head/tmp/usr/libdata/ldscripts =3D=3D=3D> gnu/usr.bin/binutils/nm (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 nm /= usr/obj/zbuilder/buildd/head/tmp/usr/bin/nm =3D=3D=3D> gnu/usr.bin/binutils/objcopy (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 objc= opy /usr/obj/zbuilder/buildd/head/tmp/usr/bin/objcopy =3D=3D=3D> gnu/usr.bin/binutils/objdump (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 objd= ump /usr/obj/zbuilder/buildd/head/tmp/usr/bin/objdump =3D=3D=3D> gnu/usr.bin/binutils/ranlib (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 ranl= ib /usr/obj/zbuilder/buildd/head/tmp/usr/bin/gnu-ranlib =3D=3D=3D> gnu/usr.bin/binutils/readelf (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 read= elf /usr/obj/zbuilder/buildd/head/tmp/usr/bin/readelf =3D=3D=3D> gnu/usr.bin/binutils/size (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 size= /usr/obj/zbuilder/buildd/head/tmp/usr/bin/size =3D=3D=3D> gnu/usr.bin/binutils/strings (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 stri= ngs /usr/obj/zbuilder/buildd/head/tmp/usr/bin/strings =3D=3D=3D> gnu/usr.bin/binutils/strip (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 -S st= rip /usr/obj/zbuilder/buildd/head/tmp/usr/bin/strip =3D=3D=3D> gnu/usr.bin/binutils/doc (install) =3D=3D=3D> usr.bin/xlint/lint1 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 lint= 1 /usr/obj/zbuilder/buildd/head/tmp/usr/libexec/lint1 =3D=3D=3D> usr.bin/xlint/lint2 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 lint= 2 /usr/obj/zbuilder/buildd/head/tmp/usr/libexec/lint2 =3D=3D=3D> usr.bin/xlint/xlint (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 555 xlin= t /usr/obj/zbuilder/buildd/head/tmp/usr/bin/lint -------------------------------------------------------------- >>> stage 4.1: building includes -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARCH=3Damd64= MACHINE=3Damd64 CPUTYPE=3D GROFF_BIN_PATH=3D/usr/obj/zbuilder/buildd/hea= d/tmp/legacy/usr/bin GROFF_FONT_PATH=3D/usr/obj/zbuilder/buildd/head/tmp/l= egacy/usr/share/groff_font GROFF_TMAC_PATH=3D/usr/obj/zbuilder/buildd/head= /tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=3D/usr/obj/zbuilder/buildd/head= /tmp _LDSCRIPTROOT=3D VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" INS= TALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilde= r/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/= usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilde= r/buildd/head/tmp/legacy/bin:/usr/obj/zbuilder/buildd/head/tmp/usr/sbin:/us= r/obj/zbuilder/buildd/head/tmp/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/us= r/games:/sbin:/bin:/usr/sbin:/usr/bin CC=3D"cc " CXX=3D"c++ " CPP=3D"cpp "= AS=3D"as" AR=3D"ar" LD=3D"ld" NM=3Dnm OBJDUMP=3D RANLIB=3Dranlib STRINGS= =3D COMPILER_TYPE=3Dclang /usr/obj/zbuilder/buildd/head/make.amd64/make -f= Makefile.inc1 DESTDIR=3D/usr/obj/zbuilder/buildd/head/tmp SHARED=3Dsymlink= s par-includes =3D=3D=3D> share/info (includes) set -e; cd /zbuilder/buildd/head/share/info; /usr/obj/zbuilder/buildd/head/= make.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/mak= e installincludes =3D=3D=3D> lib (includes) set -e; cd /zbuilder/buildd/head/lib; /usr/obj/zbuilder/buildd/head/make.am= d64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make insta= llincludes =3D=3D=3D> lib/csu/amd64 (buildincludes) =3D=3D=3D> lib/libc (buildincludes) =3D=3D=3D> lib/libbsm (buildincludes) =3D=3D=3D> lib/libauditd (buildincludes) =3D=3D=3D> lib/libcompiler_rt (buildincludes) =3D=3D=3D> lib/libcrypt (buildincludes) =3D=3D=3D> lib/libelf (buildincludes) =3D=3D=3D> lib/libkvm (buildincludes) =3D=3D=3D> lib/msun (buildincludes) =3D=3D=3D> lib/libmd (buildincludes) =3D=3D=3D> lib/ncurses (buildincludes) =3D=3D=3D> lib/ncurses/ncurses (buildincludes) =3D=3D=3D> lib/ncurses/form (buildincludes) =3D=3D=3D> lib/ncurses/menu (buildincludes) =3D=3D=3D> lib/ncurses/panel (buildincludes) =3D=3D=3D> lib/ncurses/ncursesw (buildincludes) =3D=3D=3D> lib/ncurses/formw (buildincludes) =3D=3D=3D> lib/ncurses/menuw (buildincludes) =3D=3D=3D> lib/ncurses/panelw (buildincludes) =3D=3D=3D> lib/libnetgraph (buildincludes) =3D=3D=3D> lib/libradius (buildincludes) =3D=3D=3D> lib/librpcsvc (buildincludes) =3D=3D=3D> lib/libsbuf (buildincludes) =3D=3D=3D> lib/libtacplus (buildincludes) =3D=3D=3D> lib/libutil (buildincludes) =3D=3D=3D> lib/libypclnt (buildincludes) =3D=3D=3D> lib/libcxxrt (buildincludes) =3D=3D=3D> lib/libc++ (buildincludes) =3D=3D=3D> lib/libcom_err (buildincludes) =3D=3D=3D> lib/libcom_err/doc (buildincludes) =3D=3D=3D> lib/libalias (buildincludes) =3D=3D=3D> lib/libalias/libalias (buildincludes) =3D=3D=3D> lib/libalias/modules (buildincludes) =3D=3D=3D> lib/libalias/modules/cuseeme (buildincludes) =3D=3D=3D> lib/libalias/modules/dummy (buildincludes) =3D=3D=3D> lib/libalias/modules/ftp (buildincludes) =3D=3D=3D> lib/libalias/modules/irc (buildincludes) =3D=3D=3D> lib/libalias/modules/nbt (buildincludes) =3D=3D=3D> lib/libalias/modules/pptp (buildincludes) =3D=3D=3D> lib/libalias/modules/skinny (buildincludes) =3D=3D=3D> lib/libalias/modules/smedia (buildincludes) =3D=3D=3D> lib/libarchive (buildincludes) =3D=3D=3D> lib/libbegemot (buildincludes) =3D=3D=3D> lib/libblocksruntime (buildincludes) =3D=3D=3D> lib/libbluetooth (buildincludes) =3D=3D=3D> lib/libbsnmp (buildincludes) =3D=3D=3D> lib/libbsnmp/libbsnmp (buildincludes) =3D=3D=3D> lib/libbz2 (buildincludes) =3D=3D=3D> lib/libcalendar (buildincludes) =3D=3D=3D> lib/libcam (buildincludes) =3D=3D=3D> lib/libcompat (buildincludes) =3D=3D=3D> lib/libdevinfo (buildincludes) =3D=3D=3D> lib/libdevstat (buildincludes) =3D=3D=3D> lib/libdwarf (buildincludes) =3D=3D=3D> lib/libedit (buildincludes) =3D=3D=3D> lib/libedit/edit/readline (buildincludes) =3D=3D=3D> lib/libexpat (buildincludes) =3D=3D=3D> lib/libfetch (buildincludes) =3D=3D=3D> lib/libgeom (buildincludes) =3D=3D=3D> lib/libgpib (buildincludes) =3D=3D=3D> lib/libgssapi (buildincludes) =3D=3D=3D> lib/librpcsec_gss (buildincludes) =3D=3D=3D> lib/libipsec (buildincludes) =3D=3D=3D> lib/libipx (buildincludes) =3D=3D=3D> lib/libjail (buildincludes) =3D=3D=3D> lib/libkiconv (buildincludes) =3D=3D=3D> lib/libldns (buildincludes) =3D=3D=3D> lib/liblzma (buildincludes) =3D=3D=3D> lib/libmagic (buildincludes) =3D=3D=3D> lib/libmandoc (buildincludes) =3D=3D=3D> lib/libmemstat (buildincludes) =3D=3D=3D> lib/libmilter (buildincludes) =3D=3D=3D> lib/libmp (buildincludes) =3D=3D=3D> lib/libnetbsd (buildincludes) =3D=3D=3D> lib/libngatm (buildincludes) =3D=3D=3D> lib/libopie (buildincludes) =3D=3D=3D> lib/libpam (buildincludes) =3D=3D=3D> lib/libpam/modules (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_chroot (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_deny (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_echo (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_exec (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_group (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_guest (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_krb5 (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_ksu (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_lastlog (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_login_access (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_nologin (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_opie (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_permit (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_radius (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_rhosts (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_rootok (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_securetty (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_self (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_ssh (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_tacplus (buildincludes) =3D=3D=3D> lib/libpam/modules/pam_unix (buildincludes) =3D=3D=3D> lib/libpam/libpam (buildincludes) =3D=3D=3D> lib/libpcap (buildincludes) =3D=3D=3D> lib/libpmc (buildincludes) =3D=3D=3D> lib/libproc (buildincludes) =3D=3D=3D> lib/libprocstat (buildincludes) =3D=3D=3D> lib/libprocstat/zfs (buildincludes) =3D=3D=3D> lib/librt (buildincludes) =3D=3D=3D> lib/librtld_db (buildincludes) =3D=3D=3D> lib/libsdp (buildincludes) =3D=3D=3D> lib/libsm (buildincludes) =3D=3D=3D> lib/libsmdb (buildincludes) =3D=3D=3D> lib/libsmutil (buildincludes) =3D=3D=3D> lib/libstand (buildincludes) =3D=3D=3D> lib/libstdbuf (buildincludes) =3D=3D=3D> lib/libstdthreads (buildincludes) =3D=3D=3D> lib/libtelnet (buildincludes) =3D=3D=3D> lib/libthr (buildincludes) =3D=3D=3D> lib/libthread_db (buildincludes) =3D=3D=3D> lib/libufs (buildincludes) =3D=3D=3D> lib/libugidfw (buildincludes) =3D=3D=3D> lib/libulog (buildincludes) =3D=3D=3D> lib/libusbhid (buildincludes) =3D=3D=3D> lib/libusb (buildincludes) =3D=3D=3D> lib/libvgl (buildincludes) =3D=3D=3D> lib/libvmmapi (buildincludes) =3D=3D=3D> lib/libwrap (buildincludes) =3D=3D=3D> lib/liby (buildincludes) =3D=3D=3D> lib/libyaml (buildincludes) =3D=3D=3D> lib/libz (buildincludes) =3D=3D=3D> lib/atf (buildincludes) =3D=3D=3D> lib/atf/libatf-c (buildincludes) =3D=3D=3D> lib/atf/libatf-c++ (buildincludes) =3D=3D=3D> lib/bind (buildincludes) =3D=3D=3D> lib/bind/isc (buildincludes) =3D=3D=3D> lib/bind/isccc (buildincludes) =3D=3D=3D> lib/bind/dns (buildincludes) =3D=3D=3D> lib/bind/isccfg (buildincludes) =3D=3D=3D> lib/bind/bind9 (buildincludes) =3D=3D=3D> lib/bind/lwres (buildincludes) =3D=3D=3D> lib/clang (buildincludes) =3D=3D=3D> lib/clang/libclanganalysis (buildincludes) =3D=3D=3D> lib/clang/libclangarcmigrate (buildincludes) =3D=3D=3D> lib/clang/libclangast (buildincludes) =3D=3D=3D> lib/clang/libclangbasic (buildincludes) =3D=3D=3D> lib/clang/libclangcodegen (buildincludes) =3D=3D=3D> lib/clang/libclangdriver (buildincludes) =3D=3D=3D> lib/clang/libclangedit (buildincludes) =3D=3D=3D> lib/clang/libclangfrontend (buildincludes) =3D=3D=3D> lib/clang/libclangfrontendtool (buildincludes) =3D=3D=3D> lib/clang/libclanglex (buildincludes) =3D=3D=3D> lib/clang/libclangparse (buildincludes) =3D=3D=3D> lib/clang/libclangrewritecore (buildincludes) =3D=3D=3D> lib/clang/libclangrewritefrontend (buildincludes) =3D=3D=3D> lib/clang/libclangsema (buildincludes) =3D=3D=3D> lib/clang/libclangserialization (buildincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (buildincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (buildincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (buildincludes) =3D=3D=3D> lib/clang/libllvmanalysis (buildincludes) =3D=3D=3D> lib/clang/libllvmarchive (buildincludes) =3D=3D=3D> lib/clang/libllvmasmparser (buildincludes) =3D=3D=3D> lib/clang/libllvmasmprinter (buildincludes) =3D=3D=3D> lib/clang/libllvmbitreader (buildincludes) =3D=3D=3D> lib/clang/libllvmbitwriter (buildincludes) =3D=3D=3D> lib/clang/libllvmcodegen (buildincludes) =3D=3D=3D> lib/clang/libllvmcore (buildincludes) =3D=3D=3D> lib/clang/libllvminstcombine (buildincludes) =3D=3D=3D> lib/clang/libllvminstrumentation (buildincludes) =3D=3D=3D> lib/clang/libllvmipa (buildincludes) =3D=3D=3D> lib/clang/libllvmipo (buildincludes) =3D=3D=3D> lib/clang/libllvmirreader (buildincludes) =3D=3D=3D> lib/clang/libllvmlinker (buildincludes) =3D=3D=3D> lib/clang/libllvmmc (buildincludes) =3D=3D=3D> lib/clang/libllvmmcparser (buildincludes) =3D=3D=3D> lib/clang/libllvmobjcarcopts (buildincludes) =3D=3D=3D> lib/clang/libllvmobject (buildincludes) =3D=3D=3D> lib/clang/libllvmscalaropts (buildincludes) =3D=3D=3D> lib/clang/libllvmselectiondag (buildincludes) =3D=3D=3D> lib/clang/libllvmsupport (buildincludes) =3D=3D=3D> lib/clang/libllvmtablegen (buildincludes) =3D=3D=3D> lib/clang/libllvmtarget (buildincludes) =3D=3D=3D> lib/clang/libllvmtransformutils (buildincludes) =3D=3D=3D> lib/clang/libllvmvectorize (buildincludes) =3D=3D=3D> lib/clang/libllvmarmasmparser (buildincludes) =3D=3D=3D> lib/clang/libllvmarmcodegen (buildincludes) =3D=3D=3D> lib/clang/libllvmarmdesc (buildincludes) =3D=3D=3D> lib/clang/libllvmarmdisassembler (buildincludes) =3D=3D=3D> lib/clang/libllvmarminfo (buildincludes) =3D=3D=3D> lib/clang/libllvmarminstprinter (buildincludes) =3D=3D=3D> lib/clang/libllvmmipsasmparser (buildincludes) =3D=3D=3D> lib/clang/libllvmmipscodegen (buildincludes) =3D=3D=3D> lib/clang/libllvmmipsdesc (buildincludes) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (buildincludes) =3D=3D=3D> lib/clang/libllvmmipsinfo (buildincludes) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (buildincludes) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (buildincludes) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (buildincludes) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (buildincludes) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (buildincludes) =3D=3D=3D> lib/clang/libllvmx86asmparser (buildincludes) =3D=3D=3D> lib/clang/libllvmx86codegen (buildincludes) =3D=3D=3D> lib/clang/libllvmx86desc (buildincludes) =3D=3D=3D> lib/clang/libllvmx86disassembler (buildincludes) =3D=3D=3D> lib/clang/libllvmx86info (buildincludes) =3D=3D=3D> lib/clang/libllvmx86instprinter (buildincludes) =3D=3D=3D> lib/clang/libllvmx86utils (buildincludes) =3D=3D=3D> lib/clang/include (buildincludes) =3D=3D=3D> lib/csu/amd64 (installincludes) =3D=3D=3D> lib/libc (installincludes) =3D=3D=3D> lib/libbsm (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbsm/../../contrib/openbsm/bsm/audit_uevents.h /zbui= lder/buildd/head/lib/libbsm/../../contrib/openbsm/bsm/libbsm.h /usr/obj/zbu= ilder/buildd/head/tmp/usr/include/bsm =3D=3D=3D> lib/libauditd (installincludes) =3D=3D=3D> lib/libcompiler_rt (installincludes) =3D=3D=3D> lib/libcrypt (installincludes) =3D=3D=3D> lib/libelf (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libelf/libelf.h /zbuilder/buildd/head/lib/libelf/gelf.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libkvm (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libkvm/kvm.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/msun (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/msun/x86/fenv.h /zbuilder/buildd/head/lib/msun/src/mat= h.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libmd (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmd/md4.h /zbuilder/buildd/head/lib/libmd/md5.h /zbu= ilder/buildd/head/lib/libmd/ripemd.h /zbuilder/buildd/head/lib/libmd/sha.h = /zbuilder/buildd/head/lib/libmd/sha256.h /zbuilder/buildd/head/lib/libmd/sh= a512.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses (installincludes) =3D=3D=3D> lib/ncurses/ncurses (installincludes) =3D=3D=3D> lib/ncurses/form (installincludes) =3D=3D=3D> lib/ncurses/menu (installincludes) =3D=3D=3D> lib/ncurses/panel (installincludes) =3D=3D=3D> lib/ncurses/ncursesw (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 curse= s.h term.h termcap.h unctrl.h /zbuilder/buildd/head/lib/ncurses/ncursesw/..= /../../contrib/ncurses/include/ncurses_dll.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include /usr/obj/zbuilder/buildd/head/tmp/usr/include/ncurses.h -> curses.h =3D=3D=3D> lib/ncurses/formw (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/formw/../../../contrib/ncurses/form/form.h /us= r/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses/menuw (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/menuw/../../../contrib/ncurses/menu/menu.h /zb= uilder/buildd/head/lib/ncurses/menuw/../../../contrib/ncurses/menu/eti.h /u= sr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses/panelw (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/panelw/../../../contrib/ncurses/panel/panel.h = /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libnetgraph (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libnetgraph/netgraph.h /usr/obj/zbuilder/buildd/head/t= mp/usr/include =3D=3D=3D> lib/libradius (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libradius/radlib.h /zbuilder/buildd/head/lib/libradius= /radlib_vs.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/librpcsvc (installincludes) =3D=3D=3D> lib/libsbuf (installincludes) =3D=3D=3D> lib/libtacplus (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libtacplus/taclib.h /usr/obj/zbuilder/buildd/head/tmp/= usr/include =3D=3D=3D> lib/libutil (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libutil/libutil.h /zbuilder/buildd/head/lib/libutil/lo= gin_cap.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libypclnt (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libypclnt/ypclnt.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libcxxrt (installincludes) =3D=3D=3D> lib/libc++ (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/__bit_reference /z= builder/buildd/head/lib/libc++/../../contrib/libc++/include/__config /zbuil= der/buildd/head/lib/libc++/../../contrib/libc++/include/__debug /zbuilder/b= uildd/head/lib/libc++/../../contrib/libc++/include/__functional_03 /zbuilde= r/buildd/head/lib/libc++/../../contrib/libc++/include/__functional_base /zb= uilder/buildd/head/lib/libc++/../../contrib/libc++/include/__functional_bas= e_03 /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__hash_t= able /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__locale= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__mutex_base= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__split_buff= er /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__sso_allo= cator /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__std_s= tream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__tree = /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__tuple /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/__tuple_03 /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/__undef_min_max /zbu= ilder/buildd/head/lib/libc++/../../contrib/libc++/include/algorithm /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/array /zbuilder/buil= dd/head/lib/libc++/../../contrib/libc++/include/atomic /zbuilder/buildd/hea= d/lib/libc++/../../contrib/libc++/include/bitset /zbuilder/buildd/head/lib/= libc++/../../contrib/libc++/include/cassert /zbuilder/buildd/head/lib/libc+= +/../../contrib/libc++/include/ccomplex /zbuilder/buildd/head/lib/libc++/..= /../contrib/libc++/include/cctype /zbuilder/buildd/head/lib/libc++/../../co= ntrib/libc++/include/cerrno /zbuilder/buildd/head/lib/libc++/../../contrib/= libc++/include/cfenv /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/cfloat /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/includ= e/chrono /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/cint= types /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ciso646= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/climits /zbu= ilder/buildd/head/lib/libc++/../../contrib/libc++/include/clocale /zbuilder= /buildd/head/lib/libc++/../../contrib/libc++/include/cmath /zbuilder/buildd= /head/lib/libc++/../../contrib/libc++/include/codecvt /zbuilder/buildd/head= /lib/libc++/../../contrib/libc++/include/complex /zbuilder/buildd/head/lib/= libc++/../../contrib/libc++/include/complex.h /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/condition_variable /zbuilder/buildd/head/l= ib/libc++/../../contrib/libc++/include/csetjmp /zbuilder/buildd/head/lib/li= bc++/../../contrib/libc++/include/csignal /zbuilder/buildd/head/lib/libc++/= =2E./../contrib/libc++/include/cstdarg /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/cstdbool /zbuilder/buildd/head/lib/libc++/../..= /contrib/libc++/include/cstddef /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/cstdint /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/cstdio /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/cstdlib /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/inclu= de/cstring /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ct= gmath /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ctime /= zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/cwchar /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/cwctype /zbuilder/bu= ildd/head/lib/libc++/../../contrib/libc++/include/deque /zbuilder/buildd/he= ad/lib/libc++/../../contrib/libc++/include/exception /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/forward_list /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/fstream /zbuilder/buildd/head/lib/l= ibc++/../../contrib/libc++/include/functional /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/future /zbuilder/buildd/head/lib/libc++/..= /../contrib/libc++/include/initializer_list /zbuilder/buildd/head/lib/libc+= +/../../contrib/libc++/include/iomanip /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/ios /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/iosfwd /zbuilder/buildd/head/lib/libc++/../../contrib/li= bc++/include/iostream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++= /include/istream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/incl= ude/iterator /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/= limits /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/list /= zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/locale /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/map /zbuilder/buildd= /head/lib/libc++/../../contrib/libc++/include/memory /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/mutex /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/new /zbuilder/buildd/head/lib/libc++/../..= /contrib/libc++/include/numeric /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/ostream /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/queue /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/i= nclude/random /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include= /ratio /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/regex = /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/scoped_alloca= tor /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/set /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/sstream /zbuilder/= buildd/head/lib/libc++/../../contrib/libc++/include/stack /zbuilder/buildd/= head/lib/libc++/../../contrib/libc++/include/stdexcept /zbuilder/buildd/hea= d/lib/libc++/../../contrib/libc++/include/streambuf /zbuilder/buildd/head/l= ib/libc++/../../contrib/libc++/include/string /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/strstream /zbuilder/buildd/head/lib/libc++= /../../contrib/libc++/include/system_error /zbuilder/buildd/head/lib/libc++= /../../contrib/libc++/include/tgmath.h /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/thread /zbuilder/buildd/head/lib/libc++/../../c= ontrib/libc++/include/tuple /zbuilder/buildd/head/lib/libc++/../../contrib/= libc++/include/type_traits /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/typeindex /zbuilder/buildd/head/lib/libc++/../../contrib/libc= ++/include/typeinfo /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/i= nclude/unordered_map /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/unordered_set /zbuilder/buildd/head/lib/libc++/../../contrib/libc++= /include/utility /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/incl= ude/valarray /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/= vector /zbuilder/buildd/head/lib/libc++/../../contrib/libcxxrt/cxxabi.h /zb= uilder/buildd/head/lib/libc++/../../contrib/libcxxrt/unwind.h /zbuilder/bui= ldd/head/lib/libc++/../../contrib/libcxxrt/unwind-arm.h /zbuilder/buildd/he= ad/lib/libc++/../../contrib/libcxxrt/unwind-itanium.h /usr/obj/zbuilder/bui= ldd/head/tmp/usr/include/c++/v1 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/ext/__hash /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/ext/hash_map /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/ext/hash_set /usr/ob= j/zbuilder/buildd/head/tmp/usr/include/c++/v1/ext =3D=3D=3D> lib/libcom_err (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcom_err/../../contrib/com_err/com_err.h /zbuilder/b= uildd/head/lib/libcom_err/../../contrib/com_err/com_right.h /usr/obj/zbuild= er/buildd/head/tmp/usr/include =3D=3D=3D> lib/libcom_err/doc (installincludes) =3D=3D=3D> lib/libalias (installincludes) =3D=3D=3D> lib/libalias/libalias (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libalias/libalias/../../../sys/netinet/libalias/alias.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libalias/modules (installincludes) =3D=3D=3D> lib/libalias/modules/cuseeme (installincludes) =3D=3D=3D> lib/libalias/modules/dummy (installincludes) =3D=3D=3D> lib/libalias/modules/ftp (installincludes) =3D=3D=3D> lib/libalias/modules/irc (installincludes) =3D=3D=3D> lib/libalias/modules/nbt (installincludes) =3D=3D=3D> lib/libalias/modules/pptp (installincludes) =3D=3D=3D> lib/libalias/modules/skinny (installincludes) =3D=3D=3D> lib/libalias/modules/smedia (installincludes) =3D=3D=3D> lib/libarchive (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libarchive/../../contrib/libarchive/libarchive/archive= =2Eh /zbuilder/buildd/head/lib/libarchive/../../contrib/libarchive/libarchi= ve/archive_entry.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libbegemot (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbegemot/../../contrib/libbegemot/rpoll.h /usr/obj/z= builder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libblocksruntime (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libblocksruntime/../../contrib/compiler-rt/BlocksRunti= me/Block.h /zbuilder/buildd/head/lib/libblocksruntime/../../contrib/compile= r-rt/BlocksRuntime/Block_private.h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude =3D=3D=3D> lib/libbluetooth (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbluetooth/bluetooth.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> lib/libbsnmp (installincludes) =3D=3D=3D> lib/libbsnmp/libbsnmp (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/asn1.h /z= builder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/snmp.h= /zbuilder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/snm= pagent.h /zbuilder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp= /lib/snmpclient.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> lib/libbz2 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbz2/../../contrib/bzip2/bzlib.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include =3D=3D=3D> lib/libcalendar (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcalendar/calendar.h /usr/obj/zbuilder/buildd/head/t= mp/usr/include =3D=3D=3D> lib/libcam (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcam/camlib.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include =3D=3D=3D> lib/libcompat (installincludes) =3D=3D=3D> lib/libdevinfo (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdevinfo/devinfo.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libdevstat (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdevstat/devstat.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libdwarf (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdwarf/dwarf.h /zbuilder/buildd/head/lib/libdwarf/li= bdwarf.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libedit (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libedit/histedit.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libedit/edit/readline (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libedit/edit/readline/readline.h /zbuilder/buildd/head= /lib/libedit/edit/readline/history.h /zbuilder/buildd/head/lib/libedit/edit= /readline/tilde.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/edit/readli= ne =3D=3D=3D> lib/libexpat (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 bsdxm= l.h bsdxml_external.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libfetch (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libfetch/fetch.h /usr/obj/zbuilder/buildd/head/tmp/usr= /include =3D=3D=3D> lib/libgeom (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libgeom/libgeom.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include =3D=3D=3D> lib/libgpib (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libgpib/gpib.h /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude/gpib =3D=3D=3D> lib/libgssapi (installincludes) =3D=3D=3D> lib/librpcsec_gss (installincludes) =3D=3D=3D> lib/libipsec (installincludes) =3D=3D=3D> lib/libipx (installincludes) =3D=3D=3D> lib/libjail (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libjail/jail.h /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude =3D=3D=3D> lib/libkiconv (installincludes) =3D=3D=3D> lib/libldns (installincludes) =3D=3D=3D> lib/liblzma (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/../lzma.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/base.h /= zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/bcj.= h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/b= lock.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/l= zma/check.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/= api/lzma/container.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src= /liblzma/api/lzma/delta.h /zbuilder/buildd/head/lib/liblzma/../../contrib/x= z/src/liblzma/api/lzma/filter.h /zbuilder/buildd/head/lib/liblzma/../../con= trib/xz/src/liblzma/api/lzma/hardware.h /zbuilder/buildd/head/lib/liblzma/.= =2E/../contrib/xz/src/liblzma/api/lzma/index.h /zbuilder/buildd/head/lib/li= blzma/../../contrib/xz/src/liblzma/api/lzma/index_hash.h /zbuilder/buildd/h= ead/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/lzma.h /zbuilder/buil= dd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/stream_flags.h /z= builder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/versi= on.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzm= a/vli.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/lzma =3D=3D=3D> lib/libmagic (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmagic/../../contrib/file/magic.h /usr/obj/zbuilder/= buildd/head/tmp/usr/include =3D=3D=3D> lib/libmandoc (installincludes) =3D=3D=3D> lib/libmemstat (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmemstat/memstat.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libmilter (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmilter/../../contrib/sendmail/include/libmilter/mfa= pi.h /zbuilder/buildd/head/lib/libmilter/../../contrib/sendmail/include/lib= milter/mfdef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/libmilter =3D=3D=3D> lib/libmp (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmp/mp.h /usr/obj/zbuilder/buildd/head/tmp/usr/inclu= de =3D=3D=3D> lib/libnetbsd (installincludes) =3D=3D=3D> lib/libngatm (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/unimsg.h /zbu= ilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/addr.h /usr/= obj/zbuilder/buildd/head/tmp/usr/include/netnatm sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/saal/sscfu.h = /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/saal/ssc= fudef.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/= saal/sscop.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/net= natm/saal/sscopdef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/= saal sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/msg/uni_confi= g.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/msg/= uni_hdr.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnat= m/msg/uni_ie.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/n= etnatm/msg/uni_msg.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/n= gatm/netnatm/msg/unimsglib.h /zbuilder/buildd/head/lib/libngatm/../../sys/c= ontrib/ngatm/netnatm/msg/uniprint.h /zbuilder/buildd/head/lib/libngatm/../.= =2E/sys/contrib/ngatm/netnatm/msg/unistruct.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include/netnatm/msg sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/uni.h /zb= uilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/unidef.= h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/un= isig.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/sig sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/atmapi.h = /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/ccat= m.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/= unisap.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/api =3D=3D=3D> lib/libopie (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libopie/../../contrib/opie/opie.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include =3D=3D=3D> lib/libpam (installincludes) =3D=3D=3D> lib/libpam/modules (installincludes) =3D=3D=3D> lib/libpam/modules/pam_chroot (installincludes) =3D=3D=3D> lib/libpam/modules/pam_deny (installincludes) =3D=3D=3D> lib/libpam/modules/pam_echo (installincludes) =3D=3D=3D> lib/libpam/modules/pam_exec (installincludes) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (installincludes) =3D=3D=3D> lib/libpam/modules/pam_group (installincludes) =3D=3D=3D> lib/libpam/modules/pam_guest (installincludes) =3D=3D=3D> lib/libpam/modules/pam_krb5 (installincludes) =3D=3D=3D> lib/libpam/modules/pam_ksu (installincludes) =3D=3D=3D> lib/libpam/modules/pam_lastlog (installincludes) =3D=3D=3D> lib/libpam/modules/pam_login_access (installincludes) =3D=3D=3D> lib/libpam/modules/pam_nologin (installincludes) =3D=3D=3D> lib/libpam/modules/pam_opie (installincludes) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (installincludes) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (installincludes) =3D=3D=3D> lib/libpam/modules/pam_permit (installincludes) =3D=3D=3D> lib/libpam/modules/pam_radius (installincludes) =3D=3D=3D> lib/libpam/modules/pam_rhosts (installincludes) =3D=3D=3D> lib/libpam/modules/pam_rootok (installincludes) =3D=3D=3D> lib/libpam/modules/pam_securetty (installincludes) =3D=3D=3D> lib/libpam/modules/pam_self (installincludes) =3D=3D=3D> lib/libpam/modules/pam_ssh (installincludes) =3D=3D=3D> lib/libpam/modules/pam_tacplus (installincludes) =3D=3D=3D> lib/libpam/modules/pam_unix (installincludes) =3D=3D=3D> lib/libpam/libpam (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/include/securit= y/openpam.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpa= m/include/security/openpam_attr.h /zbuilder/buildd/head/lib/libpam/libpam/.= =2E/../../contrib/openpam/include/security/openpam_version.h /zbuilder/buil= dd/head/lib/libpam/libpam/../../../contrib/openpam/include/security/pam_app= l.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/includ= e/security/pam_constants.h /zbuilder/buildd/head/lib/libpam/libpam/../../..= /contrib/openpam/include/security/pam_modules.h /zbuilder/buildd/head/lib/l= ibpam/libpam/../../../contrib/openpam/include/security/pam_types.h /zbuilde= r/buildd/head/lib/libpam/libpam/security/pam_mod_misc.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include/security =3D=3D=3D> lib/libpcap (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpcap/../../contrib/libpcap/pcap.h /zbuilder/buildd/= head/lib/libpcap/../../contrib/libpcap/pcap-int.h /zbuilder/buildd/head/lib= /libpcap/../../contrib/libpcap/pcap-namedb.h /zbuilder/buildd/head/lib/libp= cap/../../contrib/libpcap/pcap-bpf.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpcap/../../contrib/libpcap/pcap/pcap.h /zbuilder/bu= ildd/head/lib/libpcap/../../contrib/libpcap/pcap/namedb.h /zbuilder/buildd/= head/lib/libpcap/../../contrib/libpcap/pcap/bpf.h /usr/obj/zbuilder/buildd/= head/tmp/usr/include/pcap =3D=3D=3D> lib/libpmc (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpmc/pmc.h /zbuilder/buildd/head/lib/libpmc/pmclog.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libproc (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libproc/libproc.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include =3D=3D=3D> lib/libprocstat (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libprocstat/libprocstat.h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include =3D=3D=3D> lib/libprocstat/zfs (installincludes) =3D=3D=3D> lib/librt (installincludes) =3D=3D=3D> lib/librtld_db (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/librtld_db/rtld_db.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libsdp (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libsdp/sdp.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/libsm (installincludes) =3D=3D=3D> lib/libsmdb (installincludes) =3D=3D=3D> lib/libsmutil (installincludes) =3D=3D=3D> lib/libstand (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libstand/stand.h /usr/obj/zbuilder/buildd/head/tmp/usr= /include =3D=3D=3D> lib/libstdbuf (installincludes) =3D=3D=3D> lib/libstdthreads (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libstdthreads/threads.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include =3D=3D=3D> lib/libtelnet (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libtelnet/../../contrib/telnet/arpa/telnet.h /usr/obj/= zbuilder/buildd/head/tmp/usr/include/arpa =3D=3D=3D> lib/libthr (installincludes) =3D=3D=3D> lib/libthread_db (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libthread_db/thread_db.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> lib/libufs (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libufs/libufs.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include =3D=3D=3D> lib/libugidfw (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libugidfw/ugidfw.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libulog (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libulog/ulog.h /zbuilder/buildd/head/lib/libulog/utemp= ter.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libusbhid (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libusbhid/usbhid.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libusb (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libusb/libusb20.h /zbuilder/buildd/head/lib/libusb/lib= usb20_desc.h /zbuilder/buildd/head/lib/libusb/usb.h /zbuilder/buildd/head/l= ib/libusb/libusb.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libvgl (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libvgl/vgl.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/libvmmapi (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libvmmapi/vmmapi.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libwrap (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libwrap/../../contrib/tcp_wrappers/tcpd.h /usr/obj/zbu= ilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/liby (installincludes) =3D=3D=3D> lib/libyaml (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 bsdym= l.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libz (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libz/zconf.h /zbuilder/buildd/head/lib/libz/zlib.h /us= r/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/atf (installincludes) =3D=3D=3D> lib/atf/libatf-c (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c.h /usr/obj/z= builder/buildd/head/tmp/usr/include/atf-c.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/build.h /zbuil= der/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/check.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/config.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/defs.h /zbuilder= /buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error.h /zbuilder/= buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error_fwd.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/macros.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tc.h /zbuilder/b= uildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tp.h /zbuilder/build= d/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/utils.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/atf-c =3D=3D=3D> lib/atf/libatf-c++ (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++.hpp /usr= /obj/zbuilder/buildd/head/tmp/usr/include/atf-c++.hpp sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++/build.hpp = /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++/check= =2Ehpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c+= +/config.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/= atf-c++/macros.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contri= b/atf/atf-c++/tests.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../c= ontrib/atf/atf-c++/utils.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/= atf-c++ =3D=3D=3D> lib/bind (installincludes) =3D=3D=3D> lib/bind/isc (installincludes) =3D=3D=3D> lib/bind/isccc (installincludes) =3D=3D=3D> lib/bind/dns (installincludes) =3D=3D=3D> lib/bind/isccfg (installincludes) =3D=3D=3D> lib/bind/bind9 (installincludes) =3D=3D=3D> lib/bind/lwres (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lw= res/context.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/l= ib/lwres/include/lwres/int.h /zbuilder/buildd/head/lib/bind/lwres/../../../= contrib/bind9/lib/lwres/include/lwres/ipv6.h /zbuilder/buildd/head/lib/bind= /lwres/../../../contrib/bind9/lib/lwres/include/lwres/lang.h /zbuilder/buil= dd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lwres/list.= h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/inc= lude/lwres/lwbuffer.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib= /bind9/lib/lwres/include/lwres/lwpacket.h /zbuilder/buildd/head/lib/bind/lw= res/../../../contrib/bind9/lib/lwres/include/lwres/lwres.h /zbuilder/buildd= /head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lwres/result.= h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/inc= lude/lwres/version.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/= bind9/lib/lwres/unix/include/lwres/net.h /zbuilder/buildd/head/lib/bind/lwr= es/lwres/netdb.h /zbuilder/buildd/head/lib/bind/lwres/lwres/platform.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/lwres =3D=3D=3D> lib/clang (installincludes) =3D=3D=3D> lib/clang/libclanganalysis (installincludes) =3D=3D=3D> lib/clang/libclangarcmigrate (installincludes) =3D=3D=3D> lib/clang/libclangast (installincludes) =3D=3D=3D> lib/clang/libclangbasic (installincludes) =3D=3D=3D> lib/clang/libclangcodegen (installincludes) =3D=3D=3D> lib/clang/libclangdriver (installincludes) =3D=3D=3D> lib/clang/libclangedit (installincludes) =3D=3D=3D> lib/clang/libclangfrontend (installincludes) =3D=3D=3D> lib/clang/libclangfrontendtool (installincludes) =3D=3D=3D> lib/clang/libclanglex (installincludes) =3D=3D=3D> lib/clang/libclangparse (installincludes) =3D=3D=3D> lib/clang/libclangrewritecore (installincludes) =3D=3D=3D> lib/clang/libclangrewritefrontend (installincludes) =3D=3D=3D> lib/clang/libclangsema (installincludes) =3D=3D=3D> lib/clang/libclangserialization (installincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (installincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (installincludes) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (installincludes) =3D=3D=3D> lib/clang/libllvmanalysis (installincludes) =3D=3D=3D> lib/clang/libllvmarchive (installincludes) =3D=3D=3D> lib/clang/libllvmasmparser (installincludes) =3D=3D=3D> lib/clang/libllvmasmprinter (installincludes) =3D=3D=3D> lib/clang/libllvmbitreader (installincludes) =3D=3D=3D> lib/clang/libllvmbitwriter (installincludes) =3D=3D=3D> lib/clang/libllvmcodegen (installincludes) =3D=3D=3D> lib/clang/libllvmcore (installincludes) =3D=3D=3D> lib/clang/libllvminstcombine (installincludes) =3D=3D=3D> lib/clang/libllvminstrumentation (installincludes) =3D=3D=3D> lib/clang/libllvmipa (installincludes) =3D=3D=3D> lib/clang/libllvmipo (installincludes) =3D=3D=3D> lib/clang/libllvmirreader (installincludes) =3D=3D=3D> lib/clang/libllvmlinker (installincludes) =3D=3D=3D> lib/clang/libllvmmc (installincludes) =3D=3D=3D> lib/clang/libllvmmcparser (installincludes) =3D=3D=3D> lib/clang/libllvmobjcarcopts (installincludes) =3D=3D=3D> lib/clang/libllvmobject (installincludes) =3D=3D=3D> lib/clang/libllvmscalaropts (installincludes) =3D=3D=3D> lib/clang/libllvmselectiondag (installincludes) =3D=3D=3D> lib/clang/libllvmsupport (installincludes) =3D=3D=3D> lib/clang/libllvmtablegen (installincludes) =3D=3D=3D> lib/clang/libllvmtarget (installincludes) =3D=3D=3D> lib/clang/libllvmtransformutils (installincludes) =3D=3D=3D> lib/clang/libllvmvectorize (installincludes) =3D=3D=3D> lib/clang/libllvmarmasmparser (installincludes) =3D=3D=3D> lib/clang/libllvmarmcodegen (installincludes) =3D=3D=3D> lib/clang/libllvmarmdesc (installincludes) =3D=3D=3D> lib/clang/libllvmarmdisassembler (installincludes) =3D=3D=3D> lib/clang/libllvmarminfo (installincludes) =3D=3D=3D> lib/clang/libllvmarminstprinter (installincludes) =3D=3D=3D> lib/clang/libllvmmipsasmparser (installincludes) =3D=3D=3D> lib/clang/libllvmmipscodegen (installincludes) =3D=3D=3D> lib/clang/libllvmmipsdesc (installincludes) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (installincludes) =3D=3D=3D> lib/clang/libllvmmipsinfo (installincludes) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (installincludes) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (installincludes) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (installincludes) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (installincludes) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (installincludes) =3D=3D=3D> lib/clang/libllvmx86asmparser (installincludes) =3D=3D=3D> lib/clang/libllvmx86codegen (installincludes) =3D=3D=3D> lib/clang/libllvmx86desc (installincludes) =3D=3D=3D> lib/clang/libllvmx86disassembler (installincludes) =3D=3D=3D> lib/clang/libllvmx86info (installincludes) =3D=3D=3D> lib/clang/libllvmx86instprinter (installincludes) =3D=3D=3D> lib/clang/libllvmx86utils (installincludes) =3D=3D=3D> lib/clang/include (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/He= aders/__wmmintrin_aes.h /zbuilder/buildd/head/lib/clang/include/../../../co= ntrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h /zbuilder/buildd/he= ad/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/altivec.= h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang= /lib/Headers/ammintrin.h /zbuilder/buildd/head/lib/clang/include/../../../c= ontrib/llvm/tools/clang/lib/Headers/avx2intrin.h /zbuilder/buildd/head/lib/= clang/include/../../../contrib/llvm/tools/clang/lib/Headers/avxintrin.h /zb= uilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/= Headers/bmi2intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contr= ib/llvm/tools/clang/lib/Headers/bmiintrin.h /zbuilder/buildd/head/lib/clang= /include/../../../contrib/llvm/tools/clang/lib/Headers/cpuid.h /zbuilder/bu= ildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/e= mmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/to= ols/clang/lib/Headers/f16cintrin.h /zbuilder/buildd/head/lib/clang/include/= =2E./../../contrib/llvm/tools/clang/lib/Headers/fma4intrin.h /zbuilder/buil= dd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/fma= intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tool= s/clang/lib/Headers/immintrin.h /zbuilder/buildd/head/lib/clang/include/../= =2E./../contrib/llvm/tools/clang/lib/Headers/lzcntintrin.h /zbuilder/buildd= /head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/mm3dn= ow.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/cl= ang/lib/Headers/mm_malloc.h /zbuilder/buildd/head/lib/clang/include/../../.= =2E/contrib/llvm/tools/clang/lib/Headers/mmintrin.h /zbuilder/buildd/head/l= ib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/module.map /= zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/li= b/Headers/nmmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/pmmintrin.h /zbuilder/buildd/head/lib/clan= g/include/../../../contrib/llvm/tools/clang/lib/Headers/popcntintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/prfchwintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/rdseedintrin.h /zbuilder/buildd/head/lib/c= lang/include/../../../contrib/llvm/tools/clang/lib/Headers/rtmintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/smmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib= /llvm/tools/clang/lib/Headers/tmmintrin.h /zbuilder/buildd/head/lib/clang/i= nclude/../../../contrib/llvm/tools/clang/lib/Headers/wmmintrin.h /zbuilder/= buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers= /x86intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/= tools/clang/lib/Headers/xmmintrin.h /zbuilder/buildd/head/lib/clang/include= /../../../contrib/llvm/tools/clang/lib/Headers/xopintrin.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/clang/3.3 =3D=3D=3D> libexec (includes) set -e; cd /zbuilder/buildd/head/libexec; /usr/obj/zbuilder/buildd/head/mak= e.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make i= nstallincludes =3D=3D=3D> libexec/atf (buildincludes) =3D=3D=3D> libexec/atf/atf-check (buildincludes) =3D=3D=3D> libexec/atrun (buildincludes) =3D=3D=3D> libexec/bootpd (buildincludes) =3D=3D=3D> libexec/bootpd/bootpgw (buildincludes) =3D=3D=3D> libexec/bootpd/tools (buildincludes) =3D=3D=3D> libexec/bootpd/tools/bootpef (buildincludes) =3D=3D=3D> libexec/bootpd/tools/bootptest (buildincludes) =3D=3D=3D> libexec/comsat (buildincludes) =3D=3D=3D> libexec/fingerd (buildincludes) =3D=3D=3D> libexec/ftpd (buildincludes) =3D=3D=3D> libexec/getty (buildincludes) =3D=3D=3D> libexec/mail.local (buildincludes) =3D=3D=3D> libexec/mknetid (buildincludes) =3D=3D=3D> libexec/pppoed (buildincludes) =3D=3D=3D> libexec/rbootd (buildincludes) =3D=3D=3D> libexec/revnetgroup (buildincludes) =3D=3D=3D> libexec/rlogind (buildincludes) =3D=3D=3D> libexec/rpc.rquotad (buildincludes) =3D=3D=3D> libexec/rpc.rstatd (buildincludes) =3D=3D=3D> libexec/rpc.rusersd (buildincludes) =3D=3D=3D> libexec/rpc.rwalld (buildincludes) =3D=3D=3D> libexec/rpc.sprayd (buildincludes) =3D=3D=3D> libexec/rshd (buildincludes) =3D=3D=3D> libexec/rtld-elf (buildincludes) =3D=3D=3D> libexec/save-entropy (buildincludes) =3D=3D=3D> libexec/smrsh (buildincludes) =3D=3D=3D> libexec/talkd (buildincludes) =3D=3D=3D> libexec/tcpd (buildincludes) =3D=3D=3D> libexec/telnetd (buildincludes) =3D=3D=3D> libexec/tftpd (buildincludes) =3D=3D=3D> libexec/tftp-proxy (buildincludes) =3D=3D=3D> libexec/ulog-helper (buildincludes) =3D=3D=3D> libexec/ypxfr (buildincludes) =3D=3D=3D> libexec/atf (installincludes) =3D=3D=3D> libexec/atf/atf-check (installincludes) =3D=3D=3D> libexec/atrun (installincludes) =3D=3D=3D> libexec/bootpd (installincludes) =3D=3D=3D> libexec/bootpd/bootpgw (installincludes) =3D=3D=3D> libexec/bootpd/tools (installincludes) =3D=3D=3D> libexec/bootpd/tools/bootpef (installincludes) =3D=3D=3D> libexec/bootpd/tools/bootptest (installincludes) =3D=3D=3D> libexec/comsat (installincludes) =3D=3D=3D> libexec/fingerd (installincludes) =3D=3D=3D> libexec/ftpd (installincludes) =3D=3D=3D> libexec/getty (installincludes) =3D=3D=3D> libexec/mail.local (installincludes) =3D=3D=3D> libexec/mknetid (installincludes) =3D=3D=3D> libexec/pppoed (installincludes) =3D=3D=3D> libexec/rbootd (installincludes) =3D=3D=3D> libexec/revnetgroup (installincludes) =3D=3D=3D> libexec/rlogind (installincludes) =3D=3D=3D> libexec/rpc.rquotad (installincludes) =3D=3D=3D> libexec/rpc.rstatd (installincludes) =3D=3D=3D> libexec/rpc.rusersd (installincludes) =3D=3D=3D> libexec/rpc.rwalld (installincludes) =3D=3D=3D> libexec/rpc.sprayd (installincludes) =3D=3D=3D> libexec/rshd (installincludes) =3D=3D=3D> libexec/rtld-elf (installincludes) =3D=3D=3D> libexec/save-entropy (installincludes) =3D=3D=3D> libexec/smrsh (installincludes) =3D=3D=3D> libexec/talkd (installincludes) =3D=3D=3D> libexec/tcpd (installincludes) =3D=3D=3D> libexec/telnetd (installincludes) =3D=3D=3D> libexec/tftpd (installincludes) =3D=3D=3D> libexec/tftp-proxy (installincludes) =3D=3D=3D> libexec/ulog-helper (installincludes) =3D=3D=3D> libexec/ypxfr (installincludes) =3D=3D=3D> bin (includes) set -e; cd /zbuilder/buildd/head/bin; /usr/obj/zbuilder/buildd/head/make.am= d64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make insta= llincludes =3D=3D=3D> bin/cat (buildincludes) =3D=3D=3D> bin/chflags (buildincludes) =3D=3D=3D> bin/chio (buildincludes) =3D=3D=3D> bin/chmod (buildincludes) =3D=3D=3D> bin/cp (buildincludes) =3D=3D=3D> bin/csh (buildincludes) =3D=3D=3D> bin/date (buildincludes) =3D=3D=3D> bin/dd (buildincludes) =3D=3D=3D> bin/df (buildincludes) =3D=3D=3D> bin/domainname (buildincludes) =3D=3D=3D> bin/echo (buildincludes) =3D=3D=3D> bin/ed (buildincludes) =3D=3D=3D> bin/expr (buildincludes) =3D=3D=3D> bin/getfacl (buildincludes) =3D=3D=3D> bin/hostname (buildincludes) =3D=3D=3D> bin/kenv (buildincludes) =3D=3D=3D> bin/kill (buildincludes) =3D=3D=3D> bin/ln (buildincludes) =3D=3D=3D> bin/ls (buildincludes) =3D=3D=3D> bin/mkdir (buildincludes) =3D=3D=3D> bin/mv (buildincludes) =3D=3D=3D> bin/pax (buildincludes) =3D=3D=3D> bin/pkill (buildincludes) =3D=3D=3D> bin/ps (buildincludes) =3D=3D=3D> bin/pwait (buildincludes) =3D=3D=3D> bin/pwd (buildincludes) =3D=3D=3D> bin/rcp (buildincludes) =3D=3D=3D> bin/realpath (buildincludes) =3D=3D=3D> bin/rm (buildincludes) =3D=3D=3D> bin/rmail (buildincludes) =3D=3D=3D> bin/rmdir (buildincludes) =3D=3D=3D> bin/setfacl (buildincludes) =3D=3D=3D> bin/sh (buildincludes) =3D=3D=3D> bin/sleep (buildincludes) =3D=3D=3D> bin/stty (buildincludes) =3D=3D=3D> bin/sync (buildincludes) =3D=3D=3D> bin/test (buildincludes) =3D=3D=3D> bin/uuidgen (buildincludes) =3D=3D=3D> bin/cat (installincludes) =3D=3D=3D> bin/chflags (installincludes) =3D=3D=3D> bin/chio (installincludes) =3D=3D=3D> bin/chmod (installincludes) =3D=3D=3D> bin/cp (installincludes) =3D=3D=3D> bin/csh (installincludes) =3D=3D=3D> bin/date (installincludes) =3D=3D=3D> bin/dd (installincludes) =3D=3D=3D> bin/df (installincludes) =3D=3D=3D> bin/domainname (installincludes) =3D=3D=3D> bin/echo (installincludes) =3D=3D=3D> bin/ed (installincludes) =3D=3D=3D> bin/expr (installincludes) =3D=3D=3D> bin/getfacl (installincludes) =3D=3D=3D> bin/hostname (installincludes) =3D=3D=3D> bin/kenv (installincludes) =3D=3D=3D> bin/kill (installincludes) =3D=3D=3D> bin/ln (installincludes) =3D=3D=3D> bin/ls (installincludes) =3D=3D=3D> bin/mkdir (installincludes) =3D=3D=3D> bin/mv (installincludes) =3D=3D=3D> bin/pax (installincludes) =3D=3D=3D> bin/pkill (installincludes) =3D=3D=3D> bin/ps (installincludes) =3D=3D=3D> bin/pwait (installincludes) =3D=3D=3D> bin/pwd (installincludes) =3D=3D=3D> bin/rcp (installincludes) =3D=3D=3D> bin/realpath (installincludes) =3D=3D=3D> bin/rm (installincludes) =3D=3D=3D> bin/rmail (installincludes) =3D=3D=3D> bin/rmdir (installincludes) =3D=3D=3D> bin/setfacl (installincludes) =3D=3D=3D> bin/sh (installincludes) =3D=3D=3D> bin/sleep (installincludes) =3D=3D=3D> bin/stty (installincludes) =3D=3D=3D> bin/sync (installincludes) =3D=3D=3D> bin/test (installincludes) =3D=3D=3D> bin/uuidgen (installincludes) =3D=3D=3D> games (includes) set -e; cd /zbuilder/buildd/head/games; /usr/obj/zbuilder/buildd/head/make.= amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make ins= tallincludes =3D=3D=3D> games/bcd (buildincludes) =3D=3D=3D> games/caesar (buildincludes) =3D=3D=3D> games/factor (buildincludes) =3D=3D=3D> games/fortune (buildincludes) =3D=3D=3D> games/fortune/fortune (buildincludes) =3D=3D=3D> games/fortune/strfile (buildincludes) =3D=3D=3D> games/fortune/datfiles (buildincludes) =3D=3D=3D> games/fortune/unstr (buildincludes) =3D=3D=3D> games/grdc (buildincludes) =3D=3D=3D> games/morse (buildincludes) =3D=3D=3D> games/number (buildincludes) =3D=3D=3D> games/pom (buildincludes) =3D=3D=3D> games/ppt (buildincludes) =3D=3D=3D> games/primes (buildincludes) =3D=3D=3D> games/random (buildincludes) =3D=3D=3D> games/bcd (installincludes) =3D=3D=3D> games/caesar (installincludes) =3D=3D=3D> games/factor (installincludes) =3D=3D=3D> games/fortune (installincludes) =3D=3D=3D> games/fortune/fortune (installincludes) =3D=3D=3D> games/fortune/strfile (installincludes) =3D=3D=3D> games/fortune/datfiles (installincludes) =3D=3D=3D> games/fortune/unstr (installincludes) =3D=3D=3D> games/grdc (installincludes) =3D=3D=3D> games/morse (installincludes) =3D=3D=3D> games/number (installincludes) =3D=3D=3D> games/pom (installincludes) =3D=3D=3D> games/ppt (installincludes) =3D=3D=3D> games/primes (installincludes) =3D=3D=3D> games/random (installincludes) =3D=3D=3D> cddl (includes) set -e; cd /zbuilder/buildd/head/cddl; /usr/obj/zbuilder/buildd/head/make.a= md64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make inst= allincludes =3D=3D=3D> cddl/lib (buildincludes) =3D=3D=3D> cddl/lib/drti (buildincludes) =3D=3D=3D> cddl/lib/libavl (buildincludes) =3D=3D=3D> cddl/lib/libctf (buildincludes) =3D=3D=3D> cddl/lib/libdtrace (buildincludes) =3D=3D=3D> cddl/lib/libnvpair (buildincludes) =3D=3D=3D> cddl/lib/libumem (buildincludes) =3D=3D=3D> cddl/lib/libuutil (buildincludes) =3D=3D=3D> cddl/lib/libzfs_core (buildincludes) =3D=3D=3D> cddl/lib/libzfs (buildincludes) =3D=3D=3D> cddl/lib/libzpool (buildincludes) =3D=3D=3D> cddl/sbin (buildincludes) =3D=3D=3D> cddl/sbin/zfs (buildincludes) =3D=3D=3D> cddl/sbin/zpool (buildincludes) =3D=3D=3D> cddl/usr.bin (buildincludes) =3D=3D=3D> cddl/usr.bin/ctfconvert (buildincludes) =3D=3D=3D> cddl/usr.bin/ctfdump (buildincludes) =3D=3D=3D> cddl/usr.bin/ctfmerge (buildincludes) =3D=3D=3D> cddl/usr.bin/sgsmsg (buildincludes) =3D=3D=3D> cddl/usr.bin/zinject (buildincludes) =3D=3D=3D> cddl/usr.bin/zstreamdump (buildincludes) =3D=3D=3D> cddl/usr.bin/ztest (buildincludes) =3D=3D=3D> cddl/usr.sbin (buildincludes) =3D=3D=3D> cddl/usr.sbin/dtrace (buildincludes) =3D=3D=3D> cddl/usr.sbin/dtruss (buildincludes) =3D=3D=3D> cddl/usr.sbin/lockstat (buildincludes) =3D=3D=3D> cddl/usr.sbin/zdb (buildincludes) =3D=3D=3D> cddl/usr.sbin/zhack (buildincludes) =3D=3D=3D> cddl/lib (installincludes) =3D=3D=3D> cddl/lib/drti (installincludes) =3D=3D=3D> cddl/lib/libavl (installincludes) =3D=3D=3D> cddl/lib/libctf (installincludes) =3D=3D=3D> cddl/lib/libdtrace (installincludes) =3D=3D=3D> cddl/lib/libnvpair (installincludes) =3D=3D=3D> cddl/lib/libumem (installincludes) =3D=3D=3D> cddl/lib/libuutil (installincludes) =3D=3D=3D> cddl/lib/libzfs_core (installincludes) =3D=3D=3D> cddl/lib/libzfs (installincludes) =3D=3D=3D> cddl/lib/libzpool (installincludes) =3D=3D=3D> cddl/sbin (installincludes) =3D=3D=3D> cddl/sbin/zfs (installincludes) =3D=3D=3D> cddl/sbin/zpool (installincludes) =3D=3D=3D> cddl/usr.bin (installincludes) =3D=3D=3D> cddl/usr.bin/ctfconvert (installincludes) =3D=3D=3D> cddl/usr.bin/ctfdump (installincludes) =3D=3D=3D> cddl/usr.bin/ctfmerge (installincludes) =3D=3D=3D> cddl/usr.bin/sgsmsg (installincludes) =3D=3D=3D> cddl/usr.bin/zinject (installincludes) =3D=3D=3D> cddl/usr.bin/zstreamdump (installincludes) =3D=3D=3D> cddl/usr.bin/ztest (installincludes) =3D=3D=3D> cddl/usr.sbin (installincludes) =3D=3D=3D> cddl/usr.sbin/dtrace (installincludes) =3D=3D=3D> cddl/usr.sbin/dtruss (installincludes) =3D=3D=3D> cddl/usr.sbin/lockstat (installincludes) =3D=3D=3D> cddl/usr.sbin/zdb (installincludes) =3D=3D=3D> cddl/usr.sbin/zhack (installincludes) =3D=3D=3D> gnu (includes) set -e; cd /zbuilder/buildd/head/gnu; /usr/obj/zbuilder/buildd/head/make.am= d64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make insta= llincludes =3D=3D=3D> gnu/lib (buildincludes) =3D=3D=3D> gnu/lib/csu (buildincludes) =3D=3D=3D> gnu/lib/libgcc (buildincludes) =3D=3D=3D> gnu/lib/libgcov (buildincludes) =3D=3D=3D> gnu/lib/libdialog (buildincludes) =3D=3D=3D> gnu/lib/libgomp (buildincludes) =3D=3D=3D> gnu/lib/libregex (buildincludes) =3D=3D=3D> gnu/lib/libregex/doc (buildincludes) =3D=3D=3D> gnu/lib/libreadline (buildincludes) =3D=3D=3D> gnu/lib/libreadline/history (buildincludes) =3D=3D=3D> gnu/lib/libreadline/history/doc (buildincludes) =3D=3D=3D> gnu/lib/libreadline/readline (buildincludes) =3D=3D=3D> gnu/lib/libreadline/readline/doc (buildincludes) =3D=3D=3D> gnu/lib/libssp (buildincludes) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (buildincludes) =3D=3D=3D> gnu/lib/libstdc++ (buildincludes) =3D=3D=3D> gnu/lib/libsupc++ (buildincludes) =3D=3D=3D> gnu/usr.bin (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/ar (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/as (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/ld (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/nm (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/objdump (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/readelf (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/size (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/strings (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/strip (buildincludes) =3D=3D=3D> gnu/usr.bin/binutils/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/cc (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cc_tools (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/libiberty (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/libcpp (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/libdecnumber (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cc_int (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cc (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cc1 (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/include (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cpp (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/cc1plus (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/c++ (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/c++filt (buildincludes) =3D=3D=3D> gnu/usr.bin/cc/gcov (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/lib (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/libdiff (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/cvs (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/contrib (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/cvsbug (buildincludes) =3D=3D=3D> gnu/usr.bin/cvs/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/dialog (buildincludes) =3D=3D=3D> gnu/usr.bin/diff (buildincludes) =3D=3D=3D> gnu/usr.bin/diff/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/diff3 (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/libgdb (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdb (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdbtui (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/kgdb (buildincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdbserver (buildincludes) =3D=3D=3D> gnu/usr.bin/gperf (buildincludes) =3D=3D=3D> gnu/usr.bin/gperf/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/grep (buildincludes) =3D=3D=3D> gnu/usr.bin/grep/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/groff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/contrib (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devps (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/man (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (buildincludes) =3D=3D=3D> gnu/usr.bin/groff/tmac (buildincludes) =3D=3D=3D> gnu/usr.bin/patch (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/lib (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/ci (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/co (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/ident (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/merge (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcs (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsclean (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsdiff (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsmerge (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rlog (buildincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsfreeze (buildincludes) =3D=3D=3D> gnu/usr.bin/sdiff (buildincludes) =3D=3D=3D> gnu/usr.bin/send-pr (buildincludes) =3D=3D=3D> gnu/usr.bin/send-pr/doc (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/libtxi (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/makeinfo (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/info (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/infokey (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/install-info (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/texindex (buildincludes) =3D=3D=3D> gnu/usr.bin/texinfo/doc (buildincludes) =3D=3D=3D> gnu/lib (installincludes) =3D=3D=3D> gnu/lib/csu (installincludes) =3D=3D=3D> gnu/lib/libgcc (installincludes) =3D=3D=3D> gnu/lib/libgcov (installincludes) =3D=3D=3D> gnu/lib/libdialog (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libdialog/../../../contrib/dialog/dialog.h /zbuild= er/buildd/head/gnu/lib/libdialog/../../../contrib/dialog/dlg_colors.h /zbui= lder/buildd/head/gnu/lib/libdialog/dlg_config.h /zbuilder/buildd/head/gnu/l= ib/libdialog/../../../contrib/dialog/dlg_keys.h /usr/obj/zbuilder/buildd/he= ad/tmp/usr/include =3D=3D=3D> gnu/lib/libgomp (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 omp.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> gnu/lib/libregex (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 regex= =2Eh.patched /usr/obj/zbuilder/buildd/head/tmp/usr/include/gnu/regex.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libregex/gnuregex.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libregex/../../../contrib/libgnuregex/regex.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/gnu/posix =3D=3D=3D> gnu/lib/libregex/doc (installincludes) =3D=3D=3D> gnu/lib/libreadline (installincludes) =3D=3D=3D> gnu/lib/libreadline/history (installincludes) =3D=3D=3D> gnu/lib/libreadline/history/doc (installincludes) =3D=3D=3D> gnu/lib/libreadline/readline (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libreadline/readline/../../../../contrib/libreadli= ne/readline.h /zbuilder/buildd/head/gnu/lib/libreadline/readline/../../../.= =2E/contrib/libreadline/chardefs.h /zbuilder/buildd/head/gnu/lib/libreadlin= e/readline/../../../../contrib/libreadline/keymaps.h /zbuilder/buildd/head/= gnu/lib/libreadline/readline/../../../../contrib/libreadline/history.h /zbu= ilder/buildd/head/gnu/lib/libreadline/readline/../../../../contrib/libreadl= ine/tilde.h /zbuilder/buildd/head/gnu/lib/libreadline/readline/../../../../= contrib/libreadline/rlstdc.h /zbuilder/buildd/head/gnu/lib/libreadline/read= line/../../../../contrib/libreadline/rlconf.h /zbuilder/buildd/head/gnu/lib= /libreadline/readline/../../../../contrib/libreadline/rltypedefs.h /usr/obj= /zbuilder/buildd/head/tmp/usr/include/readline =3D=3D=3D> gnu/lib/libreadline/readline/doc (installincludes) =3D=3D=3D> gnu/lib/libssp (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 ssp.h= /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs/libssp/ssp/s= tring.h /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs/libss= p/ssp/stdio.h /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs= /libssp/ssp/unistd.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/ssp =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (installincludes) =3D=3D=3D> gnu/lib/libstdc++ (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= allocator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/bits/basic_ios.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/bits/basic_ios.tcc /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/bits/basic_string.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= basic_string.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/bits/boost_concept_check.h /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/bits/char_traits.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/codecvt= =2Eh /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/bits/concept_check.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/bits/cpp_type_traits.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/bits/deque.tcc /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/fstrea= m.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/bits/functexcept.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/bits/gslice.h /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/bits/gslice_array.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/indirect_ar= ray.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/bits/ios_base.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/bits/istream.tcc /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/bits/list.tcc /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/locale_classes.h = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= bits/locale_facets.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/bits/locale_facets.tcc /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/bits/localefwd.h /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/mask_arra= y.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/bits/ostream.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/bits/ostream_insert.h /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/bits/postypes.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stream_iter= ator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/bits/streambuf_iterator.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/slice_array.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/bits/sstream.tcc /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/s= tl_algo.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/bits/stl_algobase.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/bits/stl_bvector.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_construct.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= stl_deque.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/bits/stl_function.h /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/bits/stl_heap.h /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_iterator.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= stl_iterator_base_funcs.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/bits/stl_iterator_base_types.h /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_list.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bi= ts/stl_map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/stl_multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/stl_multiset.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_numeric.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bit= s/stl_pair.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/stl_queue.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/bits/stl_raw_storage_iter.h /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_relops.h= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /bits/stl_set.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/bits/stl_stack.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/stl_tempbuf.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_tree.h /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/st= l_uninitialized.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/bits/stl_vector.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/bits/streambuf.tcc /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stringfwd.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bit= s/valarray_array.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/bits/valarray_array.tcc /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/bits/valarray_before.h /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/vala= rray_after.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/vector.tcc /usr/obj/zbuilder/buildd/head/tmp/usr/include/= c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backw= ard/complex.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/backward/iomanip.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/backward/istream.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/backward/ostream.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/back= ward/stream.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/backward/streambuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/backward/algo.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/algobase.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ba= ckward/alloc.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/backward/bvector.h /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/backward/defalloc.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/deque.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ba= ckward/function.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/backward/hash_map.h /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/backward/hash_set.h /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/hashtabl= e.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/backward/heap.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/backward/iostream.h /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/backward/iterator.h /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/list.h= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /backward/map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/backward/multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/backward/new.h /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/backward/multiset.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/back= ward/pair.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/backward/queue.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/backward/rope.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/backward/set.h /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/slis= t.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/backward/stack.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/backward/tempbuf.h /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/backward/tree.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/vector.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/b= ackward/fstream.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/backward/strstream /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/backward/backward_warning.h /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/backward sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/a= lgorithm /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/atomicity.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/array_allocator.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/bitmap_allocator.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/c= odecvt_specializations.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/concurrence.h /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/debug_allocator.h /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/stdio_= filebuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/stdio_sync_filebuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/functional /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/hash_map /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/hash_s= et /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/hash_fun.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/hashtable.h /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/iterator /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/malloc_allocator.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /memory /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/mt_allocator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/ext/new_allocator.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/numeric /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/numeric_trai= ts.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/ext/pod_char_traits.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/ext/pool_allocator.h /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/ext/rb_tree /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/rope /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/ro= peimpl.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/slist /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/throw_allocator.h /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/typelist.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/type_traits.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/e= xt/rc_string_base.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/ext/sso_string_base.h /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/vstring.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/vstring.tcc /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /vstring_fwd.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/ext/vstring_util.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude/c++/4.2/ext sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cassert.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cass= ert sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cctype sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cerrno.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cerrno sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cfloat.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cfloat sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_ciso646.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ciso= 646 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_climits.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/clim= its sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_clocale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cloc= ale sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cmath.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cmath sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_csetjmp.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cset= jmp sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_csignal.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/csig= nal sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdarg.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= arg sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstddef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= def sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstdio sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdlib.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= lib sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstring.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstr= ing sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_ctime.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ctime sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cwchar.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cwchar sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cwctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cwct= ype sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_std= /cmath.tcc /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_algorithm.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/algo= rithm sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_bitset.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bitset sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_complex.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/complex sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_deque.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/deque sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_fstream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/fstream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_functional.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/fun= ctional sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iomanip.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iomanip sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_ios.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ios sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iosfwd.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iosfwd sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iostream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iostr= eam sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_istream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/istream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iterator.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/itera= tor sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_limits.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/limits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_list.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/list sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_locale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/locale sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_map.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/map sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_memory.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/memory sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_numeric.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/numeric sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_ostream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ostream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_queue.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/queue sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_set.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/set sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_sstream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/sstream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_stack.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stack sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_stdexcept.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stde= xcept sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_streambuf.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stre= ambuf sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_string.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/string sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_utility.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/utility sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_valarray.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/valar= ray sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_vector.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/vector sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/alloc= ator/new_allocator_base.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c+= +/4.2/bits/c++allocator.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/io/ba= sic_file_stdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bit= s/basic_file.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/io/c_= io_stdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits/c++i= o.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/local= e/generic/c_locale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2= /bits/c++locale.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/abi/co= mpatibility.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/config/locale/generic/c++locale_internal.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/config/locale/generic/messages_mem= bers.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/c= onfig/locale/generic/time_members.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/config/os/bsd/freebsd/ctype_base.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/os/bsd/freebs= d/ctype_inline.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/config/os/bsd/freebsd/ctype_noninline.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/config/os/bsd/freebsd/os_defines.h= c++config.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/config/cpu/generic/atomic_word.h /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/config/cpu/generic/cpu_defines.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/cpu/generic/c= xxabi_tweaks.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 gthr.= h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug= /bitset /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/debug/debug.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/debug/deque /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/debug/formatter.h /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/functions.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/deb= ug/hash_map /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/debug/hash_map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/debug/hash_multimap.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/hash_multiset.h = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= debug/hash_set /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/debug/hash_set.h /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/debug/list /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/debug/macros.h /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/map /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug= /map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/debug/multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/debug/multiset.h /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/debug/safe_base.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/safe_itera= tor.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/debug/safe_iterator.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/debug/safe_sequence.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/debug/set /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/set.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/d= ebug/string /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/debug/vector /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/= 4.2/debug sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/a= rray /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/tr1/bind_repeat.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/tr1/bind_iterate.h /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/tr1/boost_shared_ptr.h /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/cctype= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /tr1/cfenv /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/tr1/cfloat /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/tr1/cinttypes /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/tr1/climits /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/tr1/cmath /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/common.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/= complex /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/tr1/cstdarg /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/tr1/cstdbool /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/tr1/cstdint /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/tr1/cstdio /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/cstdlib /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/ctg= math /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/tr1/ctime /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/tr1/ctype.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/tr1/cwchar /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/tr1/cwctype /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/tr1/fenv.h /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/float.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr= 1/functional /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/tr1/functional_hash.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/tr1/functional_iterate.h /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/hashtable= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /tr1/hashtable_policy.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/tr1/inttypes.h /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/tr1/limits.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/math.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/memory /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/t= r1/mu_iterate.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/tr1/random /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/tr1/random.tcc /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/tr1/ref_fwd.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/ref_wrap_iterat= e.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/tr1/repeat.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/tr1/stdarg.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/stdbool.h /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/tr1/stdint.h /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/stdio.h /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/st= dlib.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/tr1/tgmath.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/tr1/tuple /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/tuple_defs.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/tr1/tuple_iterate.h /zbuilde= r/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/type= _traits /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/tr1/type_traits_fwd.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/unordered_set /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/tr1/unordered_map /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/utili= ty /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/tr1/wchar.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/tr1/wctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c= ++/4.2/tr1 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/assoc_container.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/exception.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/hash_policy.hpp = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= ext/pb_ds/list_update_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/priority_queue.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/tag= _and_trait.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/ext/pb_ds/tree_policy.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/trie_policy.hpp /usr/obj= /zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/basic_types.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/cond_dealtor.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/container_base_d= ispatch.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/ext/pb_ds/detail/map_debug_base.hpp /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/priority_q= ueue_base_dispatch.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/standard_policies.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/tree_trace_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/type_utils.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ty= pes_traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb= _ds/detail sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/pairing_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/pairing_heap_/erase_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= pairing_heap_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/detail/pairing_heap_/pairing_hea= p_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp /usr/obj/zbuil= der/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detai= l/splay_tree_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/erase_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/splay_= tree_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/splay_tree_/node.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/splay_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/splay= _tree_/split_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/traits.hpp /usr/= obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/splay_tre= e_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/list_update_map_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/= entry_metadata_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_u= pdate_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/insert_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/list_update_map_/lu_map_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/trac= e_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_= ds/detail/list_update_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/b= asic_tree_policy/null_node_metadata.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/basic_tree_policy/= traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/= detail/basic_tree_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/trie_policy/node_metadata_selector.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/trie_po= licy/null_node_update_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/order_statistics= _imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= trie_policy/sample_trie_node_update.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/string= _trie_e_access_traits_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/trie_policy_base= =2Ehpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/deta= il/trie_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_= hash_table_map_/debug_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table= _map_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_= hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_im= ps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detai= l/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_has= h_table_map_/find_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map= _/gp_ht_map_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_= table_map_/insert_no_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_= map_/insert_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/it= erator_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_= hash_table_map_/resize_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_tabl= e_map_/standard_policies.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/trace_fn= _imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/d= etail/gp_hash_table_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/tree_policy/node_metadata_selector.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/tree_po= licy/null_node_update_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/tree_policy/order_statistics= _imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp /usr/obj/= zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/tree_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bi= nomial_heap_base_/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bino= mial_heap_base_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_heap_base_/er= ase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_base_/insert_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomia= l_heap_base_/split_join_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude/c++/4.2/ext/pb_ds/detail/binomial_heap_base_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/= detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/resize_policy/hash_prime_size_policy_imp.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/resiz= e_policy/hash_standard_resize_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/resize_policy= /sample_resize_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/resize_policy/sample_resize_trig= ger.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp /usr/obj/zbui= lder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/resize_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/bin_search_tree_/bin_search_tree_.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_sear= ch_tree_/cond_dtor_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/cond= _key_dtor_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/constructor= s_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_= search_tree_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/info_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /bin_search_tree_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/n= ode_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/b= in_search_tree_/r_erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/rotat= e_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/bin_search_tree_/traits.hpp /usr/obj/zbuilder/buildd/head/tmp/= usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_/binomial_heap_.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_hea= p_/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_heap_/debu= g_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_= ds/detail/binomial_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /thin_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/i= nsert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/thin_heap_/thin_heap_.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/trace_fn_i= mps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/det= ail/thin_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/pat_trie_/child_iterator.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/cond_dt= or_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ex= t/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/pat_trie_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/h= ead.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_tr= ie_/insert_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_= /leaf.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pat_trie_/node_base.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_tri= e_/node_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/pat_trie_/pat_trie_.hpp /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/point_iter= ators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/de= tail/pat_trie_/r_erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/rotate_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_t= rie_/split_join_branch_bag.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/synth_e_access_= traits.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pa= t_trie_/traits.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tabl= e_map_/cmp_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_en= try_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_= fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_s= tore_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destr= uctor_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_= ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_has= h_table_map_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/erase_= no_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_h= ash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= cc_hash_table_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/ins= ert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /cc_hash_table_map_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tabl= e_map_/resize_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/resize_no_sto= re_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_f= n_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/cc_hash_table_map_/standard_policies.hpp /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tab= le_map_/trace_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++= /4.2/ext/pb_ds/detail/cc_hash_table_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/rc_binomial_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rc_binomial_he= ap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= rc_binomial_heap_/rc.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp /usr/obj/zbuil= der/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/left_child_next_sibling_heap_/const_point_iterator.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/left_child_next_sibling_heap_/debug_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/le= ft_child_next_sibling_heap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/left_child_n= ext_sibling_heap_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibli= ng_heap_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap= _/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left= _child_next_sibling_heap_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap= _/node.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/e= xt/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp /usr/obj/zb= uilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/left_child_next= _sibling_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/unordered_iterator/const_iterator.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/unordere= d_iterator/const_point_iterator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/unordered_iterator/ite= rator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/unordered_iter= ator sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binary_heap_/binary_heap_.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/con= st_iterator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/binary_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/entry_cm= p.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/binary_heap_/entry_pred.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_= heap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/binary_heap_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/in= sert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/binary_heap_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_h= eap_/resize_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp /usr/obj/zbuilder/buildd/h= ead/tmp/usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/ov_tree_map_/cond_dtor.hpp /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/constr= uctors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree= _map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_m= ap_/node_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree= _map_/split_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp /us= r/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/ov_tree= _map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash= _fn/direct_mod_range_hashing_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/linear_probe_= fn_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/= detail/hash_fn/mod_based_range_hashing.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/probe_f= n_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/de= tail/hash_fn/ranged_hash_fn.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.= hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/s= ample_ranged_hash_fn.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp /usr/obj/zbuilder/build= d/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/hash_fn sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/eq_fn/eq_by_less.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp /usr= /obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/eq_fn sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/rb_tree_map_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_= imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rb= _tree_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.= hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/ext/pb_ds/detail/rb_tree_map_/node.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/rb= _tree_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/rb_tree_map_/traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include= /c++/4.2/ext/pb_ds/detail/rb_tree_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/list_update_policy/counter_lu_metadata.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/lis= t_update_policy/counter_lu_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_poli= cy/mtf_lu_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/list_update_policy/sample_update_= policy.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/= detail/list_update_policy =3D=3D=3D> gnu/lib/libsupc++ (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libsupc++/../../../contrib/libstdc++/libsupc++/exc= eption /zbuilder/buildd/head/gnu/lib/libsupc++/../../../contrib/libstdc++/l= ibsupc++/new /zbuilder/buildd/head/gnu/lib/libsupc++/../../../contrib/libst= dc++/libsupc++/typeinfo /zbuilder/buildd/head/gnu/lib/libsupc++/../../../co= ntrib/libstdc++/libsupc++/cxxabi.h /zbuilder/buildd/head/gnu/lib/libsupc++/= =2E./../../contrib/libstdc++/libsupc++/exception_defines.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/c++/4.2 =3D=3D=3D> gnu/usr.bin (installincludes) =3D=3D=3D> gnu/usr.bin/binutils (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/ar (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/as (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/ld (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/nm (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/objdump (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/readelf (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/size (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/strings (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/strip (installincludes) =3D=3D=3D> gnu/usr.bin/binutils/doc (installincludes) =3D=3D=3D> gnu/usr.bin/cc (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cc_tools (installincludes) =3D=3D=3D> gnu/usr.bin/cc/libiberty (installincludes) =3D=3D=3D> gnu/usr.bin/cc/libcpp (installincludes) =3D=3D=3D> gnu/usr.bin/cc/libdecnumber (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cc_int (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cc (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cc1 (installincludes) =3D=3D=3D> gnu/usr.bin/cc/include (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/usr.bin/cc/include/../../../../contrib/gcc/config/i386= /ammintrin.h /zbuilder/buildd/head/gnu/usr.bin/cc/include/../../../../contr= ib/gcc/config/i386/emmintrin.h /zbuilder/buildd/head/gnu/usr.bin/cc/include= /../../../../contrib/gcc/config/i386/mmintrin.h /zbuilder/buildd/head/gnu/u= sr.bin/cc/include/../../../../contrib/gcc/config/i386/mm3dnow.h /zbuilder/b= uildd/head/gnu/usr.bin/cc/include/../../../../contrib/gcc/config/i386/pmmin= trin.h /zbuilder/buildd/head/gnu/usr.bin/cc/include/../../../../contrib/gcc= /config/i386/tmmintrin.h /zbuilder/buildd/head/gnu/usr.bin/cc/include/../..= /../../contrib/gcc/config/i386/xmmintrin.h mm_malloc.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include/gcc/4.2 =3D=3D=3D> gnu/usr.bin/cc/doc (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cpp (installincludes) =3D=3D=3D> gnu/usr.bin/cc/cc1plus (installincludes) =3D=3D=3D> gnu/usr.bin/cc/c++ (installincludes) =3D=3D=3D> gnu/usr.bin/cc/c++filt (installincludes) =3D=3D=3D> gnu/usr.bin/cc/gcov (installincludes) =3D=3D=3D> gnu/usr.bin/cvs (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/lib (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/libdiff (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/cvs (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/contrib (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/cvsbug (installincludes) =3D=3D=3D> gnu/usr.bin/cvs/doc (installincludes) =3D=3D=3D> gnu/usr.bin/dialog (installincludes) =3D=3D=3D> gnu/usr.bin/diff (installincludes) =3D=3D=3D> gnu/usr.bin/diff/doc (installincludes) =3D=3D=3D> gnu/usr.bin/diff3 (installincludes) =3D=3D=3D> gnu/usr.bin/gdb (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/doc (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/libgdb (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdb (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdbtui (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/kgdb (installincludes) =3D=3D=3D> gnu/usr.bin/gdb/gdbserver (installincludes) =3D=3D=3D> gnu/usr.bin/gperf (installincludes) =3D=3D=3D> gnu/usr.bin/gperf/doc (installincludes) =3D=3D=3D> gnu/usr.bin/grep (installincludes) =3D=3D=3D> gnu/usr.bin/grep/doc (installincludes) =3D=3D=3D> gnu/usr.bin/groff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/contrib (installincludes) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (installincludes) =3D=3D=3D> gnu/usr.bin/groff/doc (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devps (installincludes) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/man (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (installincludes) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (installincludes) =3D=3D=3D> gnu/usr.bin/groff/tmac (installincludes) =3D=3D=3D> gnu/usr.bin/patch (installincludes) =3D=3D=3D> gnu/usr.bin/rcs (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/lib (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/ci (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/co (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/ident (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/merge (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcs (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsclean (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsdiff (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsmerge (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rlog (installincludes) =3D=3D=3D> gnu/usr.bin/rcs/rcsfreeze (installincludes) =3D=3D=3D> gnu/usr.bin/sdiff (installincludes) =3D=3D=3D> gnu/usr.bin/send-pr (installincludes) =3D=3D=3D> gnu/usr.bin/send-pr/doc (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/libtxi (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/makeinfo (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/info (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/infokey (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/install-info (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/texindex (installincludes) =3D=3D=3D> gnu/usr.bin/texinfo/doc (installincludes) =3D=3D=3D> include (includes) set -e; cd /zbuilder/buildd/head/include; /usr/obj/zbuilder/buildd/head/mak= e.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make i= nstallincludes =3D=3D=3D> include/arpa (buildincludes) =3D=3D=3D> include/gssapi (buildincludes) =3D=3D=3D> include/protocols (buildincludes) =3D=3D=3D> include/rpcsvc (buildincludes) =3D=3D=3D> include/rpc (buildincludes) =3D=3D=3D> include/xlocale (buildincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/include/a.out.h /zbuilder/buildd/head/include/ar.h /zbuild= er/buildd/head/include/assert.h /zbuilder/buildd/head/include/bitstring.h /= zbuilder/buildd/head/include/complex.h /zbuilder/buildd/head/include/cpio.h= /zbuilder/buildd/head/include/_ctype.h /zbuilder/buildd/head/include/ctype= =2Eh /zbuilder/buildd/head/include/db.h /zbuilder/buildd/head/include/diren= t.h /zbuilder/buildd/head/include/dlfcn.h /zbuilder/buildd/head/include/elf= =2Eh /zbuilder/buildd/head/include/elf-hints.h /zbuilder/buildd/head/includ= e/err.h /zbuilder/buildd/head/include/fmtmsg.h /zbuilder/buildd/head/includ= e/fnmatch.h /zbuilder/buildd/head/include/fstab.h /zbuilder/buildd/head/inc= lude/fts.h /zbuilder/buildd/head/include/ftw.h /zbuilder/buildd/head/includ= e/getopt.h /zbuilder/buildd/head/include/glob.h /zbuilder/buildd/head/inclu= de/grp.h /zbuilder/buildd/head/include/gssapi.h /zbuilder/buildd/head/inclu= de/ieeefp.h /zbuilder/buildd/head/include/ifaddrs.h /zbuilder/buildd/head/i= nclude/inttypes.h /zbuilder/buildd/head/include/iso646.h /zbuilder/buildd/h= ead/include/kenv.h /zbuilder/buildd/head/include/langinfo.h /zbuilder/build= d/head/include/libgen.h /zbuilder/buildd/head/include/limits.h /zbuilder/bu= ildd/head/include/link.h /zbuilder/buildd/head/include/locale.h /zbuilder/b= uildd/head/include/malloc.h /zbuilder/buildd/head/include/malloc_np.h /zbui= lder/buildd/head/include/memory.h /zbuilder/buildd/head/include/monetary.h = /zbuilder/buildd/head/include/mpool.h /zbuilder/buildd/head/include/mqueue.= h /zbuilder/buildd/head/include/ndbm.h /zbuilder/buildd/head/include/netcon= fig.h /zbuilder/buildd/head/include/netdb.h /zbuilder/buildd/head/include/n= l_types.h /zbuilder/buildd/head/include/nlist.h /zbuilder/buildd/head/inclu= de/nss.h /zbuilder/buildd/head/include/nsswitch.h /zbuilder/buildd/head/inc= lude/paths.h /zbuilder/buildd/head/include/printf.h /zbuilder/buildd/head/i= nclude/proc_service.h /zbuilder/buildd/head/include/pthread.h /zbuilder/bui= ldd/head/include/pthread_np.h /zbuilder/buildd/head/include/pwd.h /zbuilder= /buildd/head/include/ranlib.h /zbuilder/buildd/head/include/readpassphrase.= h /zbuilder/buildd/head/include/regex.h /zbuilder/buildd/head/include/res_u= pdate.h /zbuilder/buildd/head/include/resolv.h /zbuilder/buildd/head/includ= e/runetype.h /zbuilder/buildd/head/include/search.h /zbuilder/buildd/head/i= nclude/semaphore.h /zbuilder/buildd/head/include/setjmp.h /zbuilder/buildd/= head/include/signal.h /zbuilder/buildd/head/include/spawn.h /zbuilder/build= d/head/include/stab.h /zbuilder/buildd/head/include/stdalign.h /zbuilder/bu= ildd/head/include/stdbool.h /zbuilder/buildd/head/include/stddef.h /zbuilde= r/buildd/head/include/stdnoreturn.h /zbuilder/buildd/head/include/stdio.h /= zbuilder/buildd/head/include/stdlib.h /zbuilder/buildd/head/include/string.= h /zbuilder/buildd/head/include/stringlist.h /zbuilder/buildd/head/include/= strings.h /zbuilder/buildd/head/include/sysexits.h /zbuilder/buildd/head/in= clude/tar.h /zbuilder/buildd/head/include/termios.h /zbuilder/buildd/head/i= nclude/tgmath.h /zbuilder/buildd/head/include/time.h /zbuilder/buildd/head/= include/timeconv.h /zbuilder/buildd/head/include/timers.h /zbuilder/buildd/= head/include/ttyent.h /zbuilder/buildd/head/include/uchar.h /zbuilder/build= d/head/include/ulimit.h /zbuilder/buildd/head/include/unistd.h /zbuilder/bu= ildd/head/include/utime.h /zbuilder/buildd/head/include/utmpx.h /zbuilder/b= uildd/head/include/uuid.h /zbuilder/buildd/head/include/varargs.h /zbuilder= /buildd/head/include/wchar.h /zbuilder/buildd/head/include/wctype.h /zbuild= er/buildd/head/include/wordexp.h /zbuilder/buildd/head/include/xlocale.h /z= builder/buildd/head/include/../contrib/libc-vis/vis.h osreldate.h /usr/obj/= zbuilder/buildd/head/tmp/usr/include if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsm ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/bsm; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/cam; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom ]; then rm -f /= usr/obj/zbuilder/buildd/head/tmp/usr/include/geom; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/net ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/net; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/net80211 ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/net80211; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netatalk ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netatalk; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netinet ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netinet; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netinet6 ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netinet6; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netipsec ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netipsec; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netipx ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/netipx; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfs ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/nfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfsclient ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfsclient; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfsserver ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfsserver; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/sys; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/vm ]; then rm -f /us= r/obj/zbuilder/buildd/head/tmp/usr/include/vm; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam/ata ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam/ata; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam/scsi ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam/scsi; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/acpica ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/acpica; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/agp ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/agp; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/an ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/an; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/bktr ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/bktr; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ciss ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ciss; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/filemon ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/filemon; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/firewire ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/firewire; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/hwpmc ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/hwpmc; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ic ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ic; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/iicbus ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/iicbus; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ieee488 ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ieee488; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/io ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/io; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/lmc ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/lmc; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/mfi ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/mfi; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/nvme ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/nvme; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ofw ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ofw; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/pbio ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/pbio; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/pci ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/pci; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ppbus ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/ppbus; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/smbus ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/smbus; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/speaker ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/speaker; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/usb ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/usb; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/utopia ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/utopia; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/vkbd ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/vkbd; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/wi ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/dev/wi; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/devfs ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/devfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/fdescfs ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/fdescfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/msdosfs ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/msdosfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nandfs ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nandfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nfs ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nullfs ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/nullfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/procfs ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/procfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/udf ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/udf; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/unionfs ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs/unionfs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/cache ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/cache; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/concat ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/concat; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/eli ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/eli; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/gate ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/gate; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/journal ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/journal; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/label ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/label; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/mirror ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/mirror; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/mountver ]; then= rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/mountver; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/multipath ]; the= n rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/multipath; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/nop ]; then rm = -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/nop; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/raid ]; then rm= -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/raid; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/raid3 ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/raid3; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/shsec ]; then r= m -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/shsec; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/stripe ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/stripe; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/virstor ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom/virstor; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph/atm ]; then = rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph/atm; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph/netflow ]; t= hen rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/netgraph/netflow; = fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/audit ]; the= n rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/audit; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_biba ]; = then rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_biba= ; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_bsdexten= ded ]; then rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/m= ac_bsdextended; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_lomac ];= then rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_lom= ac; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_mls ]; t= hen rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_mls; = fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac_partitio= n ]; then rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/security/mac= _partition; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/ufs/ffs ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/ufs/ffs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/ufs/ufs ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/ufs/ufs; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/machine ]; then rm -= f /usr/obj/zbuilder/buildd/head/tmp/usr/include/machine; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/x86 ]; then rm -f /u= sr/obj/zbuilder/buildd/head/tmp/usr/include/x86; fi if [ -L /usr/obj/zbuilder/buildd/head/tmp/usr/include/crypto ]; then rm -f= /usr/obj/zbuilder/buildd/head/tmp/usr/include/crypto; fi mtree -deU -f /zbuilder/buildd/head/include/../etc/mtree/BSD.include.dist= -p /usr/obj/zbuilder/buildd/head/tmp/usr/include Setting up symlinks to kernel source tree... cd /zbuilder/buildd/head/include/../sys/bsm; for h in *.h; do ln -fs ../.= =2E/../sys/bsm/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsm; done cd /zbuilder/buildd/head/include/../sys/cam; for h in *.h; do ln -fs ../.= =2E/../sys/cam/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/cam; done cd /zbuilder/buildd/head/include/../sys/geom; for h in *.h; do ln -fs ../= =2E./../sys/geom/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/geom; do= ne cd /zbuilder/buildd/head/include/../sys/net; for h in *.h; do ln -fs ../.= =2E/../sys/net/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net; done cd /zbuilder/buildd/head/include/../sys/net80211; for h in *.h; do ln -fs= ../../../sys/net80211/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= 80211; done cd /zbuilder/buildd/head/include/../sys/netatalk; for h in *.h; do ln -fs= ../../../sys/netatalk/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= atalk; done cd /zbuilder/buildd/head/include/../sys/netgraph; for h in *.h; do ln -fs= ../../../sys/netgraph/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= graph; done cd /zbuilder/buildd/head/include/../sys/netinet; for h in *.h; do ln -fs = =2E./../../sys/netinet/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= inet; done cd /zbuilder/buildd/head/include/../sys/netinet6; for h in *.h; do ln -fs= ../../../sys/netinet6/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= inet6; done cd /zbuilder/buildd/head/include/../sys/netipsec; for h in *.h; do ln -fs= ../../../sys/netipsec/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= ipsec; done cd /zbuilder/buildd/head/include/../sys/netipx; for h in *.h; do ln -fs .= =2E/../../sys/netipx/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netip= x; done cd /zbuilder/buildd/head/include/../sys/netnatm; for h in *.h; do ln -fs = =2E./../../sys/netnatm/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/net= natm; done cd /zbuilder/buildd/head/include/../sys/nfs; for h in *.h; do ln -fs ../.= =2E/../sys/nfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/nfs; done cd /zbuilder/buildd/head/include/../sys/nfsclient; for h in *.h; do ln -f= s ../../../sys/nfsclient/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/n= fsclient; done cd /zbuilder/buildd/head/include/../sys/nfsserver; for h in *.h; do ln -f= s ../../../sys/nfsserver/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/n= fsserver; done cd /zbuilder/buildd/head/include/../sys/sys; for h in *.h; do ln -fs ../.= =2E/../sys/sys/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys; done cd /zbuilder/buildd/head/include/../sys/vm; for h in *.h; do ln -fs ../..= /../sys/vm/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/vm; done cd /zbuilder/buildd/head/include/../sys/cam/ata; for h in *.h; do ln -fs = =2E./../../../sys/cam/ata/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= cam/ata; done cd /zbuilder/buildd/head/include/../sys/cam/scsi; for h in *.h; do ln -fs= ../../../../sys/cam/scsi/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= cam/scsi; done cd /zbuilder/buildd/head/include/../sys/dev/an; for h in *.h; do ln -fs .= =2E/../../../sys/dev/an/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/de= v/an; done cd /zbuilder/buildd/head/include/../sys/dev/ciss; for h in *.h; do ln -fs= ../../../../sys/dev/ciss/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/ciss; done cd /zbuilder/buildd/head/include/../sys/dev/filemon; for h in *.h; do ln = -fs ../../../../sys/dev/filemon/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/dev/filemon; done cd /zbuilder/buildd/head/include/../sys/dev/firewire; for h in *.h; do ln= -fs ../../../../sys/dev/firewire/$h /usr/obj/zbuilder/buildd/head/tmp/usr/= include/dev/firewire; done cd /zbuilder/buildd/head/include/../sys/dev/hwpmc; for h in *.h; do ln -f= s ../../../../sys/dev/hwpmc/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/dev/hwpmc; done cd /zbuilder/buildd/head/include/../sys/dev/ic; for h in *.h; do ln -fs .= =2E/../../../sys/dev/ic/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/de= v/ic; done cd /zbuilder/buildd/head/include/../sys/dev/iicbus; for h in *.h; do ln -= fs ../../../../sys/dev/iicbus/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/dev/iicbus; done cd /zbuilder/buildd/head/include/../sys/dev/ieee488; for h in *.h; do ln = -fs ../../../../sys/dev/ieee488/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/dev/ieee488; done cd /zbuilder/buildd/head/include/../sys/dev/io; for h in *.h; do ln -fs .= =2E/../../../sys/dev/io/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/de= v/io; done cd /zbuilder/buildd/head/include/../sys/dev/lmc; for h in *.h; do ln -fs = =2E./../../../sys/dev/lmc/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/lmc; done cd /zbuilder/buildd/head/include/../sys/dev/mfi; for h in *.h; do ln -fs = =2E./../../../sys/dev/mfi/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/mfi; done cd /zbuilder/buildd/head/include/../sys/dev/nvme; for h in *.h; do ln -fs= ../../../../sys/dev/nvme/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/nvme; done cd /zbuilder/buildd/head/include/../sys/dev/ofw; for h in *.h; do ln -fs = =2E./../../../sys/dev/ofw/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/ofw; done cd /zbuilder/buildd/head/include/../sys/dev/pbio; for h in *.h; do ln -fs= ../../../../sys/dev/pbio/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/pbio; done cd /zbuilder/buildd/head/include/../sys/dev/ppbus; for h in *.h; do ln -f= s ../../../../sys/dev/ppbus/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/dev/ppbus; done cd /zbuilder/buildd/head/include/../sys/dev/smbus; for h in *.h; do ln -f= s ../../../../sys/dev/smbus/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/dev/smbus; done cd /zbuilder/buildd/head/include/../sys/dev/speaker; for h in *.h; do ln = -fs ../../../../sys/dev/speaker/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/dev/speaker; done cd /zbuilder/buildd/head/include/../sys/dev/usb; for h in *.h; do ln -fs = =2E./../../../sys/dev/usb/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/usb; done cd /zbuilder/buildd/head/include/../sys/dev/utopia; for h in *.h; do ln -= fs ../../../../sys/dev/utopia/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/dev/utopia; done cd /zbuilder/buildd/head/include/../sys/dev/vkbd; for h in *.h; do ln -fs= ../../../../sys/dev/vkbd/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= dev/vkbd; done cd /zbuilder/buildd/head/include/../sys/dev/wi; for h in *.h; do ln -fs .= =2E/../../../sys/dev/wi/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/de= v/wi; done cd /zbuilder/buildd/head/include/../sys/fs/devfs; for h in *.h; do ln -fs= ../../../../sys/fs/devfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= fs/devfs; done cd /zbuilder/buildd/head/include/../sys/fs/fdescfs; for h in *.h; do ln -= fs ../../../../sys/fs/fdescfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/fs/fdescfs; done cd /zbuilder/buildd/head/include/../sys/fs/msdosfs; for h in *.h; do ln -= fs ../../../../sys/fs/msdosfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/fs/msdosfs; done cd /zbuilder/buildd/head/include/../sys/fs/nandfs; for h in *.h; do ln -f= s ../../../../sys/fs/nandfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/fs/nandfs; done cd /zbuilder/buildd/head/include/../sys/fs/nfs; for h in *.h; do ln -fs .= =2E/../../../sys/fs/nfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs= /nfs; done cd /zbuilder/buildd/head/include/../sys/fs/nullfs; for h in *.h; do ln -f= s ../../../../sys/fs/nullfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/fs/nullfs; done cd /zbuilder/buildd/head/include/../sys/fs/procfs; for h in *.h; do ln -f= s ../../../../sys/fs/procfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/fs/procfs; done cd /zbuilder/buildd/head/include/../sys/fs/udf; for h in *.h; do ln -fs .= =2E/../../../sys/fs/udf/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/fs= /udf; done cd /zbuilder/buildd/head/include/../sys/fs/unionfs; for h in *.h; do ln -= fs ../../../../sys/fs/unionfs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/fs/unionfs; done cd /zbuilder/buildd/head/include/../sys/geom/cache; for h in *.h; do ln -= fs ../../../../sys/geom/cache/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/geom/cache; done cd /zbuilder/buildd/head/include/../sys/geom/concat; for h in *.h; do ln = -fs ../../../../sys/geom/concat/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/geom/concat; done cd /zbuilder/buildd/head/include/../sys/geom/eli; for h in *.h; do ln -fs= ../../../../sys/geom/eli/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= geom/eli; done cd /zbuilder/buildd/head/include/../sys/geom/gate; for h in *.h; do ln -f= s ../../../../sys/geom/gate/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/geom/gate; done cd /zbuilder/buildd/head/include/../sys/geom/journal; for h in *.h; do ln= -fs ../../../../sys/geom/journal/$h /usr/obj/zbuilder/buildd/head/tmp/usr/= include/geom/journal; done cd /zbuilder/buildd/head/include/../sys/geom/label; for h in *.h; do ln -= fs ../../../../sys/geom/label/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/geom/label; done cd /zbuilder/buildd/head/include/../sys/geom/mirror; for h in *.h; do ln = -fs ../../../../sys/geom/mirror/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/geom/mirror; done cd /zbuilder/buildd/head/include/../sys/geom/mountver; for h in *.h; do l= n -fs ../../../../sys/geom/mountver/$h /usr/obj/zbuilder/buildd/head/tmp/us= r/include/geom/mountver; done cd /zbuilder/buildd/head/include/../sys/geom/multipath; for h in *.h; do = ln -fs ../../../../sys/geom/multipath/$h /usr/obj/zbuilder/buildd/head/tmp/= usr/include/geom/multipath; done cd /zbuilder/buildd/head/include/../sys/geom/nop; for h in *.h; do ln -fs= ../../../../sys/geom/nop/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= geom/nop; done cd /zbuilder/buildd/head/include/../sys/geom/raid; for h in *.h; do ln -f= s ../../../../sys/geom/raid/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/geom/raid; done cd /zbuilder/buildd/head/include/../sys/geom/raid3; for h in *.h; do ln -= fs ../../../../sys/geom/raid3/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/geom/raid3; done cd /zbuilder/buildd/head/include/../sys/geom/shsec; for h in *.h; do ln -= fs ../../../../sys/geom/shsec/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/geom/shsec; done cd /zbuilder/buildd/head/include/../sys/geom/stripe; for h in *.h; do ln = -fs ../../../../sys/geom/stripe/$h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude/geom/stripe; done cd /zbuilder/buildd/head/include/../sys/geom/virstor; for h in *.h; do ln= -fs ../../../../sys/geom/virstor/$h /usr/obj/zbuilder/buildd/head/tmp/usr/= include/geom/virstor; done cd /zbuilder/buildd/head/include/../sys/netgraph/atm; for h in *.h; do ln= -fs ../../../../sys/netgraph/atm/$h /usr/obj/zbuilder/buildd/head/tmp/usr/= include/netgraph/atm; done cd /zbuilder/buildd/head/include/../sys/netgraph/netflow; for h in *.h; do= ln -fs ../../../../sys/netgraph/netflow/$h /usr/obj/zbuilder/buildd/head/= tmp/usr/include/netgraph/netflow; done cd /zbuilder/buildd/head/include/../sys/security/audit; for h in *.h; do = ln -fs ../../../../sys/security/audit/$h /usr/obj/zbuilder/buildd/head/tmp/= usr/include/security/audit; done cd /zbuilder/buildd/head/include/../sys/security/mac_biba; for h in *.h; d= o ln -fs ../../../../sys/security/mac_biba/$h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include/security/mac_biba; done cd /zbuilder/buildd/head/include/../sys/security/mac_bsdextended; for h in= *.h; do ln -fs ../../../../sys/security/mac_bsdextended/$h /usr/obj/zbuil= der/buildd/head/tmp/usr/include/security/mac_bsdextended; done cd /zbuilder/buildd/head/include/../sys/security/mac_lomac; for h in *.h; = do ln -fs ../../../../sys/security/mac_lomac/$h /usr/obj/zbuilder/buildd/h= ead/tmp/usr/include/security/mac_lomac; done cd /zbuilder/buildd/head/include/../sys/security/mac_mls; for h in *.h; do= ln -fs ../../../../sys/security/mac_mls/$h /usr/obj/zbuilder/buildd/head/= tmp/usr/include/security/mac_mls; done cd /zbuilder/buildd/head/include/../sys/security/mac_partition; for h in *= =2Eh; do ln -fs ../../../../sys/security/mac_partition/$h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/security/mac_partition; done cd /zbuilder/buildd/head/include/../sys/ufs/ffs; for h in *.h; do ln -fs = =2E./../../../sys/ufs/ffs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= ufs/ffs; done cd /zbuilder/buildd/head/include/../sys/ufs/ufs; for h in *.h; do ln -fs = =2E./../../../sys/ufs/ufs/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/= ufs/ufs; done cd /zbuilder/buildd/head/include/../sys/dev/acpica; for h in acpiio.h; do = ln -fs ../../../../sys/dev/acpica/$h /usr/obj/zbuilder/buildd/head/tmp/us= r/include/dev/acpica; done cd /zbuilder/buildd/head/include/../sys/dev/agp; for h in agpreg.h; do ln= -fs ../../../../sys/dev/agp/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/dev/agp; done cd /zbuilder/buildd/head/include/../sys/dev/bktr; for h in ioctl_*.h; do = ln -fs ../../../../sys/dev/bktr/$h /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude/dev/bktr; done cd /zbuilder/buildd/head/include/../sys/dev/pci; for h in pcireg.h; do ln= -fs ../../../../sys/dev/pci/$h /usr/obj/zbuilder/buildd/head/tmp/usr/incl= ude/dev/pci; done cd /zbuilder/buildd/head/include/../sys/dev/mpt/mpilib; for h in *.h; do = ln -fs ../../../../../sys/dev/mpt/mpilib/$h /usr/obj/zbuilder/buildd/head/t= mp/usr/include/dev/mpt/mpilib; done cd /zbuilder/buildd/head/include/../sys/netgraph/bluetooth/include; for h = in *.h; do ln -fs ../../../../../sys/netgraph/bluetooth/include/$h /usr/ob= j/zbuilder/buildd/head/tmp/usr/include/netgraph/bluetooth/include; done cd /zbuilder/buildd/head/include/../sys/contrib/altq/altq; for h in *.h; d= o ln -fs ../../../sys/contrib/altq/altq/$h /usr/obj/zbuilder/buildd/head/= tmp/usr/include/altq; done cd /zbuilder/buildd/head/include/../sys/contrib/ipfilter/netinet; for h in= *.h; do ln -fs ../../../sys/contrib/ipfilter/netinet/$h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/netinet; done cd /zbuilder/buildd/head/include/../sys/crypto; for h in rijndael/rijndael= =2Eh; do ln -fs ../../../sys/crypto/$h /usr/obj/zbuilder/buildd/head/tmp/= usr/include/crypto; done cd /zbuilder/buildd/head/include/../sys/opencrypto; for h in *.h; do ln -= fs ../../../sys/opencrypto/$h /usr/obj/zbuilder/buildd/head/tmp/usr/includ= e/crypto; done cd /zbuilder/buildd/head/include/../sys/amd64/include; for h in *.h; do l= n -fs ../../../sys/amd64/include/$h /usr/obj/zbuilder/buildd/head/tmp/usr/= include/machine; done cd /zbuilder/buildd/head/include/../sys/amd64/include/pc; for h in *.h; do= ln -fs ../../../../sys/amd64/include/pc/$h /usr/obj/zbuilder/buildd/head= /tmp/usr/include/machine/pc; done sh /zbuilder/buildd/head/tools/install.sh -d -o root -g wheel -m 755 /usr/= obj/zbuilder/buildd/head/tmp/usr/include/x86; cd /zbuilder/buildd/head/inc= lude/../sys/x86/include; for h in *.h; do ln -fs ../../../sys/x86/include= /$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/x86; done cd /zbuilder/buildd/head/include/../sys/fs/cd9660; for h in *.h; do ln -f= s ../../../../sys/fs/cd9660/$h /usr/obj/zbuilder/buildd/head/tmp/usr/inclu= de/isofs/cd9660; done cd /zbuilder/buildd/head/include/../sys/rpc; for h in types.h; do ln -fs = =2E./../../sys/rpc/$h /usr/obj/zbuilder/buildd/head/tmp/usr/include/rpc; = done /usr/obj/zbuilder/buildd/head/tmp/usr/include/aio.h -> sys/aio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/errno.h -> sys/errno.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/fcntl.h -> sys/fcntl.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/linker_set.h -> sys/linker_se= t.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/poll.h -> sys/poll.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/stdatomic.h -> sys/stdatomic.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/stdint.h -> sys/stdint.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/syslog.h -> sys/syslog.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/ucontext.h -> sys/ucontext.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/float.h -> machine/float.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/floatingpoint.h -> machine/fl= oatingpoint.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/stdarg.h -> machine/stdarg.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/sched.h -> sys/sched.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/_semaphore.h -> sys/_semaphor= e.h =3D=3D=3D> include/arpa (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 ftp.h= inet.h nameser.h nameser_compat.h tftp.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include/arpa =3D=3D=3D> include/gssapi (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 gssap= i.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/gssapi =3D=3D=3D> include/protocols (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 dumpr= estore.h routed.h rwhod.h talkd.h timed.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include/protocols =3D=3D=3D> include/rpcsvc (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/include/rpcsvc/yp_prot.h /zbuilder/buildd/head/include/rpc= svc/ypclnt.h /zbuilder/buildd/head/include/rpcsvc/nis_db.h /zbuilder/buildd= /head/include/rpcsvc/nis_tags.h /zbuilder/buildd/head/include/rpcsvc/nislib= =2Eh /zbuilder/buildd/head/include/rpcsvc/bootparam_prot.x /zbuilder/buildd= /head/include/rpcsvc/key_prot.x /zbuilder/buildd/head/include/rpcsvc/klm_pr= ot.x /zbuilder/buildd/head/include/rpcsvc/mount.x /zbuilder/buildd/head/inc= lude/rpcsvc/nfs_prot.x /zbuilder/buildd/head/include/rpcsvc/nlm_prot.x /zbu= ilder/buildd/head/include/rpcsvc/rex.x /zbuilder/buildd/head/include/rpcsvc= /rnusers.x /zbuilder/buildd/head/include/rpcsvc/rquota.x /zbuilder/buildd/h= ead/include/rpcsvc/rstat.x /zbuilder/buildd/head/include/rpcsvc/rwall.x /zb= uilder/buildd/head/include/rpcsvc/sm_inter.x /zbuilder/buildd/head/include/= rpcsvc/spray.x /zbuilder/buildd/head/include/rpcsvc/yppasswd.x /zbuilder/bu= ildd/head/include/rpcsvc/yp.x /zbuilder/buildd/head/include/rpcsvc/ypxfrd.x= /zbuilder/buildd/head/include/rpcsvc/ypupdate_prot.x /zbuilder/buildd/head= /include/rpcsvc/nis.x /zbuilder/buildd/head/include/rpcsvc/nis_cache.x /zbu= ilder/buildd/head/include/rpcsvc/nis_object.x /zbuilder/buildd/head/include= /rpcsvc/nis_callback.x /zbuilder/buildd/head/include/rpcsvc/crypt.x key_pro= t.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h rquota.h rstat= =2Eh rwall.h sm_inter.h spray.h yppasswd.h yp.h ypxfrd.h ypupdate_prot.h ni= s.h nis_cache.h nis_callback.h bootparam_prot.h crypt.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include/rpcsvc sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 key_p= rot.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/rpc =3D=3D=3D> include/rpc (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/include/rpc/auth.h /zbuilder/buildd/head/include/rpc/auth_= unix.h /zbuilder/buildd/head/include/rpc/clnt.h /zbuilder/buildd/head/inclu= de/rpc/clnt_soc.h /zbuilder/buildd/head/include/rpc/clnt_stat.h /zbuilder/b= uildd/head/include/rpc/nettype.h /zbuilder/buildd/head/include/rpc/pmap_cln= t.h /zbuilder/buildd/head/include/rpc/pmap_prot.h /zbuilder/buildd/head/inc= lude/rpc/pmap_rmt.h /zbuilder/buildd/head/include/rpc/raw.h /zbuilder/build= d/head/include/rpc/rpc.h /zbuilder/buildd/head/include/rpc/rpc_msg.h /zbuil= der/buildd/head/include/rpc/rpcb_clnt.h /zbuilder/buildd/head/include/rpc/r= pcent.h /zbuilder/buildd/head/include/rpc/rpc_com.h /zbuilder/buildd/head/i= nclude/rpc/rpcsec_gss.h /zbuilder/buildd/head/include/rpc/svc.h /zbuilder/b= uildd/head/include/rpc/svc_auth.h /zbuilder/buildd/head/include/rpc/svc_soc= =2Eh /zbuilder/buildd/head/include/rpc/svc_dg.h /zbuilder/buildd/head/inclu= de/rpc/xdr.h /zbuilder/buildd/head/include/rpc/auth_des.h /zbuilder/buildd/= head/include/rpc/des.h /zbuilder/buildd/head/include/rpc/des_crypt.h /zbuil= der/buildd/head/include/rpc/auth_kerb.h /zbuilder/buildd/head/include/rpc/r= pcb_prot.x rpcb_prot.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/rpc =3D=3D=3D> include/xlocale (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 _ctyp= e.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h _stdlib.h _strin= g.h _time.h _uchar.h _wchar.h /usr/obj/zbuilder/buildd/head/tmp/usr/include= /xlocale =3D=3D=3D> kerberos5 (includes) set -e; cd /zbuilder/buildd/head/kerberos5; /usr/obj/zbuilder/buildd/head/m= ake.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make= installincludes =3D=3D=3D> kerberos5/doc (buildincludes) =3D=3D=3D> kerberos5/lib (buildincludes) =3D=3D=3D> kerberos5/lib/libasn1 (buildincludes) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (buildincludes) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (buildincludes) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (buildincludes) =3D=3D=3D> kerberos5/lib/libhdb (buildincludes) =3D=3D=3D> kerberos5/lib/libheimntlm (buildincludes) =3D=3D=3D> kerberos5/lib/libhx509 (buildincludes) =3D=3D=3D> kerberos5/lib/libkadm5clnt (buildincludes) =3D=3D=3D> kerberos5/lib/libkadm5srv (buildincludes) =3D=3D=3D> kerberos5/lib/libkafs5 (buildincludes) =3D=3D=3D> kerberos5/lib/libkrb5 (buildincludes) =3D=3D=3D> kerberos5/lib/libroken (buildincludes) =3D=3D=3D> kerberos5/lib/libsl (buildincludes) =3D=3D=3D> kerberos5/lib/libvers (buildincludes) =3D=3D=3D> kerberos5/lib/libkdc (buildincludes) =3D=3D=3D> kerberos5/lib/libwind (buildincludes) =3D=3D=3D> kerberos5/lib/libheimsqlite (buildincludes) =3D=3D=3D> kerberos5/lib/libheimbase (buildincludes) =3D=3D=3D> kerberos5/lib/libheimipcc (buildincludes) =3D=3D=3D> kerberos5/lib/libheimipcs (buildincludes) =3D=3D=3D> kerberos5/libexec (buildincludes) =3D=3D=3D> kerberos5/libexec/digest-service (buildincludes) =3D=3D=3D> kerberos5/libexec/ipropd-master (buildincludes) =3D=3D=3D> kerberos5/libexec/ipropd-slave (buildincludes) =3D=3D=3D> kerberos5/libexec/hprop (buildincludes) =3D=3D=3D> kerberos5/libexec/hpropd (buildincludes) =3D=3D=3D> kerberos5/libexec/kadmind (buildincludes) =3D=3D=3D> kerberos5/libexec/kdc (buildincludes) =3D=3D=3D> kerberos5/libexec/kdigest (buildincludes) =3D=3D=3D> kerberos5/libexec/kfd (buildincludes) =3D=3D=3D> kerberos5/libexec/kimpersonate (buildincludes) =3D=3D=3D> kerberos5/libexec/kpasswdd (buildincludes) =3D=3D=3D> kerberos5/libexec/kcm (buildincludes) =3D=3D=3D> kerberos5/tools (buildincludes) =3D=3D=3D> kerberos5/tools/make-roken (buildincludes) =3D=3D=3D> kerberos5/tools/asn1_compile (buildincludes) =3D=3D=3D> kerberos5/tools/slc (buildincludes) =3D=3D=3D> kerberos5/usr.bin (buildincludes) =3D=3D=3D> kerberos5/usr.bin/hxtool (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kadmin (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kcc (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kdestroy (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kgetcred (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kf (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kinit (buildincludes) =3D=3D=3D> kerberos5/usr.bin/kpasswd (buildincludes) =3D=3D=3D> kerberos5/usr.bin/krb5-config (buildincludes) =3D=3D=3D> kerberos5/usr.bin/ksu (buildincludes) =3D=3D=3D> kerberos5/usr.bin/string2key (buildincludes) =3D=3D=3D> kerberos5/usr.bin/verify_krb5_conf (buildincludes) =3D=3D=3D> kerberos5/usr.sbin (buildincludes) =3D=3D=3D> kerberos5/usr.sbin/iprop-log (buildincludes) =3D=3D=3D> kerberos5/usr.sbin/kstash (buildincludes) =3D=3D=3D> kerberos5/usr.sbin/ktutil (buildincludes) =3D=3D=3D> kerberos5/doc (installincludes) =3D=3D=3D> kerberos5/lib (installincludes) =3D=3D=3D> kerberos5/lib/libasn1 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 asn1_= err.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../crypto/heimdal/l= ib/asn1/asn1-common.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../= crypto/heimdal/lib/asn1/heim_asn1.h /zbuilder/buildd/head/kerberos5/lib/lib= asn1/../../../crypto/heimdal/lib/asn1/der.h /zbuilder/buildd/head/kerberos5= /lib/libasn1/../../../crypto/heimdal/lib/asn1/der-protos.h /zbuilder/buildd= /head/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/der-private.h = krb5_asn1.h pkinit_asn1.h cms_asn1.h rfc2459_asn1.h pkcs8_asn1.h pkcs9_asn1= =2Eh pkcs12_asn1.h digest_asn1.h kx509_asn1.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libgssapi_krb5/../../../crypto/heimdal/lib/g= ssapi/gssapi/gssapi_krb5.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/gs= sapi =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (installincludes) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (installincludes) =3D=3D=3D> kerberos5/lib/libhdb (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/lib/hdb/hdb-p= rotos.h /zbuilder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/= lib/hdb/hdb.h hdb_asn1.h hdb_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude =3D=3D=3D> kerberos5/lib/libheimntlm (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto/heimdal/lib/ntlm= /heimntlm.h /zbuilder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto= /heimdal/lib/ntlm/heimntlm-protos.h ntlm_err.h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include =3D=3D=3D> kerberos5/lib/libhx509 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/h= x509-private.h /zbuilder/buildd/head/kerberos5/lib/libhx509/../../../crypto= /heimdal/lib/hx509/hx509-protos.h /zbuilder/buildd/head/kerberos5/lib/libhx= 509/../../../crypto/heimdal/lib/hx509/hx509.h hx509_err.h ocsp_asn1.h pkcs1= 0_asn1.h crmf_asn1.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libkadm5clnt (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkadm5clnt/../../../crypto/heimdal/lib/kad= m5/admin.h /zbuilder/buildd/head/kerberos5/lib/libkadm5clnt/../../../crypto= /heimdal/lib/kadm5/kadm5-private.h /zbuilder/buildd/head/kerberos5/lib/libk= adm5clnt/../../../crypto/heimdal/lib/kadm5/kadm5-protos.h /zbuilder/buildd/= head/kerberos5/lib/libkadm5clnt/../../../crypto/heimdal/lib/kadm5/kadm5-pwc= heck.h kadm5_err.h /zbuilder/buildd/head/kerberos5/lib/libkadm5clnt/../../.= =2E/crypto/heimdal/lib/kadm5/private.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include/kadm5 =3D=3D=3D> kerberos5/lib/libkadm5srv (installincludes) =3D=3D=3D> kerberos5/lib/libkafs5 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkafs5/../../../crypto/heimdal/lib/kafs/ka= fs.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libkrb5 (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 heim_= err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/i= nclude/heim_threads.h k524_err.h /zbuilder/buildd/head/kerberos5/lib/libkrb= 5/../../../crypto/heimdal/lib/krb5/krb5-protos.h /zbuilder/buildd/head/kerb= eros5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5-private.h /zbuilder= /buildd/head/kerberos5/lib/libkrb5/../../include/krb5-types.h /zbuilder/bui= ldd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5.h krb5= _err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/= lib/krb5/krb5_ccapi.h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/loc= ate_plugin.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/he= imdal/lib/krb5/send_to_kdc_plugin.h /zbuilder/buildd/head/kerberos5/lib/lib= krb5/../../../crypto/heimdal/lib/krb5/ccache_plugin.h /usr/obj/zbuilder/bui= ldd/head/tmp/usr/include/krb5 =3D=3D=3D> kerberos5/lib/libroken (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 roken= =2Eh /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/roken-common.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../= =2E./crypto/heimdal/lib/roken/base64.h /zbuilder/buildd/head/kerberos5/lib/= libroken/../../../crypto/heimdal/lib/roken/getarg.h /zbuilder/buildd/head/k= erberos5/lib/libroken/../../../crypto/heimdal/lib/roken/hex.h /zbuilder/bui= ldd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/parse_byt= es.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/parse_time.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../..= /crypto/heimdal/lib/roken/parse_units.h /zbuilder/buildd/head/kerberos5/lib= /libroken/../../../crypto/heimdal/lib/roken/resolve.h /zbuilder/buildd/head= /kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/rtbl.h /zbuilder/= buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/xdbm.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libsl (installincludes) =3D=3D=3D> kerberos5/lib/libvers (installincludes) =3D=3D=3D> kerberos5/lib/libkdc (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/kdc.h /zb= uilder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/kdc-pro= tos.h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/windc_plu= gin.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/krb5 =3D=3D=3D> kerberos5/lib/libwind (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libwind/../../../crypto/heimdal/lib/wind/win= d.h wind_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libheimsqlite (installincludes) =3D=3D=3D> kerberos5/lib/libheimbase (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimbase/../../../crypto/heimdal/base/hei= mbase.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libheimipcc (installincludes) =3D=3D=3D> kerberos5/lib/libheimipcs (installincludes) =3D=3D=3D> kerberos5/libexec (installincludes) =3D=3D=3D> kerberos5/libexec/digest-service (installincludes) =3D=3D=3D> kerberos5/libexec/ipropd-master (installincludes) =3D=3D=3D> kerberos5/libexec/ipropd-slave (installincludes) =3D=3D=3D> kerberos5/libexec/hprop (installincludes) =3D=3D=3D> kerberos5/libexec/hpropd (installincludes) =3D=3D=3D> kerberos5/libexec/kadmind (installincludes) =3D=3D=3D> kerberos5/libexec/kdc (installincludes) =3D=3D=3D> kerberos5/libexec/kdigest (installincludes) =3D=3D=3D> kerberos5/libexec/kfd (installincludes) =3D=3D=3D> kerberos5/libexec/kimpersonate (installincludes) =3D=3D=3D> kerberos5/libexec/kpasswdd (installincludes) =3D=3D=3D> kerberos5/libexec/kcm (installincludes) =3D=3D=3D> kerberos5/tools (installincludes) =3D=3D=3D> kerberos5/tools/make-roken (installincludes) =3D=3D=3D> kerberos5/tools/asn1_compile (installincludes) =3D=3D=3D> kerberos5/tools/slc (installincludes) =3D=3D=3D> kerberos5/usr.bin (installincludes) =3D=3D=3D> kerberos5/usr.bin/hxtool (installincludes) =3D=3D=3D> kerberos5/usr.bin/kadmin (installincludes) =3D=3D=3D> kerberos5/usr.bin/kcc (installincludes) =3D=3D=3D> kerberos5/usr.bin/kdestroy (installincludes) =3D=3D=3D> kerberos5/usr.bin/kgetcred (installincludes) =3D=3D=3D> kerberos5/usr.bin/kf (installincludes) =3D=3D=3D> kerberos5/usr.bin/kinit (installincludes) =3D=3D=3D> kerberos5/usr.bin/kpasswd (installincludes) =3D=3D=3D> kerberos5/usr.bin/krb5-config (installincludes) =3D=3D=3D> kerberos5/usr.bin/ksu (installincludes) =3D=3D=3D> kerberos5/usr.bin/string2key (installincludes) =3D=3D=3D> kerberos5/usr.bin/verify_krb5_conf (installincludes) =3D=3D=3D> kerberos5/usr.sbin (installincludes) =3D=3D=3D> kerberos5/usr.sbin/iprop-log (installincludes) =3D=3D=3D> kerberos5/usr.sbin/kstash (installincludes) =3D=3D=3D> kerberos5/usr.sbin/ktutil (installincludes) =3D=3D=3D> rescue (includes) set -e; cd /zbuilder/buildd/head/rescue; /usr/obj/zbuilder/buildd/head/make= =2Eamd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make = installincludes =3D=3D=3D> rescue/librescue (buildincludes) =3D=3D=3D> rescue/rescue (buildincludes) =3D=3D=3D> rescue/librescue (installincludes) =3D=3D=3D> rescue/rescue (installincludes) =3D=3D=3D> sbin (includes) set -e; cd /zbuilder/buildd/head/sbin; /usr/obj/zbuilder/buildd/head/make.a= md64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make inst= allincludes =3D=3D=3D> sbin/adjkerntz (buildincludes) =3D=3D=3D> sbin/atm (buildincludes) =3D=3D=3D> sbin/atm/atmconfig (buildincludes) =3D=3D=3D> sbin/badsect (buildincludes) =3D=3D=3D> sbin/bsdlabel (buildincludes) =3D=3D=3D> sbin/camcontrol (buildincludes) =3D=3D=3D> sbin/ccdconfig (buildincludes) =3D=3D=3D> sbin/clri (buildincludes) =3D=3D=3D> sbin/comcontrol (buildincludes) =3D=3D=3D> sbin/conscontrol (buildincludes) =3D=3D=3D> sbin/ddb (buildincludes) =3D=3D=3D> sbin/devd (buildincludes) =3D=3D=3D> sbin/devfs (buildincludes) =3D=3D=3D> sbin/dhclient (buildincludes) =3D=3D=3D> sbin/dmesg (buildincludes) =3D=3D=3D> sbin/dump (buildincludes) =3D=3D=3D> sbin/dumpfs (buildincludes) =3D=3D=3D> sbin/dumpon (buildincludes) =3D=3D=3D> sbin/etherswitchcfg (buildincludes) =3D=3D=3D> sbin/fdisk (buildincludes) =3D=3D=3D> sbin/ffsinfo (buildincludes) =3D=3D=3D> sbin/fsck (buildincludes) =3D=3D=3D> sbin/fsck_ffs (buildincludes) =3D=3D=3D> sbin/fsck_msdosfs (buildincludes) =3D=3D=3D> sbin/fsdb (buildincludes) =3D=3D=3D> sbin/fsirand (buildincludes) =3D=3D=3D> sbin/gbde (buildincludes) =3D=3D=3D> sbin/geom (buildincludes) =3D=3D=3D> sbin/geom/core (buildincludes) =3D=3D=3D> sbin/geom/class (buildincludes) =3D=3D=3D> sbin/geom/class/cache (buildincludes) =3D=3D=3D> sbin/geom/class/concat (buildincludes) =3D=3D=3D> sbin/geom/class/eli (buildincludes) =3D=3D=3D> sbin/geom/class/journal (buildincludes) =3D=3D=3D> sbin/geom/class/label (buildincludes) =3D=3D=3D> sbin/geom/class/mirror (buildincludes) =3D=3D=3D> sbin/geom/class/mountver (buildincludes) =3D=3D=3D> sbin/geom/class/multipath (buildincludes) =3D=3D=3D> sbin/geom/class/nop (buildincludes) =3D=3D=3D> sbin/geom/class/part (buildincludes) =3D=3D=3D> sbin/geom/class/raid (buildincludes) =3D=3D=3D> sbin/geom/class/raid3 (buildincludes) =3D=3D=3D> sbin/geom/class/sched (buildincludes) =3D=3D=3D> sbin/geom/class/shsec (buildincludes) =3D=3D=3D> sbin/geom/class/stripe (buildincludes) =3D=3D=3D> sbin/geom/class/virstor (buildincludes) =3D=3D=3D> sbin/ggate (buildincludes) =3D=3D=3D> sbin/ggate/ggatec (buildincludes) =3D=3D=3D> sbin/ggate/ggated (buildincludes) =3D=3D=3D> sbin/ggate/ggatel (buildincludes) =3D=3D=3D> sbin/growfs (buildincludes) =3D=3D=3D> sbin/gvinum (buildincludes) =3D=3D=3D> sbin/hastctl (buildincludes) =3D=3D=3D> sbin/hastd (buildincludes) =3D=3D=3D> sbin/ifconfig (buildincludes) =3D=3D=3D> sbin/init (buildincludes) =3D=3D=3D> sbin/ipf (buildincludes) =3D=3D=3D> sbin/ipf/libipf (buildincludes) =3D=3D=3D> sbin/ipf/ipf (buildincludes) =3D=3D=3D> sbin/ipf/ipfs (buildincludes) =3D=3D=3D> sbin/ipf/ipfstat (buildincludes) =3D=3D=3D> sbin/ipf/ipftest (buildincludes) =3D=3D=3D> sbin/ipf/ipmon (buildincludes) =3D=3D=3D> sbin/ipf/ipnat (buildincludes) =3D=3D=3D> sbin/ipf/ippool (buildincludes) =3D=3D=3D> sbin/ipf/ipresend (buildincludes) =3D=3D=3D> sbin/ipfw (buildincludes) =3D=3D=3D> sbin/iscontrol (buildincludes) =3D=3D=3D> sbin/kldconfig (buildincludes) =3D=3D=3D> sbin/kldload (buildincludes) =3D=3D=3D> sbin/kldstat (buildincludes) =3D=3D=3D> sbin/kldunload (buildincludes) =3D=3D=3D> sbin/ldconfig (buildincludes) =3D=3D=3D> sbin/md5 (buildincludes) =3D=3D=3D> sbin/mdconfig (buildincludes) =3D=3D=3D> sbin/mdmfs (buildincludes) =3D=3D=3D> sbin/mknod (buildincludes) =3D=3D=3D> sbin/mksnap_ffs (buildincludes) =3D=3D=3D> sbin/mount (buildincludes) =3D=3D=3D> sbin/mount_cd9660 (buildincludes) =3D=3D=3D> sbin/mount_fusefs (buildincludes) =3D=3D=3D> sbin/mount_msdosfs (buildincludes) =3D=3D=3D> sbin/mount_nfs (buildincludes) =3D=3D=3D> sbin/mount_nullfs (buildincludes) =3D=3D=3D> sbin/mount_udf (buildincludes) =3D=3D=3D> sbin/mount_unionfs (buildincludes) =3D=3D=3D> sbin/natd (buildincludes) =3D=3D=3D> sbin/newfs (buildincludes) =3D=3D=3D> sbin/newfs_msdos (buildincludes) =3D=3D=3D> sbin/nfsiod (buildincludes) =3D=3D=3D> sbin/nos-tun (buildincludes) =3D=3D=3D> sbin/nvmecontrol (buildincludes) =3D=3D=3D> sbin/pfctl (buildincludes) =3D=3D=3D> sbin/pflogd (buildincludes) =3D=3D=3D> sbin/ping (buildincludes) =3D=3D=3D> sbin/ping6 (buildincludes) =3D=3D=3D> sbin/quotacheck (buildincludes) =3D=3D=3D> sbin/rcorder (buildincludes) =3D=3D=3D> sbin/reboot (buildincludes) =3D=3D=3D> sbin/recoverdisk (buildincludes) =3D=3D=3D> sbin/resolvconf (buildincludes) =3D=3D=3D> sbin/restore (buildincludes) =3D=3D=3D> sbin/route (buildincludes) =3D=3D=3D> sbin/routed (buildincludes) =3D=3D=3D> sbin/routed/rtquery (buildincludes) =3D=3D=3D> sbin/rtsol (buildincludes) =3D=3D=3D> sbin/savecore (buildincludes) =3D=3D=3D> sbin/setkey (buildincludes) =3D=3D=3D> sbin/shutdown (buildincludes) =3D=3D=3D> sbin/spppcontrol (buildincludes) =3D=3D=3D> sbin/swapon (buildincludes) =3D=3D=3D> sbin/sysctl (buildincludes) =3D=3D=3D> sbin/tunefs (buildincludes) =3D=3D=3D> sbin/umount (buildincludes) =3D=3D=3D> sbin/adjkerntz (installincludes) =3D=3D=3D> sbin/atm (installincludes) =3D=3D=3D> sbin/atm/atmconfig (installincludes) =3D=3D=3D> sbin/badsect (installincludes) =3D=3D=3D> sbin/bsdlabel (installincludes) =3D=3D=3D> sbin/camcontrol (installincludes) =3D=3D=3D> sbin/ccdconfig (installincludes) =3D=3D=3D> sbin/clri (installincludes) =3D=3D=3D> sbin/comcontrol (installincludes) =3D=3D=3D> sbin/conscontrol (installincludes) =3D=3D=3D> sbin/ddb (installincludes) =3D=3D=3D> sbin/devd (installincludes) =3D=3D=3D> sbin/devfs (installincludes) =3D=3D=3D> sbin/dhclient (installincludes) =3D=3D=3D> sbin/dmesg (installincludes) =3D=3D=3D> sbin/dump (installincludes) =3D=3D=3D> sbin/dumpfs (installincludes) =3D=3D=3D> sbin/dumpon (installincludes) =3D=3D=3D> sbin/etherswitchcfg (installincludes) =3D=3D=3D> sbin/fdisk (installincludes) =3D=3D=3D> sbin/ffsinfo (installincludes) =3D=3D=3D> sbin/fsck (installincludes) =3D=3D=3D> sbin/fsck_ffs (installincludes) =3D=3D=3D> sbin/fsck_msdosfs (installincludes) =3D=3D=3D> sbin/fsdb (installincludes) =3D=3D=3D> sbin/fsirand (installincludes) =3D=3D=3D> sbin/gbde (installincludes) =3D=3D=3D> sbin/geom (installincludes) =3D=3D=3D> sbin/geom/core (installincludes) =3D=3D=3D> sbin/geom/class (installincludes) =3D=3D=3D> sbin/geom/class/cache (installincludes) =3D=3D=3D> sbin/geom/class/concat (installincludes) =3D=3D=3D> sbin/geom/class/eli (installincludes) =3D=3D=3D> sbin/geom/class/journal (installincludes) =3D=3D=3D> sbin/geom/class/label (installincludes) =3D=3D=3D> sbin/geom/class/mirror (installincludes) =3D=3D=3D> sbin/geom/class/mountver (installincludes) =3D=3D=3D> sbin/geom/class/multipath (installincludes) =3D=3D=3D> sbin/geom/class/nop (installincludes) =3D=3D=3D> sbin/geom/class/part (installincludes) =3D=3D=3D> sbin/geom/class/raid (installincludes) =3D=3D=3D> sbin/geom/class/raid3 (installincludes) =3D=3D=3D> sbin/geom/class/sched (installincludes) =3D=3D=3D> sbin/geom/class/shsec (installincludes) =3D=3D=3D> sbin/geom/class/stripe (installincludes) =3D=3D=3D> sbin/geom/class/virstor (installincludes) =3D=3D=3D> sbin/ggate (installincludes) =3D=3D=3D> sbin/ggate/ggatec (installincludes) =3D=3D=3D> sbin/ggate/ggated (installincludes) =3D=3D=3D> sbin/ggate/ggatel (installincludes) =3D=3D=3D> sbin/growfs (installincludes) =3D=3D=3D> sbin/gvinum (installincludes) =3D=3D=3D> sbin/hastctl (installincludes) =3D=3D=3D> sbin/hastd (installincludes) =3D=3D=3D> sbin/ifconfig (installincludes) =3D=3D=3D> sbin/init (installincludes) =3D=3D=3D> sbin/ipf (installincludes) =3D=3D=3D> sbin/ipf/libipf (installincludes) =3D=3D=3D> sbin/ipf/ipf (installincludes) =3D=3D=3D> sbin/ipf/ipfs (installincludes) =3D=3D=3D> sbin/ipf/ipfstat (installincludes) =3D=3D=3D> sbin/ipf/ipftest (installincludes) =3D=3D=3D> sbin/ipf/ipmon (installincludes) =3D=3D=3D> sbin/ipf/ipnat (installincludes) =3D=3D=3D> sbin/ipf/ippool (installincludes) =3D=3D=3D> sbin/ipf/ipresend (installincludes) =3D=3D=3D> sbin/ipfw (installincludes) =3D=3D=3D> sbin/iscontrol (installincludes) =3D=3D=3D> sbin/kldconfig (installincludes) =3D=3D=3D> sbin/kldload (installincludes) =3D=3D=3D> sbin/kldstat (installincludes) =3D=3D=3D> sbin/kldunload (installincludes) =3D=3D=3D> sbin/ldconfig (installincludes) =3D=3D=3D> sbin/md5 (installincludes) =3D=3D=3D> sbin/mdconfig (installincludes) =3D=3D=3D> sbin/mdmfs (installincludes) =3D=3D=3D> sbin/mknod (installincludes) =3D=3D=3D> sbin/mksnap_ffs (installincludes) =3D=3D=3D> sbin/mount (installincludes) =3D=3D=3D> sbin/mount_cd9660 (installincludes) =3D=3D=3D> sbin/mount_fusefs (installincludes) =3D=3D=3D> sbin/mount_msdosfs (installincludes) =3D=3D=3D> sbin/mount_nfs (installincludes) =3D=3D=3D> sbin/mount_nullfs (installincludes) =3D=3D=3D> sbin/mount_udf (installincludes) =3D=3D=3D> sbin/mount_unionfs (installincludes) =3D=3D=3D> sbin/natd (installincludes) =3D=3D=3D> sbin/newfs (installincludes) =3D=3D=3D> sbin/newfs_msdos (installincludes) =3D=3D=3D> sbin/nfsiod (installincludes) =3D=3D=3D> sbin/nos-tun (installincludes) =3D=3D=3D> sbin/nvmecontrol (installincludes) =3D=3D=3D> sbin/pfctl (installincludes) =3D=3D=3D> sbin/pflogd (installincludes) =3D=3D=3D> sbin/ping (installincludes) =3D=3D=3D> sbin/ping6 (installincludes) =3D=3D=3D> sbin/quotacheck (installincludes) =3D=3D=3D> sbin/rcorder (installincludes) =3D=3D=3D> sbin/reboot (installincludes) =3D=3D=3D> sbin/recoverdisk (installincludes) =3D=3D=3D> sbin/resolvconf (installincludes) =3D=3D=3D> sbin/restore (installincludes) =3D=3D=3D> sbin/route (installincludes) =3D=3D=3D> sbin/routed (installincludes) =3D=3D=3D> sbin/routed/rtquery (installincludes) =3D=3D=3D> sbin/rtsol (installincludes) =3D=3D=3D> sbin/savecore (installincludes) =3D=3D=3D> sbin/setkey (installincludes) =3D=3D=3D> sbin/shutdown (installincludes) =3D=3D=3D> sbin/spppcontrol (installincludes) =3D=3D=3D> sbin/swapon (installincludes) =3D=3D=3D> sbin/sysctl (installincludes) =3D=3D=3D> sbin/tunefs (installincludes) =3D=3D=3D> sbin/umount (installincludes) =3D=3D=3D> secure (includes) set -e; cd /zbuilder/buildd/head/secure; /usr/obj/zbuilder/buildd/head/make= =2Eamd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make = installincludes =3D=3D=3D> secure/lib (buildincludes) =3D=3D=3D> secure/lib/libcrypto (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (buildincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (buildincludes) =3D=3D=3D> secure/lib/libssl (buildincludes) =3D=3D=3D> secure/lib/libssh (buildincludes) =3D=3D=3D> secure/libexec (buildincludes) =3D=3D=3D> secure/libexec/sftp-server (buildincludes) =3D=3D=3D> secure/libexec/ssh-keysign (buildincludes) =3D=3D=3D> secure/libexec/ssh-pkcs11-helper (buildincludes) =3D=3D=3D> secure/usr.bin (buildincludes) =3D=3D=3D> secure/usr.bin/bdes (buildincludes) =3D=3D=3D> secure/usr.bin/openssl (buildincludes) =3D=3D=3D> secure/usr.bin/scp (buildincludes) =3D=3D=3D> secure/usr.bin/sftp (buildincludes) =3D=3D=3D> secure/usr.bin/ssh (buildincludes) =3D=3D=3D> secure/usr.bin/ssh-add (buildincludes) =3D=3D=3D> secure/usr.bin/ssh-agent (buildincludes) =3D=3D=3D> secure/usr.bin/ssh-keygen (buildincludes) =3D=3D=3D> secure/usr.bin/ssh-keyscan (buildincludes) =3D=3D=3D> secure/usr.sbin (buildincludes) =3D=3D=3D> secure/usr.sbin/sshd (buildincludes) =3D=3D=3D> secure/lib (installincludes) =3D=3D=3D> secure/lib/libcrypto (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/crypto= =2Eh /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cry= pto/ebcdic.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/opensslv.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ossl_typ.h /zbuilder/buildd/head/secure/lib/libcrypto= /../../../crypto/openssl/crypto/symhacks.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/../e_os2.h /zbuilder/buildd/head/= secure/lib/libcrypto/../../../crypto/openssl/crypto/aes/aes.h /zbuilder/bui= ldd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn1/asn1.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn= 1/asn1_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/asn1/asn1t.h /zbuilder/buildd/head/secure/lib/libcrypto/../../.= =2E/crypto/openssl/crypto/bf/blowfish.h /zbuilder/buildd/head/secure/lib/li= bcrypto/../../../crypto/openssl/crypto/bio/bio.h /zbuilder/buildd/head/secu= re/lib/libcrypto/../../../crypto/openssl/crypto/bn/bn.h /zbuilder/buildd/he= ad/secure/lib/libcrypto/../../../crypto/openssl/crypto/buffer/buffer.h /zbu= ilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/camel= lia/camellia.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/cast/cast.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/cmac/cmac.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/cms/cms.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/comp/comp.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/conf.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/c= onf_api.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/des/des.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../cryp= to/openssl/crypto/des/des_old.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/dh/dh.h /zbuilder/buildd/head/secure/lib/l= ibcrypto/../../../crypto/openssl/crypto/dsa/dsa.h /zbuilder/buildd/head/sec= ure/lib/libcrypto/../../../crypto/openssl/crypto/dso/dso.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ec/ec.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ecdh/ecdh.= h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto= /ecdsa/ecdsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/engine/engine.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/err/err.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/evp/evp.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/hmac/hmac.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/idea/idea.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/krb5/k= rb5_asn.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/lhash/lhash.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/md4/md4.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/md5/md5.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/mdc2/mdc2.h /zbuilder/buildd/head= /secure/lib/libcrypto/../../../crypto/openssl/crypto/modes/modes.h /zbuilde= r/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/objects/o= bj_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl= /crypto/objects/objects.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/ocsp/ocsp.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/pem/pem.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/pem/pem2.h /zbuilder/buildd/= head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkcs12/pkcs12.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkc= s7/pkcs7.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/opens= sl/crypto/pqueue/pqueue.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/rand/rand.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/rc2/rc2.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/rc4/rc4.h /zbuilder/buildd/h= ead/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ripemd/rip= emd.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cr= ypto/rsa/rsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/seed/seed.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/sha/sha.h /zbuilder/buildd/head/secure/lib/libcr= ypto/../../../crypto/openssl/crypto/srp/srp.h /zbuilder/buildd/head/secure/= lib/libcrypto/../../../crypto/openssl/crypto/stack/safestack.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/stack/stack.h= /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/= ts/ts.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/= crypto/txt_db/txt_db.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ui/ui.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/ui/ui_compat.h /zbuilder/buildd/head/secure/li= b/libcrypto/../../../crypto/openssl/crypto/whrlpool/whrlpool.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x509/x509.h /= zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x5= 09/x509_vfy.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/op= enssl/crypto/x509v3/x509v3.h opensslconf.h /usr/obj/zbuilder/buildd/head/tm= p/usr/include/openssl =3D=3D=3D> secure/lib/libcrypto/engines (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (installincludes) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (installincludes) =3D=3D=3D> secure/lib/libssl (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/dtls1.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/kssl.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/srtp.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl2.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl23.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl3.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/tls1.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/openssl =3D=3D=3D> secure/lib/libssh (installincludes) =3D=3D=3D> secure/libexec (installincludes) =3D=3D=3D> secure/libexec/sftp-server (installincludes) =3D=3D=3D> secure/libexec/ssh-keysign (installincludes) =3D=3D=3D> secure/libexec/ssh-pkcs11-helper (installincludes) =3D=3D=3D> secure/usr.bin (installincludes) =3D=3D=3D> secure/usr.bin/bdes (installincludes) =3D=3D=3D> secure/usr.bin/openssl (installincludes) =3D=3D=3D> secure/usr.bin/scp (installincludes) =3D=3D=3D> secure/usr.bin/sftp (installincludes) =3D=3D=3D> secure/usr.bin/ssh (installincludes) =3D=3D=3D> secure/usr.bin/ssh-add (installincludes) =3D=3D=3D> secure/usr.bin/ssh-agent (installincludes) =3D=3D=3D> secure/usr.bin/ssh-keygen (installincludes) =3D=3D=3D> secure/usr.bin/ssh-keyscan (installincludes) =3D=3D=3D> secure/usr.sbin (installincludes) =3D=3D=3D> secure/usr.sbin/sshd (installincludes) =3D=3D=3D> share (includes) set -e; cd /zbuilder/buildd/head/share; /usr/obj/zbuilder/buildd/head/make.= amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make ins= tallincludes =3D=3D=3D> share/atf (buildincludes) =3D=3D=3D> share/colldef (buildincludes) =3D=3D=3D> share/dict (buildincludes) =3D=3D=3D> share/doc (buildincludes) =3D=3D=3D> share/doc/IPv6 (buildincludes) =3D=3D=3D> share/doc/atf (buildincludes) =3D=3D=3D> share/doc/bind9 (buildincludes) =3D=3D=3D> share/doc/legal (buildincludes) =3D=3D=3D> share/doc/legal/intel_ipw (buildincludes) =3D=3D=3D> share/doc/legal/intel_iwi (buildincludes) =3D=3D=3D> share/doc/legal/intel_iwn (buildincludes) =3D=3D=3D> share/doc/legal/intel_wpi (buildincludes) =3D=3D=3D> share/doc/llvm (buildincludes) =3D=3D=3D> share/doc/llvm/clang (buildincludes) =3D=3D=3D> share/doc/papers (buildincludes) =3D=3D=3D> share/doc/papers/beyond4.3 (buildincludes) =3D=3D=3D> share/doc/papers/bufbio (buildincludes) =3D=3D=3D> share/doc/papers/contents (buildincludes) =3D=3D=3D> share/doc/papers/devfs (buildincludes) =3D=3D=3D> share/doc/papers/diskperf (buildincludes) =3D=3D=3D> share/doc/papers/fsinterface (buildincludes) =3D=3D=3D> share/doc/papers/hwpmc (buildincludes) =3D=3D=3D> share/doc/papers/jail (buildincludes) =3D=3D=3D> share/doc/papers/kernmalloc (buildincludes) =3D=3D=3D> share/doc/papers/kerntune (buildincludes) =3D=3D=3D> share/doc/papers/malloc (buildincludes) =3D=3D=3D> share/doc/papers/newvm (buildincludes) =3D=3D=3D> share/doc/papers/relengr (buildincludes) =3D=3D=3D> share/doc/papers/sysperf (buildincludes) =3D=3D=3D> share/doc/papers/timecounter (buildincludes) =3D=3D=3D> share/doc/psd (buildincludes) =3D=3D=3D> share/doc/psd/title (buildincludes) =3D=3D=3D> share/doc/psd/contents (buildincludes) =3D=3D=3D> share/doc/psd/01.cacm (buildincludes) =3D=3D=3D> share/doc/psd/02.implement (buildincludes) =3D=3D=3D> share/doc/psd/03.iosys (buildincludes) =3D=3D=3D> share/doc/psd/04.uprog (buildincludes) =3D=3D=3D> share/doc/psd/05.sysman (buildincludes) =3D=3D=3D> share/doc/psd/06.Clang (buildincludes) =3D=3D=3D> share/doc/psd/12.make (buildincludes) =3D=3D=3D> share/doc/psd/13.rcs (buildincludes) =3D=3D=3D> share/doc/psd/13.rcs/rcs (buildincludes) =3D=3D=3D> share/doc/psd/13.rcs/rcs_func (buildincludes) =3D=3D=3D> share/doc/psd/15.yacc (buildincludes) =3D=3D=3D> share/doc/psd/16.lex (buildincludes) =3D=3D=3D> share/doc/psd/17.m4 (buildincludes) =3D=3D=3D> share/doc/psd/18.gprof (buildincludes) =3D=3D=3D> share/doc/psd/20.ipctut (buildincludes) =3D=3D=3D> share/doc/psd/21.ipc (buildincludes) =3D=3D=3D> share/doc/psd/22.rpcgen (buildincludes) =3D=3D=3D> share/doc/psd/23.rpc (buildincludes) =3D=3D=3D> share/doc/psd/24.xdr (buildincludes) =3D=3D=3D> share/doc/psd/25.xdrrfc (buildincludes) =3D=3D=3D> share/doc/psd/26.rpcrfc (buildincludes) =3D=3D=3D> share/doc/psd/27.nfsrpc (buildincludes) =3D=3D=3D> share/doc/psd/28.cvs (buildincludes) =3D=3D=3D> share/doc/smm (buildincludes) =3D=3D=3D> share/doc/smm/title (buildincludes) =3D=3D=3D> share/doc/smm/contents (buildincludes) =3D=3D=3D> share/doc/smm/01.setup (buildincludes) =3D=3D=3D> share/doc/smm/02.config (buildincludes) =3D=3D=3D> share/doc/smm/03.fsck (buildincludes) =3D=3D=3D> share/doc/smm/04.quotas (buildincludes) =3D=3D=3D> share/doc/smm/05.fastfs (buildincludes) =3D=3D=3D> share/doc/smm/06.nfs (buildincludes) =3D=3D=3D> share/doc/smm/07.lpd (buildincludes) =3D=3D=3D> share/doc/smm/08.sendmailop (buildincludes) =3D=3D=3D> share/doc/smm/11.timedop (buildincludes) =3D=3D=3D> share/doc/smm/12.timed (buildincludes) =3D=3D=3D> share/doc/smm/18.net (buildincludes) =3D=3D=3D> share/doc/usd (buildincludes) =3D=3D=3D> share/doc/usd/title (buildincludes) =3D=3D=3D> share/doc/usd/contents (buildincludes) =3D=3D=3D> share/doc/usd/04.csh (buildincludes) =3D=3D=3D> share/doc/usd/05.dc (buildincludes) =3D=3D=3D> share/doc/usd/06.bc (buildincludes) =3D=3D=3D> share/doc/usd/07.mail (buildincludes) =3D=3D=3D> share/doc/usd/10.exref (buildincludes) =3D=3D=3D> share/doc/usd/10.exref/exref (buildincludes) =3D=3D=3D> share/doc/usd/10.exref/summary (buildincludes) =3D=3D=3D> share/doc/usd/11.vitut (buildincludes) =3D=3D=3D> share/doc/usd/12.vi (buildincludes) =3D=3D=3D> share/doc/usd/12.vi/vi (buildincludes) =3D=3D=3D> share/doc/usd/12.vi/viapwh (buildincludes) =3D=3D=3D> share/doc/usd/12.vi/summary (buildincludes) =3D=3D=3D> share/doc/usd/13.viref (buildincludes) =3D=3D=3D> share/doc/usd/18.msdiffs (buildincludes) =3D=3D=3D> share/doc/usd/19.memacros (buildincludes) =3D=3D=3D> share/doc/usd/20.meref (buildincludes) =3D=3D=3D> share/doc/usd/21.troff (buildincludes) =3D=3D=3D> share/doc/usd/22.trofftut (buildincludes) =3D=3D=3D> share/dtrace (buildincludes) =3D=3D=3D> share/dtrace/toolkit (buildincludes) =3D=3D=3D> share/examples (buildincludes) =3D=3D=3D> share/man (buildincludes) =3D=3D=3D> share/man/man1 (buildincludes) =3D=3D=3D> share/man/man3 (buildincludes) =3D=3D=3D> share/man/man4 (buildincludes) =3D=3D=3D> share/man/man5 (buildincludes) =3D=3D=3D> share/man/man6 (buildincludes) =3D=3D=3D> share/man/man7 (buildincludes) =3D=3D=3D> share/man/man8 (buildincludes) =3D=3D=3D> share/man/man9 (buildincludes) =3D=3D=3D> share/me (buildincludes) =3D=3D=3D> share/misc (buildincludes) =3D=3D=3D> share/mk (buildincludes) =3D=3D=3D> share/mklocale (buildincludes) =3D=3D=3D> share/monetdef (buildincludes) =3D=3D=3D> share/msgdef (buildincludes) =3D=3D=3D> share/numericdef (buildincludes) =3D=3D=3D> share/sendmail (buildincludes) =3D=3D=3D> share/skel (buildincludes) =3D=3D=3D> share/snmp (buildincludes) =3D=3D=3D> share/snmp/mibs (buildincludes) =3D=3D=3D> share/syscons (buildincludes) =3D=3D=3D> share/syscons/fonts (buildincludes) =3D=3D=3D> share/syscons/keymaps (buildincludes) =3D=3D=3D> share/syscons/scrnmaps (buildincludes) =3D=3D=3D> share/tabset (buildincludes) =3D=3D=3D> share/termcap (buildincludes) =3D=3D=3D> share/timedef (buildincludes) =3D=3D=3D> share/xml (buildincludes) =3D=3D=3D> share/xml/atf (buildincludes) =3D=3D=3D> share/xsl (buildincludes) =3D=3D=3D> share/xsl/atf (buildincludes) =3D=3D=3D> share/zoneinfo (buildincludes) =3D=3D=3D> share/atf (installincludes) =3D=3D=3D> share/colldef (installincludes) =3D=3D=3D> share/dict (installincludes) =3D=3D=3D> share/doc (installincludes) =3D=3D=3D> share/doc/IPv6 (installincludes) =3D=3D=3D> share/doc/atf (installincludes) =3D=3D=3D> share/doc/bind9 (installincludes) =3D=3D=3D> share/doc/legal (installincludes) =3D=3D=3D> share/doc/legal/intel_ipw (installincludes) =3D=3D=3D> share/doc/legal/intel_iwi (installincludes) =3D=3D=3D> share/doc/legal/intel_iwn (installincludes) =3D=3D=3D> share/doc/legal/intel_wpi (installincludes) =3D=3D=3D> share/doc/llvm (installincludes) =3D=3D=3D> share/doc/llvm/clang (installincludes) =3D=3D=3D> share/doc/papers (installincludes) =3D=3D=3D> share/doc/papers/beyond4.3 (installincludes) =3D=3D=3D> share/doc/papers/bufbio (installincludes) =3D=3D=3D> share/doc/papers/contents (installincludes) =3D=3D=3D> share/doc/papers/devfs (installincludes) =3D=3D=3D> share/doc/papers/diskperf (installincludes) =3D=3D=3D> share/doc/papers/fsinterface (installincludes) =3D=3D=3D> share/doc/papers/hwpmc (installincludes) =3D=3D=3D> share/doc/papers/jail (installincludes) =3D=3D=3D> share/doc/papers/kernmalloc (installincludes) =3D=3D=3D> share/doc/papers/kerntune (installincludes) =3D=3D=3D> share/doc/papers/malloc (installincludes) =3D=3D=3D> share/doc/papers/newvm (installincludes) =3D=3D=3D> share/doc/papers/relengr (installincludes) =3D=3D=3D> share/doc/papers/sysperf (installincludes) =3D=3D=3D> share/doc/papers/timecounter (installincludes) =3D=3D=3D> share/doc/psd (installincludes) =3D=3D=3D> share/doc/psd/title (installincludes) =3D=3D=3D> share/doc/psd/contents (installincludes) =3D=3D=3D> share/doc/psd/01.cacm (installincludes) =3D=3D=3D> share/doc/psd/02.implement (installincludes) =3D=3D=3D> share/doc/psd/03.iosys (installincludes) =3D=3D=3D> share/doc/psd/04.uprog (installincludes) =3D=3D=3D> share/doc/psd/05.sysman (installincludes) =3D=3D=3D> share/doc/psd/06.Clang (installincludes) =3D=3D=3D> share/doc/psd/12.make (installincludes) =3D=3D=3D> share/doc/psd/13.rcs (installincludes) =3D=3D=3D> share/doc/psd/13.rcs/rcs (installincludes) =3D=3D=3D> share/doc/psd/13.rcs/rcs_func (installincludes) =3D=3D=3D> share/doc/psd/15.yacc (installincludes) =3D=3D=3D> share/doc/psd/16.lex (installincludes) =3D=3D=3D> share/doc/psd/17.m4 (installincludes) =3D=3D=3D> share/doc/psd/18.gprof (installincludes) =3D=3D=3D> share/doc/psd/20.ipctut (installincludes) =3D=3D=3D> share/doc/psd/21.ipc (installincludes) =3D=3D=3D> share/doc/psd/22.rpcgen (installincludes) =3D=3D=3D> share/doc/psd/23.rpc (installincludes) =3D=3D=3D> share/doc/psd/24.xdr (installincludes) =3D=3D=3D> share/doc/psd/25.xdrrfc (installincludes) =3D=3D=3D> share/doc/psd/26.rpcrfc (installincludes) =3D=3D=3D> share/doc/psd/27.nfsrpc (installincludes) =3D=3D=3D> share/doc/psd/28.cvs (installincludes) =3D=3D=3D> share/doc/smm (installincludes) =3D=3D=3D> share/doc/smm/title (installincludes) =3D=3D=3D> share/doc/smm/contents (installincludes) =3D=3D=3D> share/doc/smm/01.setup (installincludes) =3D=3D=3D> share/doc/smm/02.config (installincludes) =3D=3D=3D> share/doc/smm/03.fsck (installincludes) =3D=3D=3D> share/doc/smm/04.quotas (installincludes) =3D=3D=3D> share/doc/smm/05.fastfs (installincludes) =3D=3D=3D> share/doc/smm/06.nfs (installincludes) =3D=3D=3D> share/doc/smm/07.lpd (installincludes) =3D=3D=3D> share/doc/smm/08.sendmailop (installincludes) =3D=3D=3D> share/doc/smm/11.timedop (installincludes) =3D=3D=3D> share/doc/smm/12.timed (installincludes) =3D=3D=3D> share/doc/smm/18.net (installincludes) =3D=3D=3D> share/doc/usd (installincludes) =3D=3D=3D> share/doc/usd/title (installincludes) =3D=3D=3D> share/doc/usd/contents (installincludes) =3D=3D=3D> share/doc/usd/04.csh (installincludes) =3D=3D=3D> share/doc/usd/05.dc (installincludes) =3D=3D=3D> share/doc/usd/06.bc (installincludes) =3D=3D=3D> share/doc/usd/07.mail (installincludes) =3D=3D=3D> share/doc/usd/10.exref (installincludes) =3D=3D=3D> share/doc/usd/10.exref/exref (installincludes) =3D=3D=3D> share/doc/usd/10.exref/summary (installincludes) =3D=3D=3D> share/doc/usd/11.vitut (installincludes) =3D=3D=3D> share/doc/usd/12.vi (installincludes) =3D=3D=3D> share/doc/usd/12.vi/vi (installincludes) =3D=3D=3D> share/doc/usd/12.vi/viapwh (installincludes) =3D=3D=3D> share/doc/usd/12.vi/summary (installincludes) =3D=3D=3D> share/doc/usd/13.viref (installincludes) =3D=3D=3D> share/doc/usd/18.msdiffs (installincludes) =3D=3D=3D> share/doc/usd/19.memacros (installincludes) =3D=3D=3D> share/doc/usd/20.meref (installincludes) =3D=3D=3D> share/doc/usd/21.troff (installincludes) =3D=3D=3D> share/doc/usd/22.trofftut (installincludes) =3D=3D=3D> share/dtrace (installincludes) =3D=3D=3D> share/dtrace/toolkit (installincludes) =3D=3D=3D> share/examples (installincludes) =3D=3D=3D> share/man (installincludes) =3D=3D=3D> share/man/man1 (installincludes) =3D=3D=3D> share/man/man3 (installincludes) =3D=3D=3D> share/man/man4 (installincludes) =3D=3D=3D> share/man/man5 (installincludes) =3D=3D=3D> share/man/man6 (installincludes) =3D=3D=3D> share/man/man7 (installincludes) =3D=3D=3D> share/man/man8 (installincludes) =3D=3D=3D> share/man/man9 (installincludes) =3D=3D=3D> share/me (installincludes) =3D=3D=3D> share/misc (installincludes) =3D=3D=3D> share/mk (installincludes) =3D=3D=3D> share/mklocale (installincludes) =3D=3D=3D> share/monetdef (installincludes) =3D=3D=3D> share/msgdef (installincludes) =3D=3D=3D> share/numericdef (installincludes) =3D=3D=3D> share/sendmail (installincludes) =3D=3D=3D> share/skel (installincludes) =3D=3D=3D> share/snmp (installincludes) =3D=3D=3D> share/snmp/mibs (installincludes) =3D=3D=3D> share/syscons (installincludes) =3D=3D=3D> share/syscons/fonts (installincludes) =3D=3D=3D> share/syscons/keymaps (installincludes) =3D=3D=3D> share/syscons/scrnmaps (installincludes) =3D=3D=3D> share/tabset (installincludes) =3D=3D=3D> share/termcap (installincludes) =3D=3D=3D> share/timedef (installincludes) =3D=3D=3D> share/xml (installincludes) =3D=3D=3D> share/xml/atf (installincludes) =3D=3D=3D> share/xsl (installincludes) =3D=3D=3D> share/xsl/atf (installincludes) =3D=3D=3D> share/zoneinfo (installincludes) =3D=3D=3D> sys (includes) set -e; cd /zbuilder/buildd/head/sys; /usr/obj/zbuilder/buildd/head/make.am= d64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make insta= llincludes =3D=3D=3D> sys/boot (buildincludes) =3D=3D=3D> sys/boot/efi (buildincludes) =3D=3D=3D> sys/boot/efi/libefi (buildincludes) =3D=3D=3D> sys/boot/zfs (buildincludes) =3D=3D=3D> sys/boot/userboot (buildincludes) =3D=3D=3D> sys/boot/userboot/ficl (buildincludes) =3D=3D=3D> sys/boot/userboot/libstand (buildincludes) =3D=3D=3D> sys/boot/userboot/test (buildincludes) =3D=3D=3D> sys/boot/userboot/userboot (buildincludes) =3D=3D=3D> sys/boot/ficl (buildincludes) =3D=3D=3D> sys/boot/i386 (buildincludes) =3D=3D=3D> sys/boot/i386/mbr (buildincludes) =3D=3D=3D> sys/boot/i386/pmbr (buildincludes) =3D=3D=3D> sys/boot/i386/boot0 (buildincludes) =3D=3D=3D> sys/boot/i386/boot0sio (buildincludes) =3D=3D=3D> sys/boot/i386/btx (buildincludes) =3D=3D=3D> sys/boot/i386/btx/btx (buildincludes) =3D=3D=3D> sys/boot/i386/btx/btxldr (buildincludes) =3D=3D=3D> sys/boot/i386/btx/lib (buildincludes) =3D=3D=3D> sys/boot/i386/boot2 (buildincludes) =3D=3D=3D> sys/boot/i386/cdboot (buildincludes) =3D=3D=3D> sys/boot/i386/gptboot (buildincludes) =3D=3D=3D> sys/boot/i386/kgzldr (buildincludes) =3D=3D=3D> sys/boot/i386/libi386 (buildincludes) =3D=3D=3D> sys/boot/i386/libfirewire (buildincludes) =3D=3D=3D> sys/boot/i386/loader (buildincludes) =3D=3D=3D> sys/boot/i386/pxeldr (buildincludes) =3D=3D=3D> sys/boot/i386/zfsboot (buildincludes) =3D=3D=3D> sys/boot/i386/gptzfsboot (buildincludes) =3D=3D=3D> sys/boot/i386/zfsloader (buildincludes) =3D=3D=3D> sys/boot (installincludes) =3D=3D=3D> sys/boot/efi (installincludes) =3D=3D=3D> sys/boot/efi/libefi (installincludes) =3D=3D=3D> sys/boot/zfs (installincludes) =3D=3D=3D> sys/boot/userboot (installincludes) =3D=3D=3D> sys/boot/userboot/ficl (installincludes) =3D=3D=3D> sys/boot/userboot/libstand (installincludes) =3D=3D=3D> sys/boot/userboot/test (installincludes) =3D=3D=3D> sys/boot/userboot/userboot (installincludes) =3D=3D=3D> sys/boot/ficl (installincludes) =3D=3D=3D> sys/boot/i386 (installincludes) =3D=3D=3D> sys/boot/i386/mbr (installincludes) =3D=3D=3D> sys/boot/i386/pmbr (installincludes) =3D=3D=3D> sys/boot/i386/boot0 (installincludes) =3D=3D=3D> sys/boot/i386/boot0sio (installincludes) =3D=3D=3D> sys/boot/i386/btx (installincludes) =3D=3D=3D> sys/boot/i386/btx/btx (installincludes) =3D=3D=3D> sys/boot/i386/btx/btxldr (installincludes) =3D=3D=3D> sys/boot/i386/btx/lib (installincludes) =3D=3D=3D> sys/boot/i386/boot2 (installincludes) =3D=3D=3D> sys/boot/i386/cdboot (installincludes) =3D=3D=3D> sys/boot/i386/gptboot (installincludes) =3D=3D=3D> sys/boot/i386/kgzldr (installincludes) =3D=3D=3D> sys/boot/i386/libi386 (installincludes) =3D=3D=3D> sys/boot/i386/libfirewire (installincludes) =3D=3D=3D> sys/boot/i386/loader (installincludes) =3D=3D=3D> sys/boot/i386/pxeldr (installincludes) =3D=3D=3D> sys/boot/i386/zfsboot (installincludes) =3D=3D=3D> sys/boot/i386/gptzfsboot (installincludes) =3D=3D=3D> sys/boot/i386/zfsloader (installincludes) =3D=3D=3D> usr.bin (includes) set -e; cd /zbuilder/buildd/head/usr.bin; /usr/obj/zbuilder/buildd/head/mak= e.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make i= nstallincludes =3D=3D=3D> usr.bin/alias (buildincludes) =3D=3D=3D> usr.bin/apply (buildincludes) =3D=3D=3D> usr.bin/ar (buildincludes) =3D=3D=3D> usr.bin/asa (buildincludes) =3D=3D=3D> usr.bin/at (buildincludes) =3D=3D=3D> usr.bin/atf (buildincludes) =3D=3D=3D> usr.bin/atf/atf-config (buildincludes) =3D=3D=3D> usr.bin/atf/atf-report (buildincludes) =3D=3D=3D> usr.bin/atf/atf-run (buildincludes) =3D=3D=3D> usr.bin/atf/atf-sh (buildincludes) =3D=3D=3D> usr.bin/atf/atf-version (buildincludes) =3D=3D=3D> usr.bin/atm (buildincludes) =3D=3D=3D> usr.bin/atm/sscop (buildincludes) =3D=3D=3D> usr.bin/awk (buildincludes) =3D=3D=3D> usr.bin/banner (buildincludes) =3D=3D=3D> usr.bin/basename (buildincludes) =3D=3D=3D> usr.bin/bc (buildincludes) =3D=3D=3D> usr.bin/biff (buildincludes) =3D=3D=3D> usr.bin/bluetooth (buildincludes) =3D=3D=3D> usr.bin/bluetooth/bthost (buildincludes) =3D=3D=3D> usr.bin/bluetooth/btsockstat (buildincludes) =3D=3D=3D> usr.bin/bluetooth/rfcomm_sppd (buildincludes) =3D=3D=3D> usr.bin/bmake (buildincludes) =3D=3D=3D> usr.bin/brandelf (buildincludes) =3D=3D=3D> usr.bin/bsdiff (buildincludes) =3D=3D=3D> usr.bin/bsdiff/bsdiff (buildincludes) =3D=3D=3D> usr.bin/bsdiff/bspatch (buildincludes) =3D=3D=3D> usr.bin/bzip2 (buildincludes) =3D=3D=3D> usr.bin/bzip2recover (buildincludes) =3D=3D=3D> usr.bin/c89 (buildincludes) =3D=3D=3D> usr.bin/c99 (buildincludes) =3D=3D=3D> usr.bin/calendar (buildincludes) =3D=3D=3D> usr.bin/cap_mkdb (buildincludes) =3D=3D=3D> usr.bin/catman (buildincludes) =3D=3D=3D> usr.bin/chat (buildincludes) =3D=3D=3D> usr.bin/checknr (buildincludes) =3D=3D=3D> usr.bin/chkey (buildincludes) =3D=3D=3D> usr.bin/chpass (buildincludes) =3D=3D=3D> usr.bin/cksum (buildincludes) =3D=3D=3D> usr.bin/clang (buildincludes) =3D=3D=3D> usr.bin/clang/clang (buildincludes) =3D=3D=3D> usr.bin/clang/clang-tblgen (buildincludes) =3D=3D=3D> usr.bin/clang/tblgen (buildincludes) =3D=3D=3D> usr.bin/cmp (buildincludes) =3D=3D=3D> usr.bin/col (buildincludes) =3D=3D=3D> usr.bin/colcrt (buildincludes) =3D=3D=3D> usr.bin/colldef (buildincludes) =3D=3D=3D> usr.bin/colrm (buildincludes) =3D=3D=3D> usr.bin/column (buildincludes) =3D=3D=3D> usr.bin/comm (buildincludes) =3D=3D=3D> usr.bin/compile_et (buildincludes) =3D=3D=3D> usr.bin/compress (buildincludes) =3D=3D=3D> usr.bin/cpio (buildincludes) =3D=3D=3D> usr.bin/cpuset (buildincludes) =3D=3D=3D> usr.bin/csplit (buildincludes) =3D=3D=3D> usr.bin/csup (buildincludes) =3D=3D=3D> usr.bin/ctags (buildincludes) =3D=3D=3D> usr.bin/ctlstat (buildincludes) =3D=3D=3D> usr.bin/cut (buildincludes) =3D=3D=3D> usr.bin/dc (buildincludes) =3D=3D=3D> usr.bin/dig (buildincludes) =3D=3D=3D> usr.bin/dirname (buildincludes) =3D=3D=3D> usr.bin/dtc (buildincludes) =3D=3D=3D> usr.bin/du (buildincludes) =3D=3D=3D> usr.bin/ee (buildincludes) =3D=3D=3D> usr.bin/elf2aout (buildincludes) =3D=3D=3D> usr.bin/elfdump (buildincludes) =3D=3D=3D> usr.bin/enigma (buildincludes) =3D=3D=3D> usr.bin/env (buildincludes) =3D=3D=3D> usr.bin/expand (buildincludes) =3D=3D=3D> usr.bin/false (buildincludes) =3D=3D=3D> usr.bin/fetch (buildincludes) =3D=3D=3D> usr.bin/file (buildincludes) =3D=3D=3D> usr.bin/file2c (buildincludes) =3D=3D=3D> usr.bin/find (buildincludes) =3D=3D=3D> usr.bin/finger (buildincludes) =3D=3D=3D> usr.bin/fmt (buildincludes) =3D=3D=3D> usr.bin/fold (buildincludes) =3D=3D=3D> usr.bin/from (buildincludes) =3D=3D=3D> usr.bin/fstat (buildincludes) =3D=3D=3D> usr.bin/fsync (buildincludes) =3D=3D=3D> usr.bin/ftp (buildincludes) =3D=3D=3D> usr.bin/gcore (buildincludes) =3D=3D=3D> usr.bin/gencat (buildincludes) =3D=3D=3D> usr.bin/getconf (buildincludes) =3D=3D=3D> usr.bin/getent (buildincludes) =3D=3D=3D> usr.bin/getopt (buildincludes) =3D=3D=3D> usr.bin/gprof (buildincludes) =3D=3D=3D> usr.bin/grep (buildincludes) =3D=3D=3D> usr.bin/gzip (buildincludes) =3D=3D=3D> usr.bin/head (buildincludes) =3D=3D=3D> usr.bin/hexdump (buildincludes) =3D=3D=3D> usr.bin/host (buildincludes) =3D=3D=3D> usr.bin/id (buildincludes) =3D=3D=3D> usr.bin/indent (buildincludes) =3D=3D=3D> usr.bin/ipcrm (buildincludes) =3D=3D=3D> usr.bin/ipcs (buildincludes) =3D=3D=3D> usr.bin/join (buildincludes) =3D=3D=3D> usr.bin/jot (buildincludes) =3D=3D=3D> usr.bin/kdump (buildincludes) =3D=3D=3D> usr.bin/keylogin (buildincludes) =3D=3D=3D> usr.bin/keylogout (buildincludes) =3D=3D=3D> usr.bin/killall (buildincludes) =3D=3D=3D> usr.bin/ktrace (buildincludes) =3D=3D=3D> usr.bin/ktrdump (buildincludes) =3D=3D=3D> usr.bin/lam (buildincludes) =3D=3D=3D> usr.bin/last (buildincludes) =3D=3D=3D> usr.bin/lastcomm (buildincludes) =3D=3D=3D> usr.bin/ldd (buildincludes) =3D=3D=3D> usr.bin/leave (buildincludes) =3D=3D=3D> usr.bin/less (buildincludes) =3D=3D=3D> usr.bin/lessecho (buildincludes) =3D=3D=3D> usr.bin/lesskey (buildincludes) =3D=3D=3D> usr.bin/lex (buildincludes) =3D=3D=3D> usr.bin/lex/lib (buildincludes) =3D=3D=3D> usr.bin/limits (buildincludes) =3D=3D=3D> usr.bin/locale (buildincludes) =3D=3D=3D> usr.bin/locate (buildincludes) =3D=3D=3D> usr.bin/locate/bigram (buildincludes) =3D=3D=3D> usr.bin/locate/code (buildincludes) =3D=3D=3D> usr.bin/locate/locate (buildincludes) =3D=3D=3D> usr.bin/lock (buildincludes) =3D=3D=3D> usr.bin/lockf (buildincludes) =3D=3D=3D> usr.bin/logger (buildincludes) =3D=3D=3D> usr.bin/login (buildincludes) =3D=3D=3D> usr.bin/logins (buildincludes) =3D=3D=3D> usr.bin/logname (buildincludes) =3D=3D=3D> usr.bin/look (buildincludes) =3D=3D=3D> usr.bin/lorder (buildincludes) =3D=3D=3D> usr.bin/lsvfs (buildincludes) =3D=3D=3D> usr.bin/lzmainfo (buildincludes) =3D=3D=3D> usr.bin/m4 (buildincludes) =3D=3D=3D> usr.bin/mail (buildincludes) =3D=3D=3D> usr.bin/makewhatis (buildincludes) =3D=3D=3D> usr.bin/man (buildincludes) =3D=3D=3D> usr.bin/mandoc (buildincludes) =3D=3D=3D> usr.bin/mesg (buildincludes) =3D=3D=3D> usr.bin/minigzip (buildincludes) =3D=3D=3D> usr.bin/ministat (buildincludes) =3D=3D=3D> usr.bin/mkdep (buildincludes) =3D=3D=3D> usr.bin/mkfifo (buildincludes) =3D=3D=3D> usr.bin/mklocale (buildincludes) =3D=3D=3D> usr.bin/mkstr (buildincludes) =3D=3D=3D> usr.bin/mktemp (buildincludes) =3D=3D=3D> usr.bin/mkulzma (buildincludes) =3D=3D=3D> usr.bin/mkuzip (buildincludes) =3D=3D=3D> usr.bin/msgs (buildincludes) =3D=3D=3D> usr.bin/mt (buildincludes) =3D=3D=3D> usr.bin/nc (buildincludes) =3D=3D=3D> usr.bin/ncal (buildincludes) =3D=3D=3D> usr.bin/netstat (buildincludes) =3D=3D=3D> usr.bin/newgrp (buildincludes) =3D=3D=3D> usr.bin/newkey (buildincludes) =3D=3D=3D> usr.bin/nfsstat (buildincludes) =3D=3D=3D> usr.bin/nice (buildincludes) =3D=3D=3D> usr.bin/nl (buildincludes) =3D=3D=3D> usr.bin/nohup (buildincludes) =3D=3D=3D> usr.bin/nslookup (buildincludes) =3D=3D=3D> usr.bin/nsupdate (buildincludes) =3D=3D=3D> usr.bin/opieinfo (buildincludes) =3D=3D=3D> usr.bin/opiekey (buildincludes) =3D=3D=3D> usr.bin/opiepasswd (buildincludes) =3D=3D=3D> usr.bin/pagesize (buildincludes) =3D=3D=3D> usr.bin/passwd (buildincludes) =3D=3D=3D> usr.bin/paste (buildincludes) =3D=3D=3D> usr.bin/patch (buildincludes) =3D=3D=3D> usr.bin/pathchk (buildincludes) =3D=3D=3D> usr.bin/perror (buildincludes) =3D=3D=3D> usr.bin/pr (buildincludes) =3D=3D=3D> usr.bin/printenv (buildincludes) =3D=3D=3D> usr.bin/printf (buildincludes) =3D=3D=3D> usr.bin/procstat (buildincludes) =3D=3D=3D> usr.bin/quota (buildincludes) =3D=3D=3D> usr.bin/rctl (buildincludes) =3D=3D=3D> usr.bin/renice (buildincludes) =3D=3D=3D> usr.bin/rev (buildincludes) =3D=3D=3D> usr.bin/revoke (buildincludes) =3D=3D=3D> usr.bin/rlogin (buildincludes) =3D=3D=3D> usr.bin/rpcgen (buildincludes) =3D=3D=3D> usr.bin/rpcinfo (buildincludes) =3D=3D=3D> usr.bin/rs (buildincludes) =3D=3D=3D> usr.bin/rsh (buildincludes) =3D=3D=3D> usr.bin/rup (buildincludes) =3D=3D=3D> usr.bin/ruptime (buildincludes) =3D=3D=3D> usr.bin/rusers (buildincludes) =3D=3D=3D> usr.bin/rwall (buildincludes) =3D=3D=3D> usr.bin/rwho (buildincludes) =3D=3D=3D> usr.bin/script (buildincludes) =3D=3D=3D> usr.bin/sed (buildincludes) =3D=3D=3D> usr.bin/seq (buildincludes) =3D=3D=3D> usr.bin/shar (buildincludes) =3D=3D=3D> usr.bin/showmount (buildincludes) =3D=3D=3D> usr.bin/sockstat (buildincludes) =3D=3D=3D> usr.bin/sort (buildincludes) =3D=3D=3D> usr.bin/split (buildincludes) =3D=3D=3D> usr.bin/ssh-copy-id (buildincludes) =3D=3D=3D> usr.bin/stat (buildincludes) =3D=3D=3D> usr.bin/stdbuf (buildincludes) =3D=3D=3D> usr.bin/su (buildincludes) =3D=3D=3D> usr.bin/systat (buildincludes) =3D=3D=3D> usr.bin/tabs (buildincludes) =3D=3D=3D> usr.bin/tail (buildincludes) =3D=3D=3D> usr.bin/talk (buildincludes) =3D=3D=3D> usr.bin/tar (buildincludes) =3D=3D=3D> usr.bin/tcopy (buildincludes) =3D=3D=3D> usr.bin/tee (buildincludes) =3D=3D=3D> usr.bin/telnet (buildincludes) =3D=3D=3D> usr.bin/tftp (buildincludes) =3D=3D=3D> usr.bin/time (buildincludes) =3D=3D=3D> usr.bin/tip (buildincludes) =3D=3D=3D> usr.bin/tip/tip (buildincludes) =3D=3D=3D> usr.bin/top (buildincludes) =3D=3D=3D> usr.bin/touch (buildincludes) =3D=3D=3D> usr.bin/tput (buildincludes) =3D=3D=3D> usr.bin/tr (buildincludes) =3D=3D=3D> usr.bin/true (buildincludes) =3D=3D=3D> usr.bin/truncate (buildincludes) =3D=3D=3D> usr.bin/truss (buildincludes) =3D=3D=3D> usr.bin/tset (buildincludes) =3D=3D=3D> usr.bin/tsort (buildincludes) =3D=3D=3D> usr.bin/tty (buildincludes) =3D=3D=3D> usr.bin/ul (buildincludes) =3D=3D=3D> usr.bin/uname (buildincludes) =3D=3D=3D> usr.bin/unexpand (buildincludes) =3D=3D=3D> usr.bin/unifdef (buildincludes) =3D=3D=3D> usr.bin/uniq (buildincludes) =3D=3D=3D> usr.bin/units (buildincludes) =3D=3D=3D> usr.bin/unvis (buildincludes) =3D=3D=3D> usr.bin/unzip (buildincludes) =3D=3D=3D> usr.bin/usbhidaction (buildincludes) =3D=3D=3D> usr.bin/usbhidctl (buildincludes) =3D=3D=3D> usr.bin/users (buildincludes) =3D=3D=3D> usr.bin/uudecode (buildincludes) =3D=3D=3D> usr.bin/uuencode (buildincludes) =3D=3D=3D> usr.bin/vacation (buildincludes) =3D=3D=3D> usr.bin/vgrind (buildincludes) =3D=3D=3D> usr.bin/vi (buildincludes) =3D=3D=3D> usr.bin/vis (buildincludes) =3D=3D=3D> usr.bin/vmstat (buildincludes) =3D=3D=3D> usr.bin/w (buildincludes) =3D=3D=3D> usr.bin/wall (buildincludes) =3D=3D=3D> usr.bin/wc (buildincludes) =3D=3D=3D> usr.bin/what (buildincludes) =3D=3D=3D> usr.bin/whereis (buildincludes) =3D=3D=3D> usr.bin/which (buildincludes) =3D=3D=3D> usr.bin/who (buildincludes) =3D=3D=3D> usr.bin/whois (buildincludes) =3D=3D=3D> usr.bin/write (buildincludes) =3D=3D=3D> usr.bin/xargs (buildincludes) =3D=3D=3D> usr.bin/xinstall (buildincludes) =3D=3D=3D> usr.bin/xlint (buildincludes) =3D=3D=3D> usr.bin/xlint/lint1 (buildincludes) =3D=3D=3D> usr.bin/xlint/lint2 (buildincludes) =3D=3D=3D> usr.bin/xlint/xlint (buildincludes) =3D=3D=3D> usr.bin/xlint/llib (buildincludes) =3D=3D=3D> usr.bin/xstr (buildincludes) =3D=3D=3D> usr.bin/xz (buildincludes) =3D=3D=3D> usr.bin/xzdec (buildincludes) =3D=3D=3D> usr.bin/yacc (buildincludes) =3D=3D=3D> usr.bin/yes (buildincludes) =3D=3D=3D> usr.bin/ypcat (buildincludes) =3D=3D=3D> usr.bin/ypmatch (buildincludes) =3D=3D=3D> usr.bin/ypwhich (buildincludes) =3D=3D=3D> usr.bin/alias (installincludes) =3D=3D=3D> usr.bin/apply (installincludes) =3D=3D=3D> usr.bin/ar (installincludes) =3D=3D=3D> usr.bin/asa (installincludes) =3D=3D=3D> usr.bin/at (installincludes) =3D=3D=3D> usr.bin/atf (installincludes) =3D=3D=3D> usr.bin/atf/atf-config (installincludes) =3D=3D=3D> usr.bin/atf/atf-report (installincludes) =3D=3D=3D> usr.bin/atf/atf-run (installincludes) =3D=3D=3D> usr.bin/atf/atf-sh (installincludes) =3D=3D=3D> usr.bin/atf/atf-version (installincludes) =3D=3D=3D> usr.bin/atm (installincludes) =3D=3D=3D> usr.bin/atm/sscop (installincludes) =3D=3D=3D> usr.bin/awk (installincludes) =3D=3D=3D> usr.bin/banner (installincludes) =3D=3D=3D> usr.bin/basename (installincludes) =3D=3D=3D> usr.bin/bc (installincludes) =3D=3D=3D> usr.bin/biff (installincludes) =3D=3D=3D> usr.bin/bluetooth (installincludes) =3D=3D=3D> usr.bin/bluetooth/bthost (installincludes) =3D=3D=3D> usr.bin/bluetooth/btsockstat (installincludes) =3D=3D=3D> usr.bin/bluetooth/rfcomm_sppd (installincludes) =3D=3D=3D> usr.bin/bmake (installincludes) =3D=3D=3D> usr.bin/brandelf (installincludes) =3D=3D=3D> usr.bin/bsdiff (installincludes) =3D=3D=3D> usr.bin/bsdiff/bsdiff (installincludes) =3D=3D=3D> usr.bin/bsdiff/bspatch (installincludes) =3D=3D=3D> usr.bin/bzip2 (installincludes) =3D=3D=3D> usr.bin/bzip2recover (installincludes) =3D=3D=3D> usr.bin/c89 (installincludes) =3D=3D=3D> usr.bin/c99 (installincludes) =3D=3D=3D> usr.bin/calendar (installincludes) =3D=3D=3D> usr.bin/cap_mkdb (installincludes) =3D=3D=3D> usr.bin/catman (installincludes) =3D=3D=3D> usr.bin/chat (installincludes) =3D=3D=3D> usr.bin/checknr (installincludes) =3D=3D=3D> usr.bin/chkey (installincludes) =3D=3D=3D> usr.bin/chpass (installincludes) =3D=3D=3D> usr.bin/cksum (installincludes) =3D=3D=3D> usr.bin/clang (installincludes) =3D=3D=3D> usr.bin/clang/clang (installincludes) =3D=3D=3D> usr.bin/clang/clang-tblgen (installincludes) =3D=3D=3D> usr.bin/clang/tblgen (installincludes) =3D=3D=3D> usr.bin/cmp (installincludes) =3D=3D=3D> usr.bin/col (installincludes) =3D=3D=3D> usr.bin/colcrt (installincludes) =3D=3D=3D> usr.bin/colldef (installincludes) =3D=3D=3D> usr.bin/colrm (installincludes) =3D=3D=3D> usr.bin/column (installincludes) =3D=3D=3D> usr.bin/comm (installincludes) =3D=3D=3D> usr.bin/compile_et (installincludes) =3D=3D=3D> usr.bin/compress (installincludes) =3D=3D=3D> usr.bin/cpio (installincludes) =3D=3D=3D> usr.bin/cpuset (installincludes) =3D=3D=3D> usr.bin/csplit (installincludes) =3D=3D=3D> usr.bin/csup (installincludes) =3D=3D=3D> usr.bin/ctags (installincludes) =3D=3D=3D> usr.bin/ctlstat (installincludes) =3D=3D=3D> usr.bin/cut (installincludes) =3D=3D=3D> usr.bin/dc (installincludes) =3D=3D=3D> usr.bin/dig (installincludes) =3D=3D=3D> usr.bin/dirname (installincludes) =3D=3D=3D> usr.bin/dtc (installincludes) =3D=3D=3D> usr.bin/du (installincludes) =3D=3D=3D> usr.bin/ee (installincludes) =3D=3D=3D> usr.bin/elf2aout (installincludes) =3D=3D=3D> usr.bin/elfdump (installincludes) =3D=3D=3D> usr.bin/enigma (installincludes) =3D=3D=3D> usr.bin/env (installincludes) =3D=3D=3D> usr.bin/expand (installincludes) =3D=3D=3D> usr.bin/false (installincludes) =3D=3D=3D> usr.bin/fetch (installincludes) =3D=3D=3D> usr.bin/file (installincludes) =3D=3D=3D> usr.bin/file2c (installincludes) =3D=3D=3D> usr.bin/find (installincludes) =3D=3D=3D> usr.bin/finger (installincludes) =3D=3D=3D> usr.bin/fmt (installincludes) =3D=3D=3D> usr.bin/fold (installincludes) =3D=3D=3D> usr.bin/from (installincludes) =3D=3D=3D> usr.bin/fstat (installincludes) =3D=3D=3D> usr.bin/fsync (installincludes) =3D=3D=3D> usr.bin/ftp (installincludes) =3D=3D=3D> usr.bin/gcore (installincludes) =3D=3D=3D> usr.bin/gencat (installincludes) =3D=3D=3D> usr.bin/getconf (installincludes) =3D=3D=3D> usr.bin/getent (installincludes) =3D=3D=3D> usr.bin/getopt (installincludes) =3D=3D=3D> usr.bin/gprof (installincludes) =3D=3D=3D> usr.bin/grep (installincludes) =3D=3D=3D> usr.bin/gzip (installincludes) =3D=3D=3D> usr.bin/head (installincludes) =3D=3D=3D> usr.bin/hexdump (installincludes) =3D=3D=3D> usr.bin/host (installincludes) =3D=3D=3D> usr.bin/id (installincludes) =3D=3D=3D> usr.bin/indent (installincludes) =3D=3D=3D> usr.bin/ipcrm (installincludes) =3D=3D=3D> usr.bin/ipcs (installincludes) =3D=3D=3D> usr.bin/join (installincludes) =3D=3D=3D> usr.bin/jot (installincludes) =3D=3D=3D> usr.bin/kdump (installincludes) =3D=3D=3D> usr.bin/keylogin (installincludes) =3D=3D=3D> usr.bin/keylogout (installincludes) =3D=3D=3D> usr.bin/killall (installincludes) =3D=3D=3D> usr.bin/ktrace (installincludes) =3D=3D=3D> usr.bin/ktrdump (installincludes) =3D=3D=3D> usr.bin/lam (installincludes) =3D=3D=3D> usr.bin/last (installincludes) =3D=3D=3D> usr.bin/lastcomm (installincludes) =3D=3D=3D> usr.bin/ldd (installincludes) =3D=3D=3D> usr.bin/leave (installincludes) =3D=3D=3D> usr.bin/less (installincludes) =3D=3D=3D> usr.bin/lessecho (installincludes) =3D=3D=3D> usr.bin/lesskey (installincludes) =3D=3D=3D> usr.bin/lex (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.bin/lex/../../contrib/flex/FlexLexer.h /usr/obj/zbuild= er/buildd/head/tmp/usr/include =3D=3D=3D> usr.bin/lex/lib (installincludes) =3D=3D=3D> usr.bin/limits (installincludes) =3D=3D=3D> usr.bin/locale (installincludes) =3D=3D=3D> usr.bin/locate (installincludes) =3D=3D=3D> usr.bin/locate/bigram (installincludes) =3D=3D=3D> usr.bin/locate/code (installincludes) =3D=3D=3D> usr.bin/locate/locate (installincludes) =3D=3D=3D> usr.bin/lock (installincludes) =3D=3D=3D> usr.bin/lockf (installincludes) =3D=3D=3D> usr.bin/logger (installincludes) =3D=3D=3D> usr.bin/login (installincludes) =3D=3D=3D> usr.bin/logins (installincludes) =3D=3D=3D> usr.bin/logname (installincludes) =3D=3D=3D> usr.bin/look (installincludes) =3D=3D=3D> usr.bin/lorder (installincludes) =3D=3D=3D> usr.bin/lsvfs (installincludes) =3D=3D=3D> usr.bin/lzmainfo (installincludes) =3D=3D=3D> usr.bin/m4 (installincludes) =3D=3D=3D> usr.bin/mail (installincludes) =3D=3D=3D> usr.bin/makewhatis (installincludes) =3D=3D=3D> usr.bin/man (installincludes) =3D=3D=3D> usr.bin/mandoc (installincludes) =3D=3D=3D> usr.bin/mesg (installincludes) =3D=3D=3D> usr.bin/minigzip (installincludes) =3D=3D=3D> usr.bin/ministat (installincludes) =3D=3D=3D> usr.bin/mkdep (installincludes) =3D=3D=3D> usr.bin/mkfifo (installincludes) =3D=3D=3D> usr.bin/mklocale (installincludes) =3D=3D=3D> usr.bin/mkstr (installincludes) =3D=3D=3D> usr.bin/mktemp (installincludes) =3D=3D=3D> usr.bin/mkulzma (installincludes) =3D=3D=3D> usr.bin/mkuzip (installincludes) =3D=3D=3D> usr.bin/msgs (installincludes) =3D=3D=3D> usr.bin/mt (installincludes) =3D=3D=3D> usr.bin/nc (installincludes) =3D=3D=3D> usr.bin/ncal (installincludes) =3D=3D=3D> usr.bin/netstat (installincludes) =3D=3D=3D> usr.bin/newgrp (installincludes) =3D=3D=3D> usr.bin/newkey (installincludes) =3D=3D=3D> usr.bin/nfsstat (installincludes) =3D=3D=3D> usr.bin/nice (installincludes) =3D=3D=3D> usr.bin/nl (installincludes) =3D=3D=3D> usr.bin/nohup (installincludes) =3D=3D=3D> usr.bin/nslookup (installincludes) =3D=3D=3D> usr.bin/nsupdate (installincludes) =3D=3D=3D> usr.bin/opieinfo (installincludes) =3D=3D=3D> usr.bin/opiekey (installincludes) =3D=3D=3D> usr.bin/opiepasswd (installincludes) =3D=3D=3D> usr.bin/pagesize (installincludes) =3D=3D=3D> usr.bin/passwd (installincludes) =3D=3D=3D> usr.bin/paste (installincludes) =3D=3D=3D> usr.bin/patch (installincludes) =3D=3D=3D> usr.bin/pathchk (installincludes) =3D=3D=3D> usr.bin/perror (installincludes) =3D=3D=3D> usr.bin/pr (installincludes) =3D=3D=3D> usr.bin/printenv (installincludes) =3D=3D=3D> usr.bin/printf (installincludes) =3D=3D=3D> usr.bin/procstat (installincludes) =3D=3D=3D> usr.bin/quota (installincludes) =3D=3D=3D> usr.bin/rctl (installincludes) =3D=3D=3D> usr.bin/renice (installincludes) =3D=3D=3D> usr.bin/rev (installincludes) =3D=3D=3D> usr.bin/revoke (installincludes) =3D=3D=3D> usr.bin/rlogin (installincludes) =3D=3D=3D> usr.bin/rpcgen (installincludes) =3D=3D=3D> usr.bin/rpcinfo (installincludes) =3D=3D=3D> usr.bin/rs (installincludes) =3D=3D=3D> usr.bin/rsh (installincludes) =3D=3D=3D> usr.bin/rup (installincludes) =3D=3D=3D> usr.bin/ruptime (installincludes) =3D=3D=3D> usr.bin/rusers (installincludes) =3D=3D=3D> usr.bin/rwall (installincludes) =3D=3D=3D> usr.bin/rwho (installincludes) =3D=3D=3D> usr.bin/script (installincludes) =3D=3D=3D> usr.bin/sed (installincludes) =3D=3D=3D> usr.bin/seq (installincludes) =3D=3D=3D> usr.bin/shar (installincludes) =3D=3D=3D> usr.bin/showmount (installincludes) =3D=3D=3D> usr.bin/sockstat (installincludes) =3D=3D=3D> usr.bin/sort (installincludes) =3D=3D=3D> usr.bin/split (installincludes) =3D=3D=3D> usr.bin/ssh-copy-id (installincludes) =3D=3D=3D> usr.bin/stat (installincludes) =3D=3D=3D> usr.bin/stdbuf (installincludes) =3D=3D=3D> usr.bin/su (installincludes) =3D=3D=3D> usr.bin/systat (installincludes) =3D=3D=3D> usr.bin/tabs (installincludes) =3D=3D=3D> usr.bin/tail (installincludes) =3D=3D=3D> usr.bin/talk (installincludes) =3D=3D=3D> usr.bin/tar (installincludes) =3D=3D=3D> usr.bin/tcopy (installincludes) =3D=3D=3D> usr.bin/tee (installincludes) =3D=3D=3D> usr.bin/telnet (installincludes) =3D=3D=3D> usr.bin/tftp (installincludes) =3D=3D=3D> usr.bin/time (installincludes) =3D=3D=3D> usr.bin/tip (installincludes) =3D=3D=3D> usr.bin/tip/tip (installincludes) =3D=3D=3D> usr.bin/top (installincludes) =3D=3D=3D> usr.bin/touch (installincludes) =3D=3D=3D> usr.bin/tput (installincludes) =3D=3D=3D> usr.bin/tr (installincludes) =3D=3D=3D> usr.bin/true (installincludes) =3D=3D=3D> usr.bin/truncate (installincludes) =3D=3D=3D> usr.bin/truss (installincludes) =3D=3D=3D> usr.bin/tset (installincludes) =3D=3D=3D> usr.bin/tsort (installincludes) =3D=3D=3D> usr.bin/tty (installincludes) =3D=3D=3D> usr.bin/ul (installincludes) =3D=3D=3D> usr.bin/uname (installincludes) =3D=3D=3D> usr.bin/unexpand (installincludes) =3D=3D=3D> usr.bin/unifdef (installincludes) =3D=3D=3D> usr.bin/uniq (installincludes) =3D=3D=3D> usr.bin/units (installincludes) =3D=3D=3D> usr.bin/unvis (installincludes) =3D=3D=3D> usr.bin/unzip (installincludes) =3D=3D=3D> usr.bin/usbhidaction (installincludes) =3D=3D=3D> usr.bin/usbhidctl (installincludes) =3D=3D=3D> usr.bin/users (installincludes) =3D=3D=3D> usr.bin/uudecode (installincludes) =3D=3D=3D> usr.bin/uuencode (installincludes) =3D=3D=3D> usr.bin/vacation (installincludes) =3D=3D=3D> usr.bin/vgrind (installincludes) =3D=3D=3D> usr.bin/vi (installincludes) =3D=3D=3D> usr.bin/vis (installincludes) =3D=3D=3D> usr.bin/vmstat (installincludes) =3D=3D=3D> usr.bin/w (installincludes) =3D=3D=3D> usr.bin/wall (installincludes) =3D=3D=3D> usr.bin/wc (installincludes) =3D=3D=3D> usr.bin/what (installincludes) =3D=3D=3D> usr.bin/whereis (installincludes) =3D=3D=3D> usr.bin/which (installincludes) =3D=3D=3D> usr.bin/who (installincludes) =3D=3D=3D> usr.bin/whois (installincludes) =3D=3D=3D> usr.bin/write (installincludes) =3D=3D=3D> usr.bin/xargs (installincludes) =3D=3D=3D> usr.bin/xinstall (installincludes) =3D=3D=3D> usr.bin/xlint (installincludes) =3D=3D=3D> usr.bin/xlint/lint1 (installincludes) =3D=3D=3D> usr.bin/xlint/lint2 (installincludes) =3D=3D=3D> usr.bin/xlint/xlint (installincludes) =3D=3D=3D> usr.bin/xlint/llib (installincludes) =3D=3D=3D> usr.bin/xstr (installincludes) =3D=3D=3D> usr.bin/xz (installincludes) =3D=3D=3D> usr.bin/xzdec (installincludes) =3D=3D=3D> usr.bin/yacc (installincludes) =3D=3D=3D> usr.bin/yes (installincludes) =3D=3D=3D> usr.bin/ypcat (installincludes) =3D=3D=3D> usr.bin/ypmatch (installincludes) =3D=3D=3D> usr.bin/ypwhich (installincludes) =3D=3D=3D> usr.sbin (includes) set -e; cd /zbuilder/buildd/head/usr.sbin; /usr/obj/zbuilder/buildd/head/ma= ke.amd64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make = installincludes =3D=3D=3D> usr.sbin/IPXrouted (buildincludes) =3D=3D=3D> usr.sbin/ac (buildincludes) =3D=3D=3D> usr.sbin/accton (buildincludes) =3D=3D=3D> usr.sbin/acpi (buildincludes) =3D=3D=3D> usr.sbin/acpi/acpiconf (buildincludes) =3D=3D=3D> usr.sbin/acpi/acpidb (buildincludes) =3D=3D=3D> usr.sbin/acpi/acpidump (buildincludes) =3D=3D=3D> usr.sbin/acpi/iasl (buildincludes) =3D=3D=3D> usr.sbin/adduser (buildincludes) =3D=3D=3D> usr.sbin/amd (buildincludes) =3D=3D=3D> usr.sbin/amd/include (buildincludes) =3D=3D=3D> usr.sbin/amd/libamu (buildincludes) =3D=3D=3D> usr.sbin/amd/amd (buildincludes) =3D=3D=3D> usr.sbin/amd/amq (buildincludes) =3D=3D=3D> usr.sbin/amd/doc (buildincludes) =3D=3D=3D> usr.sbin/amd/fixmount (buildincludes) =3D=3D=3D> usr.sbin/amd/fsinfo (buildincludes) =3D=3D=3D> usr.sbin/amd/hlfsd (buildincludes) =3D=3D=3D> usr.sbin/amd/mk-amd-map (buildincludes) =3D=3D=3D> usr.sbin/amd/pawd (buildincludes) =3D=3D=3D> usr.sbin/amd/scripts (buildincludes) =3D=3D=3D> usr.sbin/amd/wire-test (buildincludes) =3D=3D=3D> usr.sbin/ancontrol (buildincludes) =3D=3D=3D> usr.sbin/apm (buildincludes) =3D=3D=3D> usr.sbin/arp (buildincludes) =3D=3D=3D> usr.sbin/arpaname (buildincludes) =3D=3D=3D> usr.sbin/asf (buildincludes) =3D=3D=3D> usr.sbin/audit (buildincludes) =3D=3D=3D> usr.sbin/auditd (buildincludes) =3D=3D=3D> usr.sbin/auditdistd (buildincludes) =3D=3D=3D> usr.sbin/auditreduce (buildincludes) =3D=3D=3D> usr.sbin/authpf (buildincludes) =3D=3D=3D> usr.sbin/bhyve (buildincludes) =3D=3D=3D> usr.sbin/bhyvectl (buildincludes) =3D=3D=3D> usr.sbin/bhyveload (buildincludes) =3D=3D=3D> usr.sbin/bluetooth (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/ath3kfw (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/bcmfw (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/bt3cfw (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/bthidcontrol (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/bthidd (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/btpand (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/hccontrol (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/hcsecd (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/hcseriald (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/l2control (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/l2ping (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/rfcomm_pppd (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/sdpcontrol (buildincludes) =3D=3D=3D> usr.sbin/bluetooth/sdpd (buildincludes) =3D=3D=3D> usr.sbin/boot0cfg (buildincludes) =3D=3D=3D> usr.sbin/bootparamd (buildincludes) =3D=3D=3D> usr.sbin/bootparamd/bootparamd (buildincludes) =3D=3D=3D> usr.sbin/bootparamd/callbootd (buildincludes) =3D=3D=3D> usr.sbin/bsdinstall (buildincludes) =3D=3D=3D> usr.sbin/bsdinstall/distextract (buildincludes) =3D=3D=3D> usr.sbin/bsdinstall/distfetch (buildincludes) =3D=3D=3D> usr.sbin/bsdinstall/partedit (buildincludes) =3D=3D=3D> usr.sbin/bsdinstall/scripts (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/gensnmptree (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/bsnmpd (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_atm (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_bridge (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hast (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hostres (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_mibII (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_pf (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_target (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_usm (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_vacm (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_wlan (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_netgraph (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/tools (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/tools/libbsnmptools (buildincludes) =3D=3D=3D> usr.sbin/bsnmpd/tools/bsnmptools (buildincludes) =3D=3D=3D> usr.sbin/btxld (buildincludes) =3D=3D=3D> usr.sbin/cdcontrol (buildincludes) =3D=3D=3D> usr.sbin/chkgrp (buildincludes) =3D=3D=3D> usr.sbin/chown (buildincludes) =3D=3D=3D> usr.sbin/chroot (buildincludes) =3D=3D=3D> usr.sbin/ckdist (buildincludes) =3D=3D=3D> usr.sbin/clear_locks (buildincludes) =3D=3D=3D> usr.sbin/config (buildincludes) =3D=3D=3D> usr.sbin/cpucontrol (buildincludes) =3D=3D=3D> usr.sbin/crashinfo (buildincludes) =3D=3D=3D> usr.sbin/cron (buildincludes) =3D=3D=3D> usr.sbin/cron/lib (buildincludes) =3D=3D=3D> usr.sbin/cron/cron (buildincludes) =3D=3D=3D> usr.sbin/cron/crontab (buildincludes) =3D=3D=3D> usr.sbin/crunch (buildincludes) =3D=3D=3D> usr.sbin/crunch/crunchgen (buildincludes) =3D=3D=3D> usr.sbin/crunch/crunchide (buildincludes) =3D=3D=3D> usr.sbin/ctladm (buildincludes) =3D=3D=3D> usr.sbin/ctm (buildincludes) =3D=3D=3D> usr.sbin/ctm/ctm (buildincludes) =3D=3D=3D> usr.sbin/ctm/ctm_rmail (buildincludes) =3D=3D=3D> usr.sbin/ctm/ctm_smail (buildincludes) =3D=3D=3D> usr.sbin/ctm/ctm_dequeue (buildincludes) =3D=3D=3D> usr.sbin/daemon (buildincludes) =3D=3D=3D> usr.sbin/dconschat (buildincludes) =3D=3D=3D> usr.sbin/ddns-confgen (buildincludes) =3D=3D=3D> usr.sbin/devinfo (buildincludes) =3D=3D=3D> usr.sbin/digictl (buildincludes) =3D=3D=3D> usr.sbin/diskinfo (buildincludes) =3D=3D=3D> usr.sbin/dnssec-dsfromkey (buildincludes) =3D=3D=3D> usr.sbin/dnssec-keyfromlabel (buildincludes) =3D=3D=3D> usr.sbin/dnssec-keygen (buildincludes) =3D=3D=3D> usr.sbin/dnssec-revoke (buildincludes) =3D=3D=3D> usr.sbin/dnssec-settime (buildincludes) =3D=3D=3D> usr.sbin/dnssec-signzone (buildincludes) =3D=3D=3D> usr.sbin/dumpcis (buildincludes) =3D=3D=3D> usr.sbin/editmap (buildincludes) =3D=3D=3D> usr.sbin/edquota (buildincludes) =3D=3D=3D> usr.sbin/etcupdate (buildincludes) =3D=3D=3D> usr.sbin/extattr (buildincludes) =3D=3D=3D> usr.sbin/extattrctl (buildincludes) =3D=3D=3D> usr.sbin/faithd (buildincludes) =3D=3D=3D> usr.sbin/fdcontrol (buildincludes) =3D=3D=3D> usr.sbin/fdformat (buildincludes) =3D=3D=3D> usr.sbin/fdread (buildincludes) =3D=3D=3D> usr.sbin/fdwrite (buildincludes) =3D=3D=3D> usr.sbin/fifolog (buildincludes) =3D=3D=3D> usr.sbin/fifolog/lib (buildincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_create (buildincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_writer (buildincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_reader (buildincludes) =3D=3D=3D> usr.sbin/flowctl (buildincludes) =3D=3D=3D> usr.sbin/freebsd-update (buildincludes) =3D=3D=3D> usr.sbin/ftp-proxy (buildincludes) =3D=3D=3D> usr.sbin/ftp-proxy/libevent (buildincludes) =3D=3D=3D> usr.sbin/ftp-proxy/ftp-proxy (buildincludes) =3D=3D=3D> usr.sbin/fwcontrol (buildincludes) =3D=3D=3D> usr.sbin/genrandom (buildincludes) =3D=3D=3D> usr.sbin/getfmac (buildincludes) =3D=3D=3D> usr.sbin/getpmac (buildincludes) =3D=3D=3D> usr.sbin/gpioctl (buildincludes) =3D=3D=3D> usr.sbin/gssd (buildincludes) =3D=3D=3D> usr.sbin/gstat (buildincludes) =3D=3D=3D> usr.sbin/i2c (buildincludes) =3D=3D=3D> usr.sbin/ifmcstat (buildincludes) =3D=3D=3D> usr.sbin/inetd (buildincludes) =3D=3D=3D> usr.sbin/iostat (buildincludes) =3D=3D=3D> usr.sbin/ip6addrctl (buildincludes) =3D=3D=3D> usr.sbin/ipfwpcap (buildincludes) =3D=3D=3D> usr.sbin/isc-hmac-fixup (buildincludes) =3D=3D=3D> usr.sbin/isfctl (buildincludes) =3D=3D=3D> usr.sbin/jail (buildincludes) =3D=3D=3D> usr.sbin/jexec (buildincludes) =3D=3D=3D> usr.sbin/jls (buildincludes) =3D=3D=3D> usr.sbin/kbdcontrol (buildincludes) =3D=3D=3D> usr.sbin/kbdmap (buildincludes) =3D=3D=3D> usr.sbin/keyserv (buildincludes) =3D=3D=3D> usr.sbin/kgmon (buildincludes) =3D=3D=3D> usr.sbin/kldxref (buildincludes) =3D=3D=3D> usr.sbin/lastlogin (buildincludes) =3D=3D=3D> usr.sbin/lmcconfig (buildincludes) =3D=3D=3D> usr.sbin/lpr (buildincludes) =3D=3D=3D> usr.sbin/lpr/common_source (buildincludes) =3D=3D=3D> usr.sbin/lpr/chkprintcap (buildincludes) =3D=3D=3D> usr.sbin/lpr/lp (buildincludes) =3D=3D=3D> usr.sbin/lpr/lpc (buildincludes) =3D=3D=3D> usr.sbin/lpr/lpd (buildincludes) =3D=3D=3D> usr.sbin/lpr/lpq (buildincludes) =3D=3D=3D> usr.sbin/lpr/lpr (buildincludes) =3D=3D=3D> usr.sbin/lpr/lprm (buildincludes) =3D=3D=3D> usr.sbin/lpr/lptest (buildincludes) =3D=3D=3D> usr.sbin/lpr/pac (buildincludes) =3D=3D=3D> usr.sbin/lpr/filters (buildincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru (buildincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2alt (buildincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2855 (buildincludes) =3D=3D=3D> usr.sbin/lptcontrol (buildincludes) =3D=3D=3D> usr.sbin/mailstats (buildincludes) =3D=3D=3D> usr.sbin/mailwrapper (buildincludes) =3D=3D=3D> usr.sbin/makefs (buildincludes) =3D=3D=3D> usr.sbin/makemap (buildincludes) =3D=3D=3D> usr.sbin/manctl (buildincludes) =3D=3D=3D> usr.sbin/memcontrol (buildincludes) =3D=3D=3D> usr.sbin/mergemaster (buildincludes) =3D=3D=3D> usr.sbin/mfiutil (buildincludes) =3D=3D=3D> usr.sbin/mixer (buildincludes) =3D=3D=3D> usr.sbin/mld6query (buildincludes) =3D=3D=3D> usr.sbin/mlxcontrol (buildincludes) =3D=3D=3D> usr.sbin/mountd (buildincludes) =3D=3D=3D> usr.sbin/moused (buildincludes) =3D=3D=3D> usr.sbin/mptable (buildincludes) =3D=3D=3D> usr.sbin/mptutil (buildincludes) =3D=3D=3D> usr.sbin/mtest (buildincludes) =3D=3D=3D> usr.sbin/mtree (buildincludes) =3D=3D=3D> usr.sbin/named (buildincludes) =3D=3D=3D> usr.sbin/named-checkconf (buildincludes) =3D=3D=3D> usr.sbin/named-checkzone (buildincludes) =3D=3D=3D> usr.sbin/named-journalprint (buildincludes) =3D=3D=3D> usr.sbin/ndiscvt (buildincludes) =3D=3D=3D> usr.sbin/ndp (buildincludes) =3D=3D=3D> usr.sbin/newsyslog (buildincludes) =3D=3D=3D> usr.sbin/nfscbd (buildincludes) =3D=3D=3D> usr.sbin/nfsd (buildincludes) =3D=3D=3D> usr.sbin/nfsdumpstate (buildincludes) =3D=3D=3D> usr.sbin/nfsrevoke (buildincludes) =3D=3D=3D> usr.sbin/nfsuserd (buildincludes) =3D=3D=3D> usr.sbin/ngctl (buildincludes) =3D=3D=3D> usr.sbin/nghook (buildincludes) =3D=3D=3D> usr.sbin/nmtree (buildincludes) =3D=3D=3D> usr.sbin/nologin (buildincludes) =3D=3D=3D> usr.sbin/nscd (buildincludes) =3D=3D=3D> usr.sbin/nsec3hash (buildincludes) =3D=3D=3D> usr.sbin/ntp (buildincludes) =3D=3D=3D> usr.sbin/ntp/libopts (buildincludes) =3D=3D=3D> usr.sbin/ntp/libntp (buildincludes) =3D=3D=3D> usr.sbin/ntp/libparse (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntpd (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntpdc (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntpq (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntpdate (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntptime (buildincludes) =3D=3D=3D> usr.sbin/ntp/ntp-keygen (buildincludes) =3D=3D=3D> usr.sbin/ntp/sntp (buildincludes) =3D=3D=3D> usr.sbin/ntp/doc (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-partmanager (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-query (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/conf (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/doc (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/examples (buildincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/pc-sysinstall (buildincludes) =3D=3D=3D> usr.sbin/pciconf (buildincludes) =3D=3D=3D> usr.sbin/periodic (buildincludes) =3D=3D=3D> usr.sbin/pkg (buildincludes) =3D=3D=3D> usr.sbin/pkg_install (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/lib (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/add (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/create (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/delete (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/info (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/updating (buildincludes) =3D=3D=3D> usr.sbin/pkg_install/version (buildincludes) =3D=3D=3D> usr.sbin/pmcannotate (buildincludes) =3D=3D=3D> usr.sbin/pmccontrol (buildincludes) =3D=3D=3D> usr.sbin/pmcstat (buildincludes) =3D=3D=3D> usr.sbin/portsnap (buildincludes) =3D=3D=3D> usr.sbin/portsnap/portsnap (buildincludes) =3D=3D=3D> usr.sbin/portsnap/make_index (buildincludes) =3D=3D=3D> usr.sbin/portsnap/phttpget (buildincludes) =3D=3D=3D> usr.sbin/powerd (buildincludes) =3D=3D=3D> usr.sbin/ppp (buildincludes) =3D=3D=3D> usr.sbin/pppctl (buildincludes) =3D=3D=3D> usr.sbin/praliases (buildincludes) =3D=3D=3D> usr.sbin/praudit (buildincludes) =3D=3D=3D> usr.sbin/procctl (buildincludes) =3D=3D=3D> usr.sbin/pstat (buildincludes) =3D=3D=3D> usr.sbin/pw (buildincludes) =3D=3D=3D> usr.sbin/pwd_mkdb (buildincludes) =3D=3D=3D> usr.sbin/quot (buildincludes) =3D=3D=3D> usr.sbin/quotaon (buildincludes) =3D=3D=3D> usr.sbin/rarpd (buildincludes) =3D=3D=3D> usr.sbin/repquota (buildincludes) =3D=3D=3D> usr.sbin/rip6query (buildincludes) =3D=3D=3D> usr.sbin/rmt (buildincludes) =3D=3D=3D> usr.sbin/rndc (buildincludes) =3D=3D=3D> usr.sbin/rndc-confgen (buildincludes) =3D=3D=3D> usr.sbin/route6d (buildincludes) =3D=3D=3D> usr.sbin/rpc.lockd (buildincludes) =3D=3D=3D> usr.sbin/rpc.statd (buildincludes) =3D=3D=3D> usr.sbin/rpc.umntall (buildincludes) =3D=3D=3D> usr.sbin/rpc.yppasswdd (buildincludes) =3D=3D=3D> usr.sbin/rpc.ypupdated (buildincludes) =3D=3D=3D> usr.sbin/rpc.ypxfrd (buildincludes) =3D=3D=3D> usr.sbin/rpcbind (buildincludes) =3D=3D=3D> usr.sbin/rrenumd (buildincludes) =3D=3D=3D> usr.sbin/rtadvctl (buildincludes) =3D=3D=3D> usr.sbin/rtadvd (buildincludes) =3D=3D=3D> usr.sbin/rtprio (buildincludes) =3D=3D=3D> usr.sbin/rtsold (buildincludes) =3D=3D=3D> usr.sbin/rwhod (buildincludes) =3D=3D=3D> usr.sbin/sa (buildincludes) =3D=3D=3D> usr.sbin/sendmail (buildincludes) =3D=3D=3D> usr.sbin/service (buildincludes) =3D=3D=3D> usr.sbin/services_mkdb (buildincludes) =3D=3D=3D> usr.sbin/setfib (buildincludes) =3D=3D=3D> usr.sbin/setfmac (buildincludes) =3D=3D=3D> usr.sbin/setpmac (buildincludes) =3D=3D=3D> usr.sbin/sicontrol (buildincludes) =3D=3D=3D> usr.sbin/smbmsg (buildincludes) =3D=3D=3D> usr.sbin/snapinfo (buildincludes) =3D=3D=3D> usr.sbin/spkrtest (buildincludes) =3D=3D=3D> usr.sbin/spray (buildincludes) =3D=3D=3D> usr.sbin/syslogd (buildincludes) =3D=3D=3D> usr.sbin/tcpdchk (buildincludes) =3D=3D=3D> usr.sbin/tcpdmatch (buildincludes) =3D=3D=3D> usr.sbin/tcpdrop (buildincludes) =3D=3D=3D> usr.sbin/tcpdump (buildincludes) =3D=3D=3D> usr.sbin/tcpdump/tcpdump (buildincludes) =3D=3D=3D> usr.sbin/timed (buildincludes) =3D=3D=3D> usr.sbin/timed/timed (buildincludes) =3D=3D=3D> usr.sbin/timed/timedc (buildincludes) =3D=3D=3D> usr.sbin/traceroute (buildincludes) =3D=3D=3D> usr.sbin/traceroute6 (buildincludes) =3D=3D=3D> usr.sbin/trpt (buildincludes) =3D=3D=3D> usr.sbin/tzsetup (buildincludes) =3D=3D=3D> usr.sbin/uathload (buildincludes) =3D=3D=3D> usr.sbin/ugidfw (buildincludes) =3D=3D=3D> usr.sbin/uhsoctl (buildincludes) =3D=3D=3D> usr.sbin/usbconfig (buildincludes) =3D=3D=3D> usr.sbin/usbdump (buildincludes) =3D=3D=3D> usr.sbin/utx (buildincludes) =3D=3D=3D> usr.sbin/vidcontrol (buildincludes) =3D=3D=3D> usr.sbin/vipw (buildincludes) =3D=3D=3D> usr.sbin/wake (buildincludes) =3D=3D=3D> usr.sbin/watch (buildincludes) =3D=3D=3D> usr.sbin/watchdogd (buildincludes) =3D=3D=3D> usr.sbin/wlandebug (buildincludes) =3D=3D=3D> usr.sbin/wpa (buildincludes) =3D=3D=3D> usr.sbin/wpa/wpa_supplicant (buildincludes) =3D=3D=3D> usr.sbin/wpa/wpa_cli (buildincludes) =3D=3D=3D> usr.sbin/wpa/wpa_passphrase (buildincludes) =3D=3D=3D> usr.sbin/wpa/hostapd (buildincludes) =3D=3D=3D> usr.sbin/wpa/hostapd_cli (buildincludes) =3D=3D=3D> usr.sbin/wpa/ndis_events (buildincludes) =3D=3D=3D> usr.sbin/yp_mkdb (buildincludes) =3D=3D=3D> usr.sbin/ypbind (buildincludes) =3D=3D=3D> usr.sbin/yppoll (buildincludes) =3D=3D=3D> usr.sbin/yppush (buildincludes) =3D=3D=3D> usr.sbin/ypserv (buildincludes) =3D=3D=3D> usr.sbin/ypset (buildincludes) =3D=3D=3D> usr.sbin/zic (buildincludes) =3D=3D=3D> usr.sbin/zic/zic (buildincludes) =3D=3D=3D> usr.sbin/zic/zdump (buildincludes) =3D=3D=3D> usr.sbin/zzz (buildincludes) =3D=3D=3D> usr.sbin/IPXrouted (installincludes) =3D=3D=3D> usr.sbin/ac (installincludes) =3D=3D=3D> usr.sbin/accton (installincludes) =3D=3D=3D> usr.sbin/acpi (installincludes) =3D=3D=3D> usr.sbin/acpi/acpiconf (installincludes) =3D=3D=3D> usr.sbin/acpi/acpidb (installincludes) =3D=3D=3D> usr.sbin/acpi/acpidump (installincludes) =3D=3D=3D> usr.sbin/acpi/iasl (installincludes) =3D=3D=3D> usr.sbin/adduser (installincludes) =3D=3D=3D> usr.sbin/amd (installincludes) =3D=3D=3D> usr.sbin/amd/include (installincludes) =3D=3D=3D> usr.sbin/amd/libamu (installincludes) =3D=3D=3D> usr.sbin/amd/amd (installincludes) =3D=3D=3D> usr.sbin/amd/amq (installincludes) =3D=3D=3D> usr.sbin/amd/doc (installincludes) =3D=3D=3D> usr.sbin/amd/fixmount (installincludes) =3D=3D=3D> usr.sbin/amd/fsinfo (installincludes) =3D=3D=3D> usr.sbin/amd/hlfsd (installincludes) =3D=3D=3D> usr.sbin/amd/mk-amd-map (installincludes) =3D=3D=3D> usr.sbin/amd/pawd (installincludes) =3D=3D=3D> usr.sbin/amd/scripts (installincludes) =3D=3D=3D> usr.sbin/amd/wire-test (installincludes) =3D=3D=3D> usr.sbin/ancontrol (installincludes) =3D=3D=3D> usr.sbin/apm (installincludes) =3D=3D=3D> usr.sbin/arp (installincludes) =3D=3D=3D> usr.sbin/arpaname (installincludes) =3D=3D=3D> usr.sbin/asf (installincludes) =3D=3D=3D> usr.sbin/audit (installincludes) =3D=3D=3D> usr.sbin/auditd (installincludes) =3D=3D=3D> usr.sbin/auditdistd (installincludes) =3D=3D=3D> usr.sbin/auditreduce (installincludes) =3D=3D=3D> usr.sbin/authpf (installincludes) =3D=3D=3D> usr.sbin/bhyve (installincludes) =3D=3D=3D> usr.sbin/bhyvectl (installincludes) =3D=3D=3D> usr.sbin/bhyveload (installincludes) =3D=3D=3D> usr.sbin/bluetooth (installincludes) =3D=3D=3D> usr.sbin/bluetooth/ath3kfw (installincludes) =3D=3D=3D> usr.sbin/bluetooth/bcmfw (installincludes) =3D=3D=3D> usr.sbin/bluetooth/bt3cfw (installincludes) =3D=3D=3D> usr.sbin/bluetooth/bthidcontrol (installincludes) =3D=3D=3D> usr.sbin/bluetooth/bthidd (installincludes) =3D=3D=3D> usr.sbin/bluetooth/btpand (installincludes) =3D=3D=3D> usr.sbin/bluetooth/hccontrol (installincludes) =3D=3D=3D> usr.sbin/bluetooth/hcsecd (installincludes) =3D=3D=3D> usr.sbin/bluetooth/hcseriald (installincludes) =3D=3D=3D> usr.sbin/bluetooth/l2control (installincludes) =3D=3D=3D> usr.sbin/bluetooth/l2ping (installincludes) =3D=3D=3D> usr.sbin/bluetooth/rfcomm_pppd (installincludes) =3D=3D=3D> usr.sbin/bluetooth/sdpcontrol (installincludes) =3D=3D=3D> usr.sbin/bluetooth/sdpd (installincludes) =3D=3D=3D> usr.sbin/boot0cfg (installincludes) =3D=3D=3D> usr.sbin/bootparamd (installincludes) =3D=3D=3D> usr.sbin/bootparamd/bootparamd (installincludes) =3D=3D=3D> usr.sbin/bootparamd/callbootd (installincludes) =3D=3D=3D> usr.sbin/bsdinstall (installincludes) =3D=3D=3D> usr.sbin/bsdinstall/distextract (installincludes) =3D=3D=3D> usr.sbin/bsdinstall/distfetch (installincludes) =3D=3D=3D> usr.sbin/bsdinstall/partedit (installincludes) =3D=3D=3D> usr.sbin/bsdinstall/scripts (installincludes) =3D=3D=3D> usr.sbin/bsnmpd (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/gensnmptree (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/bsnmpd (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.sbin/bsnmpd/modules/../../../contrib/bsnmp/snmpd/snmpm= od.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_atm (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.sbin/bsnmpd/modules/snmp_atm/../../../../contrib/ngatm= /snmp_atm/snmp_atm.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_bridge (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h /usr/obj= /zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hast (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hostres (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_mibII (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.sbin/bsnmpd/modules/snmp_mibII/../../../../contrib/bsn= mp/snmp_mibII/snmp_mibII.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bs= nmp =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_pf (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_target (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_usm (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_vacm (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_wlan (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_netgraph (installincludes) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> usr.sbin/bsnmpd/tools (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/tools/libbsnmptools (installincludes) =3D=3D=3D> usr.sbin/bsnmpd/tools/bsnmptools (installincludes) =3D=3D=3D> usr.sbin/btxld (installincludes) =3D=3D=3D> usr.sbin/cdcontrol (installincludes) =3D=3D=3D> usr.sbin/chkgrp (installincludes) =3D=3D=3D> usr.sbin/chown (installincludes) =3D=3D=3D> usr.sbin/chroot (installincludes) =3D=3D=3D> usr.sbin/ckdist (installincludes) =3D=3D=3D> usr.sbin/clear_locks (installincludes) =3D=3D=3D> usr.sbin/config (installincludes) =3D=3D=3D> usr.sbin/cpucontrol (installincludes) =3D=3D=3D> usr.sbin/crashinfo (installincludes) =3D=3D=3D> usr.sbin/cron (installincludes) =3D=3D=3D> usr.sbin/cron/lib (installincludes) =3D=3D=3D> usr.sbin/cron/cron (installincludes) =3D=3D=3D> usr.sbin/cron/crontab (installincludes) =3D=3D=3D> usr.sbin/crunch (installincludes) =3D=3D=3D> usr.sbin/crunch/crunchgen (installincludes) =3D=3D=3D> usr.sbin/crunch/crunchide (installincludes) =3D=3D=3D> usr.sbin/ctladm (installincludes) =3D=3D=3D> usr.sbin/ctm (installincludes) =3D=3D=3D> usr.sbin/ctm/ctm (installincludes) =3D=3D=3D> usr.sbin/ctm/ctm_rmail (installincludes) =3D=3D=3D> usr.sbin/ctm/ctm_smail (installincludes) =3D=3D=3D> usr.sbin/ctm/ctm_dequeue (installincludes) =3D=3D=3D> usr.sbin/daemon (installincludes) =3D=3D=3D> usr.sbin/dconschat (installincludes) =3D=3D=3D> usr.sbin/ddns-confgen (installincludes) =3D=3D=3D> usr.sbin/devinfo (installincludes) =3D=3D=3D> usr.sbin/digictl (installincludes) =3D=3D=3D> usr.sbin/diskinfo (installincludes) =3D=3D=3D> usr.sbin/dnssec-dsfromkey (installincludes) =3D=3D=3D> usr.sbin/dnssec-keyfromlabel (installincludes) =3D=3D=3D> usr.sbin/dnssec-keygen (installincludes) =3D=3D=3D> usr.sbin/dnssec-revoke (installincludes) =3D=3D=3D> usr.sbin/dnssec-settime (installincludes) =3D=3D=3D> usr.sbin/dnssec-signzone (installincludes) =3D=3D=3D> usr.sbin/dumpcis (installincludes) =3D=3D=3D> usr.sbin/editmap (installincludes) =3D=3D=3D> usr.sbin/edquota (installincludes) =3D=3D=3D> usr.sbin/etcupdate (installincludes) =3D=3D=3D> usr.sbin/extattr (installincludes) =3D=3D=3D> usr.sbin/extattrctl (installincludes) =3D=3D=3D> usr.sbin/faithd (installincludes) =3D=3D=3D> usr.sbin/fdcontrol (installincludes) =3D=3D=3D> usr.sbin/fdformat (installincludes) =3D=3D=3D> usr.sbin/fdread (installincludes) =3D=3D=3D> usr.sbin/fdwrite (installincludes) =3D=3D=3D> usr.sbin/fifolog (installincludes) =3D=3D=3D> usr.sbin/fifolog/lib (installincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_create (installincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_writer (installincludes) =3D=3D=3D> usr.sbin/fifolog/fifolog_reader (installincludes) =3D=3D=3D> usr.sbin/flowctl (installincludes) =3D=3D=3D> usr.sbin/freebsd-update (installincludes) =3D=3D=3D> usr.sbin/ftp-proxy (installincludes) =3D=3D=3D> usr.sbin/ftp-proxy/libevent (installincludes) =3D=3D=3D> usr.sbin/ftp-proxy/ftp-proxy (installincludes) =3D=3D=3D> usr.sbin/fwcontrol (installincludes) =3D=3D=3D> usr.sbin/genrandom (installincludes) =3D=3D=3D> usr.sbin/getfmac (installincludes) =3D=3D=3D> usr.sbin/getpmac (installincludes) =3D=3D=3D> usr.sbin/gpioctl (installincludes) =3D=3D=3D> usr.sbin/gssd (installincludes) =3D=3D=3D> usr.sbin/gstat (installincludes) =3D=3D=3D> usr.sbin/i2c (installincludes) =3D=3D=3D> usr.sbin/ifmcstat (installincludes) =3D=3D=3D> usr.sbin/inetd (installincludes) =3D=3D=3D> usr.sbin/iostat (installincludes) =3D=3D=3D> usr.sbin/ip6addrctl (installincludes) =3D=3D=3D> usr.sbin/ipfwpcap (installincludes) =3D=3D=3D> usr.sbin/isc-hmac-fixup (installincludes) =3D=3D=3D> usr.sbin/isfctl (installincludes) =3D=3D=3D> usr.sbin/jail (installincludes) =3D=3D=3D> usr.sbin/jexec (installincludes) =3D=3D=3D> usr.sbin/jls (installincludes) =3D=3D=3D> usr.sbin/kbdcontrol (installincludes) =3D=3D=3D> usr.sbin/kbdmap (installincludes) =3D=3D=3D> usr.sbin/keyserv (installincludes) =3D=3D=3D> usr.sbin/kgmon (installincludes) =3D=3D=3D> usr.sbin/kldxref (installincludes) =3D=3D=3D> usr.sbin/lastlogin (installincludes) =3D=3D=3D> usr.sbin/lmcconfig (installincludes) =3D=3D=3D> usr.sbin/lpr (installincludes) =3D=3D=3D> usr.sbin/lpr/common_source (installincludes) =3D=3D=3D> usr.sbin/lpr/chkprintcap (installincludes) =3D=3D=3D> usr.sbin/lpr/lp (installincludes) =3D=3D=3D> usr.sbin/lpr/lpc (installincludes) =3D=3D=3D> usr.sbin/lpr/lpd (installincludes) =3D=3D=3D> usr.sbin/lpr/lpq (installincludes) =3D=3D=3D> usr.sbin/lpr/lpr (installincludes) =3D=3D=3D> usr.sbin/lpr/lprm (installincludes) =3D=3D=3D> usr.sbin/lpr/lptest (installincludes) =3D=3D=3D> usr.sbin/lpr/pac (installincludes) =3D=3D=3D> usr.sbin/lpr/filters (installincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru (installincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2alt (installincludes) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2855 (installincludes) =3D=3D=3D> usr.sbin/lptcontrol (installincludes) =3D=3D=3D> usr.sbin/mailstats (installincludes) =3D=3D=3D> usr.sbin/mailwrapper (installincludes) =3D=3D=3D> usr.sbin/makefs (installincludes) =3D=3D=3D> usr.sbin/makemap (installincludes) =3D=3D=3D> usr.sbin/manctl (installincludes) =3D=3D=3D> usr.sbin/memcontrol (installincludes) =3D=3D=3D> usr.sbin/mergemaster (installincludes) =3D=3D=3D> usr.sbin/mfiutil (installincludes) =3D=3D=3D> usr.sbin/mixer (installincludes) =3D=3D=3D> usr.sbin/mld6query (installincludes) =3D=3D=3D> usr.sbin/mlxcontrol (installincludes) =3D=3D=3D> usr.sbin/mountd (installincludes) =3D=3D=3D> usr.sbin/moused (installincludes) =3D=3D=3D> usr.sbin/mptable (installincludes) =3D=3D=3D> usr.sbin/mptutil (installincludes) =3D=3D=3D> usr.sbin/mtest (installincludes) =3D=3D=3D> usr.sbin/mtree (installincludes) =3D=3D=3D> usr.sbin/named (installincludes) =3D=3D=3D> usr.sbin/named-checkconf (installincludes) =3D=3D=3D> usr.sbin/named-checkzone (installincludes) =3D=3D=3D> usr.sbin/named-journalprint (installincludes) =3D=3D=3D> usr.sbin/ndiscvt (installincludes) =3D=3D=3D> usr.sbin/ndp (installincludes) =3D=3D=3D> usr.sbin/newsyslog (installincludes) =3D=3D=3D> usr.sbin/nfscbd (installincludes) =3D=3D=3D> usr.sbin/nfsd (installincludes) =3D=3D=3D> usr.sbin/nfsdumpstate (installincludes) =3D=3D=3D> usr.sbin/nfsrevoke (installincludes) =3D=3D=3D> usr.sbin/nfsuserd (installincludes) =3D=3D=3D> usr.sbin/ngctl (installincludes) =3D=3D=3D> usr.sbin/nghook (installincludes) =3D=3D=3D> usr.sbin/nmtree (installincludes) =3D=3D=3D> usr.sbin/nologin (installincludes) =3D=3D=3D> usr.sbin/nscd (installincludes) =3D=3D=3D> usr.sbin/nsec3hash (installincludes) =3D=3D=3D> usr.sbin/ntp (installincludes) =3D=3D=3D> usr.sbin/ntp/libopts (installincludes) =3D=3D=3D> usr.sbin/ntp/libntp (installincludes) =3D=3D=3D> usr.sbin/ntp/libparse (installincludes) =3D=3D=3D> usr.sbin/ntp/ntpd (installincludes) =3D=3D=3D> usr.sbin/ntp/ntpdc (installincludes) =3D=3D=3D> usr.sbin/ntp/ntpq (installincludes) =3D=3D=3D> usr.sbin/ntp/ntpdate (installincludes) =3D=3D=3D> usr.sbin/ntp/ntptime (installincludes) =3D=3D=3D> usr.sbin/ntp/ntp-keygen (installincludes) =3D=3D=3D> usr.sbin/ntp/sntp (installincludes) =3D=3D=3D> usr.sbin/ntp/doc (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-partmanager (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-query (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/conf (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/doc (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/examples (installincludes) =3D=3D=3D> usr.sbin/pc-sysinstall/pc-sysinstall (installincludes) =3D=3D=3D> usr.sbin/pciconf (installincludes) =3D=3D=3D> usr.sbin/periodic (installincludes) =3D=3D=3D> usr.sbin/pkg (installincludes) =3D=3D=3D> usr.sbin/pkg_install (installincludes) =3D=3D=3D> usr.sbin/pkg_install/lib (installincludes) =3D=3D=3D> usr.sbin/pkg_install/add (installincludes) =3D=3D=3D> usr.sbin/pkg_install/create (installincludes) =3D=3D=3D> usr.sbin/pkg_install/delete (installincludes) =3D=3D=3D> usr.sbin/pkg_install/info (installincludes) =3D=3D=3D> usr.sbin/pkg_install/updating (installincludes) =3D=3D=3D> usr.sbin/pkg_install/version (installincludes) =3D=3D=3D> usr.sbin/pmcannotate (installincludes) =3D=3D=3D> usr.sbin/pmccontrol (installincludes) =3D=3D=3D> usr.sbin/pmcstat (installincludes) =3D=3D=3D> usr.sbin/portsnap (installincludes) =3D=3D=3D> usr.sbin/portsnap/portsnap (installincludes) =3D=3D=3D> usr.sbin/portsnap/make_index (installincludes) =3D=3D=3D> usr.sbin/portsnap/phttpget (installincludes) =3D=3D=3D> usr.sbin/powerd (installincludes) =3D=3D=3D> usr.sbin/ppp (installincludes) =3D=3D=3D> usr.sbin/pppctl (installincludes) =3D=3D=3D> usr.sbin/praliases (installincludes) =3D=3D=3D> usr.sbin/praudit (installincludes) =3D=3D=3D> usr.sbin/procctl (installincludes) =3D=3D=3D> usr.sbin/pstat (installincludes) =3D=3D=3D> usr.sbin/pw (installincludes) =3D=3D=3D> usr.sbin/pwd_mkdb (installincludes) =3D=3D=3D> usr.sbin/quot (installincludes) =3D=3D=3D> usr.sbin/quotaon (installincludes) =3D=3D=3D> usr.sbin/rarpd (installincludes) =3D=3D=3D> usr.sbin/repquota (installincludes) =3D=3D=3D> usr.sbin/rip6query (installincludes) =3D=3D=3D> usr.sbin/rmt (installincludes) =3D=3D=3D> usr.sbin/rndc (installincludes) =3D=3D=3D> usr.sbin/rndc-confgen (installincludes) =3D=3D=3D> usr.sbin/route6d (installincludes) =3D=3D=3D> usr.sbin/rpc.lockd (installincludes) =3D=3D=3D> usr.sbin/rpc.statd (installincludes) =3D=3D=3D> usr.sbin/rpc.umntall (installincludes) =3D=3D=3D> usr.sbin/rpc.yppasswdd (installincludes) =3D=3D=3D> usr.sbin/rpc.ypupdated (installincludes) =3D=3D=3D> usr.sbin/rpc.ypxfrd (installincludes) =3D=3D=3D> usr.sbin/rpcbind (installincludes) =3D=3D=3D> usr.sbin/rrenumd (installincludes) =3D=3D=3D> usr.sbin/rtadvctl (installincludes) =3D=3D=3D> usr.sbin/rtadvd (installincludes) =3D=3D=3D> usr.sbin/rtprio (installincludes) =3D=3D=3D> usr.sbin/rtsold (installincludes) =3D=3D=3D> usr.sbin/rwhod (installincludes) =3D=3D=3D> usr.sbin/sa (installincludes) =3D=3D=3D> usr.sbin/sendmail (installincludes) =3D=3D=3D> usr.sbin/service (installincludes) =3D=3D=3D> usr.sbin/services_mkdb (installincludes) =3D=3D=3D> usr.sbin/setfib (installincludes) =3D=3D=3D> usr.sbin/setfmac (installincludes) =3D=3D=3D> usr.sbin/setpmac (installincludes) =3D=3D=3D> usr.sbin/sicontrol (installincludes) =3D=3D=3D> usr.sbin/smbmsg (installincludes) =3D=3D=3D> usr.sbin/snapinfo (installincludes) =3D=3D=3D> usr.sbin/spkrtest (installincludes) =3D=3D=3D> usr.sbin/spray (installincludes) =3D=3D=3D> usr.sbin/syslogd (installincludes) =3D=3D=3D> usr.sbin/tcpdchk (installincludes) =3D=3D=3D> usr.sbin/tcpdmatch (installincludes) =3D=3D=3D> usr.sbin/tcpdrop (installincludes) =3D=3D=3D> usr.sbin/tcpdump (installincludes) =3D=3D=3D> usr.sbin/tcpdump/tcpdump (installincludes) =3D=3D=3D> usr.sbin/timed (installincludes) =3D=3D=3D> usr.sbin/timed/timed (installincludes) =3D=3D=3D> usr.sbin/timed/timedc (installincludes) =3D=3D=3D> usr.sbin/traceroute (installincludes) =3D=3D=3D> usr.sbin/traceroute6 (installincludes) =3D=3D=3D> usr.sbin/trpt (installincludes) =3D=3D=3D> usr.sbin/tzsetup (installincludes) =3D=3D=3D> usr.sbin/uathload (installincludes) =3D=3D=3D> usr.sbin/ugidfw (installincludes) =3D=3D=3D> usr.sbin/uhsoctl (installincludes) =3D=3D=3D> usr.sbin/usbconfig (installincludes) =3D=3D=3D> usr.sbin/usbdump (installincludes) =3D=3D=3D> usr.sbin/utx (installincludes) =3D=3D=3D> usr.sbin/vidcontrol (installincludes) =3D=3D=3D> usr.sbin/vipw (installincludes) =3D=3D=3D> usr.sbin/wake (installincludes) =3D=3D=3D> usr.sbin/watch (installincludes) =3D=3D=3D> usr.sbin/watchdogd (installincludes) =3D=3D=3D> usr.sbin/wlandebug (installincludes) =3D=3D=3D> usr.sbin/wpa (installincludes) =3D=3D=3D> usr.sbin/wpa/wpa_supplicant (installincludes) =3D=3D=3D> usr.sbin/wpa/wpa_cli (installincludes) =3D=3D=3D> usr.sbin/wpa/wpa_passphrase (installincludes) =3D=3D=3D> usr.sbin/wpa/hostapd (installincludes) =3D=3D=3D> usr.sbin/wpa/hostapd_cli (installincludes) =3D=3D=3D> usr.sbin/wpa/ndis_events (installincludes) =3D=3D=3D> usr.sbin/yp_mkdb (installincludes) =3D=3D=3D> usr.sbin/ypbind (installincludes) =3D=3D=3D> usr.sbin/yppoll (installincludes) =3D=3D=3D> usr.sbin/yppush (installincludes) =3D=3D=3D> usr.sbin/ypserv (installincludes) =3D=3D=3D> usr.sbin/ypset (installincludes) =3D=3D=3D> usr.sbin/zic (installincludes) =3D=3D=3D> usr.sbin/zic/zic (installincludes) =3D=3D=3D> usr.sbin/zic/zdump (installincludes) =3D=3D=3D> usr.sbin/zzz (installincludes) =3D=3D=3D> etc (includes) set -e; cd /zbuilder/buildd/head/etc; /usr/obj/zbuilder/buildd/head/make.am= d64/make buildincludes; /usr/obj/zbuilder/buildd/head/make.amd64/make insta= llincludes =3D=3D=3D> etc/sendmail (buildincludes) =3D=3D=3D> etc/sendmail (installincludes) -------------------------------------------------------------- >>> stage 4.2: building libraries -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARCH=3Damd6= 4 MACHINE=3Damd64 CPUTYPE=3D GROFF_BIN_PATH=3D/usr/obj/zbuilder/buildd/he= ad/tmp/legacy/usr/bin GROFF_FONT_PATH=3D/usr/obj/zbuilder/buildd/head/tmp/= legacy/usr/share/groff_font GROFF_TMAC_PATH=3D/usr/obj/zbuilder/buildd/hea= d/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=3D/usr/obj/zbuilder/buildd/hea= d/tmp _LDSCRIPTROOT=3D VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" IN= STALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuild= er/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy= /usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuild= er/buildd/head/tmp/legacy/bin:/usr/obj/zbuilder/buildd/head/tmp/usr/sbin:/u= sr/obj/zbuilder/buildd/head/tmp/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/u= sr/games:/sbin:/bin:/usr/sbin:/usr/bin CC=3D"cc " CXX=3D"c++ " CPP=3D"cpp = " AS=3D"as" AR=3D"ar" LD=3D"ld" NM=3Dnm OBJDUMP=3D RANLIB=3Dranlib STRING= S=3D COMPILER_TYPE=3Dclang /usr/obj/zbuilder/buildd/head/make.amd64/make -= f Makefile.inc1 DESTDIR=3D/usr/obj/zbuilder/buildd/head/tmp -DNO_FSCHG -DWI= THOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN -DNO_PROFILE libraries cd /zbuilder/buildd/head; /usr/obj/zbuilder/buildd/head/make.amd64/make -f= Makefile.inc1 _prereq_libs; /usr/obj/zbuilder/buildd/head/make.amd64/make= -f Makefile.inc1 _startup_libs; /usr/obj/zbuilder/buildd/head/make.amd64/= make -f Makefile.inc1 _prebuild_libs; /usr/obj/zbuilder/buildd/head/make.a= md64/make -f Makefile.inc1 _generic_libs; =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sp_nonshared.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> gnu/lib/libgcc (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= cc_eh.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> lib/libcompiler_rt (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= ompiler_rt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgcc.a -> libcompiler_rt.a =3D=3D=3D> gnu/lib/csu (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= =2Eo /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbegin.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtend.o= /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtend.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= T.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbeginT.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= S.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbeginS.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtendS.= o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtendS.o =3D=3D=3D> lib/csu/amd64 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crt1.o c= rti.o crtn.o Scrt1.o gcrt1.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> lib/libc (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libc.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libc.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libc.so sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 libc_pi= c.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 be_BY.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/be_BY.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ca_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ca_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 de_DE.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/de_DE.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 el_GR.I= SO8859-7.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/el_GR.ISO8859= -7/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 es_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/es_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 fi_FI.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/fi_FI.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 fr_FR.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/fr_FR.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 gl_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/gl_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 hu_HU.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/hu_HU.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 it_IT.I= SO8859-15.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/it_IT.ISO885= 9-15/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ja_JP.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ja_JP.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ja_JP.e= ucJP.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ja_JP.eucJP/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ko_KR.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ko_KR.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ko_KR.e= ucKR.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ko_KR.eucKR/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 mn_MN.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/mn_MN.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 nl_NL.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/nl_NL.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 no_NO.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/no_NO.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 pl_PL.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/pl_PL.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 pt_BR.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/pt_BR.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ru_RU.K= OI8-R.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ru_RU.KOI8-R/lib= c.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 sk_SK.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/sk_SK.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 sv_SE.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/sv_SE.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 uk_UA.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/uk_UA.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.G= B18030.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.GB18030/l= ibc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.G= B2312.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.GB2312/lib= c.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.UTF-8/libc.= cat =3D=3D=3D> gnu/lib/libgcc (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= cc_eh.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgcc_s.so.1 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libgcc_s.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgcc_s= =2Eso =3D=3D=3D> lib/libcompiler_rt (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= ompiler_rt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgcc.a -> libcompiler_rt.a =3D=3D=3D> lib/libcxxrt (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= xxrt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcxxrt.so.1 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcxxrt.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcxxrt= =2Eso =3D=3D=3D> lib/libcom_err (obj,depend,all,install) =3D=3D=3D> lib/libcom_err/doc (obj) =3D=3D=3D> lib/libcom_err/doc (depend) =3D=3D=3D> lib/libcom_err/doc (all) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= om_err.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcom_err.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libcom_err.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libcom_err.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcom_err/../../contrib/com_err/com_err.h /zbuilder/b= uildd/head/lib/libcom_err/../../contrib/com_err/com_right.h /usr/obj/zbuild= er/buildd/head/tmp/usr/include =3D=3D=3D> lib/libcom_err/doc (install) =3D=3D=3D> lib/libcrypt (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= rypt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libcrypt.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcrypt.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcrypt= =2Eso =3D=3D=3D> kerberos5/lib/libroken (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= oken.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= broken.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libroken.so.11 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libroken.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 roken= =2Eh /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/roken-common.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../= =2E./crypto/heimdal/lib/roken/base64.h /zbuilder/buildd/head/kerberos5/lib/= libroken/../../../crypto/heimdal/lib/roken/getarg.h /zbuilder/buildd/head/k= erberos5/lib/libroken/../../../crypto/heimdal/lib/roken/hex.h /zbuilder/bui= ldd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/parse_byt= es.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/parse_time.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../..= /crypto/heimdal/lib/roken/parse_units.h /zbuilder/buildd/head/kerberos5/lib= /libroken/../../../crypto/heimdal/lib/roken/resolve.h /zbuilder/buildd/head= /kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/rtbl.h /zbuilder/= buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/xdbm.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libasn1 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= sn1.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= basn1.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libasn1.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libasn1.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 asn1_= err.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../crypto/heimdal/l= ib/asn1/asn1-common.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../= crypto/heimdal/lib/asn1/heim_asn1.h /zbuilder/buildd/head/kerberos5/lib/lib= asn1/../../../crypto/heimdal/lib/asn1/der.h /zbuilder/buildd/head/kerberos5= /lib/libasn1/../../../crypto/heimdal/lib/asn1/der-protos.h /zbuilder/buildd= /head/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/der-private.h = krb5_asn1.h pkinit_asn1.h cms_asn1.h rfc2459_asn1.h pkcs8_asn1.h pkcs9_asn1= =2Eh pkcs12_asn1.h digest_asn1.h kx509_asn1.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> secure/lib/libcrypto (obj,depend,all,install) =3D=3D=3D> secure/lib/libcrypto/engines (obj) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (obj) =3D=3D=3D> secure/lib/libcrypto/engines (depend) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (depend) =3D=3D=3D> secure/lib/libcrypto/engines (all) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (all) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (all) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (all) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (all) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (all) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (all) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (all) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (all) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (all) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= rypto.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcrypto.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcrypto.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcryp= to.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/crypto= =2Eh /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cry= pto/ebcdic.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/opensslv.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ossl_typ.h /zbuilder/buildd/head/secure/lib/libcrypto= /../../../crypto/openssl/crypto/symhacks.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/../e_os2.h /zbuilder/buildd/head/= secure/lib/libcrypto/../../../crypto/openssl/crypto/aes/aes.h /zbuilder/bui= ldd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn1/asn1.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn= 1/asn1_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/asn1/asn1t.h /zbuilder/buildd/head/secure/lib/libcrypto/../../.= =2E/crypto/openssl/crypto/bf/blowfish.h /zbuilder/buildd/head/secure/lib/li= bcrypto/../../../crypto/openssl/crypto/bio/bio.h /zbuilder/buildd/head/secu= re/lib/libcrypto/../../../crypto/openssl/crypto/bn/bn.h /zbuilder/buildd/he= ad/secure/lib/libcrypto/../../../crypto/openssl/crypto/buffer/buffer.h /zbu= ilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/camel= lia/camellia.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/cast/cast.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/cmac/cmac.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/cms/cms.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/comp/comp.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/conf.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/c= onf_api.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/des/des.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../cryp= to/openssl/crypto/des/des_old.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/dh/dh.h /zbuilder/buildd/head/secure/lib/l= ibcrypto/../../../crypto/openssl/crypto/dsa/dsa.h /zbuilder/buildd/head/sec= ure/lib/libcrypto/../../../crypto/openssl/crypto/dso/dso.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ec/ec.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ecdh/ecdh.= h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto= /ecdsa/ecdsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/engine/engine.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/err/err.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/evp/evp.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/hmac/hmac.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/idea/idea.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/krb5/k= rb5_asn.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/lhash/lhash.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/md4/md4.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/md5/md5.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/mdc2/mdc2.h /zbuilder/buildd/head= /secure/lib/libcrypto/../../../crypto/openssl/crypto/modes/modes.h /zbuilde= r/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/objects/o= bj_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl= /crypto/objects/objects.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/ocsp/ocsp.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/pem/pem.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/pem/pem2.h /zbuilder/buildd/= head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkcs12/pkcs12.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkc= s7/pkcs7.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/opens= sl/crypto/pqueue/pqueue.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/rand/rand.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/rc2/rc2.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/rc4/rc4.h /zbuilder/buildd/h= ead/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ripemd/rip= emd.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cr= ypto/rsa/rsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/seed/seed.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/sha/sha.h /zbuilder/buildd/head/secure/lib/libcr= ypto/../../../crypto/openssl/crypto/srp/srp.h /zbuilder/buildd/head/secure/= lib/libcrypto/../../../crypto/openssl/crypto/stack/safestack.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/stack/stack.h= /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/= ts/ts.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/= crypto/txt_db/txt_db.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ui/ui.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/ui/ui_compat.h /zbuilder/buildd/head/secure/li= b/libcrypto/../../../crypto/openssl/crypto/whrlpool/whrlpool.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x509/x509.h /= zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x5= 09/x509_vfy.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/op= enssl/crypto/x509v3/x509v3.h opensslconf.h /usr/obj/zbuilder/buildd/head/tm= p/usr/include/openssl =3D=3D=3D> secure/lib/libcrypto/engines (install) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= b4758cca.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libaep (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= baep.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= batalla.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libchil (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bchil.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcswift.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libgost (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgost.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bnuron.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsureware.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bubsec.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines Removing stale symlinks. rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/des.h rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.a rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.so rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.so.3 rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes_p.a =3D=3D=3D> kerberos5/lib/libwind (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libw= ind.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bwind.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libwind.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libwind.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libwind/../../../crypto/heimdal/lib/wind/win= d.h wind_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libhx509 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= x509.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bhx509.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libhx509.so.11 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libhx509.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/h= x509-private.h /zbuilder/buildd/head/kerberos5/lib/libhx509/../../../crypto= /heimdal/lib/hx509/hx509-protos.h /zbuilder/buildd/head/kerberos5/lib/libhx= 509/../../../crypto/heimdal/lib/hx509/hx509.h hx509_err.h ocsp_asn1.h pkcs1= 0_asn1.h crmf_asn1.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libthr (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libt= hr.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libthr.so.3 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libthr.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libthr.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libpthread.a -> libthr.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libpthread.so -> libthr.so =3D=3D=3D> kerberos5/lib/libheimbase (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimbase.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimbase.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimbase.so.11 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libheimbase.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimbase/../../../crypto/heimdal/base/hei= mbase.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libheimipcc (obj,depend,all,install) =3D=3D=3D> kerberos5/lib/libkrb5 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= rb5.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkrb5.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkrb5.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libkrb5.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 heim_= err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/i= nclude/heim_threads.h k524_err.h /zbuilder/buildd/head/kerberos5/lib/libkrb= 5/../../../crypto/heimdal/lib/krb5/krb5-protos.h /zbuilder/buildd/head/kerb= eros5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5-private.h /zbuilder= /buildd/head/kerberos5/lib/libkrb5/../../include/krb5-types.h /zbuilder/bui= ldd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5.h krb5= _err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/= lib/krb5/krb5_ccapi.h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/loc= ate_plugin.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/he= imdal/lib/krb5/send_to_kdc_plugin.h /zbuilder/buildd/head/kerberos5/lib/lib= krb5/../../../crypto/heimdal/lib/krb5/ccache_plugin.h /usr/obj/zbuilder/bui= ldd/head/tmp/usr/include/krb5 =3D=3D=3D> kerberos5/lib/libheimsqlite (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimsqlite.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimsqlite.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimsqlite.so.11 /usr/obj= /zbuilder/buildd/head/tmp/usr/lib/libheimsqlite.so =3D=3D=3D> kerberos5/lib/libhdb (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= db.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bhdb.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libhdb.so.11 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libhdb.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/lib/hdb/hdb-p= rotos.h /zbuilder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/= lib/hdb/hdb.h hdb_asn1.h hdb_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude =3D=3D=3D> kerberos5/lib/libheimntlm (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimntlm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimntlm.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimntlm.so.11 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libheimntlm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto/heimdal/lib/ntlm= /heimntlm.h /zbuilder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto= /heimdal/lib/ntlm/heimntlm-protos.h ntlm_err.h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include =3D=3D=3D> lib/atf/libatf-c (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= tf-c.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= batf-c.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libatf-c.so.1 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libatf-c.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c.h /usr/obj/z= builder/buildd/head/tmp/usr/include/atf-c.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/build.h /zbuil= der/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/check.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/config.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/defs.h /zbuilder= /buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error.h /zbuilder/= buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error_fwd.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/macros.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tc.h /zbuilder/b= uildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tp.h /zbuilder/build= d/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/utils.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/atf-c =3D=3D=3D> lib/libbz2 (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= z2.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbz2.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbz2.so.4 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libbz2.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbz2/../../contrib/bzip2/bzlib.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include =3D=3D=3D> lib/libelf (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libe= lf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= belf.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libelf.so.1 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libelf.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libelf/libelf.h /zbuilder/buildd/head/lib/libelf/gelf.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libexpat (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= sdxml.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbsdxml.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libbsdxml.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libbsdx= ml.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 bsdxm= l.h bsdxml_external.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libgssapi (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= ssapi.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgssapi.so.10 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgssapi.so.10 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libgssapi.so =3D=3D=3D> lib/libipx (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libi= px.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bipx.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libipx.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libipx.so =3D=3D=3D> lib/libkiconv (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= iconv.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkiconv.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libkiconv.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libkico= nv.so =3D=3D=3D> lib/libkvm (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= vm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkvm.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libkvm.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libkvm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libkvm/kvm.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/liblzma (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libl= zma.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= blzma.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s liblzma.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/liblzma.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/../lzma.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/base.h /= zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/bcj.= h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/b= lock.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/l= zma/check.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/= api/lzma/container.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src= /liblzma/api/lzma/delta.h /zbuilder/buildd/head/lib/liblzma/../../contrib/x= z/src/liblzma/api/lzma/filter.h /zbuilder/buildd/head/lib/liblzma/../../con= trib/xz/src/liblzma/api/lzma/hardware.h /zbuilder/buildd/head/lib/liblzma/.= =2E/../contrib/xz/src/liblzma/api/lzma/index.h /zbuilder/buildd/head/lib/li= blzma/../../contrib/xz/src/liblzma/api/lzma/index_hash.h /zbuilder/buildd/h= ead/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/lzma.h /zbuilder/buil= dd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/stream_flags.h /z= builder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/versi= on.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzm= a/vli.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/lzma =3D=3D=3D> lib/libmd (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= d.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmd.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libmd.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libmd.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmd/md4.h /zbuilder/buildd/head/lib/libmd/md5.h /zbu= ilder/buildd/head/lib/libmd/ripemd.h /zbuilder/buildd/head/lib/libmd/sha.h = /zbuilder/buildd/head/lib/libmd/sha256.h /zbuilder/buildd/head/lib/libmd/sh= a512.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses/ncurses (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= curses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bncurses.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libncurses.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libncu= rses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcurses.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcap.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlib.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfo.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcurses.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcap.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlib.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfo.so -> libncurses.so =3D=3D=3D> lib/ncurses/ncursesw (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= cursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bncursesw.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libncursesw.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libnc= ursesw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 curse= s.h term.h termcap.h unctrl.h /zbuilder/buildd/head/lib/ncurses/ncursesw/..= /../../contrib/ncurses/include/ncurses_dll.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include /usr/obj/zbuilder/buildd/head/tmp/usr/include/ncurses.h -> curses.h /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcursesw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcapw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlibw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfow.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcursesw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcapw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlibw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfow.so -> libncursesw.so =3D=3D=3D> lib/libopie (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libo= pie.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bopie.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libopie.so.7 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libopie.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libopie/../../contrib/opie/opie.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include =3D=3D=3D> lib/libpam (obj,depend,all,install) =3D=3D=3D> lib/libpam/modules (obj) =3D=3D=3D> lib/libpam/modules/pam_chroot (obj) =3D=3D=3D> lib/libpam/modules/pam_deny (obj) =3D=3D=3D> lib/libpam/modules/pam_echo (obj) =3D=3D=3D> lib/libpam/modules/pam_exec (obj) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (obj) =3D=3D=3D> lib/libpam/modules/pam_group (obj) =3D=3D=3D> lib/libpam/modules/pam_guest (obj) =3D=3D=3D> lib/libpam/modules/pam_krb5 (obj) =3D=3D=3D> lib/libpam/modules/pam_ksu (obj) =3D=3D=3D> lib/libpam/modules/pam_lastlog (obj) =3D=3D=3D> lib/libpam/modules/pam_login_access (obj) =3D=3D=3D> lib/libpam/modules/pam_nologin (obj) =3D=3D=3D> lib/libpam/modules/pam_opie (obj) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (obj) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (obj) =3D=3D=3D> lib/libpam/modules/pam_permit (obj) =3D=3D=3D> lib/libpam/modules/pam_radius (obj) =3D=3D=3D> lib/libpam/modules/pam_rhosts (obj) =3D=3D=3D> lib/libpam/modules/pam_rootok (obj) =3D=3D=3D> lib/libpam/modules/pam_securetty (obj) =3D=3D=3D> lib/libpam/modules/pam_self (obj) =3D=3D=3D> lib/libpam/modules/pam_ssh (obj) =3D=3D=3D> lib/libpam/modules/pam_tacplus (obj) =3D=3D=3D> lib/libpam/modules/pam_unix (obj) =3D=3D=3D> lib/libpam/libpam (obj) =3D=3D=3D> lib/libpam/modules (depend) =3D=3D=3D> lib/libpam/modules/pam_chroot (depend) =3D=3D=3D> lib/libpam/modules/pam_deny (depend) =3D=3D=3D> lib/libpam/modules/pam_echo (depend) =3D=3D=3D> lib/libpam/modules/pam_exec (depend) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (depend) =3D=3D=3D> lib/libpam/modules/pam_group (depend) =3D=3D=3D> lib/libpam/modules/pam_guest (depend) =3D=3D=3D> lib/libpam/modules/pam_krb5 (depend) =3D=3D=3D> lib/libpam/modules/pam_ksu (depend) =3D=3D=3D> lib/libpam/modules/pam_lastlog (depend) =3D=3D=3D> lib/libpam/modules/pam_login_access (depend) =3D=3D=3D> lib/libpam/modules/pam_nologin (depend) =3D=3D=3D> lib/libpam/modules/pam_opie (depend) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (depend) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (depend) =3D=3D=3D> lib/libpam/modules/pam_permit (depend) =3D=3D=3D> lib/libpam/modules/pam_radius (depend) =3D=3D=3D> lib/libpam/modules/pam_rhosts (depend) =3D=3D=3D> lib/libpam/modules/pam_rootok (depend) =3D=3D=3D> lib/libpam/modules/pam_securetty (depend) =3D=3D=3D> lib/libpam/modules/pam_self (depend) =3D=3D=3D> lib/libpam/modules/pam_ssh (depend) =3D=3D=3D> lib/libpam/modules/pam_tacplus (depend) =3D=3D=3D> lib/libpam/modules/pam_unix (depend) =3D=3D=3D> lib/libpam/libpam (depend) =3D=3D=3D> lib/libpam/modules (all) =3D=3D=3D> lib/libpam/modules/pam_chroot (all) =3D=3D=3D> lib/libpam/modules/pam_deny (all) =3D=3D=3D> lib/libpam/modules/pam_echo (all) =3D=3D=3D> lib/libpam/modules/pam_exec (all) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (all) =3D=3D=3D> lib/libpam/modules/pam_group (all) =3D=3D=3D> lib/libpam/modules/pam_guest (all) =3D=3D=3D> lib/libpam/modules/pam_krb5 (all) =3D=3D=3D> lib/libpam/modules/pam_ksu (all) =3D=3D=3D> lib/libpam/modules/pam_lastlog (all) =3D=3D=3D> lib/libpam/modules/pam_login_access (all) =3D=3D=3D> lib/libpam/modules/pam_nologin (all) =3D=3D=3D> lib/libpam/modules/pam_opie (all) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (all) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (all) =3D=3D=3D> lib/libpam/modules/pam_permit (all) =3D=3D=3D> lib/libpam/modules/pam_radius (all) =3D=3D=3D> lib/libpam/modules/pam_rhosts (all) =3D=3D=3D> lib/libpam/modules/pam_rootok (all) =3D=3D=3D> lib/libpam/modules/pam_securetty (all) =3D=3D=3D> lib/libpam/modules/pam_self (all) =3D=3D=3D> lib/libpam/modules/pam_ssh (all) =3D=3D=3D> lib/libpam/modules/pam_tacplus (all) =3D=3D=3D> lib/libpam/modules/pam_unix (all) =3D=3D=3D> lib/libpam/libpam (all) =3D=3D=3D> lib/libpam/modules (install) =3D=3D=3D> lib/libpam/modules/pam_chroot (install) =3D=3D=3D> lib/libpam/modules/pam_deny (install) =3D=3D=3D> lib/libpam/modules/pam_echo (install) =3D=3D=3D> lib/libpam/modules/pam_exec (install) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (install) =3D=3D=3D> lib/libpam/modules/pam_group (install) =3D=3D=3D> lib/libpam/modules/pam_guest (install) =3D=3D=3D> lib/libpam/modules/pam_krb5 (install) =3D=3D=3D> lib/libpam/modules/pam_ksu (install) =3D=3D=3D> lib/libpam/modules/pam_lastlog (install) =3D=3D=3D> lib/libpam/modules/pam_login_access (install) =3D=3D=3D> lib/libpam/modules/pam_nologin (install) =3D=3D=3D> lib/libpam/modules/pam_opie (install) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (install) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (install) =3D=3D=3D> lib/libpam/modules/pam_permit (install) =3D=3D=3D> lib/libpam/modules/pam_radius (install) =3D=3D=3D> lib/libpam/modules/pam_rhosts (install) =3D=3D=3D> lib/libpam/modules/pam_rootok (install) =3D=3D=3D> lib/libpam/modules/pam_securetty (install) =3D=3D=3D> lib/libpam/modules/pam_self (install) =3D=3D=3D> lib/libpam/modules/pam_ssh (install) =3D=3D=3D> lib/libpam/modules/pam_tacplus (install) =3D=3D=3D> lib/libpam/modules/pam_unix (install) =3D=3D=3D> lib/libpam/libpam (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= am.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpam.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libpam.so.5 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libpam.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/include/securit= y/openpam.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpa= m/include/security/openpam_attr.h /zbuilder/buildd/head/lib/libpam/libpam/.= =2E/../../contrib/openpam/include/security/openpam_version.h /zbuilder/buil= dd/head/lib/libpam/libpam/../../../contrib/openpam/include/security/pam_app= l.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/includ= e/security/pam_constants.h /zbuilder/buildd/head/lib/libpam/libpam/../../..= /contrib/openpam/include/security/pam_modules.h /zbuilder/buildd/head/lib/l= ibpam/libpam/../../../contrib/openpam/include/security/pam_types.h /zbuilde= r/buildd/head/lib/libpam/libpam/security/pam_mod_misc.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include/security =3D=3D=3D> lib/libradius (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= adius.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bradius.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libradius.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libradius.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libradius/radlib.h /zbuilder/buildd/head/lib/libradius= /radlib_vs.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libsbuf (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= buf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsbuf.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libsbuf.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libsbuf.so =3D=3D=3D> lib/libtacplus (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libt= acplus.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= btacplus.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libtacplus.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libtacplus.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libtacplus/taclib.h /usr/obj/zbuilder/buildd/head/tmp/= usr/include =3D=3D=3D> cddl/lib/libumem (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= mem.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bumem.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libumem.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libumem.so =3D=3D=3D> cddl/lib/libnvpair (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= vpair.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bnvpair.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libnvpair.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libnvpa= ir.so =3D=3D=3D> cddl/lib/libzfs_core (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= fs_core.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bzfs_core.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libzfs_core.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libzf= s_core.so =3D=3D=3D> lib/libutil (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= til.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= butil.so.9 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libutil.so.9 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libutil.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libutil/libutil.h /zbuilder/buildd/head/lib/libutil/lo= gin_cap.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libypclnt (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liby= pclnt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bypclnt.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libypclnt.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libypclnt.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libypclnt/ypclnt.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libz (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bz.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libz.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libz.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libz/zconf.h /zbuilder/buildd/head/lib/libz/zlib.h /us= r/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/msun (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bm.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libm.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/msun/x86/fenv.h /zbuilder/buildd/head/lib/msun/src/mat= h.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> secure/lib/libssh (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sh.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bssh.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libssh.so.5 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libssh.so =3D=3D=3D> secure/lib/libssl (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sl.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bssl.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libssl.so.7 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libssl.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/dtls1.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/kssl.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/srtp.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl2.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl23.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl3.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/tls1.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/openssl =3D=3D=3D> cddl/lib (obj,depend,all,install) =3D=3D=3D> cddl/lib/drti (obj) =3D=3D=3D> cddl/lib/libavl (obj) =3D=3D=3D> cddl/lib/libctf (obj) =3D=3D=3D> cddl/lib/libdtrace (obj) =3D=3D=3D> cddl/lib/libnvpair (obj) =3D=3D=3D> cddl/lib/libumem (obj) =3D=3D=3D> cddl/lib/libuutil (obj) =3D=3D=3D> cddl/lib/libzfs_core (obj) =3D=3D=3D> cddl/lib/libzfs (obj) =3D=3D=3D> cddl/lib/libzpool (obj) =3D=3D=3D> cddl/lib/drti (depend) =3D=3D=3D> cddl/lib/libavl (depend) =3D=3D=3D> cddl/lib/libctf (depend) =3D=3D=3D> cddl/lib/libdtrace (depend) =3D=3D=3D> cddl/lib/libnvpair (depend) =3D=3D=3D> cddl/lib/libumem (depend) =3D=3D=3D> cddl/lib/libuutil (depend) =3D=3D=3D> cddl/lib/libzfs_core (depend) =3D=3D=3D> cddl/lib/libzfs (depend) =3D=3D=3D> cddl/lib/libzpool (depend) =3D=3D=3D> cddl/lib/drti (all) =3D=3D=3D> cddl/lib/libavl (all) =3D=3D=3D> cddl/lib/libctf (all) =3D=3D=3D> cddl/lib/libdtrace (all) =3D=3D=3D> cddl/lib/libnvpair (all) =3D=3D=3D> cddl/lib/libumem (all) =3D=3D=3D> cddl/lib/libuutil (all) =3D=3D=3D> cddl/lib/libzfs_core (all) =3D=3D=3D> cddl/lib/libzfs (all) =3D=3D=3D> cddl/lib/libzpool (all) =3D=3D=3D> cddl/lib/drti (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 drti.o /= usr/obj/zbuilder/buildd/head/tmp/usr/lib/dtrace =3D=3D=3D> cddl/lib/libavl (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= vl.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bavl.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libavl.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libavl.so =3D=3D=3D> cddl/lib/libctf (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= tf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bctf.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libctf.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libctf.so =3D=3D=3D> cddl/lib/libdtrace (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/errno.d /usr/obj/zbuilder/buildd/head/tmp/u= sr/lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/io.d /usr/obj/zbuilder/buildd/head/tmp/usr/= lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/psinfo.d /usr/obj/zbuilder/buildd/head/tmp/= usr/lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/signal.d /usr/obj/zbuilder/buildd/head/tmp/= usr/lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/unistd.d /usr/obj/zbuilder/buildd/head/tmp/= usr/lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 /zbuilder= /buildd/head/cddl/lib/libdtrace/regs_x86.d /usr/obj/zbuilder/buildd/head/tm= p/usr/lib/dtrace sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libd= trace.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bdtrace.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libdtrace.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdtra= ce.so =3D=3D=3D> cddl/lib/libnvpair (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= vpair.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bnvpair.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libnvpair.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libnvpa= ir.so =3D=3D=3D> cddl/lib/libumem (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= mem.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bumem.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libumem.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libumem.so =3D=3D=3D> cddl/lib/libuutil (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= util.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= buutil.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libuutil.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libuutil= =2Eso =3D=3D=3D> cddl/lib/libzfs_core (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= fs_core.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bzfs_core.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libzfs_core.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libzf= s_core.so =3D=3D=3D> cddl/lib/libzfs (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= fs.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bzfs.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libzfs.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libzfs.so =3D=3D=3D> cddl/lib/libzpool (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= pool.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bzpool.so.2 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libzpool.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libzpool= =2Eso =3D=3D=3D> gnu/lib (obj,depend,all,install) =3D=3D=3D> gnu/lib/csu (obj) =3D=3D=3D> gnu/lib/libgcc (obj) =3D=3D=3D> gnu/lib/libgcov (obj) =3D=3D=3D> gnu/lib/libdialog (obj) =3D=3D=3D> gnu/lib/libgomp (obj) =3D=3D=3D> gnu/lib/libregex (obj) =3D=3D=3D> gnu/lib/libregex/doc (obj) =3D=3D=3D> gnu/lib/libreadline (obj) =3D=3D=3D> gnu/lib/libreadline/history (obj) =3D=3D=3D> gnu/lib/libreadline/history/doc (obj) =3D=3D=3D> gnu/lib/libreadline/readline (obj) =3D=3D=3D> gnu/lib/libreadline/readline/doc (obj) =3D=3D=3D> gnu/lib/libssp (obj) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (obj) =3D=3D=3D> gnu/lib/libstdc++ (obj) =3D=3D=3D> gnu/lib/libsupc++ (obj) =3D=3D=3D> gnu/lib/csu (depend) =3D=3D=3D> gnu/lib/libgcc (depend) =3D=3D=3D> gnu/lib/libgcov (depend) =3D=3D=3D> gnu/lib/libdialog (depend) =3D=3D=3D> gnu/lib/libgomp (depend) =3D=3D=3D> gnu/lib/libregex (depend) =3D=3D=3D> gnu/lib/libregex/doc (depend) =3D=3D=3D> gnu/lib/libreadline (depend) =3D=3D=3D> gnu/lib/libreadline/history (depend) =3D=3D=3D> gnu/lib/libreadline/history/doc (depend) =3D=3D=3D> gnu/lib/libreadline/readline (depend) =3D=3D=3D> gnu/lib/libreadline/readline/doc (depend) =3D=3D=3D> gnu/lib/libssp (depend) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (depend) =3D=3D=3D> gnu/lib/libstdc++ (depend) =3D=3D=3D> gnu/lib/libsupc++ (depend) =3D=3D=3D> gnu/lib/csu (all) =3D=3D=3D> gnu/lib/libgcc (all) =3D=3D=3D> gnu/lib/libgcov (all) =3D=3D=3D> gnu/lib/libdialog (all) =3D=3D=3D> gnu/lib/libgomp (all) =3D=3D=3D> gnu/lib/libregex (all) =3D=3D=3D> gnu/lib/libregex/doc (all) =3D=3D=3D> gnu/lib/libreadline (all) =3D=3D=3D> gnu/lib/libreadline/history (all) =3D=3D=3D> gnu/lib/libreadline/history/doc (all) =3D=3D=3D> gnu/lib/libreadline/readline (all) =3D=3D=3D> gnu/lib/libreadline/readline/doc (all) =3D=3D=3D> gnu/lib/libssp (all) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (all) =3D=3D=3D> gnu/lib/libstdc++ (all) =3D=3D=3D> gnu/lib/libsupc++ (all) =3D=3D=3D> gnu/lib/csu (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= =2Eo /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbegin.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtend.o= /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtend.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= T.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbeginT.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtbegin= S.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtbeginS.o sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crtendS.= o /usr/obj/zbuilder/buildd/head/tmp/usr/lib/crtendS.o =3D=3D=3D> gnu/lib/libgcc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= cc_eh.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgcc_s.so.1 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libgcc_s.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgcc_s= =2Eso =3D=3D=3D> gnu/lib/libgcov (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= cov.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> gnu/lib/libdialog (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libd= ialog.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bdialog.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libdialog.so.7 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libdialog.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libdialog/../../../contrib/dialog/dialog.h /zbuild= er/buildd/head/gnu/lib/libdialog/../../../contrib/dialog/dlg_colors.h /zbui= lder/buildd/head/gnu/lib/libdialog/dlg_config.h /zbuilder/buildd/head/gnu/l= ib/libdialog/../../../contrib/dialog/dlg_keys.h /usr/obj/zbuilder/buildd/he= ad/tmp/usr/include =3D=3D=3D> gnu/lib/libgomp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= omp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgomp.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgomp.so.1 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libgomp.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 omp.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> gnu/lib/libregex (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= nuregex.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgnuregex.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgnuregex.so.5 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/libgnuregex.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 regex= =2Eh.patched /usr/obj/zbuilder/buildd/head/tmp/usr/include/gnu/regex.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libregex/gnuregex.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libregex/../../../contrib/libgnuregex/regex.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/gnu/posix =3D=3D=3D> gnu/lib/libregex/doc (install) =3D=3D=3D> gnu/lib/libreadline (install) =3D=3D=3D> gnu/lib/libreadline/history (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= istory.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bhistory.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libhistory.so.8 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libhistory.so =3D=3D=3D> gnu/lib/libreadline/history/doc (install) =3D=3D=3D> gnu/lib/libreadline/readline (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= eadline.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= breadline.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libreadline.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libre= adline.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libreadline/readline/../../../../contrib/libreadli= ne/readline.h /zbuilder/buildd/head/gnu/lib/libreadline/readline/../../../.= =2E/contrib/libreadline/chardefs.h /zbuilder/buildd/head/gnu/lib/libreadlin= e/readline/../../../../contrib/libreadline/keymaps.h /zbuilder/buildd/head/= gnu/lib/libreadline/readline/../../../../contrib/libreadline/history.h /zbu= ilder/buildd/head/gnu/lib/libreadline/readline/../../../../contrib/libreadl= ine/tilde.h /zbuilder/buildd/head/gnu/lib/libreadline/readline/../../../../= contrib/libreadline/rlstdc.h /zbuilder/buildd/head/gnu/lib/libreadline/read= line/../../../../contrib/libreadline/rlconf.h /zbuilder/buildd/head/gnu/lib= /libreadline/readline/../../../../contrib/libreadline/rltypedefs.h /usr/obj= /zbuilder/buildd/head/tmp/usr/include/readline =3D=3D=3D> gnu/lib/libreadline/readline/doc (install) =3D=3D=3D> gnu/lib/libssp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bssp.so.0 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libssp.so.0 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libssp.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 ssp.h= /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs/libssp/ssp/s= tring.h /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs/libss= p/ssp/stdio.h /zbuilder/buildd/head/gnu/lib/libssp/../../../contrib/gcclibs= /libssp/ssp/unistd.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/ssp =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sp_nonshared.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> gnu/lib/libstdc++ (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= tdc++.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bstdc++.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libstdc++.so.6 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libstdc++.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= allocator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/bits/basic_ios.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/bits/basic_ios.tcc /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/bits/basic_string.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= basic_string.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/bits/boost_concept_check.h /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/bits/char_traits.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/codecvt= =2Eh /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/bits/concept_check.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/bits/cpp_type_traits.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/bits/deque.tcc /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/fstrea= m.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/bits/functexcept.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/bits/gslice.h /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/bits/gslice_array.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/indirect_ar= ray.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/bits/ios_base.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/bits/istream.tcc /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/bits/list.tcc /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/locale_classes.h = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= bits/locale_facets.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/bits/locale_facets.tcc /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/bits/localefwd.h /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/mask_arra= y.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/bits/ostream.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/bits/ostream_insert.h /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/bits/postypes.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stream_iter= ator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/bits/streambuf_iterator.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/slice_array.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/bits/sstream.tcc /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/s= tl_algo.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/bits/stl_algobase.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/bits/stl_bvector.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_construct.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= stl_deque.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/bits/stl_function.h /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/bits/stl_heap.h /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_iterator.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/= stl_iterator_base_funcs.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/bits/stl_iterator_base_types.h /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_list.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bi= ts/stl_map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/stl_multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/stl_multiset.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_numeric.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bit= s/stl_pair.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/stl_queue.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/bits/stl_raw_storage_iter.h /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_relops.h= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /bits/stl_set.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/bits/stl_stack.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/bits/stl_tempbuf.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stl_tree.h /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/st= l_uninitialized.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/bits/stl_vector.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/bits/streambuf.tcc /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/stringfwd.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bit= s/valarray_array.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/bits/valarray_array.tcc /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/bits/valarray_before.h /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/bits/vala= rray_after.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/bits/vector.tcc /usr/obj/zbuilder/buildd/head/tmp/usr/include/= c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backw= ard/complex.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/backward/iomanip.h /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/backward/istream.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/backward/ostream.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/back= ward/stream.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/backward/streambuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/backward/algo.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/algobase.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ba= ckward/alloc.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/backward/bvector.h /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/backward/defalloc.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/deque.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ba= ckward/function.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/backward/hash_map.h /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/backward/hash_set.h /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/hashtabl= e.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/backward/heap.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/backward/iostream.h /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/backward/iterator.h /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/list.h= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /backward/map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/backward/multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/backward/new.h /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/backward/multiset.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/back= ward/pair.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/backward/queue.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/backward/rope.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/backward/set.h /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/slis= t.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/backward/stack.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/backward/tempbuf.h /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/backward/tree.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/backward/vector.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/b= ackward/fstream.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/backward/strstream /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/backward/backward_warning.h /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/backward sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/a= lgorithm /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/atomicity.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/array_allocator.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/bitmap_allocator.h /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/c= odecvt_specializations.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/concurrence.h /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/debug_allocator.h /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/stdio_= filebuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/stdio_sync_filebuf.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/functional /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/hash_map /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/hash_s= et /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/hash_fun.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/hashtable.h /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/iterator /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/malloc_allocator.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /memory /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/mt_allocator.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/ext/new_allocator.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/numeric /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/numeric_trai= ts.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/ext/pod_char_traits.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/ext/pool_allocator.h /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/ext/rb_tree /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/rope /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/ro= peimpl.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/slist /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/throw_allocator.h /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/typelist.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/type_traits.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/e= xt/rc_string_base.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/ext/sso_string_base.h /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/vstring.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/vstring.tcc /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /vstring_fwd.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/ext/vstring_util.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude/c++/4.2/ext sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cassert.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cass= ert sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cctype sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cerrno.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cerrno sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cfloat.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cfloat sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_ciso646.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ciso= 646 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_climits.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/clim= its sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_clocale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cloc= ale sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cmath.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cmath sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_csetjmp.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cset= jmp sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_csignal.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/csig= nal sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdarg.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= arg sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstddef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= def sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstdio sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstdlib.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstd= lib sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cstring.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cstr= ing sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_ctime.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ctime sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cwchar.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cwchar sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_st= d/std_cwctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/cwct= ype sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/c_std= /cmath.tcc /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_algorithm.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/algo= rithm sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_bitset.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bitset sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_complex.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/complex sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_deque.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/deque sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_fstream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/fstream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_functional.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/fun= ctional sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iomanip.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iomanip sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_ios.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ios sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iosfwd.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iosfwd sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iostream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/iostr= eam sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_istream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/istream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_iterator.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/itera= tor sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_limits.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/limits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_list.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/list sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_locale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/locale sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_map.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/map sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_memory.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/memory sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_numeric.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/numeric sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_ostream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ostream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_queue.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/queue sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_set.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/set sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_sstream.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/sstream sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_stack.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stack sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_stdexcept.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stde= xcept sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_streambuf.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/stre= ambuf sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_string.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/string sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_utility.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/utility sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_valarray.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/valar= ray sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/std/= std_vector.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/vector sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/alloc= ator/new_allocator_base.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c+= +/4.2/bits/c++allocator.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/io/ba= sic_file_stdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bit= s/basic_file.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/io/c_= io_stdio.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits/c++i= o.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/local= e/generic/c_locale.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2= /bits/c++locale.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/abi/co= mpatibility.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/config/locale/generic/c++locale_internal.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/config/locale/generic/messages_mem= bers.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/c= onfig/locale/generic/time_members.h /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/config/os/bsd/freebsd/ctype_base.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/os/bsd/freebs= d/ctype_inline.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/config/os/bsd/freebsd/ctype_noninline.h /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/config/os/bsd/freebsd/os_defines.h= c++config.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/config/cpu/generic/atomic_word.h /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/config/cpu/generic/cpu_defines.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/config/cpu/generic/c= xxabi_tweaks.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 gthr.= h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include/c++/4.2/bits sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug= /bitset /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/debug/debug.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/debug/deque /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/debug/formatter.h /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/functions.h /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/deb= ug/hash_map /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/debug/hash_map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/debug/hash_multimap.h /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/hash_multiset.h = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= debug/hash_set /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/debug/hash_set.h /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/debug/list /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/debug/macros.h /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/map /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug= /map.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/debug/multimap.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/debug/multiset.h /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/debug/safe_base.h /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/safe_itera= tor.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/debug/safe_iterator.tcc /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/debug/safe_sequence.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/debug/set /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/debug/set.h /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/d= ebug/string /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/debug/vector /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/= 4.2/debug sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/a= rray /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/tr1/bind_repeat.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/tr1/bind_iterate.h /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/tr1/boost_shared_ptr.h /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/cctype= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /tr1/cfenv /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/tr1/cfloat /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/tr1/cinttypes /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/tr1/climits /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/tr1/cmath /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/common.h /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/= complex /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/tr1/cstdarg /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/tr1/cstdbool /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/tr1/cstdint /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/tr1/cstdio /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/cstdlib /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/ctg= math /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inc= lude/tr1/ctime /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/tr1/ctype.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/tr1/cwchar /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/tr1/cwctype /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/tr1/fenv.h /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/float.h /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr= 1/functional /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libst= dc++/include/tr1/functional_hash.h /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/tr1/functional_iterate.h /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/hashtable= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /tr1/hashtable_policy.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/tr1/inttypes.h /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/tr1/limits.h /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/math.h /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/memory /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/t= r1/mu_iterate.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/tr1/random /zbuilder/buildd/head/gnu/lib/libstdc++/../../..= /contrib/libstdc++/include/tr1/random.tcc /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/tr1/ref_fwd.h /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/ref_wrap_iterat= e.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/tr1/repeat.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/tr1/stdarg.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/stdbool.h /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/tr1/stdint.h /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/stdio.h /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/st= dlib.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/tr1/tgmath.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/tr1/tuple /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/tuple_defs.h /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/tr1/tuple_iterate.h /zbuilde= r/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/type= _traits /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/tr1/type_traits_fwd.h /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/tr1/unordered_set /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/tr1/unordered_map /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/tr1/utili= ty /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/tr1/wchar.h /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/tr1/wctype.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/c= ++/4.2/tr1 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/assoc_container.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/exception.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/hash_policy.hpp = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= ext/pb_ds/list_update_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/priority_queue.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/tag= _and_trait.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/lib= stdc++/include/ext/pb_ds/tree_policy.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/trie_policy.hpp /usr/obj= /zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/basic_types.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/cond_dealtor.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/container_base_d= ispatch.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/ext/pb_ds/detail/map_debug_base.hpp /zbuilder/buildd/head/gnu/l= ib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/priority_q= ueue_base_dispatch.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/standard_policies.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/tree_trace_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/type_utils.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ty= pes_traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb= _ds/detail sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/pairing_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/pairing_heap_/erase_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= pairing_heap_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/detail/pairing_heap_/pairing_hea= p_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp /usr/obj/zbuil= der/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detai= l/splay_tree_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/erase_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/splay_= tree_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/splay_tree_/node.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/splay_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/splay= _tree_/split_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/splay_tree_/traits.hpp /usr/= obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/splay_tre= e_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/list_update_map_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/= entry_metadata_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_u= pdate_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/insert_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/list_update_map_/lu_map_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_map_/trac= e_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_= ds/detail/list_update_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/b= asic_tree_policy/null_node_metadata.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/basic_tree_policy/= traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/= detail/basic_tree_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/trie_policy/node_metadata_selector.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/trie_po= licy/null_node_update_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/order_statistics= _imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= trie_policy/sample_trie_node_update.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/string= _trie_e_access_traits_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/trie_policy/trie_policy_base= =2Ehpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/deta= il/trie_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_= hash_table_map_/debug_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table= _map_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_= hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_im= ps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/i= nclude/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp /zbuilder/build= d/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detai= l/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_has= h_table_map_/find_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map= _/gp_ht_map_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_= table_map_/insert_no_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_= map_/insert_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/it= erator_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_= hash_table_map_/resize_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_tabl= e_map_/standard_policies.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/gp_hash_table_map_/trace_fn= _imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/d= etail/gp_hash_table_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/tree_policy/node_metadata_selector.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/tree_po= licy/null_node_update_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/tree_policy/order_statistics= _imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp /usr/obj/= zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/tree_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bi= nomial_heap_base_/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bino= mial_heap_base_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_heap_base_/er= ase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_base_/insert_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomia= l_heap_base_/split_join_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude/c++/4.2/ext/pb_ds/detail/binomial_heap_base_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/= detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/resize_policy/hash_prime_size_policy_imp.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/resiz= e_policy/hash_standard_resize_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/= libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/resize_policy= /sample_resize_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/resize_policy/sample_resize_trig= ger.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp /usr/obj/zbui= lder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/resize_policy sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/bin_search_tree_/bin_search_tree_.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_sear= ch_tree_/cond_dtor_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/cond= _key_dtor_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/constructor= s_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_= search_tree_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/info_fn_imp= s.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /bin_search_tree_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libst= dc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/n= ode_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp /zbuilder/buildd/h= ead/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/b= in_search_tree_/r_erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/bin_search_tree_/rotat= e_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libs= tdc++/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/bin_search_tree_/traits.hpp /usr/obj/zbuilder/buildd/head/tmp/= usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binomial_heap_/binomial_heap_.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_hea= p_/constructors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binomial_heap_/debu= g_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_= ds/detail/binomial_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /thin_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/i= nsert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/= libstdc++/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/thin_heap_/thin_heap_.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/thin_heap_/trace_fn_i= mps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/det= ail/thin_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/pat_trie_/child_iterator.hpp /zbuilder/buildd/head/gnu/lib/libs= tdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/cond_dt= or_entry_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contr= ib/libstdc++/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp /z= builder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ex= t/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/pat_trie_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/h= ead.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_tr= ie_/insert_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp = /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/= ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_= /leaf.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pat_trie_/node_base.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_tri= e_/node_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/pat_trie_/pat_trie_.hpp /zbuilder/buildd/head/gnu/lib/libstdc= ++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/point_iter= ators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/de= tail/pat_trie_/r_erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/rotate_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp /zbuilder/buildd/head/= gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pat_t= rie_/split_join_branch_bag.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/pat_trie_/synth_e_access_= traits.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/pa= t_trie_/traits.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib= /libstdc++/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tabl= e_map_/cmp_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_en= try_dealtor.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_= fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstd= c++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_s= tore_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destr= uctor_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp /zbuild= er/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_= ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp /zbuilder/buildd/head/g= nu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_has= h_table_map_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../.= =2E/../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/erase_= no_store_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_h= ash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= cc_hash_table_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/ins= ert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn= _imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp /zbuilder/buildd= /head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail= /cc_hash_table_map_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tabl= e_map_/resize_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../= contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/resize_no_sto= re_hash_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contri= b/libstdc++/include/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_f= n_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/cc_hash_table_map_/standard_policies.hpp /zbuilder/buildd/head/gnu/li= b/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/cc_hash_tab= le_map_/trace_fn_imps.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++= /4.2/ext/pb_ds/detail/cc_hash_table_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/rc_binomial_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/l= ibstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rc_binomial_he= ap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../cont= rib/libstdc++/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= rc_binomial_heap_/rc.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_i= mps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/= include/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp /usr/obj/zbuil= der/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/left_child_next_sibling_heap_/const_point_iterator.hpp /zbuilder/buildd/= head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/= left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp /zbuilder= /buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds= /detail/left_child_next_sibling_heap_/debug_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/le= ft_child_next_sibling_heap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib= /libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/left_child_n= ext_sibling_heap_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibli= ng_heap_/insert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap= _/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left= _child_next_sibling_heap_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/left_child_next_sibling_heap= _/node.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp /= zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/e= xt/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp /usr/obj/zb= uilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/left_child_next= _sibling_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/unordered_iterator/const_iterator.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/unordere= d_iterator/const_point_iterator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++= /../../../contrib/libstdc++/include/ext/pb_ds/detail/unordered_iterator/ite= rator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc+= +/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp /usr/obj/z= builder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/unordered_iter= ator sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/binary_heap_/binary_heap_.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/con= st_iterator.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/li= bstdc++/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp /zbuilder/bui= ldd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/det= ail/binary_heap_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/= =2E./../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/entry_cm= p.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/in= clude/ext/pb_ds/detail/binary_heap_/entry_pred.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_= heap_/erase_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../co= ntrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp /zbu= ilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/= pb_ds/detail/binary_heap_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_heap_/in= sert_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/l= ibstdc++/include/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp /zbuil= der/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb= _ds/detail/binary_heap_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gnu= /lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/binary_h= eap_/resize_policy.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp= /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include= /ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp /usr/obj/zbuilder/buildd/h= ead/tmp/usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/ov_tree_map_/cond_dtor.hpp /zbuilder/buildd/head/gnu/lib/libstd= c++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/constr= uctors_destructor_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../..= /../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.h= pp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/inclu= de/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree= _map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp /zb= uilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext= /pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_m= ap_/node_iterators.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../con= trib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp /zbuilder/buildd/head/gn= u/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/ov_tree= _map_/split_join_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../= =2E./contrib/libstdc++/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp /us= r/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/ov_tree= _map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp /zbuilder/buildd/head= /gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash= _fn/direct_mod_range_hashing_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc+= +/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/linear_probe_= fn_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp /zbuilder/= buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/= detail/hash_fn/mod_based_range_hashing.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/probe_f= n_base.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp /zbuilder/bu= ildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/de= tail/hash_fn/ranged_hash_fn.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../= =2E./../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.= hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp /zbuilder/buildd/head/gnu/= lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/hash_fn/s= ample_ranged_hash_fn.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hp= p /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/includ= e/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp /usr/obj/zbuilder/build= d/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/hash_fn sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/eq_fn/eq_by_less.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/..= /../../contrib/libstdc++/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp /usr= /obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/detail/eq_fn sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp /zbuilder/buil= dd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/deta= il/rb_tree_map_/debug_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/.= =2E/../../contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_= imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++= /include/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp /zbuilder/buildd/he= ad/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rb= _tree_map_/info_fn_imps.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../.= =2E/contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.= hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/incl= ude/ext/pb_ds/detail/rb_tree_map_/node.hpp /zbuilder/buildd/head/gnu/lib/li= bstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/rb_tree_map_/rb= _tree_.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc= ++/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp /zbuilder/b= uildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/d= etail/rb_tree_map_/traits.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include= /c++/4.2/ext/pb_ds/detail/rb_tree_map_ sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/p= b_ds/detail/list_update_policy/counter_lu_metadata.hpp /zbuilder/buildd/hea= d/gnu/lib/libstdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/lis= t_update_policy/counter_lu_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/lib= stdc++/../../../contrib/libstdc++/include/ext/pb_ds/detail/list_update_poli= cy/mtf_lu_policy_imp.hpp /zbuilder/buildd/head/gnu/lib/libstdc++/../../../c= ontrib/libstdc++/include/ext/pb_ds/detail/list_update_policy/sample_update_= policy.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/c++/4.2/ext/pb_ds/= detail/list_update_policy =3D=3D=3D> gnu/lib/libsupc++ (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= upc++.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsupc++.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libsupc++.so.1 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libsupc++.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/gnu/lib/libsupc++/../../../contrib/libstdc++/libsupc++/exc= eption /zbuilder/buildd/head/gnu/lib/libsupc++/../../../contrib/libstdc++/l= ibsupc++/new /zbuilder/buildd/head/gnu/lib/libsupc++/../../../contrib/libst= dc++/libsupc++/typeinfo /zbuilder/buildd/head/gnu/lib/libsupc++/../../../co= ntrib/libstdc++/libsupc++/cxxabi.h /zbuilder/buildd/head/gnu/lib/libsupc++/= =2E./../../contrib/libstdc++/libsupc++/exception_defines.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/c++/4.2 =3D=3D=3D> kerberos5/lib (obj,depend,all,install) =3D=3D=3D> kerberos5/lib/libasn1 (obj) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (obj) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (obj) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (obj) =3D=3D=3D> kerberos5/lib/libhdb (obj) =3D=3D=3D> kerberos5/lib/libheimntlm (obj) =3D=3D=3D> kerberos5/lib/libhx509 (obj) =3D=3D=3D> kerberos5/lib/libkadm5clnt (obj) =3D=3D=3D> kerberos5/lib/libkadm5srv (obj) =3D=3D=3D> kerberos5/lib/libkafs5 (obj) =3D=3D=3D> kerberos5/lib/libkrb5 (obj) =3D=3D=3D> kerberos5/lib/libroken (obj) =3D=3D=3D> kerberos5/lib/libsl (obj) =3D=3D=3D> kerberos5/lib/libvers (obj) =3D=3D=3D> kerberos5/lib/libkdc (obj) =3D=3D=3D> kerberos5/lib/libwind (obj) =3D=3D=3D> kerberos5/lib/libheimsqlite (obj) =3D=3D=3D> kerberos5/lib/libheimbase (obj) =3D=3D=3D> kerberos5/lib/libheimipcc (obj) =3D=3D=3D> kerberos5/lib/libheimipcs (obj) =3D=3D=3D> kerberos5/lib/libasn1 (depend) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (depend) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (depend) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (depend) =3D=3D=3D> kerberos5/lib/libhdb (depend) =3D=3D=3D> kerberos5/lib/libheimntlm (depend) =3D=3D=3D> kerberos5/lib/libhx509 (depend) =3D=3D=3D> kerberos5/lib/libkadm5clnt (depend) =3D=3D=3D> kerberos5/lib/libkadm5srv (depend) =3D=3D=3D> kerberos5/lib/libkafs5 (depend) =3D=3D=3D> kerberos5/lib/libkrb5 (depend) =3D=3D=3D> kerberos5/lib/libroken (depend) =3D=3D=3D> kerberos5/lib/libsl (depend) =3D=3D=3D> kerberos5/lib/libvers (depend) =3D=3D=3D> kerberos5/lib/libkdc (depend) =3D=3D=3D> kerberos5/lib/libwind (depend) =3D=3D=3D> kerberos5/lib/libheimsqlite (depend) =3D=3D=3D> kerberos5/lib/libheimbase (depend) =3D=3D=3D> kerberos5/lib/libheimipcc (depend) =3D=3D=3D> kerberos5/lib/libheimipcs (depend) =3D=3D=3D> kerberos5/lib/libasn1 (all) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (all) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (all) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (all) =3D=3D=3D> kerberos5/lib/libhdb (all) =3D=3D=3D> kerberos5/lib/libheimntlm (all) =3D=3D=3D> kerberos5/lib/libhx509 (all) =3D=3D=3D> kerberos5/lib/libkadm5clnt (all) =3D=3D=3D> kerberos5/lib/libkadm5srv (all) =3D=3D=3D> kerberos5/lib/libkafs5 (all) =3D=3D=3D> kerberos5/lib/libkrb5 (all) =3D=3D=3D> kerberos5/lib/libroken (all) =3D=3D=3D> kerberos5/lib/libsl (all) =3D=3D=3D> kerberos5/lib/libvers (all) =3D=3D=3D> kerberos5/lib/libkdc (all) =3D=3D=3D> kerberos5/lib/libwind (all) =3D=3D=3D> kerberos5/lib/libheimsqlite (all) =3D=3D=3D> kerberos5/lib/libheimbase (all) =3D=3D=3D> kerberos5/lib/libheimipcc (all) =3D=3D=3D> kerberos5/lib/libheimipcs (all) =3D=3D=3D> kerberos5/lib/libasn1 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= sn1.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= basn1.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libasn1.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libasn1.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 asn1_= err.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../crypto/heimdal/l= ib/asn1/asn1-common.h /zbuilder/buildd/head/kerberos5/lib/libasn1/../../../= crypto/heimdal/lib/asn1/heim_asn1.h /zbuilder/buildd/head/kerberos5/lib/lib= asn1/../../../crypto/heimdal/lib/asn1/der.h /zbuilder/buildd/head/kerberos5= /lib/libasn1/../../../crypto/heimdal/lib/asn1/der-protos.h /zbuilder/buildd= /head/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/der-private.h = krb5_asn1.h pkinit_asn1.h cms_asn1.h rfc2459_asn1.h pkcs8_asn1.h pkcs9_asn1= =2Eh pkcs12_asn1.h digest_asn1.h kx509_asn1.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= ssapi_krb5.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgssapi_krb5.so.10 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgssapi_krb5.so.10 /usr/ob= j/zbuilder/buildd/head/tmp/usr/lib/libgssapi_krb5.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libgssapi_krb5/../../../crypto/heimdal/lib/g= ssapi/gssapi/gssapi_krb5.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/gs= sapi =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= ssapi_ntlm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgssapi_ntlm.so.10 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgssapi_ntlm.so.10 /usr/ob= j/zbuilder/buildd/head/tmp/usr/lib/libgssapi_ntlm.so =3D=3D=3D> kerberos5/lib/libgssapi_spnego (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= ssapi_spnego.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgssapi_spnego.so.10 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgssapi_spnego.so.10 /usr/= obj/zbuilder/buildd/head/tmp/usr/lib/libgssapi_spnego.so =3D=3D=3D> kerberos5/lib/libhdb (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= db.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bhdb.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libhdb.so.11 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libhdb.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/lib/hdb/hdb-p= rotos.h /zbuilder/buildd/head/kerberos5/lib/libhdb/../../../crypto/heimdal/= lib/hdb/hdb.h hdb_asn1.h hdb_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude =3D=3D=3D> kerberos5/lib/libheimntlm (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimntlm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimntlm.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimntlm.so.11 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libheimntlm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto/heimdal/lib/ntlm= /heimntlm.h /zbuilder/buildd/head/kerberos5/lib/libheimntlm/../../../crypto= /heimdal/lib/ntlm/heimntlm-protos.h ntlm_err.h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include =3D=3D=3D> kerberos5/lib/libhx509 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= x509.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bhx509.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libhx509.so.11 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libhx509.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/h= x509-private.h /zbuilder/buildd/head/kerberos5/lib/libhx509/../../../crypto= /heimdal/lib/hx509/hx509-protos.h /zbuilder/buildd/head/kerberos5/lib/libhx= 509/../../../crypto/heimdal/lib/hx509/hx509.h hx509_err.h ocsp_asn1.h pkcs1= 0_asn1.h crmf_asn1.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libkadm5clnt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= adm5clnt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkadm5clnt.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkadm5clnt.so.11 /usr/obj/= zbuilder/buildd/head/tmp/usr/lib/libkadm5clnt.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkadm5clnt/../../../crypto/heimdal/lib/kad= m5/admin.h /zbuilder/buildd/head/kerberos5/lib/libkadm5clnt/../../../crypto= /heimdal/lib/kadm5/kadm5-private.h /zbuilder/buildd/head/kerberos5/lib/libk= adm5clnt/../../../crypto/heimdal/lib/kadm5/kadm5-protos.h /zbuilder/buildd/= head/kerberos5/lib/libkadm5clnt/../../../crypto/heimdal/lib/kadm5/kadm5-pwc= heck.h kadm5_err.h /zbuilder/buildd/head/kerberos5/lib/libkadm5clnt/../../.= =2E/crypto/heimdal/lib/kadm5/private.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include/kadm5 =3D=3D=3D> kerberos5/lib/libkadm5srv (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= adm5srv.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkadm5srv.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkadm5srv.so.11 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libkadm5srv.so =3D=3D=3D> kerberos5/lib/libkafs5 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= afs5.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkafs5.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkafs5.so.11 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libkafs5.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkafs5/../../../crypto/heimdal/lib/kafs/ka= fs.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libkrb5 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= rb5.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkrb5.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkrb5.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libkrb5.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 heim_= err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/i= nclude/heim_threads.h k524_err.h /zbuilder/buildd/head/kerberos5/lib/libkrb= 5/../../../crypto/heimdal/lib/krb5/krb5-protos.h /zbuilder/buildd/head/kerb= eros5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5-private.h /zbuilder= /buildd/head/kerberos5/lib/libkrb5/../../include/krb5-types.h /zbuilder/bui= ldd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5.h krb5= _err.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/= lib/krb5/krb5_ccapi.h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/loc= ate_plugin.h /zbuilder/buildd/head/kerberos5/lib/libkrb5/../../../crypto/he= imdal/lib/krb5/send_to_kdc_plugin.h /zbuilder/buildd/head/kerberos5/lib/lib= krb5/../../../crypto/heimdal/lib/krb5/ccache_plugin.h /usr/obj/zbuilder/bui= ldd/head/tmp/usr/include/krb5 =3D=3D=3D> kerberos5/lib/libroken (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= oken.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= broken.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libroken.so.11 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libroken.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 roken= =2Eh /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/roken-common.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../= =2E./crypto/heimdal/lib/roken/base64.h /zbuilder/buildd/head/kerberos5/lib/= libroken/../../../crypto/heimdal/lib/roken/getarg.h /zbuilder/buildd/head/k= erberos5/lib/libroken/../../../crypto/heimdal/lib/roken/hex.h /zbuilder/bui= ldd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/parse_byt= es.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/l= ib/roken/parse_time.h /zbuilder/buildd/head/kerberos5/lib/libroken/../../..= /crypto/heimdal/lib/roken/parse_units.h /zbuilder/buildd/head/kerberos5/lib= /libroken/../../../crypto/heimdal/lib/roken/resolve.h /zbuilder/buildd/head= /kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/rtbl.h /zbuilder/= buildd/head/kerberos5/lib/libroken/../../../crypto/heimdal/lib/roken/xdbm.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libsl (install) =3D=3D=3D> kerberos5/lib/libvers (install) =3D=3D=3D> kerberos5/lib/libkdc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= dc.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkdc.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libkdc.so.11 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libkdc.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/kdc.h /zb= uilder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/kdc-pro= tos.h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libkdc/../../../crypto/heimdal/kdc/windc_plu= gin.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/krb5 =3D=3D=3D> kerberos5/lib/libwind (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libw= ind.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bwind.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libwind.so.11 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libwind.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libwind/../../../crypto/heimdal/lib/wind/win= d.h wind_err.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libheimsqlite (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimsqlite.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimsqlite.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimsqlite.so.11 /usr/obj= /zbuilder/buildd/head/tmp/usr/lib/libheimsqlite.so =3D=3D=3D> kerberos5/lib/libheimbase (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libh= eimbase.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bheimbase.so.11 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libheimbase.so.11 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libheimbase.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/kerberos5/lib/libheimbase/../../../crypto/heimdal/base/hei= mbase.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> kerberos5/lib/libheimipcc (install) =3D=3D=3D> kerberos5/lib/libheimipcs (install) =3D=3D=3D> lib (obj,depend,all,install) =3D=3D=3D> lib/csu/amd64 (obj) =3D=3D=3D> lib/libc (obj) =3D=3D=3D> lib/libbsm (obj) =3D=3D=3D> lib/libauditd (obj) =3D=3D=3D> lib/libcompiler_rt (obj) =3D=3D=3D> lib/libcrypt (obj) =3D=3D=3D> lib/libelf (obj) =3D=3D=3D> lib/libkvm (obj) =3D=3D=3D> lib/msun (obj) =3D=3D=3D> lib/libmd (obj) =3D=3D=3D> lib/ncurses (obj) =3D=3D=3D> lib/ncurses/ncurses (obj) =3D=3D=3D> lib/ncurses/form (obj) =3D=3D=3D> lib/ncurses/menu (obj) =3D=3D=3D> lib/ncurses/panel (obj) =3D=3D=3D> lib/ncurses/ncursesw (obj) =3D=3D=3D> lib/ncurses/formw (obj) =3D=3D=3D> lib/ncurses/menuw (obj) =3D=3D=3D> lib/ncurses/panelw (obj) =3D=3D=3D> lib/libnetgraph (obj) =3D=3D=3D> lib/libradius (obj) =3D=3D=3D> lib/librpcsvc (obj) =3D=3D=3D> lib/libsbuf (obj) =3D=3D=3D> lib/libtacplus (obj) =3D=3D=3D> lib/libutil (obj) =3D=3D=3D> lib/libypclnt (obj) =3D=3D=3D> lib/libcxxrt (obj) =3D=3D=3D> lib/libc++ (obj) =3D=3D=3D> lib/libcom_err (obj) =3D=3D=3D> lib/libcom_err/doc (obj) =3D=3D=3D> lib/libalias (obj) =3D=3D=3D> lib/libalias/libalias (obj) =3D=3D=3D> lib/libalias/modules (obj) =3D=3D=3D> lib/libalias/modules/cuseeme (obj) =3D=3D=3D> lib/libalias/modules/dummy (obj) =3D=3D=3D> lib/libalias/modules/ftp (obj) =3D=3D=3D> lib/libalias/modules/irc (obj) =3D=3D=3D> lib/libalias/modules/nbt (obj) =3D=3D=3D> lib/libalias/modules/pptp (obj) =3D=3D=3D> lib/libalias/modules/skinny (obj) =3D=3D=3D> lib/libalias/modules/smedia (obj) =3D=3D=3D> lib/libarchive (obj) =3D=3D=3D> lib/libbegemot (obj) =3D=3D=3D> lib/libblocksruntime (obj) =3D=3D=3D> lib/libbluetooth (obj) =3D=3D=3D> lib/libbsnmp (obj) =3D=3D=3D> lib/libbsnmp/libbsnmp (obj) =3D=3D=3D> lib/libbz2 (obj) =3D=3D=3D> lib/libcalendar (obj) =3D=3D=3D> lib/libcam (obj) =3D=3D=3D> lib/libcompat (obj) =3D=3D=3D> lib/libdevinfo (obj) =3D=3D=3D> lib/libdevstat (obj) =3D=3D=3D> lib/libdwarf (obj) =3D=3D=3D> lib/libedit (obj) =3D=3D=3D> lib/libedit/edit/readline (obj) =3D=3D=3D> lib/libexpat (obj) =3D=3D=3D> lib/libfetch (obj) =3D=3D=3D> lib/libgeom (obj) =3D=3D=3D> lib/libgpib (obj) =3D=3D=3D> lib/libgssapi (obj) =3D=3D=3D> lib/librpcsec_gss (obj) =3D=3D=3D> lib/libipsec (obj) =3D=3D=3D> lib/libipx (obj) =3D=3D=3D> lib/libjail (obj) =3D=3D=3D> lib/libkiconv (obj) =3D=3D=3D> lib/libldns (obj) =3D=3D=3D> lib/liblzma (obj) =3D=3D=3D> lib/libmagic (obj) =3D=3D=3D> lib/libmandoc (obj) =3D=3D=3D> lib/libmemstat (obj) =3D=3D=3D> lib/libmilter (obj) =3D=3D=3D> lib/libmp (obj) =3D=3D=3D> lib/libnetbsd (obj) =3D=3D=3D> lib/libngatm (obj) =3D=3D=3D> lib/libopie (obj) =3D=3D=3D> lib/libpam (obj) =3D=3D=3D> lib/libpam/modules (obj) =3D=3D=3D> lib/libpam/modules/pam_chroot (obj) =3D=3D=3D> lib/libpam/modules/pam_deny (obj) =3D=3D=3D> lib/libpam/modules/pam_echo (obj) =3D=3D=3D> lib/libpam/modules/pam_exec (obj) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (obj) =3D=3D=3D> lib/libpam/modules/pam_group (obj) =3D=3D=3D> lib/libpam/modules/pam_guest (obj) =3D=3D=3D> lib/libpam/modules/pam_krb5 (obj) =3D=3D=3D> lib/libpam/modules/pam_ksu (obj) =3D=3D=3D> lib/libpam/modules/pam_lastlog (obj) =3D=3D=3D> lib/libpam/modules/pam_login_access (obj) =3D=3D=3D> lib/libpam/modules/pam_nologin (obj) =3D=3D=3D> lib/libpam/modules/pam_opie (obj) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (obj) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (obj) =3D=3D=3D> lib/libpam/modules/pam_permit (obj) =3D=3D=3D> lib/libpam/modules/pam_radius (obj) =3D=3D=3D> lib/libpam/modules/pam_rhosts (obj) =3D=3D=3D> lib/libpam/modules/pam_rootok (obj) =3D=3D=3D> lib/libpam/modules/pam_securetty (obj) =3D=3D=3D> lib/libpam/modules/pam_self (obj) =3D=3D=3D> lib/libpam/modules/pam_ssh (obj) =3D=3D=3D> lib/libpam/modules/pam_tacplus (obj) =3D=3D=3D> lib/libpam/modules/pam_unix (obj) =3D=3D=3D> lib/libpam/libpam (obj) =3D=3D=3D> lib/libpcap (obj) =3D=3D=3D> lib/libpmc (obj) =3D=3D=3D> lib/libproc (obj) =3D=3D=3D> lib/libprocstat (obj) =3D=3D=3D> lib/libprocstat/zfs (obj) =3D=3D=3D> lib/librt (obj) =3D=3D=3D> lib/librtld_db (obj) =3D=3D=3D> lib/libsdp (obj) =3D=3D=3D> lib/libsm (obj) =3D=3D=3D> lib/libsmdb (obj) =3D=3D=3D> lib/libsmutil (obj) =3D=3D=3D> lib/libstand (obj) =3D=3D=3D> lib/libstdbuf (obj) =3D=3D=3D> lib/libstdthreads (obj) =3D=3D=3D> lib/libtelnet (obj) =3D=3D=3D> lib/libthr (obj) =3D=3D=3D> lib/libthread_db (obj) =3D=3D=3D> lib/libufs (obj) =3D=3D=3D> lib/libugidfw (obj) =3D=3D=3D> lib/libulog (obj) =3D=3D=3D> lib/libusbhid (obj) =3D=3D=3D> lib/libusb (obj) =3D=3D=3D> lib/libvgl (obj) =3D=3D=3D> lib/libvmmapi (obj) =3D=3D=3D> lib/libwrap (obj) =3D=3D=3D> lib/liby (obj) =3D=3D=3D> lib/libyaml (obj) =3D=3D=3D> lib/libz (obj) =3D=3D=3D> lib/atf (obj) =3D=3D=3D> lib/atf/libatf-c (obj) =3D=3D=3D> lib/atf/libatf-c++ (obj) =3D=3D=3D> lib/bind (obj) =3D=3D=3D> lib/bind/isc (obj) =3D=3D=3D> lib/bind/isccc (obj) =3D=3D=3D> lib/bind/dns (obj) =3D=3D=3D> lib/bind/isccfg (obj) =3D=3D=3D> lib/bind/bind9 (obj) =3D=3D=3D> lib/bind/lwres (obj) =3D=3D=3D> lib/clang (obj) =3D=3D=3D> lib/clang/libclanganalysis (obj) =3D=3D=3D> lib/clang/libclangarcmigrate (obj) =3D=3D=3D> lib/clang/libclangast (obj) =3D=3D=3D> lib/clang/libclangbasic (obj) =3D=3D=3D> lib/clang/libclangcodegen (obj) =3D=3D=3D> lib/clang/libclangdriver (obj) =3D=3D=3D> lib/clang/libclangedit (obj) =3D=3D=3D> lib/clang/libclangfrontend (obj) =3D=3D=3D> lib/clang/libclangfrontendtool (obj) =3D=3D=3D> lib/clang/libclanglex (obj) =3D=3D=3D> lib/clang/libclangparse (obj) =3D=3D=3D> lib/clang/libclangrewritecore (obj) =3D=3D=3D> lib/clang/libclangrewritefrontend (obj) =3D=3D=3D> lib/clang/libclangsema (obj) =3D=3D=3D> lib/clang/libclangserialization (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (obj) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (obj) =3D=3D=3D> lib/clang/libllvmanalysis (obj) =3D=3D=3D> lib/clang/libllvmarchive (obj) =3D=3D=3D> lib/clang/libllvmasmparser (obj) =3D=3D=3D> lib/clang/libllvmasmprinter (obj) =3D=3D=3D> lib/clang/libllvmbitreader (obj) =3D=3D=3D> lib/clang/libllvmbitwriter (obj) =3D=3D=3D> lib/clang/libllvmcodegen (obj) =3D=3D=3D> lib/clang/libllvmcore (obj) =3D=3D=3D> lib/clang/libllvminstcombine (obj) =3D=3D=3D> lib/clang/libllvminstrumentation (obj) =3D=3D=3D> lib/clang/libllvmipa (obj) =3D=3D=3D> lib/clang/libllvmipo (obj) =3D=3D=3D> lib/clang/libllvmirreader (obj) =3D=3D=3D> lib/clang/libllvmlinker (obj) =3D=3D=3D> lib/clang/libllvmmc (obj) =3D=3D=3D> lib/clang/libllvmmcparser (obj) =3D=3D=3D> lib/clang/libllvmobjcarcopts (obj) =3D=3D=3D> lib/clang/libllvmobject (obj) =3D=3D=3D> lib/clang/libllvmscalaropts (obj) =3D=3D=3D> lib/clang/libllvmselectiondag (obj) =3D=3D=3D> lib/clang/libllvmsupport (obj) =3D=3D=3D> lib/clang/libllvmtablegen (obj) =3D=3D=3D> lib/clang/libllvmtarget (obj) =3D=3D=3D> lib/clang/libllvmtransformutils (obj) =3D=3D=3D> lib/clang/libllvmvectorize (obj) =3D=3D=3D> lib/clang/libllvmarmasmparser (obj) =3D=3D=3D> lib/clang/libllvmarmcodegen (obj) =3D=3D=3D> lib/clang/libllvmarmdesc (obj) =3D=3D=3D> lib/clang/libllvmarmdisassembler (obj) =3D=3D=3D> lib/clang/libllvmarminfo (obj) =3D=3D=3D> lib/clang/libllvmarminstprinter (obj) =3D=3D=3D> lib/clang/libllvmmipsasmparser (obj) =3D=3D=3D> lib/clang/libllvmmipscodegen (obj) =3D=3D=3D> lib/clang/libllvmmipsdesc (obj) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (obj) =3D=3D=3D> lib/clang/libllvmmipsinfo (obj) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (obj) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (obj) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (obj) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (obj) =3D=3D=3D> lib/clang/libllvmx86asmparser (obj) =3D=3D=3D> lib/clang/libllvmx86codegen (obj) =3D=3D=3D> lib/clang/libllvmx86desc (obj) =3D=3D=3D> lib/clang/libllvmx86disassembler (obj) =3D=3D=3D> lib/clang/libllvmx86info (obj) =3D=3D=3D> lib/clang/libllvmx86instprinter (obj) =3D=3D=3D> lib/clang/libllvmx86utils (obj) =3D=3D=3D> lib/clang/include (obj) =3D=3D=3D> lib/csu/amd64 (depend) =3D=3D=3D> lib/libc (depend) =3D=3D=3D> lib/libbsm (depend) =3D=3D=3D> lib/libauditd (depend) =3D=3D=3D> lib/libcompiler_rt (depend) =3D=3D=3D> lib/libcrypt (depend) =3D=3D=3D> lib/libelf (depend) =3D=3D=3D> lib/libkvm (depend) =3D=3D=3D> lib/msun (depend) =3D=3D=3D> lib/libmd (depend) =3D=3D=3D> lib/ncurses (depend) =3D=3D=3D> lib/ncurses/ncurses (depend) =3D=3D=3D> lib/ncurses/form (depend) =3D=3D=3D> lib/ncurses/menu (depend) =3D=3D=3D> lib/ncurses/panel (depend) =3D=3D=3D> lib/ncurses/ncursesw (depend) =3D=3D=3D> lib/ncurses/formw (depend) =3D=3D=3D> lib/ncurses/menuw (depend) =3D=3D=3D> lib/ncurses/panelw (depend) =3D=3D=3D> lib/libnetgraph (depend) =3D=3D=3D> lib/libradius (depend) =3D=3D=3D> lib/librpcsvc (depend) =3D=3D=3D> lib/libsbuf (depend) =3D=3D=3D> lib/libtacplus (depend) =3D=3D=3D> lib/libutil (depend) =3D=3D=3D> lib/libypclnt (depend) =3D=3D=3D> lib/libcxxrt (depend) =3D=3D=3D> lib/libc++ (depend) =3D=3D=3D> lib/libcom_err (depend) =3D=3D=3D> lib/libcom_err/doc (depend) =3D=3D=3D> lib/libalias (depend) =3D=3D=3D> lib/libalias/libalias (depend) =3D=3D=3D> lib/libalias/modules (depend) =3D=3D=3D> lib/libalias/modules/cuseeme (depend) =3D=3D=3D> lib/libalias/modules/dummy (depend) =3D=3D=3D> lib/libalias/modules/ftp (depend) =3D=3D=3D> lib/libalias/modules/irc (depend) =3D=3D=3D> lib/libalias/modules/nbt (depend) =3D=3D=3D> lib/libalias/modules/pptp (depend) =3D=3D=3D> lib/libalias/modules/skinny (depend) =3D=3D=3D> lib/libalias/modules/smedia (depend) =3D=3D=3D> lib/libarchive (depend) =3D=3D=3D> lib/libbegemot (depend) =3D=3D=3D> lib/libblocksruntime (depend) =3D=3D=3D> lib/libbluetooth (depend) =3D=3D=3D> lib/libbsnmp (depend) =3D=3D=3D> lib/libbsnmp/libbsnmp (depend) =3D=3D=3D> lib/libbz2 (depend) =3D=3D=3D> lib/libcalendar (depend) =3D=3D=3D> lib/libcam (depend) =3D=3D=3D> lib/libcompat (depend) =3D=3D=3D> lib/libdevinfo (depend) =3D=3D=3D> lib/libdevstat (depend) =3D=3D=3D> lib/libdwarf (depend) =3D=3D=3D> lib/libedit (depend) =3D=3D=3D> lib/libedit/edit/readline (depend) =3D=3D=3D> lib/libexpat (depend) =3D=3D=3D> lib/libfetch (depend) =3D=3D=3D> lib/libgeom (depend) =3D=3D=3D> lib/libgpib (depend) =3D=3D=3D> lib/libgssapi (depend) =3D=3D=3D> lib/librpcsec_gss (depend) =3D=3D=3D> lib/libipsec (depend) =3D=3D=3D> lib/libipx (depend) =3D=3D=3D> lib/libjail (depend) =3D=3D=3D> lib/libkiconv (depend) =3D=3D=3D> lib/libldns (depend) =3D=3D=3D> lib/liblzma (depend) =3D=3D=3D> lib/libmagic (depend) =3D=3D=3D> lib/libmandoc (depend) =3D=3D=3D> lib/libmemstat (depend) =3D=3D=3D> lib/libmilter (depend) =3D=3D=3D> lib/libmp (depend) =3D=3D=3D> lib/libnetbsd (depend) =3D=3D=3D> lib/libngatm (depend) =3D=3D=3D> lib/libopie (depend) =3D=3D=3D> lib/libpam (depend) =3D=3D=3D> lib/libpam/modules (depend) =3D=3D=3D> lib/libpam/modules/pam_chroot (depend) =3D=3D=3D> lib/libpam/modules/pam_deny (depend) =3D=3D=3D> lib/libpam/modules/pam_echo (depend) =3D=3D=3D> lib/libpam/modules/pam_exec (depend) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (depend) =3D=3D=3D> lib/libpam/modules/pam_group (depend) =3D=3D=3D> lib/libpam/modules/pam_guest (depend) =3D=3D=3D> lib/libpam/modules/pam_krb5 (depend) =3D=3D=3D> lib/libpam/modules/pam_ksu (depend) =3D=3D=3D> lib/libpam/modules/pam_lastlog (depend) =3D=3D=3D> lib/libpam/modules/pam_login_access (depend) =3D=3D=3D> lib/libpam/modules/pam_nologin (depend) =3D=3D=3D> lib/libpam/modules/pam_opie (depend) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (depend) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (depend) =3D=3D=3D> lib/libpam/modules/pam_permit (depend) =3D=3D=3D> lib/libpam/modules/pam_radius (depend) =3D=3D=3D> lib/libpam/modules/pam_rhosts (depend) =3D=3D=3D> lib/libpam/modules/pam_rootok (depend) =3D=3D=3D> lib/libpam/modules/pam_securetty (depend) =3D=3D=3D> lib/libpam/modules/pam_self (depend) =3D=3D=3D> lib/libpam/modules/pam_ssh (depend) =3D=3D=3D> lib/libpam/modules/pam_tacplus (depend) =3D=3D=3D> lib/libpam/modules/pam_unix (depend) =3D=3D=3D> lib/libpam/libpam (depend) =3D=3D=3D> lib/libpcap (depend) =3D=3D=3D> lib/libpmc (depend) =3D=3D=3D> lib/libproc (depend) =3D=3D=3D> lib/libprocstat (depend) =3D=3D=3D> lib/libprocstat/zfs (depend) =3D=3D=3D> lib/librt (depend) =3D=3D=3D> lib/librtld_db (depend) =3D=3D=3D> lib/libsdp (depend) =3D=3D=3D> lib/libsm (depend) =3D=3D=3D> lib/libsmdb (depend) =3D=3D=3D> lib/libsmutil (depend) =3D=3D=3D> lib/libstand (depend) =3D=3D=3D> lib/libstdbuf (depend) =3D=3D=3D> lib/libstdthreads (depend) =3D=3D=3D> lib/libtelnet (depend) =3D=3D=3D> lib/libthr (depend) =3D=3D=3D> lib/libthread_db (depend) =3D=3D=3D> lib/libufs (depend) =3D=3D=3D> lib/libugidfw (depend) =3D=3D=3D> lib/libulog (depend) =3D=3D=3D> lib/libusbhid (depend) =3D=3D=3D> lib/libusb (depend) =3D=3D=3D> lib/libvgl (depend) =3D=3D=3D> lib/libvmmapi (depend) =3D=3D=3D> lib/libwrap (depend) =3D=3D=3D> lib/liby (depend) =3D=3D=3D> lib/libyaml (depend) =3D=3D=3D> lib/libz (depend) =3D=3D=3D> lib/atf (depend) =3D=3D=3D> lib/atf/libatf-c (depend) =3D=3D=3D> lib/atf/libatf-c++ (depend) =3D=3D=3D> lib/bind (depend) =3D=3D=3D> lib/bind/isc (depend) =3D=3D=3D> lib/bind/isccc (depend) =3D=3D=3D> lib/bind/dns (depend) =3D=3D=3D> lib/bind/isccfg (depend) =3D=3D=3D> lib/bind/bind9 (depend) =3D=3D=3D> lib/bind/lwres (depend) =3D=3D=3D> lib/clang (depend) =3D=3D=3D> lib/clang/libclanganalysis (depend) =3D=3D=3D> lib/clang/libclangarcmigrate (depend) =3D=3D=3D> lib/clang/libclangast (depend) =3D=3D=3D> lib/clang/libclangbasic (depend) =3D=3D=3D> lib/clang/libclangcodegen (depend) =3D=3D=3D> lib/clang/libclangdriver (depend) =3D=3D=3D> lib/clang/libclangedit (depend) =3D=3D=3D> lib/clang/libclangfrontend (depend) =3D=3D=3D> lib/clang/libclangfrontendtool (depend) =3D=3D=3D> lib/clang/libclanglex (depend) =3D=3D=3D> lib/clang/libclangparse (depend) =3D=3D=3D> lib/clang/libclangrewritecore (depend) =3D=3D=3D> lib/clang/libclangrewritefrontend (depend) =3D=3D=3D> lib/clang/libclangsema (depend) =3D=3D=3D> lib/clang/libclangserialization (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (depend) =3D=3D=3D> lib/clang/libllvmanalysis (depend) =3D=3D=3D> lib/clang/libllvmarchive (depend) =3D=3D=3D> lib/clang/libllvmasmparser (depend) =3D=3D=3D> lib/clang/libllvmasmprinter (depend) =3D=3D=3D> lib/clang/libllvmbitreader (depend) =3D=3D=3D> lib/clang/libllvmbitwriter (depend) =3D=3D=3D> lib/clang/libllvmcodegen (depend) =3D=3D=3D> lib/clang/libllvmcore (depend) =3D=3D=3D> lib/clang/libllvminstcombine (depend) =3D=3D=3D> lib/clang/libllvminstrumentation (depend) =3D=3D=3D> lib/clang/libllvmipa (depend) =3D=3D=3D> lib/clang/libllvmipo (depend) =3D=3D=3D> lib/clang/libllvmirreader (depend) =3D=3D=3D> lib/clang/libllvmlinker (depend) =3D=3D=3D> lib/clang/libllvmmc (depend) =3D=3D=3D> lib/clang/libllvmmcparser (depend) =3D=3D=3D> lib/clang/libllvmobjcarcopts (depend) =3D=3D=3D> lib/clang/libllvmobject (depend) =3D=3D=3D> lib/clang/libllvmscalaropts (depend) =3D=3D=3D> lib/clang/libllvmselectiondag (depend) =3D=3D=3D> lib/clang/libllvmsupport (depend) =3D=3D=3D> lib/clang/libllvmtablegen (depend) =3D=3D=3D> lib/clang/libllvmtarget (depend) =3D=3D=3D> lib/clang/libllvmtransformutils (depend) =3D=3D=3D> lib/clang/libllvmvectorize (depend) =3D=3D=3D> lib/clang/libllvmarmasmparser (depend) =3D=3D=3D> lib/clang/libllvmarmcodegen (depend) =3D=3D=3D> lib/clang/libllvmarmdesc (depend) =3D=3D=3D> lib/clang/libllvmarmdisassembler (depend) =3D=3D=3D> lib/clang/libllvmarminfo (depend) =3D=3D=3D> lib/clang/libllvmarminstprinter (depend) =3D=3D=3D> lib/clang/libllvmmipsasmparser (depend) =3D=3D=3D> lib/clang/libllvmmipscodegen (depend) =3D=3D=3D> lib/clang/libllvmmipsdesc (depend) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (depend) =3D=3D=3D> lib/clang/libllvmmipsinfo (depend) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (depend) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (depend) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (depend) =3D=3D=3D> lib/clang/libllvmx86asmparser (depend) =3D=3D=3D> lib/clang/libllvmx86codegen (depend) =3D=3D=3D> lib/clang/libllvmx86desc (depend) =3D=3D=3D> lib/clang/libllvmx86disassembler (depend) =3D=3D=3D> lib/clang/libllvmx86info (depend) =3D=3D=3D> lib/clang/libllvmx86instprinter (depend) =3D=3D=3D> lib/clang/libllvmx86utils (depend) =3D=3D=3D> lib/clang/include (depend) =3D=3D=3D> lib/csu/amd64 (all) =3D=3D=3D> lib/libc (all) =3D=3D=3D> lib/libbsm (all) =3D=3D=3D> lib/libauditd (all) =3D=3D=3D> lib/libcompiler_rt (all) =3D=3D=3D> lib/libcrypt (all) =3D=3D=3D> lib/libelf (all) =3D=3D=3D> lib/libkvm (all) =3D=3D=3D> lib/msun (all) =3D=3D=3D> lib/libmd (all) =3D=3D=3D> lib/ncurses (all) =3D=3D=3D> lib/ncurses/ncurses (all) =3D=3D=3D> lib/ncurses/form (all) =3D=3D=3D> lib/ncurses/menu (all) =3D=3D=3D> lib/ncurses/panel (all) =3D=3D=3D> lib/ncurses/ncursesw (all) =3D=3D=3D> lib/ncurses/formw (all) =3D=3D=3D> lib/ncurses/menuw (all) =3D=3D=3D> lib/ncurses/panelw (all) =3D=3D=3D> lib/libnetgraph (all) =3D=3D=3D> lib/libradius (all) =3D=3D=3D> lib/librpcsvc (all) =3D=3D=3D> lib/libsbuf (all) =3D=3D=3D> lib/libtacplus (all) =3D=3D=3D> lib/libutil (all) =3D=3D=3D> lib/libypclnt (all) =3D=3D=3D> lib/libcxxrt (all) =3D=3D=3D> lib/libc++ (all) =3D=3D=3D> lib/libcom_err (all) =3D=3D=3D> lib/libcom_err/doc (all) =3D=3D=3D> lib/libalias (all) =3D=3D=3D> lib/libalias/libalias (all) =3D=3D=3D> lib/libalias/modules (all) =3D=3D=3D> lib/libalias/modules/cuseeme (all) =3D=3D=3D> lib/libalias/modules/dummy (all) =3D=3D=3D> lib/libalias/modules/ftp (all) =3D=3D=3D> lib/libalias/modules/irc (all) =3D=3D=3D> lib/libalias/modules/nbt (all) =3D=3D=3D> lib/libalias/modules/pptp (all) =3D=3D=3D> lib/libalias/modules/skinny (all) =3D=3D=3D> lib/libalias/modules/smedia (all) =3D=3D=3D> lib/libarchive (all) =3D=3D=3D> lib/libbegemot (all) =3D=3D=3D> lib/libblocksruntime (all) =3D=3D=3D> lib/libbluetooth (all) =3D=3D=3D> lib/libbsnmp (all) =3D=3D=3D> lib/libbsnmp/libbsnmp (all) =3D=3D=3D> lib/libbz2 (all) =3D=3D=3D> lib/libcalendar (all) =3D=3D=3D> lib/libcam (all) =3D=3D=3D> lib/libcompat (all) =3D=3D=3D> lib/libdevinfo (all) =3D=3D=3D> lib/libdevstat (all) =3D=3D=3D> lib/libdwarf (all) =3D=3D=3D> lib/libedit (all) =3D=3D=3D> lib/libedit/edit/readline (all) =3D=3D=3D> lib/libexpat (all) =3D=3D=3D> lib/libfetch (all) =3D=3D=3D> lib/libgeom (all) =3D=3D=3D> lib/libgpib (all) =3D=3D=3D> lib/libgssapi (all) =3D=3D=3D> lib/librpcsec_gss (all) =3D=3D=3D> lib/libipsec (all) =3D=3D=3D> lib/libipx (all) =3D=3D=3D> lib/libjail (all) =3D=3D=3D> lib/libkiconv (all) =3D=3D=3D> lib/libldns (all) =3D=3D=3D> lib/liblzma (all) =3D=3D=3D> lib/libmagic (all) =3D=3D=3D> lib/libmandoc (all) =3D=3D=3D> lib/libmemstat (all) =3D=3D=3D> lib/libmilter (all) =3D=3D=3D> lib/libmp (all) =3D=3D=3D> lib/libnetbsd (all) =3D=3D=3D> lib/libngatm (all) =3D=3D=3D> lib/libopie (all) =3D=3D=3D> lib/libpam (all) =3D=3D=3D> lib/libpam/modules (all) =3D=3D=3D> lib/libpam/modules/pam_chroot (all) =3D=3D=3D> lib/libpam/modules/pam_deny (all) =3D=3D=3D> lib/libpam/modules/pam_echo (all) =3D=3D=3D> lib/libpam/modules/pam_exec (all) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (all) =3D=3D=3D> lib/libpam/modules/pam_group (all) =3D=3D=3D> lib/libpam/modules/pam_guest (all) =3D=3D=3D> lib/libpam/modules/pam_krb5 (all) =3D=3D=3D> lib/libpam/modules/pam_ksu (all) =3D=3D=3D> lib/libpam/modules/pam_lastlog (all) =3D=3D=3D> lib/libpam/modules/pam_login_access (all) =3D=3D=3D> lib/libpam/modules/pam_nologin (all) =3D=3D=3D> lib/libpam/modules/pam_opie (all) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (all) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (all) =3D=3D=3D> lib/libpam/modules/pam_permit (all) =3D=3D=3D> lib/libpam/modules/pam_radius (all) =3D=3D=3D> lib/libpam/modules/pam_rhosts (all) =3D=3D=3D> lib/libpam/modules/pam_rootok (all) =3D=3D=3D> lib/libpam/modules/pam_securetty (all) =3D=3D=3D> lib/libpam/modules/pam_self (all) =3D=3D=3D> lib/libpam/modules/pam_ssh (all) =3D=3D=3D> lib/libpam/modules/pam_tacplus (all) =3D=3D=3D> lib/libpam/modules/pam_unix (all) =3D=3D=3D> lib/libpam/libpam (all) =3D=3D=3D> lib/libpcap (all) =3D=3D=3D> lib/libpmc (all) =3D=3D=3D> lib/libproc (all) =3D=3D=3D> lib/libprocstat (all) cc -O2 -pipe -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cd= dl/compat/opensolaris -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../= cddl/compat/opensolaris/include -I/zbuilder/buildd/head/lib/libprocstat/zfs= /../../../cddl/compat/opensolaris/lib/libumem -I/zbuilder/buildd/head/lib/l= ibprocstat/zfs/../../../cddl/contrib/opensolaris/lib/libzpool/common -I/zbu= ilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/contrib/opensolaris= /uts/common/fs/zfs -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys= /cddl/contrib/opensolaris/uts/common -I/zbuilder/buildd/head/lib/libprocsta= t/zfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys -I/zbuilder/buil= dd/head/lib/libprocstat/zfs/../../../cddl/contrib/opensolaris/head -I/zbuil= der/buildd/head/lib/libprocstat/zfs/.. -DNEED_SOLARIS_BOOLEAN -std=3Dgnu99 = -Qunused-arguments -fstack-protector -Wsystem-headers -Werror -Wno-pointer-= sign -Wno-empty-body -Wno-string-plus-int -Wno-tautological-compare -Wno-un= used-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion -= Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses -c= /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c -o zfs.o In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:34: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/proc.h:521:19: =1B[= 0m=1B[0;1;31merror: =1B[0m=1B[1mfield has incomplete type 'struct itimerval'=1B[0m struct itimerval p_realtimer; /* (c) Alarm timer. */ =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/proc.h:521:9:= =1B[0m=1B[0;1;30mnote: =1B[0mforward declaration of 'struct itimerval'=1B[0m struct itimerval p_realtimer; /* (c) Alarm timer. */ =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:168:5: =1B[= 0m=1B[0;1;31merror: =1B[0m=1B[1mdeclaration of built-in function 'setjmp' requires inclusion of the header [-Werror,-Wbuiltin-requires-header]=1B[0m int setjmp(struct _jmp_buf *) __returns_twice; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:169:6= : =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mdeclaration of built-in function 'longjmp' requires inclusion of the header [-Werror,-Wbuiltin-requires-header]=1B[0m void longjmp(struct _jmp_buf *, int) __dead2; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:197:6= : =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mincompatible redeclaration of library function 'log' [-Werror,-Wincompatible-libra= ry-redeclaration]=1B[0m void log(int, const char *, ...) __printflike(2, 3); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:197:6= : =1B[0m=1B[0;1;30mnote: =1B[0m'log' is a builtin with type 'double (double)'=1B[0m =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:261:30: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void hardclock(int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:268:30: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void profclock(int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:269:43: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void profclock_cnt(int cnt, int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/sys= tm.h:310: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:115:7: = =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mincompatible redeclaration of library function 'strdup' [-Werror,-Wincompatible-li= brary-redeclaration]=1B[0m char *strdup(const char *__restrict, struct malloc_type *); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:115= :7: =1B[0m=1B[0;1;30mnote: =1B[0m'strdup' is a builtin with type 'char *(const char *)'=1B[0m In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:333:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splbio(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:334:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splcam(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:335:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splclock(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:336:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splhigh(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:337:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splimp(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:338:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splnet(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:339:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t spltty(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:340:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splvm(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:341:28: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline void splx(intrmask_t ipl __unused) { return; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: =1B[1m/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/compat/op= ensolaris/sys/proc.h:57:16: =1B[0m=1B[0;1;31merror: =1B[0m=1B[1m redefinition of typedef 'pri_t' is a C11 feature [-Werror,-Wtypedef-r= edefinition]=1B[0m typedef short pri_t; =1B[0;1;32m ^ =1B[0m=1B[1m/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/com= pat/opensolaris/sys/types.h:88:16: =1B[0m=1B[0;1;30mnote: =1B[0m previous definition is here=1B[0m typedef short pri_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:39: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../cd= dl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:47: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../cd= dl/compat/opensolaris/include/stdlib.h:30: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/stdlib.h:83:15: =1B[0m= =1B[0;1;31merror: =1B[0m=1B[1mattribute declaration must precede definition [-Werror,-Wignored-attributes]=1B[0m int abs(int) __pure2; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/cdefs.h:227:3= 3: =1B[0m=1B[0;1;30mnote: =1B[0mexpanded from macro '__pure2'=1B[0m #define __pure2 __attribute__((__const__)) =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:69:= 21: =1B[0m=1B[0;1;30mnote: =1B[0mprevious definition is here=1B[0m static __inline int abs(int a) { return (a < 0 ? -a : a); } =1B[0;1;32m ^ =1B[0m=1B[0;1;31mfatal error: =1B[0m=1B[1mtoo many errors emitted, stopping= now [-ferror-limit=3D]=1B[0m 20 errors generated. *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib/libprocstat/zfs *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib/libprocstat *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib =3D=3D=3D> lib/csu/amd64 (install) sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 crt1.o c= rti.o crtn.o Scrt1.o gcrt1.o /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> lib/libc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libc.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libc.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libc.so sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 libc_pi= c.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 be_BY.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/be_BY.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ca_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ca_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 de_DE.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/de_DE.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 el_GR.I= SO8859-7.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/el_GR.ISO8859= -7/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 es_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/es_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 fi_FI.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/fi_FI.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 fr_FR.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/fr_FR.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 gl_ES.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/gl_ES.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 hu_HU.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/hu_HU.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 it_IT.I= SO8859-15.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/it_IT.ISO885= 9-15/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ja_JP.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ja_JP.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ja_JP.e= ucJP.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ja_JP.eucJP/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ko_KR.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ko_KR.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ko_KR.e= ucKR.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ko_KR.eucKR/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 mn_MN.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/mn_MN.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 nl_NL.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/nl_NL.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 no_NO.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/no_NO.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 pl_PL.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/pl_PL.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 pt_BR.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/pt_BR.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 ru_RU.K= OI8-R.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/ru_RU.KOI8-R/lib= c.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 sk_SK.I= SO8859-2.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/sk_SK.ISO8859= -2/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 sv_SE.I= SO8859-1.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/sv_SE.ISO8859= -1/libc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 uk_UA.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/uk_UA.UTF-8/libc.= cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.G= B18030.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.GB18030/l= ibc.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.G= B2312.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.GB2312/lib= c.cat sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 zh_CN.U= TF-8.cat /usr/obj/zbuilder/buildd/head/tmp/usr/share/nls/zh_CN.UTF-8/libc.= cat =3D=3D=3D> lib/libbsm (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= sm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbsm.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbsm.so.3 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libbsm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbsm/../../contrib/openbsm/bsm/audit_uevents.h /zbui= lder/buildd/head/lib/libbsm/../../contrib/openbsm/bsm/libbsm.h /usr/obj/zbu= ilder/buildd/head/tmp/usr/include/bsm =3D=3D=3D> lib/libauditd (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= uditd.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bauditd.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libauditd.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libauditd.so =3D=3D=3D> lib/libcompiler_rt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= ompiler_rt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgcc.a -> libcompiler_rt.a =3D=3D=3D> lib/libcrypt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= rypt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libcrypt.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcrypt.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcrypt= =2Eso =3D=3D=3D> lib/libelf (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libe= lf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= belf.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libelf.so.1 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libelf.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libelf/libelf.h /zbuilder/buildd/head/lib/libelf/gelf.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libkvm (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= vm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkvm.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libkvm.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libkvm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libkvm/kvm.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/msun (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bm.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libm.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/msun/x86/fenv.h /zbuilder/buildd/head/lib/msun/src/mat= h.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libmd (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= d.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmd.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libmd.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libmd.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmd/md4.h /zbuilder/buildd/head/lib/libmd/md5.h /zbu= ilder/buildd/head/lib/libmd/ripemd.h /zbuilder/buildd/head/lib/libmd/sha.h = /zbuilder/buildd/head/lib/libmd/sha256.h /zbuilder/buildd/head/lib/libmd/sh= a512.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses (install) =3D=3D=3D> lib/ncurses/ncurses (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= curses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bncurses.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libncurses.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libncu= rses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcurses.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcap.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlib.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfo.a -> libncurses.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcurses.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcap.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlib.so -> libncurses.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfo.so -> libncurses.so =3D=3D=3D> lib/ncurses/form (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libf= orm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bform.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libform.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libform.so =3D=3D=3D> lib/ncurses/menu (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= enu.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmenu.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmenu.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libmenu.so =3D=3D=3D> lib/ncurses/panel (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= anel.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpanel.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libpanel.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libpanel.so =3D=3D=3D> lib/ncurses/ncursesw (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= cursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bncursesw.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libncursesw.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libnc= ursesw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 curse= s.h term.h termcap.h unctrl.h /zbuilder/buildd/head/lib/ncurses/ncursesw/..= /../../contrib/ncurses/include/ncurses_dll.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include /usr/obj/zbuilder/buildd/head/tmp/usr/include/ncurses.h -> curses.h /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcursesw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcapw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlibw.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfow.a -> libncursesw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcursesw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermcapw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtermlibw.so -> libncursesw.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libtinfow.so -> libncursesw.so =3D=3D=3D> lib/ncurses/formw (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libf= ormw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bformw.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libformw.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libformw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/formw/../../../contrib/ncurses/form/form.h /us= r/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses/menuw (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= enuw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmenuw.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmenuw.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libmenuw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/menuw/../../../contrib/ncurses/menu/menu.h /zb= uilder/buildd/head/lib/ncurses/menuw/../../../contrib/ncurses/menu/eti.h /u= sr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/ncurses/panelw (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= anelw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpanelw.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libpanelw.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libpanelw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/ncurses/panelw/../../../contrib/ncurses/panel/panel.h = /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libnetgraph (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= etgraph.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bnetgraph.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libnetgraph.so.4 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/libnetgraph.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libnetgraph/netgraph.h /usr/obj/zbuilder/buildd/head/t= mp/usr/include =3D=3D=3D> lib/libradius (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= adius.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bradius.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libradius.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libradius.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libradius/radlib.h /zbuilder/buildd/head/lib/libradius= /radlib_vs.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/librpcsvc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= pcsvc.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= brpcsvc.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s librpcsvc.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/librpcsvc.so =3D=3D=3D> lib/libsbuf (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= buf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsbuf.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libsbuf.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libsbuf.so =3D=3D=3D> lib/libtacplus (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libt= acplus.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= btacplus.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libtacplus.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libtacplus.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libtacplus/taclib.h /usr/obj/zbuilder/buildd/head/tmp/= usr/include =3D=3D=3D> lib/libutil (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= til.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= butil.so.9 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libutil.so.9 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libutil.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libutil/libutil.h /zbuilder/buildd/head/lib/libutil/lo= gin_cap.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libypclnt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liby= pclnt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bypclnt.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libypclnt.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libypclnt.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libypclnt/ypclnt.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libcxxrt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= xxrt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcxxrt.so.1 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcxxrt.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcxxrt= =2Eso =3D=3D=3D> lib/libc++ (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= ++.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bc++.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libc++.so.1 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libc++.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/__bit_reference /z= builder/buildd/head/lib/libc++/../../contrib/libc++/include/__config /zbuil= der/buildd/head/lib/libc++/../../contrib/libc++/include/__debug /zbuilder/b= uildd/head/lib/libc++/../../contrib/libc++/include/__functional_03 /zbuilde= r/buildd/head/lib/libc++/../../contrib/libc++/include/__functional_base /zb= uilder/buildd/head/lib/libc++/../../contrib/libc++/include/__functional_bas= e_03 /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__hash_t= able /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__locale= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__mutex_base= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__split_buff= er /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__sso_allo= cator /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__std_s= tream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__tree = /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/__tuple /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/__tuple_03 /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/__undef_min_max /zbu= ilder/buildd/head/lib/libc++/../../contrib/libc++/include/algorithm /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/array /zbuilder/buil= dd/head/lib/libc++/../../contrib/libc++/include/atomic /zbuilder/buildd/hea= d/lib/libc++/../../contrib/libc++/include/bitset /zbuilder/buildd/head/lib/= libc++/../../contrib/libc++/include/cassert /zbuilder/buildd/head/lib/libc+= +/../../contrib/libc++/include/ccomplex /zbuilder/buildd/head/lib/libc++/..= /../contrib/libc++/include/cctype /zbuilder/buildd/head/lib/libc++/../../co= ntrib/libc++/include/cerrno /zbuilder/buildd/head/lib/libc++/../../contrib/= libc++/include/cfenv /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/cfloat /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/includ= e/chrono /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/cint= types /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ciso646= /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/climits /zbu= ilder/buildd/head/lib/libc++/../../contrib/libc++/include/clocale /zbuilder= /buildd/head/lib/libc++/../../contrib/libc++/include/cmath /zbuilder/buildd= /head/lib/libc++/../../contrib/libc++/include/codecvt /zbuilder/buildd/head= /lib/libc++/../../contrib/libc++/include/complex /zbuilder/buildd/head/lib/= libc++/../../contrib/libc++/include/complex.h /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/condition_variable /zbuilder/buildd/head/l= ib/libc++/../../contrib/libc++/include/csetjmp /zbuilder/buildd/head/lib/li= bc++/../../contrib/libc++/include/csignal /zbuilder/buildd/head/lib/libc++/= =2E./../contrib/libc++/include/cstdarg /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/cstdbool /zbuilder/buildd/head/lib/libc++/../..= /contrib/libc++/include/cstddef /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/cstdint /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/cstdio /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/cstdlib /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/inclu= de/cstring /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ct= gmath /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/ctime /= zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/cwchar /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/cwctype /zbuilder/bu= ildd/head/lib/libc++/../../contrib/libc++/include/deque /zbuilder/buildd/he= ad/lib/libc++/../../contrib/libc++/include/exception /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/forward_list /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/fstream /zbuilder/buildd/head/lib/l= ibc++/../../contrib/libc++/include/functional /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/future /zbuilder/buildd/head/lib/libc++/..= /../contrib/libc++/include/initializer_list /zbuilder/buildd/head/lib/libc+= +/../../contrib/libc++/include/iomanip /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/ios /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/iosfwd /zbuilder/buildd/head/lib/libc++/../../contrib/li= bc++/include/iostream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++= /include/istream /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/incl= ude/iterator /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/= limits /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/list /= zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/locale /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/map /zbuilder/buildd= /head/lib/libc++/../../contrib/libc++/include/memory /zbuilder/buildd/head/= lib/libc++/../../contrib/libc++/include/mutex /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/new /zbuilder/buildd/head/lib/libc++/../..= /contrib/libc++/include/numeric /zbuilder/buildd/head/lib/libc++/../../cont= rib/libc++/include/ostream /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/queue /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/i= nclude/random /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include= /ratio /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/regex = /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/scoped_alloca= tor /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/set /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/sstream /zbuilder/= buildd/head/lib/libc++/../../contrib/libc++/include/stack /zbuilder/buildd/= head/lib/libc++/../../contrib/libc++/include/stdexcept /zbuilder/buildd/hea= d/lib/libc++/../../contrib/libc++/include/streambuf /zbuilder/buildd/head/l= ib/libc++/../../contrib/libc++/include/string /zbuilder/buildd/head/lib/lib= c++/../../contrib/libc++/include/strstream /zbuilder/buildd/head/lib/libc++= /../../contrib/libc++/include/system_error /zbuilder/buildd/head/lib/libc++= /../../contrib/libc++/include/tgmath.h /zbuilder/buildd/head/lib/libc++/../= =2E./contrib/libc++/include/thread /zbuilder/buildd/head/lib/libc++/../../c= ontrib/libc++/include/tuple /zbuilder/buildd/head/lib/libc++/../../contrib/= libc++/include/type_traits /zbuilder/buildd/head/lib/libc++/../../contrib/l= ibc++/include/typeindex /zbuilder/buildd/head/lib/libc++/../../contrib/libc= ++/include/typeinfo /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/i= nclude/unordered_map /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/= include/unordered_set /zbuilder/buildd/head/lib/libc++/../../contrib/libc++= /include/utility /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/incl= ude/valarray /zbuilder/buildd/head/lib/libc++/../../contrib/libc++/include/= vector /zbuilder/buildd/head/lib/libc++/../../contrib/libcxxrt/cxxabi.h /zb= uilder/buildd/head/lib/libc++/../../contrib/libcxxrt/unwind.h /zbuilder/bui= ldd/head/lib/libc++/../../contrib/libcxxrt/unwind-arm.h /zbuilder/buildd/he= ad/lib/libc++/../../contrib/libcxxrt/unwind-itanium.h /usr/obj/zbuilder/bui= ldd/head/tmp/usr/include/c++/v1 sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libc++/../../contrib/libc++/include/ext/__hash /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/ext/hash_map /zbuild= er/buildd/head/lib/libc++/../../contrib/libc++/include/ext/hash_set /usr/ob= j/zbuilder/buildd/head/tmp/usr/include/c++/v1/ext =3D=3D=3D> lib/libcom_err (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= om_err.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcom_err.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libcom_err.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libcom_err.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcom_err/../../contrib/com_err/com_err.h /zbuilder/b= uildd/head/lib/libcom_err/../../contrib/com_err/com_right.h /usr/obj/zbuild= er/buildd/head/tmp/usr/include =3D=3D=3D> lib/libcom_err/doc (install) =3D=3D=3D> lib/libalias (install) =3D=3D=3D> lib/libalias/libalias (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libalias.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libalias= =2Eso sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libalias/libalias/../../../sys/netinet/libalias/alias.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libalias/modules (install) =3D=3D=3D> lib/libalias/modules/cuseeme (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_cuseeme.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_cuseeme.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/dummy (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_dummy.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_dummy.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/ftp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_ftp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_ftp.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/irc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_irc.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_irc.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/nbt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_nbt.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_nbt.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/pptp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_pptp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_pptp.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/skinny (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_skinny.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_skinny.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libalias/modules/smedia (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= lias_smedia.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= balias_smedia.so /usr/obj/zbuilder/buildd/head/tmp/lib =3D=3D=3D> lib/libarchive (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= rchive.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= barchive.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libarchive.so.6 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libarchive.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libarchive/../../contrib/libarchive/libarchive/archive= =2Eh /zbuilder/buildd/head/lib/libarchive/../../contrib/libarchive/libarchi= ve/archive_entry.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libbegemot (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= egemot.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbegemot.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libbegemot.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libbeg= emot.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbegemot/../../contrib/libbegemot/rpoll.h /usr/obj/z= builder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libblocksruntime (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libB= locksRuntime.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bBlocksRuntime.so.0 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libBlocksRuntime.so.0 /usr/o= bj/zbuilder/buildd/head/tmp/usr/lib/libBlocksRuntime.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libblocksruntime/../../contrib/compiler-rt/BlocksRunti= me/Block.h /zbuilder/buildd/head/lib/libblocksruntime/../../contrib/compile= r-rt/BlocksRuntime/Block_private.h /usr/obj/zbuilder/buildd/head/tmp/usr/in= clude =3D=3D=3D> lib/libbluetooth (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= luetooth.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbluetooth.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbluetooth.so.4 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libbluetooth.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbluetooth/bluetooth.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> lib/libbsnmp (install) =3D=3D=3D> lib/libbsnmp/libbsnmp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= snmp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbsnmp.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbsnmp.so.6 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libbsnmp.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/asn1.h /z= builder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/snmp.h= /zbuilder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp/lib/snm= pagent.h /zbuilder/buildd/head/lib/libbsnmp/libbsnmp/../../../contrib/bsnmp= /lib/snmpclient.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/bsnmp =3D=3D=3D> lib/libbz2 (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= z2.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbz2.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbz2.so.4 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libbz2.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libbz2/../../contrib/bzip2/bzlib.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include =3D=3D=3D> lib/libcalendar (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= alendar.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcalendar.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libcalendar.so.5 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/libcalendar.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcalendar/calendar.h /usr/obj/zbuilder/buildd/head/t= mp/usr/include =3D=3D=3D> lib/libcam (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= am.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcam.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcam.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcam.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libcam/camlib.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include =3D=3D=3D> lib/libcompat (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= ompat.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> lib/libdevinfo (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libd= evinfo.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bdevinfo.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libdevinfo.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libdevinfo.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdevinfo/devinfo.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libdevstat (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libd= evstat.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bdevstat.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libdevstat.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdev= stat.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdevstat/devstat.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libdwarf (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libd= warf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bdwarf.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libdwarf.so.3 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libdwarf.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libdwarf/dwarf.h /zbuilder/buildd/head/lib/libdwarf/li= bdwarf.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libedit (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libe= dit.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bedit.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libedit.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libedit.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libedit/histedit.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libedit/edit/readline (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libedit/edit/readline/readline.h /zbuilder/buildd/head= /lib/libedit/edit/readline/history.h /zbuilder/buildd/head/lib/libedit/edit= /readline/tilde.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/edit/readli= ne =3D=3D=3D> lib/libexpat (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= sdxml.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbsdxml.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libbsdxml.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libbsdx= ml.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 bsdxm= l.h bsdxml_external.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libfetch (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libf= etch.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bfetch.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libfetch.so.6 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libfetch.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libfetch/fetch.h /usr/obj/zbuilder/buildd/head/tmp/usr= /include =3D=3D=3D> lib/libgeom (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= eom.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgeom.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libgeom.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libgeom.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libgeom/libgeom.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include =3D=3D=3D> lib/libgpib (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= pib.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgpib.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgpib.so.3 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libgpib.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libgpib/gpib.h /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude/gpib =3D=3D=3D> lib/libgssapi (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libg= ssapi.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgssapi.so.10 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libgssapi.so.10 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libgssapi.so =3D=3D=3D> lib/librpcsec_gss (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= pcsec_gss.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= brpcsec_gss.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s librpcsec_gss.so.1 /usr/obj/= zbuilder/buildd/head/tmp/usr/lib/librpcsec_gss.so =3D=3D=3D> lib/libipsec (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libi= psec.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bipsec.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libipsec.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libipsec= =2Eso =3D=3D=3D> lib/libipx (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libi= px.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bipx.so.5 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libipx.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libipx.so =3D=3D=3D> lib/libjail (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libj= ail.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bjail.so.1 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libjail.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libjail.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libjail/jail.h /usr/obj/zbuilder/buildd/head/tmp/usr/i= nclude =3D=3D=3D> lib/libkiconv (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libk= iconv.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bkiconv.so.4 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libkiconv.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libkico= nv.so =3D=3D=3D> lib/libldns (install) =3D=3D=3D> lib/liblzma (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libl= zma.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= blzma.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s liblzma.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/liblzma.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/../lzma.= h /usr/obj/zbuilder/buildd/head/tmp/usr/include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/base.h /= zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/bcj.= h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/b= lock.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/l= zma/check.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/= api/lzma/container.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src= /liblzma/api/lzma/delta.h /zbuilder/buildd/head/lib/liblzma/../../contrib/x= z/src/liblzma/api/lzma/filter.h /zbuilder/buildd/head/lib/liblzma/../../con= trib/xz/src/liblzma/api/lzma/hardware.h /zbuilder/buildd/head/lib/liblzma/.= =2E/../contrib/xz/src/liblzma/api/lzma/index.h /zbuilder/buildd/head/lib/li= blzma/../../contrib/xz/src/liblzma/api/lzma/index_hash.h /zbuilder/buildd/h= ead/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/lzma.h /zbuilder/buil= dd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/stream_flags.h /z= builder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzma/versi= on.h /zbuilder/buildd/head/lib/liblzma/../../contrib/xz/src/liblzma/api/lzm= a/vli.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/lzma =3D=3D=3D> lib/libmagic (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= agic.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmagic.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmagic.so.4 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libmagic.so sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 magic ma= gic.mgc /usr/obj/zbuilder/buildd/head/tmp/usr/share/misc sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmagic/../../contrib/file/magic.h /usr/obj/zbuilder/= buildd/head/tmp/usr/include =3D=3D=3D> lib/libmandoc (install) =3D=3D=3D> lib/libmemstat (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= emstat.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmemstat.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmemstat.so.3 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libmemstat.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmemstat/memstat.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libmilter (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= ilter.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmilter.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmilter.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libmilter.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmilter/../../contrib/sendmail/include/libmilter/mfa= pi.h /zbuilder/buildd/head/lib/libmilter/../../contrib/sendmail/include/lib= milter/mfdef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/libmilter =3D=3D=3D> lib/libmp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libm= p.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bmp.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libmp.so.7 /usr/obj/zbuilder= /buildd/head/tmp/usr/lib/libmp.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libmp/mp.h /usr/obj/zbuilder/buildd/head/tmp/usr/inclu= de =3D=3D=3D> lib/libnetbsd (install) =3D=3D=3D> lib/libngatm (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libn= gatm.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bngatm.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libngatm.so.4 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libngatm.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/unimsg.h /zbu= ilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/addr.h /usr/= obj/zbuilder/buildd/head/tmp/usr/include/netnatm sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/saal/sscfu.h = /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/saal/ssc= fudef.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/= saal/sscop.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/net= natm/saal/sscopdef.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/= saal sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/msg/uni_confi= g.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/msg/= uni_hdr.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnat= m/msg/uni_ie.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/n= etnatm/msg/uni_msg.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/n= gatm/netnatm/msg/unimsglib.h /zbuilder/buildd/head/lib/libngatm/../../sys/c= ontrib/ngatm/netnatm/msg/uniprint.h /zbuilder/buildd/head/lib/libngatm/../.= =2E/sys/contrib/ngatm/netnatm/msg/unistruct.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include/netnatm/msg sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/uni.h /zb= uilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/unidef.= h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/sig/un= isig.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/sig sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/atmapi.h = /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/ccat= m.h /zbuilder/buildd/head/lib/libngatm/../../sys/contrib/ngatm/netnatm/api/= unisap.h /usr/obj/zbuilder/buildd/head/tmp/usr/include/netnatm/api =3D=3D=3D> lib/libopie (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libo= pie.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bopie.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libopie.so.7 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libopie.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libopie/../../contrib/opie/opie.h /usr/obj/zbuilder/bu= ildd/head/tmp/usr/include =3D=3D=3D> lib/libpam (install) =3D=3D=3D> lib/libpam/modules (install) =3D=3D=3D> lib/libpam/modules/pam_chroot (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_chroot.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_chroot.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/pam_chroot.so =3D=3D=3D> lib/libpam/modules/pam_deny (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_deny.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_deny.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_deny.so =3D=3D=3D> lib/libpam/modules/pam_echo (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_echo.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_echo.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_echo.so =3D=3D=3D> lib/libpam/modules/pam_exec (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_exec.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_exec.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_exec.so =3D=3D=3D> lib/libpam/modules/pam_ftpusers (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_ftpusers.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_ftpusers.so.5 /usr/obj/z= builder/buildd/head/tmp/usr/lib/pam_ftpusers.so =3D=3D=3D> lib/libpam/modules/pam_group (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_group.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_group.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/pam_group.so =3D=3D=3D> lib/libpam/modules/pam_guest (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_guest.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_guest.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/pam_guest.so =3D=3D=3D> lib/libpam/modules/pam_krb5 (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_krb5.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_krb5.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_krb5.so =3D=3D=3D> lib/libpam/modules/pam_ksu (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_ksu.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_ksu.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/pam_ksu.so =3D=3D=3D> lib/libpam/modules/pam_lastlog (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_lastlog.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_lastlog.so.5 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/pam_lastlog.so =3D=3D=3D> lib/libpam/modules/pam_login_access (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_login_access.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_login_access.so.5 /usr/o= bj/zbuilder/buildd/head/tmp/usr/lib/pam_login_access.so =3D=3D=3D> lib/libpam/modules/pam_nologin (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_nologin.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_nologin.so.5 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/pam_nologin.so =3D=3D=3D> lib/libpam/modules/pam_opie (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_opie.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_opie.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_opie.so =3D=3D=3D> lib/libpam/modules/pam_opieaccess (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_opieaccess.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_opieaccess.so.5 /usr/obj= /zbuilder/buildd/head/tmp/usr/lib/pam_opieaccess.so =3D=3D=3D> lib/libpam/modules/pam_passwdqc (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_passwdqc.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_passwdqc.so.5 /usr/obj/z= builder/buildd/head/tmp/usr/lib/pam_passwdqc.so =3D=3D=3D> lib/libpam/modules/pam_permit (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_permit.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_permit.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/pam_permit.so =3D=3D=3D> lib/libpam/modules/pam_radius (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_radius.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_radius.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/pam_radius.so =3D=3D=3D> lib/libpam/modules/pam_rhosts (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_rhosts.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_rhosts.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/pam_rhosts.so =3D=3D=3D> lib/libpam/modules/pam_rootok (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_rootok.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_rootok.so.5 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/pam_rootok.so =3D=3D=3D> lib/libpam/modules/pam_securetty (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_securetty.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_securetty.so.5 /usr/obj/= zbuilder/buildd/head/tmp/usr/lib/pam_securetty.so =3D=3D=3D> lib/libpam/modules/pam_self (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_self.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_self.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_self.so =3D=3D=3D> lib/libpam/modules/pam_ssh (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_ssh.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_ssh.so.5 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/pam_ssh.so =3D=3D=3D> lib/libpam/modules/pam_tacplus (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_tacplus.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_tacplus.so.5 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/pam_tacplus.so =3D=3D=3D> lib/libpam/modules/pam_unix (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 pa= m_unix.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s pam_unix.so.5 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/pam_unix.so =3D=3D=3D> lib/libpam/libpam (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= am.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpam.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libpam.so.5 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libpam.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/include/securit= y/openpam.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpa= m/include/security/openpam_attr.h /zbuilder/buildd/head/lib/libpam/libpam/.= =2E/../../contrib/openpam/include/security/openpam_version.h /zbuilder/buil= dd/head/lib/libpam/libpam/../../../contrib/openpam/include/security/pam_app= l.h /zbuilder/buildd/head/lib/libpam/libpam/../../../contrib/openpam/includ= e/security/pam_constants.h /zbuilder/buildd/head/lib/libpam/libpam/../../..= /contrib/openpam/include/security/pam_modules.h /zbuilder/buildd/head/lib/l= ibpam/libpam/../../../contrib/openpam/include/security/pam_types.h /zbuilde= r/buildd/head/lib/libpam/libpam/security/pam_mod_misc.h /usr/obj/zbuilder/b= uildd/head/tmp/usr/include/security =3D=3D=3D> lib/libpcap (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= cap.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpcap.so.8 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libpcap.so.8 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libpcap.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpcap/../../contrib/libpcap/pcap.h /zbuilder/buildd/= head/lib/libpcap/../../contrib/libpcap/pcap-int.h /zbuilder/buildd/head/lib= /libpcap/../../contrib/libpcap/pcap-namedb.h /zbuilder/buildd/head/lib/libp= cap/../../contrib/libpcap/pcap-bpf.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpcap/../../contrib/libpcap/pcap/pcap.h /zbuilder/bu= ildd/head/lib/libpcap/../../contrib/libpcap/pcap/namedb.h /zbuilder/buildd/= head/lib/libpcap/../../contrib/libpcap/pcap/bpf.h /usr/obj/zbuilder/buildd/= head/tmp/usr/include/pcap =3D=3D=3D> lib/libpmc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= mc.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bpmc.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libpmc.so.5 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libpmc.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libpmc/pmc.h /zbuilder/buildd/head/lib/libpmc/pmclog.h= /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libproc (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= roc.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bproc.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libproc.so.2 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libproc.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libproc/libproc.h /usr/obj/zbuilder/buildd/head/tmp/us= r/include =3D=3D=3D> lib/libprocstat (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libp= rocstat.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bprocstat.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libprocstat.so.1 /usr/obj/zb= uilder/buildd/head/tmp/usr/lib/libprocstat.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libprocstat/libprocstat.h /usr/obj/zbuilder/buildd/hea= d/tmp/usr/include =3D=3D=3D> lib/libprocstat/zfs (install) =3D=3D=3D> lib/librt (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= t.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = librt.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s librt.so.1 /usr/obj/zbuilder= /buildd/head/tmp/usr/lib/librt.so =3D=3D=3D> lib/librtld_db (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libr= tld_db.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= brtld_db.so.2 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s librtld_db.so.2 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/librtld_db.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/librtld_db/rtld_db.h /usr/obj/zbuilder/buildd/head/tmp= /usr/include =3D=3D=3D> lib/libsdp (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= dp.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsdp.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libsdp.so.4 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libsdp.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libsdp/sdp.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/libsm (install) =3D=3D=3D> lib/libsmdb (install) =3D=3D=3D> lib/libsmutil (install) =3D=3D=3D> lib/libstand (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= tand.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libstand/stand.h /usr/obj/zbuilder/buildd/head/tmp/usr= /include =3D=3D=3D> lib/libstdbuf (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= tdbuf.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bstdbuf.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libstdbuf.so.1 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libstdbuf.so =3D=3D=3D> lib/libstdthreads (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= tdthreads.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bstdthreads.so.0 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libstdthreads.so.0 /usr/obj/= zbuilder/buildd/head/tmp/usr/lib/libstdthreads.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libstdthreads/threads.h /usr/obj/zbuilder/buildd/head/= tmp/usr/include =3D=3D=3D> lib/libtelnet (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libtelnet/../../contrib/telnet/arpa/telnet.h /usr/obj/= zbuilder/buildd/head/tmp/usr/include/arpa =3D=3D=3D> lib/libthr (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libt= hr.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 -S = libthr.so.3 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libthr.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libthr.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libpthread.a -> libthr.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libpthread.so -> libthr.so =3D=3D=3D> lib/libthread_db (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libt= hread_db.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bthread_db.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libthread_db.so.3 /usr/obj/z= builder/buildd/head/tmp/usr/lib/libthread_db.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libthread_db/thread_db.h /usr/obj/zbuilder/buildd/head= /tmp/usr/include =3D=3D=3D> lib/libufs (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= fs.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -o root -g wheel -m 444 libu= fs.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libufs.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libufs.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libufs/libufs.h /usr/obj/zbuilder/buildd/head/tmp/usr/= include =3D=3D=3D> lib/libugidfw (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= gidfw.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bugidfw.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libugidfw.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libugidfw.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libugidfw/ugidfw.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libulog (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= log.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bulog.so.0 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libulog.so.0 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libulog.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libulog/ulog.h /zbuilder/buildd/head/lib/libulog/utemp= ter.h /usr/obj/zbuilder/buildd/head/tmp/usr/include /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libutempter.a -> libulog.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libutempter.so -> libulog.so =3D=3D=3D> lib/libusbhid (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= sbhid.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= busbhid.so.4 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libusbhid.so.4 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libusbhid.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libusbhid/usbhid.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libusb (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libu= sb.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= busb.so.3 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libusb.so.3 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libusb.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libusb/libusb20.h /zbuilder/buildd/head/lib/libusb/lib= usb20_desc.h /zbuilder/buildd/head/lib/libusb/usb.h /zbuilder/buildd/head/l= ib/libusb/libusb.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libvgl (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libv= gl.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bvgl.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libvgl.so.6 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libvgl.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libvgl/vgl.h /usr/obj/zbuilder/buildd/head/tmp/usr/inc= lude =3D=3D=3D> lib/libvmmapi (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libv= mmapi.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bvmmapi.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libvmmapi.so.5 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libvmmapi.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libvmmapi/vmmapi.h /usr/obj/zbuilder/buildd/head/tmp/u= sr/include =3D=3D=3D> lib/libwrap (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libw= rap.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bwrap.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libwrap.so.6 /usr/obj/zbuild= er/buildd/head/tmp/usr/lib/libwrap.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libwrap/../../contrib/tcp_wrappers/tcpd.h /usr/obj/zbu= ilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/liby (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liby= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib =3D=3D=3D> lib/libyaml (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libb= sdyml.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bbsdyml.so.0 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libbsdyml.so.0 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/libbsdyml.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 bsdym= l.h /usr/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/libz (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libz= =2Ea /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bz.so.6 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libz.so.6 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libz.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/libz/zconf.h /zbuilder/buildd/head/lib/libz/zlib.h /us= r/obj/zbuilder/buildd/head/tmp/usr/include =3D=3D=3D> lib/atf (install) =3D=3D=3D> lib/atf/libatf-c (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= tf-c.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= batf-c.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libatf-c.so.1 /usr/obj/zbuil= der/buildd/head/tmp/usr/lib/libatf-c.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c.h /usr/obj/z= builder/buildd/head/tmp/usr/include/atf-c.h sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/build.h /zbuil= der/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/check.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/config.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/defs.h /zbuilder= /buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error.h /zbuilder/= buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/error_fwd.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/macros.h /zbuild= er/buildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tc.h /zbuilder/b= uildd/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/tp.h /zbuilder/build= d/head/lib/atf/libatf-c/../../../contrib/atf/atf-c/utils.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/atf-c =3D=3D=3D> lib/atf/libatf-c++ (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 liba= tf-c++.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= batf-c++.so.1 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libatf-c++.so.1 /usr/obj/zbu= ilder/buildd/head/tmp/usr/lib/libatf-c++.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbu= ilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++.hpp /usr= /obj/zbuilder/buildd/head/tmp/usr/include/atf-c++.hpp sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++/build.hpp = /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c++/check= =2Ehpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/atf-c+= +/config.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contrib/atf/= atf-c++/macros.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../contri= b/atf/atf-c++/tests.hpp /zbuilder/buildd/head/lib/atf/libatf-c++/../../../c= ontrib/atf/atf-c++/utils.hpp /usr/obj/zbuilder/buildd/head/tmp/usr/include/= atf-c++ =3D=3D=3D> lib/bind (install) =3D=3D=3D> lib/bind/isc (install) =3D=3D=3D> lib/bind/isccc (install) =3D=3D=3D> lib/bind/dns (install) =3D=3D=3D> lib/bind/isccfg (install) =3D=3D=3D> lib/bind/bind9 (install) =3D=3D=3D> lib/bind/lwres (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libl= wres.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= blwres.so.80 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s liblwres.so.80 /usr/obj/zbui= lder/buildd/head/tmp/usr/lib/liblwres.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lw= res/context.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/l= ib/lwres/include/lwres/int.h /zbuilder/buildd/head/lib/bind/lwres/../../../= contrib/bind9/lib/lwres/include/lwres/ipv6.h /zbuilder/buildd/head/lib/bind= /lwres/../../../contrib/bind9/lib/lwres/include/lwres/lang.h /zbuilder/buil= dd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lwres/list.= h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/inc= lude/lwres/lwbuffer.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib= /bind9/lib/lwres/include/lwres/lwpacket.h /zbuilder/buildd/head/lib/bind/lw= res/../../../contrib/bind9/lib/lwres/include/lwres/lwres.h /zbuilder/buildd= /head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/include/lwres/result.= h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/bind9/lib/lwres/inc= lude/lwres/version.h /zbuilder/buildd/head/lib/bind/lwres/../../../contrib/= bind9/lib/lwres/unix/include/lwres/net.h /zbuilder/buildd/head/lib/bind/lwr= es/lwres/netdb.h /zbuilder/buildd/head/lib/bind/lwres/lwres/platform.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/lwres =3D=3D=3D> lib/clang (install) =3D=3D=3D> lib/clang/include (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/He= aders/__wmmintrin_aes.h /zbuilder/buildd/head/lib/clang/include/../../../co= ntrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h /zbuilder/buildd/he= ad/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/altivec.= h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang= /lib/Headers/ammintrin.h /zbuilder/buildd/head/lib/clang/include/../../../c= ontrib/llvm/tools/clang/lib/Headers/avx2intrin.h /zbuilder/buildd/head/lib/= clang/include/../../../contrib/llvm/tools/clang/lib/Headers/avxintrin.h /zb= uilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/= Headers/bmi2intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contr= ib/llvm/tools/clang/lib/Headers/bmiintrin.h /zbuilder/buildd/head/lib/clang= /include/../../../contrib/llvm/tools/clang/lib/Headers/cpuid.h /zbuilder/bu= ildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/e= mmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/to= ols/clang/lib/Headers/f16cintrin.h /zbuilder/buildd/head/lib/clang/include/= =2E./../../contrib/llvm/tools/clang/lib/Headers/fma4intrin.h /zbuilder/buil= dd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/fma= intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tool= s/clang/lib/Headers/immintrin.h /zbuilder/buildd/head/lib/clang/include/../= =2E./../contrib/llvm/tools/clang/lib/Headers/lzcntintrin.h /zbuilder/buildd= /head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/mm3dn= ow.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/cl= ang/lib/Headers/mm_malloc.h /zbuilder/buildd/head/lib/clang/include/../../.= =2E/contrib/llvm/tools/clang/lib/Headers/mmintrin.h /zbuilder/buildd/head/l= ib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers/module.map /= zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/li= b/Headers/nmmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/pmmintrin.h /zbuilder/buildd/head/lib/clan= g/include/../../../contrib/llvm/tools/clang/lib/Headers/popcntintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/prfchwintrin.h /zbuilder/buildd/head/lib/clang/include/../../../cont= rib/llvm/tools/clang/lib/Headers/rdseedintrin.h /zbuilder/buildd/head/lib/c= lang/include/../../../contrib/llvm/tools/clang/lib/Headers/rtmintrin.h /zbu= ilder/buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/H= eaders/smmintrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib= /llvm/tools/clang/lib/Headers/tmmintrin.h /zbuilder/buildd/head/lib/clang/i= nclude/../../../contrib/llvm/tools/clang/lib/Headers/wmmintrin.h /zbuilder/= buildd/head/lib/clang/include/../../../contrib/llvm/tools/clang/lib/Headers= /x86intrin.h /zbuilder/buildd/head/lib/clang/include/../../../contrib/llvm/= tools/clang/lib/Headers/xmmintrin.h /zbuilder/buildd/head/lib/clang/include= /../../../contrib/llvm/tools/clang/lib/Headers/xopintrin.h /usr/obj/zbuilde= r/buildd/head/tmp/usr/include/clang/3.3 sh /zbuilder/buildd/head/tools/install.sh -l s ../include /usr/obj/zbuilder= /buildd/head/tmp/usr/lib/include =3D=3D=3D> secure/lib (obj,depend,all,install) =3D=3D=3D> secure/lib/libcrypto (obj) =3D=3D=3D> secure/lib/libcrypto/engines (obj) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (obj) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (obj) =3D=3D=3D> secure/lib/libssl (obj) =3D=3D=3D> secure/lib/libssh (obj) =3D=3D=3D> secure/lib/libcrypto (depend) =3D=3D=3D> secure/lib/libcrypto/engines (depend) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (depend) =3D=3D=3D> secure/lib/libssl (depend) =3D=3D=3D> secure/lib/libssh (depend) =3D=3D=3D> secure/lib/libcrypto (all) =3D=3D=3D> secure/lib/libcrypto/engines (all) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (all) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (all) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (all) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (all) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (all) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (all) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (all) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (all) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (all) =3D=3D=3D> secure/lib/libssl (all) =3D=3D=3D> secure/lib/libssh (all) =3D=3D=3D> secure/lib/libcrypto (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libc= rypto.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcrypto.so.7 /usr/obj/zbuilder/buildd/head/tmp/lib sh /zbuilder/buildd/head/tools/install.sh -l s /usr/obj/zbuilder/buildd/hea= d/tmp/lib/libcrypto.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libcryp= to.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/crypto= =2Eh /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cry= pto/ebcdic.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/opensslv.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ossl_typ.h /zbuilder/buildd/head/secure/lib/libcrypto= /../../../crypto/openssl/crypto/symhacks.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/../e_os2.h /zbuilder/buildd/head/= secure/lib/libcrypto/../../../crypto/openssl/crypto/aes/aes.h /zbuilder/bui= ldd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn1/asn1.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/asn= 1/asn1_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/ope= nssl/crypto/asn1/asn1t.h /zbuilder/buildd/head/secure/lib/libcrypto/../../.= =2E/crypto/openssl/crypto/bf/blowfish.h /zbuilder/buildd/head/secure/lib/li= bcrypto/../../../crypto/openssl/crypto/bio/bio.h /zbuilder/buildd/head/secu= re/lib/libcrypto/../../../crypto/openssl/crypto/bn/bn.h /zbuilder/buildd/he= ad/secure/lib/libcrypto/../../../crypto/openssl/crypto/buffer/buffer.h /zbu= ilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/camel= lia/camellia.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/cast/cast.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/cmac/cmac.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/cms/cms.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/comp/comp.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/conf.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/c= onf_api.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/des/des.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../cryp= to/openssl/crypto/des/des_old.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/dh/dh.h /zbuilder/buildd/head/secure/lib/l= ibcrypto/../../../crypto/openssl/crypto/dsa/dsa.h /zbuilder/buildd/head/sec= ure/lib/libcrypto/../../../crypto/openssl/crypto/dso/dso.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ec/ec.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ecdh/ecdh.= h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto= /ecdsa/ecdsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/engine/engine.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/err/err.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/evp/evp.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/hmac/hmac.h /zbuilder/buildd= /head/secure/lib/libcrypto/../../../crypto/openssl/crypto/idea/idea.h /zbui= lder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/krb5/k= rb5_asn.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openss= l/crypto/lhash/lhash.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/md4/md4.h /zbuilder/buildd/head/secure/lib/libcrypto/= =2E./../../crypto/openssl/crypto/md5/md5.h /zbuilder/buildd/head/secure/lib= /libcrypto/../../../crypto/openssl/crypto/mdc2/mdc2.h /zbuilder/buildd/head= /secure/lib/libcrypto/../../../crypto/openssl/crypto/modes/modes.h /zbuilde= r/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/objects/o= bj_mac.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl= /crypto/objects/objects.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/ocsp/ocsp.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/pem/pem.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/pem/pem2.h /zbuilder/buildd/= head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkcs12/pkcs12.h /z= builder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/pkc= s7/pkcs7.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/opens= sl/crypto/pqueue/pqueue.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/rand/rand.h /zbuilder/buildd/head/secure/lib/lib= crypto/../../../crypto/openssl/crypto/rc2/rc2.h /zbuilder/buildd/head/secur= e/lib/libcrypto/../../../crypto/openssl/crypto/rc4/rc4.h /zbuilder/buildd/h= ead/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5.h /zbuilder= /buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/ripemd/rip= emd.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/cr= ypto/rsa/rsa.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/o= penssl/crypto/seed/seed.h /zbuilder/buildd/head/secure/lib/libcrypto/../../= =2E./crypto/openssl/crypto/sha/sha.h /zbuilder/buildd/head/secure/lib/libcr= ypto/../../../crypto/openssl/crypto/srp/srp.h /zbuilder/buildd/head/secure/= lib/libcrypto/../../../crypto/openssl/crypto/stack/safestack.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/stack/stack.h= /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/= ts/ts.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/= crypto/txt_db/txt_db.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../= crypto/openssl/crypto/ui/ui.h /zbuilder/buildd/head/secure/lib/libcrypto/..= /../../crypto/openssl/crypto/ui/ui_compat.h /zbuilder/buildd/head/secure/li= b/libcrypto/../../../crypto/openssl/crypto/whrlpool/whrlpool.h /zbuilder/bu= ildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x509/x509.h /= zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/openssl/crypto/x5= 09/x509_vfy.h /zbuilder/buildd/head/secure/lib/libcrypto/../../../crypto/op= enssl/crypto/x509v3/x509v3.h opensslconf.h /usr/obj/zbuilder/buildd/head/tm= p/usr/include/openssl =3D=3D=3D> secure/lib/libcrypto/engines (install) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= b4758cca.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libaep (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= baep.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= batalla.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libchil (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bchil.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bcswift.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libgost (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bgost.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bnuron.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bsureware.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (install) sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bubsec.so /usr/obj/zbuilder/buildd/head/tmp/usr/lib/engines Removing stale symlinks. rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/include/des.h rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.a rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.so rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes.so.3 rm -f /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libdes_p.a =3D=3D=3D> secure/lib/libssl (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sl.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bssl.so.7 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libssl.so.7 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libssl.so sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/dtls1.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/kssl.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/srtp.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl2.h /zbui= lder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl23.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/ssl3.h /zbu= ilder/buildd/head/secure/lib/libssl/../../../crypto/openssl/ssl/tls1.h /usr= /obj/zbuilder/buildd/head/tmp/usr/include/openssl =3D=3D=3D> secure/lib/libssh (install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libs= sh.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -s -o root -g wheel -m 444 li= bssh.so.5 /usr/obj/zbuilder/buildd/head/tmp/usr/lib sh /zbuilder/buildd/head/tools/install.sh -l s libssh.so.5 /usr/obj/zbuilde= r/buildd/head/tmp/usr/lib/libssh.so =3D=3D=3D> usr.bin/lex/lib (obj,depend,all,install) sh /zbuilder/buildd/head/tools/install.sh -C -o root -g wheel -m 444 libl= n.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libl.a -> /usr/obj/zbuilder/build= d/head/tmp/usr/lib/libln.a /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libfl.a -> /usr/obj/zbuilder/buil= dd/head/tmp/usr/lib/libln.a -------------------------------------------------------------- >>> stage 4.3: make dependencies -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARCH=3Damd64= MACHINE=3Damd64 CPUTYPE=3D GROFF_BIN_PATH=3D/usr/obj/zbuilder/buildd/hea= d/tmp/legacy/usr/bin GROFF_FONT_PATH=3D/usr/obj/zbuilder/buildd/head/tmp/l= egacy/usr/share/groff_font GROFF_TMAC_PATH=3D/usr/obj/zbuilder/buildd/head= /tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=3D/usr/obj/zbuilder/buildd/head= /tmp _LDSCRIPTROOT=3D VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" INS= TALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilde= r/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/= usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilde= r/buildd/head/tmp/legacy/bin:/usr/obj/zbuilder/buildd/head/tmp/usr/sbin:/us= r/obj/zbuilder/buildd/head/tmp/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/us= r/games:/sbin:/bin:/usr/sbin:/usr/bin CC=3D"cc " CXX=3D"c++ " CPP=3D"cpp "= AS=3D"as" AR=3D"ar" LD=3D"ld" NM=3Dnm OBJDUMP=3D RANLIB=3Dranlib STRINGS= =3D COMPILER_TYPE=3Dclang /usr/obj/zbuilder/buildd/head/make.amd64/make -f= Makefile.inc1 DESTDIR=3D/usr/obj/zbuilder/buildd/head/tmp par-depend =3D=3D=3D> share/info (depend) =3D=3D=3D> lib (depend) =3D=3D=3D> lib/csu/amd64 (depend) =3D=3D=3D> lib/libc (depend) =3D=3D=3D> lib/libbsm (depend) =3D=3D=3D> lib/libauditd (depend) =3D=3D=3D> lib/libcompiler_rt (depend) =3D=3D=3D> lib/libcrypt (depend) =3D=3D=3D> lib/libelf (depend) =3D=3D=3D> lib/libkvm (depend) =3D=3D=3D> lib/msun (depend) =3D=3D=3D> lib/libmd (depend) =3D=3D=3D> lib/ncurses (depend) =3D=3D=3D> lib/ncurses/ncurses (depend) =3D=3D=3D> lib/ncurses/form (depend) =3D=3D=3D> lib/ncurses/menu (depend) =3D=3D=3D> lib/ncurses/panel (depend) =3D=3D=3D> lib/ncurses/ncursesw (depend) =3D=3D=3D> lib/ncurses/formw (depend) =3D=3D=3D> lib/ncurses/menuw (depend) =3D=3D=3D> lib/ncurses/panelw (depend) =3D=3D=3D> lib/libnetgraph (depend) =3D=3D=3D> lib/libradius (depend) =3D=3D=3D> lib/librpcsvc (depend) =3D=3D=3D> lib/libsbuf (depend) =3D=3D=3D> lib/libtacplus (depend) =3D=3D=3D> lib/libutil (depend) =3D=3D=3D> lib/libypclnt (depend) =3D=3D=3D> lib/libcxxrt (depend) =3D=3D=3D> lib/libc++ (depend) =3D=3D=3D> lib/libcom_err (depend) =3D=3D=3D> lib/libcom_err/doc (depend) =3D=3D=3D> lib/libalias (depend) =3D=3D=3D> lib/libalias/libalias (depend) =3D=3D=3D> lib/libalias/modules (depend) =3D=3D=3D> lib/libalias/modules/cuseeme (depend) =3D=3D=3D> lib/libalias/modules/dummy (depend) =3D=3D=3D> lib/libalias/modules/ftp (depend) =3D=3D=3D> lib/libalias/modules/irc (depend) =3D=3D=3D> lib/libalias/modules/nbt (depend) =3D=3D=3D> lib/libalias/modules/pptp (depend) =3D=3D=3D> lib/libalias/modules/skinny (depend) =3D=3D=3D> lib/libalias/modules/smedia (depend) =3D=3D=3D> lib/libarchive (depend) =3D=3D=3D> lib/libbegemot (depend) =3D=3D=3D> lib/libblocksruntime (depend) =3D=3D=3D> lib/libbluetooth (depend) =3D=3D=3D> lib/libbsnmp (depend) =3D=3D=3D> lib/libbsnmp/libbsnmp (depend) =3D=3D=3D> lib/libbz2 (depend) =3D=3D=3D> lib/libcalendar (depend) =3D=3D=3D> lib/libcam (depend) =3D=3D=3D> lib/libcompat (depend) =3D=3D=3D> lib/libdevinfo (depend) =3D=3D=3D> lib/libdevstat (depend) =3D=3D=3D> lib/libdwarf (depend) =3D=3D=3D> lib/libedit (depend) =3D=3D=3D> lib/libedit/edit/readline (depend) =3D=3D=3D> lib/libexpat (depend) =3D=3D=3D> lib/libfetch (depend) =3D=3D=3D> lib/libgeom (depend) =3D=3D=3D> lib/libgpib (depend) =3D=3D=3D> lib/libgssapi (depend) =3D=3D=3D> lib/librpcsec_gss (depend) =3D=3D=3D> lib/libipsec (depend) =3D=3D=3D> lib/libipx (depend) =3D=3D=3D> lib/libjail (depend) =3D=3D=3D> lib/libkiconv (depend) =3D=3D=3D> lib/libldns (depend) =3D=3D=3D> lib/liblzma (depend) =3D=3D=3D> lib/libmagic (depend) =3D=3D=3D> lib/libmandoc (depend) =3D=3D=3D> lib/libmemstat (depend) =3D=3D=3D> lib/libmilter (depend) =3D=3D=3D> lib/libmp (depend) =3D=3D=3D> lib/libnetbsd (depend) =3D=3D=3D> lib/libngatm (depend) =3D=3D=3D> lib/libopie (depend) =3D=3D=3D> lib/libpam (depend) =3D=3D=3D> lib/libpam/modules (depend) =3D=3D=3D> lib/libpam/modules/pam_chroot (depend) =3D=3D=3D> lib/libpam/modules/pam_deny (depend) =3D=3D=3D> lib/libpam/modules/pam_echo (depend) =3D=3D=3D> lib/libpam/modules/pam_exec (depend) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (depend) =3D=3D=3D> lib/libpam/modules/pam_group (depend) =3D=3D=3D> lib/libpam/modules/pam_guest (depend) =3D=3D=3D> lib/libpam/modules/pam_krb5 (depend) =3D=3D=3D> lib/libpam/modules/pam_ksu (depend) =3D=3D=3D> lib/libpam/modules/pam_lastlog (depend) =3D=3D=3D> lib/libpam/modules/pam_login_access (depend) =3D=3D=3D> lib/libpam/modules/pam_nologin (depend) =3D=3D=3D> lib/libpam/modules/pam_opie (depend) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (depend) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (depend) =3D=3D=3D> lib/libpam/modules/pam_permit (depend) =3D=3D=3D> lib/libpam/modules/pam_radius (depend) =3D=3D=3D> lib/libpam/modules/pam_rhosts (depend) =3D=3D=3D> lib/libpam/modules/pam_rootok (depend) =3D=3D=3D> lib/libpam/modules/pam_securetty (depend) =3D=3D=3D> lib/libpam/modules/pam_self (depend) =3D=3D=3D> lib/libpam/modules/pam_ssh (depend) =3D=3D=3D> lib/libpam/modules/pam_tacplus (depend) =3D=3D=3D> lib/libpam/modules/pam_unix (depend) =3D=3D=3D> lib/libpam/libpam (depend) =3D=3D=3D> lib/libpcap (depend) =3D=3D=3D> lib/libpmc (depend) =3D=3D=3D> lib/libproc (depend) =3D=3D=3D> lib/libprocstat (depend) =3D=3D=3D> lib/libprocstat/zfs (depend) =3D=3D=3D> lib/librt (depend) =3D=3D=3D> lib/librtld_db (depend) =3D=3D=3D> lib/libsdp (depend) =3D=3D=3D> lib/libsm (depend) =3D=3D=3D> lib/libsmdb (depend) =3D=3D=3D> lib/libsmutil (depend) =3D=3D=3D> lib/libstand (depend) =3D=3D=3D> lib/libstdbuf (depend) =3D=3D=3D> lib/libstdthreads (depend) =3D=3D=3D> lib/libtelnet (depend) =3D=3D=3D> lib/libthr (depend) =3D=3D=3D> lib/libthread_db (depend) =3D=3D=3D> lib/libufs (depend) =3D=3D=3D> lib/libugidfw (depend) =3D=3D=3D> lib/libulog (depend) =3D=3D=3D> lib/libusbhid (depend) =3D=3D=3D> lib/libusb (depend) =3D=3D=3D> lib/libvgl (depend) =3D=3D=3D> lib/libvmmapi (depend) =3D=3D=3D> lib/libwrap (depend) =3D=3D=3D> lib/liby (depend) =3D=3D=3D> lib/libyaml (depend) =3D=3D=3D> lib/libz (depend) =3D=3D=3D> lib/atf (depend) =3D=3D=3D> lib/atf/libatf-c (depend) =3D=3D=3D> lib/atf/libatf-c++ (depend) =3D=3D=3D> lib/bind (depend) =3D=3D=3D> lib/bind/isc (depend) =3D=3D=3D> lib/bind/isccc (depend) =3D=3D=3D> lib/bind/dns (depend) =3D=3D=3D> lib/bind/isccfg (depend) =3D=3D=3D> lib/bind/bind9 (depend) =3D=3D=3D> lib/bind/lwres (depend) =3D=3D=3D> lib/clang (depend) =3D=3D=3D> lib/clang/libclanganalysis (depend) =3D=3D=3D> lib/clang/libclangarcmigrate (depend) =3D=3D=3D> lib/clang/libclangast (depend) =3D=3D=3D> lib/clang/libclangbasic (depend) =3D=3D=3D> lib/clang/libclangcodegen (depend) =3D=3D=3D> lib/clang/libclangdriver (depend) =3D=3D=3D> lib/clang/libclangedit (depend) =3D=3D=3D> lib/clang/libclangfrontend (depend) =3D=3D=3D> lib/clang/libclangfrontendtool (depend) =3D=3D=3D> lib/clang/libclanglex (depend) =3D=3D=3D> lib/clang/libclangparse (depend) =3D=3D=3D> lib/clang/libclangrewritecore (depend) =3D=3D=3D> lib/clang/libclangrewritefrontend (depend) =3D=3D=3D> lib/clang/libclangsema (depend) =3D=3D=3D> lib/clang/libclangserialization (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzercheckers (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzercore (depend) =3D=3D=3D> lib/clang/libclangstaticanalyzerfrontend (depend) =3D=3D=3D> lib/clang/libllvmanalysis (depend) =3D=3D=3D> lib/clang/libllvmarchive (depend) =3D=3D=3D> lib/clang/libllvmasmparser (depend) =3D=3D=3D> lib/clang/libllvmasmprinter (depend) =3D=3D=3D> lib/clang/libllvmbitreader (depend) =3D=3D=3D> lib/clang/libllvmbitwriter (depend) =3D=3D=3D> lib/clang/libllvmcodegen (depend) =3D=3D=3D> lib/clang/libllvmcore (depend) =3D=3D=3D> lib/clang/libllvminstcombine (depend) =3D=3D=3D> lib/clang/libllvminstrumentation (depend) =3D=3D=3D> lib/clang/libllvmipa (depend) =3D=3D=3D> lib/clang/libllvmipo (depend) =3D=3D=3D> lib/clang/libllvmirreader (depend) =3D=3D=3D> lib/clang/libllvmlinker (depend) =3D=3D=3D> lib/clang/libllvmmc (depend) =3D=3D=3D> lib/clang/libllvmmcparser (depend) =3D=3D=3D> lib/clang/libllvmobjcarcopts (depend) =3D=3D=3D> lib/clang/libllvmobject (depend) =3D=3D=3D> lib/clang/libllvmscalaropts (depend) =3D=3D=3D> lib/clang/libllvmselectiondag (depend) =3D=3D=3D> lib/clang/libllvmsupport (depend) =3D=3D=3D> lib/clang/libllvmtablegen (depend) =3D=3D=3D> lib/clang/libllvmtarget (depend) =3D=3D=3D> lib/clang/libllvmtransformutils (depend) =3D=3D=3D> lib/clang/libllvmvectorize (depend) =3D=3D=3D> lib/clang/libllvmarmasmparser (depend) =3D=3D=3D> lib/clang/libllvmarmcodegen (depend) =3D=3D=3D> lib/clang/libllvmarmdesc (depend) =3D=3D=3D> lib/clang/libllvmarmdisassembler (depend) =3D=3D=3D> lib/clang/libllvmarminfo (depend) =3D=3D=3D> lib/clang/libllvmarminstprinter (depend) =3D=3D=3D> lib/clang/libllvmmipsasmparser (depend) =3D=3D=3D> lib/clang/libllvmmipscodegen (depend) =3D=3D=3D> lib/clang/libllvmmipsdesc (depend) =3D=3D=3D> lib/clang/libllvmmipsdisassembler (depend) =3D=3D=3D> lib/clang/libllvmmipsinfo (depend) =3D=3D=3D> lib/clang/libllvmmipsinstprinter (depend) =3D=3D=3D> lib/clang/libllvmpowerpccodegen (depend) =3D=3D=3D> lib/clang/libllvmpowerpcdesc (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinfo (depend) =3D=3D=3D> lib/clang/libllvmpowerpcinstprinter (depend) =3D=3D=3D> lib/clang/libllvmx86asmparser (depend) =3D=3D=3D> lib/clang/libllvmx86codegen (depend) =3D=3D=3D> lib/clang/libllvmx86desc (depend) =3D=3D=3D> lib/clang/libllvmx86disassembler (depend) =3D=3D=3D> lib/clang/libllvmx86info (depend) =3D=3D=3D> lib/clang/libllvmx86instprinter (depend) =3D=3D=3D> lib/clang/libllvmx86utils (depend) =3D=3D=3D> lib/clang/include (depend) =3D=3D=3D> libexec (depend) =3D=3D=3D> libexec/atf (depend) =3D=3D=3D> libexec/atf/atf-check (depend) =3D=3D=3D> libexec/atrun (depend) =3D=3D=3D> libexec/bootpd (depend) =3D=3D=3D> libexec/bootpd/bootpgw (depend) =3D=3D=3D> libexec/bootpd/tools (depend) =3D=3D=3D> libexec/bootpd/tools/bootpef (depend) =3D=3D=3D> libexec/bootpd/tools/bootptest (depend) =3D=3D=3D> libexec/comsat (depend) =3D=3D=3D> libexec/fingerd (depend) =3D=3D=3D> libexec/ftpd (depend) =3D=3D=3D> libexec/getty (depend) =3D=3D=3D> libexec/mail.local (depend) =3D=3D=3D> libexec/mknetid (depend) =3D=3D=3D> libexec/pppoed (depend) =3D=3D=3D> libexec/rbootd (depend) =3D=3D=3D> libexec/revnetgroup (depend) =3D=3D=3D> libexec/rlogind (depend) =3D=3D=3D> libexec/rpc.rquotad (depend) =3D=3D=3D> libexec/rpc.rstatd (depend) =3D=3D=3D> libexec/rpc.rusersd (depend) =3D=3D=3D> libexec/rpc.rwalld (depend) =3D=3D=3D> libexec/rpc.sprayd (depend) =3D=3D=3D> libexec/rshd (depend) =3D=3D=3D> libexec/rtld-elf (depend) =3D=3D=3D> libexec/save-entropy (depend) =3D=3D=3D> libexec/smrsh (depend) =3D=3D=3D> libexec/talkd (depend) =3D=3D=3D> libexec/tcpd (depend) =3D=3D=3D> libexec/telnetd (depend) =3D=3D=3D> libexec/tftpd (depend) =3D=3D=3D> libexec/tftp-proxy (depend) =3D=3D=3D> libexec/ulog-helper (depend) =3D=3D=3D> libexec/ypxfr (depend) =3D=3D=3D> bin (depend) =3D=3D=3D> bin/cat (depend) =3D=3D=3D> bin/chflags (depend) =3D=3D=3D> bin/chio (depend) =3D=3D=3D> bin/chmod (depend) =3D=3D=3D> bin/cp (depend) =3D=3D=3D> bin/csh (depend) =3D=3D=3D> bin/date (depend) =3D=3D=3D> bin/dd (depend) =3D=3D=3D> bin/df (depend) =3D=3D=3D> bin/domainname (depend) =3D=3D=3D> bin/echo (depend) =3D=3D=3D> bin/ed (depend) =3D=3D=3D> bin/expr (depend) =3D=3D=3D> bin/getfacl (depend) =3D=3D=3D> bin/hostname (depend) =3D=3D=3D> bin/kenv (depend) =3D=3D=3D> bin/kill (depend) =3D=3D=3D> bin/ln (depend) =3D=3D=3D> bin/ls (depend) =3D=3D=3D> bin/mkdir (depend) =3D=3D=3D> bin/mv (depend) =3D=3D=3D> bin/pax (depend) =3D=3D=3D> bin/pkill (depend) =3D=3D=3D> bin/ps (depend) =3D=3D=3D> bin/pwait (depend) =3D=3D=3D> bin/pwd (depend) =3D=3D=3D> bin/rcp (depend) =3D=3D=3D> bin/realpath (depend) =3D=3D=3D> bin/rm (depend) =3D=3D=3D> bin/rmail (depend) =3D=3D=3D> bin/rmdir (depend) =3D=3D=3D> bin/setfacl (depend) =3D=3D=3D> bin/sh (depend) =3D=3D=3D> bin/sleep (depend) =3D=3D=3D> bin/stty (depend) =3D=3D=3D> bin/sync (depend) =3D=3D=3D> bin/test (depend) =3D=3D=3D> bin/uuidgen (depend) =3D=3D=3D> games (depend) =3D=3D=3D> games/bcd (depend) =3D=3D=3D> games/caesar (depend) =3D=3D=3D> games/factor (depend) =3D=3D=3D> games/fortune (depend) =3D=3D=3D> games/fortune/fortune (depend) =3D=3D=3D> games/fortune/strfile (depend) =3D=3D=3D> games/fortune/datfiles (depend) =3D=3D=3D> games/fortune/unstr (depend) =3D=3D=3D> games/grdc (depend) =3D=3D=3D> games/morse (depend) =3D=3D=3D> games/number (depend) =3D=3D=3D> games/pom (depend) =3D=3D=3D> games/ppt (depend) =3D=3D=3D> games/primes (depend) =3D=3D=3D> games/random (depend) =3D=3D=3D> cddl (depend) =3D=3D=3D> cddl/lib (depend) =3D=3D=3D> cddl/lib/drti (depend) =3D=3D=3D> cddl/lib/libavl (depend) =3D=3D=3D> cddl/lib/libctf (depend) =3D=3D=3D> cddl/lib/libdtrace (depend) =3D=3D=3D> cddl/lib/libnvpair (depend) =3D=3D=3D> cddl/lib/libumem (depend) =3D=3D=3D> cddl/lib/libuutil (depend) =3D=3D=3D> cddl/lib/libzfs_core (depend) =3D=3D=3D> cddl/lib/libzfs (depend) =3D=3D=3D> cddl/lib/libzpool (depend) =3D=3D=3D> cddl/sbin (depend) =3D=3D=3D> cddl/sbin/zfs (depend) =3D=3D=3D> cddl/sbin/zpool (depend) =3D=3D=3D> cddl/usr.bin (depend) =3D=3D=3D> cddl/usr.bin/ctfconvert (depend) =3D=3D=3D> cddl/usr.bin/ctfdump (depend) =3D=3D=3D> cddl/usr.bin/ctfmerge (depend) =3D=3D=3D> cddl/usr.bin/sgsmsg (depend) =3D=3D=3D> cddl/usr.bin/zinject (depend) =3D=3D=3D> cddl/usr.bin/zstreamdump (depend) =3D=3D=3D> cddl/usr.bin/ztest (depend) =3D=3D=3D> cddl/usr.sbin (depend) =3D=3D=3D> cddl/usr.sbin/dtrace (depend) =3D=3D=3D> cddl/usr.sbin/dtruss (depend) =3D=3D=3D> cddl/usr.sbin/lockstat (depend) =3D=3D=3D> cddl/usr.sbin/zdb (depend) =3D=3D=3D> cddl/usr.sbin/zhack (depend) =3D=3D=3D> gnu (depend) =3D=3D=3D> gnu/lib (depend) =3D=3D=3D> gnu/lib/csu (depend) =3D=3D=3D> gnu/lib/libgcc (depend) =3D=3D=3D> gnu/lib/libgcov (depend) =3D=3D=3D> gnu/lib/libdialog (depend) =3D=3D=3D> gnu/lib/libgomp (depend) =3D=3D=3D> gnu/lib/libregex (depend) =3D=3D=3D> gnu/lib/libregex/doc (depend) =3D=3D=3D> gnu/lib/libreadline (depend) =3D=3D=3D> gnu/lib/libreadline/history (depend) =3D=3D=3D> gnu/lib/libreadline/history/doc (depend) =3D=3D=3D> gnu/lib/libreadline/readline (depend) =3D=3D=3D> gnu/lib/libreadline/readline/doc (depend) =3D=3D=3D> gnu/lib/libssp (depend) =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (depend) =3D=3D=3D> gnu/lib/libstdc++ (depend) =3D=3D=3D> gnu/lib/libsupc++ (depend) =3D=3D=3D> gnu/usr.bin (depend) =3D=3D=3D> gnu/usr.bin/binutils (depend) =3D=3D=3D> gnu/usr.bin/binutils/libiberty (depend) =3D=3D=3D> gnu/usr.bin/binutils/libbfd (depend) =3D=3D=3D> gnu/usr.bin/binutils/libopcodes (depend) =3D=3D=3D> gnu/usr.bin/binutils/libbinutils (depend) =3D=3D=3D> gnu/usr.bin/binutils/addr2line (depend) =3D=3D=3D> gnu/usr.bin/binutils/ar (depend) =3D=3D=3D> gnu/usr.bin/binutils/as (depend) =3D=3D=3D> gnu/usr.bin/binutils/ld (depend) =3D=3D=3D> gnu/usr.bin/binutils/nm (depend) =3D=3D=3D> gnu/usr.bin/binutils/objcopy (depend) =3D=3D=3D> gnu/usr.bin/binutils/objdump (depend) =3D=3D=3D> gnu/usr.bin/binutils/ranlib (depend) =3D=3D=3D> gnu/usr.bin/binutils/readelf (depend) =3D=3D=3D> gnu/usr.bin/binutils/size (depend) =3D=3D=3D> gnu/usr.bin/binutils/strings (depend) =3D=3D=3D> gnu/usr.bin/binutils/strip (depend) =3D=3D=3D> gnu/usr.bin/binutils/doc (depend) =3D=3D=3D> gnu/usr.bin/cc (depend) =3D=3D=3D> gnu/usr.bin/cc/cc_tools (depend) =3D=3D=3D> gnu/usr.bin/cc/libiberty (depend) =3D=3D=3D> gnu/usr.bin/cc/libcpp (depend) =3D=3D=3D> gnu/usr.bin/cc/libdecnumber (depend) =3D=3D=3D> gnu/usr.bin/cc/cc_int (depend) =3D=3D=3D> gnu/usr.bin/cc/cc (depend) =3D=3D=3D> gnu/usr.bin/cc/cc1 (depend) =3D=3D=3D> gnu/usr.bin/cc/include (depend) =3D=3D=3D> gnu/usr.bin/cc/doc (depend) =3D=3D=3D> gnu/usr.bin/cc/cpp (depend) =3D=3D=3D> gnu/usr.bin/cc/cc1plus (depend) =3D=3D=3D> gnu/usr.bin/cc/c++ (depend) =3D=3D=3D> gnu/usr.bin/cc/c++filt (depend) =3D=3D=3D> gnu/usr.bin/cc/gcov (depend) =3D=3D=3D> gnu/usr.bin/cvs (depend) =3D=3D=3D> gnu/usr.bin/cvs/lib (depend) =3D=3D=3D> gnu/usr.bin/cvs/libdiff (depend) =3D=3D=3D> gnu/usr.bin/cvs/cvs (depend) =3D=3D=3D> gnu/usr.bin/cvs/contrib (depend) =3D=3D=3D> gnu/usr.bin/cvs/cvsbug (depend) =3D=3D=3D> gnu/usr.bin/cvs/doc (depend) =3D=3D=3D> gnu/usr.bin/dialog (depend) =3D=3D=3D> gnu/usr.bin/diff (depend) =3D=3D=3D> gnu/usr.bin/diff/doc (depend) =3D=3D=3D> gnu/usr.bin/diff3 (depend) =3D=3D=3D> gnu/usr.bin/gdb (depend) =3D=3D=3D> gnu/usr.bin/gdb/doc (depend) =3D=3D=3D> gnu/usr.bin/gdb/libgdb (depend) =3D=3D=3D> gnu/usr.bin/gdb/gdb (depend) =3D=3D=3D> gnu/usr.bin/gdb/gdbtui (depend) =3D=3D=3D> gnu/usr.bin/gdb/kgdb (depend) =3D=3D=3D> gnu/usr.bin/gdb/gdbserver (depend) =3D=3D=3D> gnu/usr.bin/gperf (depend) =3D=3D=3D> gnu/usr.bin/gperf/doc (depend) =3D=3D=3D> gnu/usr.bin/grep (depend) =3D=3D=3D> gnu/usr.bin/grep/doc (depend) =3D=3D=3D> gnu/usr.bin/groff (depend) =3D=3D=3D> gnu/usr.bin/groff/contrib (depend) =3D=3D=3D> gnu/usr.bin/groff/contrib/mm (depend) =3D=3D=3D> gnu/usr.bin/groff/doc (depend) =3D=3D=3D> gnu/usr.bin/groff/font (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX100 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX100-12 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX75 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devX75-12 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devascii (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devcp1047 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devdvi (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devhtml (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devkoi8-r (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlatin1 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlbp (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devlj4 (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devps (depend) =3D=3D=3D> gnu/usr.bin/groff/font/devutf8 (depend) =3D=3D=3D> gnu/usr.bin/groff/man (depend) =3D=3D=3D> gnu/usr.bin/groff/src (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libgroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libdriver (depend) =3D=3D=3D> gnu/usr.bin/groff/src/libs/libbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grodvi (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grohtml (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolbp (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grolj4 (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grops (depend) =3D=3D=3D> gnu/usr.bin/groff/src/devices/grotty (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/eqn (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/grn (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/html (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/pic (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/refer (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/soelim (depend) =3D=3D=3D> gnu/usr.bin/groff/src/preproc/tbl (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/groff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/grog (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/nroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/psroff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/roff/troff (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/addftinfo (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/afmtodit (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/hpftodit (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/indxbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lkbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/lookbib (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/pfbtops (depend) =3D=3D=3D> gnu/usr.bin/groff/src/utils/tfmtodit (depend) =3D=3D=3D> gnu/usr.bin/groff/tmac (depend) =3D=3D=3D> gnu/usr.bin/patch (depend) =3D=3D=3D> gnu/usr.bin/rcs (depend) =3D=3D=3D> gnu/usr.bin/rcs/lib (depend) =3D=3D=3D> gnu/usr.bin/rcs/ci (depend) =3D=3D=3D> gnu/usr.bin/rcs/co (depend) =3D=3D=3D> gnu/usr.bin/rcs/ident (depend) =3D=3D=3D> gnu/usr.bin/rcs/merge (depend) =3D=3D=3D> gnu/usr.bin/rcs/rcs (depend) =3D=3D=3D> gnu/usr.bin/rcs/rcsclean (depend) =3D=3D=3D> gnu/usr.bin/rcs/rcsdiff (depend) =3D=3D=3D> gnu/usr.bin/rcs/rcsmerge (depend) =3D=3D=3D> gnu/usr.bin/rcs/rlog (depend) =3D=3D=3D> gnu/usr.bin/rcs/rcsfreeze (depend) =3D=3D=3D> gnu/usr.bin/sdiff (depend) =3D=3D=3D> gnu/usr.bin/send-pr (depend) =3D=3D=3D> gnu/usr.bin/send-pr/doc (depend) =3D=3D=3D> gnu/usr.bin/texinfo (depend) =3D=3D=3D> gnu/usr.bin/texinfo/libtxi (depend) =3D=3D=3D> gnu/usr.bin/texinfo/makeinfo (depend) =3D=3D=3D> gnu/usr.bin/texinfo/info (depend) =3D=3D=3D> gnu/usr.bin/texinfo/infokey (depend) =3D=3D=3D> gnu/usr.bin/texinfo/install-info (depend) =3D=3D=3D> gnu/usr.bin/texinfo/texindex (depend) =3D=3D=3D> gnu/usr.bin/texinfo/doc (depend) =3D=3D=3D> include (depend) =3D=3D=3D> include/arpa (depend) =3D=3D=3D> include/gssapi (depend) =3D=3D=3D> include/protocols (depend) =3D=3D=3D> include/rpcsvc (depend) =3D=3D=3D> include/rpc (depend) =3D=3D=3D> include/xlocale (depend) =3D=3D=3D> kerberos5 (depend) =3D=3D=3D> kerberos5/doc (depend) =3D=3D=3D> kerberos5/lib (depend) =3D=3D=3D> kerberos5/lib/libasn1 (depend) =3D=3D=3D> kerberos5/lib/libgssapi_krb5 (depend) =3D=3D=3D> kerberos5/lib/libgssapi_ntlm (depend) =3D=3D=3D> kerberos5/lib/libgssapi_spnego (depend) =3D=3D=3D> kerberos5/lib/libhdb (depend) =3D=3D=3D> kerberos5/lib/libheimntlm (depend) =3D=3D=3D> kerberos5/lib/libhx509 (depend) =3D=3D=3D> kerberos5/lib/libkadm5clnt (depend) =3D=3D=3D> kerberos5/lib/libkadm5srv (depend) =3D=3D=3D> kerberos5/lib/libkafs5 (depend) =3D=3D=3D> kerberos5/lib/libkrb5 (depend) =3D=3D=3D> kerberos5/lib/libroken (depend) =3D=3D=3D> kerberos5/lib/libsl (depend) =3D=3D=3D> kerberos5/lib/libvers (depend) =3D=3D=3D> kerberos5/lib/libkdc (depend) =3D=3D=3D> kerberos5/lib/libwind (depend) =3D=3D=3D> kerberos5/lib/libheimsqlite (depend) =3D=3D=3D> kerberos5/lib/libheimbase (depend) =3D=3D=3D> kerberos5/lib/libheimipcc (depend) =3D=3D=3D> kerberos5/lib/libheimipcs (depend) =3D=3D=3D> kerberos5/libexec (depend) =3D=3D=3D> kerberos5/libexec/digest-service (depend) =3D=3D=3D> kerberos5/libexec/ipropd-master (depend) =3D=3D=3D> kerberos5/libexec/ipropd-slave (depend) =3D=3D=3D> kerberos5/libexec/hprop (depend) =3D=3D=3D> kerberos5/libexec/hpropd (depend) =3D=3D=3D> kerberos5/libexec/kadmind (depend) =3D=3D=3D> kerberos5/libexec/kdc (depend) =3D=3D=3D> kerberos5/libexec/kdigest (depend) =3D=3D=3D> kerberos5/libexec/kfd (depend) =3D=3D=3D> kerberos5/libexec/kimpersonate (depend) =3D=3D=3D> kerberos5/libexec/kpasswdd (depend) =3D=3D=3D> kerberos5/libexec/kcm (depend) =3D=3D=3D> kerberos5/tools (depend) =3D=3D=3D> kerberos5/tools/make-roken (depend) =3D=3D=3D> kerberos5/tools/asn1_compile (depend) =3D=3D=3D> kerberos5/tools/slc (depend) =3D=3D=3D> kerberos5/usr.bin (depend) =3D=3D=3D> kerberos5/usr.bin/hxtool (depend) =3D=3D=3D> kerberos5/usr.bin/kadmin (depend) =3D=3D=3D> kerberos5/usr.bin/kcc (depend) =3D=3D=3D> kerberos5/usr.bin/kdestroy (depend) =3D=3D=3D> kerberos5/usr.bin/kgetcred (depend) =3D=3D=3D> kerberos5/usr.bin/kf (depend) =3D=3D=3D> kerberos5/usr.bin/kinit (depend) =3D=3D=3D> kerberos5/usr.bin/kpasswd (depend) =3D=3D=3D> kerberos5/usr.bin/krb5-config (depend) =3D=3D=3D> kerberos5/usr.bin/ksu (depend) =3D=3D=3D> kerberos5/usr.bin/string2key (depend) =3D=3D=3D> kerberos5/usr.bin/verify_krb5_conf (depend) =3D=3D=3D> kerberos5/usr.sbin (depend) =3D=3D=3D> kerberos5/usr.sbin/iprop-log (depend) =3D=3D=3D> kerberos5/usr.sbin/kstash (depend) =3D=3D=3D> kerberos5/usr.sbin/ktutil (depend) =3D=3D=3D> rescue (depend) =3D=3D=3D> rescue/librescue (depend) =3D=3D=3D> rescue/rescue (depend) =3D=3D=3D> sbin (depend) =3D=3D=3D> sbin/adjkerntz (depend) =3D=3D=3D> sbin/atm (depend) =3D=3D=3D> sbin/atm/atmconfig (depend) =3D=3D=3D> sbin/badsect (depend) =3D=3D=3D> sbin/bsdlabel (depend) =3D=3D=3D> sbin/camcontrol (depend) =3D=3D=3D> sbin/ccdconfig (depend) =3D=3D=3D> sbin/clri (depend) =3D=3D=3D> sbin/comcontrol (depend) =3D=3D=3D> sbin/conscontrol (depend) =3D=3D=3D> sbin/ddb (depend) =3D=3D=3D> sbin/devd (depend) =3D=3D=3D> sbin/devfs (depend) =3D=3D=3D> sbin/dhclient (depend) =3D=3D=3D> sbin/dmesg (depend) =3D=3D=3D> sbin/dump (depend) =3D=3D=3D> sbin/dumpfs (depend) =3D=3D=3D> sbin/dumpon (depend) =3D=3D=3D> sbin/etherswitchcfg (depend) =3D=3D=3D> sbin/fdisk (depend) =3D=3D=3D> sbin/ffsinfo (depend) =3D=3D=3D> sbin/fsck (depend) =3D=3D=3D> sbin/fsck_ffs (depend) =3D=3D=3D> sbin/fsck_msdosfs (depend) =3D=3D=3D> sbin/fsdb (depend) =3D=3D=3D> sbin/fsirand (depend) =3D=3D=3D> sbin/gbde (depend) =3D=3D=3D> sbin/geom (depend) =3D=3D=3D> sbin/geom/core (depend) =3D=3D=3D> sbin/geom/class (depend) =3D=3D=3D> sbin/geom/class/cache (depend) =3D=3D=3D> sbin/geom/class/concat (depend) =3D=3D=3D> sbin/geom/class/eli (depend) =3D=3D=3D> sbin/geom/class/journal (depend) =3D=3D=3D> sbin/geom/class/label (depend) =3D=3D=3D> sbin/geom/class/mirror (depend) =3D=3D=3D> sbin/geom/class/mountver (depend) =3D=3D=3D> sbin/geom/class/multipath (depend) =3D=3D=3D> sbin/geom/class/nop (depend) =3D=3D=3D> sbin/geom/class/part (depend) =3D=3D=3D> sbin/geom/class/raid (depend) =3D=3D=3D> sbin/geom/class/raid3 (depend) =3D=3D=3D> sbin/geom/class/sched (depend) =3D=3D=3D> sbin/geom/class/shsec (depend) =3D=3D=3D> sbin/geom/class/stripe (depend) =3D=3D=3D> sbin/geom/class/virstor (depend) =3D=3D=3D> sbin/ggate (depend) =3D=3D=3D> sbin/ggate/ggatec (depend) =3D=3D=3D> sbin/ggate/ggated (depend) =3D=3D=3D> sbin/ggate/ggatel (depend) =3D=3D=3D> sbin/growfs (depend) =3D=3D=3D> sbin/gvinum (depend) =3D=3D=3D> sbin/hastctl (depend) =3D=3D=3D> sbin/hastd (depend) =3D=3D=3D> sbin/ifconfig (depend) =3D=3D=3D> sbin/init (depend) =3D=3D=3D> sbin/ipf (depend) =3D=3D=3D> sbin/ipf/libipf (depend) =3D=3D=3D> sbin/ipf/ipf (depend) =3D=3D=3D> sbin/ipf/ipfs (depend) =3D=3D=3D> sbin/ipf/ipfstat (depend) =3D=3D=3D> sbin/ipf/ipftest (depend) =3D=3D=3D> sbin/ipf/ipmon (depend) =3D=3D=3D> sbin/ipf/ipnat (depend) =3D=3D=3D> sbin/ipf/ippool (depend) =3D=3D=3D> sbin/ipf/ipresend (depend) =3D=3D=3D> sbin/ipfw (depend) =3D=3D=3D> sbin/iscontrol (depend) =3D=3D=3D> sbin/kldconfig (depend) =3D=3D=3D> sbin/kldload (depend) =3D=3D=3D> sbin/kldstat (depend) =3D=3D=3D> sbin/kldunload (depend) =3D=3D=3D> sbin/ldconfig (depend) =3D=3D=3D> sbin/md5 (depend) =3D=3D=3D> sbin/mdconfig (depend) =3D=3D=3D> sbin/mdmfs (depend) =3D=3D=3D> sbin/mknod (depend) =3D=3D=3D> sbin/mksnap_ffs (depend) =3D=3D=3D> sbin/mount (depend) =3D=3D=3D> sbin/mount_cd9660 (depend) =3D=3D=3D> sbin/mount_fusefs (depend) =3D=3D=3D> sbin/mount_msdosfs (depend) =3D=3D=3D> sbin/mount_nfs (depend) =3D=3D=3D> sbin/mount_nullfs (depend) =3D=3D=3D> sbin/mount_udf (depend) =3D=3D=3D> sbin/mount_unionfs (depend) =3D=3D=3D> sbin/natd (depend) =3D=3D=3D> sbin/newfs (depend) =3D=3D=3D> sbin/newfs_msdos (depend) =3D=3D=3D> sbin/nfsiod (depend) =3D=3D=3D> sbin/nos-tun (depend) =3D=3D=3D> sbin/nvmecontrol (depend) =3D=3D=3D> sbin/pfctl (depend) =3D=3D=3D> sbin/pflogd (depend) =3D=3D=3D> sbin/ping (depend) =3D=3D=3D> sbin/ping6 (depend) =3D=3D=3D> sbin/quotacheck (depend) =3D=3D=3D> sbin/rcorder (depend) =3D=3D=3D> sbin/reboot (depend) =3D=3D=3D> sbin/recoverdisk (depend) =3D=3D=3D> sbin/resolvconf (depend) =3D=3D=3D> sbin/restore (depend) =3D=3D=3D> sbin/route (depend) =3D=3D=3D> sbin/routed (depend) =3D=3D=3D> sbin/routed/rtquery (depend) =3D=3D=3D> sbin/rtsol (depend) =3D=3D=3D> sbin/savecore (depend) =3D=3D=3D> sbin/setkey (depend) =3D=3D=3D> sbin/shutdown (depend) =3D=3D=3D> sbin/spppcontrol (depend) =3D=3D=3D> sbin/swapon (depend) =3D=3D=3D> sbin/sysctl (depend) =3D=3D=3D> sbin/tunefs (depend) =3D=3D=3D> sbin/umount (depend) =3D=3D=3D> secure (depend) =3D=3D=3D> secure/lib (depend) =3D=3D=3D> secure/lib/libcrypto (depend) =3D=3D=3D> secure/lib/libcrypto/engines (depend) =3D=3D=3D> secure/lib/libcrypto/engines/lib4758cca (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libaep (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libatalla (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libchil (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libcswift (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libgost (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libnuron (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libsureware (depend) =3D=3D=3D> secure/lib/libcrypto/engines/libubsec (depend) =3D=3D=3D> secure/lib/libssl (depend) =3D=3D=3D> secure/lib/libssh (depend) =3D=3D=3D> secure/libexec (depend) =3D=3D=3D> secure/libexec/sftp-server (depend) =3D=3D=3D> secure/libexec/ssh-keysign (depend) =3D=3D=3D> secure/libexec/ssh-pkcs11-helper (depend) =3D=3D=3D> secure/usr.bin (depend) =3D=3D=3D> secure/usr.bin/bdes (depend) =3D=3D=3D> secure/usr.bin/openssl (depend) =3D=3D=3D> secure/usr.bin/scp (depend) =3D=3D=3D> secure/usr.bin/sftp (depend) =3D=3D=3D> secure/usr.bin/ssh (depend) =3D=3D=3D> secure/usr.bin/ssh-add (depend) =3D=3D=3D> secure/usr.bin/ssh-agent (depend) =3D=3D=3D> secure/usr.bin/ssh-keygen (depend) =3D=3D=3D> secure/usr.bin/ssh-keyscan (depend) =3D=3D=3D> secure/usr.sbin (depend) =3D=3D=3D> secure/usr.sbin/sshd (depend) =3D=3D=3D> share (depend) =3D=3D=3D> share/atf (depend) =3D=3D=3D> share/colldef (depend) =3D=3D=3D> share/dict (depend) =3D=3D=3D> share/doc (depend) =3D=3D=3D> share/doc/IPv6 (depend) =3D=3D=3D> share/doc/atf (depend) =3D=3D=3D> share/doc/bind9 (depend) =3D=3D=3D> share/doc/legal (depend) =3D=3D=3D> share/doc/legal/intel_ipw (depend) =3D=3D=3D> share/doc/legal/intel_iwi (depend) =3D=3D=3D> share/doc/legal/intel_iwn (depend) =3D=3D=3D> share/doc/legal/intel_wpi (depend) =3D=3D=3D> share/doc/llvm (depend) =3D=3D=3D> share/doc/llvm/clang (depend) =3D=3D=3D> share/doc/papers (depend) =3D=3D=3D> share/doc/papers/beyond4.3 (depend) =3D=3D=3D> share/doc/papers/bufbio (depend) =3D=3D=3D> share/doc/papers/contents (depend) =3D=3D=3D> share/doc/papers/devfs (depend) =3D=3D=3D> share/doc/papers/diskperf (depend) =3D=3D=3D> share/doc/papers/fsinterface (depend) =3D=3D=3D> share/doc/papers/hwpmc (depend) =3D=3D=3D> share/doc/papers/jail (depend) =3D=3D=3D> share/doc/papers/kernmalloc (depend) =3D=3D=3D> share/doc/papers/kerntune (depend) =3D=3D=3D> share/doc/papers/malloc (depend) =3D=3D=3D> share/doc/papers/newvm (depend) =3D=3D=3D> share/doc/papers/relengr (depend) =3D=3D=3D> share/doc/papers/sysperf (depend) =3D=3D=3D> share/doc/papers/timecounter (depend) =3D=3D=3D> share/doc/psd (depend) =3D=3D=3D> share/doc/psd/title (depend) =3D=3D=3D> share/doc/psd/contents (depend) =3D=3D=3D> share/doc/psd/01.cacm (depend) =3D=3D=3D> share/doc/psd/02.implement (depend) =3D=3D=3D> share/doc/psd/03.iosys (depend) =3D=3D=3D> share/doc/psd/04.uprog (depend) =3D=3D=3D> share/doc/psd/05.sysman (depend) =3D=3D=3D> share/doc/psd/06.Clang (depend) =3D=3D=3D> share/doc/psd/12.make (depend) =3D=3D=3D> share/doc/psd/13.rcs (depend) =3D=3D=3D> share/doc/psd/13.rcs/rcs (depend) =3D=3D=3D> share/doc/psd/13.rcs/rcs_func (depend) =3D=3D=3D> share/doc/psd/15.yacc (depend) =3D=3D=3D> share/doc/psd/16.lex (depend) =3D=3D=3D> share/doc/psd/17.m4 (depend) =3D=3D=3D> share/doc/psd/18.gprof (depend) =3D=3D=3D> share/doc/psd/20.ipctut (depend) =3D=3D=3D> share/doc/psd/21.ipc (depend) =3D=3D=3D> share/doc/psd/22.rpcgen (depend) =3D=3D=3D> share/doc/psd/23.rpc (depend) =3D=3D=3D> share/doc/psd/24.xdr (depend) =3D=3D=3D> share/doc/psd/25.xdrrfc (depend) =3D=3D=3D> share/doc/psd/26.rpcrfc (depend) =3D=3D=3D> share/doc/psd/27.nfsrpc (depend) =3D=3D=3D> share/doc/psd/28.cvs (depend) =3D=3D=3D> share/doc/smm (depend) =3D=3D=3D> share/doc/smm/title (depend) =3D=3D=3D> share/doc/smm/contents (depend) =3D=3D=3D> share/doc/smm/01.setup (depend) =3D=3D=3D> share/doc/smm/02.config (depend) =3D=3D=3D> share/doc/smm/03.fsck (depend) =3D=3D=3D> share/doc/smm/04.quotas (depend) =3D=3D=3D> share/doc/smm/05.fastfs (depend) =3D=3D=3D> share/doc/smm/06.nfs (depend) =3D=3D=3D> share/doc/smm/07.lpd (depend) =3D=3D=3D> share/doc/smm/08.sendmailop (depend) =3D=3D=3D> share/doc/smm/11.timedop (depend) =3D=3D=3D> share/doc/smm/12.timed (depend) =3D=3D=3D> share/doc/smm/18.net (depend) =3D=3D=3D> share/doc/usd (depend) =3D=3D=3D> share/doc/usd/title (depend) =3D=3D=3D> share/doc/usd/contents (depend) =3D=3D=3D> share/doc/usd/04.csh (depend) =3D=3D=3D> share/doc/usd/05.dc (depend) =3D=3D=3D> share/doc/usd/06.bc (depend) =3D=3D=3D> share/doc/usd/07.mail (depend) =3D=3D=3D> share/doc/usd/10.exref (depend) =3D=3D=3D> share/doc/usd/10.exref/exref (depend) =3D=3D=3D> share/doc/usd/10.exref/summary (depend) =3D=3D=3D> share/doc/usd/11.vitut (depend) =3D=3D=3D> share/doc/usd/12.vi (depend) =3D=3D=3D> share/doc/usd/12.vi/vi (depend) =3D=3D=3D> share/doc/usd/12.vi/viapwh (depend) =3D=3D=3D> share/doc/usd/12.vi/summary (depend) =3D=3D=3D> share/doc/usd/13.viref (depend) =3D=3D=3D> share/doc/usd/18.msdiffs (depend) =3D=3D=3D> share/doc/usd/19.memacros (depend) =3D=3D=3D> share/doc/usd/20.meref (depend) =3D=3D=3D> share/doc/usd/21.troff (depend) =3D=3D=3D> share/doc/usd/22.trofftut (depend) =3D=3D=3D> share/dtrace (depend) =3D=3D=3D> share/dtrace/toolkit (depend) =3D=3D=3D> share/examples (depend) =3D=3D=3D> share/examples/atf (depend) =3D=3D=3D> share/examples/ipfilter (depend) =3D=3D=3D> share/examples/pf (depend) =3D=3D=3D> share/man (depend) =3D=3D=3D> share/man/man1 (depend) =3D=3D=3D> share/man/man3 (depend) =3D=3D=3D> share/man/man4 (depend) =3D=3D=3D> share/man/man5 (depend) =3D=3D=3D> share/man/man6 (depend) =3D=3D=3D> share/man/man7 (depend) =3D=3D=3D> share/man/man8 (depend) =3D=3D=3D> share/man/man9 (depend) =3D=3D=3D> share/me (depend) =3D=3D=3D> share/misc (depend) =3D=3D=3D> share/mk (depend) =3D=3D=3D> share/mklocale (depend) =3D=3D=3D> share/monetdef (depend) =3D=3D=3D> share/msgdef (depend) =3D=3D=3D> share/numericdef (depend) =3D=3D=3D> share/sendmail (depend) =3D=3D=3D> share/skel (depend) =3D=3D=3D> share/snmp (depend) =3D=3D=3D> share/snmp/mibs (depend) =3D=3D=3D> share/syscons (depend) =3D=3D=3D> share/syscons/fonts (depend) =3D=3D=3D> share/syscons/keymaps (depend) =3D=3D=3D> share/syscons/scrnmaps (depend) =3D=3D=3D> share/tabset (depend) =3D=3D=3D> share/termcap (depend) =3D=3D=3D> share/timedef (depend) =3D=3D=3D> share/xml (depend) =3D=3D=3D> share/xml/atf (depend) =3D=3D=3D> share/xsl (depend) =3D=3D=3D> share/xsl/atf (depend) =3D=3D=3D> share/zoneinfo (depend) =3D=3D=3D> sys (depend) =3D=3D=3D> sys/boot (depend) =3D=3D=3D> sys/boot/efi (depend) =3D=3D=3D> sys/boot/efi/libefi (depend) =3D=3D=3D> sys/boot/zfs (depend) =3D=3D=3D> sys/boot/userboot (depend) =3D=3D=3D> sys/boot/userboot/ficl (depend) =3D=3D=3D> sys/boot/userboot/libstand (depend) =3D=3D=3D> sys/boot/userboot/test (depend) =3D=3D=3D> sys/boot/userboot/userboot (depend) =3D=3D=3D> sys/boot/ficl (depend) =3D=3D=3D> sys/boot/i386 (depend) =3D=3D=3D> sys/boot/i386/mbr (depend) rm -f .depend =3D=3D=3D> sys/boot/i386/pmbr (depend) rm -f .depend =3D=3D=3D> sys/boot/i386/boot0 (depend) =3D=3D=3D> sys/boot/i386/boot0sio (depend) =3D=3D=3D> sys/boot/i386/btx (depend) =3D=3D=3D> sys/boot/i386/btx/btx (depend) =3D=3D=3D> sys/boot/i386/btx/btxldr (depend) =3D=3D=3D> sys/boot/i386/btx/lib (depend) =3D=3D=3D> sys/boot/i386/boot2 (depend) =3D=3D=3D> sys/boot/i386/cdboot (depend) =3D=3D=3D> sys/boot/i386/gptboot (depend) =3D=3D=3D> sys/boot/i386/kgzldr (depend) =3D=3D=3D> sys/boot/i386/libi386 (depend) =3D=3D=3D> sys/boot/i386/libfirewire (depend) =3D=3D=3D> sys/boot/i386/loader (depend) =3D=3D=3D> sys/boot/i386/pxeldr (depend) =3D=3D=3D> sys/boot/i386/zfsboot (depend) =3D=3D=3D> sys/boot/i386/gptzfsboot (depend) =3D=3D=3D> sys/boot/i386/zfsloader (depend) =3D=3D=3D> usr.bin (depend) =3D=3D=3D> usr.bin/alias (depend) =3D=3D=3D> usr.bin/apply (depend) =3D=3D=3D> usr.bin/ar (depend) =3D=3D=3D> usr.bin/asa (depend) =3D=3D=3D> usr.bin/at (depend) =3D=3D=3D> usr.bin/atf (depend) =3D=3D=3D> usr.bin/atf/atf-config (depend) =3D=3D=3D> usr.bin/atf/atf-report (depend) =3D=3D=3D> usr.bin/atf/atf-run (depend) =3D=3D=3D> usr.bin/atf/atf-sh (depend) =3D=3D=3D> usr.bin/atf/atf-version (depend) =3D=3D=3D> usr.bin/atm (depend) =3D=3D=3D> usr.bin/atm/sscop (depend) =3D=3D=3D> usr.bin/awk (depend) =3D=3D=3D> usr.bin/banner (depend) =3D=3D=3D> usr.bin/basename (depend) =3D=3D=3D> usr.bin/bc (depend) =3D=3D=3D> usr.bin/biff (depend) =3D=3D=3D> usr.bin/bluetooth (depend) =3D=3D=3D> usr.bin/bluetooth/bthost (depend) =3D=3D=3D> usr.bin/bluetooth/btsockstat (depend) =3D=3D=3D> usr.bin/bluetooth/rfcomm_sppd (depend) =3D=3D=3D> usr.bin/bmake (depend) =3D=3D=3D> usr.bin/brandelf (depend) =3D=3D=3D> usr.bin/bsdiff (depend) =3D=3D=3D> usr.bin/bsdiff/bsdiff (depend) =3D=3D=3D> usr.bin/bsdiff/bspatch (depend) =3D=3D=3D> usr.bin/bzip2 (depend) =3D=3D=3D> usr.bin/bzip2recover (depend) =3D=3D=3D> usr.bin/c89 (depend) =3D=3D=3D> usr.bin/c99 (depend) =3D=3D=3D> usr.bin/calendar (depend) =3D=3D=3D> usr.bin/cap_mkdb (depend) =3D=3D=3D> usr.bin/catman (depend) =3D=3D=3D> usr.bin/chat (depend) =3D=3D=3D> usr.bin/checknr (depend) =3D=3D=3D> usr.bin/chkey (depend) =3D=3D=3D> usr.bin/chpass (depend) =3D=3D=3D> usr.bin/cksum (depend) =3D=3D=3D> usr.bin/clang (depend) =3D=3D=3D> usr.bin/clang/clang (depend) =3D=3D=3D> usr.bin/clang/clang-tblgen (depend) =3D=3D=3D> usr.bin/clang/tblgen (depend) =3D=3D=3D> usr.bin/cmp (depend) =3D=3D=3D> usr.bin/col (depend) =3D=3D=3D> usr.bin/colcrt (depend) =3D=3D=3D> usr.bin/colldef (depend) =3D=3D=3D> usr.bin/colrm (depend) =3D=3D=3D> usr.bin/column (depend) =3D=3D=3D> usr.bin/comm (depend) =3D=3D=3D> usr.bin/compile_et (depend) =3D=3D=3D> usr.bin/compress (depend) =3D=3D=3D> usr.bin/cpio (depend) =3D=3D=3D> usr.bin/cpuset (depend) =3D=3D=3D> usr.bin/csplit (depend) =3D=3D=3D> usr.bin/csup (depend) =3D=3D=3D> usr.bin/ctags (depend) =3D=3D=3D> usr.bin/ctlstat (depend) =3D=3D=3D> usr.bin/cut (depend) =3D=3D=3D> usr.bin/dc (depend) =3D=3D=3D> usr.bin/dig (depend) =3D=3D=3D> usr.bin/dirname (depend) =3D=3D=3D> usr.bin/dtc (depend) =3D=3D=3D> usr.bin/du (depend) =3D=3D=3D> usr.bin/ee (depend) =3D=3D=3D> usr.bin/elf2aout (depend) =3D=3D=3D> usr.bin/elfdump (depend) =3D=3D=3D> usr.bin/enigma (depend) =3D=3D=3D> usr.bin/env (depend) =3D=3D=3D> usr.bin/expand (depend) =3D=3D=3D> usr.bin/false (depend) =3D=3D=3D> usr.bin/fetch (depend) =3D=3D=3D> usr.bin/file (depend) =3D=3D=3D> usr.bin/file2c (depend) =3D=3D=3D> usr.bin/find (depend) =3D=3D=3D> usr.bin/finger (depend) =3D=3D=3D> usr.bin/fmt (depend) =3D=3D=3D> usr.bin/fold (depend) =3D=3D=3D> usr.bin/from (depend) =3D=3D=3D> usr.bin/fstat (depend) =3D=3D=3D> usr.bin/fsync (depend) =3D=3D=3D> usr.bin/ftp (depend) =3D=3D=3D> usr.bin/gcore (depend) =3D=3D=3D> usr.bin/gencat (depend) =3D=3D=3D> usr.bin/getconf (depend) =3D=3D=3D> usr.bin/getent (depend) =3D=3D=3D> usr.bin/getopt (depend) =3D=3D=3D> usr.bin/gprof (depend) =3D=3D=3D> usr.bin/grep (depend) =3D=3D=3D> usr.bin/gzip (depend) =3D=3D=3D> usr.bin/head (depend) =3D=3D=3D> usr.bin/hexdump (depend) =3D=3D=3D> usr.bin/host (depend) =3D=3D=3D> usr.bin/id (depend) =3D=3D=3D> usr.bin/indent (depend) =3D=3D=3D> usr.bin/ipcrm (depend) =3D=3D=3D> usr.bin/ipcs (depend) =3D=3D=3D> usr.bin/join (depend) =3D=3D=3D> usr.bin/jot (depend) =3D=3D=3D> usr.bin/kdump (depend) sh /zbuilder/buildd/head/usr.bin/kdump/mksubr /usr/obj/zbuilder/buildd/head= /tmp/usr/include >kdump_subr.c env MACHINE=3Damd64 CPP=3D"cpp " sh /zbuilder/buildd/head/usr.bin/kdump/mk= ioctls print /usr/obj/zbuilder/buildd/head/tmp/usr/include > ioctl.c rm -f .depend CC=3D'cc ' mkdep -f .depend -a -I/zbuilder/buildd/head/usr.bin/kdump/../= ktrace -I/zbuilder/buildd/head/usr.bin/kdump -I/zbuilder/buildd/head/usr.bi= n/kdump/../.. -I. -std=3Dgnu99 kdump_subr.c /zbuilder/buildd/head/usr.bin= /kdump/kdump.c ioctl.c /zbuilder/buildd/head/usr.bin/kdump/../ktrace/subr.c= linux_syscalls.c echo kdump: /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libc.a >> .depend =3D=3D=3D> usr.bin/keylogin (depend) =3D=3D=3D> usr.bin/keylogout (depend) =3D=3D=3D> usr.bin/killall (depend) =3D=3D=3D> usr.bin/ktrace (depend) =3D=3D=3D> usr.bin/ktrdump (depend) =3D=3D=3D> usr.bin/lam (depend) =3D=3D=3D> usr.bin/last (depend) =3D=3D=3D> usr.bin/lastcomm (depend) =3D=3D=3D> usr.bin/ldd (depend) =3D=3D=3D> usr.bin/leave (depend) =3D=3D=3D> usr.bin/less (depend) =3D=3D=3D> usr.bin/lessecho (depend) =3D=3D=3D> usr.bin/lesskey (depend) =3D=3D=3D> usr.bin/lex (depend) =3D=3D=3D> usr.bin/lex/lib (depend) =3D=3D=3D> usr.bin/limits (depend) =3D=3D=3D> usr.bin/locale (depend) =3D=3D=3D> usr.bin/locate (depend) =3D=3D=3D> usr.bin/locate/bigram (depend) =3D=3D=3D> usr.bin/locate/code (depend) =3D=3D=3D> usr.bin/locate/locate (depend) =3D=3D=3D> usr.bin/lock (depend) =3D=3D=3D> usr.bin/lockf (depend) =3D=3D=3D> usr.bin/logger (depend) =3D=3D=3D> usr.bin/login (depend) =3D=3D=3D> usr.bin/logins (depend) =3D=3D=3D> usr.bin/logname (depend) =3D=3D=3D> usr.bin/look (depend) =3D=3D=3D> usr.bin/lorder (depend) =3D=3D=3D> usr.bin/lsvfs (depend) =3D=3D=3D> usr.bin/lzmainfo (depend) =3D=3D=3D> usr.bin/m4 (depend) =3D=3D=3D> usr.bin/mail (depend) =3D=3D=3D> usr.bin/makewhatis (depend) =3D=3D=3D> usr.bin/man (depend) =3D=3D=3D> usr.bin/mandoc (depend) =3D=3D=3D> usr.bin/mesg (depend) =3D=3D=3D> usr.bin/minigzip (depend) =3D=3D=3D> usr.bin/ministat (depend) =3D=3D=3D> usr.bin/mkdep (depend) =3D=3D=3D> usr.bin/mkfifo (depend) =3D=3D=3D> usr.bin/mklocale (depend) =3D=3D=3D> usr.bin/mkstr (depend) =3D=3D=3D> usr.bin/mktemp (depend) =3D=3D=3D> usr.bin/mkulzma (depend) =3D=3D=3D> usr.bin/mkuzip (depend) =3D=3D=3D> usr.bin/msgs (depend) =3D=3D=3D> usr.bin/mt (depend) =3D=3D=3D> usr.bin/nc (depend) =3D=3D=3D> usr.bin/ncal (depend) =3D=3D=3D> usr.bin/netstat (depend) =3D=3D=3D> usr.bin/newgrp (depend) =3D=3D=3D> usr.bin/newkey (depend) =3D=3D=3D> usr.bin/nfsstat (depend) =3D=3D=3D> usr.bin/nice (depend) =3D=3D=3D> usr.bin/nl (depend) =3D=3D=3D> usr.bin/nohup (depend) =3D=3D=3D> usr.bin/nslookup (depend) =3D=3D=3D> usr.bin/nsupdate (depend) =3D=3D=3D> usr.bin/opieinfo (depend) =3D=3D=3D> usr.bin/opiekey (depend) =3D=3D=3D> usr.bin/opiepasswd (depend) =3D=3D=3D> usr.bin/pagesize (depend) =3D=3D=3D> usr.bin/passwd (depend) =3D=3D=3D> usr.bin/paste (depend) =3D=3D=3D> usr.bin/patch (depend) =3D=3D=3D> usr.bin/pathchk (depend) =3D=3D=3D> usr.bin/perror (depend) =3D=3D=3D> usr.bin/pr (depend) =3D=3D=3D> usr.bin/printenv (depend) =3D=3D=3D> usr.bin/printf (depend) =3D=3D=3D> usr.bin/procstat (depend) =3D=3D=3D> usr.bin/quota (depend) =3D=3D=3D> usr.bin/rctl (depend) =3D=3D=3D> usr.bin/renice (depend) =3D=3D=3D> usr.bin/rev (depend) =3D=3D=3D> usr.bin/revoke (depend) =3D=3D=3D> usr.bin/rlogin (depend) =3D=3D=3D> usr.bin/rpcgen (depend) =3D=3D=3D> usr.bin/rpcinfo (depend) =3D=3D=3D> usr.bin/rs (depend) =3D=3D=3D> usr.bin/rsh (depend) =3D=3D=3D> usr.bin/rup (depend) =3D=3D=3D> usr.bin/ruptime (depend) =3D=3D=3D> usr.bin/rusers (depend) =3D=3D=3D> usr.bin/rwall (depend) =3D=3D=3D> usr.bin/rwho (depend) =3D=3D=3D> usr.bin/script (depend) =3D=3D=3D> usr.bin/sed (depend) =3D=3D=3D> usr.bin/seq (depend) =3D=3D=3D> usr.bin/shar (depend) =3D=3D=3D> usr.bin/showmount (depend) =3D=3D=3D> usr.bin/sockstat (depend) =3D=3D=3D> usr.bin/sort (depend) =3D=3D=3D> usr.bin/split (depend) =3D=3D=3D> usr.bin/ssh-copy-id (depend) =3D=3D=3D> usr.bin/stat (depend) =3D=3D=3D> usr.bin/stdbuf (depend) =3D=3D=3D> usr.bin/su (depend) =3D=3D=3D> usr.bin/systat (depend) =3D=3D=3D> usr.bin/tabs (depend) =3D=3D=3D> usr.bin/tail (depend) =3D=3D=3D> usr.bin/talk (depend) =3D=3D=3D> usr.bin/tar (depend) =3D=3D=3D> usr.bin/tcopy (depend) =3D=3D=3D> usr.bin/tee (depend) =3D=3D=3D> usr.bin/telnet (depend) =3D=3D=3D> usr.bin/tftp (depend) =3D=3D=3D> usr.bin/time (depend) =3D=3D=3D> usr.bin/tip (depend) =3D=3D=3D> usr.bin/tip/tip (depend) =3D=3D=3D> usr.bin/top (depend) =3D=3D=3D> usr.bin/touch (depend) =3D=3D=3D> usr.bin/tput (depend) =3D=3D=3D> usr.bin/tr (depend) =3D=3D=3D> usr.bin/true (depend) =3D=3D=3D> usr.bin/truncate (depend) =3D=3D=3D> usr.bin/truss (depend) env MACHINE=3Damd64 CPP=3D"cpp " /bin/sh /zbuilder/buildd/head/usr.bin/tru= ss/../kdump/mkioctls return /usr/obj/zbuilder/buildd/head/tmp/usr/include >= ioctl.c rm -f .depend CC=3D'cc ' mkdep -f .depend -a -I/zbuilder/buildd/head/usr.bin/truss -I.= -std=3Dgnu99 /zbuilder/buildd/head/usr.bin/truss/main.c /zbuilder/buildd= /head/usr.bin/truss/setup.c /zbuilder/buildd/head/usr.bin/truss/syscalls.c = ioctl.c /zbuilder/buildd/head/usr.bin/truss/amd64-fbsd.c /zbuilder/buildd/h= ead/usr.bin/truss/amd64-linux32.c /zbuilder/buildd/head/usr.bin/truss/amd64= -fbsd32.c echo truss: /usr/obj/zbuilder/buildd/head/tmp/usr/lib/libc.a >> .depend =3D=3D=3D> usr.bin/tset (depend) =3D=3D=3D> usr.bin/tsort (depend) =3D=3D=3D> usr.bin/tty (depend) =3D=3D=3D> usr.bin/ul (depend) =3D=3D=3D> usr.bin/uname (depend) =3D=3D=3D> usr.bin/unexpand (depend) =3D=3D=3D> usr.bin/unifdef (depend) =3D=3D=3D> usr.bin/uniq (depend) =3D=3D=3D> usr.bin/units (depend) =3D=3D=3D> usr.bin/unvis (depend) =3D=3D=3D> usr.bin/unzip (depend) =3D=3D=3D> usr.bin/usbhidaction (depend) =3D=3D=3D> usr.bin/usbhidctl (depend) =3D=3D=3D> usr.bin/users (depend) =3D=3D=3D> usr.bin/uudecode (depend) =3D=3D=3D> usr.bin/uuencode (depend) =3D=3D=3D> usr.bin/vacation (depend) =3D=3D=3D> usr.bin/vgrind (depend) =3D=3D=3D> usr.bin/vi (depend) =3D=3D=3D> usr.bin/vis (depend) =3D=3D=3D> usr.bin/vmstat (depend) =3D=3D=3D> usr.bin/w (depend) =3D=3D=3D> usr.bin/wall (depend) =3D=3D=3D> usr.bin/wc (depend) =3D=3D=3D> usr.bin/what (depend) =3D=3D=3D> usr.bin/whereis (depend) =3D=3D=3D> usr.bin/which (depend) =3D=3D=3D> usr.bin/who (depend) =3D=3D=3D> usr.bin/whois (depend) =3D=3D=3D> usr.bin/write (depend) =3D=3D=3D> usr.bin/xargs (depend) =3D=3D=3D> usr.bin/xinstall (depend) =3D=3D=3D> usr.bin/xlint (depend) =3D=3D=3D> usr.bin/xlint/lint1 (depend) =3D=3D=3D> usr.bin/xlint/lint2 (depend) =3D=3D=3D> usr.bin/xlint/xlint (depend) =3D=3D=3D> usr.bin/xlint/llib (depend) =3D=3D=3D> usr.bin/xstr (depend) =3D=3D=3D> usr.bin/xz (depend) =3D=3D=3D> usr.bin/xzdec (depend) =3D=3D=3D> usr.bin/yacc (depend) =3D=3D=3D> usr.bin/yes (depend) =3D=3D=3D> usr.bin/ypcat (depend) =3D=3D=3D> usr.bin/ypmatch (depend) =3D=3D=3D> usr.bin/ypwhich (depend) =3D=3D=3D> usr.sbin (depend) =3D=3D=3D> usr.sbin/IPXrouted (depend) =3D=3D=3D> usr.sbin/ac (depend) =3D=3D=3D> usr.sbin/accton (depend) =3D=3D=3D> usr.sbin/acpi (depend) =3D=3D=3D> usr.sbin/acpi/acpiconf (depend) =3D=3D=3D> usr.sbin/acpi/acpidb (depend) =3D=3D=3D> usr.sbin/acpi/acpidump (depend) =3D=3D=3D> usr.sbin/acpi/iasl (depend) =3D=3D=3D> usr.sbin/adduser (depend) =3D=3D=3D> usr.sbin/amd (depend) =3D=3D=3D> usr.sbin/amd/include (depend) =3D=3D=3D> usr.sbin/amd/libamu (depend) =3D=3D=3D> usr.sbin/amd/amd (depend) =3D=3D=3D> usr.sbin/amd/amq (depend) =3D=3D=3D> usr.sbin/amd/doc (depend) =3D=3D=3D> usr.sbin/amd/fixmount (depend) =3D=3D=3D> usr.sbin/amd/fsinfo (depend) =3D=3D=3D> usr.sbin/amd/hlfsd (depend) =3D=3D=3D> usr.sbin/amd/mk-amd-map (depend) =3D=3D=3D> usr.sbin/amd/pawd (depend) =3D=3D=3D> usr.sbin/amd/scripts (depend) =3D=3D=3D> usr.sbin/amd/wire-test (depend) =3D=3D=3D> usr.sbin/ancontrol (depend) =3D=3D=3D> usr.sbin/apm (depend) =3D=3D=3D> usr.sbin/arp (depend) =3D=3D=3D> usr.sbin/arpaname (depend) =3D=3D=3D> usr.sbin/asf (depend) =3D=3D=3D> usr.sbin/audit (depend) =3D=3D=3D> usr.sbin/auditd (depend) =3D=3D=3D> usr.sbin/auditdistd (depend) =3D=3D=3D> usr.sbin/auditreduce (depend) =3D=3D=3D> usr.sbin/authpf (depend) =3D=3D=3D> usr.sbin/bhyve (depend) =3D=3D=3D> usr.sbin/bhyvectl (depend) =3D=3D=3D> usr.sbin/bhyveload (depend) =3D=3D=3D> usr.sbin/bluetooth (depend) =3D=3D=3D> usr.sbin/bluetooth/ath3kfw (depend) =3D=3D=3D> usr.sbin/bluetooth/bcmfw (depend) =3D=3D=3D> usr.sbin/bluetooth/bt3cfw (depend) =3D=3D=3D> usr.sbin/bluetooth/bthidcontrol (depend) =3D=3D=3D> usr.sbin/bluetooth/bthidd (depend) =3D=3D=3D> usr.sbin/bluetooth/btpand (depend) =3D=3D=3D> usr.sbin/bluetooth/hccontrol (depend) =3D=3D=3D> usr.sbin/bluetooth/hcsecd (depend) =3D=3D=3D> usr.sbin/bluetooth/hcseriald (depend) =3D=3D=3D> usr.sbin/bluetooth/l2control (depend) =3D=3D=3D> usr.sbin/bluetooth/l2ping (depend) =3D=3D=3D> usr.sbin/bluetooth/rfcomm_pppd (depend) =3D=3D=3D> usr.sbin/bluetooth/sdpcontrol (depend) =3D=3D=3D> usr.sbin/bluetooth/sdpd (depend) =3D=3D=3D> usr.sbin/boot0cfg (depend) =3D=3D=3D> usr.sbin/bootparamd (depend) =3D=3D=3D> usr.sbin/bootparamd/bootparamd (depend) =3D=3D=3D> usr.sbin/bootparamd/callbootd (depend) =3D=3D=3D> usr.sbin/bsdinstall (depend) =3D=3D=3D> usr.sbin/bsdinstall/distextract (depend) =3D=3D=3D> usr.sbin/bsdinstall/distfetch (depend) =3D=3D=3D> usr.sbin/bsdinstall/partedit (depend) =3D=3D=3D> usr.sbin/bsdinstall/scripts (depend) =3D=3D=3D> usr.sbin/bsnmpd (depend) =3D=3D=3D> usr.sbin/bsnmpd/gensnmptree (depend) =3D=3D=3D> usr.sbin/bsnmpd/bsnmpd (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_atm (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_bridge (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hast (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_hostres (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_mibII (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_pf (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_target (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_usm (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_vacm (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_wlan (depend) =3D=3D=3D> usr.sbin/bsnmpd/modules/snmp_netgraph (depend) =3D=3D=3D> usr.sbin/bsnmpd/tools (depend) =3D=3D=3D> usr.sbin/bsnmpd/tools/libbsnmptools (depend) =3D=3D=3D> usr.sbin/bsnmpd/tools/bsnmptools (depend) =3D=3D=3D> usr.sbin/btxld (depend) =3D=3D=3D> usr.sbin/cdcontrol (depend) =3D=3D=3D> usr.sbin/chkgrp (depend) =3D=3D=3D> usr.sbin/chown (depend) =3D=3D=3D> usr.sbin/chroot (depend) =3D=3D=3D> usr.sbin/ckdist (depend) =3D=3D=3D> usr.sbin/clear_locks (depend) =3D=3D=3D> usr.sbin/config (depend) =3D=3D=3D> usr.sbin/cpucontrol (depend) =3D=3D=3D> usr.sbin/crashinfo (depend) =3D=3D=3D> usr.sbin/cron (depend) =3D=3D=3D> usr.sbin/cron/lib (depend) =3D=3D=3D> usr.sbin/cron/cron (depend) =3D=3D=3D> usr.sbin/cron/crontab (depend) =3D=3D=3D> usr.sbin/crunch (depend) =3D=3D=3D> usr.sbin/crunch/crunchgen (depend) =3D=3D=3D> usr.sbin/crunch/crunchide (depend) =3D=3D=3D> usr.sbin/ctladm (depend) =3D=3D=3D> usr.sbin/ctm (depend) =3D=3D=3D> usr.sbin/ctm/ctm (depend) =3D=3D=3D> usr.sbin/ctm/ctm_rmail (depend) =3D=3D=3D> usr.sbin/ctm/ctm_smail (depend) =3D=3D=3D> usr.sbin/ctm/ctm_dequeue (depend) =3D=3D=3D> usr.sbin/daemon (depend) =3D=3D=3D> usr.sbin/dconschat (depend) =3D=3D=3D> usr.sbin/ddns-confgen (depend) =3D=3D=3D> usr.sbin/devinfo (depend) =3D=3D=3D> usr.sbin/digictl (depend) =3D=3D=3D> usr.sbin/diskinfo (depend) =3D=3D=3D> usr.sbin/dnssec-dsfromkey (depend) =3D=3D=3D> usr.sbin/dnssec-keyfromlabel (depend) =3D=3D=3D> usr.sbin/dnssec-keygen (depend) =3D=3D=3D> usr.sbin/dnssec-revoke (depend) =3D=3D=3D> usr.sbin/dnssec-settime (depend) =3D=3D=3D> usr.sbin/dnssec-signzone (depend) =3D=3D=3D> usr.sbin/dumpcis (depend) =3D=3D=3D> usr.sbin/editmap (depend) =3D=3D=3D> usr.sbin/edquota (depend) =3D=3D=3D> usr.sbin/etcupdate (depend) =3D=3D=3D> usr.sbin/extattr (depend) =3D=3D=3D> usr.sbin/extattrctl (depend) =3D=3D=3D> usr.sbin/faithd (depend) =3D=3D=3D> usr.sbin/fdcontrol (depend) =3D=3D=3D> usr.sbin/fdformat (depend) =3D=3D=3D> usr.sbin/fdread (depend) =3D=3D=3D> usr.sbin/fdwrite (depend) =3D=3D=3D> usr.sbin/fifolog (depend) =3D=3D=3D> usr.sbin/fifolog/lib (depend) =3D=3D=3D> usr.sbin/fifolog/fifolog_create (depend) =3D=3D=3D> usr.sbin/fifolog/fifolog_writer (depend) =3D=3D=3D> usr.sbin/fifolog/fifolog_reader (depend) =3D=3D=3D> usr.sbin/flowctl (depend) =3D=3D=3D> usr.sbin/freebsd-update (depend) =3D=3D=3D> usr.sbin/ftp-proxy (depend) =3D=3D=3D> usr.sbin/ftp-proxy/libevent (depend) =3D=3D=3D> usr.sbin/ftp-proxy/ftp-proxy (depend) =3D=3D=3D> usr.sbin/fwcontrol (depend) =3D=3D=3D> usr.sbin/genrandom (depend) =3D=3D=3D> usr.sbin/getfmac (depend) =3D=3D=3D> usr.sbin/getpmac (depend) =3D=3D=3D> usr.sbin/gpioctl (depend) =3D=3D=3D> usr.sbin/gssd (depend) =3D=3D=3D> usr.sbin/gstat (depend) =3D=3D=3D> usr.sbin/i2c (depend) =3D=3D=3D> usr.sbin/ifmcstat (depend) =3D=3D=3D> usr.sbin/inetd (depend) =3D=3D=3D> usr.sbin/iostat (depend) =3D=3D=3D> usr.sbin/ip6addrctl (depend) =3D=3D=3D> usr.sbin/ipfwpcap (depend) =3D=3D=3D> usr.sbin/isc-hmac-fixup (depend) =3D=3D=3D> usr.sbin/isfctl (depend) =3D=3D=3D> usr.sbin/jail (depend) =3D=3D=3D> usr.sbin/jexec (depend) =3D=3D=3D> usr.sbin/jls (depend) =3D=3D=3D> usr.sbin/kbdcontrol (depend) =3D=3D=3D> usr.sbin/kbdmap (depend) =3D=3D=3D> usr.sbin/keyserv (depend) =3D=3D=3D> usr.sbin/kgmon (depend) =3D=3D=3D> usr.sbin/kldxref (depend) =3D=3D=3D> usr.sbin/lastlogin (depend) =3D=3D=3D> usr.sbin/lmcconfig (depend) =3D=3D=3D> usr.sbin/lpr (depend) =3D=3D=3D> usr.sbin/lpr/common_source (depend) =3D=3D=3D> usr.sbin/lpr/chkprintcap (depend) =3D=3D=3D> usr.sbin/lpr/lp (depend) =3D=3D=3D> usr.sbin/lpr/lpc (depend) =3D=3D=3D> usr.sbin/lpr/lpd (depend) =3D=3D=3D> usr.sbin/lpr/lpq (depend) =3D=3D=3D> usr.sbin/lpr/lpr (depend) =3D=3D=3D> usr.sbin/lpr/lprm (depend) =3D=3D=3D> usr.sbin/lpr/lptest (depend) =3D=3D=3D> usr.sbin/lpr/pac (depend) =3D=3D=3D> usr.sbin/lpr/filters (depend) =3D=3D=3D> usr.sbin/lpr/filters.ru (depend) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2alt (depend) =3D=3D=3D> usr.sbin/lpr/filters.ru/koi2855 (depend) =3D=3D=3D> usr.sbin/lptcontrol (depend) =3D=3D=3D> usr.sbin/mailstats (depend) =3D=3D=3D> usr.sbin/mailwrapper (depend) =3D=3D=3D> usr.sbin/makefs (depend) =3D=3D=3D> usr.sbin/makemap (depend) =3D=3D=3D> usr.sbin/manctl (depend) =3D=3D=3D> usr.sbin/memcontrol (depend) =3D=3D=3D> usr.sbin/mergemaster (depend) =3D=3D=3D> usr.sbin/mfiutil (depend) =3D=3D=3D> usr.sbin/mixer (depend) =3D=3D=3D> usr.sbin/mld6query (depend) =3D=3D=3D> usr.sbin/mlxcontrol (depend) =3D=3D=3D> usr.sbin/mountd (depend) =3D=3D=3D> usr.sbin/moused (depend) =3D=3D=3D> usr.sbin/mptable (depend) =3D=3D=3D> usr.sbin/mptutil (depend) =3D=3D=3D> usr.sbin/mtest (depend) =3D=3D=3D> usr.sbin/mtree (depend) =3D=3D=3D> usr.sbin/named (depend) =3D=3D=3D> usr.sbin/named-checkconf (depend) =3D=3D=3D> usr.sbin/named-checkzone (depend) =3D=3D=3D> usr.sbin/named-journalprint (depend) =3D=3D=3D> usr.sbin/ndiscvt (depend) =3D=3D=3D> usr.sbin/ndp (depend) =3D=3D=3D> usr.sbin/newsyslog (depend) =3D=3D=3D> usr.sbin/nfscbd (depend) =3D=3D=3D> usr.sbin/nfsd (depend) =3D=3D=3D> usr.sbin/nfsdumpstate (depend) =3D=3D=3D> usr.sbin/nfsrevoke (depend) =3D=3D=3D> usr.sbin/nfsuserd (depend) =3D=3D=3D> usr.sbin/ngctl (depend) =3D=3D=3D> usr.sbin/nghook (depend) =3D=3D=3D> usr.sbin/nmtree (depend) =3D=3D=3D> usr.sbin/nologin (depend) =3D=3D=3D> usr.sbin/nscd (depend) =3D=3D=3D> usr.sbin/nsec3hash (depend) =3D=3D=3D> usr.sbin/ntp (depend) =3D=3D=3D> usr.sbin/ntp/libopts (depend) =3D=3D=3D> usr.sbin/ntp/libntp (depend) =3D=3D=3D> usr.sbin/ntp/libparse (depend) =3D=3D=3D> usr.sbin/ntp/ntpd (depend) =3D=3D=3D> usr.sbin/ntp/ntpdc (depend) =3D=3D=3D> usr.sbin/ntp/ntpq (depend) =3D=3D=3D> usr.sbin/ntp/ntpdate (depend) =3D=3D=3D> usr.sbin/ntp/ntptime (depend) =3D=3D=3D> usr.sbin/ntp/ntp-keygen (depend) =3D=3D=3D> usr.sbin/ntp/sntp (depend) =3D=3D=3D> usr.sbin/ntp/doc (depend) =3D=3D=3D> usr.sbin/pc-sysinstall (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/backend (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-partmanager (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/backend-query (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/conf (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/doc (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/examples (depend) =3D=3D=3D> usr.sbin/pc-sysinstall/pc-sysinstall (depend) =3D=3D=3D> usr.sbin/pciconf (depend) =3D=3D=3D> usr.sbin/periodic (depend) =3D=3D=3D> usr.sbin/pkg (depend) =3D=3D=3D> usr.sbin/pkg_install (depend) =3D=3D=3D> usr.sbin/pkg_install/lib (depend) =3D=3D=3D> usr.sbin/pkg_install/add (depend) =3D=3D=3D> usr.sbin/pkg_install/create (depend) =3D=3D=3D> usr.sbin/pkg_install/delete (depend) =3D=3D=3D> usr.sbin/pkg_install/info (depend) =3D=3D=3D> usr.sbin/pkg_install/updating (depend) =3D=3D=3D> usr.sbin/pkg_install/version (depend) =3D=3D=3D> usr.sbin/pmcannotate (depend) =3D=3D=3D> usr.sbin/pmccontrol (depend) =3D=3D=3D> usr.sbin/pmcstat (depend) =3D=3D=3D> usr.sbin/portsnap (depend) =3D=3D=3D> usr.sbin/portsnap/portsnap (depend) =3D=3D=3D> usr.sbin/portsnap/make_index (depend) =3D=3D=3D> usr.sbin/portsnap/phttpget (depend) =3D=3D=3D> usr.sbin/powerd (depend) =3D=3D=3D> usr.sbin/ppp (depend) =3D=3D=3D> usr.sbin/pppctl (depend) =3D=3D=3D> usr.sbin/praliases (depend) =3D=3D=3D> usr.sbin/praudit (depend) =3D=3D=3D> usr.sbin/procctl (depend) =3D=3D=3D> usr.sbin/pstat (depend) =3D=3D=3D> usr.sbin/pw (depend) =3D=3D=3D> usr.sbin/pwd_mkdb (depend) =3D=3D=3D> usr.sbin/quot (depend) =3D=3D=3D> usr.sbin/quotaon (depend) =3D=3D=3D> usr.sbin/rarpd (depend) =3D=3D=3D> usr.sbin/repquota (depend) =3D=3D=3D> usr.sbin/rip6query (depend) =3D=3D=3D> usr.sbin/rmt (depend) =3D=3D=3D> usr.sbin/rndc (depend) =3D=3D=3D> usr.sbin/rndc-confgen (depend) =3D=3D=3D> usr.sbin/route6d (depend) =3D=3D=3D> usr.sbin/rpc.lockd (depend) =3D=3D=3D> usr.sbin/rpc.statd (depend) =3D=3D=3D> usr.sbin/rpc.umntall (depend) =3D=3D=3D> usr.sbin/rpc.yppasswdd (depend) =3D=3D=3D> usr.sbin/rpc.ypupdated (depend) =3D=3D=3D> usr.sbin/rpc.ypxfrd (depend) =3D=3D=3D> usr.sbin/rpcbind (depend) =3D=3D=3D> usr.sbin/rrenumd (depend) =3D=3D=3D> usr.sbin/rtadvctl (depend) =3D=3D=3D> usr.sbin/rtadvd (depend) =3D=3D=3D> usr.sbin/rtprio (depend) =3D=3D=3D> usr.sbin/rtsold (depend) =3D=3D=3D> usr.sbin/rwhod (depend) =3D=3D=3D> usr.sbin/sa (depend) =3D=3D=3D> usr.sbin/sendmail (depend) =3D=3D=3D> usr.sbin/service (depend) =3D=3D=3D> usr.sbin/services_mkdb (depend) =3D=3D=3D> usr.sbin/setfib (depend) =3D=3D=3D> usr.sbin/setfmac (depend) =3D=3D=3D> usr.sbin/setpmac (depend) =3D=3D=3D> usr.sbin/sicontrol (depend) =3D=3D=3D> usr.sbin/smbmsg (depend) =3D=3D=3D> usr.sbin/snapinfo (depend) =3D=3D=3D> usr.sbin/spkrtest (depend) =3D=3D=3D> usr.sbin/spray (depend) =3D=3D=3D> usr.sbin/syslogd (depend) =3D=3D=3D> usr.sbin/tcpdchk (depend) =3D=3D=3D> usr.sbin/tcpdmatch (depend) =3D=3D=3D> usr.sbin/tcpdrop (depend) =3D=3D=3D> usr.sbin/tcpdump (depend) =3D=3D=3D> usr.sbin/tcpdump/tcpdump (depend) =3D=3D=3D> usr.sbin/timed (depend) =3D=3D=3D> usr.sbin/timed/timed (depend) =3D=3D=3D> usr.sbin/timed/timedc (depend) =3D=3D=3D> usr.sbin/traceroute (depend) =3D=3D=3D> usr.sbin/traceroute6 (depend) =3D=3D=3D> usr.sbin/trpt (depend) =3D=3D=3D> usr.sbin/tzsetup (depend) =3D=3D=3D> usr.sbin/uathload (depend) =3D=3D=3D> usr.sbin/ugidfw (depend) =3D=3D=3D> usr.sbin/uhsoctl (depend) =3D=3D=3D> usr.sbin/usbconfig (depend) =3D=3D=3D> usr.sbin/usbdump (depend) =3D=3D=3D> usr.sbin/utx (depend) =3D=3D=3D> usr.sbin/vidcontrol (depend) =3D=3D=3D> usr.sbin/vipw (depend) =3D=3D=3D> usr.sbin/wake (depend) =3D=3D=3D> usr.sbin/watch (depend) =3D=3D=3D> usr.sbin/watchdogd (depend) =3D=3D=3D> usr.sbin/wlandebug (depend) =3D=3D=3D> usr.sbin/wpa (depend) =3D=3D=3D> usr.sbin/wpa/wpa_supplicant (depend) =3D=3D=3D> usr.sbin/wpa/wpa_cli (depend) =3D=3D=3D> usr.sbin/wpa/wpa_passphrase (depend) =3D=3D=3D> usr.sbin/wpa/hostapd (depend) =3D=3D=3D> usr.sbin/wpa/hostapd_cli (depend) =3D=3D=3D> usr.sbin/wpa/ndis_events (depend) =3D=3D=3D> usr.sbin/yp_mkdb (depend) =3D=3D=3D> usr.sbin/ypbind (depend) =3D=3D=3D> usr.sbin/yppoll (depend) =3D=3D=3D> usr.sbin/yppush (depend) =3D=3D=3D> usr.sbin/ypserv (depend) =3D=3D=3D> usr.sbin/ypset (depend) =3D=3D=3D> usr.sbin/zic (depend) =3D=3D=3D> usr.sbin/zic/zic (depend) =3D=3D=3D> usr.sbin/zic/zdump (depend) =3D=3D=3D> usr.sbin/zzz (depend) =3D=3D=3D> etc (depend) =3D=3D=3D> etc/sendmail (depend) -------------------------------------------------------------- >>> stage 4.4: building everything -------------------------------------------------------------- cd /zbuilder/buildd/head; MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARCH=3Damd64= MACHINE=3Damd64 CPUTYPE=3D GROFF_BIN_PATH=3D/usr/obj/zbuilder/buildd/hea= d/tmp/legacy/usr/bin GROFF_FONT_PATH=3D/usr/obj/zbuilder/buildd/head/tmp/l= egacy/usr/share/groff_font GROFF_TMAC_PATH=3D/usr/obj/zbuilder/buildd/head= /tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=3D/usr/obj/zbuilder/buildd/head= /tmp _LDSCRIPTROOT=3D VERSION=3D"FreeBSD 10.0-CURRENT amd64 1000035" INS= TALL=3D"sh /zbuilder/buildd/head/tools/install.sh" PATH=3D/usr/obj/zbuilde= r/buildd/head/tmp/legacy/usr/sbin:/usr/obj/zbuilder/buildd/head/tmp/legacy/= usr/bin:/usr/obj/zbuilder/buildd/head/tmp/legacy/usr/games:/usr/obj/zbuilde= r/buildd/head/tmp/legacy/bin:/usr/obj/zbuilder/buildd/head/tmp/usr/sbin:/us= r/obj/zbuilder/buildd/head/tmp/usr/bin:/usr/obj/zbuilder/buildd/head/tmp/us= r/games:/sbin:/bin:/usr/sbin:/usr/bin CC=3D"cc " CXX=3D"c++ " CPP=3D"cpp "= AS=3D"as" AR=3D"ar" LD=3D"ld" NM=3Dnm OBJDUMP=3D RANLIB=3Dranlib STRINGS= =3D COMPILER_TYPE=3Dclang /usr/obj/zbuilder/buildd/head/make.amd64/make -f= Makefile.inc1 DESTDIR=3D/usr/obj/zbuilder/buildd/head/tmp par-all =3D=3D=3D> share/info (all) =3D=3D=3D> lib (all) =3D=3D=3D> lib/csu/amd64 (all) =3D=3D=3D> lib/libc (all) =3D=3D=3D> lib/libbsm (all) =3D=3D=3D> lib/libauditd (all) =3D=3D=3D> lib/libcompiler_rt (all) =3D=3D=3D> lib/libcrypt (all) =3D=3D=3D> lib/libelf (all) =3D=3D=3D> lib/libkvm (all) =3D=3D=3D> lib/msun (all) =3D=3D=3D> lib/libmd (all) =3D=3D=3D> lib/ncurses (all) =3D=3D=3D> lib/ncurses/ncurses (all) =3D=3D=3D> lib/ncurses/form (all) =3D=3D=3D> lib/ncurses/menu (all) =3D=3D=3D> lib/ncurses/panel (all) =3D=3D=3D> lib/ncurses/ncursesw (all) =3D=3D=3D> lib/ncurses/formw (all) =3D=3D=3D> lib/ncurses/menuw (all) =3D=3D=3D> lib/ncurses/panelw (all) =3D=3D=3D> lib/libnetgraph (all) =3D=3D=3D> lib/libradius (all) =3D=3D=3D> lib/librpcsvc (all) =3D=3D=3D> lib/libsbuf (all) =3D=3D=3D> lib/libtacplus (all) =3D=3D=3D> lib/libutil (all) =3D=3D=3D> lib/libypclnt (all) =3D=3D=3D> lib/libcxxrt (all) =3D=3D=3D> lib/libc++ (all) =3D=3D=3D> lib/libcom_err (all) =3D=3D=3D> lib/libcom_err/doc (all) =3D=3D=3D> lib/libalias (all) =3D=3D=3D> lib/libalias/libalias (all) =3D=3D=3D> lib/libalias/modules (all) =3D=3D=3D> lib/libalias/modules/cuseeme (all) =3D=3D=3D> lib/libalias/modules/dummy (all) =3D=3D=3D> lib/libalias/modules/ftp (all) =3D=3D=3D> lib/libalias/modules/irc (all) =3D=3D=3D> lib/libalias/modules/nbt (all) =3D=3D=3D> lib/libalias/modules/pptp (all) =3D=3D=3D> lib/libalias/modules/skinny (all) =3D=3D=3D> lib/libalias/modules/smedia (all) =3D=3D=3D> lib/libarchive (all) =3D=3D=3D> lib/libbegemot (all) =3D=3D=3D> lib/libblocksruntime (all) =3D=3D=3D> lib/libbluetooth (all) =3D=3D=3D> lib/libbsnmp (all) =3D=3D=3D> lib/libbsnmp/libbsnmp (all) =3D=3D=3D> lib/libbz2 (all) =3D=3D=3D> lib/libcalendar (all) =3D=3D=3D> lib/libcam (all) =3D=3D=3D> lib/libcompat (all) =3D=3D=3D> lib/libdevinfo (all) =3D=3D=3D> lib/libdevstat (all) =3D=3D=3D> lib/libdwarf (all) =3D=3D=3D> lib/libedit (all) =3D=3D=3D> lib/libedit/edit/readline (all) =3D=3D=3D> lib/libexpat (all) =3D=3D=3D> lib/libfetch (all) =3D=3D=3D> lib/libgeom (all) =3D=3D=3D> lib/libgpib (all) =3D=3D=3D> lib/libgssapi (all) =3D=3D=3D> lib/librpcsec_gss (all) =3D=3D=3D> lib/libipsec (all) =3D=3D=3D> lib/libipx (all) =3D=3D=3D> lib/libjail (all) =3D=3D=3D> lib/libkiconv (all) =3D=3D=3D> lib/libldns (all) =3D=3D=3D> lib/liblzma (all) =3D=3D=3D> lib/libmagic (all) =3D=3D=3D> lib/libmandoc (all) =3D=3D=3D> lib/libmemstat (all) =3D=3D=3D> lib/libmilter (all) =3D=3D=3D> lib/libmp (all) =3D=3D=3D> lib/libnetbsd (all) =3D=3D=3D> lib/libngatm (all) =3D=3D=3D> lib/libopie (all) =3D=3D=3D> lib/libpam (all) =3D=3D=3D> lib/libpam/modules (all) =3D=3D=3D> lib/libpam/modules/pam_chroot (all) =3D=3D=3D> lib/libpam/modules/pam_deny (all) =3D=3D=3D> lib/libpam/modules/pam_echo (all) =3D=3D=3D> lib/libpam/modules/pam_exec (all) =3D=3D=3D> lib/libpam/modules/pam_ftpusers (all) =3D=3D=3D> lib/libpam/modules/pam_group (all) =3D=3D=3D> lib/libpam/modules/pam_guest (all) =3D=3D=3D> lib/libpam/modules/pam_krb5 (all) =3D=3D=3D> lib/libpam/modules/pam_ksu (all) =3D=3D=3D> lib/libpam/modules/pam_lastlog (all) =3D=3D=3D> lib/libpam/modules/pam_login_access (all) =3D=3D=3D> lib/libpam/modules/pam_nologin (all) =3D=3D=3D> lib/libpam/modules/pam_opie (all) =3D=3D=3D> lib/libpam/modules/pam_opieaccess (all) =3D=3D=3D> lib/libpam/modules/pam_passwdqc (all) =3D=3D=3D> lib/libpam/modules/pam_permit (all) =3D=3D=3D> lib/libpam/modules/pam_radius (all) =3D=3D=3D> lib/libpam/modules/pam_rhosts (all) =3D=3D=3D> lib/libpam/modules/pam_rootok (all) =3D=3D=3D> lib/libpam/modules/pam_securetty (all) =3D=3D=3D> lib/libpam/modules/pam_self (all) =3D=3D=3D> lib/libpam/modules/pam_ssh (all) =3D=3D=3D> lib/libpam/modules/pam_tacplus (all) =3D=3D=3D> lib/libpam/modules/pam_unix (all) =3D=3D=3D> lib/libpam/libpam (all) =3D=3D=3D> lib/libpcap (all) =3D=3D=3D> lib/libpmc (all) =3D=3D=3D> lib/libproc (all) =3D=3D=3D> lib/libprocstat (all) cc -O2 -pipe -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cd= dl/compat/opensolaris -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../= cddl/compat/opensolaris/include -I/zbuilder/buildd/head/lib/libprocstat/zfs= /../../../cddl/compat/opensolaris/lib/libumem -I/zbuilder/buildd/head/lib/l= ibprocstat/zfs/../../../cddl/contrib/opensolaris/lib/libzpool/common -I/zbu= ilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/contrib/opensolaris= /uts/common/fs/zfs -I/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys= /cddl/contrib/opensolaris/uts/common -I/zbuilder/buildd/head/lib/libprocsta= t/zfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys -I/zbuilder/buil= dd/head/lib/libprocstat/zfs/../../../cddl/contrib/opensolaris/head -I/zbuil= der/buildd/head/lib/libprocstat/zfs/.. -DNEED_SOLARIS_BOOLEAN -std=3Dgnu99 = -Qunused-arguments -fstack-protector -Wsystem-headers -Werror -Wno-pointer-= sign -Wno-empty-body -Wno-string-plus-int -Wno-tautological-compare -Wno-un= used-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion -= Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses -c= /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c -o zfs.o In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:34: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/proc.h:521:19: =1B[= 0m=1B[0;1;31merror: =1B[0m=1B[1mfield has incomplete type 'struct itimerval'=1B[0m struct itimerval p_realtimer; /* (c) Alarm timer. */ =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/proc.h:521:9:= =1B[0m=1B[0;1;30mnote: =1B[0mforward declaration of 'struct itimerval'=1B[0m struct itimerval p_realtimer; /* (c) Alarm timer. */ =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:168:5: =1B[= 0m=1B[0;1;31merror: =1B[0m=1B[1mdeclaration of built-in function 'setjmp' requires inclusion of the header [-Werror,-Wbuiltin-requires-header]=1B[0m int setjmp(struct _jmp_buf *) __returns_twice; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:169:6= : =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mdeclaration of built-in function 'longjmp' requires inclusion of the header [-Werror,-Wbuiltin-requires-header]=1B[0m void longjmp(struct _jmp_buf *, int) __dead2; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:197:6= : =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mincompatible redeclaration of library function 'log' [-Werror,-Wincompatible-libra= ry-redeclaration]=1B[0m void log(int, const char *, ...) __printflike(2, 3); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:197:6= : =1B[0m=1B[0;1;30mnote: =1B[0m'log' is a builtin with type 'double (double)'=1B[0m =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:261:30: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void hardclock(int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:268:30: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void profclock(int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:269:43: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'uintfptr_t'; did you mean 'uintptr_t'?=1B[0m void profclock_cnt(int cnt, int usermode, uintfptr_t pc); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/_stdint.h:78:= 22: =1B[0m=1B[0;1;30mnote: =1B[0m'uintptr_t' declared here=1B[0m typedef __uintptr_t uintptr_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/sys= tm.h:310: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:115:7: = =1B[0m=1B[0;1;31merror: =1B[0m=1B[1mincompatible redeclaration of library function 'strdup' [-Werror,-Wincompatible-li= brary-redeclaration]=1B[0m char *strdup(const char *__restrict, struct malloc_type *); =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:115= :7: =1B[0m=1B[0;1;30mnote: =1B[0m'strdup' is a builtin with type 'char *(const char *)'=1B[0m In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zfs.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:333:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splbio(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:334:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splcam(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:335:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splclock(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:336:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splhigh(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:337:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splimp(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:338:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splnet(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:339:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t spltty(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:340:17: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline intrmask_t splvm(void) { return 0; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/proc.h:41: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/debug.h:33: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/systm.h:35: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/systm.h:341:28: =1B= [0m=1B[0;1;31merror: =1B[0m=1B[1munknown type name 'intrmask_t'; did you mean 'intmax_t'?=1B[0m static __inline void splx(intrmask_t ipl __unused) { return; } =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/stdint.h:59:2= 1: =1B[0m=1B[0;1;30mnote: =1B[0m'intmax_t' declared here=1B[0m typedef __intmax_t intmax_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:31: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mount.h:34: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/mou= nt.h:42: In file included from /usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/eve= nthandler.h:34: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../sy= s/cddl/compat/opensolaris/sys/mutex.h:37: =1B[1m/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/compat/op= ensolaris/sys/proc.h:57:16: =1B[0m=1B[0;1;31merror: =1B[0m=1B[1m redefinition of typedef 'pri_t' is a C11 feature [-Werror,-Wtypedef-r= edefinition]=1B[0m typedef short pri_t; =1B[0;1;32m ^ =1B[0m=1B[1m/zbuilder/buildd/head/lib/libprocstat/zfs/../../../sys/cddl/com= pat/opensolaris/sys/types.h:88:16: =1B[0m=1B[0;1;30mnote: =1B[0m previous definition is here=1B[0m typedef short pri_t; =1B[0;1;32m ^ =1B[0mIn file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../zf= s.c:39: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../cd= dl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:47: In file included from /zbuilder/buildd/head/lib/libprocstat/zfs/../../../cd= dl/compat/opensolaris/include/stdlib.h:30: =1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/stdlib.h:83:15: =1B[0m= =1B[0;1;31merror: =1B[0m=1B[1mattribute declaration must precede definition [-Werror,-Wignored-attributes]=1B[0m int abs(int) __pure2; =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/cdefs.h:227:3= 3: =1B[0m=1B[0;1;30mnote: =1B[0mexpanded from macro '__pure2'=1B[0m #define __pure2 __attribute__((__const__)) =1B[0;1;32m ^ =1B[0m=1B[1m/usr/obj/zbuilder/buildd/head/tmp/usr/include/sys/libkern.h:69:= 21: =1B[0m=1B[0;1;30mnote: =1B[0mprevious definition is here=1B[0m static __inline int abs(int a) { return (a < 0 ? -a : a); } =1B[0;1;32m ^ =1B[0m=1B[0;1;31mfatal error: =1B[0m=1B[1mtoo many errors emitted, stopping= now [-ferror-limit=3D]=1B[0m 20 errors generated. *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib/libprocstat/zfs *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib/libprocstat *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head/lib *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head *** Error code 1 Stop. make: stopped in /zbuilder/buildd/head root@kaos:/zbuilder/buildd # ^D Script done on Mon Jun 10 01:33:22 2013 Glen --hSsVBZHIO2Q9XETc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJRtWYPAAoJEFJPDDeguUaj4E8H/iCzKZXrLQnztWNmDUfvz47Z 8e0cofQMXPymF6gmFWO8lDyXj+dQwT32fmgUpnVy8jKSEMp7QjPPI4kS8PRc1YjS kLy8ccYbVeVSlDlndVAyFy0Sy2HKJrPc40IuJvnml+rmu5O0rwHEE+3Gh4uitk8V eRq9YvEbIWHTK4BziQgpcfO6pFx6svR1c5rZyVMqLVi+cDvl5yA8gO02iG6iCU8L 7cxrX7LdtRX0o79JAGWE1Mjjzv4wFy1jaHwVf0lEYkjKlj1VbrRRKWkuW6KI9kKN GwhV4ypG2VkPfU9Qt9mqwMmMX7a/wjZI7+Z18i3eRNkbMmxcN+vPqRgotVOaumA= =wFh3 -----END PGP SIGNATURE----- --hSsVBZHIO2Q9XETc-- From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 05:39:31 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EECD4E7B; Mon, 10 Jun 2013 05:39:30 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id D317E1C0E; Mon, 10 Jun 2013 05:39:30 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.6/8.14.6) with ESMTP id r5A5dU03017577; Sun, 9 Jun 2013 22:39:30 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.6/8.14.6/Submit) id r5A5dUoR017576; Sun, 9 Jun 2013 22:39:30 -0700 (PDT) (envelope-from sgk) Date: Sun, 9 Jun 2013 22:39:30 -0700 From: Steve Kargl To: Glen Barber Subject: Re: svn commit: r251590 - in head/sys: kern sys Message-ID: <20130610053930.GA17558@troutmask.apl.washington.edu> References: <201306092351.r59NpRTZ024888@svn.freebsd.org> <20130610053719.GU13292@glenbarber.us> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130610053719.GU13292@glenbarber.us> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Marcel Moolenaar , src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 05:39:31 -0000 On Mon, Jun 10, 2013 at 01:37:19AM -0400, Glen Barber wrote: > On Sun, Jun 09, 2013 at 11:51:27PM +0000, Marcel Moolenaar wrote: > > Author: marcel > > Date: Sun Jun 9 23:51:26 2013 > > New Revision: 251590 > > URL: http://svnweb.freebsd.org/changeset/base/251590 > > > > Log: > > Add vfs_mounted and vfs_unmounted events so that components can be informed > > about mount and unmount events. This is used by Juniper to implement a more > > optimal implementation of NetBSD's veriexec. > > > > Submitted by: stevek@juniper.net > > Obtained from: Juniper Networks, Inc > > > > Modified: > > head/sys/kern/vfs_mount.c > > head/sys/sys/mount.h > > > > This breaks head/ for me. > A 15000 line post. Really? -- steve From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 05:45:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 947F019A; Mon, 10 Jun 2013 05:45:16 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 873C41C39; Mon, 10 Jun 2013 05:45:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A5jGVm037902; Mon, 10 Jun 2013 05:45:16 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A5jGeb037901; Mon, 10 Jun 2013 05:45:16 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201306100545.r5A5jGeb037901@svn.freebsd.org> From: Rui Paulo Date: Mon, 10 Jun 2013 05:45:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251596 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 05:45:16 -0000 Author: rpaulo Date: Mon Jun 10 05:45:16 2013 New Revision: 251596 URL: http://svnweb.freebsd.org/changeset/base/251596 Log: Use STRUCT_USB_HOST_ID to make sure we have the right ELF section. Modified: head/sys/dev/usb/wlan/if_urtwn.c Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Mon Jun 10 04:23:11 2013 (r251595) +++ head/sys/dev/usb/wlan/if_urtwn.c Mon Jun 10 05:45:16 2013 (r251596) @@ -84,7 +84,7 @@ SYSCTL_INT(_hw_usb_urtwn, OID_AUTO, debu (((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) /* various supported device vendors/products */ -static const struct usb_device_id urtwn_devs[] = { +static const STRUCT_USB_HOST_ID urtwn_devs[] = { #define URTWN_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) } URTWN_DEV(ABOCOM, RTL8188CU_1), URTWN_DEV(ABOCOM, RTL8188CU_2), From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 05:45:21 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3FBEF19B; Mon, 10 Jun 2013 05:45:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [199.48.134.227]) by mx1.freebsd.org (Postfix) with ESMTP id 1E2A31C3A; Mon, 10 Jun 2013 05:45:20 +0000 (UTC) Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id B708823F848; Mon, 10 Jun 2013 01:45:19 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.8.3 onyx.glenbarber.us B708823F848 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Mon, 10 Jun 2013 01:45:17 -0400 From: Glen Barber To: Steve Kargl Subject: Re: svn commit: r251590 - in head/sys: kern sys Message-ID: <20130610054517.GV13292@glenbarber.us> References: <201306092351.r59NpRTZ024888@svn.freebsd.org> <20130610053719.GU13292@glenbarber.us> <20130610053930.GA17558@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8MA55IEjTDEadc2f" Content-Disposition: inline In-Reply-To: <20130610053930.GA17558@troutmask.apl.washington.edu> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Marcel Moolenaar , src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 05:45:21 -0000 --8MA55IEjTDEadc2f Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 09, 2013 at 10:39:30PM -0700, Steve Kargl wrote: > On Mon, Jun 10, 2013 at 01:37:19AM -0400, Glen Barber wrote: > > On Sun, Jun 09, 2013 at 11:51:27PM +0000, Marcel Moolenaar wrote: > > > Author: marcel > > > Date: Sun Jun 9 23:51:26 2013 > > > New Revision: 251590 > > > URL: http://svnweb.freebsd.org/changeset/base/251590 > > >=20 > > > Log: > > > Add vfs_mounted and vfs_unmounted events so that components can be = informed > > > about mount and unmount events. This is used by Juniper to implemen= t a more > > > optimal implementation of NetBSD's veriexec. > > > =20 > > > Submitted by: stevek@juniper.net > > > Obtained from: Juniper Networks, Inc > > >=20 > > > Modified: > > > head/sys/kern/vfs_mount.c > > > head/sys/sys/mount.h > > >=20 > >=20 > > This breaks head/ for me. > >=20 >=20 > A 15000 line post. Really? >=20 Yeah, it was a _big_ screwup on my part. Was not at all intended... Glen --8MA55IEjTDEadc2f Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJRtWftAAoJEFJPDDeguUaji38H/2hue3rlRDW6Mf+Ma70KPNqk +fLAaMnSfXl/YtVtkpcJ/+AhwxLzf0dBntq/PQx8yAmM4mSUdSYDIHdm9D9jJA5+ AfHpDDpCLLjj7Aj0VL4tGROUgL49yBSr0hJS3vtqR/TQeihdFJRlhAP0LsPxvChm WqluVWsLpNg2hee5xe7mFIT9ruMUTsxFojf+6V0ffxJ4FAcIvB/WF79oklItLufE SqDodU+aljVaMmBHtAHPVx3VfNxNnQQqmH7Xf8sF/8j6buEHzLsbY1Cymyo2rRzT 1z4J5S+6+s0mq+xvKBr7S4maDvuNjYeO+5PIUcmSkGLSo6LnpQd8wOUeAl6XGCk= =qW+b -----END PGP SIGNATURE----- --8MA55IEjTDEadc2f-- From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 05:45:54 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 64D5A474; Mon, 10 Jun 2013 05:45:54 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 463461C3F; Mon, 10 Jun 2013 05:45:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A5js9s038008; Mon, 10 Jun 2013 05:45:54 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A5jseZ038007; Mon, 10 Jun 2013 05:45:54 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201306100545.r5A5jseZ038007@svn.freebsd.org> From: Rui Paulo Date: Mon, 10 Jun 2013 05:45:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251597 - head/etc/devd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 05:45:54 -0000 Author: rpaulo Date: Mon Jun 10 05:45:53 2013 New Revision: 251597 URL: http://svnweb.freebsd.org/changeset/base/251597 Log: Regen. Modified: head/etc/devd/usb.conf Modified: head/etc/devd/usb.conf ============================================================================== --- head/etc/devd/usb.conf Mon Jun 10 05:45:16 2013 (r251596) +++ head/etc/devd/usb.conf Mon Jun 10 05:45:53 2013 (r251597) @@ -53,6 +53,17 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x05ac"; + match "product" "0x12a0"; + match "intclass" "0xff"; + match "intsubclass" "0xfd"; + match "intprotocol" "0x01"; + action "kldload -n if_ipheth"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x05ac"; match "product" "0x12a8"; match "intclass" "0xff"; match "intsubclass" "0xfd"; @@ -679,6 +690,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x04f2"; + match "product" "(0xaff7|0xaff8|0xaff9|0xaffa|0xaffa)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0502"; match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)"; action "kldload -n uipaq"; @@ -744,6 +763,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x050d"; + match "product" "0x1102"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x050d"; match "product" "0x1203"; action "kldload -n ubsa"; }; @@ -752,6 +779,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x050d"; + match "product" "(0x2102|0x2103)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x050d"; match "product" "0x4050"; action "kldload -n if_zyd"; }; @@ -1039,6 +1074,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0586"; + match "product" "0x341f"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x058f"; match "product" "0x9720"; action "kldload -n uplcom"; @@ -1271,6 +1314,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x06f8"; + match "product" "0xe033"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0707"; match "product" "0x0100"; action "kldload -n if_kue"; @@ -1472,6 +1523,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x07aa"; + match "product" "0x0056"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x07aa"; match "product" "0x9601"; action "kldload -n if_udav"; }; @@ -1528,6 +1587,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x07b8"; + match "product" "(0x8178|0x8188|0x8189)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x07b8"; match "product" "0xabc1"; action "kldload -n if_aue"; }; @@ -1735,6 +1802,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0846"; + match "product" "(0x9021|0x9041)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0856"; match "product" "(0xac01|0xac02|0xac03|0xac11|0xac12|0xac16|0xac17|0xac18|0xac19|0xac25|0xac26|0xac27|0xac33|0xac34|0xac49|0xac50|0xba02)"; action "kldload -n uftdi"; @@ -2136,6 +2211,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0b05"; + match "product" "0x17ab"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0b05"; match "product" "(0x4200|0x4201|0x4202|0x420f|0x9200|0x9202)"; action "kldload -n uipaq"; }; @@ -2240,6 +2323,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; + match "product" "(0x018a|0x317f)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0bda"; match "product" "0x8150"; action "kldload -n if_rue"; }; @@ -2248,13 +2339,45 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "(0x8187|0x8189|0x8197|0x8198)"; + match "product" "(0x8170|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0bda"; + match "product" "(0x8187|0x8189)"; + action "kldload -n if_urtw"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0bda"; + match "product" "0x818a"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0bda"; + match "product" "(0x8197|0x8198)"; action "kldload -n if_urtw"; }; nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0bda"; + match "product" "0x8754"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0bed"; match "product" "(0x1100|0x1101)"; action "kldload -n uslcom"; @@ -2560,6 +2683,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0df6"; + match "product" "(0x0052|0x005c|0x0061)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0df6"; match "product" "0x061c"; action "kldload -n if_axe"; }; @@ -2616,6 +2747,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0e66"; + match "product" "0x0019"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0e66"; match "product" "0x400c"; action "kldload -n if_aue"; }; @@ -2671,6 +2810,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0eb0"; + match "product" "0x9071"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0eba"; match "product" "(0x1080|0x2080)"; action "kldload -n uplcom"; @@ -2807,6 +2954,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x103c"; + match "product" "0x1629"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x103e"; match "product" "0x03e8"; action "kldload -n uftdi"; @@ -3304,6 +3459,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x13d3"; + match "product" "(0x3357|0x3358|0x3359)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x13d3"; match "product" "(0x3362|0x3375|0x3393)"; action "kldload -n ng_ubt"; }; @@ -4136,6 +4299,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; + match "product" "(0x3307|0x3308|0x3309|0x330a)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x2001"; match "product" "(0x3a00|0x3a02|0x3a04)"; action "kldload -n if_uath"; }; @@ -4200,6 +4371,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2019"; + match "product" "(0x1201|0x4902)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x2019"; match "product" "0x5303"; action "kldload -n if_zyd"; }; @@ -4224,6 +4403,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2019"; + match "product" "(0xab2a|0xab2b|0xab2e)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x2019"; match "product" "0xab50"; action "kldload -n if_rum"; }; @@ -4255,6 +4442,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x2019"; + match "product" "0xed17"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x203d"; match "product" "(0x1480|0x14a1|0x14a9)"; action "kldload -n if_run"; @@ -4287,6 +4482,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x20f4"; + match "product" "(0x624d|0x648b)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x2100"; match "product" "(0x9e52|0x9e54)"; action "kldload -n uftdi"; @@ -4431,6 +4634,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x4855"; + match "product" "(0x0090|0x0091)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x5050"; match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0300|0x0301|0x0400|0x0500|0x0700|0x0800|0x0900|0x0a00|0x0b00|0x0c00|0x0d00|0x0e00|0x0f00|0x1000|0x8000|0x8001|0x8002|0x8003|0x8004|0x8005)"; action "kldload -n uftdi"; @@ -4527,6 +4738,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x7392"; + match "product" "(0x7811|0x7822)"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x8516"; match "product" "(0x2070|0x2770|0x2870|0x3070|0x3071|0x3072|0x3572)"; action "kldload -n if_run"; @@ -4575,6 +4794,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x9846"; + match "product" "0x9041"; + action "kldload -n if_urtwn"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x9e88"; match "product" "0x9e8f"; action "kldload -n uftdi"; @@ -4749,5 +4976,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2422 USB entries processed +# 2479 USB entries processed From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 06:03:03 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D6F70741; Mon, 10 Jun 2013 06:03:03 +0000 (UTC) (envelope-from das@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C7ABD1CA3; Mon, 10 Jun 2013 06:03:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A633Ap043875; Mon, 10 Jun 2013 06:03:03 GMT (envelope-from das@svn.freebsd.org) Received: (from das@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A633GQ043874; Mon, 10 Jun 2013 06:03:03 GMT (envelope-from das@svn.freebsd.org) Message-Id: <201306100603.r5A633GQ043874@svn.freebsd.org> From: David Schultz Date: Mon, 10 Jun 2013 06:03:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251598 - head/tools/regression/lib/msun X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 06:03:03 -0000 Author: das Date: Mon Jun 10 06:03:03 2013 New Revision: 251598 URL: http://svnweb.freebsd.org/changeset/base/251598 Log: Fix some bugs in the complex trig tests so that they test both double and float precision properly. Modified: head/tools/regression/lib/msun/test-ctrig.c Modified: head/tools/regression/lib/msun/test-ctrig.c ============================================================================== --- head/tools/regression/lib/msun/test-ctrig.c Mon Jun 10 05:45:53 2013 (r251597) +++ head/tools/regression/lib/msun/test-ctrig.c Mon Jun 10 06:03:03 2013 (r251598) @@ -86,6 +86,14 @@ __FBSDID("$FreeBSD$"); test_p_tol(func, z, result, tol); \ test_p_tol(func, conjl(z), conjl(result), tol); \ } while (0) +#define test_odd_tol(func, z, result, tol) do { \ + test_tol(func, z, result, tol); \ + test_tol(func, -(z), -(result), tol); \ +} while (0) +#define test_even_tol(func, z, result, tol) do { \ + test_tol(func, z, result, tol); \ + test_tol(func, -(z), result, tol); \ +} while (0) /* Test the given function in all precisions. */ #define testall(func, x, result, exceptmask, excepts, checksign) do { \ @@ -110,12 +118,12 @@ __FBSDID("$FreeBSD$"); test_tol(func##f, x, result, tol * FLT_ULP()); \ } while (0) #define testall_odd_tol(func, x, result, tol) do { \ - test_tol(func, x, result, tol * DBL_ULP()); \ - test_tol(func, -x, -result, tol * DBL_ULP()); \ + test_odd_tol(func, x, result, tol * DBL_ULP()); \ + test_odd_tol(func##f, x, result, tol * FLT_ULP()); \ } while (0) #define testall_even_tol(func, x, result, tol) do { \ - test_tol(func, x, result, tol * DBL_ULP()); \ - test_tol(func, -x, result, tol * DBL_ULP()); \ + test_even_tol(func, x, result, tol * DBL_ULP()); \ + test_even_tol(func##f, x, result, tol * FLT_ULP()); \ } while (0) @@ -293,25 +301,49 @@ test_axes(void) for (i = 0; i < sizeof(nums) / sizeof(nums[0]); i++) { /* Real axis */ z = CMPLXL(nums[i], 0.0); - testall_odd_tol(csinh, z, CMPLXL(sinh(nums[i]), 0), 0); - testall_even_tol(ccosh, z, CMPLXL(cosh(nums[i]), 0), 0); - testall_odd_tol(ctanh, z, CMPLXL(tanh(nums[i]), 0), 1); - testall_odd_tol(csin, z, CMPLXL(sin(nums[i]), - copysign(0, cos(nums[i]))), 0); - testall_even_tol(ccos, z, CMPLXL(cos(nums[i]), - -copysign(0, sin(nums[i]))), 0); - testall_odd_tol(ctan, z, CMPLXL(tan(nums[i]), 0), 1); + test_odd_tol(csinh, z, CMPLXL(sinh(nums[i]), 0), DBL_ULP()); + test_even_tol(ccosh, z, CMPLXL(cosh(nums[i]), 0), DBL_ULP()); + test_odd_tol(ctanh, z, CMPLXL(tanh(nums[i]), 0), DBL_ULP()); + test_odd_tol(csin, z, CMPLXL(sin(nums[i]), + copysign(0, cos(nums[i]))), DBL_ULP()); + test_even_tol(ccos, z, CMPLXL(cos(nums[i]), + -copysign(0, sin(nums[i]))), DBL_ULP()); + test_odd_tol(ctan, z, CMPLXL(tan(nums[i]), 0), DBL_ULP()); + + test_odd_tol(csinhf, z, CMPLXL(sinhf(nums[i]), 0), FLT_ULP()); + test_even_tol(ccoshf, z, CMPLXL(coshf(nums[i]), 0), FLT_ULP()); + printf("%a %a\n", creal(z), cimag(z)); + printf("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z))); + printf("%a\n", nextafterf(tanhf(nums[i]), INFINITY)); + test_odd_tol(ctanhf, z, CMPLXL(tanhf(nums[i]), 0), + 1.3 * FLT_ULP()); + test_odd_tol(csinf, z, CMPLXL(sinf(nums[i]), + copysign(0, cosf(nums[i]))), FLT_ULP()); + test_even_tol(ccosf, z, CMPLXL(cosf(nums[i]), + -copysign(0, sinf(nums[i]))), 2 * FLT_ULP()); + test_odd_tol(ctanf, z, CMPLXL(tanf(nums[i]), 0), FLT_ULP()); /* Imaginary axis */ z = CMPLXL(0.0, nums[i]); - testall_odd_tol(csinh, z, CMPLXL(copysign(0, cos(nums[i])), - sin(nums[i])), 0); - testall_even_tol(ccosh, z, CMPLXL(cos(nums[i]), - copysign(0, sin(nums[i]))), 0); - testall_odd_tol(ctanh, z, CMPLXL(0, tan(nums[i])), 1); - testall_odd_tol(csin, z, CMPLXL(0, sinh(nums[i])), 0); - testall_even_tol(ccos, z, CMPLXL(cosh(nums[i]), -0.0), 0); - testall_odd_tol(ctan, z, CMPLXL(0, tanh(nums[i])), 1); + test_odd_tol(csinh, z, CMPLXL(copysign(0, cos(nums[i])), + sin(nums[i])), DBL_ULP()); + test_even_tol(ccosh, z, CMPLXL(cos(nums[i]), + copysign(0, sin(nums[i]))), DBL_ULP()); + test_odd_tol(ctanh, z, CMPLXL(0, tan(nums[i])), DBL_ULP()); + test_odd_tol(csin, z, CMPLXL(0, sinh(nums[i])), DBL_ULP()); + test_even_tol(ccos, z, CMPLXL(cosh(nums[i]), -0.0), DBL_ULP()); + test_odd_tol(ctan, z, CMPLXL(0, tanh(nums[i])), DBL_ULP()); + + test_odd_tol(csinhf, z, CMPLXL(copysign(0, cosf(nums[i])), + sinf(nums[i])), FLT_ULP()); + test_even_tol(ccoshf, z, CMPLXL(cosf(nums[i]), + copysign(0, sinf(nums[i]))), FLT_ULP()); + test_odd_tol(ctanhf, z, CMPLXL(0, tanf(nums[i])), FLT_ULP()); + test_odd_tol(csinf, z, CMPLXL(0, sinhf(nums[i])), FLT_ULP()); + test_even_tol(ccosf, z, CMPLXL(coshf(nums[i]), -0.0), + FLT_ULP()); + test_odd_tol(ctanf, z, CMPLXL(0, tanhf(nums[i])), + 1.3 * FLT_ULP()); } } @@ -373,7 +405,7 @@ test_small(void) testall_even_tol(ccosh, z, CMPLXL(tests[i].cosh_a, tests[i].cosh_b), 1.1); testall_odd_tol(ctanh, z, - CMPLXL(tests[i].tanh_a, tests[i].tanh_b), 1.1); + CMPLXL(tests[i].tanh_a, tests[i].tanh_b), 1.4); } } @@ -386,29 +418,32 @@ test_large(void) /* tanh() uses a threshold around x=22, so check both sides. */ z = CMPLXL(21, 0.78539816339744830961566084581987572L); testall_odd_tol(ctanh, z, - CMPLXL(1.0, 1.14990445285871196133287617611468468e-18L), 1); + CMPLXL(1.0, 1.14990445285871196133287617611468468e-18L), 1.2); z++; testall_odd_tol(ctanh, z, CMPLXL(1.0, 1.55622644822675930314266334585597964e-19L), 1); z = CMPLXL(355, 0.78539816339744830961566084581987572L); - testall_odd_tol(ctanh, z, - CMPLXL(1.0, 8.95257245135025991216632140458264468e-309L), 1); + test_odd_tol(ctanh, z, + CMPLXL(1.0, 8.95257245135025991216632140458264468e-309L), + DBL_ULP()); z = CMPLXL(30, 0x1p1023L); - testall_odd_tol(ctanh, z, - CMPLXL(1.0, -1.62994325413993477997492170229268382e-26L), 1); + test_odd_tol(ctanh, z, + CMPLXL(1.0, -1.62994325413993477997492170229268382e-26L), + DBL_ULP()); z = CMPLXL(1, 0x1p1023L); - testall_odd_tol(ctanh, z, - CMPLXL(0.878606311888306869546254022621986509L, - -0.225462792499754505792678258169527424L), 1); + test_odd_tol(ctanh, z, + CMPLXL(0.878606311888306869546254022621986509L, + -0.225462792499754505792678258169527424L), + DBL_ULP()); z = CMPLXL(710.6, 0.78539816339744830961566084581987572L); - testall_odd_tol(csinh, z, + test_odd_tol(csinh, z, CMPLXL(1.43917579766621073533185387499658944e308L, - 1.43917579766621073533185387499658944e308L), 1); - testall_even_tol(ccosh, z, + 1.43917579766621073533185387499658944e308L), DBL_ULP()); + test_even_tol(ccosh, z, CMPLXL(1.43917579766621073533185387499658944e308L, - 1.43917579766621073533185387499658944e308L), 1); + 1.43917579766621073533185387499658944e308L), DBL_ULP()); z = CMPLXL(1500, 0.78539816339744830961566084581987572L); testall_odd(csinh, z, CMPLXL(INFINITY, INFINITY), OPT_INEXACT, From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 06:05:01 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C4E1E8C3; Mon, 10 Jun 2013 06:05:01 +0000 (UTC) (envelope-from das@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B57D91CAF; Mon, 10 Jun 2013 06:05:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A651TT044292; Mon, 10 Jun 2013 06:05:01 GMT (envelope-from das@svn.freebsd.org) Received: (from das@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A64xDh044235; Mon, 10 Jun 2013 06:04:59 GMT (envelope-from das@svn.freebsd.org) Message-Id: <201306100604.r5A64xDh044235@svn.freebsd.org> From: David Schultz Date: Mon, 10 Jun 2013 06:04:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251599 - in head/lib/msun: . man src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 06:05:01 -0000 Author: das Date: Mon Jun 10 06:04:58 2013 New Revision: 251599 URL: http://svnweb.freebsd.org/changeset/base/251599 Log: Add implementations of acoshl(), asinhl(), and atanhl(). This is a merge of the work done by bde and myself. Added: head/lib/msun/src/e_acoshl.c - copied, changed from r251484, head/lib/msun/src/e_acosh.c head/lib/msun/src/e_atanhl.c - copied, changed from r251484, head/lib/msun/src/e_atanh.c head/lib/msun/src/s_asinhl.c - copied, changed from r251484, head/lib/msun/src/s_asinh.c Modified: head/lib/msun/Makefile head/lib/msun/Symbol.map head/lib/msun/man/acosh.3 head/lib/msun/man/asinh.3 head/lib/msun/man/atanh.3 head/lib/msun/src/e_acosh.c head/lib/msun/src/e_atanh.c head/lib/msun/src/math.h head/lib/msun/src/s_asinh.c Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/Makefile Mon Jun 10 06:04:58 2013 (r251599) @@ -94,10 +94,10 @@ SYMBOL_MAPS= ${SYM_MAPS} COMMON_SRCS+= s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. -COMMON_SRCS+= e_acosl.c e_asinl.c e_atan2l.c e_fmodl.c \ - e_hypotl.c e_remainderl.c e_sqrtl.c \ +COMMON_SRCS+= e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \ + e_fmodl.c e_hypotl.c e_remainderl.c e_sqrtl.c \ invtrig.c k_cosl.c k_sinl.c k_tanl.c \ - s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \ + s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \ s_csqrtl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c s_nextafterl.c \ s_nexttoward.c s_remquol.c s_rintl.c s_scalbnl.c \ @@ -138,11 +138,11 @@ MAN= acos.3 acosh.3 asin.3 asinh.3 atan. complex.3 MLINKS+=acos.3 acosf.3 acos.3 acosl.3 -MLINKS+=acosh.3 acoshf.3 +MLINKS+=acosh.3 acoshf.3 acosh.3 acoshl.3 MLINKS+=asin.3 asinf.3 asin.3 asinl.3 -MLINKS+=asinh.3 asinhf.3 +MLINKS+=asinh.3 asinhf.3 asinh.3 asinhl.3 MLINKS+=atan.3 atanf.3 atan.3 atanl.3 -MLINKS+=atanh.3 atanhf.3 +MLINKS+=atanh.3 atanhf.3 atanh.3 atanhl.3 MLINKS+=atan2.3 atan2f.3 atan2.3 atan2l.3 \ atan2.3 carg.3 atan2.3 cargf.3 atan2.3 cargl.3 MLINKS+=cacos.3 cacosf.3 cacos.3 cacosh.3 cacos.3 cacoshf.3 \ Modified: head/lib/msun/Symbol.map ============================================================================== --- head/lib/msun/Symbol.map Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/Symbol.map Mon Jun 10 06:04:58 2013 (r251599) @@ -237,6 +237,9 @@ FBSD_1.3 { fegetround; fesetround; fesetenv; + acoshl; + asinhl; + atanhl; cacos; cacosf; cacosh; Modified: head/lib/msun/man/acosh.3 ============================================================================== --- head/lib/msun/man/acosh.3 Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/man/acosh.3 Mon Jun 10 06:04:58 2013 (r251599) @@ -28,12 +28,13 @@ .\" from: @(#)acosh.3 5.2 (Berkeley) 5/6/91 .\" $FreeBSD$ .\" -.Dd January 14, 2005 +.Dd June 9, 2013 .Dt ACOSH 3 .Os .Sh NAME .Nm acosh , -.Nm acoshf +.Nm acoshf , +.Nm acoshl .Nd inverse hyperbolic cosine functions .Sh LIBRARY .Lb libm @@ -43,11 +44,14 @@ .Fn acosh "double x" .Ft float .Fn acoshf "float x" +.Ft long double +.Fn acoshl "long double x" .Sh DESCRIPTION The -.Fn acosh -and the -.Fn acoshf +.Fn acosh , +.Fn acoshf , +and +.Fn acoshl functions compute the inverse hyperbolic cosine of the real argument @@ -55,11 +59,7 @@ argument For a discussion of error due to roundoff, see .Xr math 3 . .Sh RETURN VALUES -The -.Fn acosh -and the -.Fn acoshf -functions +These functions return the inverse hyperbolic cosine of .Ar x . If the argument is less than 1, @@ -73,6 +73,13 @@ raises an invalid exception and returns .Xr math 3 .Sh HISTORY The -.Fn acosh -function appeared in -.Bx 4.3 . +.Fn acosh , +.Fn acoshf , +and +.Fn acoshl +functions appeared in +.Bx 4.3 , +.Fx 2.0 , +and +.Fx 10.0 , +respectively. Modified: head/lib/msun/man/asinh.3 ============================================================================== --- head/lib/msun/man/asinh.3 Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/man/asinh.3 Mon Jun 10 06:04:58 2013 (r251599) @@ -28,12 +28,13 @@ .\" from: @(#)asinh.3 6.4 (Berkeley) 5/6/91 .\" $FreeBSD$ .\" -.Dd May 6, 1991 +.Dd June 9, 2013 .Dt ASINH 3 .Os .Sh NAME .Nm asinh , -.Nm asinhf +.Nm asinhf , +.Nm asinhl .Nd inverse hyperbolic sine functions .Sh LIBRARY .Lb libm @@ -43,11 +44,14 @@ .Fn asinh "double x" .Ft float .Fn asinhf "float x" +.Ft long double +.Fn asinhl "long double x" .Sh DESCRIPTION The -.Fn asinh -and the -.Fn asinhf +.Fn asinh , +.Fn asinhf , +and +.Fn asinhl functions compute the inverse hyperbolic sine of the real argument @@ -55,11 +59,7 @@ argument For a discussion of error due to roundoff, see .Xr math 3 . .Sh RETURN VALUES -The -.Fn asinh -and the -.Fn asinhf -functions +These functions return the inverse hyperbolic sine of .Ar x . .Sh SEE ALSO @@ -69,6 +69,13 @@ return the inverse hyperbolic sine of .Xr math 3 .Sh HISTORY The -.Fn asinh -function appeared in -.Bx 4.3 . +.Fn asinh , +.Fn asinhf , +and +.Fn asinhl +functions appeared in +.Bx 4.3 , +.Fx 2.0 , +and +.Fx 10.0 , +respectively. Modified: head/lib/msun/man/atanh.3 ============================================================================== --- head/lib/msun/man/atanh.3 Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/man/atanh.3 Mon Jun 10 06:04:58 2013 (r251599) @@ -28,12 +28,13 @@ .\" from: @(#)atanh.3 5.2 (Berkeley) 5/6/91 .\" $FreeBSD$ .\" -.Dd January 14, 2005 +.Dd June 9, 2013 .Dt ATANH 3 .Os .Sh NAME .Nm atanh , -.Nm atanhf +.Nm atanhf , +.Nm atanhl .Nd inverse hyperbolic tangent functions .Sh LIBRARY .Lb libm @@ -43,11 +44,14 @@ .Fn atanh "double x" .Ft float .Fn atanhf "float x" +.Ft long double +.Fn atanhl "long double x" .Sh DESCRIPTION The -.Fn atanh -and the -.Fn atanhf +.Fn atanh , +.Fn atanhf , +and +.Fn atanhl functions compute the inverse hyperbolic tangent of the real argument @@ -55,11 +59,7 @@ argument For a discussion of error due to roundoff, see .Xr math 3 . .Sh RETURN VALUES -The -.Fn atanh -and the -.Fn atanhf -functions +These functions return the inverse hyperbolic tangent of .Ar x if successful. @@ -76,6 +76,13 @@ If .Xr math 3 .Sh HISTORY The -.Fn atanh -function appeared in -.Bx 4.3 . +.Fn atanh , +.Fn atanhf , +and +.Fn atanhl +functions appeared in +.Bx 4.3 , +.Fx 2.0 , +and +.Fx 10.0 , +respectively. Modified: head/lib/msun/src/e_acosh.c ============================================================================== --- head/lib/msun/src/e_acosh.c Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/src/e_acosh.c Mon Jun 10 06:04:58 2013 (r251599) @@ -29,6 +29,8 @@ __FBSDID("$FreeBSD$"); * acosh(NaN) is NaN without signal. */ +#include + #include "math.h" #include "math_private.h" @@ -60,3 +62,7 @@ __ieee754_acosh(double x) return log1p(t+sqrt(2.0*t+t*t)); } } + +#if LDBL_MANT_DIG == 53 +__weak_reference(acosh, acoshl); +#endif Copied and modified: head/lib/msun/src/e_acoshl.c (from r251484, head/lib/msun/src/e_acosh.c) ============================================================================== --- head/lib/msun/src/e_acosh.c Fri Jun 7 05:18:07 2013 (r251484, copy source) +++ head/lib/msun/src/e_acoshl.c Mon Jun 10 06:04:58 2013 (r251599) @@ -1,3 +1,4 @@ +/* from: FreeBSD: head/lib/msun/src/e_acosh.c 176451 2008-02-22 02:30:36Z das */ /* @(#)e_acosh.c 1.3 95/01/18 */ /* @@ -15,48 +16,74 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acosh(x) - * Method : - * Based on - * acosh(x) = log [ x + sqrt(x*x-1) ] - * we have - * acosh(x) := log(x)+ln2, if x is large; else - * acosh(x) := log(2x-1/(sqrt(x*x-1)+x)) if x>2; else - * acosh(x) := log1p(t+sqrt(2.0*t+t*t)); where t=x-1. +/* + * See e_acosh.c for complete comments. * - * Special cases: - * acosh(x) is NaN with signal if x<1. - * acosh(NaN) is NaN without signal. + * Converted to long double by David Schultz and + * Bruce D. Evans. */ +#include +#ifdef __i386__ +#include +#endif + +#include "fpmath.h" #include "math.h" #include "math_private.h" +/* EXP_LARGE is the threshold above which we use acosh(x) ~= log(2x). */ +#if LDBL_MANT_DIG == 64 +#define EXP_LARGE 34 +#elif LDBL_MANT_DIG == 113 +#define EXP_LARGE 58 +#else +#error "Unsupported long double format" +#endif + +#if LDBL_MAX_EXP != 0x4000 +/* We also require the usual expsign encoding. */ +#error "Unsupported long double format" +#endif + +#define BIAS (LDBL_MAX_EXP - 1) + static const double -one = 1.0, -ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ +one = 1.0; + +#if LDBL_MANT_DIG == 64 +static const union IEEEl2bits +u_ln2 = LD80C(0xb17217f7d1cf79ac, -1, 6.93147180559945309417e-1L); +#define ln2 u_ln2.e +#elif LDBL_MANT_DIG == 113 +static const long double +ln2 = 6.93147180559945309417232121458176568e-1L; /* 0x162e42fefa39ef35793c7673007e6.0p-113 */ +#else +#error "Unsupported long double format" +#endif -double -__ieee754_acosh(double x) +long double +acoshl(long double x) { - double t; - int32_t hx; - u_int32_t lx; - EXTRACT_WORDS(hx,lx,x); - if(hx<0x3ff00000) { /* x < 1 */ - return (x-x)/(x-x); - } else if(hx >=0x41b00000) { /* x > 2**28 */ - if(hx >=0x7ff00000) { /* x is inf of NaN */ - return x+x; + long double t; + int16_t hx; + + ENTERI(); + GET_LDBL_EXPSIGN(hx, x); + if (hx < 0x3fff) { /* x < 1, or misnormal */ + RETURNI((x-x)/(x-x)); + } else if (hx >= BIAS + EXP_LARGE) { /* x >= LARGE */ + if (hx >= 0x7fff) { /* x is inf, NaN or misnormal */ + RETURNI(x+x); } else - return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ - } else if(((hx-0x3ff00000)|lx)==0) { - return 0.0; /* acosh(1) = 0 */ - } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ + RETURNI(logl(x)+ln2); /* acosh(huge)=log(2x), or misnormal */ + } else if (hx == 0x3fff && x == 1) { + RETURNI(0.0); /* acosh(1) = 0 */ + } else if (hx >= 0x4000) { /* LARGE > x >= 2, or misnormal */ t=x*x; - return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); + RETURNI(logl(2.0*x-one/(x+sqrtl(t-one)))); } else { /* 1 + #include "math.h" #include "math_private.h" @@ -60,3 +62,7 @@ __ieee754_atanh(double x) t = 0.5*log1p((x+x)/(one-x)); if(hx>=0) return t; else return -t; } + +#if LDBL_MANT_DIG == 53 +__weak_reference(atanh, atanhl); +#endif Copied and modified: head/lib/msun/src/e_atanhl.c (from r251484, head/lib/msun/src/e_atanh.c) ============================================================================== --- head/lib/msun/src/e_atanh.c Fri Jun 7 05:18:07 2013 (r251484, copy source) +++ head/lib/msun/src/e_atanhl.c Mon Jun 10 06:04:58 2013 (r251599) @@ -1,3 +1,4 @@ +/* from: FreeBSD: head/lib/msun/src/e_atanh.c 176451 2008-02-22 02:30:36Z das */ /* @(#)e_atanh.c 1.3 95/01/18 */ /* @@ -15,48 +16,59 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atanh(x) - * Method : - * 1.Reduced x to positive by atanh(-x) = -atanh(x) - * 2.For x>=0.5 - * 1 2x x - * atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------) - * 2 1 - x 1 - x - * - * For x<0.5 - * atanh(x) = 0.5*log1p(2x+2x*x/(1-x)) - * - * Special cases: - * atanh(x) is NaN if |x| > 1 with signal; - * atanh(NaN) is that NaN with no signal; - * atanh(+-1) is +-INF with signal. +/* + * See e_atanh.c for complete comments. * + * Converted to long double by David Schultz and + * Bruce D. Evans. */ +#include +#ifdef __i386__ +#include +#endif + +#include "fpmath.h" #include "math.h" #include "math_private.h" +/* EXP_TINY is the threshold below which we use atanh(x) ~= x. */ +#if LDBL_MANT_DIG == 64 +#define EXP_TINY -34 +#elif LDBL_MANT_DIG == 113 +#define EXP_TINY -58 +#else +#error "Unsupported long double format" +#endif + +#if LDBL_MAX_EXP != 0x4000 +/* We also require the usual expsign encoding. */ +#error "Unsupported long double format" +#endif + +#define BIAS (LDBL_MAX_EXP - 1) + static const double one = 1.0, huge = 1e300; static const double zero = 0.0; -double -__ieee754_atanh(double x) +long double +atanhl(long double x) { - double t; - int32_t hx,ix; - u_int32_t lx; - EXTRACT_WORDS(hx,lx,x); - ix = hx&0x7fffffff; - if ((ix|((lx|(-lx))>>31))>0x3ff00000) /* |x|>1 */ - return (x-x)/(x-x); - if(ix==0x3ff00000) - return x/zero; - if(ix<0x3e300000&&(huge+x)>zero) return x; /* x<2**-28 */ - SET_HIGH_WORD(x,ix); - if(ix<0x3fe00000) { /* x < 0.5 */ + long double t; + uint16_t hx, ix; + + ENTERI(); + GET_LDBL_EXPSIGN(hx, x); + ix = hx & 0x7fff; + if (ix >= 0x3fff) /* |x| >= 1, or NaN or misnormal */ + RETURNI(fabsl(x) == 1 ? x / zero : (x - x) / (x - x)); + if (ix < BIAS + EXP_TINY && (huge + x) > zero) + RETURNI(x); /* x is tiny */ + SET_LDBL_EXPSIGN(x, ix); + if (ix < 0x3ffe) { /* |x| < 0.5, or misnormal */ t = x+x; - t = 0.5*log1p(t+t*x/(one-x)); + t = 0.5*log1pl(t+t*x/(one-x)); } else - t = 0.5*log1p((x+x)/(one-x)); - if(hx>=0) return t; else return -t; + t = 0.5*log1pl((x+x)/(one-x)); + RETURNI((hx & 0x8000) == 0 ? t : -t); } Modified: head/lib/msun/src/math.h ============================================================================== --- head/lib/msun/src/math.h Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/src/math.h Mon Jun 10 06:04:58 2013 (r251599) @@ -395,9 +395,12 @@ float significandf(float); * long double versions of ISO/POSIX math functions */ #if __ISO_C_VISIBLE >= 1999 +long double acoshl(long double); long double acosl(long double); +long double asinhl(long double); long double asinl(long double); long double atan2l(long double, long double); +long double atanhl(long double); long double atanl(long double); long double cbrtl(long double); long double ceill(long double); @@ -461,9 +464,6 @@ __END_DECLS */ __BEGIN_DECLS -long double acoshl(long double); -long double asinhl(long double); -long double atanhl(long double); long double coshl(long double); long double erfcl(long double); long double erfl(long double); Modified: head/lib/msun/src/s_asinh.c ============================================================================== --- head/lib/msun/src/s_asinh.c Mon Jun 10 06:03:03 2013 (r251598) +++ head/lib/msun/src/s_asinh.c Mon Jun 10 06:04:58 2013 (r251599) @@ -24,6 +24,8 @@ __FBSDID("$FreeBSD$"); * := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2))) */ +#include + #include "math.h" #include "math_private.h" @@ -54,3 +56,7 @@ asinh(double x) } if(hx>0) return w; else return -w; } + +#if LDBL_MANT_DIG == 53 +__weak_reference(asinh, asinhl); +#endif Copied and modified: head/lib/msun/src/s_asinhl.c (from r251484, head/lib/msun/src/s_asinh.c) ============================================================================== --- head/lib/msun/src/s_asinh.c Fri Jun 7 05:18:07 2013 (r251484, copy source) +++ head/lib/msun/src/s_asinhl.c Mon Jun 10 06:04:58 2013 (r251599) @@ -1,3 +1,5 @@ +/* from: FreeBSD: head/lib/msun/src/e_acosh.c 176451 2008-02-22 02:30:36Z das */ + /* @(#)s_asinh.c 5.1 93/09/24 */ /* * ==================================================== @@ -13,44 +15,77 @@ #include __FBSDID("$FreeBSD$"); -/* asinh(x) - * Method : - * Based on - * asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ] - * we have - * asinh(x) := x if 1+x*x=1, - * := sign(x)*(log(x)+ln2)) for large |x|, else - * := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else - * := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2))) +/* + * See s_asinh.c for complete comments. + * + * Converted to long double by David Schultz and + * Bruce D. Evans. */ +#include +#ifdef __i386__ +#include +#endif + +#include "fpmath.h" #include "math.h" #include "math_private.h" +/* EXP_LARGE is the threshold above which we use asinh(x) ~= log(2x). */ +/* EXP_TINY is the threshold below which we use asinh(x) ~= x. */ +#if LDBL_MANT_DIG == 64 +#define EXP_LARGE 34 +#define EXP_TINY -34 +#elif LDBL_MANT_DIG == 113 +#define EXP_LARGE 58 +#define EXP_TINY -58 +#else +#error "Unsupported long double format" +#endif + +#if LDBL_MAX_EXP != 0x4000 +/* We also require the usual expsign encoding. */ +#error "Unsupported long double format" +#endif + +#define BIAS (LDBL_MAX_EXP - 1) + static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ -ln2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ huge= 1.00000000000000000000e+300; -double -asinh(double x) +#if LDBL_MANT_DIG == 64 +static const union IEEEl2bits +u_ln2 = LD80C(0xb17217f7d1cf79ac, -1, 6.93147180559945309417e-1L); +#define ln2 u_ln2.e +#elif LDBL_MANT_DIG == 113 +static const long double +ln2 = 6.93147180559945309417232121458176568e-1L; /* 0x162e42fefa39ef35793c7673007e6.0p-113 */ +#else +#error "Unsupported long double format" +#endif + +long double +asinhl(long double x) { - double t,w; - int32_t hx,ix; - GET_HIGH_WORD(hx,x); - ix = hx&0x7fffffff; - if(ix>=0x7ff00000) return x+x; /* x is inf or NaN */ - if(ix< 0x3e300000) { /* |x|<2**-28 */ - if(huge+x>one) return x; /* return x inexact except 0 */ + long double t, w; + uint16_t hx, ix; + + ENTERI(); + GET_LDBL_EXPSIGN(hx, x); + ix = hx & 0x7fff; + if (ix >= 0x7fff) RETURNI(x+x); /* x is inf, NaN or misnormal */ + if (ix < BIAS + EXP_TINY) { /* |x| < TINY, or misnormal */ + if (huge + x > one) RETURNI(x); /* return x inexact except 0 */ } - if(ix>0x41b00000) { /* |x| > 2**28 */ - w = __ieee754_log(fabs(x))+ln2; - } else if (ix>0x40000000) { /* 2**28 > |x| > 2.0 */ - t = fabs(x); - w = __ieee754_log(2.0*t+one/(__ieee754_sqrt(x*x+one)+t)); - } else { /* 2.0 > |x| > 2**-28 */ + if (ix >= BIAS + EXP_LARGE) { /* |x| >= LARGE, or misnormal */ + w = logl(fabsl(x))+ln2; + } else if (ix >= 0x4000) { /* LARGE > |x| >= 2.0, or misnormal */ + t = fabsl(x); + w = logl(2.0*t+one/(sqrtl(x*x+one)+t)); + } else { /* 2.0 > |x| >= TINY, or misnormal */ t = x*x; - w =log1p(fabs(x)+t/(one+__ieee754_sqrt(one+t))); + w =log1pl(fabsl(x)+t/(one+sqrtl(one+t))); } - if(hx>0) return w; else return -w; + RETURNI((hx & 0x8000) == 0 ? w : -w); } From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 07:31:50 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5A367AA3; Mon, 10 Jun 2013 07:31:50 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4BC9C1FD2; Mon, 10 Jun 2013 07:31:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A7VoCU072248; Mon, 10 Jun 2013 07:31:50 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A7Vof6072247; Mon, 10 Jun 2013 07:31:50 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201306100731.r5A7Vof6072247@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 10 Jun 2013 07:31:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251600 - head/sys/dev/fxp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 07:31:50 -0000 Author: yongari Date: Mon Jun 10 07:31:49 2013 New Revision: 251600 URL: http://svnweb.freebsd.org/changeset/base/251600 Log: Avoid unnecessary controller reinitialization by checking driver running state. fxp(4) requires controller reinitialization for the following cases. o RX lockup condition on i82557 o promiscuous mode change o multicast filter change o WOL configuration o TSO/VLAN hardware tagging/checksum offloading configuration o MAC reprogramming after speed/duplex/flow-control resolution o Any events that result in MAC reprogramming(link UP/DOWN, remote link partner's restart of auto-negotiation etc) o Microcode loading/unloading Apart from above cases which come from hardware limitation, upper stack also blindly reinitializes controller whenever an IP address is assigned. After r194573, fxp(4) no longer needs to reinitialize the controller to program multicast filter after upping the interface. So keeping track of driver running state should remove all unnecessary controller reinitializations. This change will also address endless controller reinitialization triggered by dhclient(8). Tested by: hrs, Alban Hertroys Modified: head/sys/dev/fxp/if_fxp.c Modified: head/sys/dev/fxp/if_fxp.c ============================================================================== --- head/sys/dev/fxp/if_fxp.c Mon Jun 10 06:04:58 2013 (r251599) +++ head/sys/dev/fxp/if_fxp.c Mon Jun 10 07:31:49 2013 (r251600) @@ -1075,7 +1075,8 @@ fxp_suspend(device_t dev) pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; sc->flags |= FXP_FLAG_WOL; /* Reconfigure hardware to accept magic frames. */ - fxp_init_body(sc, 1); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + fxp_init_body(sc, 0); } pci_write_config(sc->dev, pmc + PCIR_POWER_STATUS, pmstat, 2); } @@ -2141,8 +2142,10 @@ fxp_tick(void *xsc) */ if (sc->rx_idle_secs > FXP_MAX_RX_IDLE) { sc->rx_idle_secs = 0; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 1); + } return; } /* @@ -2240,6 +2243,7 @@ fxp_watchdog(struct fxp_softc *sc) device_printf(sc->dev, "device timeout\n"); sc->ifp->if_oerrors++; + sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 1); } @@ -2274,6 +2278,10 @@ fxp_init_body(struct fxp_softc *sc, int int i, prm; FXP_LOCK_ASSERT(sc, MA_OWNED); + + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return; + /* * Cancel any pending I/O */ @@ -2813,6 +2821,7 @@ fxp_miibus_statchg(device_t dev) */ if (sc->revision == FXP_REV_82557) return; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 0); } @@ -2836,9 +2845,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm if (ifp->if_flags & IFF_UP) { if (((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) && ((ifp->if_flags ^ sc->if_flags) & - (IFF_PROMISC | IFF_ALLMULTI | IFF_LINK0)) != 0) + (IFF_PROMISC | IFF_ALLMULTI | IFF_LINK0)) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 0); - else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + } else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) fxp_init_body(sc, 1); } else { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) @@ -2851,8 +2861,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm case SIOCADDMULTI: case SIOCDELMULTI: FXP_LOCK(sc); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 0); + } FXP_UNLOCK(sc); break; @@ -2942,8 +2954,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm ~(IFCAP_VLAN_HWTSO | IFCAP_VLAN_HWCSUM); reinit++; } - if (reinit > 0 && ifp->if_flags & IFF_UP) + if (reinit > 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; fxp_init_body(sc, 0); + } FXP_UNLOCK(sc); VLAN_CAPABILITIES(ifp); break; From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 11:09:11 2013 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8277870F; Mon, 10 Jun 2013 11:09:11 +0000 (UTC) (envelope-from cognet@ci0.org) Received: from kanar.ci0.org (unknown [IPv6:2a01:e0b:1:150:ca0a:a9ff:fef1:a4c9]) by mx1.freebsd.org (Postfix) with ESMTP id 0B5B91DFA; Mon, 10 Jun 2013 11:09:10 +0000 (UTC) Received: from kanar.ci0.org (pluxor@localhost [127.0.0.1]) by kanar.ci0.org (8.14.5/8.14.5) with ESMTP id r5AB8lu3046634; Mon, 10 Jun 2013 13:08:47 +0200 (CEST) (envelope-from cognet@ci0.org) Received: (from doginou@localhost) by kanar.ci0.org (8.14.5/8.14.5/Submit) id r5AB8lop046633; Mon, 10 Jun 2013 13:08:47 +0200 (CEST) (envelope-from cognet@ci0.org) X-Authentication-Warning: kanar.ci0.org: doginou set sender to cognet@ci0.org using -f Date: Mon, 10 Jun 2013 13:08:47 +0200 From: Olivier Houchard To: Konstantin Belousov Subject: Re: svn commit: r251586 - head/sys/arm/ti Message-ID: <20130610110847.GA46614@ci0.org> References: <201306092251.r59MpCmW006162@svn.freebsd.org> <20130610035547.GX3047@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130610035547.GX3047@kib.kiev.ua> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 11:09:11 -0000 On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote: > On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote: > > Author: cognet > > Date: Sun Jun 9 22:51:11 2013 > > New Revision: 251586 > > URL: http://svnweb.freebsd.org/changeset/base/251586 > > > > Log: > > Increase the maximum KVM available on TI chips. Not sure why we suddenly need > > that much, but that lets me boot with 1GB of RAM. > > I suspect that the cause is the combination of limited KVA and > lack of any limitation for the buffer map. I noted that ARM lacks > VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a > day ago. > > In essence, the buffer map is allowed to take up to ~330MB when no > upper limit from VM_BCACHE_SIZE_MAX is specified. Hi Konstantin, Thanks for the hint ! It seems only i386 and sparc64 sets it, what would be a good value, 200M, as it is on i386 ? Regards, Olivier From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 13:55:04 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 308F8DBB; Mon, 10 Jun 2013 13:55:04 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 07C7019AF; Mon, 10 Jun 2013 13:55:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ADt3jf094101; Mon, 10 Jun 2013 13:55:03 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ADt3ms094100; Mon, 10 Jun 2013 13:55:03 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201306101355.r5ADt3ms094100@svn.freebsd.org> From: Ed Maste Date: Mon, 10 Jun 2013 13:55:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251601 - head/tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 13:55:04 -0000 Author: emaste Date: Mon Jun 10 13:55:03 2013 New Revision: 251601 URL: http://svnweb.freebsd.org/changeset/base/251601 Log: Handle options that override other options This is a workaround for WITH_LDNS_UTILS forcing BIND_UTILS off. It can be reverted when we no longer have these conflicting options, or made more general if we grow more cases like this. Modified: head/tools/build/options/makeman Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Mon Jun 10 07:31:49 2013 (r251600) +++ head/tools/build/options/makeman Mon Jun 10 13:55:03 2013 (r251601) @@ -198,7 +198,12 @@ that can be used for source builds. .Bl -tag -width indent EOF show settings SRCCONF=/dev/null | sort > $t/config_default - show with SRCCONF=/dev/null | sort > $t/config_WITH_ALL + # Work around WITH_LDNS_UTILS forcing BIND_UTILS off by parsing the + # actual config that results from enabling every WITH_ option. This + # can be reverted if/when we no longer have options that disable + # others. + show with SRCCONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf + show settings SRCCONF=$t/src.conf | sort > $t/config_WITH_ALL show without SRCCONF=/dev/null | sort > $t/config_WITHOUT_ALL show_options | @@ -229,6 +234,18 @@ EOF exit 1 fi + show settings SRCCONF=/dev/null -D${opt} | sort > $t/config_${opt} + comm -13 $t/config_default $t/config_${opt} | sed -n "/^${opt}$/!p" | + comm -13 $t/deps - > $t/deps2 + + # Work around BIND_UTILS=no being the default when every WITH_ + # option is enabled. + if [ "$(cat $t/deps2)" == WITHOUT_BIND_UTILS ]; then + sort $t/deps $t/deps2 > $t/_deps + mv $t/_deps $t/deps + :> $t/deps2 + fi + if [ -s $t/deps ] ; then echo 'When set, it also enforces the following options:' echo '.Pp' @@ -240,10 +257,6 @@ EOF echo '.El' fi - show settings SRCCONF=/dev/null -D${opt} | sort > $t/config_${opt} - comm -13 $t/config_default $t/config_${opt} | sed -n "/^${opt}$/!p" | - comm -13 $t/deps - > $t/deps2 - if [ -s $t/deps2 ] ; then if [ -s $t/deps ] ; then echo '.Pp' From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 15:22:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4F39E63F; Mon, 10 Jun 2013 15:22:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 401AB1E6E; Mon, 10 Jun 2013 15:22:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AFMSWt023303; Mon, 10 Jun 2013 15:22:28 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AFMRwR023301; Mon, 10 Jun 2013 15:22:27 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201306101522.r5AFMRwR023301@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 10 Jun 2013 15:22:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251604 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 15:22:28 -0000 Author: marcel Date: Mon Jun 10 15:22:27 2013 New Revision: 251604 URL: http://svnweb.freebsd.org/changeset/base/251604 Log: Revert r251590. It unexpectedly broke the build and there were some questions on locking. As part of commit-bit grooming, I'd like Steve to handle this, but can't leave things broken in the mean time. Modified: head/sys/kern/vfs_mount.c head/sys/sys/mount.h Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Mon Jun 10 14:22:04 2013 (r251603) +++ head/sys/kern/vfs_mount.c Mon Jun 10 15:22:27 2013 (r251604) @@ -864,7 +864,6 @@ vfs_domount_first( VOP_UNLOCK(newdp, 0); VOP_UNLOCK(vp, 0); mountcheckdirs(vp, newdp); - EVENTHANDLER_INVOKE(vfs_mounted, mp, newdp, td); vrele(newdp); if ((mp->mnt_flag & MNT_RDONLY) == 0) vfs_allocate_syncvnode(mp); @@ -1356,7 +1355,6 @@ dounmount(mp, flags, td) mtx_lock(&mountlist_mtx); TAILQ_REMOVE(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); - EVENTHANDLER_INVOKE(vfs_unmounted, mp, td); if (coveredvp != NULL) { coveredvp->v_mountedhere = NULL; vput(coveredvp); Modified: head/sys/sys/mount.h ============================================================================== --- head/sys/sys/mount.h Mon Jun 10 14:22:04 2013 (r251603) +++ head/sys/sys/mount.h Mon Jun 10 15:22:27 2013 (r251604) @@ -39,7 +39,6 @@ #include #include #include -#include #endif /* @@ -799,17 +798,6 @@ vfs_statfs_t __vfs_statfs; extern char *mountrootfsname; /* - * Event handlers - */ - -typedef void (*vfs_mounted_notify_fn)(void *, struct mount *, struct vnode *, - struct thread *); -typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *, - struct thread *); -EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); -EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn); - -/* * exported vnode operations */ From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 17:02:37 2013 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3C349ECA; Mon, 10 Jun 2013 17:02:37 +0000 (UTC) (envelope-from alc@rice.edu) Received: from pp2.rice.edu (proofpoint2.mail.rice.edu [128.42.201.101]) by mx1.freebsd.org (Postfix) with ESMTP id 0D62115D0; Mon, 10 Jun 2013 17:02:36 +0000 (UTC) Received: from pps.filterd (pp2.rice.edu [127.0.0.1]) by pp2.rice.edu (8.14.5/8.14.5) with SMTP id r5AAnxbY015409; Mon, 10 Jun 2013 12:02:23 -0500 Received: from mh3.mail.rice.edu (mh3.mail.rice.edu [128.42.199.10]) by pp2.rice.edu with ESMTP id 1cs11m3a9b-1; Mon, 10 Jun 2013 12:02:23 -0500 X-Virus-Scanned: by amavis-2.7.0 at mh3.mail.rice.edu, auth channel Received: from adsl-216-63-78-18.dsl.hstntx.swbell.net (adsl-216-63-78-18.dsl.hstntx.swbell.net [216.63.78.18]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (Authenticated sender: alc) by mh3.mail.rice.edu (Postfix) with ESMTPSA id 486F440188; Mon, 10 Jun 2013 12:02:21 -0500 (CDT) Message-ID: <51B6069C.6060704@rice.edu> Date: Mon, 10 Jun 2013 12:02:20 -0500 From: Alan Cox User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/20130127 Thunderbird/17.0.2 MIME-Version: 1.0 To: Olivier Houchard Subject: Re: svn commit: r251586 - head/sys/arm/ti References: <201306092251.r59MpCmW006162@svn.freebsd.org> <20130610035547.GX3047@kib.kiev.ua> <20130610110847.GA46614@ci0.org> In-Reply-To: <20130610110847.GA46614@ci0.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Konstantin Belousov , svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 17:02:37 -0000 On 06/10/2013 06:08, Olivier Houchard wrote: > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote: >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote: >>> Author: cognet >>> Date: Sun Jun 9 22:51:11 2013 >>> New Revision: 251586 >>> URL: http://svnweb.freebsd.org/changeset/base/251586 >>> >>> Log: >>> Increase the maximum KVM available on TI chips. Not sure why we suddenly need >>> that much, but that lets me boot with 1GB of RAM. >> I suspect that the cause is the combination of limited KVA and >> lack of any limitation for the buffer map. I noted that ARM lacks >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a >> day ago. >> >> In essence, the buffer map is allowed to take up to ~330MB when no >> upper limit from VM_BCACHE_SIZE_MAX is specified. > > Hi Konstantin, > > Thanks for the hint ! > It seems only i386 and sparc64 sets it, what would be a good value, 200M, as > it is on i386 ? > Since there are many arm platforms with less than 1 GB of kernel virtual address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down from 200 MB with the available KVA space. See how VM_KMEM_SIZE_MAX is currently defined on arm. Alan From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 17:12:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0509F385; Mon, 10 Jun 2013 17:12:23 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EC10E166C; Mon, 10 Jun 2013 17:12:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AHCMPo058031; Mon, 10 Jun 2013 17:12:22 GMT (envelope-from davidcs@svn.freebsd.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AHCM2U058030; Mon, 10 Jun 2013 17:12:22 GMT (envelope-from davidcs@svn.freebsd.org) Message-Id: <201306101712.r5AHCM2U058030@svn.freebsd.org> From: David C Somayajulu Date: Mon, 10 Jun 2013 17:12:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251605 - head/sys/dev/qlxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 17:12:23 -0000 Author: davidcs Date: Mon Jun 10 17:12:22 2013 New Revision: 251605 URL: http://svnweb.freebsd.org/changeset/base/251605 Log: There is a one-to-one correspondence between the MSI-X vector # and the Status Descriptor Ring Index. Hence there is no need to check the Interrupt Source Register. Approved by: George Neville-Neil Modified: head/sys/dev/qlxgbe/ql_isr.c Modified: head/sys/dev/qlxgbe/ql_isr.c ============================================================================== --- head/sys/dev/qlxgbe/ql_isr.c Mon Jun 10 15:22:27 2013 (r251604) +++ head/sys/dev/qlxgbe/ql_isr.c Mon Jun 10 17:12:22 2013 (r251605) @@ -858,7 +858,6 @@ ql_isr(void *arg) int idx; qla_hw_t *hw; struct ifnet *ifp; - uint32_t data = 0; uint32_t ret = 0; ha = ivec->ha; @@ -871,12 +870,7 @@ ql_isr(void *arg) if (idx == 0) taskqueue_enqueue(ha->tx_tq, &ha->tx_task); - - - data = READ_REG32(ha, ha->hw.intr_src[idx]); - - if (data & 0x1 ) - ret = qla_rcv_isr(ha, idx, -1); + ret = qla_rcv_isr(ha, idx, -1); if (idx == 0) taskqueue_enqueue(ha->tx_tq, &ha->tx_task); From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 19:37:46 2013 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAFACC1D; Mon, 10 Jun 2013 19:37:46 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 511E71D54; Mon, 10 Jun 2013 19:37:46 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r5AJbaYv069537; Mon, 10 Jun 2013 22:37:36 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r5AJbaYv069537 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r5AJbaEW069536; Mon, 10 Jun 2013 22:37:36 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 10 Jun 2013 22:37:36 +0300 From: Konstantin Belousov To: Alan Cox Subject: Re: svn commit: r251586 - head/sys/arm/ti Message-ID: <20130610193736.GF3047@kib.kiev.ua> References: <201306092251.r59MpCmW006162@svn.freebsd.org> <20130610035547.GX3047@kib.kiev.ua> <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="0kF7NMh4V20xOF8g" Content-Disposition: inline In-Reply-To: <51B6069C.6060704@rice.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Olivier Houchard X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 19:37:46 -0000 --0kF7NMh4V20xOF8g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote: > On 06/10/2013 06:08, Olivier Houchard wrote: > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote: > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote: > >>> Author: cognet > >>> Date: Sun Jun 9 22:51:11 2013 > >>> New Revision: 251586 > >>> URL: http://svnweb.freebsd.org/changeset/base/251586 > >>> > >>> Log: > >>> Increase the maximum KVM available on TI chips. Not sure why we sud= denly need > >>> that much, but that lets me boot with 1GB of RAM. > >> I suspect that the cause is the combination of limited KVA and > >> lack of any limitation for the buffer map. I noted that ARM lacks > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a > >> day ago. > >> > >> In essence, the buffer map is allowed to take up to ~330MB when no > >> upper limit from VM_BCACHE_SIZE_MAX is specified. > > > > Hi Konstantin, > > > > Thanks for the hint ! > > It seems only i386 and sparc64 sets it, what would be a good value, 200= M, as > > it is on i386 ? > > >=20 > Since there are many arm platforms with less than 1 GB of kernel virtual > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down > from 200 MB with the available KVA space. See how VM_KMEM_SIZE_MAX is > currently defined on arm. In fact, Ithink it does not make much sense to scale the buffer cache up. It is mostly wasted space now. As I measured it, on typical load you have only 10-20% of instantiated buffers mapped. Alexander Motin reported that he tested the equivalent of the following change. With it committed, I think that r251586 could be reverted. diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index 9ffb118..5c738c2 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -128,6 +128,11 @@ #define USPACE_SVC_STACK_BOTTOM (USPACE_SVC_STACK_TOP - 0x1000) #define USPACE_UNDEF_STACK_TOP (USPACE_SVC_STACK_BOTTOM - 0x10) #define USPACE_UNDEF_STACK_BOTTOM (FPCONTEXTSIZE + 10) + +#ifndef VM_BCACHE_SIZE_MAX +#define VM_BCACHE_SIZE_MAX (128 * 1024 * 1024) +#endif + /* * Mach derived conversion macros */ --0kF7NMh4V20xOF8g Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBAgAGBQJRtir/AAoJEJDCuSvBvK1Bc3EP/0x7/43VmJr1gaRRGR9suJDr DZfnpLVqMKPgMotOzF96y4K0OvI/3WUul0lrZc/QXIre5c13leJ0XQEqqjr1juOO lGsdSyRMwxbn0auMePcV2WE1+VKhTPRHd73KHeQI7e5EjTYvcu1Mx9AlpR+nOw/+ q2Rjhw/gSwr/xEv+TFUhuMnUs6wZQSPB9wkBT0yq25CJCl35SkwL70FAyByvLDtI vUplqSgZ9HHI9NsPCWVY34ga5IqV63s5M8EofjyigvES7GntFbcF0YlXxBeu3iOy DF0L3JmTKPclBL4VZ8w4qIw4Nkx1VCggIxnB3vaf34GGubJYe4tYRBgXoGOj/yxB ZX79pizEGznwMGWd8rkKsOjlkHFdSPRUodb0XD44UZzxtZYwccGFxpa6PgxVVjT4 uGrty84PNDKRcl04U/MjcHyD8YuIs74fGucydZMT34wxAgN9bARCctNaaVt43yfc rE/w+mn336CSLjrmpdo+8MSJ9Z4GA4DFB6qh0DFLm7gwGHxpJ51Yp1M+7h6+nsLs xekDAosIZoA0nRSZ20MJ20ouUySrAYaQJqvC4gZ4CltbW/w3hKx8j1wJz9sNfHvF Z1gOYVOyAQdWLFu9WL7HOk8kEj2G+rcY5KmHKfpx8vOf675QM0G2gUyejiOZGcne lDpCIYn8MKq5JhatKVCB =kR7R -----END PGP SIGNATURE----- --0kF7NMh4V20xOF8g-- From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 20:10:35 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6B6703BB; Mon, 10 Jun 2013 20:10:35 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5CC301ECE; Mon, 10 Jun 2013 20:10:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AKAZ7R013140; Mon, 10 Jun 2013 20:10:35 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AKAZlF013139; Mon, 10 Jun 2013 20:10:35 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201306102010.r5AKAZlF013139@svn.freebsd.org> From: Adrian Chadd Date: Mon, 10 Jun 2013 20:10:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251606 - head/sys/dev/ath X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 20:10:35 -0000 Author: adrian Date: Mon Jun 10 20:10:34 2013 New Revision: 251606 URL: http://svnweb.freebsd.org/changeset/base/251606 Log: Add another comment about WB195 (AR9285+AR3011) when using ASPM. Modified: head/sys/dev/ath/if_ath_btcoex.c Modified: head/sys/dev/ath/if_ath_btcoex.c ============================================================================== --- head/sys/dev/ath/if_ath_btcoex.c Mon Jun 10 17:12:22 2013 (r251605) +++ head/sys/dev/ath/if_ath_btcoex.c Mon Jun 10 20:10:34 2013 (r251606) @@ -134,6 +134,10 @@ ath_btcoex_cfg_wb195(struct ath_softc *s * When using bluetooth coexistence, ASPM needs to be disabled * otherwise the sleeping interferes with the bluetooth (USB) * operation and the MAC sleep/wakeup hardware. + * + * The PCIe powersave routine also needs to not be called + * by the driver during suspend/resume, else things will get + * a little odd. Check Linux ath9k for more details. */ static int ath_btcoex_aspm_wb195(struct ath_softc *sc) From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 20:36:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 74580A5D; Mon, 10 Jun 2013 20:36:57 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 637431FFE; Mon, 10 Jun 2013 20:36:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AKav0W021661; Mon, 10 Jun 2013 20:36:57 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AKaslT021644; Mon, 10 Jun 2013 20:36:54 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201306102036.r5AKaslT021644@svn.freebsd.org> From: Dimitry Andric Date: Mon, 10 Jun 2013 20:36:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r251607 - in vendor/llvm/dist: . autoconf cmake cmake/modules docs docs/CommandGuide docs/tutorial examples/ExceptionDemo include/llvm include/llvm-c include/llvm-c/Transforms include/l... X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 20:36:57 -0000 Author: dim Date: Mon Jun 10 20:36:52 2013 New Revision: 251607 URL: http://svnweb.freebsd.org/changeset/base/251607 Log: Vendor import of llvm tags/RELEASE_33/final r183502 (effectively, 3.3 release): http://llvm.org/svn/llvm-project/llvm/tags/RELEASE_33/final@183502 Added: vendor/llvm/dist/docs/CommandGuide/llvm-readobj.rst vendor/llvm/dist/docs/Extensions.rst vendor/llvm/dist/include/llvm/DebugInfo/DWARFFormValue.h vendor/llvm/dist/include/llvm/ExecutionEngine/ObjectCache.h vendor/llvm/dist/include/llvm/Support/CBindingWrapping.h vendor/llvm/dist/include/llvm/Support/Compression.h vendor/llvm/dist/lib/Support/Compression.cpp vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h vendor/llvm/dist/lib/Target/Mips/MicroMipsInstrFormats.td vendor/llvm/dist/lib/Target/Mips/MicroMipsInstrInfo.td vendor/llvm/dist/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Mips/MipsModuleISelDAGToDAG.h vendor/llvm/dist/lib/Target/Mips/MipsOs16.cpp vendor/llvm/dist/lib/Target/Mips/MipsOs16.h vendor/llvm/dist/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp vendor/llvm/dist/lib/Target/PowerPC/AsmParser/ vendor/llvm/dist/lib/Target/PowerPC/AsmParser/CMakeLists.txt vendor/llvm/dist/lib/Target/PowerPC/AsmParser/LLVMBuild.txt vendor/llvm/dist/lib/Target/PowerPC/AsmParser/Makefile vendor/llvm/dist/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp vendor/llvm/dist/lib/Target/R600/R600Packetizer.cpp vendor/llvm/dist/lib/Target/R600/SIDefines.h vendor/llvm/dist/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h vendor/llvm/dist/lib/Target/SystemZ/ vendor/llvm/dist/lib/Target/SystemZ/AsmParser/ vendor/llvm/dist/lib/Target/SystemZ/AsmParser/CMakeLists.txt vendor/llvm/dist/lib/Target/SystemZ/AsmParser/LLVMBuild.txt vendor/llvm/dist/lib/Target/SystemZ/AsmParser/Makefile vendor/llvm/dist/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp vendor/llvm/dist/lib/Target/SystemZ/CMakeLists.txt vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/ vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/CMakeLists.txt vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/LLVMBuild.txt vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/Makefile vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.cpp vendor/llvm/dist/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h vendor/llvm/dist/lib/Target/SystemZ/LLVMBuild.txt vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/ vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/Makefile vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCCodeEmitter.cpp vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCFixups.h vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp vendor/llvm/dist/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.h vendor/llvm/dist/lib/Target/SystemZ/Makefile vendor/llvm/dist/lib/Target/SystemZ/README.txt vendor/llvm/dist/lib/Target/SystemZ/SystemZ.h vendor/llvm/dist/lib/Target/SystemZ/SystemZ.td vendor/llvm/dist/lib/Target/SystemZ/SystemZAsmPrinter.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZAsmPrinter.h vendor/llvm/dist/lib/Target/SystemZ/SystemZCallingConv.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZCallingConv.h vendor/llvm/dist/lib/Target/SystemZ/SystemZCallingConv.td vendor/llvm/dist/lib/Target/SystemZ/SystemZConstantPoolValue.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZConstantPoolValue.h vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.h vendor/llvm/dist/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZISelLowering.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZISelLowering.h vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrBuilder.h vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrFP.td vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrFormats.td vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrInfo.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrInfo.h vendor/llvm/dist/lib/Target/SystemZ/SystemZInstrInfo.td vendor/llvm/dist/lib/Target/SystemZ/SystemZMCInstLower.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZMCInstLower.h vendor/llvm/dist/lib/Target/SystemZ/SystemZMachineFunctionInfo.h vendor/llvm/dist/lib/Target/SystemZ/SystemZOperands.td vendor/llvm/dist/lib/Target/SystemZ/SystemZOperators.td vendor/llvm/dist/lib/Target/SystemZ/SystemZPatterns.td vendor/llvm/dist/lib/Target/SystemZ/SystemZRegisterInfo.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZRegisterInfo.h vendor/llvm/dist/lib/Target/SystemZ/SystemZRegisterInfo.td vendor/llvm/dist/lib/Target/SystemZ/SystemZSubtarget.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZSubtarget.h vendor/llvm/dist/lib/Target/SystemZ/SystemZTargetMachine.cpp vendor/llvm/dist/lib/Target/SystemZ/SystemZTargetMachine.h vendor/llvm/dist/lib/Target/SystemZ/TargetInfo/ vendor/llvm/dist/lib/Target/SystemZ/TargetInfo/CMakeLists.txt vendor/llvm/dist/lib/Target/SystemZ/TargetInfo/LLVMBuild.txt vendor/llvm/dist/lib/Target/SystemZ/TargetInfo/Makefile vendor/llvm/dist/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp vendor/llvm/dist/lib/Target/X86/X86FixupLEAs.cpp vendor/llvm/dist/lib/Target/XCore/XCoreLowerThreadLocal.cpp vendor/llvm/dist/lib/Transforms/Vectorize/SLPVectorizer.cpp vendor/llvm/dist/lib/Transforms/Vectorize/VecUtils.cpp vendor/llvm/dist/lib/Transforms/Vectorize/VecUtils.h vendor/llvm/dist/test/Analysis/CostModel/ARM/divrem.ll vendor/llvm/dist/test/Analysis/CostModel/X86/sitofp.ll vendor/llvm/dist/test/Analysis/CostModel/X86/uitofp.ll vendor/llvm/dist/test/Analysis/MemoryDependenceAnalysis/ vendor/llvm/dist/test/Analysis/MemoryDependenceAnalysis/lit.local.cfg vendor/llvm/dist/test/Analysis/MemoryDependenceAnalysis/memdep_requires_dominator_tree.ll vendor/llvm/dist/test/Analysis/RegionInfo/unreachable_bb.ll vendor/llvm/dist/test/Analysis/TypeBasedAliasAnalysis/tbaa-path.ll vendor/llvm/dist/test/CodeGen/AArch64/code-model-large-abs.ll vendor/llvm/dist/test/CodeGen/ARM/2013-04-05-Small-ByVal-Structs-PR15293.ll vendor/llvm/dist/test/CodeGen/ARM/2013-04-16-AAPCS-C4-vs-VFP.ll vendor/llvm/dist/test/CodeGen/ARM/2013-04-16-AAPCS-C5-vs-VFP.ll vendor/llvm/dist/test/CodeGen/ARM/2013-04-18-load-overlap-PR14824.ll vendor/llvm/dist/test/CodeGen/ARM/2013-04-21-AAPCS-VA-C.1.cp.ll vendor/llvm/dist/test/CodeGen/ARM/2013-05-02-AAPCS-ByVal-Structs-C4-C5-VFP.ll vendor/llvm/dist/test/CodeGen/ARM/2013-05-02-AAPCS-ByVal-Structs-C4-C5-VFP2.ll vendor/llvm/dist/test/CodeGen/ARM/2013-05-05-IfConvertBug.ll vendor/llvm/dist/test/CodeGen/ARM/dagcombine-concatvector.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc-compact-pr0.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc-compact-pr1.ll vendor/llvm/dist/test/CodeGen/ARM/gpr-paired-spill-thumbinst.ll vendor/llvm/dist/test/CodeGen/ARM/gpr-paired-spill.ll vendor/llvm/dist/test/CodeGen/ARM/misched-copy-arm.ll vendor/llvm/dist/test/CodeGen/ARM/neon_vabs.ll vendor/llvm/dist/test/CodeGen/ARM/nop_concat_vectors.ll vendor/llvm/dist/test/CodeGen/ARM/returned-ext.ll vendor/llvm/dist/test/CodeGen/ARM/this-return.ll vendor/llvm/dist/test/CodeGen/ARM/v1-constant-fold.ll vendor/llvm/dist/test/CodeGen/ARM/vcvt-cost.ll vendor/llvm/dist/test/CodeGen/Generic/annotate.ll vendor/llvm/dist/test/CodeGen/Generic/ptr-annotate.ll vendor/llvm/dist/test/CodeGen/Hexagon/absimm.ll vendor/llvm/dist/test/CodeGen/Hexagon/always-ext.ll vendor/llvm/dist/test/CodeGen/Hexagon/cmp_pred2.ll vendor/llvm/dist/test/CodeGen/Hexagon/union-1.ll vendor/llvm/dist/test/CodeGen/Mips/dsp-patterns-cmp-vselect.ll vendor/llvm/dist/test/CodeGen/Mips/fpneeded.ll vendor/llvm/dist/test/CodeGen/Mips/fpnotneeded.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_1.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_10.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_3.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_4.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_5.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_6.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_7.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_8.ll vendor/llvm/dist/test/CodeGen/Mips/mips16_32_9.ll vendor/llvm/dist/test/CodeGen/Mips/spill-copy-acreg.ll vendor/llvm/dist/test/CodeGen/Mips/tnaked.ll vendor/llvm/dist/test/CodeGen/NVPTX/generic-to-nvvm.ll vendor/llvm/dist/test/CodeGen/NVPTX/i1-global.ll vendor/llvm/dist/test/CodeGen/NVPTX/i1-param.ll vendor/llvm/dist/test/CodeGen/NVPTX/refl1.ll vendor/llvm/dist/test/CodeGen/PowerPC/bdzlr.ll vendor/llvm/dist/test/CodeGen/PowerPC/early-ret.ll vendor/llvm/dist/test/CodeGen/PowerPC/early-ret2.ll vendor/llvm/dist/test/CodeGen/PowerPC/fold-zero.ll vendor/llvm/dist/test/CodeGen/PowerPC/fsel.ll vendor/llvm/dist/test/CodeGen/PowerPC/ifcvt.ll vendor/llvm/dist/test/CodeGen/PowerPC/lsa.ll vendor/llvm/dist/test/CodeGen/PowerPC/optcmp.ll vendor/llvm/dist/test/CodeGen/R600/README vendor/llvm/dist/test/CodeGen/R600/add.ll vendor/llvm/dist/test/CodeGen/R600/and.ll vendor/llvm/dist/test/CodeGen/R600/bfe_uint.ll vendor/llvm/dist/test/CodeGen/R600/bfi_int.ll vendor/llvm/dist/test/CodeGen/R600/call_fs.ll vendor/llvm/dist/test/CodeGen/R600/cf_end.ll vendor/llvm/dist/test/CodeGen/R600/elf.ll vendor/llvm/dist/test/CodeGen/R600/elf.r600.ll vendor/llvm/dist/test/CodeGen/R600/fdiv.ll vendor/llvm/dist/test/CodeGen/R600/fp_to_sint.ll vendor/llvm/dist/test/CodeGen/R600/fp_to_uint.ll vendor/llvm/dist/test/CodeGen/R600/i8-to-double-to-float.ll vendor/llvm/dist/test/CodeGen/R600/imm.ll vendor/llvm/dist/test/CodeGen/R600/jump-address.ll vendor/llvm/dist/test/CodeGen/R600/load.ll vendor/llvm/dist/test/CodeGen/R600/loop-address.ll vendor/llvm/dist/test/CodeGen/R600/mul.ll vendor/llvm/dist/test/CodeGen/R600/or.ll vendor/llvm/dist/test/CodeGen/R600/pv.ll vendor/llvm/dist/test/CodeGen/R600/r600-encoding.ll vendor/llvm/dist/test/CodeGen/R600/selectcc-cnd.ll vendor/llvm/dist/test/CodeGen/R600/selectcc-cnde-int.ll vendor/llvm/dist/test/CodeGen/R600/setcc.ll vendor/llvm/dist/test/CodeGen/R600/shl.ll vendor/llvm/dist/test/CodeGen/R600/sint_to_fp.ll vendor/llvm/dist/test/CodeGen/R600/sra.ll vendor/llvm/dist/test/CodeGen/R600/srl.ll vendor/llvm/dist/test/CodeGen/R600/store.ll vendor/llvm/dist/test/CodeGen/R600/store.r600.ll vendor/llvm/dist/test/CodeGen/R600/sub.ll vendor/llvm/dist/test/CodeGen/R600/udiv.ll vendor/llvm/dist/test/CodeGen/R600/uint_to_fp.ll vendor/llvm/dist/test/CodeGen/R600/urecip.ll vendor/llvm/dist/test/CodeGen/R600/urem.ll vendor/llvm/dist/test/CodeGen/R600/vselect.ll vendor/llvm/dist/test/CodeGen/R600/xor.ll vendor/llvm/dist/test/CodeGen/SPARC/64abi.ll vendor/llvm/dist/test/CodeGen/SPARC/constpool.ll vendor/llvm/dist/test/CodeGen/SPARC/globals.ll vendor/llvm/dist/test/CodeGen/SPARC/varargs.ll vendor/llvm/dist/test/CodeGen/SystemZ/ vendor/llvm/dist/test/CodeGen/SystemZ/addr-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/addr-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/addr-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/alloca-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/alloca-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/and-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/args-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-11.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-12.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-13.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-14.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-15.ll vendor/llvm/dist/test/CodeGen/SystemZ/asm-16.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-load-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-load-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-load-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-load-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-store-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-store-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-store-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomic-store-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-add-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-add-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-add-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-add-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-and-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-and-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-and-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-and-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-minmax-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-minmax-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-minmax-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-minmax-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-nand-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-nand-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-nand-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-nand-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-or-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-or-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-or-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-or-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-sub-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-sub-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-sub-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-sub-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xchg-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xchg-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xchg-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xchg-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xor-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xor-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xor-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/atomicrmw-xor-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/branch-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/branch-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/branch-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/branch-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/branch-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/bswap-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/bswap-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/bswap-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/bswap-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/bswap-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/call-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/call-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/cmpxchg-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/cmpxchg-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/cmpxchg-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/cmpxchg-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-abs-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-abs-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-add-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-add-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-add-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-cmp-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-cmp-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-cmp-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-const-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-11.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-conv-12.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-copysign-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-div-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-div-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-div-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-move-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-mul-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-neg-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-round-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sqrt-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sqrt-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sqrt-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sub-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sub-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/fp-sub-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-11.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-13.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-14.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-15.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-16.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-17.ll vendor/llvm/dist/test/CodeGen/SystemZ/frame-18.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/insert-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-11.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-add-12.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-11.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-12.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-13.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-14.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-15.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-16.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-17.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-18.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-19.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-20.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-21.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-22.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-23.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-24.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-25.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-26.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-27.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-28.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-29.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-30.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-31.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-32.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-33.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-34.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-35.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-36.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-37.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-38.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-39.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-40.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-41.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-42.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-cmp-43.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-const-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-conv-10.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-div-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-div-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-div-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-div-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-div-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-move-09.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-mul-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-neg-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/int-sub-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/la-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/la-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/la-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/la-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/lit.local.cfg vendor/llvm/dist/test/CodeGen/SystemZ/or-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/or-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/or-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/or-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/or-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/or-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-06.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-07.ll vendor/llvm/dist/test/CodeGen/SystemZ/shift-08.ll vendor/llvm/dist/test/CodeGen/SystemZ/tls-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-01.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-02.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-03.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-04.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-05.ll vendor/llvm/dist/test/CodeGen/SystemZ/xor-06.ll vendor/llvm/dist/test/CodeGen/X86/2013-05-06-ConactVectorCrash.ll vendor/llvm/dist/test/CodeGen/X86/asm-invalid-register-class-crasher.ll vendor/llvm/dist/test/CodeGen/X86/atom-fixup-lea1.ll vendor/llvm/dist/test/CodeGen/X86/atom-fixup-lea2.ll vendor/llvm/dist/test/CodeGen/X86/atom-fixup-lea3.ll vendor/llvm/dist/test/CodeGen/X86/avx-brcond.ll vendor/llvm/dist/test/CodeGen/X86/code_placement_align_all.ll vendor/llvm/dist/test/CodeGen/X86/codegen-prepare.ll vendor/llvm/dist/test/CodeGen/X86/compact-unwind.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-divrem-x86-64.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-divrem.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-unaligned-store.ll vendor/llvm/dist/test/CodeGen/X86/fp-elim-and-no-fp-elim.ll vendor/llvm/dist/test/CodeGen/X86/misched-copy.ll vendor/llvm/dist/test/CodeGen/X86/no-compact-unwind.ll vendor/llvm/dist/test/CodeGen/X86/select-with-and-or.ll vendor/llvm/dist/test/CodeGen/X86/this-return-64.ll vendor/llvm/dist/test/CodeGen/X86/viabs.ll vendor/llvm/dist/test/CodeGen/XCore/offset_folding.ll vendor/llvm/dist/test/DebugInfo/AArch64/eh_frame.s vendor/llvm/dist/test/DebugInfo/Inputs/dwarfdump-test-zlib.cc vendor/llvm/dist/test/DebugInfo/Inputs/dwarfdump-test-zlib.elf-x86-64 (contents, props changed) vendor/llvm/dist/test/DebugInfo/SystemZ/ vendor/llvm/dist/test/DebugInfo/SystemZ/eh_frame.s vendor/llvm/dist/test/DebugInfo/SystemZ/eh_frame_personality.ll vendor/llvm/dist/test/DebugInfo/SystemZ/eh_frame_personality.s vendor/llvm/dist/test/DebugInfo/SystemZ/lit.local.cfg vendor/llvm/dist/test/DebugInfo/SystemZ/variable-loc.ll vendor/llvm/dist/test/DebugInfo/SystemZ/variable-loc.s vendor/llvm/dist/test/DebugInfo/X86/instcombine-instrinsics.ll vendor/llvm/dist/test/DebugInfo/dwarfdump-zlib.test vendor/llvm/dist/test/DebugInfo/inline-debug-info-multiret.ll vendor/llvm/dist/test/DebugInfo/inline-debug-info.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/eh.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/non-extern-addend.ll vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-arithm_float.ll vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-arithm_int.ll vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-logical.ll vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-setcond-fp.ll vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-setcond-int.ll vendor/llvm/dist/test/FileCheck/check-not-diaginfo.txt vendor/llvm/dist/test/MC/ARM/arm-thumb-trustzone.s vendor/llvm/dist/test/MC/ARM/arm-trustzone.s vendor/llvm/dist/test/MC/ARM/invalid-hint-arm.s vendor/llvm/dist/test/MC/ARM/invalid-hint-thumb.s vendor/llvm/dist/test/MC/COFF/basic-coff-64.s vendor/llvm/dist/test/MC/COFF/linker-options.ll (contents, props changed) vendor/llvm/dist/test/MC/COFF/relocation-imgrel.s vendor/llvm/dist/test/MC/COFF/secrel-variant.s vendor/llvm/dist/test/MC/COFF/symbol-fragment-offset-64.s vendor/llvm/dist/test/MC/Disassembler/ARM/arm-thumb-trustzone.txt vendor/llvm/dist/test/MC/Disassembler/ARM/arm-trustzone.txt vendor/llvm/dist/test/MC/Disassembler/ARM/invalid-hint-arm.txt vendor/llvm/dist/test/MC/Disassembler/ARM/invalid-hint-thumb.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips-dsp.txt vendor/llvm/dist/test/MC/ELF/subsection.s vendor/llvm/dist/test/MC/Mips/expr1.s vendor/llvm/dist/test/MC/Mips/micromips-alu-instructions.s vendor/llvm/dist/test/MC/Mips/micromips-loadstore-instructions.s vendor/llvm/dist/test/MC/Mips/micromips-shift-instructions.s vendor/llvm/dist/test/MC/PowerPC/ppc64-encoding-bookII.s vendor/llvm/dist/test/MC/PowerPC/ppc64-encoding-ext.s vendor/llvm/dist/test/MC/PowerPC/ppc64-encoding-fp.s vendor/llvm/dist/test/MC/PowerPC/ppc64-encoding-vmx.s vendor/llvm/dist/test/MC/PowerPC/ppc64-encoding.s vendor/llvm/dist/test/MC/PowerPC/ppc64-errors.s vendor/llvm/dist/test/MC/PowerPC/ppc64-fixups.s vendor/llvm/dist/test/MC/PowerPC/ppc64-operands.s vendor/llvm/dist/test/MC/SystemZ/ vendor/llvm/dist/test/MC/SystemZ/insn-a-01.s vendor/llvm/dist/test/MC/SystemZ/insn-a-02.s vendor/llvm/dist/test/MC/SystemZ/insn-adb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-adb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-adbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-aebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-afi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-afi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ag-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ag-02.s vendor/llvm/dist/test/MC/SystemZ/insn-agf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-agf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-agfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-agfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-agfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aghi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aghi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-agr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-agsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-agsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ah-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ah-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ahi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ahi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ahy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ahy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-al-01.s vendor/llvm/dist/test/MC/SystemZ/insn-al-02.s vendor/llvm/dist/test/MC/SystemZ/insn-alc-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alc-02.s vendor/llvm/dist/test/MC/SystemZ/insn-alcg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alcg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-alcgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alcr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-alg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-algf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-algf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-algfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-algfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-algfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-algr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-alr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aly-01.s vendor/llvm/dist/test/MC/SystemZ/insn-aly-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ar-01.s vendor/llvm/dist/test/MC/SystemZ/insn-asi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-asi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-axbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-axbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ay-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ay-02.s vendor/llvm/dist/test/MC/SystemZ/insn-basr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-br-01.s vendor/llvm/dist/test/MC/SystemZ/insn-bras-01.s vendor/llvm/dist/test/MC/SystemZ/insn-brasl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-brc-01.s vendor/llvm/dist/test/MC/SystemZ/insn-brc-02.s vendor/llvm/dist/test/MC/SystemZ/insn-brcl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-brcl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-c-01.s vendor/llvm/dist/test/MC/SystemZ/insn-c-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cdfbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cdfbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cdgbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cdgbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ceb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ceb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cefbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cefbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cegbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cegbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cfdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cfdbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cfebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cfebr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cfxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cfxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgdbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgebr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgfrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cghi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cghi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cghrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cghsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cghsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cgxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ch-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ch-02.s vendor/llvm/dist/test/MC/SystemZ/insn-chhsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-chhsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-chi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-chi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-chrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-chsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-chsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-chy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-chy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clfhsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clfhsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clgfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clgfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clgfrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clghrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clghsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clghsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clgrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clhhsi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clhhsi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clhrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cli-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cli-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cliy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cliy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-clr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-clrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cly-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cly-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cpsdr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-crl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cs-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cs-02.s vendor/llvm/dist/test/MC/SystemZ/insn-csg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-csg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-csy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-csy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cxfbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cxfbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cxgbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cxgbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-cy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-cy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ddb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ddb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ddbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-deb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-deb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-debr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dlg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dlg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dlgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dlgr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dlr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dlr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dsg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dsg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgfr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dsgr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-dxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-dxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ear-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ear-02.s vendor/llvm/dist/test/MC/SystemZ/insn-fidbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-fidbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-fiebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-fiebr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-fixbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-fixbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-flogr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-flogr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ic-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ic-02.s vendor/llvm/dist/test/MC/SystemZ/insn-icy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-icy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iihf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iihf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iihh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iihh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iihl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iihl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iilf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iilf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iilh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iilh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-iill-01.s vendor/llvm/dist/test/MC/SystemZ/insn-iill-02.s vendor/llvm/dist/test/MC/SystemZ/insn-l-01.s vendor/llvm/dist/test/MC/SystemZ/insn-l-02.s vendor/llvm/dist/test/MC/SystemZ/insn-la-01.s vendor/llvm/dist/test/MC/SystemZ/insn-la-02.s vendor/llvm/dist/test/MC/SystemZ/insn-larl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lay-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lay-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lcxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ld-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ld-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ldeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ldebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldgr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ldr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ldy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ldy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-le-01.s vendor/llvm/dist/test/MC/SystemZ/insn-le-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ledbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ler-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lexbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lexbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ley-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ley-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lgb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lgbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgdr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgdr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lgfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgfrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lghi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lghi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lghr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lghrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lgrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lhi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lhi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lhr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lhrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lhy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lhy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llc-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llc-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llcr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgc-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgc-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llgcr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgfrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llgh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llghr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llghrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llhr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llhrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llihf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llihf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llihh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llihh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llihl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llihl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llilf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llilf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llilh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llilh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-llill-01.s vendor/llvm/dist/test/MC/SystemZ/insn-llill-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lmg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lmg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lndbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lnebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lnxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lnxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lpdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lpebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lpxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lpxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lrv-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lrv-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lrvg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lrvg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lrvgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lrvr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lxr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lxr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ly-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ly-02.s vendor/llvm/dist/test/MC/SystemZ/insn-lzdr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lzer-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lzxr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-lzxr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-madb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-madb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-madbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-maeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-maeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-maebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mdeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mdeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mdebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-meeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-meeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-meebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mghi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mghi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mhi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mhi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mhy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mhy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mlg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mlg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mlgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mlgr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ms-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ms-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mseb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mseb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msgfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msgfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-msgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-msy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mvghi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mvghi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mvhhi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mvhhi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mvhi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mvhi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mvi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mvi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mviy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mviy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mxdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mxdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-mxdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-mxdbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-n-01.s vendor/llvm/dist/test/MC/SystemZ/insn-n-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ng-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ng-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ngr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ni-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ni-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nihf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nihf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nihh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nihh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nihl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nihl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nilf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nilf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nilh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nilh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nill-01.s vendor/llvm/dist/test/MC/SystemZ/insn-nill-02.s vendor/llvm/dist/test/MC/SystemZ/insn-niy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-niy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-nr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ny-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ny-02.s vendor/llvm/dist/test/MC/SystemZ/insn-o-01.s vendor/llvm/dist/test/MC/SystemZ/insn-o-02.s vendor/llvm/dist/test/MC/SystemZ/insn-og-01.s vendor/llvm/dist/test/MC/SystemZ/insn-og-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ogr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oihf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oihf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oihh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oihh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oihl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oihl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oilf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oilf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oilh-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oilh-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oill-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oill-02.s vendor/llvm/dist/test/MC/SystemZ/insn-oiy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oiy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-or-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-oy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-risbg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-risbg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-rll-01.s vendor/llvm/dist/test/MC/SystemZ/insn-rll-02.s vendor/llvm/dist/test/MC/SystemZ/insn-rllg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-rllg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-s-01.s vendor/llvm/dist/test/MC/SystemZ/insn-s-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-seb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-seb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slbg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slbg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slbgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slgf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slgf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slgfi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slgfi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slgfr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-slgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sll-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sll-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sllg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sllg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-slr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sly-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sly-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sqdb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sqdb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sqdbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sqeb-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sqeb-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sqebr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sqxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sqxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sra-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sra-02.s vendor/llvm/dist/test/MC/SystemZ/insn-srag-01.s vendor/llvm/dist/test/MC/SystemZ/insn-srag-02.s vendor/llvm/dist/test/MC/SystemZ/insn-srl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-srl-02.s vendor/llvm/dist/test/MC/SystemZ/insn-srlg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-srlg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-st-01.s vendor/llvm/dist/test/MC/SystemZ/insn-st-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stc-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stc-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stcy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stcy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-std-01.s vendor/llvm/dist/test/MC/SystemZ/insn-std-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stdy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stdy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-ste-01.s vendor/llvm/dist/test/MC/SystemZ/insn-ste-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stey-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stey-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stgrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sth-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sth-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sthrl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sthy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sthy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-stmg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-stmg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-strl-01.s vendor/llvm/dist/test/MC/SystemZ/insn-strv-01.s vendor/llvm/dist/test/MC/SystemZ/insn-strv-02.s vendor/llvm/dist/test/MC/SystemZ/insn-strvg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-strvg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sty-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sty-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sxbr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sxbr-02.s vendor/llvm/dist/test/MC/SystemZ/insn-sy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-sy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-x-01.s vendor/llvm/dist/test/MC/SystemZ/insn-x-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xg-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xg-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xgr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xi-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xi-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xihf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xihf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xilf-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xilf-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xiy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xiy-02.s vendor/llvm/dist/test/MC/SystemZ/insn-xr-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xy-01.s vendor/llvm/dist/test/MC/SystemZ/insn-xy-02.s vendor/llvm/dist/test/MC/SystemZ/lit.local.cfg vendor/llvm/dist/test/MC/SystemZ/regs-01.s vendor/llvm/dist/test/MC/SystemZ/regs-02.s vendor/llvm/dist/test/MC/SystemZ/regs-03.s vendor/llvm/dist/test/MC/SystemZ/regs-04.s vendor/llvm/dist/test/MC/SystemZ/regs-05.s vendor/llvm/dist/test/MC/SystemZ/regs-06.s vendor/llvm/dist/test/MC/SystemZ/regs-07.s vendor/llvm/dist/test/MC/SystemZ/regs-08.s vendor/llvm/dist/test/MC/SystemZ/regs-09.s vendor/llvm/dist/test/MC/SystemZ/regs-10.s vendor/llvm/dist/test/MC/SystemZ/regs-11.s vendor/llvm/dist/test/MC/SystemZ/regs-12.s vendor/llvm/dist/test/MC/SystemZ/regs-13.s vendor/llvm/dist/test/MC/SystemZ/regs-14.s vendor/llvm/dist/test/MC/SystemZ/regs-15.s vendor/llvm/dist/test/Object/ARM/lit.local.cfg vendor/llvm/dist/test/Object/ARM/objdump-thumb.test vendor/llvm/dist/test/Object/Inputs/hello-world.elf-x86-64 (contents, props changed) vendor/llvm/dist/test/Object/Inputs/macho-text.thumb (contents, props changed) vendor/llvm/dist/test/Object/relocation-executable.test vendor/llvm/dist/test/Other/attribute-comment.ll vendor/llvm/dist/test/Transforms/GVN/unreachable_block_infinite_loop.ll vendor/llvm/dist/test/Transforms/GlobalDCE/complex-constantexpr.ll vendor/llvm/dist/test/Transforms/GlobalDCE/indirectbr.ll vendor/llvm/dist/test/Transforms/GlobalOpt/alias-used.ll vendor/llvm/dist/test/Transforms/InstCombine/add4.ll vendor/llvm/dist/test/Transforms/InstCombine/vec_extract_2elts.ll vendor/llvm/dist/test/Transforms/InstCombine/vec_extract_var_elt.ll vendor/llvm/dist/test/Transforms/InstCombine/vec_phi_extract.ll vendor/llvm/dist/test/Transforms/InstSimplify/2013-04-19-ConstantFoldingCrash.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/illegal-parallel-loop-uniform-write.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/x86_fp80-vector-store.ll vendor/llvm/dist/test/Transforms/LoopVectorize/bsd_regex.ll vendor/llvm/dist/test/Transforms/LoopVectorize/if-conversion-nest.ll vendor/llvm/dist/test/Transforms/LoopVectorize/minmax_reduction.ll vendor/llvm/dist/test/Transforms/LoopVectorize/no_idiv_reduction.ll vendor/llvm/dist/test/Transforms/LoopVectorize/no_outside_user.ll vendor/llvm/dist/test/Transforms/LoopVectorize/reverse_induction.ll vendor/llvm/dist/test/Transforms/LoopVectorize/runtime-check-readonly.ll vendor/llvm/dist/test/Transforms/LoopVectorize/runtime-limit.ll vendor/llvm/dist/test/Transforms/LoopVectorize/value-ptr-bug.ll vendor/llvm/dist/test/Transforms/MergeFunc/crash.ll vendor/llvm/dist/test/Transforms/MergeFunc/inttoptr.ll vendor/llvm/dist/test/Transforms/ObjCARC/intrinsic-use-isolated.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/ vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/ vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/barriercall.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/cast.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/compare-reduce.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/diamond.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/flag.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/hoist.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/lit.local.cfg vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/loopinvariant.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/multi_user.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/reduction.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/reduction2.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/saxpy.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/simple-loop.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/simplebb.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/X86/vector.ll vendor/llvm/dist/test/Transforms/SLPVectorizer/lit.local.cfg vendor/llvm/dist/test/Transforms/SimplifyCFG/speculate-store.ll vendor/llvm/dist/test/Verifier/llvm.compiler_used-invalid-type.ll vendor/llvm/dist/test/Verifier/llvm.used-invalid-init.ll vendor/llvm/dist/test/Verifier/llvm.used-invalid-init2.ll vendor/llvm/dist/test/Verifier/llvm.used-invalid-type.ll vendor/llvm/dist/test/Verifier/llvm.used-invalid-type2.ll vendor/llvm/dist/test/Verifier/llvm.used-ptr-type.ll vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.coff-i386 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.coff-x86_64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-aarch64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-arm (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-i386 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-mips (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-mips64el (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-ppc64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.elf-x86_64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.macho-arm (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.macho-i386 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.obj.macho-x86_64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/relocs.py vendor/llvm/dist/test/tools/llvm-readobj/Inputs/trivial.obj.macho-arm (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc64 (contents, props changed) vendor/llvm/dist/test/tools/llvm-readobj/program-headers.test vendor/llvm/dist/test/tools/llvm-readobj/reloc-types.test vendor/llvm/dist/tools/yaml2obj/ vendor/llvm/dist/tools/yaml2obj/CMakeLists.txt vendor/llvm/dist/tools/yaml2obj/Makefile vendor/llvm/dist/tools/yaml2obj/yaml2obj.cpp vendor/llvm/dist/unittests/DebugInfo/ vendor/llvm/dist/unittests/DebugInfo/CMakeLists.txt vendor/llvm/dist/unittests/DebugInfo/DWARFFormValueTest.cpp vendor/llvm/dist/unittests/DebugInfo/Makefile vendor/llvm/dist/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp vendor/llvm/dist/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp vendor/llvm/dist/unittests/ExecutionEngine/MCJIT/MCJITTestAPICommon.h vendor/llvm/dist/unittests/IR/PatternMatch.cpp vendor/llvm/dist/unittests/IR/ValueTest.cpp vendor/llvm/dist/unittests/Support/CompressionTest.cpp vendor/llvm/dist/unittests/Support/ProgramTest.cpp vendor/llvm/dist/utils/git-svn/ vendor/llvm/dist/utils/git-svn/git-svnrevert (contents, props changed) vendor/llvm/dist/utils/git-svn/git-svnup (contents, props changed) vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery/ vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery-in-tree/ vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery-in-tree/lit.cfg vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery-in-tree/obj/ vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery-in-tree/obj/lit.site.cfg vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery-in-tree/test-one.txt vendor/llvm/dist/utils/lit/tests/Inputs/exec-discovery/lit.site.cfg vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/ vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/lit.cfg vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/test-1.txt vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/test-2.txt vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/test-3.txt vendor/llvm/dist/utils/lit/tests/Inputs/progress-bar/test-4.txt vendor/llvm/dist/utils/lit/tests/progress-bar.py Deleted: vendor/llvm/dist/include/llvm/ADT/InMemoryStruct.h vendor/llvm/dist/include/llvm/Object/MachOObject.h vendor/llvm/dist/lib/DebugInfo/DWARFFormValue.h vendor/llvm/dist/lib/Linker/Linker.cpp vendor/llvm/dist/lib/Object/MachOObject.cpp vendor/llvm/dist/lib/Target/R600/AMDILPeepholeOptimizer.cpp vendor/llvm/dist/test/CodeGen/ARM/2013-04-05-overridden-loads-PR14824.ll vendor/llvm/dist/test/CodeGen/R600/add.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/and.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/fadd.v4f32.ll vendor/llvm/dist/test/CodeGen/R600/fdiv.v4f32.ll vendor/llvm/dist/test/CodeGen/R600/fsub.v4f32.ll vendor/llvm/dist/test/CodeGen/R600/i8_to_double_to_float.ll vendor/llvm/dist/test/CodeGen/R600/jump_address.ll vendor/llvm/dist/test/CodeGen/R600/load.constant_addrspace.f32.ll vendor/llvm/dist/test/CodeGen/R600/load.i8.ll vendor/llvm/dist/test/CodeGen/R600/selectcc_cnde.ll vendor/llvm/dist/test/CodeGen/R600/selectcc_cnde_int.ll vendor/llvm/dist/test/CodeGen/R600/setcc.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/store.v4f32.ll vendor/llvm/dist/test/CodeGen/R600/store.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/udiv.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/urem.v4i32.ll vendor/llvm/dist/test/CodeGen/R600/vec4-expand.ll vendor/llvm/dist/test/CodeGen/XCore/global_negative_offset.ll vendor/llvm/dist/test/DebugInfo/AArch64/eh_frame.ll vendor/llvm/dist/test/Scripts/README.txt vendor/llvm/dist/test/Scripts/coff-dump.py vendor/llvm/dist/test/Scripts/coff-dump.py.bat vendor/llvm/dist/test/Scripts/common_dump.py vendor/llvm/dist/test/Scripts/elf-dump vendor/llvm/dist/test/Scripts/elf-dump.bat vendor/llvm/dist/test/Scripts/ignore vendor/llvm/dist/test/Scripts/macho-dumpx vendor/llvm/dist/test/Scripts/macho-dumpx.bat vendor/llvm/dist/test/Transforms/ObjCARC/clang-arc-used-intrinsic-removed-if-isolated.ll vendor/llvm/dist/test/Transforms/ScalarRepl/dynamic-vector-gep.ll vendor/llvm/dist/utils/yaml2obj/CMakeLists.txt vendor/llvm/dist/utils/yaml2obj/Makefile vendor/llvm/dist/utils/yaml2obj/yaml2obj.cpp Modified: vendor/llvm/dist/CMakeLists.txt vendor/llvm/dist/CODE_OWNERS.TXT vendor/llvm/dist/CREDITS.TXT vendor/llvm/dist/Makefile.config.in vendor/llvm/dist/Makefile.rules vendor/llvm/dist/README.txt vendor/llvm/dist/autoconf/configure.ac vendor/llvm/dist/cmake/config-ix.cmake vendor/llvm/dist/cmake/modules/HandleLLVMOptions.cmake vendor/llvm/dist/cmake/modules/LLVM-Config.cmake vendor/llvm/dist/cmake/modules/LLVMConfig.cmake.in vendor/llvm/dist/configure vendor/llvm/dist/docs/CMake.rst vendor/llvm/dist/docs/CodeGenerator.rst vendor/llvm/dist/docs/CommandGuide/index.rst vendor/llvm/dist/docs/CommandGuide/llc.rst vendor/llvm/dist/docs/CommandGuide/tblgen.rst vendor/llvm/dist/docs/CommandLine.rst vendor/llvm/dist/docs/CompilerWriterInfo.rst vendor/llvm/dist/docs/DeveloperPolicy.rst vendor/llvm/dist/docs/ExtendingLLVM.rst vendor/llvm/dist/docs/GettingStarted.rst vendor/llvm/dist/docs/GettingStartedVS.rst vendor/llvm/dist/docs/LLVMBuild.rst vendor/llvm/dist/docs/LangRef.rst vendor/llvm/dist/docs/ReleaseNotes.rst vendor/llvm/dist/docs/Vectorizers.rst vendor/llvm/dist/docs/index.rst vendor/llvm/dist/docs/tutorial/LangImpl1.rst vendor/llvm/dist/examples/ExceptionDemo/CMakeLists.txt vendor/llvm/dist/examples/ExceptionDemo/ExceptionDemo.cpp vendor/llvm/dist/include/llvm-c/Core.h vendor/llvm/dist/include/llvm-c/ExecutionEngine.h vendor/llvm/dist/include/llvm-c/Object.h vendor/llvm/dist/include/llvm-c/Target.h vendor/llvm/dist/include/llvm-c/TargetMachine.h vendor/llvm/dist/include/llvm-c/Transforms/PassManagerBuilder.h vendor/llvm/dist/include/llvm-c/Transforms/Vectorize.h vendor/llvm/dist/include/llvm/ADT/ArrayRef.h vendor/llvm/dist/include/llvm/ADT/DenseMap.h vendor/llvm/dist/include/llvm/ADT/Hashing.h vendor/llvm/dist/include/llvm/ADT/PointerIntPair.h vendor/llvm/dist/include/llvm/ADT/StringRef.h vendor/llvm/dist/include/llvm/ADT/Triple.h vendor/llvm/dist/include/llvm/ADT/Twine.h vendor/llvm/dist/include/llvm/Analysis/MemoryBuiltins.h vendor/llvm/dist/include/llvm/Analysis/RegionInfo.h vendor/llvm/dist/include/llvm/Analysis/ScalarEvolution.h vendor/llvm/dist/include/llvm/CodeGen/AsmPrinter.h vendor/llvm/dist/include/llvm/CodeGen/CallingConvLower.h vendor/llvm/dist/include/llvm/CodeGen/FastISel.h vendor/llvm/dist/include/llvm/CodeGen/ISDOpcodes.h vendor/llvm/dist/include/llvm/CodeGen/LiveInterval.h vendor/llvm/dist/include/llvm/CodeGen/LiveRangeEdit.h vendor/llvm/dist/include/llvm/CodeGen/MachineBasicBlock.h vendor/llvm/dist/include/llvm/CodeGen/MachineFunction.h vendor/llvm/dist/include/llvm/CodeGen/MachineMemOperand.h vendor/llvm/dist/include/llvm/CodeGen/MachineRegisterInfo.h vendor/llvm/dist/include/llvm/CodeGen/MachineScheduler.h vendor/llvm/dist/include/llvm/CodeGen/MachineTraceMetrics.h vendor/llvm/dist/include/llvm/CodeGen/Passes.h vendor/llvm/dist/include/llvm/CodeGen/RegAllocPBQP.h vendor/llvm/dist/include/llvm/CodeGen/ScheduleDAG.h vendor/llvm/dist/include/llvm/CodeGen/ScheduleDAGInstrs.h vendor/llvm/dist/include/llvm/CodeGen/SelectionDAG.h vendor/llvm/dist/include/llvm/CodeGen/SelectionDAGISel.h vendor/llvm/dist/include/llvm/CodeGen/SlotIndexes.h vendor/llvm/dist/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h vendor/llvm/dist/include/llvm/CodeGen/ValueTypes.td vendor/llvm/dist/include/llvm/Config/config.h.cmake vendor/llvm/dist/include/llvm/Config/config.h.in vendor/llvm/dist/include/llvm/Config/llvm-config.h.cmake vendor/llvm/dist/include/llvm/Config/llvm-config.h.in vendor/llvm/dist/include/llvm/DIBuilder.h vendor/llvm/dist/include/llvm/DebugInfo.h vendor/llvm/dist/include/llvm/ExecutionEngine/ExecutionEngine.h vendor/llvm/dist/include/llvm/ExecutionEngine/RuntimeDyld.h vendor/llvm/dist/include/llvm/ExecutionEngine/SectionMemoryManager.h vendor/llvm/dist/include/llvm/IR/Argument.h vendor/llvm/dist/include/llvm/IR/Attributes.h vendor/llvm/dist/include/llvm/IR/BasicBlock.h vendor/llvm/dist/include/llvm/IR/Constants.h vendor/llvm/dist/include/llvm/IR/DataLayout.h vendor/llvm/dist/include/llvm/IR/DerivedTypes.h vendor/llvm/dist/include/llvm/IR/GlobalValue.h vendor/llvm/dist/include/llvm/IR/IRBuilder.h vendor/llvm/dist/include/llvm/IR/Intrinsics.h vendor/llvm/dist/include/llvm/IR/IntrinsicsMips.td vendor/llvm/dist/include/llvm/IR/IntrinsicsNVVM.td vendor/llvm/dist/include/llvm/IR/IntrinsicsPowerPC.td vendor/llvm/dist/include/llvm/IR/LLVMContext.h vendor/llvm/dist/include/llvm/IR/MDBuilder.h vendor/llvm/dist/include/llvm/IR/Module.h vendor/llvm/dist/include/llvm/IR/Type.h vendor/llvm/dist/include/llvm/IR/Use.h vendor/llvm/dist/include/llvm/IR/Value.h vendor/llvm/dist/include/llvm/InitializePasses.h vendor/llvm/dist/include/llvm/LinkAllPasses.h vendor/llvm/dist/include/llvm/Linker.h vendor/llvm/dist/include/llvm/MC/MCAsmInfo.h vendor/llvm/dist/include/llvm/MC/MCAssembler.h vendor/llvm/dist/include/llvm/MC/MCELFObjectWriter.h vendor/llvm/dist/include/llvm/MC/MCELFStreamer.h vendor/llvm/dist/include/llvm/MC/MCExpr.h vendor/llvm/dist/include/llvm/MC/MCInst.h vendor/llvm/dist/include/llvm/MC/MCObjectFileInfo.h vendor/llvm/dist/include/llvm/MC/MCObjectStreamer.h vendor/llvm/dist/include/llvm/MC/MCParser/MCAsmParser.h vendor/llvm/dist/include/llvm/MC/MCParser/MCParsedAsmOperand.h vendor/llvm/dist/include/llvm/MC/MCSection.h vendor/llvm/dist/include/llvm/MC/MCSectionCOFF.h vendor/llvm/dist/include/llvm/MC/MCSectionELF.h vendor/llvm/dist/include/llvm/MC/MCSectionMachO.h vendor/llvm/dist/include/llvm/MC/MCStreamer.h vendor/llvm/dist/include/llvm/MC/MCTargetAsmParser.h vendor/llvm/dist/include/llvm/MC/MCWinCOFFObjectWriter.h vendor/llvm/dist/include/llvm/MC/MachineLocation.h vendor/llvm/dist/include/llvm/MC/SubtargetFeature.h vendor/llvm/dist/include/llvm/Object/Binary.h vendor/llvm/dist/include/llvm/Object/ELF.h vendor/llvm/dist/include/llvm/Object/MachO.h vendor/llvm/dist/include/llvm/Object/ObjectFile.h vendor/llvm/dist/include/llvm/Object/RelocVisitor.h vendor/llvm/dist/include/llvm/PassManager.h vendor/llvm/dist/include/llvm/PassRegistry.h vendor/llvm/dist/include/llvm/Support/CodeGen.h vendor/llvm/dist/include/llvm/Support/CommandLine.h vendor/llvm/dist/include/llvm/Support/ELF.h vendor/llvm/dist/include/llvm/Support/Endian.h vendor/llvm/dist/include/llvm/Support/Host.h vendor/llvm/dist/include/llvm/Support/MemoryBuffer.h vendor/llvm/dist/include/llvm/Support/PatternMatch.h vendor/llvm/dist/include/llvm/Support/Program.h vendor/llvm/dist/include/llvm/Support/SourceMgr.h vendor/llvm/dist/include/llvm/Target/Target.td vendor/llvm/dist/include/llvm/Target/TargetCallingConv.h vendor/llvm/dist/include/llvm/Target/TargetInstrInfo.h vendor/llvm/dist/include/llvm/Target/TargetLowering.h vendor/llvm/dist/include/llvm/Target/TargetMachine.h vendor/llvm/dist/include/llvm/Target/TargetOptions.h vendor/llvm/dist/include/llvm/Target/TargetSelectionDAG.td vendor/llvm/dist/include/llvm/Transforms/IPO/PassManagerBuilder.h vendor/llvm/dist/include/llvm/Transforms/Utils/BlackList.h vendor/llvm/dist/include/llvm/Transforms/Utils/Local.h vendor/llvm/dist/include/llvm/Transforms/Vectorize.h vendor/llvm/dist/lib/Analysis/Analysis.cpp vendor/llvm/dist/lib/Analysis/BasicAliasAnalysis.cpp vendor/llvm/dist/lib/Analysis/ConstantFolding.cpp vendor/llvm/dist/lib/Analysis/IPA/IPA.cpp vendor/llvm/dist/lib/Analysis/InstructionSimplify.cpp vendor/llvm/dist/lib/Analysis/MemoryBuiltins.cpp vendor/llvm/dist/lib/Analysis/MemoryDependenceAnalysis.cpp vendor/llvm/dist/lib/Analysis/RegionInfo.cpp vendor/llvm/dist/lib/Analysis/ScalarEvolution.cpp vendor/llvm/dist/lib/Analysis/TypeBasedAliasAnalysis.cpp vendor/llvm/dist/lib/AsmParser/LLLexer.cpp vendor/llvm/dist/lib/AsmParser/LLParser.cpp vendor/llvm/dist/lib/AsmParser/LLToken.h vendor/llvm/dist/lib/Bitcode/Reader/BitReader.cpp vendor/llvm/dist/lib/Bitcode/Reader/BitcodeReader.cpp vendor/llvm/dist/lib/Bitcode/Writer/BitWriter.cpp vendor/llvm/dist/lib/CodeGen/Analysis.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/AsmPrinter.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DIE.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DIE.h vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfDebug.cpp vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfDebug.h vendor/llvm/dist/lib/CodeGen/BasicTargetTransformInfo.cpp vendor/llvm/dist/lib/CodeGen/CalcSpillWeights.cpp vendor/llvm/dist/lib/CodeGen/CallingConvLower.cpp vendor/llvm/dist/lib/CodeGen/CodeGen.cpp vendor/llvm/dist/lib/CodeGen/IfConversion.cpp vendor/llvm/dist/lib/CodeGen/InlineSpiller.cpp vendor/llvm/dist/lib/CodeGen/IntrinsicLowering.cpp vendor/llvm/dist/lib/CodeGen/LocalStackSlotAllocation.cpp vendor/llvm/dist/lib/CodeGen/MachineBasicBlock.cpp vendor/llvm/dist/lib/CodeGen/MachineBlockPlacement.cpp vendor/llvm/dist/lib/CodeGen/MachineModuleInfo.cpp vendor/llvm/dist/lib/CodeGen/MachineRegisterInfo.cpp vendor/llvm/dist/lib/CodeGen/MachineScheduler.cpp vendor/llvm/dist/lib/CodeGen/MachineTraceMetrics.cpp vendor/llvm/dist/lib/CodeGen/MachineVerifier.cpp vendor/llvm/dist/lib/CodeGen/Passes.cpp vendor/llvm/dist/lib/CodeGen/PrologEpilogInserter.cpp vendor/llvm/dist/lib/CodeGen/RegAllocBasic.cpp vendor/llvm/dist/lib/CodeGen/RegAllocGreedy.cpp vendor/llvm/dist/lib/CodeGen/RegAllocPBQP.cpp vendor/llvm/dist/lib/CodeGen/RegisterScavenging.cpp vendor/llvm/dist/lib/CodeGen/ScheduleDAGInstrs.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/DAGCombiner.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/FastISel.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeTypes.h vendor/llvm/dist/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAG.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp vendor/llvm/dist/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp vendor/llvm/dist/lib/CodeGen/ShrinkWrapping.cpp vendor/llvm/dist/lib/CodeGen/TargetLoweringBase.cpp vendor/llvm/dist/lib/CodeGen/TargetLoweringObjectFileImpl.cpp vendor/llvm/dist/lib/CodeGen/TargetOptionsImpl.cpp vendor/llvm/dist/lib/CodeGen/TargetSchedule.cpp vendor/llvm/dist/lib/CodeGen/TwoAddressInstructionPass.cpp vendor/llvm/dist/lib/DebugInfo/DWARFCompileUnit.cpp vendor/llvm/dist/lib/DebugInfo/DWARFContext.cpp vendor/llvm/dist/lib/DebugInfo/DWARFContext.h vendor/llvm/dist/lib/DebugInfo/DWARFDebugInfoEntry.cpp vendor/llvm/dist/lib/DebugInfo/DWARFDebugInfoEntry.h vendor/llvm/dist/lib/DebugInfo/DWARFFormValue.cpp vendor/llvm/dist/lib/ExecutionEngine/ExecutionEngine.cpp vendor/llvm/dist/lib/ExecutionEngine/ExecutionEngineBindings.cpp vendor/llvm/dist/lib/ExecutionEngine/Interpreter/Execution.cpp vendor/llvm/dist/lib/ExecutionEngine/MCJIT/MCJIT.cpp vendor/llvm/dist/lib/ExecutionEngine/MCJIT/MCJIT.h vendor/llvm/dist/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h vendor/llvm/dist/lib/IR/AsmWriter.cpp vendor/llvm/dist/lib/IR/AttributeImpl.h vendor/llvm/dist/lib/IR/Attributes.cpp vendor/llvm/dist/lib/IR/Constants.cpp vendor/llvm/dist/lib/IR/ConstantsContext.h vendor/llvm/dist/lib/IR/Core.cpp vendor/llvm/dist/lib/IR/DIBuilder.cpp vendor/llvm/dist/lib/IR/DataLayout.cpp vendor/llvm/dist/lib/IR/DebugInfo.cpp vendor/llvm/dist/lib/IR/Function.cpp vendor/llvm/dist/lib/IR/Metadata.cpp vendor/llvm/dist/lib/IR/PassManager.cpp vendor/llvm/dist/lib/IR/Type.cpp vendor/llvm/dist/lib/IR/Value.cpp vendor/llvm/dist/lib/IR/Verifier.cpp vendor/llvm/dist/lib/Linker/CMakeLists.txt vendor/llvm/dist/lib/Linker/LinkModules.cpp vendor/llvm/dist/lib/MC/MCAsmInfo.cpp vendor/llvm/dist/lib/MC/MCAsmInfoCOFF.cpp vendor/llvm/dist/lib/MC/MCAsmStreamer.cpp vendor/llvm/dist/lib/MC/MCAssembler.cpp vendor/llvm/dist/lib/MC/MCDwarf.cpp vendor/llvm/dist/lib/MC/MCELFStreamer.cpp vendor/llvm/dist/lib/MC/MCExpr.cpp vendor/llvm/dist/lib/MC/MCMachOStreamer.cpp vendor/llvm/dist/lib/MC/MCNullStreamer.cpp vendor/llvm/dist/lib/MC/MCObjectFileInfo.cpp vendor/llvm/dist/lib/MC/MCObjectStreamer.cpp vendor/llvm/dist/lib/MC/MCParser/AsmParser.cpp vendor/llvm/dist/lib/MC/MCParser/DarwinAsmParser.cpp vendor/llvm/dist/lib/MC/MCParser/ELFAsmParser.cpp vendor/llvm/dist/lib/MC/MCPureStreamer.cpp vendor/llvm/dist/lib/MC/MCSectionCOFF.cpp vendor/llvm/dist/lib/MC/MCSectionELF.cpp vendor/llvm/dist/lib/MC/MCSectionMachO.cpp vendor/llvm/dist/lib/MC/MCStreamer.cpp vendor/llvm/dist/lib/MC/WinCOFFObjectWriter.cpp vendor/llvm/dist/lib/Object/CMakeLists.txt vendor/llvm/dist/lib/Object/COFFObjectFile.cpp vendor/llvm/dist/lib/Object/MachOObjectFile.cpp vendor/llvm/dist/lib/Object/Object.cpp vendor/llvm/dist/lib/Object/ObjectFile.cpp vendor/llvm/dist/lib/Support/CMakeLists.txt vendor/llvm/dist/lib/Support/CommandLine.cpp vendor/llvm/dist/lib/Support/DataExtractor.cpp vendor/llvm/dist/lib/Support/FoldingSet.cpp vendor/llvm/dist/lib/Support/Host.cpp vendor/llvm/dist/lib/Support/LockFileManager.cpp vendor/llvm/dist/lib/Support/PathV2.cpp vendor/llvm/dist/lib/Support/Triple.cpp vendor/llvm/dist/lib/Support/Unix/Memory.inc vendor/llvm/dist/lib/Support/Unix/PathV2.inc vendor/llvm/dist/lib/Support/Unix/Program.inc vendor/llvm/dist/lib/Support/Unix/Signals.inc vendor/llvm/dist/lib/Support/Windows/Program.inc vendor/llvm/dist/lib/Support/Windows/Signals.inc vendor/llvm/dist/lib/Support/YAMLParser.cpp vendor/llvm/dist/lib/Target/AArch64/AArch64FrameLowering.cpp vendor/llvm/dist/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/AArch64/AArch64ISelLowering.cpp vendor/llvm/dist/lib/Target/AArch64/AArch64ISelLowering.h vendor/llvm/dist/lib/Target/AArch64/AArch64InstrFormats.td vendor/llvm/dist/lib/Target/AArch64/AArch64InstrInfo.td vendor/llvm/dist/lib/Target/AArch64/AArch64MCInstLower.cpp vendor/llvm/dist/lib/Target/AArch64/LLVMBuild.txt vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp vendor/llvm/dist/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp vendor/llvm/dist/lib/Target/AArch64/Utils/AArch64BaseInfo.cpp vendor/llvm/dist/lib/Target/AArch64/Utils/AArch64BaseInfo.h vendor/llvm/dist/lib/Target/ARM/ARM.td vendor/llvm/dist/lib/Target/ARM/ARMBaseInstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/ARMBaseInstrInfo.h vendor/llvm/dist/lib/Target/ARM/ARMBaseRegisterInfo.cpp vendor/llvm/dist/lib/Target/ARM/ARMBaseRegisterInfo.h vendor/llvm/dist/lib/Target/ARM/ARMCallingConv.h vendor/llvm/dist/lib/Target/ARM/ARMCallingConv.td vendor/llvm/dist/lib/Target/ARM/ARMFastISel.cpp vendor/llvm/dist/lib/Target/ARM/ARMFrameLowering.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelLowering.cpp vendor/llvm/dist/lib/Target/ARM/ARMISelLowering.h vendor/llvm/dist/lib/Target/ARM/ARMInstrInfo.td vendor/llvm/dist/lib/Target/ARM/ARMInstrNEON.td vendor/llvm/dist/lib/Target/ARM/ARMInstrThumb2.td vendor/llvm/dist/lib/Target/ARM/ARMLoadStoreOptimizer.cpp vendor/llvm/dist/lib/Target/ARM/ARMMachineFunctionInfo.h vendor/llvm/dist/lib/Target/ARM/ARMSubtarget.cpp vendor/llvm/dist/lib/Target/ARM/ARMSubtarget.h vendor/llvm/dist/lib/Target/ARM/ARMTargetTransformInfo.cpp vendor/llvm/dist/lib/Target/ARM/AsmParser/ARMAsmParser.cpp vendor/llvm/dist/lib/Target/ARM/Disassembler/ARMDisassembler.cpp vendor/llvm/dist/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp vendor/llvm/dist/lib/Target/ARM/InstPrinter/ARMInstPrinter.h vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMUnwindOp.h vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/CMakeLists.txt vendor/llvm/dist/lib/Target/ARM/Thumb1FrameLowering.cpp vendor/llvm/dist/lib/Target/ARM/Thumb2InstrInfo.cpp vendor/llvm/dist/lib/Target/ARM/Thumb2SizeReduction.cpp vendor/llvm/dist/lib/Target/Hexagon/Hexagon.h vendor/llvm/dist/lib/Target/Hexagon/Hexagon.td vendor/llvm/dist/lib/Target/Hexagon/HexagonCFGOptimizer.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonExpandPredSpillCode.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonFrameLowering.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonHardwareLoops.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonISelLowering.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonISelLowering.h vendor/llvm/dist/lib/Target/Hexagon/HexagonInstrInfo.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonInstrInfo.h vendor/llvm/dist/lib/Target/Hexagon/HexagonInstrInfo.td vendor/llvm/dist/lib/Target/Hexagon/HexagonInstrInfoV3.td vendor/llvm/dist/lib/Target/Hexagon/HexagonInstrInfoV4.td vendor/llvm/dist/lib/Target/Hexagon/HexagonMachineFunctionInfo.h vendor/llvm/dist/lib/Target/Hexagon/HexagonNewValueJump.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonPeephole.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonRemoveSZExtArgs.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonSplitTFRCondSets.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonTargetMachine.cpp vendor/llvm/dist/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp vendor/llvm/dist/lib/Target/LLVMBuild.txt vendor/llvm/dist/lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/MBlaze/MBlazeInstrInfo.td vendor/llvm/dist/lib/Target/Mangler.cpp vendor/llvm/dist/lib/Target/Mips/AsmParser/MipsAsmParser.cpp vendor/llvm/dist/lib/Target/Mips/CMakeLists.txt vendor/llvm/dist/lib/Target/Mips/Disassembler/MipsDisassembler.cpp vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp vendor/llvm/dist/lib/Target/Mips/Mips16ISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Mips/Mips16ISelDAGToDAG.h vendor/llvm/dist/lib/Target/Mips/Mips16ISelLowering.cpp vendor/llvm/dist/lib/Target/Mips/Mips16RegisterInfo.cpp vendor/llvm/dist/lib/Target/Mips/Mips64InstrInfo.td vendor/llvm/dist/lib/Target/Mips/MipsAsmPrinter.cpp vendor/llvm/dist/lib/Target/Mips/MipsCodeEmitter.cpp vendor/llvm/dist/lib/Target/Mips/MipsConstantIslandPass.cpp vendor/llvm/dist/lib/Target/Mips/MipsDSPInstrFormats.td vendor/llvm/dist/lib/Target/Mips/MipsDSPInstrInfo.td vendor/llvm/dist/lib/Target/Mips/MipsISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Mips/MipsISelLowering.cpp vendor/llvm/dist/lib/Target/Mips/MipsISelLowering.h vendor/llvm/dist/lib/Target/Mips/MipsInstrFormats.td vendor/llvm/dist/lib/Target/Mips/MipsInstrInfo.td vendor/llvm/dist/lib/Target/Mips/MipsLongBranch.cpp vendor/llvm/dist/lib/Target/Mips/MipsRegisterInfo.cpp vendor/llvm/dist/lib/Target/Mips/MipsRegisterInfo.td vendor/llvm/dist/lib/Target/Mips/MipsSEFrameLowering.cpp vendor/llvm/dist/lib/Target/Mips/MipsSEISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Mips/MipsSEISelDAGToDAG.h vendor/llvm/dist/lib/Target/Mips/MipsSEISelLowering.cpp vendor/llvm/dist/lib/Target/Mips/MipsSEISelLowering.h vendor/llvm/dist/lib/Target/Mips/MipsSEInstrInfo.cpp vendor/llvm/dist/lib/Target/Mips/MipsSubtarget.cpp vendor/llvm/dist/lib/Target/Mips/MipsSubtarget.h vendor/llvm/dist/lib/Target/Mips/MipsTargetMachine.cpp vendor/llvm/dist/lib/Target/Mips/MipsTargetMachine.h vendor/llvm/dist/lib/Target/NVPTX/CMakeLists.txt vendor/llvm/dist/lib/Target/NVPTX/NVPTX.h vendor/llvm/dist/lib/Target/NVPTX/NVPTXAsmPrinter.cpp vendor/llvm/dist/lib/Target/NVPTX/NVPTXAsmPrinter.h vendor/llvm/dist/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/NVPTX/NVPTXISelDAGToDAG.h vendor/llvm/dist/lib/Target/NVPTX/NVPTXInstrInfo.td vendor/llvm/dist/lib/Target/NVPTX/NVPTXIntrinsics.td vendor/llvm/dist/lib/Target/NVPTX/NVPTXSection.h vendor/llvm/dist/lib/Target/NVPTX/NVPTXTargetMachine.cpp vendor/llvm/dist/lib/Target/NVPTX/NVVMReflect.cpp vendor/llvm/dist/lib/Target/PowerPC/CMakeLists.txt vendor/llvm/dist/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp vendor/llvm/dist/lib/Target/PowerPC/LLVMBuild.txt vendor/llvm/dist/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp vendor/llvm/dist/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp vendor/llvm/dist/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h vendor/llvm/dist/lib/Target/PowerPC/Makefile vendor/llvm/dist/lib/Target/PowerPC/PPC.h vendor/llvm/dist/lib/Target/PowerPC/PPC.td vendor/llvm/dist/lib/Target/PowerPC/PPCAsmPrinter.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCBranchSelector.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCFrameLowering.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCISelLowering.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCISelLowering.h vendor/llvm/dist/lib/Target/PowerPC/PPCInstr64Bit.td vendor/llvm/dist/lib/Target/PowerPC/PPCInstrAltivec.td vendor/llvm/dist/lib/Target/PowerPC/PPCInstrFormats.td vendor/llvm/dist/lib/Target/PowerPC/PPCInstrInfo.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCInstrInfo.h vendor/llvm/dist/lib/Target/PowerPC/PPCInstrInfo.td vendor/llvm/dist/lib/Target/PowerPC/PPCMCInstLower.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCMachineFunctionInfo.h vendor/llvm/dist/lib/Target/PowerPC/PPCRegisterInfo.cpp vendor/llvm/dist/lib/Target/PowerPC/PPCRegisterInfo.h vendor/llvm/dist/lib/Target/PowerPC/PPCScheduleA2.td vendor/llvm/dist/lib/Target/PowerPC/PPCTargetMachine.cpp vendor/llvm/dist/lib/Target/PowerPC/README.txt vendor/llvm/dist/lib/Target/R600/AMDGPU.h vendor/llvm/dist/lib/Target/R600/AMDGPUAsmPrinter.cpp vendor/llvm/dist/lib/Target/R600/AMDGPUAsmPrinter.h vendor/llvm/dist/lib/Target/R600/AMDGPUCallingConv.td vendor/llvm/dist/lib/Target/R600/AMDGPUISelLowering.h vendor/llvm/dist/lib/Target/R600/AMDGPUInstructions.td vendor/llvm/dist/lib/Target/R600/AMDGPUMachineFunction.cpp vendor/llvm/dist/lib/Target/R600/AMDGPUSubtarget.cpp vendor/llvm/dist/lib/Target/R600/AMDGPUSubtarget.h vendor/llvm/dist/lib/Target/R600/AMDGPUTargetMachine.cpp vendor/llvm/dist/lib/Target/R600/AMDILBase.td vendor/llvm/dist/lib/Target/R600/AMDILDeviceInfo.cpp vendor/llvm/dist/lib/Target/R600/AMDILISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/R600/CMakeLists.txt vendor/llvm/dist/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp vendor/llvm/dist/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h vendor/llvm/dist/lib/Target/R600/MCTargetDesc/CMakeLists.txt vendor/llvm/dist/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp vendor/llvm/dist/lib/Target/R600/Processors.td vendor/llvm/dist/lib/Target/R600/R600ControlFlowFinalizer.cpp vendor/llvm/dist/lib/Target/R600/R600Defines.h vendor/llvm/dist/lib/Target/R600/R600ISelLowering.cpp vendor/llvm/dist/lib/Target/R600/R600InstrInfo.cpp vendor/llvm/dist/lib/Target/R600/R600InstrInfo.h vendor/llvm/dist/lib/Target/R600/R600Instructions.td vendor/llvm/dist/lib/Target/R600/R600MachineFunctionInfo.h vendor/llvm/dist/lib/Target/R600/R600RegisterInfo.td vendor/llvm/dist/lib/Target/R600/R600Schedule.td vendor/llvm/dist/lib/Target/R600/SIISelLowering.cpp vendor/llvm/dist/lib/Target/R600/SIISelLowering.h vendor/llvm/dist/lib/Target/R600/SIInstrFormats.td vendor/llvm/dist/lib/Target/R600/SIInstrInfo.cpp vendor/llvm/dist/lib/Target/R600/SIInstrInfo.h vendor/llvm/dist/lib/Target/R600/SIInstrInfo.td vendor/llvm/dist/lib/Target/R600/SIInstructions.td vendor/llvm/dist/lib/Target/R600/SIIntrinsics.td vendor/llvm/dist/lib/Target/R600/SIRegisterInfo.td vendor/llvm/dist/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp vendor/llvm/dist/lib/Target/Sparc/SparcAsmPrinter.cpp vendor/llvm/dist/lib/Target/Sparc/SparcCallingConv.td vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.cpp vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.h vendor/llvm/dist/lib/Target/Sparc/SparcISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/Sparc/SparcISelLowering.cpp vendor/llvm/dist/lib/Target/Sparc/SparcISelLowering.h vendor/llvm/dist/lib/Target/Sparc/SparcInstr64Bit.td vendor/llvm/dist/lib/Target/Sparc/SparcInstrFormats.td vendor/llvm/dist/lib/Target/Sparc/SparcInstrInfo.td vendor/llvm/dist/lib/Target/Sparc/SparcRegisterInfo.cpp vendor/llvm/dist/lib/Target/Sparc/SparcSubtarget.h vendor/llvm/dist/lib/Target/Target.cpp vendor/llvm/dist/lib/Target/TargetMachineC.cpp vendor/llvm/dist/lib/Target/X86/AsmParser/X86AsmParser.cpp vendor/llvm/dist/lib/Target/X86/CMakeLists.txt vendor/llvm/dist/lib/Target/X86/MCTargetDesc/X86BaseInfo.h vendor/llvm/dist/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp vendor/llvm/dist/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp vendor/llvm/dist/lib/Target/X86/X86.h vendor/llvm/dist/lib/Target/X86/X86.td vendor/llvm/dist/lib/Target/X86/X86CodeEmitter.cpp vendor/llvm/dist/lib/Target/X86/X86FastISel.cpp vendor/llvm/dist/lib/Target/X86/X86FrameLowering.cpp vendor/llvm/dist/lib/Target/X86/X86FrameLowering.h vendor/llvm/dist/lib/Target/X86/X86ISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/X86/X86ISelLowering.cpp vendor/llvm/dist/lib/Target/X86/X86ISelLowering.h vendor/llvm/dist/lib/Target/X86/X86InstrFormats.td vendor/llvm/dist/lib/Target/X86/X86InstrInfo.cpp vendor/llvm/dist/lib/Target/X86/X86InstrInfo.td vendor/llvm/dist/lib/Target/X86/X86InstrSSE.td vendor/llvm/dist/lib/Target/X86/X86InstrShiftRotate.td vendor/llvm/dist/lib/Target/X86/X86InstrSystem.td vendor/llvm/dist/lib/Target/X86/X86SchedHaswell.td vendor/llvm/dist/lib/Target/X86/X86SchedSandyBridge.td vendor/llvm/dist/lib/Target/X86/X86Subtarget.cpp vendor/llvm/dist/lib/Target/X86/X86Subtarget.h vendor/llvm/dist/lib/Target/X86/X86TargetMachine.cpp vendor/llvm/dist/lib/Target/X86/X86TargetTransformInfo.cpp vendor/llvm/dist/lib/Target/XCore/CMakeLists.txt vendor/llvm/dist/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp vendor/llvm/dist/lib/Target/XCore/InstPrinter/XCoreInstPrinter.cpp vendor/llvm/dist/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp vendor/llvm/dist/lib/Target/XCore/XCore.h vendor/llvm/dist/lib/Target/XCore/XCoreAsmPrinter.cpp vendor/llvm/dist/lib/Target/XCore/XCoreISelDAGToDAG.cpp vendor/llvm/dist/lib/Target/XCore/XCoreISelLowering.cpp vendor/llvm/dist/lib/Target/XCore/XCoreISelLowering.h vendor/llvm/dist/lib/Target/XCore/XCoreInstrInfo.td vendor/llvm/dist/lib/Target/XCore/XCoreTargetMachine.cpp vendor/llvm/dist/lib/Target/XCore/XCoreTargetObjectFile.cpp vendor/llvm/dist/lib/Transforms/IPO/ConstantMerge.cpp vendor/llvm/dist/lib/Transforms/IPO/GlobalDCE.cpp vendor/llvm/dist/lib/Transforms/IPO/GlobalOpt.cpp vendor/llvm/dist/lib/Transforms/IPO/MergeFunctions.cpp vendor/llvm/dist/lib/Transforms/IPO/PassManagerBuilder.cpp vendor/llvm/dist/lib/Transforms/IPO/StripSymbols.cpp vendor/llvm/dist/lib/Transforms/InstCombine/CMakeLists.txt vendor/llvm/dist/lib/Transforms/InstCombine/InstCombine.h vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineAddSub.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineCalls.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineCompares.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombinePHI.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineSelect.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstCombineVectorOps.cpp vendor/llvm/dist/lib/Transforms/InstCombine/InstructionCombining.cpp vendor/llvm/dist/lib/Transforms/Instrumentation/BlackList.cpp vendor/llvm/dist/lib/Transforms/Instrumentation/Instrumentation.cpp vendor/llvm/dist/lib/Transforms/ObjCARC/ObjCARC.cpp vendor/llvm/dist/lib/Transforms/ObjCARC/ObjCARCContract.cpp vendor/llvm/dist/lib/Transforms/ObjCARC/ObjCARCOpts.cpp vendor/llvm/dist/lib/Transforms/Scalar/CodeGenPrepare.cpp vendor/llvm/dist/lib/Transforms/Scalar/GVN.cpp vendor/llvm/dist/lib/Transforms/Scalar/GlobalMerge.cpp vendor/llvm/dist/lib/Transforms/Scalar/LoopRotation.cpp vendor/llvm/dist/lib/Transforms/Scalar/Reassociate.cpp vendor/llvm/dist/lib/Transforms/Scalar/SROA.cpp vendor/llvm/dist/lib/Transforms/Scalar/ScalarReplAggregates.cpp vendor/llvm/dist/lib/Transforms/Utils/CloneFunction.cpp vendor/llvm/dist/lib/Transforms/Utils/InlineFunction.cpp vendor/llvm/dist/lib/Transforms/Utils/Local.cpp vendor/llvm/dist/lib/Transforms/Utils/SimplifyCFG.cpp vendor/llvm/dist/lib/Transforms/Utils/SimplifyLibCalls.cpp vendor/llvm/dist/lib/Transforms/Utils/Utils.cpp vendor/llvm/dist/lib/Transforms/Utils/ValueMapper.cpp vendor/llvm/dist/lib/Transforms/Vectorize/CMakeLists.txt vendor/llvm/dist/lib/Transforms/Vectorize/LoopVectorize.cpp vendor/llvm/dist/lib/Transforms/Vectorize/Vectorize.cpp vendor/llvm/dist/projects/sample/autoconf/configure.ac vendor/llvm/dist/projects/sample/configure vendor/llvm/dist/test/Analysis/BasicAA/invariant_load.ll vendor/llvm/dist/test/Analysis/BasicAA/phi-spec-order.ll vendor/llvm/dist/test/Analysis/CostModel/ARM/cast.ll vendor/llvm/dist/test/Analysis/CostModel/X86/arith.ll vendor/llvm/dist/test/Analysis/CostModel/X86/loop_v2.ll vendor/llvm/dist/test/Analysis/CostModel/X86/testshiftashr.ll vendor/llvm/dist/test/Analysis/CostModel/X86/testshiftlshr.ll vendor/llvm/dist/test/Analysis/CostModel/X86/testshiftshl.ll vendor/llvm/dist/test/Analysis/CostModel/X86/vectorized-loop.ll vendor/llvm/dist/test/Analysis/GlobalsModRef/volatile-instrs.ll vendor/llvm/dist/test/Analysis/Profiling/lit.local.cfg vendor/llvm/dist/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll vendor/llvm/dist/test/CodeGen/AArch64/adrp-relocation.ll vendor/llvm/dist/test/CodeGen/AArch64/atomic-ops-not-barriers.ll vendor/llvm/dist/test/CodeGen/AArch64/atomic-ops.ll vendor/llvm/dist/test/CodeGen/AArch64/blockaddress.ll vendor/llvm/dist/test/CodeGen/AArch64/elf-extern.ll vendor/llvm/dist/test/CodeGen/AArch64/extern-weak.ll vendor/llvm/dist/test/CodeGen/AArch64/jump-table.ll vendor/llvm/dist/test/CodeGen/AArch64/literal_pools.ll vendor/llvm/dist/test/CodeGen/ARM/2010-08-04-StackVariable.ll vendor/llvm/dist/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll vendor/llvm/dist/test/CodeGen/ARM/2010-11-30-reloc-movt.ll vendor/llvm/dist/test/CodeGen/ARM/2010-12-08-tpsoft.ll vendor/llvm/dist/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll vendor/llvm/dist/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll vendor/llvm/dist/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll vendor/llvm/dist/test/CodeGen/ARM/2011-12-14-machine-sink.ll vendor/llvm/dist/test/CodeGen/ARM/2012-01-23-PostRA-LICM.ll vendor/llvm/dist/test/CodeGen/ARM/2012-01-24-RegSequenceLiveRange.ll vendor/llvm/dist/test/CodeGen/ARM/2012-01-26-CopyPropKills.ll vendor/llvm/dist/test/CodeGen/ARM/2012-04-02-TwoAddrInstrCrash.ll vendor/llvm/dist/test/CodeGen/ARM/2012-04-10-DAGCombine.ll vendor/llvm/dist/test/CodeGen/ARM/2012-06-12-SchedMemLatency.ll vendor/llvm/dist/test/CodeGen/ARM/2012-08-04-DtripleSpillReload.ll vendor/llvm/dist/test/CodeGen/ARM/2013-01-21-PR14992.ll vendor/llvm/dist/test/CodeGen/ARM/avoid-cpsr-rmw.ll vendor/llvm/dist/test/CodeGen/ARM/commute-movcc.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-arg.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-branch-folding.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-d16-reg.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-qreg.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-s16-reg.ll vendor/llvm/dist/test/CodeGen/ARM/debug-info-sreg2.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-filters.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc-section-group.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc-section.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc-sh_link.ll vendor/llvm/dist/test/CodeGen/ARM/ehabi-mc.ll vendor/llvm/dist/test/CodeGen/ARM/lsr-unfolded-offset.ll vendor/llvm/dist/test/CodeGen/ARM/private.ll vendor/llvm/dist/test/CodeGen/ARM/tail-dup.ll vendor/llvm/dist/test/CodeGen/ARM/vcvt.ll vendor/llvm/dist/test/CodeGen/ARM/vcvt_combine.ll vendor/llvm/dist/test/CodeGen/ARM/vdiv_combine.ll vendor/llvm/dist/test/CodeGen/ARM/vmul.ll vendor/llvm/dist/test/CodeGen/Generic/crash.ll vendor/llvm/dist/test/CodeGen/Hexagon/cmpb_pred.ll vendor/llvm/dist/test/CodeGen/Hexagon/combine_ir.ll vendor/llvm/dist/test/CodeGen/Hexagon/hwloop-const.ll vendor/llvm/dist/test/CodeGen/Hexagon/hwloop-dbg.ll vendor/llvm/dist/test/CodeGen/Hexagon/memops2.ll vendor/llvm/dist/test/CodeGen/Hexagon/memops3.ll vendor/llvm/dist/test/CodeGen/Hexagon/remove_lsr.ll vendor/llvm/dist/test/CodeGen/Mips/alloca.ll vendor/llvm/dist/test/CodeGen/Mips/divrem.ll vendor/llvm/dist/test/CodeGen/Mips/dsp-patterns.ll vendor/llvm/dist/test/CodeGen/Mips/dsp-r1.ll vendor/llvm/dist/test/CodeGen/Mips/eh.ll vendor/llvm/dist/test/CodeGen/Mips/inlineasmmemop.ll vendor/llvm/dist/test/CodeGen/Mips/select.ll vendor/llvm/dist/test/CodeGen/Mips/zeroreg.ll vendor/llvm/dist/test/CodeGen/NVPTX/intrinsics.ll vendor/llvm/dist/test/CodeGen/PowerPC/2007-09-07-LoadStoreIdxForms.ll vendor/llvm/dist/test/CodeGen/PowerPC/2011-12-05-NoSpillDupCR.ll vendor/llvm/dist/test/CodeGen/PowerPC/2011-12-06-SpillAndRestoreCR.ll vendor/llvm/dist/test/CodeGen/PowerPC/crsave.ll vendor/llvm/dist/test/CodeGen/PowerPC/ctrloop-s000.ll vendor/llvm/dist/test/CodeGen/PowerPC/ctrloop-sums.ll vendor/llvm/dist/test/CodeGen/PowerPC/ctrloops.ll vendor/llvm/dist/test/CodeGen/PowerPC/fma.ll vendor/llvm/dist/test/CodeGen/PowerPC/lbzux.ll vendor/llvm/dist/test/CodeGen/PowerPC/mcm-obj-2.ll vendor/llvm/dist/test/CodeGen/PowerPC/mcm-obj.ll vendor/llvm/dist/test/CodeGen/PowerPC/pr15359.ll vendor/llvm/dist/test/CodeGen/PowerPC/rounding-ops.ll vendor/llvm/dist/test/CodeGen/PowerPC/s000-alias-misched.ll vendor/llvm/dist/test/CodeGen/PowerPC/stubs.ll vendor/llvm/dist/test/CodeGen/PowerPC/stwu-gta.ll vendor/llvm/dist/test/CodeGen/PowerPC/stwu8.ll vendor/llvm/dist/test/CodeGen/PowerPC/tls-gd-obj.ll vendor/llvm/dist/test/CodeGen/PowerPC/tls-ie-obj.ll vendor/llvm/dist/test/CodeGen/PowerPC/tls-ld-obj.ll vendor/llvm/dist/test/CodeGen/R600/alu-split.ll vendor/llvm/dist/test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll vendor/llvm/dist/test/CodeGen/R600/disconnected-predset-break-bug.ll vendor/llvm/dist/test/CodeGen/R600/fabs.ll vendor/llvm/dist/test/CodeGen/R600/fadd.ll vendor/llvm/dist/test/CodeGen/R600/fcmp-cnd.ll vendor/llvm/dist/test/CodeGen/R600/fcmp.ll vendor/llvm/dist/test/CodeGen/R600/floor.ll vendor/llvm/dist/test/CodeGen/R600/fmad.ll vendor/llvm/dist/test/CodeGen/R600/fmax.ll vendor/llvm/dist/test/CodeGen/R600/fmin.ll vendor/llvm/dist/test/CodeGen/R600/fmul.ll vendor/llvm/dist/test/CodeGen/R600/fmul.v4f32.ll vendor/llvm/dist/test/CodeGen/R600/fsub.ll vendor/llvm/dist/test/CodeGen/R600/icmp-select-sete-reverse-args.ll vendor/llvm/dist/test/CodeGen/R600/literals.ll vendor/llvm/dist/test/CodeGen/R600/llvm.AMDGPU.mul.ll vendor/llvm/dist/test/CodeGen/R600/llvm.AMDGPU.trunc.ll vendor/llvm/dist/test/CodeGen/R600/llvm.SI.fs.interp.constant.ll vendor/llvm/dist/test/CodeGen/R600/llvm.SI.sample.ll vendor/llvm/dist/test/CodeGen/R600/llvm.cos.ll vendor/llvm/dist/test/CodeGen/R600/llvm.pow.ll vendor/llvm/dist/test/CodeGen/R600/llvm.sin.ll vendor/llvm/dist/test/CodeGen/R600/lshl.ll vendor/llvm/dist/test/CodeGen/R600/lshr.ll vendor/llvm/dist/test/CodeGen/R600/mulhu.ll vendor/llvm/dist/test/CodeGen/R600/predicates.ll vendor/llvm/dist/test/CodeGen/R600/reciprocal.ll vendor/llvm/dist/test/CodeGen/R600/sdiv.ll vendor/llvm/dist/test/CodeGen/R600/selectcc-icmp-select-float.ll vendor/llvm/dist/test/CodeGen/R600/set-dx10.ll vendor/llvm/dist/test/CodeGen/R600/seto.ll vendor/llvm/dist/test/CodeGen/R600/setuo.ll vendor/llvm/dist/test/CodeGen/R600/unsupported-cc.ll vendor/llvm/dist/test/CodeGen/SPARC/64bit.ll vendor/llvm/dist/test/CodeGen/Thumb/large-stack.ll vendor/llvm/dist/test/CodeGen/Thumb2/2013-02-19-tail-call-register-hint.ll vendor/llvm/dist/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll vendor/llvm/dist/test/CodeGen/X86/2006-07-31-SingleRegClass.ll vendor/llvm/dist/test/CodeGen/X86/2006-11-27-SelectLegalize.ll vendor/llvm/dist/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll vendor/llvm/dist/test/CodeGen/X86/2007-04-24-Huge-Stack.ll vendor/llvm/dist/test/CodeGen/X86/2007-05-17-ShuffleISelBug.ll vendor/llvm/dist/test/CodeGen/X86/2007-06-15-IntToMMX.ll vendor/llvm/dist/test/CodeGen/X86/2007-08-01-LiveVariablesBug.ll vendor/llvm/dist/test/CodeGen/X86/2007-10-19-SpillerUnfold.ll vendor/llvm/dist/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll vendor/llvm/dist/test/CodeGen/X86/2008-01-09-LongDoubleSin.ll vendor/llvm/dist/test/CodeGen/X86/2008-02-20-InlineAsmClobber.ll vendor/llvm/dist/test/CodeGen/X86/2008-11-06-testb.ll vendor/llvm/dist/test/CodeGen/X86/2009-02-25-CommuteBug.ll vendor/llvm/dist/test/CodeGen/X86/2009-03-25-TestBug.ll vendor/llvm/dist/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll vendor/llvm/dist/test/CodeGen/X86/2009-04-24.ll vendor/llvm/dist/test/CodeGen/X86/2009-05-08-InlineAsmIOffset.ll vendor/llvm/dist/test/CodeGen/X86/2009-05-23-available_externally.ll vendor/llvm/dist/test/CodeGen/X86/2009-06-05-ScalarToVectorByteMMX.ll vendor/llvm/dist/test/CodeGen/X86/2009-08-08-CastError.ll vendor/llvm/dist/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll vendor/llvm/dist/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll vendor/llvm/dist/test/CodeGen/X86/2010-05-28-Crash.ll vendor/llvm/dist/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll vendor/llvm/dist/test/CodeGen/X86/2010-08-04-StackVariable.ll vendor/llvm/dist/test/CodeGen/X86/2010-11-02-DbgParameter.ll vendor/llvm/dist/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll vendor/llvm/dist/test/CodeGen/X86/2011-09-14-valcoalesce.ll vendor/llvm/dist/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll vendor/llvm/dist/test/CodeGen/X86/2012-11-30-handlemove-dbg.ll vendor/llvm/dist/test/CodeGen/X86/2013-03-13-VEX-DestReg.ll vendor/llvm/dist/test/CodeGen/X86/MachineSink-DbgValue.ll vendor/llvm/dist/test/CodeGen/X86/add.ll vendor/llvm/dist/test/CodeGen/X86/atom-call-reg-indirect-foldedreload32.ll vendor/llvm/dist/test/CodeGen/X86/atom-call-reg-indirect-foldedreload64.ll vendor/llvm/dist/test/CodeGen/X86/atomic-dagsched.ll vendor/llvm/dist/test/CodeGen/X86/avx-basic.ll vendor/llvm/dist/test/CodeGen/X86/block-placement.ll vendor/llvm/dist/test/CodeGen/X86/brcond.ll vendor/llvm/dist/test/CodeGen/X86/bswap-inline-asm.ll vendor/llvm/dist/test/CodeGen/X86/bt.ll vendor/llvm/dist/test/CodeGen/X86/call-imm.ll vendor/llvm/dist/test/CodeGen/X86/coalescer-identity.ll vendor/llvm/dist/test/CodeGen/X86/commute-intrinsic.ll vendor/llvm/dist/test/CodeGen/X86/compiler_used.ll vendor/llvm/dist/test/CodeGen/X86/crash.ll vendor/llvm/dist/test/CodeGen/X86/dbg-byval-parameter.ll vendor/llvm/dist/test/CodeGen/X86/dbg-const-int.ll vendor/llvm/dist/test/CodeGen/X86/dbg-const.ll vendor/llvm/dist/test/CodeGen/X86/dbg-i128-const.ll vendor/llvm/dist/test/CodeGen/X86/dbg-large-unsigned-const.ll vendor/llvm/dist/test/CodeGen/X86/dbg-merge-loc-entry.ll vendor/llvm/dist/test/CodeGen/X86/dbg-prolog-end.ll vendor/llvm/dist/test/CodeGen/X86/dbg-subrange.ll vendor/llvm/dist/test/CodeGen/X86/dbg-value-dag-combine.ll vendor/llvm/dist/test/CodeGen/X86/dbg-value-isel.ll vendor/llvm/dist/test/CodeGen/X86/dbg-value-location.ll vendor/llvm/dist/test/CodeGen/X86/dbg-value-range.ll vendor/llvm/dist/test/CodeGen/X86/fast-cc-merge-stack-adj.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-constpool.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-fneg.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-gv.ll vendor/llvm/dist/test/CodeGen/X86/fast-isel-tailcall.ll vendor/llvm/dist/test/CodeGen/X86/fastcall-correct-mangling.ll vendor/llvm/dist/test/CodeGen/X86/fastcc-2.ll vendor/llvm/dist/test/CodeGen/X86/fastcc-byval.ll vendor/llvm/dist/test/CodeGen/X86/fastcc-sret.ll vendor/llvm/dist/test/CodeGen/X86/fastcc3struct.ll vendor/llvm/dist/test/CodeGen/X86/fold-imm.ll vendor/llvm/dist/test/CodeGen/X86/fp-immediate-shorten.ll vendor/llvm/dist/test/CodeGen/X86/fp_load_cast_fold.ll vendor/llvm/dist/test/CodeGen/X86/long-setcc.ll vendor/llvm/dist/test/CodeGen/X86/lsr-normalization.ll vendor/llvm/dist/test/CodeGen/X86/lsr-static-addr.ll vendor/llvm/dist/test/CodeGen/X86/misched-matmul.ll vendor/llvm/dist/test/CodeGen/X86/misched-matrix.ll vendor/llvm/dist/test/CodeGen/X86/mmx-pinsrw.ll vendor/llvm/dist/test/CodeGen/X86/mul-legalize.ll vendor/llvm/dist/test/CodeGen/X86/negative_zero.ll vendor/llvm/dist/test/CodeGen/X86/nosse-error1.ll vendor/llvm/dist/test/CodeGen/X86/nosse-error2.ll vendor/llvm/dist/test/CodeGen/X86/optimize-max-2.ll vendor/llvm/dist/test/CodeGen/X86/peep-test-2.ll vendor/llvm/dist/test/CodeGen/X86/phys_subreg_coalesce.ll vendor/llvm/dist/test/CodeGen/X86/pr12889.ll vendor/llvm/dist/test/CodeGen/X86/pr2656.ll vendor/llvm/dist/test/CodeGen/X86/private-2.ll vendor/llvm/dist/test/CodeGen/X86/rd-mod-wr-eflags.ll vendor/llvm/dist/test/CodeGen/X86/sincos-opt.ll vendor/llvm/dist/test/CodeGen/X86/stdcall.ll vendor/llvm/dist/test/CodeGen/X86/store-fp-constant.ll vendor/llvm/dist/test/CodeGen/X86/subreg-to-reg-1.ll vendor/llvm/dist/test/CodeGen/X86/subreg-to-reg-3.ll vendor/llvm/dist/test/CodeGen/X86/subtarget-feature-change.ll vendor/llvm/dist/test/CodeGen/X86/switch-crit-edge-constant.ll vendor/llvm/dist/test/CodeGen/X86/tailcall-64.ll vendor/llvm/dist/test/CodeGen/X86/unwindraise.ll vendor/llvm/dist/test/CodeGen/X86/v4f32-immediate.ll vendor/llvm/dist/test/CodeGen/X86/vararg_tailcall.ll vendor/llvm/dist/test/CodeGen/X86/vec_compare.ll vendor/llvm/dist/test/CodeGen/X86/vec_set-9.ll vendor/llvm/dist/test/CodeGen/X86/vec_set-B.ll vendor/llvm/dist/test/CodeGen/X86/vec_set-D.ll vendor/llvm/dist/test/CodeGen/X86/vec_set-I.ll vendor/llvm/dist/test/CodeGen/X86/vec_shuffle-28.ll vendor/llvm/dist/test/CodeGen/X86/vec_zero_cse.ll vendor/llvm/dist/test/CodeGen/X86/vector.ll vendor/llvm/dist/test/CodeGen/X86/win32_sret.ll vendor/llvm/dist/test/CodeGen/X86/x86-64-frameaddr.ll vendor/llvm/dist/test/CodeGen/X86/x86-64-pic-3.ll vendor/llvm/dist/test/CodeGen/X86/x86-64-shortint.ll vendor/llvm/dist/test/CodeGen/X86/zext-extract_subreg.ll vendor/llvm/dist/test/CodeGen/X86/zext-inreg-0.ll vendor/llvm/dist/test/CodeGen/XCore/unaligned_load.ll vendor/llvm/dist/test/CodeGen/XCore/unaligned_store.ll vendor/llvm/dist/test/DebugInfo/2010-03-19-DbgDeclare.ll vendor/llvm/dist/test/DebugInfo/2010-03-24-MemberFn.ll vendor/llvm/dist/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll vendor/llvm/dist/test/DebugInfo/2010-04-19-FramePtr.ll vendor/llvm/dist/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll vendor/llvm/dist/test/DebugInfo/AArch64/dwarfdump.ll vendor/llvm/dist/test/DebugInfo/AArch64/variable-loc.ll vendor/llvm/dist/test/DebugInfo/X86/2010-04-13-PubType.ll vendor/llvm/dist/test/DebugInfo/X86/2010-08-10-DbgConstant.ll vendor/llvm/dist/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll vendor/llvm/dist/test/DebugInfo/X86/2011-12-16-BadStructRef.ll vendor/llvm/dist/test/DebugInfo/X86/DW_AT_byte_size.ll vendor/llvm/dist/test/DebugInfo/X86/DW_AT_location-reference.ll vendor/llvm/dist/test/DebugInfo/X86/DW_AT_object_pointer.ll vendor/llvm/dist/test/DebugInfo/X86/DW_AT_specification.ll vendor/llvm/dist/test/DebugInfo/X86/DW_TAG_friend.ll vendor/llvm/dist/test/DebugInfo/X86/aligned_stack_var.ll vendor/llvm/dist/test/DebugInfo/X86/block-capture.ll vendor/llvm/dist/test/DebugInfo/X86/concrete_out_of_line.ll vendor/llvm/dist/test/DebugInfo/X86/dbg-value-inlined-parameter.ll vendor/llvm/dist/test/DebugInfo/X86/debug-info-block-captured-self.ll vendor/llvm/dist/test/DebugInfo/X86/debug-info-blocks.ll vendor/llvm/dist/test/DebugInfo/X86/debug-info-static-member.ll vendor/llvm/dist/test/DebugInfo/X86/elf-names.ll vendor/llvm/dist/test/DebugInfo/X86/empty-and-one-elem-array.ll vendor/llvm/dist/test/DebugInfo/X86/empty-array.ll vendor/llvm/dist/test/DebugInfo/X86/ending-run.ll vendor/llvm/dist/test/DebugInfo/X86/enum-class.ll vendor/llvm/dist/test/DebugInfo/X86/enum-fwd-decl.ll vendor/llvm/dist/test/DebugInfo/X86/fission-cu.ll vendor/llvm/dist/test/DebugInfo/X86/line-info.ll vendor/llvm/dist/test/DebugInfo/X86/linkage-name.ll vendor/llvm/dist/test/DebugInfo/X86/low-pc-cu.ll vendor/llvm/dist/test/DebugInfo/X86/misched-dbg-value.ll vendor/llvm/dist/test/DebugInfo/X86/multiple-at-const-val.ll vendor/llvm/dist/test/DebugInfo/X86/nondefault-subrange-array.ll vendor/llvm/dist/test/DebugInfo/X86/objc-fwd-decl.ll vendor/llvm/dist/test/DebugInfo/X86/op_deref.ll vendor/llvm/dist/test/DebugInfo/X86/pointer-type-size.ll vendor/llvm/dist/test/DebugInfo/X86/pr11300.ll vendor/llvm/dist/test/DebugInfo/X86/pr13303.ll vendor/llvm/dist/test/DebugInfo/X86/prologue-stack.ll vendor/llvm/dist/test/DebugInfo/X86/rvalue-ref.ll vendor/llvm/dist/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll vendor/llvm/dist/test/DebugInfo/X86/stringpool.ll vendor/llvm/dist/test/DebugInfo/X86/struct-loc.ll vendor/llvm/dist/test/DebugInfo/X86/subrange-type.ll vendor/llvm/dist/test/DebugInfo/X86/subreg.ll vendor/llvm/dist/test/DebugInfo/X86/union-template.ll vendor/llvm/dist/test/DebugInfo/X86/vector.ll vendor/llvm/dist/test/DebugInfo/array.ll vendor/llvm/dist/test/DebugInfo/dwarf-public-names.ll vendor/llvm/dist/test/DebugInfo/inlined-vars.ll vendor/llvm/dist/test/DebugInfo/llvm-symbolizer.test vendor/llvm/dist/test/DebugInfo/member-pointers.ll vendor/llvm/dist/test/DebugInfo/namespace.ll vendor/llvm/dist/test/DebugInfo/two-cus-from-same-file.ll vendor/llvm/dist/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/fpbitcast.ll vendor/llvm/dist/test/ExecutionEngine/MCJIT/lit.local.cfg vendor/llvm/dist/test/ExecutionEngine/MCJIT/test-global-ctors.ll vendor/llvm/dist/test/ExecutionEngine/fpbitcast.ll vendor/llvm/dist/test/ExecutionEngine/lit.local.cfg vendor/llvm/dist/test/ExecutionEngine/test-interp-vec-loadstore.ll vendor/llvm/dist/test/Feature/aliases.ll vendor/llvm/dist/test/Instrumentation/ThreadSanitizer/tsan_basic.ll vendor/llvm/dist/test/Integer/2007-01-19-TruncSext.ll vendor/llvm/dist/test/Integer/fold-fpcast_bt.ll vendor/llvm/dist/test/Integer/packed_struct_bt.ll vendor/llvm/dist/test/Linker/2003-01-30-LinkerRename.ll vendor/llvm/dist/test/Linker/2003-01-30-LinkerTypeRename.ll vendor/llvm/dist/test/Linker/2003-04-23-LinkOnceLost.ll vendor/llvm/dist/test/Linker/2003-05-31-LinkerRename.ll vendor/llvm/dist/test/Linker/2003-08-23-GlobalVarLinking.ll vendor/llvm/dist/test/Linker/2003-08-24-InheritPtrSize.ll vendor/llvm/dist/test/Linker/2004-12-03-DisagreeingType.ll vendor/llvm/dist/test/Linker/2005-02-12-ConstantGlobals-2.ll vendor/llvm/dist/test/Linker/2005-02-12-ConstantGlobals.ll vendor/llvm/dist/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll vendor/llvm/dist/test/Linker/2006-06-15-GlobalVarAlignment.ll vendor/llvm/dist/test/Linker/2008-03-07-DroppedSection_a.ll vendor/llvm/dist/test/Linker/2008-03-07-DroppedSection_b.ll vendor/llvm/dist/test/Linker/2008-06-26-AddressSpace.ll vendor/llvm/dist/test/Linker/2011-08-18-unique-class-type.ll vendor/llvm/dist/test/Linker/2011-08-18-unique-debug-type.ll vendor/llvm/dist/test/Linker/AppendingLinkage.ll vendor/llvm/dist/test/Linker/AppendingLinkage2.ll vendor/llvm/dist/test/Linker/ConstantGlobals1.ll vendor/llvm/dist/test/Linker/ConstantGlobals2.ll vendor/llvm/dist/test/Linker/ConstantGlobals3.ll vendor/llvm/dist/test/Linker/link-global-to-func.ll vendor/llvm/dist/test/Linker/linknamedmdnode.ll vendor/llvm/dist/test/Linker/redefinition.ll vendor/llvm/dist/test/Linker/weakextern.ll vendor/llvm/dist/test/MC/AArch64/elf-globaladdress.ll vendor/llvm/dist/test/MC/AArch64/elf-objdump.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-addsubimm.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-condbr.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-ldrlit.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-ldstunsimm.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-movw.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-pcreladdressing.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-tstb.s vendor/llvm/dist/test/MC/AArch64/elf-reloc-uncondbrimm.s vendor/llvm/dist/test/MC/AArch64/tls-relocs.s vendor/llvm/dist/test/MC/ARM/basic-arm-instructions.s vendor/llvm/dist/test/MC/ARM/basic-thumb2-instructions.s vendor/llvm/dist/test/MC/ARM/cxx-global-constructor.ll vendor/llvm/dist/test/MC/ARM/data-in-code.ll vendor/llvm/dist/test/MC/ARM/elf-eflags-eabi-cg.ll vendor/llvm/dist/test/MC/ARM/elf-eflags-eabi.s vendor/llvm/dist/test/MC/ARM/elf-movt.s vendor/llvm/dist/test/MC/ARM/elf-reloc-01.ll vendor/llvm/dist/test/MC/ARM/elf-reloc-02.ll vendor/llvm/dist/test/MC/ARM/elf-reloc-03.ll vendor/llvm/dist/test/MC/ARM/elf-reloc-condcall.s vendor/llvm/dist/test/MC/ARM/elf-thumbfunc-reloc.ll vendor/llvm/dist/test/MC/ARM/elf-thumbfunc-reloc.s vendor/llvm/dist/test/MC/ARM/elf-thumbfunc.s vendor/llvm/dist/test/MC/ARM/neon-cmp-encoding.s vendor/llvm/dist/test/MC/ARM/xscale-attributes.ll vendor/llvm/dist/test/MC/AsmParser/exprs.s vendor/llvm/dist/test/MC/AsmParser/section.s vendor/llvm/dist/test/MC/AsmParser/section_names.s vendor/llvm/dist/test/MC/COFF/align-nops.s vendor/llvm/dist/test/MC/COFF/basic-coff.s vendor/llvm/dist/test/MC/COFF/bss.s vendor/llvm/dist/test/MC/COFF/diff.s vendor/llvm/dist/test/MC/COFF/module-asm.ll vendor/llvm/dist/test/MC/COFF/secrel32.s vendor/llvm/dist/test/MC/COFF/seh-section.s vendor/llvm/dist/test/MC/COFF/seh.s vendor/llvm/dist/test/MC/COFF/simple-fixups.s vendor/llvm/dist/test/MC/COFF/symbol-alias.s vendor/llvm/dist/test/MC/COFF/symbol-fragment-offset.s vendor/llvm/dist/test/MC/COFF/weak-symbol-section-specification.ll vendor/llvm/dist/test/MC/COFF/weak.s vendor/llvm/dist/test/MC/Disassembler/ARM/arm-tests.txt vendor/llvm/dist/test/MC/Disassembler/ARM/basic-arm-instructions.txt vendor/llvm/dist/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips32.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips32_le.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips32r2.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips32r2_le.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips64.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips64_le.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips64r2.txt vendor/llvm/dist/test/MC/Disassembler/Mips/mips64r2_le.txt vendor/llvm/dist/test/MC/Disassembler/X86/intel-syntax.txt vendor/llvm/dist/test/MC/Disassembler/X86/x86-64.txt vendor/llvm/dist/test/MC/Disassembler/XCore/xcore.txt vendor/llvm/dist/test/MC/ELF/abs.s vendor/llvm/dist/test/MC/ELF/alias-reloc.s vendor/llvm/dist/test/MC/ELF/alias.s vendor/llvm/dist/test/MC/ELF/align-bss.s vendor/llvm/dist/test/MC/ELF/align-nops.s vendor/llvm/dist/test/MC/ELF/align-size.s vendor/llvm/dist/test/MC/ELF/align-text.s vendor/llvm/dist/test/MC/ELF/align.s vendor/llvm/dist/test/MC/ELF/basic-elf-32.s vendor/llvm/dist/test/MC/ELF/basic-elf-64.s vendor/llvm/dist/test/MC/ELF/call-abs.s vendor/llvm/dist/test/MC/ELF/cfi-adjust-cfa-offset.s vendor/llvm/dist/test/MC/ELF/cfi-advance-loc2.s vendor/llvm/dist/test/MC/ELF/cfi-def-cfa-offset.s vendor/llvm/dist/test/MC/ELF/cfi-def-cfa-register.s vendor/llvm/dist/test/MC/ELF/cfi-def-cfa.s vendor/llvm/dist/test/MC/ELF/cfi-escape.s vendor/llvm/dist/test/MC/ELF/cfi-offset.s vendor/llvm/dist/test/MC/ELF/cfi-register.s vendor/llvm/dist/test/MC/ELF/cfi-rel-offset.s vendor/llvm/dist/test/MC/ELF/cfi-rel-offset2.s vendor/llvm/dist/test/MC/ELF/cfi-remember.s vendor/llvm/dist/test/MC/ELF/cfi-restore.s vendor/llvm/dist/test/MC/ELF/cfi-same-value.s vendor/llvm/dist/test/MC/ELF/cfi-sections.s vendor/llvm/dist/test/MC/ELF/cfi-signal-frame.s vendor/llvm/dist/test/MC/ELF/cfi-undefined.s vendor/llvm/dist/test/MC/ELF/cfi-zero-addr-delta.s vendor/llvm/dist/test/MC/ELF/cfi.s vendor/llvm/dist/test/MC/ELF/comdat.s vendor/llvm/dist/test/MC/ELF/common.s vendor/llvm/dist/test/MC/ELF/common2.s vendor/llvm/dist/test/MC/ELF/debug-line.s vendor/llvm/dist/test/MC/ELF/debug-loc.s vendor/llvm/dist/test/MC/ELF/diff.s vendor/llvm/dist/test/MC/ELF/empty-dwarf-lines.s vendor/llvm/dist/test/MC/ELF/empty.s vendor/llvm/dist/test/MC/ELF/entsize.ll vendor/llvm/dist/test/MC/ELF/entsize.s vendor/llvm/dist/test/MC/ELF/file.s vendor/llvm/dist/test/MC/ELF/gen-dwarf.s vendor/llvm/dist/test/MC/ELF/global-offset.s vendor/llvm/dist/test/MC/ELF/got.s vendor/llvm/dist/test/MC/ELF/ident.s vendor/llvm/dist/test/MC/ELF/lcomm.s vendor/llvm/dist/test/MC/ELF/leb128.s vendor/llvm/dist/test/MC/ELF/local-reloc.s vendor/llvm/dist/test/MC/ELF/merge.s vendor/llvm/dist/test/MC/ELF/n_bytes.s vendor/llvm/dist/test/MC/ELF/noexec.s vendor/llvm/dist/test/MC/ELF/norelocation.s vendor/llvm/dist/test/MC/ELF/org.s vendor/llvm/dist/test/MC/ELF/pic-diff.s vendor/llvm/dist/test/MC/ELF/plt.s vendor/llvm/dist/test/MC/ELF/pr9292.s vendor/llvm/dist/test/MC/ELF/relax-arith.s vendor/llvm/dist/test/MC/ELF/relax.s vendor/llvm/dist/test/MC/ELF/relocation-386.s vendor/llvm/dist/test/MC/ELF/relocation-pc.s vendor/llvm/dist/test/MC/ELF/relocation.s vendor/llvm/dist/test/MC/ELF/rename.s vendor/llvm/dist/test/MC/ELF/section.s vendor/llvm/dist/test/MC/ELF/set.s vendor/llvm/dist/test/MC/ELF/sleb.s vendor/llvm/dist/test/MC/ELF/symref.s vendor/llvm/dist/test/MC/ELF/tls-i386.s vendor/llvm/dist/test/MC/ELF/tls.s vendor/llvm/dist/test/MC/ELF/type.s vendor/llvm/dist/test/MC/ELF/uleb.s vendor/llvm/dist/test/MC/ELF/undef.s vendor/llvm/dist/test/MC/ELF/undef2.s vendor/llvm/dist/test/MC/ELF/version.s vendor/llvm/dist/test/MC/ELF/weak-relocation.s vendor/llvm/dist/test/MC/ELF/weak.s vendor/llvm/dist/test/MC/ELF/weakref-plt.s vendor/llvm/dist/test/MC/ELF/weakref-reloc.s vendor/llvm/dist/test/MC/ELF/weakref.s vendor/llvm/dist/test/MC/ELF/x86_64-reloc-sizetest.s vendor/llvm/dist/test/MC/ELF/zero.s vendor/llvm/dist/test/MC/Mips/elf-N64.ll vendor/llvm/dist/test/MC/Mips/elf-bigendian.ll vendor/llvm/dist/test/MC/Mips/elf-gprel-32-64.ll vendor/llvm/dist/test/MC/Mips/elf-reginfo.ll vendor/llvm/dist/test/MC/Mips/elf-relsym.ll vendor/llvm/dist/test/MC/Mips/elf-tls.ll vendor/llvm/dist/test/MC/Mips/elf_basic.s vendor/llvm/dist/test/MC/Mips/elf_eflags.ll vendor/llvm/dist/test/MC/Mips/elf_st_other.ll vendor/llvm/dist/test/MC/Mips/higher_highest.ll vendor/llvm/dist/test/MC/Mips/mips-alu-instructions.s vendor/llvm/dist/test/MC/Mips/mips-expansions.s vendor/llvm/dist/test/MC/Mips/mips-fpu-instructions.s vendor/llvm/dist/test/MC/Mips/mips-jump-instructions.s vendor/llvm/dist/test/MC/Mips/mips-memory-instructions.s vendor/llvm/dist/test/MC/Mips/mips-relocations.s vendor/llvm/dist/test/MC/Mips/mips64-alu-instructions.s vendor/llvm/dist/test/MC/Mips/mips_directives.s vendor/llvm/dist/test/MC/Mips/nabi-regs.s vendor/llvm/dist/test/MC/Mips/r-mips-got-disp.ll vendor/llvm/dist/test/MC/Mips/set-at-directive.s vendor/llvm/dist/test/MC/Mips/sym-offset.ll vendor/llvm/dist/test/MC/Mips/xgot.ll vendor/llvm/dist/test/MC/PowerPC/ppc64-initial-cfa.ll vendor/llvm/dist/test/MC/PowerPC/ppc64-relocs-01.ll vendor/llvm/dist/test/MC/PowerPC/ppc64-tls-relocs-01.ll vendor/llvm/dist/test/MC/X86/intel-syntax.s vendor/llvm/dist/test/MC/X86/x86-64.s vendor/llvm/dist/test/Makefile vendor/llvm/dist/test/Makefile.tests vendor/llvm/dist/test/Object/Inputs/COFF/i386.yaml vendor/llvm/dist/test/Object/Inputs/COFF/x86-64.yaml vendor/llvm/dist/test/Object/lit.local.cfg vendor/llvm/dist/test/Object/nm-trivial-object.test vendor/llvm/dist/test/Object/objdump-section-content.test vendor/llvm/dist/test/Object/yaml2obj-readobj.test vendor/llvm/dist/test/Transforms/BBVectorize/X86/loop1.ll vendor/llvm/dist/test/Transforms/BBVectorize/X86/simple.ll vendor/llvm/dist/test/Transforms/ConstantMerge/merge-both.ll vendor/llvm/dist/test/Transforms/DeadArgElim/dbginfo.ll vendor/llvm/dist/test/Transforms/DeadStoreElimination/2011-09-06-EndOfFunction.ll vendor/llvm/dist/test/Transforms/GCOVProfiling/linkagename.ll vendor/llvm/dist/test/Transforms/InstCombine/2012-05-27-Negative-Shift-Crash.ll vendor/llvm/dist/test/Transforms/InstCombine/and-fcmp.ll vendor/llvm/dist/test/Transforms/InstCombine/apint-shift-simplify.ll vendor/llvm/dist/test/Transforms/InstCombine/debuginfo.ll vendor/llvm/dist/test/Transforms/InstCombine/fprintf-1.ll vendor/llvm/dist/test/Transforms/InstCombine/icmp.ll vendor/llvm/dist/test/Transforms/InstCombine/load-cmp.ll vendor/llvm/dist/test/Transforms/InstCombine/objsize.ll vendor/llvm/dist/test/Transforms/InstCombine/or.ll vendor/llvm/dist/test/Transforms/InstCombine/select.ll vendor/llvm/dist/test/Transforms/InstCombine/sub-xor.ll vendor/llvm/dist/test/Transforms/InstCombine/vec_demanded_elts.ll vendor/llvm/dist/test/Transforms/InstCombine/vec_shuffle.ll vendor/llvm/dist/test/Transforms/InstSimplify/floating-point-arithmetic.ll vendor/llvm/dist/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll vendor/llvm/dist/test/Transforms/LoopRotate/simplifylatch.ll vendor/llvm/dist/test/Transforms/LoopStrengthReduce/2012-07-13-ExpandUDiv.ll vendor/llvm/dist/test/Transforms/LoopStrengthReduce/ARM/2012-06-15-lsr-noaddrmode.ll vendor/llvm/dist/test/Transforms/LoopUnroll/scevunroll.ll vendor/llvm/dist/test/Transforms/LoopUnroll/unloop.ll vendor/llvm/dist/test/Transforms/LoopUnswitch/2011-09-26-EHCrash.ll vendor/llvm/dist/test/Transforms/LoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll vendor/llvm/dist/test/Transforms/LoopVectorize/12-12-11-if-conv.ll vendor/llvm/dist/test/Transforms/LoopVectorize/2012-10-22-isconsec.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/constant-vector-operand.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/min-trip-count-switch.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/parallel-loops-after-reg2mem.ll vendor/llvm/dist/test/Transforms/LoopVectorize/X86/parallel-loops.ll vendor/llvm/dist/test/Transforms/LoopVectorize/bzip_reverse_loops.ll vendor/llvm/dist/test/Transforms/LoopVectorize/calloc.ll vendor/llvm/dist/test/Transforms/LoopVectorize/dbg.value.ll vendor/llvm/dist/test/Transforms/LoopVectorize/float-reduction.ll vendor/llvm/dist/test/Transforms/LoopVectorize/i8-induction.ll vendor/llvm/dist/test/Transforms/LoopVectorize/intrinsic.ll vendor/llvm/dist/test/Transforms/LoopVectorize/lcssa-crash.ll vendor/llvm/dist/test/Transforms/LoopVectorize/phi-hang.ll vendor/llvm/dist/test/Transforms/LoopVectorize/runtime-check.ll vendor/llvm/dist/test/Transforms/LoopVectorize/start-non-zero.ll vendor/llvm/dist/test/Transforms/LoopVectorize/struct_access.ll vendor/llvm/dist/test/Transforms/LoopVectorize/vectorize-once.ll vendor/llvm/dist/test/Transforms/MergeFunc/vector.ll vendor/llvm/dist/test/Transforms/ObjCARC/apelim.ll vendor/llvm/dist/test/Transforms/ObjCARC/arc-annotations.ll vendor/llvm/dist/test/Transforms/ObjCARC/basic.ll vendor/llvm/dist/test/Transforms/ObjCARC/cfg-hazards.ll vendor/llvm/dist/test/Transforms/ObjCARC/contract-marker.ll vendor/llvm/dist/test/Transforms/ObjCARC/contract-storestrong.ll vendor/llvm/dist/test/Transforms/ObjCARC/contract-testcases.ll vendor/llvm/dist/test/Transforms/ObjCARC/contract.ll vendor/llvm/dist/test/Transforms/ObjCARC/expand.ll vendor/llvm/dist/test/Transforms/ObjCARC/gvn.ll vendor/llvm/dist/test/Transforms/ObjCARC/intrinsic-use.ll vendor/llvm/dist/test/Transforms/ObjCARC/invoke.ll vendor/llvm/dist/test/Transforms/ObjCARC/move-and-merge-autorelease.ll vendor/llvm/dist/test/Transforms/ObjCARC/retain-block-escape-analysis.ll vendor/llvm/dist/test/Transforms/ObjCARC/rv.ll vendor/llvm/dist/test/Transforms/ObjCARC/tail-call-invariant-enforcement.ll vendor/llvm/dist/test/Transforms/Reassociate/pr12245.ll vendor/llvm/dist/test/Transforms/Reassociate/xor_reassoc.ll vendor/llvm/dist/test/Transforms/SROA/basictest.ll vendor/llvm/dist/test/Transforms/SROA/vector-promotion.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch-dbg.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll vendor/llvm/dist/test/Transforms/SimplifyCFG/switch-to-icmp.ll vendor/llvm/dist/test/Verifier/2002-04-13-RetTypes.ll vendor/llvm/dist/test/Verifier/2002-11-05-GetelementptrPointers.ll vendor/llvm/dist/test/Verifier/2006-07-11-StoreStruct.ll vendor/llvm/dist/test/Verifier/2006-10-15-AddrLabel.ll vendor/llvm/dist/test/Verifier/2006-12-12-IntrinsicDefine.ll vendor/llvm/dist/test/Verifier/2008-03-01-AllocaSized.ll vendor/llvm/dist/test/Verifier/2008-08-22-MemCpyAlignment.ll vendor/llvm/dist/test/Verifier/2008-11-15-RetVoid.ll vendor/llvm/dist/test/Verifier/2010-08-07-PointerIntrinsic.ll vendor/llvm/dist/test/Verifier/AmbiguousPhi.ll vendor/llvm/dist/test/Verifier/PhiGrouping.ll vendor/llvm/dist/test/Verifier/SelfReferential.ll vendor/llvm/dist/test/Verifier/aliasing-chain.ll vendor/llvm/dist/test/lit.cfg vendor/llvm/dist/test/lit.site.cfg.in vendor/llvm/dist/test/tools/llvm-readobj/relocations.test vendor/llvm/dist/test/tools/llvm-readobj/sections-ext.test vendor/llvm/dist/test/tools/llvm-readobj/sections.test vendor/llvm/dist/tools/CMakeLists.txt vendor/llvm/dist/tools/Makefile vendor/llvm/dist/tools/bugpoint/BugDriver.cpp vendor/llvm/dist/tools/llc/llc.cpp vendor/llvm/dist/tools/llvm-as/llvm-as.cpp vendor/llvm/dist/tools/llvm-dis/llvm-dis.cpp vendor/llvm/dist/tools/llvm-extract/llvm-extract.cpp vendor/llvm/dist/tools/llvm-link/llvm-link.cpp vendor/llvm/dist/tools/llvm-mc/llvm-mc.cpp vendor/llvm/dist/tools/llvm-objdump/MachODump.cpp vendor/llvm/dist/tools/llvm-objdump/llvm-objdump.cpp vendor/llvm/dist/tools/llvm-ranlib/llvm-ranlib.cpp vendor/llvm/dist/tools/llvm-readobj/COFFDumper.cpp vendor/llvm/dist/tools/llvm-readobj/ELFDumper.cpp vendor/llvm/dist/tools/llvm-readobj/MachODumper.cpp vendor/llvm/dist/tools/llvm-readobj/ObjDumper.h vendor/llvm/dist/tools/llvm-readobj/llvm-readobj.cpp vendor/llvm/dist/tools/llvm-readobj/llvm-readobj.h vendor/llvm/dist/tools/llvm-rtdyld/llvm-rtdyld.cpp vendor/llvm/dist/tools/lto/LTOCodeGenerator.cpp vendor/llvm/dist/tools/lto/LTOCodeGenerator.h vendor/llvm/dist/tools/lto/LTOModule.cpp vendor/llvm/dist/tools/macho-dump/macho-dump.cpp vendor/llvm/dist/tools/obj2yaml/coff2yaml.cpp vendor/llvm/dist/tools/obj2yaml/obj2yaml.cpp vendor/llvm/dist/tools/obj2yaml/obj2yaml.h vendor/llvm/dist/tools/opt/opt.cpp vendor/llvm/dist/unittests/CMakeLists.txt vendor/llvm/dist/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp vendor/llvm/dist/unittests/ExecutionEngine/JIT/JITTest.cpp vendor/llvm/dist/unittests/ExecutionEngine/JIT/MultiJITTest.cpp vendor/llvm/dist/unittests/ExecutionEngine/MCJIT/CMakeLists.txt vendor/llvm/dist/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h vendor/llvm/dist/unittests/ExecutionEngine/Makefile vendor/llvm/dist/unittests/IR/CMakeLists.txt vendor/llvm/dist/unittests/Makefile vendor/llvm/dist/unittests/Support/CMakeLists.txt vendor/llvm/dist/unittests/Support/CommandLineTest.cpp vendor/llvm/dist/unittests/Support/Path.cpp vendor/llvm/dist/unittests/Transforms/Utils/Cloning.cpp vendor/llvm/dist/utils/FileCheck/FileCheck.cpp vendor/llvm/dist/utils/Makefile vendor/llvm/dist/utils/TableGen/AsmMatcherEmitter.cpp vendor/llvm/dist/utils/TableGen/CodeGenSchedule.cpp vendor/llvm/dist/utils/TableGen/CodeGenSchedule.h vendor/llvm/dist/utils/TableGen/SubtargetEmitter.cpp vendor/llvm/dist/utils/TableGen/X86RecognizableInstr.cpp vendor/llvm/dist/utils/lit/lit/discovery.py vendor/llvm/dist/utils/lit/lit/main.py vendor/llvm/dist/utils/lit/tests/Inputs/discovery/lit.cfg vendor/llvm/dist/utils/lit/tests/discovery.py vendor/llvm/dist/utils/release/tag.sh vendor/llvm/dist/utils/release/test-release.sh vendor/llvm/dist/utils/unittest/UnitTestMain/TestMain.cpp Modified: vendor/llvm/dist/CMakeLists.txt ============================================================================== --- vendor/llvm/dist/CMakeLists.txt Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/CMakeLists.txt Mon Jun 10 20:36:52 2013 (r251607) @@ -84,20 +84,16 @@ set(LLVM_ALL_TARGETS NVPTX PowerPC Sparc + SystemZ X86 XCore ) # List of targets with JIT support: -set(LLVM_TARGETS_WITH_JIT X86 PowerPC ARM Mips) +set(LLVM_TARGETS_WITH_JIT X86 PowerPC ARM Mips SystemZ) -if( MSVC ) - set(LLVM_TARGETS_TO_BUILD X86 - CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") -else( MSVC ) - set(LLVM_TARGETS_TO_BUILD "all" +set(LLVM_TARGETS_TO_BUILD "all" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") -endif( MSVC ) set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "" CACHE STRING "Semicolon-separated list of experimental targets to build.") @@ -129,6 +125,8 @@ set(LLVM_TARGET_ARCH "host" option(LLVM_ENABLE_THREADS "Use threads if available." ON) +option(LLVM_ENABLE_ZLIB "Use zlib for compression/decompression if available." ON) + if( LLVM_TARGETS_TO_BUILD STREQUAL "all" ) set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} ) endif() @@ -419,7 +417,6 @@ add_subdirectory(utils/count) add_subdirectory(utils/not) add_subdirectory(utils/llvm-lit) add_subdirectory(utils/yaml-bench) -add_subdirectory(utils/yaml2obj) add_subdirectory(projects) Modified: vendor/llvm/dist/CODE_OWNERS.TXT ============================================================================== --- vendor/llvm/dist/CODE_OWNERS.TXT Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/CODE_OWNERS.TXT Mon Jun 10 20:36:52 2013 (r251607) @@ -23,7 +23,7 @@ D: Gold plugin (tools/gold/*) N: Chandler Carruth E: chandlerc@gmail.com E: chandlerc@google.com -D: Config, ADT, Support, inlining & related passse, SROA/mem2reg & related passes, CMake, library layering +D: Config, ADT, Support, inlining & related passes, SROA/mem2reg & related passes, CMake, library layering N: Evan Cheng E: evan.cheng@apple.com @@ -109,6 +109,10 @@ N: Nadav Rotem E: nrotem@apple.com D: X86 Backend, Loop Vectorizer +N: Richard Sandiford +E: rsandifo@linux.vnet.ibm.com +D: SystemZ Backend + N: Duncan Sands E: baldrick@free.fr D: DragonEgg @@ -128,4 +132,4 @@ D: IndVar Simplify, Loop Strength Reduct N: Bill Wendling E: wendling@apple.com -D: libLTO & IR Linker +D: libLTO, IR Linker Modified: vendor/llvm/dist/CREDITS.TXT ============================================================================== --- vendor/llvm/dist/CREDITS.TXT Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/CREDITS.TXT Mon Jun 10 20:36:52 2013 (r251607) @@ -251,6 +251,12 @@ D: The initial llvm-ar tool, converted r D: Modulo scheduling in the SparcV9 backend D: Release manager (1.7+) +N: Sylvestre Ledru +E: sylvestre@debian.org +W: http://sylvesre.ledru.info/ +D: Debian and Ubuntu packaging +D: Continous integration with jenkins + N: Andrew Lenharth E: alenhar2@cs.uiuc.edu W: http://www.lenharth.org/~andrewl/ @@ -423,6 +429,7 @@ D: Thread Local Storage implementation N: Bill Wendling E: wendling@apple.com +D: Release manager D: Bunches of stuff N: Bob Wilson Modified: vendor/llvm/dist/Makefile.config.in ============================================================================== --- vendor/llvm/dist/Makefile.config.in Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/Makefile.config.in Mon Jun 10 20:36:52 2013 (r251607) @@ -302,6 +302,9 @@ ENABLE_DOXYGEN = @ENABLE_DOXYGEN@ # Do we want to enable threads? ENABLE_THREADS := @LLVM_ENABLE_THREADS@ +# Do we want to enable zlib? +ENABLE_ZLIB := @LLVM_ENABLE_ZLIB@ + # Do we want to build with position independent code? ENABLE_PIC := @ENABLE_PIC@ Modified: vendor/llvm/dist/Makefile.rules ============================================================================== --- vendor/llvm/dist/Makefile.rules Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/Makefile.rules Mon Jun 10 20:36:52 2013 (r251607) @@ -1515,6 +1515,8 @@ $(ToolBuildPath): $(ToolDir)/.dir endif ifdef CODESIGN_TOOLS +TOOL_CODESIGN_IDENTITY ?= - + $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ @@ -1522,7 +1524,7 @@ $(ToolBuildPath): $(ObjectsO) $(ProjLibs $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \ $(StripWarnMsg) $(Echo) ======= Code-Signing $(BuildMode) Executable $(TOOLNAME) - $(Verb) codesign -s - $@ + $(Verb) codesign -s $(TOOL_CODESIGN_IDENTITY) $@ else $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) @@ -1967,7 +1969,7 @@ endif # CHECK: Running the test suite ############################################################################### -check:: +check:: all $(Verb) if test -d "$(PROJ_OBJ_ROOT)/test" ; then \ if test -f "$(PROJ_OBJ_ROOT)/test/Makefile" ; then \ $(EchoCmd) Running test suite ; \ Modified: vendor/llvm/dist/README.txt ============================================================================== --- vendor/llvm/dist/README.txt Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/README.txt Mon Jun 10 20:36:52 2013 (r251607) @@ -15,3 +15,4 @@ documentation setup. If you're writing a package for LLVM, see docs/Packaging.rst for our suggestions. + Modified: vendor/llvm/dist/autoconf/configure.ac ============================================================================== --- vendor/llvm/dist/autoconf/configure.ac Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/autoconf/configure.ac Mon Jun 10 20:36:52 2013 (r251607) @@ -31,7 +31,7 @@ dnl=== dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl address for reporting bugs. -AC_INIT([LLVM],[3.3svn],[http://llvm.org/bugs/]) +AC_INIT([LLVM],[3.3],[http://llvm.org/bugs/]) AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) AC_DEFINE([LLVM_VERSION_MINOR], [3], [Minor version of the LLVM API]) @@ -402,6 +402,7 @@ AC_CACHE_CHECK([target architecture],[ll hexagon-*) llvm_cv_target_arch="Hexagon" ;; mblaze-*) llvm_cv_target_arch="MBlaze" ;; nvptx-*) llvm_cv_target_arch="NVPTX" ;; + s390x-*) llvm_cv_target_arch="SystemZ" ;; *) llvm_cv_target_arch="Unknown" ;; esac]) @@ -435,6 +436,7 @@ case $host in msp430-*) host_arch="MSP430" ;; hexagon-*) host_arch="Hexagon" ;; mblaze-*) host_arch="MBlaze" ;; + s390x-*) host_arch="SystemZ" ;; *) host_arch="Unknown" ;; esac @@ -654,6 +656,7 @@ else Hexagon) AC_SUBST(TARGET_HAS_JIT,0) ;; MBlaze) AC_SUBST(TARGET_HAS_JIT,0) ;; NVPTX) AC_SUBST(TARGET_HAS_JIT,0) ;; + SystemZ) AC_SUBST(TARGET_HAS_JIT,1) ;; *) AC_SUBST(TARGET_HAS_JIT,0) ;; esac fi @@ -708,6 +711,21 @@ case "$enableval" in *) AC_MSG_ERROR([Invalid setting for --enable-pthreads. Use "yes" or "no"]) ;; esac +dnl Allow disablement of zlib +AC_ARG_ENABLE(zlib, + AS_HELP_STRING([--enable-zlib], + [Use zlib for compression/decompression if + available (default is YES)]),, + enableval=default) +case "$enableval" in + yes) AC_SUBST(LLVM_ENABLE_ZLIB,[1]) ;; + no) AC_SUBST(LLVM_ENABLE_ZLIB,[0]) ;; + default) AC_SUBST(LLVM_ENABLE_ZLIB,[1]) ;; + *) AC_MSG_ERROR([Invalid setting for --enable-zlib. Use "yes" or "no"]) ;; +esac +AC_DEFINE_UNQUOTED([LLVM_ENABLE_ZLIB],$LLVM_ENABLE_ZLIB, + [Define if zlib is enabled]) + dnl Allow building without position independent code AC_ARG_ENABLE(pic, AS_HELP_STRING([--enable-pic], @@ -780,13 +798,13 @@ TARGETS_TO_BUILD="" AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets], [Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, aarch64, mips, hexagon, - xcore, msp430, nvptx, and cpp (default=all)]),, + xcore, msp430, nvptx, systemz, and cpp (default=all)]),, enableval=all) if test "$enableval" = host-only ; then enableval=host fi case "$enableval" in - all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend MBlaze NVPTX Hexagon" ;; + all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend MBlaze NVPTX Hexagon SystemZ" ;; *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do case "$a_target" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; @@ -805,11 +823,13 @@ case "$enableval" in hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; Sparc) TARGETS_TO_BUILD="Sparc $TARGETS_TO_BUILD" ;; PowerPC) TARGETS_TO_BUILD="PowerPC $TARGETS_TO_BUILD" ;; + AArch64) TARGETS_TO_BUILD="AArch64 $TARGETS_TO_BUILD" ;; ARM) TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;; Mips) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; MBlaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; @@ -817,6 +837,7 @@ case "$enableval" in MSP430) TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;; Hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; NVPTX) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + SystemZ) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; *) AC_MSG_ERROR([Can not set target to build]) ;; esac ;; *) AC_MSG_ERROR([Unrecognized target $a_target]) ;; @@ -1367,6 +1388,11 @@ if test "$LLVM_ENABLE_THREADS" -eq 1 && [Have pthread_getspecific])) fi +dnl zlib is optional; used for compression/uncompression +if test "$LLVM_ENABLE_ZLIB" -eq 1 ; then + AC_CHECK_LIB(z, compress2) +fi + dnl Allow extra x86-disassembler library AC_ARG_WITH(udis86, AS_HELP_STRING([--with-udis86=], @@ -1486,6 +1512,9 @@ AC_HEADER_STAT AC_HEADER_SYS_WAIT AC_HEADER_TIME +AC_LANG_PUSH([C++]) +AC_CHECK_HEADERS([cxxabi.h]) +AC_LANG_POP([C++]) AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h]) AC_CHECK_HEADERS([malloc.h setjmp.h signal.h stdint.h termios.h unistd.h]) AC_CHECK_HEADERS([utime.h windows.h]) @@ -1501,6 +1530,13 @@ if test "$LLVM_ENABLE_THREADS" -eq 1 && else AC_SUBST(HAVE_PTHREAD, 0) fi +if test "$LLVM_ENABLE_ZLIB" -eq 1 ; then + AC_CHECK_HEADERS(zlib.h, + AC_SUBST(HAVE_LIBZ, 1), + AC_SUBST(HAVE_LIBZ, 0)) +else + AC_SUBST(HAVE_LIBZ, 0) +fi dnl Try to find ffi.h. if test "$llvm_cv_enable_libffi" = "yes" ; then @@ -1746,7 +1782,7 @@ AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_M [Installation directory for man pages]) AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", [Time at which LLVM was configured]) -AC_DEFINE_UNQUOTED(LLVM_HOSTTRIPLE, "$host", +AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host", [Host triple LLVM will be executed on]) AC_DEFINE_UNQUOTED(LLVM_DEFAULT_TARGET_TRIPLE, "$target", [Target triple LLVM will generate code for by default]) Modified: vendor/llvm/dist/cmake/config-ix.cmake ============================================================================== --- vendor/llvm/dist/cmake/config-ix.cmake Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/cmake/config-ix.cmake Mon Jun 10 20:36:52 2013 (r251607) @@ -4,6 +4,7 @@ if( WIN32 AND NOT CYGWIN ) endif() include(CheckIncludeFile) +include(CheckIncludeFileCXX) include(CheckLibraryExists) include(CheckSymbolExists) include(CheckFunctionExists) @@ -37,6 +38,7 @@ endfunction() check_include_file(argz.h HAVE_ARGZ_H) check_include_file(assert.h HAVE_ASSERT_H) check_include_file(ctype.h HAVE_CTYPE_H) +check_include_file_cxx(cxxabi.h HAVE_CXXABI_H) check_include_file(dirent.h HAVE_DIRENT_H) check_include_file(dl.h HAVE_DL_H) check_include_file(dld.h HAVE_DLD_H) @@ -79,6 +81,7 @@ check_include_file(unistd.h HAVE_UNISTD_ check_include_file(utime.h HAVE_UTIME_H) check_include_file(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) check_include_file(windows.h HAVE_WINDOWS_H) +check_include_file(zlib.h HAVE_ZLIB_H) check_include_file(fenv.h HAVE_FENV_H) check_symbol_exists(FE_ALL_EXCEPT "fenv.h" HAVE_DECL_FE_ALL_EXCEPT) check_symbol_exists(FE_INEXACT "fenv.h" HAVE_DECL_FE_INEXACT) @@ -104,6 +107,11 @@ if( NOT PURE_WINDOWS ) endif() check_library_exists(dl dlopen "" HAVE_LIBDL) check_library_exists(rt clock_gettime "" HAVE_LIBRT) + if (LLVM_ENABLE_ZLIB) + check_library_exists(z compress2 "" HAVE_LIBZ) + else() + set(HAVE_LIBZ 0) + endif() endif() # function checks @@ -332,12 +340,13 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif() endif() -include(GetHostTriple) -get_host_triple(LLVM_HOST_TRIPLE) - # By default, we target the host, but this can be overridden at CMake # invocation time. -set(LLVM_HOSTTRIPLE "${LLVM_HOST_TRIPLE}") +include(GetHostTriple) +get_host_triple(LLVM_INFERRED_HOST_TRIPLE) + +set(LLVM_HOST_TRIPLE "${LLVM_INFERRED_HOST_TRIPLE}" CACHE STRING + "Host on which LLVM binaries will run") # Determine the native architecture. string(TOLOWER "${LLVM_TARGET_ARCH}" LLVM_NATIVE_ARCH) @@ -357,6 +366,8 @@ elseif (LLVM_NATIVE_ARCH MATCHES "sparc" set(LLVM_NATIVE_ARCH Sparc) elseif (LLVM_NATIVE_ARCH MATCHES "powerpc") set(LLVM_NATIVE_ARCH PowerPC) +elseif (LLVM_NATIVE_ARCH MATCHES "aarch64") + set(LLVM_NATIVE_ARCH AArch64) elseif (LLVM_NATIVE_ARCH MATCHES "arm") set(LLVM_NATIVE_ARCH ARM) elseif (LLVM_NATIVE_ARCH MATCHES "mips") @@ -367,6 +378,8 @@ elseif (LLVM_NATIVE_ARCH MATCHES "msp430 set(LLVM_NATIVE_ARCH MSP430) elseif (LLVM_NATIVE_ARCH MATCHES "hexagon") set(LLVM_NATIVE_ARCH Hexagon) +elseif (LLVM_NATIVE_ARCH MATCHES "s390x") + set(LLVM_NATIVE_ARCH SystemZ) else () message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}") endif () @@ -450,4 +463,11 @@ else( LLVM_ENABLE_THREADS ) message(STATUS "Threads disabled.") endif() +if (LLVM_ENABLE_ZLIB ) + # Check if zlib is available in the system. + if ( NOT HAVE_ZLIB_H OR NOT HAVE_LIBZ ) + set(LLVM_ENABLE_ZLIB 0) + endif() +endif() + set(LLVM_PREFIX ${CMAKE_INSTALL_PREFIX}) Modified: vendor/llvm/dist/cmake/modules/HandleLLVMOptions.cmake ============================================================================== --- vendor/llvm/dist/cmake/modules/HandleLLVMOptions.cmake Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/cmake/modules/HandleLLVMOptions.cmake Mon Jun 10 20:36:52 2013 (r251607) @@ -21,6 +21,9 @@ if( LLVM_ENABLE_ASSERTIONS ) # explicitly undefine it: if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) add_definitions( -UNDEBUG ) + # Also remove /D NDEBUG to avoid MSVC warnings about conflicting defines. + string (REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " + CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") endif() else() if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) @@ -249,8 +252,6 @@ if(LLVM_USE_SANITIZER) elseif (LLVM_USE_SANITIZER MATCHES "Memory(WithOrigins)?") append_common_sanitizer_flags() add_flag_or_print_warning("-fsanitize=memory") - # -pie is required for MSan. - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") if(LLVM_USE_SANITIZER STREQUAL "MemoryWithOrigins") add_flag_or_print_warning("-fsanitize-memory-track-origins") endif() Modified: vendor/llvm/dist/cmake/modules/LLVM-Config.cmake ============================================================================== --- vendor/llvm/dist/cmake/modules/LLVM-Config.cmake Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/cmake/modules/LLVM-Config.cmake Mon Jun 10 20:36:52 2013 (r251607) @@ -13,6 +13,9 @@ function(get_system_libs return_var) if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD ) set(system_libs ${system_libs} pthread) endif() + if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ ) + set(system_libs ${system_libs} z) + endif() endif( MINGW ) endif( NOT MSVC ) set(${return_var} ${system_libs} PARENT_SCOPE) Modified: vendor/llvm/dist/cmake/modules/LLVMConfig.cmake.in ============================================================================== --- vendor/llvm/dist/cmake/modules/LLVMConfig.cmake.in Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/cmake/modules/LLVMConfig.cmake.in Mon Jun 10 20:36:52 2013 (r251607) @@ -22,12 +22,15 @@ set(LLVM_TOOLS_BINARY_DIR @LLVM_TOOLS_BI set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@) +set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@) + set(LLVM_NATIVE_ARCH @LLVM_NATIVE_ARCH@) set(LLVM_ENABLE_PIC @LLVM_ENABLE_PIC@) set(HAVE_LIBDL @HAVE_LIBDL@) set(HAVE_LIBPTHREAD @HAVE_LIBPTHREAD@) +set(HAVE_LIBZ @HAVE_LIBZ@) set(LLVM_ON_UNIX @LLVM_ON_UNIX@) set(LLVM_ON_WIN32 @LLVM_ON_WIN32@) Modified: vendor/llvm/dist/configure ============================================================================== --- vendor/llvm/dist/configure Mon Jun 10 20:10:34 2013 (r251606) +++ vendor/llvm/dist/configure Mon Jun 10 20:36:52 2013 (r251607) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for LLVM 3.3svn. +# Generated by GNU Autoconf 2.60 for LLVM 3.3. # # Report bugs to . # @@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='LLVM' PACKAGE_TARNAME='llvm' -PACKAGE_VERSION='3.3svn' -PACKAGE_STRING='LLVM 3.3svn' +PACKAGE_VERSION='3.3' +PACKAGE_STRING='LLVM 3.3' PACKAGE_BUGREPORT='http://llvm.org/bugs/' ac_unique_file="lib/IR/Module.cpp" @@ -703,6 +703,7 @@ ENABLE_DOCS ENABLE_DOXYGEN LLVM_ENABLE_THREADS ENABLE_PTHREADS +LLVM_ENABLE_ZLIB ENABLE_PIC ENABLE_SHARED ENABLE_EMBED_STDCXX @@ -776,7 +777,9 @@ USE_INTEL_JITEVENTS XML2CONFIG LIBXML2_LIBS LIBXML2_INC +CXXCPP HAVE_PTHREAD +HAVE_LIBZ HUGE_VAL_SANITY MMAP_FILE SHLIBEXT @@ -811,7 +814,8 @@ CPPFLAGS CXX CXXFLAGS CCC -CPP' +CPP +CXXCPP' ac_subdirs_all='projects/llvm-gcc projects/test-suite projects/llvm-test @@ -1327,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LLVM 3.3svn to adapt to many kinds of systems. +\`configure' configures LLVM 3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LLVM 3.3svn:";; + short | recursive ) echo "Configuration of LLVM 3.3:";; esac cat <<\_ACEOF @@ -1426,6 +1430,8 @@ Optional Features: --enable-doxygen Build doxygen documentation (default is NO) --enable-threads Use threads if available (default is YES) --enable-pthreads Use pthreads if available (default is YES) + --enable-zlib Use zlib for compression/decompression if available + (default is YES) --enable-pic Build LLVM with Position Independent Code (default is YES) --enable-shared Build a shared library and link tools against it @@ -1439,7 +1445,7 @@ Optional Features: --enable-targets Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, aarch64, mips, hexagon, - xcore, msp430, nvptx, and cpp (default=all) + xcore, msp430, nvptx, systemz, and cpp (default=all) --enable-experimental-targets Build experimental host targets: disable or target1,target2,... (default=disable) @@ -1487,6 +1493,7 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor + CXXCPP C++ preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1552,7 +1559,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LLVM configure 3.3svn +LLVM configure 3.3 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1568,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LLVM $as_me 3.3svn, which was +It was created by LLVM $as_me 3.3, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -4019,6 +4026,7 @@ else hexagon-*) llvm_cv_target_arch="Hexagon" ;; mblaze-*) llvm_cv_target_arch="MBlaze" ;; nvptx-*) llvm_cv_target_arch="NVPTX" ;; + s390x-*) llvm_cv_target_arch="SystemZ" ;; *) llvm_cv_target_arch="Unknown" ;; esac fi @@ -4052,6 +4060,7 @@ case $host in msp430-*) host_arch="MSP430" ;; hexagon-*) host_arch="Hexagon" ;; mblaze-*) host_arch="MBlaze" ;; + s390x-*) host_arch="SystemZ" ;; *) host_arch="Unknown" ;; esac @@ -5392,6 +5401,8 @@ else ;; NVPTX) TARGET_HAS_JIT=0 ;; + SystemZ) TARGET_HAS_JIT=1 + ;; *) TARGET_HAS_JIT=0 ;; esac @@ -5478,6 +5489,30 @@ echo "$as_me: error: Invalid setting for { (exit 1); exit 1; }; } ;; esac +# Check whether --enable-zlib was given. +if test "${enable_zlib+set}" = set; then + enableval=$enable_zlib; +else + enableval=default +fi + +case "$enableval" in + yes) LLVM_ENABLE_ZLIB=1 + ;; + no) LLVM_ENABLE_ZLIB=0 + ;; + default) LLVM_ENABLE_ZLIB=1 + ;; + *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-zlib. Use \"yes\" or \"no\"" >&5 +echo "$as_me: error: Invalid setting for --enable-zlib. Use \"yes\" or \"no\"" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +cat >>confdefs.h <<_ACEOF +#define LLVM_ENABLE_ZLIB $LLVM_ENABLE_ZLIB +_ACEOF + + # Check whether --enable-pic was given. if test "${enable_pic+set}" = set; then enableval=$enable_pic; @@ -5601,7 +5636,7 @@ if test "$enableval" = host-only ; then enableval=host fi case "$enableval" in - all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend MBlaze NVPTX Hexagon" ;; + all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend MBlaze NVPTX Hexagon SystemZ" ;; *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do case "$a_target" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; @@ -5620,11 +5655,13 @@ case "$enableval" in hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; Sparc) TARGETS_TO_BUILD="Sparc $TARGETS_TO_BUILD" ;; PowerPC) TARGETS_TO_BUILD="PowerPC $TARGETS_TO_BUILD" ;; + AArch64) TARGETS_TO_BUILD="AArch64 $TARGETS_TO_BUILD" ;; ARM) TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;; Mips) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; MBlaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; @@ -5632,6 +5669,7 @@ case "$enableval" in MSP430) TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;; Hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; NVPTX) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + SystemZ) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; *) { { echo "$as_me:$LINENO: error: Can not set target to build" >&5 echo "$as_me: error: Can not set target to build" >&2;} { (exit 1); exit 1; }; } ;; @@ -10497,7 +10535,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; } +if test "${ac_cv_lib_z_compress2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char compress2 (); +int +main () +{ +return compress2 (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_z_compress2=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_z_compress2=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5 +echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6; } +if test $ac_cv_lib_z_compress2 = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBS="-lz $LIBS" + +fi + +fi + # Check whether --with-udis86 was given. if test "${with_udis86+set}" = set; then @@ -14743,93 +14871,91 @@ _ACEOF fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - - -for ac_header in dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + # Broken: fails on valid input. +continue fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.err conftest.$ac_ext -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -14845,8 +14971,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -14854,64 +14980,502 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + # Passes both tests. +ac_preproc_ok=: +break fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to http://llvm.org/bugs/ ## -## ------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 20:37:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 574C3BE1; Mon, 10 Jun 2013 20:37:57 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2FBAE1037; Mon, 10 Jun 2013 20:37:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AKbvEd021808; Mon, 10 Jun 2013 20:37:57 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AKbvBE021807; Mon, 10 Jun 2013 20:37:57 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201306102037.r5AKbvBE021807@svn.freebsd.org> From: Dimitry Andric Date: Mon, 10 Jun 2013 20:37:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r251608 - vendor/llvm/llvm-release_33-r183502 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 20:37:57 -0000 Author: dim Date: Mon Jun 10 20:37:56 2013 New Revision: 251608 URL: http://svnweb.freebsd.org/changeset/base/251608 Log: Tag llvm tags/RELEASE_33/final r183502 (effectively, 3.3 release). Added: vendor/llvm/llvm-release_33-r183502/ - copied from r251607, vendor/llvm/dist/ From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 20:45:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AAEACFA4; Mon, 10 Jun 2013 20:45:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9A1F210AF; Mon, 10 Jun 2013 20:45:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AKjGcR024500; Mon, 10 Jun 2013 20:45:16 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AKjDLp024479; Mon, 10 Jun 2013 20:45:13 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201306102045.r5AKjDLp024479@svn.freebsd.org> From: Dimitry Andric Date: Mon, 10 Jun 2013 20:45:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r251609 - in vendor/clang/dist: . bindings/python/clang bindings/python/tests/cindex docs docs/tools include/clang-c include/clang/AST include/clang/ASTMatchers include/clang/Basic incl... X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 20:45:16 -0000 Author: dim Date: Mon Jun 10 20:45:12 2013 New Revision: 251609 URL: http://svnweb.freebsd.org/changeset/base/251609 Log: Vendor import of clang tags/RELEASE_33/final r183502 (effectively, 3.3 release): http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_33/final@183502 Added: vendor/clang/dist/include/clang/Basic/BuiltinsAArch64.def vendor/clang/dist/include/clang/Basic/CapturedStmt.h vendor/clang/dist/include/clang/Lex/MacroArgs.h vendor/clang/dist/lib/Format/BreakableToken.cpp vendor/clang/dist/lib/Format/BreakableToken.h vendor/clang/dist/lib/Format/WhitespaceManager.cpp vendor/clang/dist/lib/Format/WhitespaceManager.h vendor/clang/dist/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.h vendor/clang/dist/test/Analysis/MismatchedDeallocator-checker-test.mm vendor/clang/dist/test/Analysis/MismatchedDeallocator-path-notes.cpp vendor/clang/dist/test/Analysis/bool-assignment.c vendor/clang/dist/test/Analysis/conditional-operator.cpp vendor/clang/dist/test/Analysis/enum.cpp vendor/clang/dist/test/Analysis/inlining/false-positive-suppression.m vendor/clang/dist/test/Analysis/objc-string.mm vendor/clang/dist/test/CXX/dcl.dcl/dcl.link/p7-2.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p3-1y.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p6-1y.cpp vendor/clang/dist/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p7.cpp vendor/clang/dist/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp vendor/clang/dist/test/CodeGen/arm-asm-diag.c vendor/clang/dist/test/CodeGen/builtins-aarch64.c vendor/clang/dist/test/CodeGen/linetable-endscope.c vendor/clang/dist/test/CodeGen/linux-arm-atomic.c vendor/clang/dist/test/CodeGen/mips-inline-asm-modifiers.c vendor/clang/dist/test/CodeGen/sparc-target-data.c vendor/clang/dist/test/CodeGen/systemz-inline-asm.c vendor/clang/dist/test/CodeGen/tbaa-class.cpp vendor/clang/dist/test/CodeGenCXX/cxx11-thread-local-reference.cpp vendor/clang/dist/test/CodeGenCXX/cxx11-thread-local.cpp vendor/clang/dist/test/CodeGenCXX/cxx1y-initializer-aggregate.cpp vendor/clang/dist/test/CodeGenCXX/linetable-cleanup.cpp vendor/clang/dist/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp vendor/clang/dist/test/CodeGenCXX/pr15753.cpp vendor/clang/dist/test/CodeGenCXX/scoped-enums-debug-info.cpp vendor/clang/dist/test/CodeGenCXX/tls-init-funcs.cpp vendor/clang/dist/test/CodeGenObjC/arc-linetable.m vendor/clang/dist/test/CodeGenObjC/objc-fixed-enum.m vendor/clang/dist/test/CodeGenObjC/tentative-cfconstantstring.m vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/lib/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/lib/.keep vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/gcc/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/ vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/crtbegin.o vendor/clang/dist/test/Driver/Inputs/fedora_18_tree/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/bin/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/bin/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/64/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/64/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/64/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/64/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/el/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/el/64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/micromips/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/mips16/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/el/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include-fixed/soft-float/el/64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/include/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/micromips/soft-float/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/mips16/soft-float/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/64/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/64/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/crtbegin.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/lib/gcc/mips-linux-gnu/4.6.3/soft-float/el/crtend.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/include/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/include/c++/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/include/c++/4.6.3/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/include/c++/4.6.3/mips-linux-gnu/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/include/c++/4.6.3/mips-linux-gnu/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/micromips/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/mips16/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/lib64/soft-float/el/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/lib64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib64/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib64/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/el/usr/lib64/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/lib64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/soft-float/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/micromips/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/soft-float/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/mips16/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/lib64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib64/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib64/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/el/usr/lib64/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/lib/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/lib64/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib64/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib64/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/soft-float/usr/lib64/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/include/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/include/.keep vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib/crtn.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib64/ vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib64/crt1.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib64/crti.o vendor/clang/dist/test/Driver/Inputs/mips_cs_tree/mips-linux-gnu/libc/usr/lib64/crtn.o vendor/clang/dist/test/Driver/Ofast.c vendor/clang/dist/test/Driver/autolink_integrated_as.c vendor/clang/dist/test/Driver/color-diagnostics.c vendor/clang/dist/test/Driver/fparse-all-comments.c vendor/clang/dist/test/Driver/mips-abi.c vendor/clang/dist/test/Driver/mips-cs-header-search.cpp vendor/clang/dist/test/Driver/mips-cs-ld.c vendor/clang/dist/test/Driver/save-temps.c vendor/clang/dist/test/Driver/split-debug.s vendor/clang/dist/test/FixIt/fixit-cxx1y-compat.cpp vendor/clang/dist/test/Format/multiple-inputs-error.cpp vendor/clang/dist/test/Format/multiple-inputs-inplace.cpp vendor/clang/dist/test/Format/multiple-inputs.cpp vendor/clang/dist/test/Frontend/Inputs/rewrite-includes8.h vendor/clang/dist/test/Frontend/rewrite-includes-invalid-hasinclude.c vendor/clang/dist/test/Frontend/rewrite-includes-modules.c vendor/clang/dist/test/Headers/ms-wchar.c vendor/clang/dist/test/Index/comment-cplus11-specific.cpp vendor/clang/dist/test/Index/comment-misc-tags.m vendor/clang/dist/test/Index/comment-unqualified-objc-pointer.m vendor/clang/dist/test/Index/comment-with-preamble.c vendor/clang/dist/test/Index/parse-all-comments.c vendor/clang/dist/test/Index/print-type-size.cpp vendor/clang/dist/test/Index/subclass-comment.mm vendor/clang/dist/test/Lexer/cxx1y_binary_literal.cpp vendor/clang/dist/test/Lexer/pragma-message2.c vendor/clang/dist/test/Modules/Inputs/ModuleDiags/ vendor/clang/dist/test/Modules/Inputs/ModuleDiags/has_errors.h vendor/clang/dist/test/Modules/Inputs/ModuleDiags/has_warnings.h vendor/clang/dist/test/Modules/Inputs/ModuleDiags/module.map vendor/clang/dist/test/Modules/Inputs/System/usr/include/dbl_max.h vendor/clang/dist/test/Modules/Inputs/System/usr/include/uses_other_constants.h vendor/clang/dist/test/Modules/redecls/ vendor/clang/dist/test/Modules/redecls/a.h vendor/clang/dist/test/Modules/redecls/b.h vendor/clang/dist/test/Modules/redecls/main.m vendor/clang/dist/test/Modules/redecls/module.map vendor/clang/dist/test/Modules/serialized-diags.m vendor/clang/dist/test/Modules/system_version.m vendor/clang/dist/test/PCH/captured-stmt.cpp vendor/clang/dist/test/PCH/cxx1y-decltype-auto.cpp vendor/clang/dist/test/PCH/cxx1y-default-initializer.cpp vendor/clang/dist/test/PCH/thread-local.cpp vendor/clang/dist/test/Parser/captured-statements.c vendor/clang/dist/test/Parser/objc-error-qualified-implementation.m vendor/clang/dist/test/Parser/objcxx11-initialized-temps.mm vendor/clang/dist/test/Preprocessor/pp-modules.c vendor/clang/dist/test/Preprocessor/pp-modules.h vendor/clang/dist/test/Preprocessor/pragma-captured.c vendor/clang/dist/test/Sema/MicrosoftCompatibility.cpp vendor/clang/dist/test/Sema/atomic-expr.c vendor/clang/dist/test/Sema/builtins-aarch64.c vendor/clang/dist/test/Sema/captured-statements.c vendor/clang/dist/test/Sema/no-documentation-warn-tagdecl-specifier.c vendor/clang/dist/test/SemaCXX/Inputs/warn-unused-variables.h vendor/clang/dist/test/SemaCXX/alignof.cpp vendor/clang/dist/test/SemaCXX/captured-statements.cpp vendor/clang/dist/test/SemaCXX/constant-expression-cxx1y.cpp vendor/clang/dist/test/SemaCXX/cxx11-inheriting-ctors.cpp vendor/clang/dist/test/SemaCXX/cxx11-thread-local-print.cpp vendor/clang/dist/test/SemaCXX/cxx11-thread-local.cpp vendor/clang/dist/test/SemaCXX/cxx11-user-defined-literals-unused.cpp vendor/clang/dist/test/SemaCXX/cxx1y-array-runtime-bound.cpp vendor/clang/dist/test/SemaCXX/cxx1y-constexpr-not-const.cpp vendor/clang/dist/test/SemaCXX/cxx1y-deduced-return-type.cpp vendor/clang/dist/test/SemaCXX/cxx1y-initializer-aggregates.cpp vendor/clang/dist/test/SemaCXX/warn-unused-variables-error.cpp vendor/clang/dist/test/SemaObjC/deprecated-objc-introspection.m vendor/clang/dist/test/SemaTemplate/local-member-templates.cpp vendor/clang/dist/tools/clang-format/clang-format-bbedit.applescript vendor/clang/dist/tools/clang-format/clang-format.el vendor/clang/dist/tools/scan-build/scan-build.bat vendor/clang/dist/www/analyzer/open_projects.html Replaced: vendor/clang/dist/tools/scan-build/c++-analyzer (contents, props changed) Deleted: vendor/clang/dist/lib/Lex/MacroArgs.h vendor/clang/dist/test/Analysis/alloc-match-dealloc.mm vendor/clang/dist/test/Analysis/bool-assignment.cpp vendor/clang/dist/test/Analysis/bool-assignment2.c vendor/clang/dist/test/Driver/modules_integrated_as.c vendor/clang/dist/test/SemaObjC/warn-isa-ref.m vendor/clang/dist/test/SemaTemplate/example-dynarray.cpp vendor/clang/dist/www/analyzer/dev_cxx.html Modified: vendor/clang/dist/CMakeLists.txt vendor/clang/dist/bindings/python/clang/cindex.py vendor/clang/dist/bindings/python/tests/cindex/test_type.py vendor/clang/dist/bindings/python/tests/cindex/util.py vendor/clang/dist/docs/ClangFormat.rst vendor/clang/dist/docs/ClangTools.rst vendor/clang/dist/docs/LanguageExtensions.rst vendor/clang/dist/docs/LibASTMatchersReference.html vendor/clang/dist/docs/LibASTMatchersTutorial.rst vendor/clang/dist/docs/MemorySanitizer.rst vendor/clang/dist/docs/Modules.rst vendor/clang/dist/docs/ReleaseNotes.rst vendor/clang/dist/docs/ThreadSanitizer.rst vendor/clang/dist/docs/UsersManual.rst vendor/clang/dist/docs/tools/clang.pod vendor/clang/dist/include/clang-c/Index.h vendor/clang/dist/include/clang/AST/ASTContext.h vendor/clang/dist/include/clang/AST/ASTUnresolvedSet.h vendor/clang/dist/include/clang/AST/CommentCommands.td vendor/clang/dist/include/clang/AST/CommentLexer.h vendor/clang/dist/include/clang/AST/Decl.h vendor/clang/dist/include/clang/AST/DeclBase.h vendor/clang/dist/include/clang/AST/DeclCXX.h vendor/clang/dist/include/clang/AST/DeclFriend.h vendor/clang/dist/include/clang/AST/DeclObjC.h vendor/clang/dist/include/clang/AST/EvaluatedExprVisitor.h vendor/clang/dist/include/clang/AST/Expr.h vendor/clang/dist/include/clang/AST/ExprCXX.h vendor/clang/dist/include/clang/AST/ExprObjC.h vendor/clang/dist/include/clang/AST/Mangle.h vendor/clang/dist/include/clang/AST/RawCommentList.h vendor/clang/dist/include/clang/AST/RecursiveASTVisitor.h vendor/clang/dist/include/clang/AST/Stmt.h vendor/clang/dist/include/clang/AST/Type.h vendor/clang/dist/include/clang/AST/TypeNodes.def vendor/clang/dist/include/clang/ASTMatchers/ASTMatchers.h vendor/clang/dist/include/clang/Basic/Attr.td vendor/clang/dist/include/clang/Basic/CommentOptions.h vendor/clang/dist/include/clang/Basic/DeclNodes.td vendor/clang/dist/include/clang/Basic/Diagnostic.h vendor/clang/dist/include/clang/Basic/DiagnosticASTKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticCommentKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticDriverKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticFrontendKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticGroups.td vendor/clang/dist/include/clang/Basic/DiagnosticLexKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticOptions.def vendor/clang/dist/include/clang/Basic/DiagnosticParseKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticSemaKinds.td vendor/clang/dist/include/clang/Basic/DiagnosticSerializationKinds.td vendor/clang/dist/include/clang/Basic/IdentifierTable.h vendor/clang/dist/include/clang/Basic/LangOptions.def vendor/clang/dist/include/clang/Basic/OnDiskHashTable.h vendor/clang/dist/include/clang/Basic/SourceManager.h vendor/clang/dist/include/clang/Basic/Specifiers.h vendor/clang/dist/include/clang/Basic/StmtNodes.td vendor/clang/dist/include/clang/Basic/TargetBuiltins.h vendor/clang/dist/include/clang/Basic/TargetInfo.h vendor/clang/dist/include/clang/Basic/TokenKinds.def vendor/clang/dist/include/clang/Basic/arm_neon.td vendor/clang/dist/include/clang/Driver/ArgList.h vendor/clang/dist/include/clang/Driver/CC1Options.td vendor/clang/dist/include/clang/Driver/Driver.h vendor/clang/dist/include/clang/Driver/Options.td vendor/clang/dist/include/clang/Driver/ToolChain.h vendor/clang/dist/include/clang/Format/Format.h vendor/clang/dist/include/clang/Frontend/ChainedDiagnosticConsumer.h vendor/clang/dist/include/clang/Frontend/ChainedIncludesSource.h vendor/clang/dist/include/clang/Frontend/CodeGenOptions.def vendor/clang/dist/include/clang/Frontend/CodeGenOptions.h vendor/clang/dist/include/clang/Frontend/CompilerInstance.h vendor/clang/dist/include/clang/Frontend/LogDiagnosticPrinter.h vendor/clang/dist/include/clang/Frontend/TextDiagnosticBuffer.h vendor/clang/dist/include/clang/Frontend/TextDiagnosticPrinter.h vendor/clang/dist/include/clang/Frontend/VerifyDiagnosticConsumer.h vendor/clang/dist/include/clang/Lex/ModuleMap.h vendor/clang/dist/include/clang/Lex/PPCallbacks.h vendor/clang/dist/include/clang/Lex/PreprocessingRecord.h vendor/clang/dist/include/clang/Lex/Preprocessor.h vendor/clang/dist/include/clang/Parse/CMakeLists.txt vendor/clang/dist/include/clang/Parse/Makefile vendor/clang/dist/include/clang/Parse/Parser.h vendor/clang/dist/include/clang/Rewrite/Frontend/FixItRewriter.h vendor/clang/dist/include/clang/Sema/AttributeList.h vendor/clang/dist/include/clang/Sema/DeclSpec.h vendor/clang/dist/include/clang/Sema/Initialization.h vendor/clang/dist/include/clang/Sema/ObjCMethodList.h vendor/clang/dist/include/clang/Sema/Ownership.h vendor/clang/dist/include/clang/Sema/ScopeInfo.h vendor/clang/dist/include/clang/Sema/Sema.h vendor/clang/dist/include/clang/Sema/Template.h vendor/clang/dist/include/clang/Sema/TemplateDeduction.h vendor/clang/dist/include/clang/Serialization/ASTBitCodes.h vendor/clang/dist/include/clang/Serialization/ASTReader.h vendor/clang/dist/include/clang/Serialization/ASTWriter.h vendor/clang/dist/include/clang/Serialization/GlobalModuleIndex.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/CheckerManager.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h vendor/clang/dist/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h vendor/clang/dist/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h vendor/clang/dist/lib/ARCMigrate/ARCMT.cpp vendor/clang/dist/lib/ARCMigrate/TransAPIUses.cpp vendor/clang/dist/lib/ARCMigrate/TransRetainReleaseDealloc.cpp vendor/clang/dist/lib/ARCMigrate/Transforms.h vendor/clang/dist/lib/AST/ASTContext.cpp vendor/clang/dist/lib/AST/ASTDumper.cpp vendor/clang/dist/lib/AST/ASTImporter.cpp vendor/clang/dist/lib/AST/Comment.cpp vendor/clang/dist/lib/AST/CommentLexer.cpp vendor/clang/dist/lib/AST/CommentParser.cpp vendor/clang/dist/lib/AST/Decl.cpp vendor/clang/dist/lib/AST/DeclBase.cpp vendor/clang/dist/lib/AST/DeclCXX.cpp vendor/clang/dist/lib/AST/DeclObjC.cpp vendor/clang/dist/lib/AST/DeclPrinter.cpp vendor/clang/dist/lib/AST/Expr.cpp vendor/clang/dist/lib/AST/ExprCXX.cpp vendor/clang/dist/lib/AST/ExprClassification.cpp vendor/clang/dist/lib/AST/ExprConstant.cpp vendor/clang/dist/lib/AST/ItaniumMangle.cpp vendor/clang/dist/lib/AST/MicrosoftCXXABI.cpp vendor/clang/dist/lib/AST/MicrosoftMangle.cpp vendor/clang/dist/lib/AST/RawCommentList.cpp vendor/clang/dist/lib/AST/Stmt.cpp vendor/clang/dist/lib/AST/StmtPrinter.cpp vendor/clang/dist/lib/AST/StmtProfile.cpp vendor/clang/dist/lib/AST/Type.cpp vendor/clang/dist/lib/AST/TypePrinter.cpp vendor/clang/dist/lib/Analysis/BodyFarm.cpp vendor/clang/dist/lib/Analysis/CFG.cpp vendor/clang/dist/lib/Analysis/ThreadSafety.cpp vendor/clang/dist/lib/Basic/Diagnostic.cpp vendor/clang/dist/lib/Basic/IdentifierTable.cpp vendor/clang/dist/lib/Basic/SourceManager.cpp vendor/clang/dist/lib/Basic/TargetInfo.cpp vendor/clang/dist/lib/Basic/Targets.cpp vendor/clang/dist/lib/Basic/Version.cpp vendor/clang/dist/lib/CodeGen/ABIInfo.h vendor/clang/dist/lib/CodeGen/CGAtomic.cpp vendor/clang/dist/lib/CodeGen/CGBlocks.cpp vendor/clang/dist/lib/CodeGen/CGBuiltin.cpp vendor/clang/dist/lib/CodeGen/CGCXXABI.cpp vendor/clang/dist/lib/CodeGen/CGCXXABI.h vendor/clang/dist/lib/CodeGen/CGCall.cpp vendor/clang/dist/lib/CodeGen/CGClass.cpp vendor/clang/dist/lib/CodeGen/CGCleanup.cpp vendor/clang/dist/lib/CodeGen/CGDebugInfo.cpp vendor/clang/dist/lib/CodeGen/CGDebugInfo.h vendor/clang/dist/lib/CodeGen/CGDecl.cpp vendor/clang/dist/lib/CodeGen/CGDeclCXX.cpp vendor/clang/dist/lib/CodeGen/CGException.cpp vendor/clang/dist/lib/CodeGen/CGExpr.cpp vendor/clang/dist/lib/CodeGen/CGExprAgg.cpp vendor/clang/dist/lib/CodeGen/CGExprComplex.cpp vendor/clang/dist/lib/CodeGen/CGExprConstant.cpp vendor/clang/dist/lib/CodeGen/CGExprScalar.cpp vendor/clang/dist/lib/CodeGen/CGObjC.cpp vendor/clang/dist/lib/CodeGen/CGObjCMac.cpp vendor/clang/dist/lib/CodeGen/CGObjCRuntime.cpp vendor/clang/dist/lib/CodeGen/CGRTTI.cpp vendor/clang/dist/lib/CodeGen/CGRecordLayoutBuilder.cpp vendor/clang/dist/lib/CodeGen/CGStmt.cpp vendor/clang/dist/lib/CodeGen/CodeGenFunction.cpp vendor/clang/dist/lib/CodeGen/CodeGenFunction.h vendor/clang/dist/lib/CodeGen/CodeGenModule.cpp vendor/clang/dist/lib/CodeGen/CodeGenModule.h vendor/clang/dist/lib/CodeGen/CodeGenTBAA.cpp vendor/clang/dist/lib/CodeGen/CodeGenTBAA.h vendor/clang/dist/lib/CodeGen/CodeGenTypes.cpp vendor/clang/dist/lib/CodeGen/CodeGenTypes.h vendor/clang/dist/lib/CodeGen/ItaniumCXXABI.cpp vendor/clang/dist/lib/CodeGen/MicrosoftCXXABI.cpp vendor/clang/dist/lib/CodeGen/ModuleBuilder.cpp vendor/clang/dist/lib/CodeGen/TargetInfo.cpp vendor/clang/dist/lib/Driver/ArgList.cpp vendor/clang/dist/lib/Driver/Driver.cpp vendor/clang/dist/lib/Driver/SanitizerArgs.h vendor/clang/dist/lib/Driver/ToolChain.cpp vendor/clang/dist/lib/Driver/ToolChains.cpp vendor/clang/dist/lib/Driver/ToolChains.h vendor/clang/dist/lib/Driver/Tools.cpp vendor/clang/dist/lib/Driver/WindowsToolChain.cpp vendor/clang/dist/lib/Edit/EditedSource.cpp vendor/clang/dist/lib/Format/CMakeLists.txt vendor/clang/dist/lib/Format/Format.cpp vendor/clang/dist/lib/Format/TokenAnnotator.cpp vendor/clang/dist/lib/Format/TokenAnnotator.h vendor/clang/dist/lib/Format/UnwrappedLineParser.cpp vendor/clang/dist/lib/Format/UnwrappedLineParser.h vendor/clang/dist/lib/Frontend/ASTMerge.cpp vendor/clang/dist/lib/Frontend/ASTUnit.cpp vendor/clang/dist/lib/Frontend/ChainedIncludesSource.cpp vendor/clang/dist/lib/Frontend/CompilerInstance.cpp vendor/clang/dist/lib/Frontend/CompilerInvocation.cpp vendor/clang/dist/lib/Frontend/DiagnosticRenderer.cpp vendor/clang/dist/lib/Frontend/FrontendAction.cpp vendor/clang/dist/lib/Frontend/InitHeaderSearch.cpp vendor/clang/dist/lib/Frontend/InitPreprocessor.cpp vendor/clang/dist/lib/Frontend/LogDiagnosticPrinter.cpp vendor/clang/dist/lib/Frontend/PrintPreprocessedOutput.cpp vendor/clang/dist/lib/Frontend/SerializedDiagnosticPrinter.cpp vendor/clang/dist/lib/Frontend/TextDiagnostic.cpp vendor/clang/dist/lib/Frontend/TextDiagnosticBuffer.cpp vendor/clang/dist/lib/Frontend/TextDiagnosticPrinter.cpp vendor/clang/dist/lib/Frontend/VerifyDiagnosticConsumer.cpp vendor/clang/dist/lib/Frontend/Warnings.cpp vendor/clang/dist/lib/Headers/CMakeLists.txt vendor/clang/dist/lib/Headers/avxintrin.h vendor/clang/dist/lib/Headers/emmintrin.h vendor/clang/dist/lib/Headers/stddef.h vendor/clang/dist/lib/Headers/stdint.h vendor/clang/dist/lib/Headers/xopintrin.h vendor/clang/dist/lib/Lex/Lexer.cpp vendor/clang/dist/lib/Lex/LiteralSupport.cpp vendor/clang/dist/lib/Lex/MacroArgs.cpp vendor/clang/dist/lib/Lex/ModuleMap.cpp vendor/clang/dist/lib/Lex/PPDirectives.cpp vendor/clang/dist/lib/Lex/PPMacroExpansion.cpp vendor/clang/dist/lib/Lex/Pragma.cpp vendor/clang/dist/lib/Lex/PreprocessingRecord.cpp vendor/clang/dist/lib/Lex/Preprocessor.cpp vendor/clang/dist/lib/Lex/TokenLexer.cpp vendor/clang/dist/lib/Parse/CMakeLists.txt vendor/clang/dist/lib/Parse/ParseCXXInlineMethods.cpp vendor/clang/dist/lib/Parse/ParseDecl.cpp vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp vendor/clang/dist/lib/Parse/ParseExpr.cpp vendor/clang/dist/lib/Parse/ParseExprCXX.cpp vendor/clang/dist/lib/Parse/ParseInit.cpp vendor/clang/dist/lib/Parse/ParseObjc.cpp vendor/clang/dist/lib/Parse/ParsePragma.cpp vendor/clang/dist/lib/Parse/ParsePragma.h vendor/clang/dist/lib/Parse/ParseStmt.cpp vendor/clang/dist/lib/Parse/ParseTemplate.cpp vendor/clang/dist/lib/Parse/ParseTentative.cpp vendor/clang/dist/lib/Parse/Parser.cpp vendor/clang/dist/lib/Rewrite/Frontend/FixItRewriter.cpp vendor/clang/dist/lib/Rewrite/Frontend/InclusionRewriter.cpp vendor/clang/dist/lib/Sema/AnalysisBasedWarnings.cpp vendor/clang/dist/lib/Sema/AttributeList.cpp vendor/clang/dist/lib/Sema/DeclSpec.cpp vendor/clang/dist/lib/Sema/ScopeInfo.cpp vendor/clang/dist/lib/Sema/Sema.cpp vendor/clang/dist/lib/Sema/SemaAccess.cpp vendor/clang/dist/lib/Sema/SemaCast.cpp vendor/clang/dist/lib/Sema/SemaChecking.cpp vendor/clang/dist/lib/Sema/SemaCodeComplete.cpp vendor/clang/dist/lib/Sema/SemaDecl.cpp vendor/clang/dist/lib/Sema/SemaDeclAttr.cpp vendor/clang/dist/lib/Sema/SemaDeclCXX.cpp vendor/clang/dist/lib/Sema/SemaDeclObjC.cpp vendor/clang/dist/lib/Sema/SemaExceptionSpec.cpp vendor/clang/dist/lib/Sema/SemaExpr.cpp vendor/clang/dist/lib/Sema/SemaExprCXX.cpp vendor/clang/dist/lib/Sema/SemaExprMember.cpp vendor/clang/dist/lib/Sema/SemaExprObjC.cpp vendor/clang/dist/lib/Sema/SemaInit.cpp vendor/clang/dist/lib/Sema/SemaLambda.cpp vendor/clang/dist/lib/Sema/SemaLookup.cpp vendor/clang/dist/lib/Sema/SemaObjCProperty.cpp vendor/clang/dist/lib/Sema/SemaOpenMP.cpp vendor/clang/dist/lib/Sema/SemaOverload.cpp vendor/clang/dist/lib/Sema/SemaPseudoObject.cpp vendor/clang/dist/lib/Sema/SemaStmt.cpp vendor/clang/dist/lib/Sema/SemaStmtAsm.cpp vendor/clang/dist/lib/Sema/SemaTemplate.cpp vendor/clang/dist/lib/Sema/SemaTemplateDeduction.cpp vendor/clang/dist/lib/Sema/SemaTemplateInstantiate.cpp vendor/clang/dist/lib/Sema/SemaTemplateInstantiateDecl.cpp vendor/clang/dist/lib/Sema/SemaTemplateVariadic.cpp vendor/clang/dist/lib/Sema/SemaType.cpp vendor/clang/dist/lib/Sema/TreeTransform.h vendor/clang/dist/lib/Serialization/ASTCommon.cpp vendor/clang/dist/lib/Serialization/ASTReader.cpp vendor/clang/dist/lib/Serialization/ASTReaderDecl.cpp vendor/clang/dist/lib/Serialization/ASTReaderInternals.h vendor/clang/dist/lib/Serialization/ASTReaderStmt.cpp vendor/clang/dist/lib/Serialization/ASTWriter.cpp vendor/clang/dist/lib/Serialization/ASTWriterDecl.cpp vendor/clang/dist/lib/Serialization/ASTWriterStmt.cpp vendor/clang/dist/lib/Serialization/GlobalModuleIndex.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/CMakeLists.txt vendor/clang/dist/lib/StaticAnalyzer/Checkers/CStringChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/Checkers.td vendor/clang/dist/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/MallocChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/BugReporter.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/CallEvent.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/Environment.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/ExprEngine.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/ExprEngineC.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/MemRegion.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/PathDiagnostic.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/ProgramState.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/RegionStore.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/SValBuilder.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/SVals.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/Store.cpp vendor/clang/dist/lib/StaticAnalyzer/Core/SymbolManager.cpp vendor/clang/dist/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp vendor/clang/dist/test/ARCMT/check-with-serialized-diag.m vendor/clang/dist/test/ARCMT/migrate-plist-output.m vendor/clang/dist/test/ARCMT/objcmt-subscripting-literals.m vendor/clang/dist/test/ARCMT/objcmt-subscripting-literals.m.result vendor/clang/dist/test/ASTMerge/function.c vendor/clang/dist/test/Analysis/Inputs/system-header-simulator-cxx.h vendor/clang/dist/test/Analysis/Inputs/system-header-simulator.h vendor/clang/dist/test/Analysis/Malloc+MismatchedDeallocator+NewDelete.cpp vendor/clang/dist/test/Analysis/Malloc+NewDelete_intersections.cpp vendor/clang/dist/test/Analysis/NSContainers.m vendor/clang/dist/test/Analysis/NewDelete+MismatchedDeallocator_intersections.cpp vendor/clang/dist/test/Analysis/NewDelete-checker-test.cpp vendor/clang/dist/test/Analysis/NewDelete-custom.cpp vendor/clang/dist/test/Analysis/NewDelete-intersections.mm vendor/clang/dist/test/Analysis/NewDelete-path-notes.cpp vendor/clang/dist/test/Analysis/NewDelete-variadic.cpp vendor/clang/dist/test/Analysis/analyzer-config.c vendor/clang/dist/test/Analysis/analyzer-config.cpp vendor/clang/dist/test/Analysis/casts.c vendor/clang/dist/test/Analysis/conditional-operator-path-notes.c vendor/clang/dist/test/Analysis/coverage.c vendor/clang/dist/test/Analysis/cstring-syntax-cxx.cpp vendor/clang/dist/test/Analysis/dead-stores.c vendor/clang/dist/test/Analysis/derived-to-base.cpp vendor/clang/dist/test/Analysis/diagnostics/deref-track-symbolic-region.c vendor/clang/dist/test/Analysis/diagnostics/explicit-suppression.cpp vendor/clang/dist/test/Analysis/diagnostics/undef-value-param.c vendor/clang/dist/test/Analysis/diagnostics/undef-value-param.m vendor/clang/dist/test/Analysis/global-region-invalidation.c vendor/clang/dist/test/Analysis/global_region_invalidation.mm vendor/clang/dist/test/Analysis/inline-plist.c vendor/clang/dist/test/Analysis/inline-unique-reports.c vendor/clang/dist/test/Analysis/inline.cpp vendor/clang/dist/test/Analysis/inlining/containers.cpp vendor/clang/dist/test/Analysis/inlining/dyn-dispatch-bifurcate.cpp vendor/clang/dist/test/Analysis/inlining/eager-reclamation-path-notes.c vendor/clang/dist/test/Analysis/inlining/eager-reclamation-path-notes.cpp vendor/clang/dist/test/Analysis/inlining/false-positive-suppression.c vendor/clang/dist/test/Analysis/inlining/inline-defensive-checks.c vendor/clang/dist/test/Analysis/inlining/inline-defensive-checks.cpp vendor/clang/dist/test/Analysis/inlining/path-notes.c vendor/clang/dist/test/Analysis/inlining/path-notes.cpp vendor/clang/dist/test/Analysis/inlining/path-notes.m vendor/clang/dist/test/Analysis/malloc-annotations.c vendor/clang/dist/test/Analysis/malloc-interprocedural.c vendor/clang/dist/test/Analysis/malloc-plist.c vendor/clang/dist/test/Analysis/malloc.c vendor/clang/dist/test/Analysis/malloc.cpp vendor/clang/dist/test/Analysis/malloc.mm vendor/clang/dist/test/Analysis/misc-ps.c vendor/clang/dist/test/Analysis/new.cpp vendor/clang/dist/test/Analysis/null-deref-path-notes.m vendor/clang/dist/test/Analysis/objc-boxing.m vendor/clang/dist/test/Analysis/objc-for.m vendor/clang/dist/test/Analysis/objc-subscript.m vendor/clang/dist/test/Analysis/objc_invalidation.m vendor/clang/dist/test/Analysis/operator-calls.cpp vendor/clang/dist/test/Analysis/plist-output-alternate.m vendor/clang/dist/test/Analysis/plist-output.m vendor/clang/dist/test/Analysis/pointer-to-member.cpp vendor/clang/dist/test/Analysis/properties.m vendor/clang/dist/test/Analysis/reference.cpp vendor/clang/dist/test/Analysis/retain-release-path-notes-gc.m vendor/clang/dist/test/Analysis/retain-release-path-notes.m vendor/clang/dist/test/Analysis/retain-release.m vendor/clang/dist/test/Analysis/retain-release.mm vendor/clang/dist/test/Analysis/stack-addr-ps.cpp vendor/clang/dist/test/Analysis/stackaddrleak.c vendor/clang/dist/test/Analysis/string.c vendor/clang/dist/test/Analysis/svalbuilder-logic.c vendor/clang/dist/test/Analysis/taint-tester.c vendor/clang/dist/test/Analysis/temporaries.cpp vendor/clang/dist/test/Analysis/uninit-vals-ps.c vendor/clang/dist/test/Analysis/uninit-vals.m vendor/clang/dist/test/Analysis/unix-fns.c vendor/clang/dist/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp vendor/clang/dist/test/CXX/basic/basic.types/p10.cpp vendor/clang/dist/test/CXX/class/class.friend/p6.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p1.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p3.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p4.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p5.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p6.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p2.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p5.cpp vendor/clang/dist/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.simple/p5-cxx0x.cpp vendor/clang/dist/test/CXX/dcl.dcl/p4-0x.cpp vendor/clang/dist/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp vendor/clang/dist/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p1-0x.cpp vendor/clang/dist/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-0x.cpp vendor/clang/dist/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5.cpp vendor/clang/dist/test/CXX/except/except.spec/p1.cpp vendor/clang/dist/test/CXX/except/except.spec/p14.cpp vendor/clang/dist/test/CXX/expr/expr.ass/p9-cxx11.cpp vendor/clang/dist/test/CXX/expr/expr.const/p2-0x.cpp vendor/clang/dist/test/CXX/expr/expr.const/p3-0x.cpp vendor/clang/dist/test/CXX/expr/expr.const/p5-0x.cpp vendor/clang/dist/test/CXX/expr/expr.post/expr.const.cast/p1-0x.cpp vendor/clang/dist/test/CXX/expr/expr.prim/expr.prim.lambda/default-arguments.cpp vendor/clang/dist/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp vendor/clang/dist/test/CXX/over/over.oper/over.literal/p2.cpp vendor/clang/dist/test/CXX/special/class.inhctor/elsewhere.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p1.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p2.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p3.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p4.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p7.cpp vendor/clang/dist/test/CXX/special/class.inhctor/p8.cpp vendor/clang/dist/test/CXX/stmt.stmt/stmt.iter/stmt.ranged/p1.cpp vendor/clang/dist/test/CXX/stmt.stmt/stmt.select/stmt.switch/p2-0x.cpp vendor/clang/dist/test/CXX/temp/temp.arg/temp.arg.nontype/p1-11.cpp vendor/clang/dist/test/CXX/temp/temp.decls/temp.variadic/multi-level-substitution.cpp vendor/clang/dist/test/CXX/temp/temp.spec/temp.explicit/p1-0x.cpp vendor/clang/dist/test/CodeGen/2010-02-10-PointerName.c vendor/clang/dist/test/CodeGen/c-strings.c vendor/clang/dist/test/CodeGen/le32-regparm.c vendor/clang/dist/test/CodeGen/may-alias.c vendor/clang/dist/test/CodeGen/ms-inline-asm-64.c vendor/clang/dist/test/CodeGen/ms-inline-asm.c vendor/clang/dist/test/CodeGen/ms-inline-asm.cpp vendor/clang/dist/test/CodeGen/mult-alt-generic.c vendor/clang/dist/test/CodeGen/pragma-pack-1.c vendor/clang/dist/test/CodeGen/tbaa-struct.cpp vendor/clang/dist/test/CodeGen/tbaa.cpp vendor/clang/dist/test/CodeGen/thread-specifier.c vendor/clang/dist/test/CodeGen/x86_32-arguments-win32.c vendor/clang/dist/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp vendor/clang/dist/test/CodeGenCXX/debug-info-namespace.cpp vendor/clang/dist/test/CodeGenCXX/extern-c.cpp vendor/clang/dist/test/CodeGenCXX/inheriting-constructor.cpp vendor/clang/dist/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp vendor/clang/dist/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp vendor/clang/dist/test/CodeGenCXX/mangle-ms-templates.cpp vendor/clang/dist/test/CodeGenCXX/mangle-ms.cpp vendor/clang/dist/test/CodeGenCXX/microsoft-abi-member-pointers.cpp vendor/clang/dist/test/CodeGenCXX/scoped-enums.cpp vendor/clang/dist/test/CodeGenCXX/throw-expressions.cpp vendor/clang/dist/test/CodeGenCXX/vtable-debug-info.cpp vendor/clang/dist/test/CodeGenObjC/arc-blocks.m vendor/clang/dist/test/CodeGenObjC/autorelease.m vendor/clang/dist/test/CodeGenObjC/debug-info-block-captured-self.m vendor/clang/dist/test/CodeGenObjC/debug-info-block-line.m vendor/clang/dist/test/CodeGenObjC/debug-info-blocks.m vendor/clang/dist/test/CodeGenObjC/encode-test-3.m vendor/clang/dist/test/CodeGenObjC/metadata-symbols-32.m vendor/clang/dist/test/CodeGenObjC/metadata-symbols-64.m vendor/clang/dist/test/CodeGenObjC/metadata_symbols.m vendor/clang/dist/test/CodeGenObjC/objc-align.m vendor/clang/dist/test/CodeGenObjC/synthesize_ivar-cont-class.m vendor/clang/dist/test/CodeGenObjCXX/arc.mm vendor/clang/dist/test/CodeGenObjCXX/lambda-expressions.mm vendor/clang/dist/test/CodeGenObjCXX/mangle.mm vendor/clang/dist/test/Driver/clang_cpp.c vendor/clang/dist/test/Driver/clang_f_opts.c vendor/clang/dist/test/Driver/debug-comp-dir.S vendor/clang/dist/test/Driver/debug.c vendor/clang/dist/test/Driver/dragonfly.c vendor/clang/dist/test/Driver/flags.c vendor/clang/dist/test/Driver/fsanitize.c vendor/clang/dist/test/Driver/hexagon-toolchain-elf.c vendor/clang/dist/test/Driver/hexagon-toolchain.c vendor/clang/dist/test/Driver/linux-ld.c vendor/clang/dist/test/Driver/mips-as.c vendor/clang/dist/test/Driver/mips-eleb.c vendor/clang/dist/test/Driver/mips-features.c vendor/clang/dist/test/Driver/mips-float.c vendor/clang/dist/test/Driver/modules.m vendor/clang/dist/test/Driver/objc++-cpp-output.mm vendor/clang/dist/test/Driver/objc-cpp-output.m vendor/clang/dist/test/Driver/output-file-is-dir.c vendor/clang/dist/test/Driver/pic.c vendor/clang/dist/test/Driver/r600-mcpu.cl vendor/clang/dist/test/Driver/sanitizer-ld.c vendor/clang/dist/test/Format/basic.cpp vendor/clang/dist/test/Format/ranges.cpp vendor/clang/dist/test/Frontend/rewrite-includes-missing.c vendor/clang/dist/test/Frontend/rewrite-includes.c vendor/clang/dist/test/Frontend/rewrite-macros.c vendor/clang/dist/test/Frontend/verify.c vendor/clang/dist/test/Headers/c11.c vendor/clang/dist/test/Headers/cxx11.cpp vendor/clang/dist/test/Index/annotate-module.m vendor/clang/dist/test/Index/annotate-tokens.cpp vendor/clang/dist/test/Index/annotate-tokens.m vendor/clang/dist/test/Index/c-index-api-loadTU-test.m vendor/clang/dist/test/Index/get-cursor.cpp vendor/clang/dist/test/Index/index-refs.m vendor/clang/dist/test/Index/load-classes.cpp vendor/clang/dist/test/Index/print-type.c vendor/clang/dist/test/Index/print-type.cpp vendor/clang/dist/test/Index/print-type.m vendor/clang/dist/test/Index/properties-class-extensions.m vendor/clang/dist/test/Index/targeted-annotation.c vendor/clang/dist/test/Index/usrs.m vendor/clang/dist/test/Lexer/has_extension_cxx.cpp vendor/clang/dist/test/Lexer/has_feature_c1x.c vendor/clang/dist/test/Lexer/has_feature_cxx0x.cpp vendor/clang/dist/test/Lexer/pragma-message.c vendor/clang/dist/test/Misc/ast-dump-decl.c vendor/clang/dist/test/Misc/ast-dump-decl.cpp vendor/clang/dist/test/Misc/warn-in-system-header.c vendor/clang/dist/test/Modules/Inputs/System/usr/include/module.map vendor/clang/dist/test/Modules/auto-module-import.m vendor/clang/dist/test/Modules/autolink.m vendor/clang/dist/test/Modules/compiler_builtins.m vendor/clang/dist/test/Modules/cstd.m vendor/clang/dist/test/Modules/cycles.c vendor/clang/dist/test/Modules/decldef.m vendor/clang/dist/test/Modules/decldef.mm vendor/clang/dist/test/Modules/diamond-pch.c vendor/clang/dist/test/Modules/diamond.c vendor/clang/dist/test/Modules/linkage-merge.cpp vendor/clang/dist/test/Modules/linkage-merge.m vendor/clang/dist/test/Modules/lookup.cpp vendor/clang/dist/test/Modules/lookup.m vendor/clang/dist/test/Modules/macros.c vendor/clang/dist/test/Modules/method_pool.m vendor/clang/dist/test/Modules/module-private.cpp vendor/clang/dist/test/Modules/namespaces.cpp vendor/clang/dist/test/Modules/normal-module-map.cpp vendor/clang/dist/test/Modules/objc-categories.m vendor/clang/dist/test/Modules/on-demand-build.m vendor/clang/dist/test/Modules/redecl-merge.m vendor/clang/dist/test/Modules/subframeworks.m vendor/clang/dist/test/PCH/cxx-typeid.cpp vendor/clang/dist/test/PCH/cxx-typeid.h vendor/clang/dist/test/PCH/cxx-using.cpp vendor/clang/dist/test/PCH/cxx11-statement-attributes.cpp vendor/clang/dist/test/PCH/functions.c vendor/clang/dist/test/PCH/headersearch.cpp vendor/clang/dist/test/PCH/method_pool.m vendor/clang/dist/test/PCH/nonvisible-external-defs.c vendor/clang/dist/test/PCH/reloc.c vendor/clang/dist/test/PCH/tentative-defs.c vendor/clang/dist/test/PCH/typo.cpp vendor/clang/dist/test/PCH/typo.m vendor/clang/dist/test/Parser/MicrosoftExtensions.c vendor/clang/dist/test/Parser/MicrosoftExtensions.cpp vendor/clang/dist/test/Parser/cxx0x-ambig.cpp vendor/clang/dist/test/Parser/cxx0x-decl.cpp vendor/clang/dist/test/Parser/objc-boxing.m vendor/clang/dist/test/Parser/pragma-options.c vendor/clang/dist/test/Parser/pragma-pack.c vendor/clang/dist/test/Preprocessor/aarch64-target-features.c vendor/clang/dist/test/Preprocessor/cxx_oper_spelling.cpp vendor/clang/dist/test/Preprocessor/dependencies-and-pp.c vendor/clang/dist/test/Preprocessor/init.c vendor/clang/dist/test/Preprocessor/line-directive.c vendor/clang/dist/test/Preprocessor/pragma_sysheader.c vendor/clang/dist/test/Preprocessor/predefined-arch-macros.c vendor/clang/dist/test/Preprocessor/stdint.c vendor/clang/dist/test/Rewriter/rewrite-byref-in-nested-blocks.mm vendor/clang/dist/test/Sema/arm-neon-types.c vendor/clang/dist/test/Sema/array-init.c vendor/clang/dist/test/Sema/asm.c vendor/clang/dist/test/Sema/bitfield.c vendor/clang/dist/test/Sema/crash-invalid-array.c vendor/clang/dist/test/Sema/extern-redecl.c vendor/clang/dist/test/Sema/function-redecl.c vendor/clang/dist/test/Sema/function.c vendor/clang/dist/test/Sema/parentheses.c vendor/clang/dist/test/Sema/parentheses.cpp vendor/clang/dist/test/Sema/pragma-arc-cf-code-audited.c vendor/clang/dist/test/Sema/return.c vendor/clang/dist/test/Sema/thread-specifier.c vendor/clang/dist/test/Sema/var-redecl.c vendor/clang/dist/test/Sema/warn-documentation.cpp vendor/clang/dist/test/Sema/warn-documentation.m vendor/clang/dist/test/Sema/warn-duplicate-enum.c vendor/clang/dist/test/SemaCXX/MicrosoftExtensions.cpp vendor/clang/dist/test/SemaCXX/access.cpp vendor/clang/dist/test/SemaCXX/ast-print.cpp vendor/clang/dist/test/SemaCXX/attr-noreturn.cpp vendor/clang/dist/test/SemaCXX/compound-literal.cpp vendor/clang/dist/test/SemaCXX/condition.cpp vendor/clang/dist/test/SemaCXX/constant-expression-cxx11.cpp vendor/clang/dist/test/SemaCXX/constexpr-printing.cpp vendor/clang/dist/test/SemaCXX/constexpr-value-init.cpp vendor/clang/dist/test/SemaCXX/cxx11-ast-print.cpp vendor/clang/dist/test/SemaCXX/cxx11-crashes.cpp vendor/clang/dist/test/SemaCXX/cxx98-compat-pedantic.cpp vendor/clang/dist/test/SemaCXX/enum-unscoped-nonexistent.cpp vendor/clang/dist/test/SemaCXX/for-range-unused.cpp vendor/clang/dist/test/SemaCXX/i-c-e-cxx.cpp vendor/clang/dist/test/SemaCXX/linkage-spec.cpp vendor/clang/dist/test/SemaCXX/linkage.cpp vendor/clang/dist/test/SemaCXX/linkage2.cpp vendor/clang/dist/test/SemaCXX/pascal-strings.cpp vendor/clang/dist/test/SemaCXX/trailing-return-0x.cpp vendor/clang/dist/test/SemaCXX/undefined-internal.cpp vendor/clang/dist/test/SemaCXX/uninitialized.cpp vendor/clang/dist/test/SemaCXX/warn-c++11-extensions.cpp vendor/clang/dist/test/SemaCXX/warn-overloaded-virtual.cpp vendor/clang/dist/test/SemaCXX/warn-thread-safety-analysis.cpp vendor/clang/dist/test/SemaCXX/warn-unused-filescoped.cpp vendor/clang/dist/test/SemaCXX/warn-unused-variables.cpp vendor/clang/dist/test/SemaObjC/arc-repeated-weak.mm vendor/clang/dist/test/SemaObjC/arc-system-header.m vendor/clang/dist/test/SemaObjC/arc-unavailable-for-weakref.m vendor/clang/dist/test/SemaObjC/arc.m vendor/clang/dist/test/SemaObjC/attr-availability.m vendor/clang/dist/test/SemaObjC/format-arg-attribute.m vendor/clang/dist/test/SemaObjC/format-strings-objc.m vendor/clang/dist/test/SemaObjC/message.m vendor/clang/dist/test/SemaObjC/method-conflict-2.m vendor/clang/dist/test/SemaObjC/property-category-4.m vendor/clang/dist/test/SemaObjC/property-category-impl.m vendor/clang/dist/test/SemaObjC/property-deprecated-warning.m vendor/clang/dist/test/SemaObjC/property-noninherited-availability-attr.m vendor/clang/dist/test/SemaObjC/property-user-setter.m vendor/clang/dist/test/SemaObjC/property.m vendor/clang/dist/test/SemaObjC/protocol-lookup-2.m vendor/clang/dist/test/SemaObjC/typo-correction.m vendor/clang/dist/test/SemaObjC/warn-missing-super.m vendor/clang/dist/test/SemaObjCXX/arc-system-header.mm vendor/clang/dist/test/SemaObjCXX/foreach.mm vendor/clang/dist/test/SemaObjCXX/property-reference.mm vendor/clang/dist/test/SemaObjCXX/references.mm vendor/clang/dist/test/SemaOpenCL/event_t.cl vendor/clang/dist/test/SemaOpenCL/storageclass.cl vendor/clang/dist/test/SemaTemplate/attributes.cpp vendor/clang/dist/test/SemaTemplate/dependent-names.cpp vendor/clang/dist/test/SemaTemplate/ms-function-specialization-class-scope.cpp vendor/clang/dist/test/SemaTemplate/ms-lookup-template-base-classes.cpp vendor/clang/dist/test/SemaTemplate/overload-candidates.cpp vendor/clang/dist/test/SemaTemplate/temp_arg_nontype.cpp vendor/clang/dist/test/Tooling/clang-check-args.cpp vendor/clang/dist/test/Tooling/clang-check-builtin-headers.cpp vendor/clang/dist/test/Tooling/clang-check-chdir.cpp vendor/clang/dist/test/Tooling/clang-check.cpp vendor/clang/dist/test/Tooling/multi-jobs.cpp vendor/clang/dist/test/lit.cfg vendor/clang/dist/tools/c-index-test/c-index-test.c vendor/clang/dist/tools/clang-format/ClangFormat.cpp vendor/clang/dist/tools/clang-format/clang-format-diff.py vendor/clang/dist/tools/clang-format/clang-format.py vendor/clang/dist/tools/libclang/CIndex.cpp vendor/clang/dist/tools/libclang/CIndexCXX.cpp vendor/clang/dist/tools/libclang/CXCursor.cpp vendor/clang/dist/tools/libclang/CXSourceLocation.cpp vendor/clang/dist/tools/libclang/CXTranslationUnit.h vendor/clang/dist/tools/libclang/CXType.cpp vendor/clang/dist/tools/libclang/IndexBody.cpp vendor/clang/dist/tools/libclang/IndexDecl.cpp vendor/clang/dist/tools/libclang/Indexing.cpp vendor/clang/dist/tools/libclang/IndexingContext.cpp vendor/clang/dist/tools/libclang/IndexingContext.h vendor/clang/dist/tools/libclang/RecursiveASTVisitor.h vendor/clang/dist/tools/libclang/libclang.exports vendor/clang/dist/tools/scan-build/ccc-analyzer vendor/clang/dist/tools/scan-build/scan-build vendor/clang/dist/tools/scan-view/ScanView.py vendor/clang/dist/unittests/AST/CommentLexer.cpp vendor/clang/dist/unittests/AST/CommentParser.cpp vendor/clang/dist/unittests/AST/SourceLocationTest.cpp vendor/clang/dist/unittests/ASTMatchers/ASTMatchersTest.cpp vendor/clang/dist/unittests/Basic/SourceManagerTest.cpp vendor/clang/dist/unittests/Format/FormatTest.cpp vendor/clang/dist/utils/TableGen/ClangAttrEmitter.cpp vendor/clang/dist/utils/TableGen/ClangCommentCommandInfoEmitter.cpp vendor/clang/dist/utils/TableGen/ClangDiagnosticsEmitter.cpp vendor/clang/dist/utils/TableGen/NeonEmitter.cpp vendor/clang/dist/utils/TableGen/TableGen.cpp vendor/clang/dist/utils/TableGen/TableGenBackends.h vendor/clang/dist/utils/analyzer/SATestBuild.py vendor/clang/dist/www/OpenProjects.html vendor/clang/dist/www/analyzer/available_checks.html vendor/clang/dist/www/analyzer/checker_dev_manual.html vendor/clang/dist/www/analyzer/latest_checker.html.incl vendor/clang/dist/www/analyzer/menu.html.incl vendor/clang/dist/www/analyzer/potential_checkers.html vendor/clang/dist/www/analyzer/release_notes.html vendor/clang/dist/www/comparison.html vendor/clang/dist/www/cxx_status.html vendor/clang/dist/www/get_started.html vendor/clang/dist/www/index.html Modified: vendor/clang/dist/CMakeLists.txt ============================================================================== --- vendor/clang/dist/CMakeLists.txt Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/CMakeLists.txt Mon Jun 10 20:45:12 2013 (r251609) @@ -137,7 +137,12 @@ configure_file( # Add appropriate flags for GCC if (LLVM_COMPILER_IS_GCC_COMPATIBLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing") + + # Enable -pedantic for Clang even if it's not enabled for LLVM. + if (NOT LLVM_ENABLE_PEDANTIC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wno-long-long") + endif () check_cxx_compiler_flag("-Werror -Wnested-anon-types" CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG) if( CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG ) Modified: vendor/clang/dist/bindings/python/clang/cindex.py ============================================================================== --- vendor/clang/dist/bindings/python/clang/cindex.py Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/bindings/python/clang/cindex.py Mon Jun 10 20:45:12 2013 (r251609) @@ -1314,6 +1314,18 @@ class Cursor(Structure): """ return TokenGroup.get_tokens(self._tu, self.extent) + def is_bitfield(self): + """ + Check if the field is a bitfield. + """ + return conf.lib.clang_Cursor_isBitField(self) + + def get_bitfield_width(self): + """ + Retrieve the width of a bitfield. + """ + return conf.lib.clang_getFieldDeclBitWidth(self) + @staticmethod def from_result(res, fn, args): assert isinstance(res, Cursor) @@ -1613,6 +1625,24 @@ class Type(Structure): """ return conf.lib.clang_getArraySize(self) + def get_align(self): + """ + Retrieve the alignment of the record. + """ + return conf.lib.clang_Type_getAlignOf(self) + + def get_size(self): + """ + Retrieve the size of the record. + """ + return conf.lib.clang_Type_getSizeOf(self) + + def get_offset(self, fieldname): + """ + Retrieve the offset of a field in the record. + """ + return conf.lib.clang_Type_getOffsetOf(self, c_char_p(fieldname)) + def __eq__(self, other): if type(other) != type(self): return False @@ -2623,6 +2653,10 @@ functionList = [ [Type], c_longlong), + ("clang_getFieldDeclBitWidth", + [Cursor], + c_int), + ("clang_getCanonicalCursor", [Cursor], Cursor, @@ -3038,6 +3072,22 @@ functionList = [ [Cursor, c_uint], Cursor, Cursor.from_result), + + ("clang_Cursor_isBitField", + [Cursor], + bool), + + ("clang_Type_getAlignOf", + [Type], + c_longlong), + + ("clang_Type_getOffsetOf", + [Type, c_char_p], + c_longlong), + + ("clang_Type_getSizeOf", + [Type], + c_ulonglong), ] class LibclangError(Exception): Modified: vendor/clang/dist/bindings/python/tests/cindex/test_type.py ============================================================================== --- vendor/clang/dist/bindings/python/tests/cindex/test_type.py Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/bindings/python/tests/cindex/test_type.py Mon Jun 10 20:45:12 2013 (r251609) @@ -298,3 +298,66 @@ def test_is_restrict_qualified(): assert isinstance(i.type.is_restrict_qualified(), bool) assert i.type.is_restrict_qualified() assert not j.type.is_restrict_qualified() + +def test_record_layout(): + """Ensure Cursor.type.get_size, Cursor.type.get_align and + Cursor.type.get_offset works.""" + + source =""" +struct a { + long a1; + long a2:3; + long a3:4; + long long a4; +}; +""" + tries=[(['-target','i386-linux-gnu'],(4,16,0,32,35,64)), + (['-target','nvptx64-unknown-unknown'],(8,24,0,64,67,128)), + (['-target','i386-pc-win32'],(8,16,0,32,35,64)), + (['-target','msp430-none-none'],(2,14,0,32,35,48))] + for flags, values in tries: + align,total,a1,a2,a3,a4 = values + + tu = get_tu(source, flags=flags) + teststruct = get_cursor(tu, 'a') + fields = list(teststruct.get_children()) + + assert teststruct.type.get_align() == align + assert teststruct.type.get_size() == total + assert teststruct.type.get_offset(fields[0].spelling) == a1 + assert teststruct.type.get_offset(fields[1].spelling) == a2 + assert teststruct.type.get_offset(fields[2].spelling) == a3 + assert teststruct.type.get_offset(fields[3].spelling) == a4 + assert fields[0].is_bitfield() == False + assert fields[1].is_bitfield() == True + assert fields[1].get_bitfield_width() == 3 + assert fields[2].is_bitfield() == True + assert fields[2].get_bitfield_width() == 4 + assert fields[3].is_bitfield() == False + +def test_offset(): + """Ensure Cursor.get_record_field_offset works in anonymous records""" + source=""" +struct Test { + struct { + int bariton; + union { + int foo; + }; + }; + int bar; +};""" + tries=[(['-target','i386-linux-gnu'],(4,16,0,32,64)), + (['-target','nvptx64-unknown-unknown'],(8,24,0,32,64)), + (['-target','i386-pc-win32'],(8,16,0,32,64)), + (['-target','msp430-none-none'],(2,14,0,32,64))] + for flags, values in tries: + align,total,bariton,foo,bar = values + tu = get_tu(source) + teststruct = get_cursor(tu, 'Test') + fields = list(teststruct.get_children()) + assert teststruct.type.get_offset("bariton") == bariton + assert teststruct.type.get_offset("foo") == foo + assert teststruct.type.get_offset("bar") == bar + + Modified: vendor/clang/dist/bindings/python/tests/cindex/util.py ============================================================================== --- vendor/clang/dist/bindings/python/tests/cindex/util.py Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/bindings/python/tests/cindex/util.py Mon Jun 10 20:45:12 2013 (r251609) @@ -3,7 +3,7 @@ from clang.cindex import Cursor from clang.cindex import TranslationUnit -def get_tu(source, lang='c', all_warnings=False): +def get_tu(source, lang='c', all_warnings=False, flags=[]): """Obtain a translation unit from source and language. By default, the translation unit is created from source file "t." @@ -14,8 +14,8 @@ def get_tu(source, lang='c', all_warning all_warnings is a convenience argument to enable all compiler warnings. """ + args = list(flags) name = 't.c' - args = [] if lang == 'cpp': name = 't.cpp' args.append('-std=c++11') Modified: vendor/clang/dist/docs/ClangFormat.rst ============================================================================== --- vendor/clang/dist/docs/ClangFormat.rst Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/docs/ClangFormat.rst Mon Jun 10 20:45:12 2013 (r251609) @@ -18,7 +18,6 @@ to format C/C++/Obj-C code. $ clang-format --help OVERVIEW: A tool to format C/C++/Obj-C code. - Currently supports LLVM and Google style guides. If no arguments are specified, it formats the code from standard input and writes the result to the standard output. If is given, it reformats the file. If -i is specified together @@ -66,6 +65,37 @@ It operates on the current, potentially or save any files. To revert a formatting, just undo. +Emacs Integration +================= + +Similar to the integration for :program:`vim`, there is an integration for +:program:`emacs`. It can be found at `clang/tools/clang-format/clang-format.el` +and used by adding this to your `.emacs`: + +.. code-block:: common-lisp + + (load "/tools/clang-format/clang-format.el") + (global-set-key [C-M-tab] 'clang-format-region) + +This binds the function `clang-format-region` to C-M-tab, which then formats the +current line or selected region. + + +BBEdit Integration +================== + +:program:`clang-format` cannot be used as a text filter with BBEdit, but works +well via a script. The AppleScript to do this integration can be found at +`clang/tools/clang-format/clang-format-bbedit.applescript`; place a copy in +`~/Library/Application Support/BBEdit/Scripts`, and edit the path within it to +point to your local copy of :program:`clang-format`. + +With this integration you can select the script from the Script menu and +:program:`clang-format` will format the selection. Note that you can rename the +menu item by renaming the script, and can assign the menu item a keyboard +shortcut in the BBEdit preferences, under Menus & Shortcuts. + + Script for patch reformatting ============================= @@ -81,7 +111,7 @@ a unified diff and reformats all contain optional arguments: -h, --help show this help message and exit -p P strip the smallest prefix containing P slashes - -style STYLE formatting style to apply (LLVM, Google) + -style STYLE formatting style to apply (LLVM, Google, Chromium) So to reformat all the lines in the latest :program:`git` commit, just do: Modified: vendor/clang/dist/docs/ClangTools.rst ============================================================================== --- vendor/clang/dist/docs/ClangTools.rst Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/docs/ClangTools.rst Mon Jun 10 20:45:12 2013 (r251609) @@ -100,7 +100,11 @@ Currently it can: * convert loops to range-based for loops; -* convert null pointer constants (like ``NULL`` or ``0``) to C++11 ``nullptr``. +* convert null pointer constants (like ``NULL`` or ``0``) to C++11 ``nullptr``; + +* replace the type specifier in variable declarations with the ``auto`` type specifier; + +* add the ``override`` specifier to applicable member functions. Extra Clang Tools ================= @@ -120,6 +124,27 @@ Ideas for new Tools ``foo.begin()`` into ``begin(foo)`` and similarly for ``end()``, where ``foo`` is a standard container. We could also detect similar patterns for arrays. +* ``make_shared`` / ``make_unique`` conversion. Part of this transformation +can be incorporated into the ``auto`` transformation. Will convert + + .. code-block:: c++ + + std::shared_ptr sp(new Foo); + std::unique_ptr up(new Foo); + + func(std::shared_ptr(new Foo), bar()); + + into: + + .. code-block:: c++ + + auto sp = std::make_shared(); + auto up = std::make_unique(); // In C++14 mode. + + // This also affects correctness. For the cases where bar() throws, + // make_shared() is safe and the original code may leak. + func(std::make_shared(), bar()); + * ``tr1`` removal tool. Will migrate source code from using TR1 library features to C++11 library. For example: @@ -150,3 +175,17 @@ Ideas for new Tools that don't want to use ``auto`` because they are afraid that they might lose control over their code. +* C++14: less verbose operator function objects (`N3421 + `_). + For example: + + .. code-block:: c++ + + sort(v.begin(), v.end(), greater()); + + should be rewritten to: + + .. code-block:: c++ + + sort(v.begin(), v.end(), greater<>()); + Modified: vendor/clang/dist/docs/LanguageExtensions.rst ============================================================================== --- vendor/clang/dist/docs/LanguageExtensions.rst Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/docs/LanguageExtensions.rst Mon Jun 10 20:45:12 2013 (r251609) @@ -645,8 +645,7 @@ C++11 inheriting constructors ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use ``__has_feature(cxx_inheriting_constructors)`` to determine if support for -inheriting constructors is enabled. Clang does not currently implement this -feature. +inheriting constructors is enabled. C++11 inline namespaces ^^^^^^^^^^^^^^^^^^^^^^^ @@ -727,6 +726,12 @@ Use ``__has_feature(cxx_static_assert)`` ``__has_extension(cxx_static_assert)`` to determine if support for compile-time assertions using ``static_assert`` is enabled. +C++11 ``thread_local`` +^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_thread_local)`` to determine if support for +``thread_local`` variables is enabled. + C++11 type inference ^^^^^^^^^^^^^^^^^^^^ @@ -774,6 +779,98 @@ Use ``__has_feature(cxx_variadic_templat ``__has_extension(cxx_variadic_templates)`` to determine if support for variadic templates is enabled. +C++1y +----- + +The features listed below are part of the committee draft for the C++1y +standard. As a result, all these features are enabled with the ``-std=c++1y`` +or ``-std=gnu++1y`` option when compiling C++ code. + +C++1y binary literals +^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_binary_literals)`` or +``__has_extension(cxx_binary_literals)`` to determine whether +binary literals (for instance, ``0b10010``) are recognized. Clang supports this +feature as an extension in all language modes. + +C++1y contextual conversions +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_contextual_conversions)`` or +``__has_extension(cxx_contextual_conversions)`` to determine if the C++1y rules +are used when performing an implicit conversion for an array bound in a +*new-expression*, the operand of a *delete-expression*, an integral constant +expression, or a condition in a ``switch`` statement. Clang does not yet +support this feature. + +C++1y decltype(auto) +^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_decltype_auto)`` or +``__has_extension(cxx_decltype_auto)`` to determine if support +for the ``decltype(auto)`` placeholder type is enabled. + +C++1y default initializers for aggregates +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_aggregate_nsdmi)`` or +``__has_extension(cxx_aggregate_nsdmi)`` to determine if support +for default initializers in aggregate members is enabled. + +C++1y generalized lambda capture +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_generalized_capture)`` or +``__has_extension(cxx_generalized_capture`` to determine if support for +generalized lambda captures is enabled +(for instance, ``[n(0)] { return ++n; }``). +Clang does not yet support this feature. + +C++1y generic lambdas +^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_generic_lambda)`` or +``__has_extension(cxx_generic_lambda)`` to determine if support for generic +(polymorphic) lambdas is enabled +(for instance, ``[] (auto x) { return x + 1; }``). +Clang does not yet support this feature. + +C++1y relaxed constexpr +^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_relaxed_constexpr)`` or +``__has_extension(cxx_relaxed_constexpr)`` to determine if variable +declarations, local variable modification, and control flow constructs +are permitted in ``constexpr`` functions. +Clang's implementation of this feature is incomplete. + +C++1y return type deduction +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_return_type_deduction)`` or +``__has_extension(cxx_return_type_deduction)`` to determine if support +for return type deduction for functions (using ``auto`` as a return type) +is enabled. +Clang's implementation of this feature is incomplete. + +C++1y runtime-sized arrays +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_runtime_array)`` or +``__has_extension(cxx_runtime_array)`` to determine if support +for arrays of runtime bound (a restricted form of variable-length arrays) +is enabled. +Clang's implementation of this feature is incomplete. + +C++1y variable templates +^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(cxx_variable_templates)`` or +``__has_extension(cxx_variable_templates)`` to determine if support for +templated variable declarations is enabled. +Clang does not yet support this feature. + C11 --- @@ -818,6 +915,12 @@ Use ``__has_feature(c_static_assert)`` o to determine if support for compile-time assertions using ``_Static_assert`` is enabled. +C11 ``_Thread_local`` +^^^^^^^^^^^^^^^^^^^^^ + +Use ``__has_feature(c_thread_local)`` to determine if support for +``_Thread_local`` variables is enabled. + Checks for Type Traits ====================== Modified: vendor/clang/dist/docs/LibASTMatchersReference.html ============================================================================== --- vendor/clang/dist/docs/LibASTMatchersReference.html Mon Jun 10 20:37:56 2013 (r251608) +++ vendor/clang/dist/docs/LibASTMatchersReference.html Mon Jun 10 20:45:12 2013 (r251609) @@ -1513,6 +1513,34 @@ Usable as: Matcher<CXXMethodDecl>isOverride +
Matches if the given method declaration overrides another method.
+
+Given
+  class A {
+   public:
+    virtual void x();
+  };
+  class B : public A {
+   public:
+    virtual void x();
+  };
+  matches B::x
+
+ + +Matcher<CXXMethodDecl>isVirtual +
Matches if the given method declaration is virtual.
+
+Given
+  class A {
+   public:
+    virtual void x();
+  };
+  matches A::x
+
+ + Matcher<CXXOperatorCallExpr>hasOverloadedOperatorNameStringRef Name 
Matches overloaded operator names.
 

Modified: vendor/clang/dist/docs/LibASTMatchersTutorial.rst
==============================================================================
--- vendor/clang/dist/docs/LibASTMatchersTutorial.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/LibASTMatchersTutorial.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -27,6 +27,8 @@ guide  test.cpp
+      cat "int main() { return 0; }" > test.cpp
       bin/loop-convert test.cpp --
 
 Note the two dashes after we specify the source file. The additional
@@ -275,8 +277,9 @@ Add the following to ``LoopConvert.cpp``
       class LoopPrinter : public MatchFinder::MatchCallback {
       public :
         virtual void run(const MatchFinder::MatchResult &Result) {
-        if (const ForStmt *FS = Result.Nodes.getNodeAs("forLoop"))
-          FS->dump();
+          if (const ForStmt *FS = Result.Nodes.getNodeAs("forLoop"))
+            FS->dump();
+        }
       };
 
 And change ``main()`` to:
@@ -411,13 +414,13 @@ previous iteration of loop-convert, show
             (IntegerLiteral 0x173afa8 'int' 0)")
         <<>>
         (BinaryOperator 0x173b060 '_Bool' '<'
-          (ImplicitCastExpr 0x173b030 'int' 
+          (ImplicitCastExpr 0x173b030 'int'
             (DeclRefExpr 0x173afe0 'int' lvalue Var 0x173af50 'i' 'int'))
-          (ImplicitCastExpr 0x173b048 'int' 
+          (ImplicitCastExpr 0x173b048 'int'
             (DeclRefExpr 0x173b008 'const int' lvalue Var 0x170fa80 'N' 'const int')))
         (UnaryOperator 0x173b0b0 'int' lvalue prefix '++'
           (DeclRefExpr 0x173b088 'int' lvalue Var 0x173af50 'i' 'int'))
-        (CompoundStatement …
+        (CompoundStatement ...
 
 We already know that the declaration and increments both match, or this
 loop wouldn't have been dumped. The culprit lies in the implicit cast
@@ -460,32 +463,60 @@ Since we bind three variables (identifie
 InitVarName, and IncrementVarName), we can obtain the matched nodes by
 using the ``getNodeAs()`` member function.
 
-In ``LoopActions.cpp``:
+In ``LoopConvert.cpp`` add
 
 .. code-block:: c++
 
       #include "clang/AST/ASTContext.h"
 
+Change ``LoopMatcher`` to
+
+.. code-block:: c++
+
+      StatementMatcher LoopMatcher =
+          forStmt(hasLoopInit(declStmt(
+                      hasSingleDecl(varDecl(hasInitializer(integerLiteral(equals(0))))
+                                        .bind("initVarName")))),
+                  hasIncrement(unaryOperator(
+                      hasOperatorName("++"),
+                      hasUnaryOperand(declRefExpr(
+                          to(varDecl(hasType(isInteger())).bind("incVarName")))))),
+                  hasCondition(binaryOperator(
+                      hasOperatorName("<"),
+                      hasLHS(ignoringParenImpCasts(declRefExpr(
+                          to(varDecl(hasType(isInteger())).bind("condVarName"))))),
+                      hasRHS(expr(hasType(isInteger())))))).bind("forLoop");
+
+And change ``LoopPrinter::run`` to
+
+.. code-block:: c++
+
       void LoopPrinter::run(const MatchFinder::MatchResult &Result) {
         ASTContext *Context = Result.Context;
-        const ForStmt *FS = Result.Nodes.getStmtAs(LoopName);
+        const ForStmt *FS = Result.Nodes.getStmtAs("forLoop");
         // We do not want to convert header files!
         if (!FS || !Context->getSourceManager().isFromMainFile(FS->getForLoc()))
           return;
-        const VarDecl *IncVar = Result.Nodes.getNodeAs(IncrementVarName);
-        const VarDecl *CondVar = Result.Nodes.getNodeAs(ConditionVarName);
-        const VarDecl *InitVar = Result.Nodes.getNodeAs(InitVarName);
+        const VarDecl *IncVar = Result.Nodes.getNodeAs("incVarName");
+        const VarDecl *CondVar = Result.Nodes.getNodeAs("condVarName");
+        const VarDecl *InitVar = Result.Nodes.getNodeAs("initVarName");
+
+        if (!areSameVariable(IncVar, CondVar) || !areSameVariable(IncVar, InitVar))
+          return;
+        llvm::outs() << "Potential array-based loop discovered.\n";
+      }
 
-Now that we have the three variables, represented by their respective
-declarations, let's make sure that they're all the same, using a helper
-function I call ``areSameVariable()``.
+Clang associates a ``VarDecl`` with each variable to represent the variable's
+declaration. Since the "canonical" form of each declaration is unique by
+address, all we need to do is make sure neither ``ValueDecl`` (base class of
+``VarDecl``) is ``NULL`` and compare the canonical Decls.
 
 .. code-block:: c++
 
-      if (!areSameVariable(IncVar, CondVar) || !areSameVariable(IncVar, InitVar))
-        return;
-      llvm::outs() << "Potential array-based loop discovered.\n";
-    }
+      static bool areSameVariable(const ValueDecl *First, const ValueDecl *Second) {
+        return First && Second &&
+               First->getCanonicalDecl() == Second->getCanonicalDecl();
+      }
 
 If execution reaches the end of ``LoopPrinter::run()``, we know that the
 loop shell that looks like
@@ -498,21 +529,8 @@ For now, we will just print a message ex
 The next section will deal with recursively traversing the AST to
 discover all changes needed.
 
-As a side note, here is the implementation of ``areSameVariable``. Clang
-associates a ``VarDecl`` with each variable to represent the variable's
-declaration. Since the "canonical" form of each declaration is unique by
-address, all we need to do is make sure neither ``ValueDecl`` (base
-class of ``VarDecl``) is ``NULL`` and compare the canonical Decls.
-
-.. code-block:: c++
-
-      static bool areSameVariable(const ValueDecl *First, const ValueDecl *Second) {
-        return First && Second &&
-               First->getCanonicalDecl() == Second->getCanonicalDecl();
-      }
-
-It's not as trivial to test if two expressions are the same, though
-Clang has already done the hard work for us by providing a way to
+As a side note, it's not as trivial to test if two expressions are the same,
+though Clang has already done the hard work for us by providing a way to
 canonicalize expressions:
 
 .. code-block:: c++

Modified: vendor/clang/dist/docs/MemorySanitizer.rst
==============================================================================
--- vendor/clang/dist/docs/MemorySanitizer.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/MemorySanitizer.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -46,7 +46,7 @@ to disable inlining (just use ``-O1``) a
       return 0;
     }
 
-    % clang -fsanitize=memory -fPIE -pie -fno-omit-frame-pointer -g -O2 umr.cc
+    % clang -fsanitize=memory -fno-omit-frame-pointer -g -O2 umr.cc
 
 If a bug is detected, the program will print an error message to
 stderr and exit with a non-zero exit code. Currently, MemorySanitizer
@@ -103,7 +103,7 @@ the example above,
 
 .. code-block:: console
 
-    % clang -fsanitize=memory -fsanitize-memory-track-origins -fPIE -pie -fno-omit-frame-pointer -g -O2 umr.cc
+    % clang -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -g -O2 umr.cc
     % ./a.out 2>log
     % projects/compiler-rt/lib/asan/scripts/asan_symbolize.py / < log | c++filt
     ==14425==  WARNING: MemorySanitizer: UMR (uninitialized-memory-read)
@@ -160,7 +160,10 @@ Limitations
   address space. This means that tools like ``ulimit`` may not work as
   usually expected.
 * Static linking is not supported.
-* Non-position-independent executables are not supported.
+* Non-position-independent executables are not supported.  Therefore, the
+  ``fsanitize=memory`` flag will cause Clang to act as though the ``-fPIE``
+  flag had been supplied if compiling without ``-fPIC``, and as though the
+  ``-pie`` flag had been supplied if linking an executable.
 * Depending on the version of Linux kernel, running without ASLR may
   be not supported. Note that GDB disables ASLR by default. To debug
   instrumented programs, use "set disable-randomization off".

Modified: vendor/clang/dist/docs/Modules.rst
==============================================================================
--- vendor/clang/dist/docs/Modules.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/Modules.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -168,8 +168,8 @@ Command-line parameters
 ``-fmodules-cache-path=``
   Specify the path to the modules cache. If not provided, Clang will select a system-appropriate default.
 
-``-f[no-]modules-autolink``
-  Enable of disable automatic linking against the libraries associated with imported modules.
+``-fno-autolink``
+  Disable automatic linking against the libraries associated with imported modules.
 
 ``-fmodules-ignore-macro=macroname``
   Instruct modules to ignore the named macro when selecting an appropriate module variant. Use this for macros defined on the command line that don't affect how modules are built, to improve sharing of compiled module files.

Modified: vendor/clang/dist/docs/ReleaseNotes.rst
==============================================================================
--- vendor/clang/dist/docs/ReleaseNotes.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/ReleaseNotes.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -1,6 +1,6 @@
-=====================================
-Clang 3.3 (In-Progress) Release Notes
-=====================================
+=======================
+Clang 3.3 Release Notes
+=======================
 
 .. contents::
    :local:
@@ -8,41 +8,33 @@ Clang 3.3 (In-Progress) Release Notes
 
 Written by the `LLVM Team `_
 
-.. warning::
-
-   These are in-progress notes for the upcoming Clang 3.3 release. You may
-   prefer the `Clang 3.2 Release Notes
-   `_.
-
 Introduction
 ============
 
 This document contains the release notes for the Clang C/C++/Objective-C
 frontend, part of the LLVM Compiler Infrastructure, release 3.3. Here we
-describe the status of Clang in some detail, including major
-improvements from the previous release and new feature work. For the
-general LLVM release notes, see `the LLVM
-documentation `_. All LLVM
-releases may be downloaded from the `LLVM releases web
-site `_.
-
-For more information about Clang or LLVM, including information about
-the latest release, please check out the main please see the `Clang Web
-Site `_ or the `LLVM Web
-Site `_.
-
-Note that if you are reading this file from a Subversion checkout or the
-main Clang web page, this document applies to the *next* release, not
-the current one. To see the release notes for a specific release, please
-see the `releases page `_.
+describe the status of Clang in some detail, including major improvements from
+the previous release and new feature work. For the general LLVM release notes,
+see `the LLVM documentation `_. All LLVM
+releases may be downloaded from the `LLVM releases web site
+`_.
+
+For more information about Clang or LLVM, including information about the latest
+release, please check out the main please see the `Clang Web Site
+`_ or the `LLVM Web Site `_.
+
+Note that if you are reading this file from a Subversion checkout or the main
+Clang web page, this document applies to the *next* release, not the current
+one. To see the release notes for a specific release, please see the `releases
+page `_.
 
 What's New in Clang 3.3?
 ========================
 
 Some of the major new features and improvements to Clang are listed
 here. Generic improvements to Clang as a whole or to its underlying
-infrastructure are described first, followed by language-specific
-sections with improvements to Clang's support for those languages.
+infrastructure are described first, followed by language-specific sections with
+improvements to Clang's support for those languages.
 
 Major New Features
 ------------------
@@ -54,8 +46,6 @@ Clang's diagnostics are constantly being
 explain them more clearly, and provide more accurate source information
 about them. The improvements since the 3.2 release include:
 
--  ...
-
 Extended Identifiers: Unicode Support and Universal Character Names
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -65,31 +55,17 @@ specified by the active language standar
 directly in the source file using the UTF-8 encoding, or referred to using
 *universal character names* (``\u00E0``, ``\U000000E0``).
 
-New Compiler Flags
-------------------
-
--  ...
-
 C Language Changes in Clang
 ---------------------------
 
-C11 Feature Support
-^^^^^^^^^^^^^^^^^^^
-
-...
-
 C++ Language Changes in Clang
 -----------------------------
 
-C++11 Feature Support
-^^^^^^^^^^^^^^^^^^^^^
-
-...
-
-Objective-C Language Changes in Clang
--------------------------------------
-
-...
+- Clang now correctly implements language linkage for functions and variables.
+  This means that, for example, it is now possible to overload static functions
+  declared in an ``extern "C"`` context. For backwards compatibility, an alias
+  with the unmangled name is still emitted if it is the only one and has the
+  ``used`` attribute.
 
 Internal API Changes
 --------------------
@@ -118,16 +94,40 @@ Storage Class
 For each variable and function Clang used to keep the storage class as written
 in the source, the linkage and a semantic storage class. This was a bit
 redundant and the semantic storage class has been removed. The method
-getStorageClass now returns what is written it the source code for that decl.
+getStorageClass now returns what is written in the source code for that decl.
 
-...
+libclang
+--------
 
-Python Binding Changes
-----------------------
+The clang_CXCursorSet_contains() function previously incorrectly returned 0
+if it contained a CXCursor, contrary to what the documentation stated.  This
+has been fixed so that the function returns a non-zero value if the set
+contains a cursor.  This is API breaking change, but matches the intended
+original behavior.  Moreover, this also fixes the issue of an invalid CXCursorSet
+appearing to contain any CXCursor.
+
+Static Analyzer
+---------------
+
+The static analyzer (which contains additional code checking beyond compiler
+warnings) has improved significantly in both in the core analysis engine and 
+also in the kinds of issues it can find.
 
-The following methods have been added:
+Core Analysis Improvements
+==========================
 
--  ...
+- Support for interprocedural reasoning about constructors and destructors.
+- New false positive suppression mechanisms that reduced the number of false
+  null pointer dereference warnings due to interprocedural analysis.
+- Major performance enhancements to speed up interprocedural analysis
+
+New Issues Found
+================
+
+- New memory error checks such as use-after-free with C++ 'delete'.
+- Detection of mismatched allocators and deallocators (e.g., using 'new' with
+  'free()', 'malloc()' with 'delete').
+- Additional checks for misuses of Apple Foundation framework collection APIs.
 
 Significant Known Problems
 ==========================
@@ -135,13 +135,11 @@ Significant Known Problems
 Additional Information
 ======================
 
-A wide variety of additional information is available on the `Clang web
-page `_. The web page contains versions of the
-API documentation which are up-to-date with the Subversion version of
-the source code. You can access versions of these documents specific to
-this release by going into the "``clang/docs/``" directory in the Clang
-tree.
-
-If you have any questions or comments about Clang, please feel free to
-contact us via the `mailing
-list `_.
+A wide variety of additional information is available on the `Clang web page
+`_. The web page contains versions of the API
+documentation which are up-to-date with the Subversion version of the source
+code. You can access versions of these documents specific to this release by
+going into the "``clang/docs/``" directory in the Clang tree.
+
+If you have any questions or comments about Clang, please feel free to contact
+us via the `mailing list `_.

Modified: vendor/clang/dist/docs/ThreadSanitizer.rst
==============================================================================
--- vendor/clang/dist/docs/ThreadSanitizer.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/ThreadSanitizer.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -25,9 +25,9 @@ platforms is problematic and not yet pla
 Usage
 -----
 
-Simply compile your program with ``-fsanitize=thread -fPIE`` and link it with
-``-fsanitize=thread -pie``.  To get a reasonable performance add ``-O1`` or
-higher.  Use ``-g`` to get file names and line numbers in the warning messages.
+Simply compile and link your program with ``-fsanitize=thread``.  To get a
+reasonable performance add ``-O1`` or higher.  Use ``-g`` to get file names
+and line numbers in the warning messages.
 
 Example:
 
@@ -48,7 +48,7 @@ Example:
     return Global;
   }
 
-  $ clang -fsanitize=thread -g -O1 tiny_race.c -fPIE -pie
+  $ clang -fsanitize=thread -g -O1 tiny_race.c
 
 If a bug is detected, the program will print an error message to stderr.
 Currently, ThreadSanitizer symbolizes its output using an external
@@ -107,7 +107,10 @@ Limitations
 * ThreadSanitizer maps (but does not reserve) a lot of virtual address space.
   This means that tools like ``ulimit`` may not work as usually expected.
 * Libc/libstdc++ static linking is not supported.
-* ThreadSanitizer requires ``-fPIE -pie`` compiler flags.
+* Non-position-independent executables are not supported.  Therefore, the
+  ``fsanitize=thread`` flag will cause Clang to act as though the ``-fPIE``
+  flag had been supplied if compiling without ``-fPIC``, and as though the
+  ``-pie`` flag had been supplied if linking an executable.
 
 Current Status
 --------------

Modified: vendor/clang/dist/docs/UsersManual.rst
==============================================================================
--- vendor/clang/dist/docs/UsersManual.rst	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/UsersManual.rst	Mon Jun 10 20:45:12 2013	(r251609)
@@ -652,6 +652,31 @@ supports the GCC pragma, Clang and GCC d
 of warnings, so even when using GCC compatible #pragmas there is no
 guarantee that they will have identical behaviour on both compilers.
 
+In addition to controlling warnings and errors generated by the compiler, it is
+possible to generate custom warning and error messages through the following
+pragmas:
+
+.. code-block:: c
+
+  // The following will produce warning messages
+  #pragma message "some diagnostic message"
+  #pragma GCC warning "TODO: replace deprecated feature"
+
+  // The following will produce an error message
+  #pragma GCC error "Not supported"
+
+These pragmas operate similarly to the ``#warning`` and ``#error`` preprocessor
+directives, except that they may also be embedded into preprocessor macros via
+the C99 ``_Pragma`` operator, for example:
+
+.. code-block:: c
+
+  #define STR(X) #X
+  #define DEFER(M,...) M(__VA_ARGS__)
+  #define CUSTOM_ERROR(X) _Pragma(STR(GCC error(X " at line " DEFER(STR,__LINE__))))
+
+  CUSTOM_ERROR("Feature not available");
+
 Controlling Diagnostics in System Headers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1005,6 +1030,19 @@ below. If multiple flags are present, th
 
   Generate complete debug info.
 
+Comment Parsing Options
+--------------------------
+
+Clang parses Doxygen and non-Doxygen style documentation comments and attaches
+them to the appropriate declaration nodes.  By default, it only parses
+Doxygen-style comments and ignores ordinary comments starting with ``//`` and
+``/*``.
+
+.. option:: -fparse-all-comments
+
+  Parse all comments as documentation comments (including ordinary comments
+  starting with ``//`` and ``/*``).
+
 .. _c:
 
 C Language Features

Modified: vendor/clang/dist/docs/tools/clang.pod
==============================================================================
--- vendor/clang/dist/docs/tools/clang.pod	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/docs/tools/clang.pod	Mon Jun 10 20:45:12 2013	(r251609)
@@ -7,7 +7,7 @@ clang - the Clang C, C++, and Objective-
 =head1 SYNOPSIS
 
 B [B<-c>|B<-S>|B<-E>] B<-std=>I B<-g>
-  [B<-O0>|B<-O1>|B<-O2>|B<-Os>|B<-Oz>|B<-O3>|B<-O4>]
+  [B<-O0>|B<-O1>|B<-O2>|B<-Os>|B<-Oz>|B<-O3>|B<-Ofast>|B<-O4>]
   B<-W>I B<-pedantic>
   B<-I>I B<-L>I
   B<-D>I
@@ -263,7 +263,7 @@ may not exist on earlier ones.
 
 =over
 
-=item B<-O0> B<-O1> B<-O2> B<-Os> B<-Oz> B<-O3> B<-O4>
+=item B<-O0> B<-O1> B<-O2> B<-Os> B<-Oz> B<-O3> B<-Ofast> B<-O4>
 
 Specify which optimization level to use.  B<-O0> means "no optimization": this
 level compiles the fastest and generates the most debuggable code.  B<-O2> is a
@@ -271,7 +271,9 @@ moderate level of optimization which ena
 B<-O2> with extra optimizations to reduce code size.  B<-Oz> is like B<-Os> 
 (and thus B<-O2>), but reduces code size further.  B<-O3> is like B<-O2>,
 except that it enables optimizations that take longer to perform or that may
-generate larger code (in an attempt to make the program run faster).  On
+generate larger code (in an attempt to make the program run faster).
+B<-Ofast> enables all the optimizations from B<-O3> along with other aggressive
+optimizations that may violate strict compliance with language standards. On
 supported platforms, B<-O4> enables link-time optimization; object files are
 stored in the LLVM bitcode file format and whole program optimization is done at
 link time. B<-O1> is somewhere between B<-O0> and B<-O2>.

Modified: vendor/clang/dist/include/clang-c/Index.h
==============================================================================
--- vendor/clang/dist/include/clang-c/Index.h	Mon Jun 10 20:37:56 2013	(r251608)
+++ vendor/clang/dist/include/clang-c/Index.h	Mon Jun 10 20:45:12 2013	(r251609)
@@ -32,7 +32,7 @@
  * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable.
  */
 #define CINDEX_VERSION_MAJOR 0
-#define CINDEX_VERSION_MINOR 15
+#define CINDEX_VERSION_MINOR 19
 
 #define CINDEX_VERSION_ENCODE(major, minor) ( \
       ((major) * 10000)                       \
@@ -409,6 +409,11 @@ CINDEX_LINKAGE CXSourceLocation clang_ge
                                                            unsigned offset);
 
 /**
+ * \brief Returns non-zero if the given source location is in a system header.
+ */
+CINDEX_LINKAGE int clang_Location_isInSystemHeader(CXSourceLocation location);
+
+/**
  * \brief Retrieve a NULL (invalid) source range.
  */
 CINDEX_LINKAGE CXSourceRange clang_getNullRange(void);
@@ -1898,7 +1903,11 @@ enum CXCursorKind {
    */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Mon Jun 10 20:46:07 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B5E79196;
 Mon, 10 Jun 2013 20:46:07 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E61510B7;
 Mon, 10 Jun 2013 20:46:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AKk79i024646;
 Mon, 10 Jun 2013 20:46:07 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AKk7rj024645;
 Mon, 10 Jun 2013 20:46:07 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201306102046.r5AKk7rj024645@svn.freebsd.org>
From: Dimitry Andric 
Date: Mon, 10 Jun 2013 20:46:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251610 - vendor/clang/clang-release_33-r183502
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Mon, 10 Jun 2013 20:46:07 -0000

Author: dim
Date: Mon Jun 10 20:46:07 2013
New Revision: 251610
URL: http://svnweb.freebsd.org/changeset/base/251610

Log:
  Tag clang tags/RELEASE_33/final r183502 (effectively, 3.3 release).

Added:
  vendor/clang/clang-release_33-r183502/
     - copied from r251609, vendor/clang/dist/

From owner-svn-src-all@FreeBSD.ORG  Mon Jun 10 21:14:23 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E435B6C2;
 Mon, 10 Jun 2013 21:14:23 +0000 (UTC) (envelope-from cognet@ci0.org)
Received: from kanar.ci0.org (unknown
 [IPv6:2a01:e0b:1:150:ca0a:a9ff:fef1:a4c9])
 by mx1.freebsd.org (Postfix) with ESMTP id 689BE11B8;
 Mon, 10 Jun 2013 21:14:22 +0000 (UTC)
Received: from kanar.ci0.org (pluxor@localhost [127.0.0.1])
 by kanar.ci0.org (8.14.5/8.14.5) with ESMTP id r5ALDw5i055413;
 Mon, 10 Jun 2013 23:13:58 +0200 (CEST) (envelope-from cognet@ci0.org)
Received: (from doginou@localhost)
 by kanar.ci0.org (8.14.5/8.14.5/Submit) id r5ALDweh055412;
 Mon, 10 Jun 2013 23:13:58 +0200 (CEST) (envelope-from cognet@ci0.org)
X-Authentication-Warning: kanar.ci0.org: doginou set sender to cognet@ci0.org
 using -f
Date: Mon, 10 Jun 2013 23:13:58 +0200
From: Olivier Houchard 
To: Konstantin Belousov 
Subject: Re: svn commit: r251586 - head/sys/arm/ti
Message-ID: <20130610211358.GA55399@ci0.org>
References: <201306092251.r59MpCmW006162@svn.freebsd.org>
 <20130610035547.GX3047@kib.kiev.ua>
 <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu>
 <20130610193736.GF3047@kib.kiev.ua>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130610193736.GF3047@kib.kiev.ua>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Mon, 10 Jun 2013 21:14:24 -0000

On Mon, Jun 10, 2013 at 10:37:36PM +0300, Konstantin Belousov wrote:
> On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote:
> > On 06/10/2013 06:08, Olivier Houchard wrote:
> > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote:
> > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote:
> > >>> Author: cognet
> > >>> Date: Sun Jun  9 22:51:11 2013
> > >>> New Revision: 251586
> > >>> URL: http://svnweb.freebsd.org/changeset/base/251586
> > >>>
> > >>> Log:
> > >>>   Increase the maximum KVM available on TI chips. Not sure why we suddenly need
> > >>>   that much, but that lets me boot with 1GB of RAM.
> > >> I suspect that the cause is the combination of limited KVA and
> > >> lack of any limitation for the buffer map. I noted that ARM lacks
> > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a
> > >> day ago.
> > >>
> > >> In essence, the buffer map is allowed to take up to ~330MB when no
> > >> upper limit from VM_BCACHE_SIZE_MAX is specified.
> > >
> > > Hi Konstantin,
> > >
> > > Thanks for the hint !
> > > It seems only i386 and sparc64 sets it, what would be a good value, 200M, as
> > > it is on i386 ?
> > >
> > 
> > Since there are many arm platforms with less than 1 GB of kernel virtual
> > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down
> > from 200 MB with the available KVA space.  See how VM_KMEM_SIZE_MAX is
> > currently defined on arm.
> 
> In fact, Ithink it does not make much sense to scale the buffer cache up.
> It is mostly wasted space now.  As I measured it, on typical load you
> have only 10-20% of instantiated buffers mapped.
> 
> Alexander Motin reported that he tested the equivalent of the following
> change.  With it committed, I think that r251586 could be reverted.
> 
> diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
> index 9ffb118..5c738c2 100644
> --- a/sys/arm/include/param.h
> +++ b/sys/arm/include/param.h
> @@ -128,6 +128,11 @@
>  #define USPACE_SVC_STACK_BOTTOM		(USPACE_SVC_STACK_TOP - 0x1000)
>  #define USPACE_UNDEF_STACK_TOP		(USPACE_SVC_STACK_BOTTOM - 0x10)
>  #define USPACE_UNDEF_STACK_BOTTOM	(FPCONTEXTSIZE + 10)
> +
> +#ifndef VM_BCACHE_SIZE_MAX
> +#define	VM_BCACHE_SIZE_MAX	(128 * 1024 * 1024)
> +#endif
> +
>  /*
>   * Mach derived conversion macros
>   */


I tested it with my changes reverted and it works indeed, so I'm fine with
this being committed and my changes being reverted.

Regards,

Olivier

From owner-svn-src-all@FreeBSD.ORG  Mon Jun 10 23:09:46 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 301E8325;
 Mon, 10 Jun 2013 23:09:46 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 215811960;
 Mon, 10 Jun 2013 23:09:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AN9jGB069128;
 Mon, 10 Jun 2013 23:09:45 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AN9jrm069127;
 Mon, 10 Jun 2013 23:09:45 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306102309.r5AN9jrm069127@svn.freebsd.org>
From: Brooks Davis 
Date: Mon, 10 Jun 2013 23:09:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251611 - stable/9/usr.bin/xinstall
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Mon, 10 Jun 2013 23:09:46 -0000

Author: brooks
Date: Mon Jun 10 23:09:45 2013
New Revision: 251611
URL: http://svnweb.freebsd.org/changeset/base/251611

Log:
  MFC r251424:
  
  New install flags were merged to 9-STABLE and will appear in
  FreeBSD-9.2.
  
  Sponsored by:	DARPA, AFRL
  Submitted by:	ru

Modified:
  stable/9/usr.bin/xinstall/install.1
Directory Properties:
  stable/9/usr.bin/xinstall/   (props changed)

Modified: stable/9/usr.bin/xinstall/install.1
==============================================================================
--- stable/9/usr.bin/xinstall/install.1	Mon Jun 10 20:46:07 2013	(r251610)
+++ stable/9/usr.bin/xinstall/install.1	Mon Jun 10 23:09:45 2013	(r251611)
@@ -351,7 +351,7 @@ utility appeared in
 The meaning of the
 .Fl M
 option has changed as of
-.Fx 10
+.Fx 9.2
 and it now takes an argument.
 Command lines that used the old
 .Fl M

From owner-svn-src-all@FreeBSD.ORG  Mon Jun 10 23:11:17 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BCF2F4BD;
 Mon, 10 Jun 2013 23:11:17 +0000 (UTC) (envelope-from cognet@ci0.org)
Received: from kanar.ci0.org (unknown
 [IPv6:2a01:e0b:1:150:ca0a:a9ff:fef1:a4c9])
 by mx1.freebsd.org (Postfix) with ESMTP id 54DA11978;
 Mon, 10 Jun 2013 23:11:17 +0000 (UTC)
Received: from kanar.ci0.org (pluxor@localhost [127.0.0.1])
 by kanar.ci0.org (8.14.5/8.14.5) with ESMTP id r5ANArCq057180;
 Tue, 11 Jun 2013 01:10:53 +0200 (CEST) (envelope-from cognet@ci0.org)
Received: (from doginou@localhost)
 by kanar.ci0.org (8.14.5/8.14.5/Submit) id r5ANAqf4057179;
 Tue, 11 Jun 2013 01:10:52 +0200 (CEST) (envelope-from cognet@ci0.org)
X-Authentication-Warning: kanar.ci0.org: doginou set sender to cognet@ci0.org
 using -f
Date: Tue, 11 Jun 2013 01:10:52 +0200
From: Olivier Houchard 
To: Konstantin Belousov 
Subject: Re: svn commit: r251586 - head/sys/arm/ti
Message-ID: <20130610231052.GA57152@ci0.org>
References: <201306092251.r59MpCmW006162@svn.freebsd.org>
 <20130610035547.GX3047@kib.kiev.ua>
 <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu>
 <20130610193736.GF3047@kib.kiev.ua>
 <20130610211358.GA55399@ci0.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130610211358.GA55399@ci0.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Mon, 10 Jun 2013 23:11:17 -0000

On Mon, Jun 10, 2013 at 11:13:58PM +0200, Olivier Houchard wrote:
> On Mon, Jun 10, 2013 at 10:37:36PM +0300, Konstantin Belousov wrote:
> > On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote:
> > > On 06/10/2013 06:08, Olivier Houchard wrote:
> > > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote:
> > > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote:
> > > >>> Author: cognet
> > > >>> Date: Sun Jun  9 22:51:11 2013
> > > >>> New Revision: 251586
> > > >>> URL: http://svnweb.freebsd.org/changeset/base/251586
> > > >>>
> > > >>> Log:
> > > >>>   Increase the maximum KVM available on TI chips. Not sure why we suddenly need
> > > >>>   that much, but that lets me boot with 1GB of RAM.
> > > >> I suspect that the cause is the combination of limited KVA and
> > > >> lack of any limitation for the buffer map. I noted that ARM lacks
> > > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a
> > > >> day ago.
> > > >>
> > > >> In essence, the buffer map is allowed to take up to ~330MB when no
> > > >> upper limit from VM_BCACHE_SIZE_MAX is specified.
> > > >
> > > > Hi Konstantin,
> > > >
> > > > Thanks for the hint !
> > > > It seems only i386 and sparc64 sets it, what would be a good value, 200M, as
> > > > it is on i386 ?
> > > >
> > > 
> > > Since there are many arm platforms with less than 1 GB of kernel virtual
> > > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down
> > > from 200 MB with the available KVA space.  See how VM_KMEM_SIZE_MAX is
> > > currently defined on arm.
> > 
> > In fact, Ithink it does not make much sense to scale the buffer cache up.
> > It is mostly wasted space now.  As I measured it, on typical load you
> > have only 10-20% of instantiated buffers mapped.
> > 
> > Alexander Motin reported that he tested the equivalent of the following
> > change.  With it committed, I think that r251586 could be reverted.
> > 
> > diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
> > index 9ffb118..5c738c2 100644
> > --- a/sys/arm/include/param.h
> > +++ b/sys/arm/include/param.h
> > @@ -128,6 +128,11 @@
> >  #define USPACE_SVC_STACK_BOTTOM		(USPACE_SVC_STACK_TOP - 0x1000)
> >  #define USPACE_UNDEF_STACK_TOP		(USPACE_SVC_STACK_BOTTOM - 0x10)
> >  #define USPACE_UNDEF_STACK_BOTTOM	(FPCONTEXTSIZE + 10)
> > +
> > +#ifndef VM_BCACHE_SIZE_MAX
> > +#define	VM_BCACHE_SIZE_MAX	(128 * 1024 * 1024)
> > +#endif
> > +
> >  /*
> >   * Mach derived conversion macros
> >   */
> 
> 
> I tested it with my changes reverted and it works indeed, so I'm fine with
> this being committed and my changes being reverted.
> 

In fact I spoke too soon. It's getting further, but I'm ending up getting
vm_thread_new: kstack allocation failed
Probably because I have a local patch that aligns the stack on 32kB, which
is something we have to do if we want to store curthread on the kstack.
It will boot if I reduce VM_DCACHE_SIZE_MAX to 64MB, but it's probably not
the best thing to do.

Regards,

Olivier

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 02:47:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E0C04AE4;
 Tue, 11 Jun 2013 02:47:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B9523161B;
 Tue, 11 Jun 2013 02:47:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B2l8DJ038591;
 Tue, 11 Jun 2013 02:47:08 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5B2l8k3038588;
 Tue, 11 Jun 2013 02:47:08 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306110247.r5B2l8k3038588@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Tue, 11 Jun 2013 02:47:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251612 - head/sys/fs/ext2fs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 02:47:09 -0000

Author: pfg
Date: Tue Jun 11 02:47:07 2013
New Revision: 251612
URL: http://svnweb.freebsd.org/changeset/base/251612

Log:
  s/file system/filesystem/g
  
  Based on r96755 from UFS.
  
  MFC after:	3 days

Modified:
  head/sys/fs/ext2fs/ext2_alloc.c
  head/sys/fs/ext2fs/ext2_balloc.c
  head/sys/fs/ext2fs/ext2_vfsops.c

Modified: head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_alloc.c	Mon Jun 10 23:09:45 2013	(r251611)
+++ head/sys/fs/ext2fs/ext2_alloc.c	Tue Jun 11 02:47:07 2013	(r251612)
@@ -63,7 +63,7 @@ static daddr_t	ext2_nodealloccg(struct i
 static daddr_t  ext2_mapsearch(struct m_ext2fs *, char *, daddr_t);
 
 /*
- * Allocate a block in the file system.
+ * Allocate a block in the filesystem.
  *
  * A preference may be optionally specified. If a preference is given
  * the following hierarchy is used to allocate a block:
@@ -125,8 +125,8 @@ ext2_alloc(struct inode *ip, int32_t lbn
         }
 nospace:
 	EXT2_UNLOCK(ump);
-	ext2_fserr(fs, cred->cr_uid, "file system full");
-	uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt);
+	ext2_fserr(fs, cred->cr_uid, "filesystem full");
+	uprintf("\n%s: write failed, filesystem is full\n", fs->e2fs_fsmnt);
 	return (ENOSPC);
 }
 
@@ -338,7 +338,7 @@ fail:
 }
 
 /*
- * Allocate an inode in the file system.
+ * Allocate an inode in the filesystem.
  * 
  */
 int
@@ -1083,7 +1083,7 @@ ext2_mapsearch(struct m_ext2fs *fs, char
 }
 
 /*
- * Fserr prints the name of a file system with an error diagnostic.
+ * Fserr prints the name of a filesystem with an error diagnostic.
  * 
  * The form of the error message is:
  *	fs: error message

Modified: head/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_balloc.c	Mon Jun 10 23:09:45 2013	(r251611)
+++ head/sys/fs/ext2fs/ext2_balloc.c	Tue Jun 11 02:47:07 2013	(r251612)
@@ -50,7 +50,7 @@
 #include 
 #include 
 /*
- * Balloc defines the structure of file system storage
+ * Balloc defines the structure of filesystem storage
  * by allocating the physical blocks on a device given
  * the inode and the logical block number in a file.
  */

Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vfsops.c	Mon Jun 10 23:09:45 2013	(r251611)
+++ head/sys/fs/ext2fs/ext2_vfsops.c	Tue Jun 11 02:47:07 2013	(r251612)
@@ -747,7 +747,7 @@ ext2_flushfiles(struct mount *mp, int fl
 	return (error);
 }
 /*
- * Get file system statistics.
+ * Get filesystem statistics.
  */
 int
 ext2_statfs(struct mount *mp, struct statfs *sbp)
@@ -852,7 +852,7 @@ loop:
 	}
 
 	/*
-	 * Force stale file system control information to be flushed.
+	 * Force stale filesystem control information to be flushed.
 	 */
 	if (waitfor != MNT_LAZY) {
 		vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 03:37:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CCA3D54E;
 Tue, 11 Jun 2013 03:37:29 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BEE2918B3;
 Tue, 11 Jun 2013 03:37:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B3bTS9055799;
 Tue, 11 Jun 2013 03:37:29 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5B3bTDV055796;
 Tue, 11 Jun 2013 03:37:29 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306110337.r5B3bTDV055796@svn.freebsd.org>
From: Devin Teske 
Date: Tue, 11 Jun 2013 03:37:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251613 - in head/usr.sbin/bsdconfig/share: . media
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 03:37:29 -0000

Author: dteske
Date: Tue Jun 11 03:37:29 2013
New Revision: 251613
URL: http://svnweb.freebsd.org/changeset/base/251613

Log:
  Make the default choice for FTP media access use "auto".

Modified:
  head/usr.sbin/bsdconfig/share/media/any.subr
  head/usr.sbin/bsdconfig/share/variable.subr

Modified: head/usr.sbin/bsdconfig/share/media/any.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/any.subr	Tue Jun 11 02:47:07 2013	(r251612)
+++ head/usr.sbin/bsdconfig/share/media/any.subr	Tue Jun 11 03:37:29 2013	(r251613)
@@ -122,7 +122,7 @@ f_media_get_type()
 
 		case "$mtag" in
 		?" $msg_cd_dvd")      f_media_set_cdrom ;;
-		?" $msg_ftp")         f_media_set_ftp_active ;;
+		?" $msg_ftp")         f_media_set_ftp ;;
 		?" $msg_ftp_passive") f_media_set_ftp_passive ;;
 		?" $msg_http")        f_media_set_http_proxy ;;
 		?" $msg_directory")   f_media_set_directory ;;

Modified: head/usr.sbin/bsdconfig/share/variable.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/variable.subr	Tue Jun 11 02:47:07 2013	(r251612)
+++ head/usr.sbin/bsdconfig/share/variable.subr	Tue Jun 11 03:37:29 2013	(r251613)
@@ -110,7 +110,7 @@ f_variable_set_defaults()
 	# Initialize various user-edittable values to their defaults
 	#
 	setvar $VAR_EDITOR		"${EDITOR:-/usr/bin/ee}"
-	setvar $VAR_FTP_STATE		"passive"
+	setvar $VAR_FTP_STATE		"auto"
 	setvar $VAR_FTP_USER		"ftp"
 	setvar $VAR_HOSTNAME		"$( hostname )"
 	setvar $VAR_MEDIA_TIMEOUT	"300"

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 05:22:08 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5C3BA2C6;
 Tue, 11 Jun 2013 05:22:08 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 by mx1.freebsd.org (Postfix) with ESMTP id C0E171C11;
 Tue, 11 Jun 2013 05:22:07 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r5B5Lqhg089687;
 Tue, 11 Jun 2013 08:21:52 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r5B5Lqhg089687
Received: (from kostik@localhost)
 by tom.home (8.14.7/8.14.7/Submit) id r5B5Lq3s089686;
 Tue, 11 Jun 2013 08:21:52 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Tue, 11 Jun 2013 08:21:52 +0300
From: Konstantin Belousov 
To: Olivier Houchard 
Subject: Re: svn commit: r251586 - head/sys/arm/ti
Message-ID: <20130611052152.GG3047@kib.kiev.ua>
References: <201306092251.r59MpCmW006162@svn.freebsd.org>
 <20130610035547.GX3047@kib.kiev.ua>
 <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu>
 <20130610193736.GF3047@kib.kiev.ua>
 <20130610211358.GA55399@ci0.org> <20130610231052.GA57152@ci0.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="nBxkCaiRhNuisgbJ"
Content-Disposition: inline
In-Reply-To: <20130610231052.GA57152@ci0.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 05:22:08 -0000


--nBxkCaiRhNuisgbJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jun 11, 2013 at 01:10:52AM +0200, Olivier Houchard wrote:
> On Mon, Jun 10, 2013 at 11:13:58PM +0200, Olivier Houchard wrote:
> > On Mon, Jun 10, 2013 at 10:37:36PM +0300, Konstantin Belousov wrote:
> > > On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote:
> > > > On 06/10/2013 06:08, Olivier Houchard wrote:
> > > > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wro=
te:
> > > > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote:
> > > > >>> Author: cognet
> > > > >>> Date: Sun Jun  9 22:51:11 2013
> > > > >>> New Revision: 251586
> > > > >>> URL: http://svnweb.freebsd.org/changeset/base/251586
> > > > >>>
> > > > >>> Log:
> > > > >>>   Increase the maximum KVM available on TI chips. Not sure why =
we suddenly need
> > > > >>>   that much, but that lets me boot with 1GB of RAM.
> > > > >> I suspect that the cause is the combination of limited KVA and
> > > > >> lack of any limitation for the buffer map. I noted that ARM lacks
> > > > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) pro=
blem a
> > > > >> day ago.
> > > > >>
> > > > >> In essence, the buffer map is allowed to take up to ~330MB when =
no
> > > > >> upper limit from VM_BCACHE_SIZE_MAX is specified.
> > > > >
> > > > > Hi Konstantin,
> > > > >
> > > > > Thanks for the hint !
> > > > > It seems only i386 and sparc64 sets it, what would be a good valu=
e, 200M, as
> > > > > it is on i386 ?
> > > > >
> > > >=20
> > > > Since there are many arm platforms with less than 1 GB of kernel vi=
rtual
> > > > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down
> > > > from 200 MB with the available KVA space.  See how VM_KMEM_SIZE_MAX=
 is
> > > > currently defined on arm.
> > >=20
> > > In fact, Ithink it does not make much sense to scale the buffer cache=
 up.
> > > It is mostly wasted space now.  As I measured it, on typical load you
> > > have only 10-20% of instantiated buffers mapped.
> > >=20
> > > Alexander Motin reported that he tested the equivalent of the followi=
ng
> > > change.  With it committed, I think that r251586 could be reverted.
> > >=20
> > > diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
> > > index 9ffb118..5c738c2 100644
> > > --- a/sys/arm/include/param.h
> > > +++ b/sys/arm/include/param.h
> > > @@ -128,6 +128,11 @@
> > >  #define USPACE_SVC_STACK_BOTTOM		(USPACE_SVC_STACK_TOP - 0x1000)
> > >  #define USPACE_UNDEF_STACK_TOP		(USPACE_SVC_STACK_BOTTOM - 0x10)
> > >  #define USPACE_UNDEF_STACK_BOTTOM	(FPCONTEXTSIZE + 10)
> > > +
> > > +#ifndef VM_BCACHE_SIZE_MAX
> > > +#define	VM_BCACHE_SIZE_MAX	(128 * 1024 * 1024)
> > > +#endif
> > > +
> > >  /*
> > >   * Mach derived conversion macros
> > >   */
> >=20
> >=20
> > I tested it with my changes reverted and it works indeed, so I'm fine w=
ith
> > this being committed and my changes being reverted.
> >=20
>=20
> In fact I spoke too soon. It's getting further, but I'm ending up getting
> vm_thread_new: kstack allocation failed
> Probably because I have a local patch that aligns the stack on 32kB, which
> is something we have to do if we want to store curthread on the kstack.
> It will boot if I reduce VM_DCACHE_SIZE_MAX to 64MB, but it's probably not
> the best thing to do.

The other cause of increased KVA use is the vm radix trie used to keep
the collection of the vm object' pages. When I profiled KVA use for PAE
on i386, which has similar problem of exhausted KVA, the radix trie
popped up as the reason.

IMO the current sizing of the trie for the worst case is not attainable
for any practical situation.  Anyway, this is separate.

I will commit the bcache limit change after make universe passes.

--nBxkCaiRhNuisgbJ
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQIcBAEBAgAGBQJRtrPwAAoJEJDCuSvBvK1BhCwP/REMjlmZKV0xTjS0qSDDK+qB
McEkNIxTWRPKXCrbMplCWPACQtHKRf5OZe4CderAVz3YT+MgJgWB1xSt5nkR6wda
XZn4ozqm2GXuLMpxa09UqW97sxCYwR1ShZ313dv07gpAmUCDEpb/SIXtWDfufHzt
qKM8Gtml9Z2soNCThRLDs/FOy3nYcsYCuC5Gn82/qbbk/MMFZEtVZGHJPnynOrbk
2IZr6HAQHOt0yfa7gxU2WMqiaH6aE3t+ITZ+ZtZ0cc7brXE0CWHn5uW+HSpyZhb/
jeuDgeUa1Re4w10cHkvm48YkfdRr4Doq5RqzXo8Bjc6XuFeik9ge37kCpb/Rf67z
wYdRXscbGd+2xS6qfG1zINGoixTrbnUfHOiBsY1pS32cdXBnMheu8cOee+8vTlHG
PRolFEO14plFKhtPwd2CJ1bndf7+NLk7SSH5D9cv3tRnReacGM7hqnBNAsmYT+7f
206FytsKd40Wf/UiqavexGGGl4E4f+ySLki6OgS5Jg+nVS0daFwLuAwTYudK0SF+
4ns09tTop8XsErb2qWGiDc2jz+RuNEXMXXfYQi5QEbzO4Ga0owNNisxdrz3aL5Ls
34Tix+XQAlW1tdAstkCKBsc9UhZ5+qIM4CCUHwrztawu/1WiAORBJXAJHeN5CNC2
6CZInDf1C2OMKIJfWfla
=+9QD
-----END PGP SIGNATURE-----

--nBxkCaiRhNuisgbJ--

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 06:18:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 98A8B8F0;
 Tue, 11 Jun 2013 06:18:52 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8A1411D73;
 Tue, 11 Jun 2013 06:18:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B6Iq1A005903;
 Tue, 11 Jun 2013 06:18:52 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5B6IqB6005901;
 Tue, 11 Jun 2013 06:18:52 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201306110618.r5B6IqB6005901@svn.freebsd.org>
From: Hans Petter Selasky 
Date: Tue, 11 Jun 2013 06:18:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251614 - stable/9/sys/dev/usb/controller
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 06:18:52 -0000

Author: hselasky
Date: Tue Jun 11 06:18:51 2013
New Revision: 251614
URL: http://svnweb.freebsd.org/changeset/base/251614

Log:
  MFC r251249, r251251, r251252, r2512, r251254 and r251515:
  Correct XHCI DMA descriptor programming.
  Correct maximum IRQ rate.

Modified:
  stable/9/sys/dev/usb/controller/xhci.c
  stable/9/sys/dev/usb/controller/xhcireg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci.c	Tue Jun 11 03:37:29 2013	(r251613)
+++ stable/9/sys/dev/usb/controller/xhci.c	Tue Jun 11 06:18:51 2013	(r251614)
@@ -1533,9 +1533,11 @@ xhci_setup_generic_chain_sub(struct xhci
 	struct xhci_td *td;
 	struct xhci_td *td_next;
 	struct xhci_td *td_alt_next;
+	struct xhci_td *td_first;
 	uint32_t buf_offset;
 	uint32_t average;
 	uint32_t len_old;
+	uint32_t npkt_off;
 	uint32_t dword;
 	uint8_t shortpkt_old;
 	uint8_t precompute;
@@ -1545,12 +1547,13 @@ xhci_setup_generic_chain_sub(struct xhci
 	buf_offset = 0;
 	shortpkt_old = temp->shortpkt;
 	len_old = temp->len;
+	npkt_off = 0;
 	precompute = 1;
 
 restart:
 
 	td = temp->td;
-	td_next = temp->td_next;
+	td_next = td_first = temp->td_next;
 
 	while (1) {
 
@@ -1651,7 +1654,7 @@ restart:
 			/* fill out buffer pointers */
 
 			if (average == 0) {
-				npkt = 1;
+				npkt = 0;
 				memset(&buf_res, 0, sizeof(buf_res));
 			} else {
 				usbd_get_page(temp->pc, temp->offset +
@@ -1665,8 +1668,10 @@ restart:
 				if (buf_res.length > XHCI_TD_PAGE_SIZE)
 					buf_res.length = XHCI_TD_PAGE_SIZE;
 
+				npkt_off += buf_res.length;
+
 				/* setup npkt */
-				npkt = (average + temp->max_packet_size - 1) /
+				npkt = (len_old - npkt_off + temp->max_packet_size - 1) /
 				    temp->max_packet_size;
 
 				if (npkt > 31)
@@ -1684,32 +1689,55 @@ restart:
 
 			td->td_trb[x].dwTrb2 = htole32(dword);
 
-			dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
-			  XHCI_TRB_3_TYPE_SET(temp->trb_type) |
-			  (temp->do_isoc_sync ?
-			   XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8) :
-			   XHCI_TRB_3_ISO_SIA_BIT) |
-			  XHCI_TRB_3_TBC_SET(temp->tbc) |
-			  XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
-
-			temp->do_isoc_sync = 0;
-
-			if (temp->direction == UE_DIR_IN) {
-				dword |= XHCI_TRB_3_DIR_IN;
-
-				/*
-				 * NOTE: Only the SETUP stage should
-				 * use the IDT bit. Else transactions
-				 * can be sent using the wrong data
-				 * toggle value.
-				 */
-				if (temp->trb_type !=
-				    XHCI_TRB_TYPE_SETUP_STAGE &&
-				    temp->trb_type !=
-				    XHCI_TRB_TYPE_STATUS_STAGE)
-					dword |= XHCI_TRB_3_ISP_BIT;
+			switch (temp->trb_type) {
+			case XHCI_TRB_TYPE_ISOCH:
+				/* BEI: Interrupts are inhibited until EOT */
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_BEI_BIT |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (td != td_first) {
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL);
+				} else if (temp->do_isoc_sync != 0) {
+					temp->do_isoc_sync = 0;
+					/* wait until "isoc_frame" */
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+					    XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8);
+				} else {
+					/* start data transfer at next interval */
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+					    XHCI_TRB_3_ISO_SIA_BIT;
+				}
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
+			case XHCI_TRB_TYPE_DATA_STAGE:
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE) |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
+			case XHCI_TRB_TYPE_STATUS_STAGE:
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_STATUS_STAGE) |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN;
+				break;
+			default:	/* XHCI_TRB_TYPE_NORMAL */
+				/* BEI: Interrupts are inhibited until EOT */
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
+				    XHCI_TRB_3_BEI_BIT |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
 			}
-
 			td->td_trb[x].dwTrb3 = htole32(dword);
 
 			average -= buf_res.length;
@@ -1773,9 +1801,14 @@ restart:
 		goto restart;
 	}
 
-	/* remove cycle bit from first if we are stepping the TRBs */
-	if (temp->step_td)
-		td->td_trb[0].dwTrb3 &= ~htole32(XHCI_TRB_3_CYCLE_BIT);
+	/*
+	 * Remove cycle bit from the first TRB if we are
+	 * stepping them:
+	 */
+	if (temp->step_td != 0) {
+		td_first->td_trb[0].dwTrb3 &= ~htole32(XHCI_TRB_3_CYCLE_BIT);
+		usb_pc_cpu_flush(td_first->page_cache);
+	}
 
 	/* remove chain bit because this is the last TRB in the chain */
 	td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
@@ -2601,6 +2634,7 @@ xhci_transfer_insert(struct usb_xfer *xf
 {
 	struct xhci_td *td_first;
 	struct xhci_td *td_last;
+	struct xhci_trb *trb_link;
 	struct xhci_endpoint_ext *pepext;
 	uint64_t addr;
 	uint8_t i;
@@ -2666,11 +2700,15 @@ xhci_transfer_insert(struct usb_xfer *xf
 	/* compute terminating return address */
 	addr += inext * sizeof(struct xhci_trb);
 
+	/* compute link TRB pointer */
+	trb_link = td_last->td_trb + td_last->ntrb;
+
 	/* update next pointer of last link TRB */
-	td_last->td_trb[td_last->ntrb].qwTrb0 = htole64(addr);
-	td_last->td_trb[td_last->ntrb].dwTrb2 = htole32(XHCI_TRB_2_IRQ_SET(0));
-	td_last->td_trb[td_last->ntrb].dwTrb3 = htole32(XHCI_TRB_3_IOC_BIT |
-	    XHCI_TRB_3_CYCLE_BIT | XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK));
+	trb_link->qwTrb0 = htole64(addr);
+	trb_link->dwTrb2 = htole32(XHCI_TRB_2_IRQ_SET(0));
+	trb_link->dwTrb3 = htole32(XHCI_TRB_3_IOC_BIT |
+	    XHCI_TRB_3_CYCLE_BIT |
+	    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK));
 
 #ifdef USB_DEBUG
 	xhci_dump_trb(&td_last->td_trb[td_last->ntrb]);

Modified: stable/9/sys/dev/usb/controller/xhcireg.h
==============================================================================
--- stable/9/sys/dev/usb/controller/xhcireg.h	Tue Jun 11 03:37:29 2013	(r251613)
+++ stable/9/sys/dev/usb/controller/xhcireg.h	Tue Jun 11 06:18:51 2013	(r251614)
@@ -166,7 +166,7 @@
 #define	XHCI_IMOD_IVAL_SET(x)	(((x) & 0xFFFF) << 0)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_GET(x)	(((x) >> 16) & 0xFFFF)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_SET(x)	(((x) & 0xFFFF) << 16)	/* 250ns unit */
-#define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
+#define	XHCI_IMOD_DEFAULT	0x000003E8U	/* 8000 IRQ/second */
 #define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n)))	/* XHCI event ring segment table size */
 #define	XHCI_ERSTS_GET(x)	((x) & 0xFFFF)
 #define	XHCI_ERSTS_SET(x)	((x) & 0xFFFF)

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 06:22:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9B789B2C;
 Tue, 11 Jun 2013 06:22:10 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8DC651DA2;
 Tue, 11 Jun 2013 06:22:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B6MA85008063;
 Tue, 11 Jun 2013 06:22:10 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5B6MApq008061;
 Tue, 11 Jun 2013 06:22:10 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201306110622.r5B6MApq008061@svn.freebsd.org>
From: Hans Petter Selasky 
Date: Tue, 11 Jun 2013 06:22:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251615 - stable/8/sys/dev/usb/controller
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 06:22:10 -0000

Author: hselasky
Date: Tue Jun 11 06:22:09 2013
New Revision: 251615
URL: http://svnweb.freebsd.org/changeset/base/251615

Log:
  MFC r251249, r251251, r251252, r251253, r251254 and r251515:
  Correct XHCI DMA descriptor programming.
  Correct maximum IRQ rate.

Modified:
  stable/8/sys/dev/usb/controller/xhci.c
  stable/8/sys/dev/usb/controller/xhcireg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/usb/   (props changed)

Modified: stable/8/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci.c	Tue Jun 11 06:18:51 2013	(r251614)
+++ stable/8/sys/dev/usb/controller/xhci.c	Tue Jun 11 06:22:09 2013	(r251615)
@@ -1533,9 +1533,11 @@ xhci_setup_generic_chain_sub(struct xhci
 	struct xhci_td *td;
 	struct xhci_td *td_next;
 	struct xhci_td *td_alt_next;
+	struct xhci_td *td_first;
 	uint32_t buf_offset;
 	uint32_t average;
 	uint32_t len_old;
+	uint32_t npkt_off;
 	uint32_t dword;
 	uint8_t shortpkt_old;
 	uint8_t precompute;
@@ -1545,12 +1547,13 @@ xhci_setup_generic_chain_sub(struct xhci
 	buf_offset = 0;
 	shortpkt_old = temp->shortpkt;
 	len_old = temp->len;
+	npkt_off = 0;
 	precompute = 1;
 
 restart:
 
 	td = temp->td;
-	td_next = temp->td_next;
+	td_next = td_first = temp->td_next;
 
 	while (1) {
 
@@ -1651,7 +1654,7 @@ restart:
 			/* fill out buffer pointers */
 
 			if (average == 0) {
-				npkt = 1;
+				npkt = 0;
 				memset(&buf_res, 0, sizeof(buf_res));
 			} else {
 				usbd_get_page(temp->pc, temp->offset +
@@ -1665,8 +1668,10 @@ restart:
 				if (buf_res.length > XHCI_TD_PAGE_SIZE)
 					buf_res.length = XHCI_TD_PAGE_SIZE;
 
+				npkt_off += buf_res.length;
+
 				/* setup npkt */
-				npkt = (average + temp->max_packet_size - 1) /
+				npkt = (len_old - npkt_off + temp->max_packet_size - 1) /
 				    temp->max_packet_size;
 
 				if (npkt > 31)
@@ -1684,32 +1689,55 @@ restart:
 
 			td->td_trb[x].dwTrb2 = htole32(dword);
 
-			dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
-			  XHCI_TRB_3_TYPE_SET(temp->trb_type) |
-			  (temp->do_isoc_sync ?
-			   XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8) :
-			   XHCI_TRB_3_ISO_SIA_BIT) |
-			  XHCI_TRB_3_TBC_SET(temp->tbc) |
-			  XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
-
-			temp->do_isoc_sync = 0;
-
-			if (temp->direction == UE_DIR_IN) {
-				dword |= XHCI_TRB_3_DIR_IN;
-
-				/*
-				 * NOTE: Only the SETUP stage should
-				 * use the IDT bit. Else transactions
-				 * can be sent using the wrong data
-				 * toggle value.
-				 */
-				if (temp->trb_type !=
-				    XHCI_TRB_TYPE_SETUP_STAGE &&
-				    temp->trb_type !=
-				    XHCI_TRB_TYPE_STATUS_STAGE)
-					dword |= XHCI_TRB_3_ISP_BIT;
+			switch (temp->trb_type) {
+			case XHCI_TRB_TYPE_ISOCH:
+				/* BEI: Interrupts are inhibited until EOT */
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_BEI_BIT |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (td != td_first) {
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL);
+				} else if (temp->do_isoc_sync != 0) {
+					temp->do_isoc_sync = 0;
+					/* wait until "isoc_frame" */
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+					    XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8);
+				} else {
+					/* start data transfer at next interval */
+					dword |= XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ISOCH) |
+					    XHCI_TRB_3_ISO_SIA_BIT;
+				}
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
+			case XHCI_TRB_TYPE_DATA_STAGE:
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE) |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
+			case XHCI_TRB_TYPE_STATUS_STAGE:
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_STATUS_STAGE) |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN;
+				break;
+			default:	/* XHCI_TRB_TYPE_NORMAL */
+				/* BEI: Interrupts are inhibited until EOT */
+				dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
+				    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
+				    XHCI_TRB_3_BEI_BIT |
+				    XHCI_TRB_3_TBC_SET(temp->tbc) |
+				    XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
+				if (temp->direction == UE_DIR_IN)
+					dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT;
+				break;
 			}
-
 			td->td_trb[x].dwTrb3 = htole32(dword);
 
 			average -= buf_res.length;
@@ -1773,9 +1801,14 @@ restart:
 		goto restart;
 	}
 
-	/* remove cycle bit from first if we are stepping the TRBs */
-	if (temp->step_td)
-		td->td_trb[0].dwTrb3 &= ~htole32(XHCI_TRB_3_CYCLE_BIT);
+	/*
+	 * Remove cycle bit from the first TRB if we are
+	 * stepping them:
+	 */
+	if (temp->step_td != 0) {
+		td_first->td_trb[0].dwTrb3 &= ~htole32(XHCI_TRB_3_CYCLE_BIT);
+		usb_pc_cpu_flush(td_first->page_cache);
+	}
 
 	/* remove chain bit because this is the last TRB in the chain */
 	td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
@@ -2601,6 +2634,7 @@ xhci_transfer_insert(struct usb_xfer *xf
 {
 	struct xhci_td *td_first;
 	struct xhci_td *td_last;
+	struct xhci_trb *trb_link;
 	struct xhci_endpoint_ext *pepext;
 	uint64_t addr;
 	uint8_t i;
@@ -2666,11 +2700,15 @@ xhci_transfer_insert(struct usb_xfer *xf
 	/* compute terminating return address */
 	addr += inext * sizeof(struct xhci_trb);
 
+	/* compute link TRB pointer */
+	trb_link = td_last->td_trb + td_last->ntrb;
+
 	/* update next pointer of last link TRB */
-	td_last->td_trb[td_last->ntrb].qwTrb0 = htole64(addr);
-	td_last->td_trb[td_last->ntrb].dwTrb2 = htole32(XHCI_TRB_2_IRQ_SET(0));
-	td_last->td_trb[td_last->ntrb].dwTrb3 = htole32(XHCI_TRB_3_IOC_BIT |
-	    XHCI_TRB_3_CYCLE_BIT | XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK));
+	trb_link->qwTrb0 = htole64(addr);
+	trb_link->dwTrb2 = htole32(XHCI_TRB_2_IRQ_SET(0));
+	trb_link->dwTrb3 = htole32(XHCI_TRB_3_IOC_BIT |
+	    XHCI_TRB_3_CYCLE_BIT |
+	    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK));
 
 #ifdef USB_DEBUG
 	xhci_dump_trb(&td_last->td_trb[td_last->ntrb]);

Modified: stable/8/sys/dev/usb/controller/xhcireg.h
==============================================================================
--- stable/8/sys/dev/usb/controller/xhcireg.h	Tue Jun 11 06:18:51 2013	(r251614)
+++ stable/8/sys/dev/usb/controller/xhcireg.h	Tue Jun 11 06:22:09 2013	(r251615)
@@ -166,7 +166,7 @@
 #define	XHCI_IMOD_IVAL_SET(x)	(((x) & 0xFFFF) << 0)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_GET(x)	(((x) >> 16) & 0xFFFF)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_SET(x)	(((x) & 0xFFFF) << 16)	/* 250ns unit */
-#define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
+#define	XHCI_IMOD_DEFAULT	0x000003E8U	/* 8000 IRQ/second */
 #define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n)))	/* XHCI event ring segment table size */
 #define	XHCI_ERSTS_GET(x)	((x) & 0xFFFF)
 #define	XHCI_ERSTS_SET(x)	((x) & 0xFFFF)

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 06:48:02 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 05466130;
 Tue, 11 Jun 2013 06:48:02 +0000 (UTC) (envelope-from hps@bitfrost.no)
Received: from mta.bitpro.no (mta.bitpro.no [92.42.64.202])
 by mx1.freebsd.org (Postfix) with ESMTP id BDA1C1EA1;
 Tue, 11 Jun 2013 06:47:58 +0000 (UTC)
Received: from mail.bitfrost.no (mail.bitfrost.no [46.29.221.36])
 by mta.bitpro.no (Postfix) with ESMTP id B4A5D7A0D9;
 Tue, 11 Jun 2013 08:47:57 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at bitfrost.no
Received: from laptop015.hselasky.homeunix.org
 (cm-176.74.213.204.customer.telag.net [176.74.213.204])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: hanspetter)
 by mail.bitfrost.no (Postfix) with ESMTPSA id 1AE2220D1C;
 Tue, 11 Jun 2013 08:47:54 +0200 (CEST)
Message-ID: <51B6C86E.3090102@bitfrost.no>
Date: Tue, 11 Jun 2013 08:49:18 +0200
From: Hans Petter Selasky 
Organization: Bitfrost A/S
MIME-Version: 1.0
Subject: Re: svn commit: r251614 - stable/9/sys/dev/usb/controller
References: <201306110618.r5B6IqB6005901@svn.freebsd.org>
In-Reply-To: <201306110618.r5B6IqB6005901@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-9@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 06:48:02 -0000

On 06/11/13 08:18, Hans Petter Selasky wrote:
> Author: hselasky
> Date: Tue Jun 11 06:18:51 2013
> New Revision: 251614
> URL: http://svnweb.freebsd.org/changeset/base/251614
>
> Log:
>    MFC r251249, r251251, r251252, r2512, r251254 and r251515:
                                          ^^53. C&P error.
>    Correct XHCI DMA descriptor programming.
>    Correct maximum IRQ rate.


From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 09:50:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 083C1CEF;
 Tue, 11 Jun 2013 09:50:31 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-ie0-x232.google.com (mail-ie0-x232.google.com
 [IPv6:2607:f8b0:4001:c03::232])
 by mx1.freebsd.org (Postfix) with ESMTP id BDA5E18FC;
 Tue, 11 Jun 2013 09:50:30 +0000 (UTC)
Received: by mail-ie0-f178.google.com with SMTP id at1so15235177iec.37
 for ; Tue, 11 Jun 2013 02:50:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=RAt1U6ttNE2O18fDzENFKdYfD0uek4RNoyjx8G4JnAo=;
 b=D0hng7x7tv9f6TSuTFHo+9E8hFwNTeUrS9qr+HsYot5ewt3DKB7iUSUIAVlJqTbLHR
 cUiGx/V8Uqb6jQKDASLuzXZBuGthhkRsNHl8e8a7NZK98ZC7ZQK+Pgdv+I/sAAcX48XA
 jwFEcznMYK8Kw5+prof8pCujquQGLYsBV0UeERJ11SK65ykHhJlU/T8s0LonoTAsf9nV
 2PYjht0X98PHNE4rw0rLkdY4z2oNd0g+AP3CsCzLj3+llljFZud5VWKtPvHEfvMkyHbx
 ID5gdqAk1bcvjljEbmw+15Fj8gdDUWFkg2EQ7APfyvCU4symIUogM6MwemyHpcQFLuY/
 k89g==
MIME-Version: 1.0
X-Received: by 10.50.152.37 with SMTP id uv5mr516068igb.13.1370944230321; Tue,
 11 Jun 2013 02:50:30 -0700 (PDT)
Sender: asmrookie@gmail.com
Received: by 10.42.253.129 with HTTP; Tue, 11 Jun 2013 02:50:30 -0700 (PDT)
In-Reply-To: <20130611052152.GG3047@kib.kiev.ua>
References: <201306092251.r59MpCmW006162@svn.freebsd.org>
 <20130610035547.GX3047@kib.kiev.ua>
 <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu>
 <20130610193736.GF3047@kib.kiev.ua>
 <20130610211358.GA55399@ci0.org> <20130610231052.GA57152@ci0.org>
 <20130611052152.GG3047@kib.kiev.ua>
Date: Tue, 11 Jun 2013 11:50:30 +0200
X-Google-Sender-Auth: FI5TRG31ZavfjxtJrpFIfpc1wbA
Message-ID: 
Subject: Re: svn commit: r251586 - head/sys/arm/ti
From: Attilio Rao 
To: Konstantin Belousov , Jeff Roberson 
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 Olivier Houchard , Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 09:50:31 -0000

On Tue, Jun 11, 2013 at 7:21 AM, Konstantin Belousov
 wrote:
> On Tue, Jun 11, 2013 at 01:10:52AM +0200, Olivier Houchard wrote:
>> On Mon, Jun 10, 2013 at 11:13:58PM +0200, Olivier Houchard wrote:
>> > On Mon, Jun 10, 2013 at 10:37:36PM +0300, Konstantin Belousov wrote:
>> > > On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote:
>> > > > On 06/10/2013 06:08, Olivier Houchard wrote:
>> > > > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote:
>> > > > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote:
>> > > > >>> Author: cognet
>> > > > >>> Date: Sun Jun  9 22:51:11 2013
>> > > > >>> New Revision: 251586
>> > > > >>> URL: http://svnweb.freebsd.org/changeset/base/251586
>> > > > >>>
>> > > > >>> Log:
>> > > > >>>   Increase the maximum KVM available on TI chips. Not sure why we suddenly need
>> > > > >>>   that much, but that lets me boot with 1GB of RAM.
>> > > > >> I suspect that the cause is the combination of limited KVA and
>> > > > >> lack of any limitation for the buffer map. I noted that ARM lacks
>> > > > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a
>> > > > >> day ago.
>> > > > >>
>> > > > >> In essence, the buffer map is allowed to take up to ~330MB when no
>> > > > >> upper limit from VM_BCACHE_SIZE_MAX is specified.
>> > > > >
>> > > > > Hi Konstantin,
>> > > > >
>> > > > > Thanks for the hint !
>> > > > > It seems only i386 and sparc64 sets it, what would be a good value, 200M, as
>> > > > > it is on i386 ?
>> > > > >
>> > > >
>> > > > Since there are many arm platforms with less than 1 GB of kernel virtual
>> > > > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down
>> > > > from 200 MB with the available KVA space.  See how VM_KMEM_SIZE_MAX is
>> > > > currently defined on arm.
>> > >
>> > > In fact, Ithink it does not make much sense to scale the buffer cache up.
>> > > It is mostly wasted space now.  As I measured it, on typical load you
>> > > have only 10-20% of instantiated buffers mapped.
>> > >
>> > > Alexander Motin reported that he tested the equivalent of the following
>> > > change.  With it committed, I think that r251586 could be reverted.
>> > >
>> > > diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
>> > > index 9ffb118..5c738c2 100644
>> > > --- a/sys/arm/include/param.h
>> > > +++ b/sys/arm/include/param.h
>> > > @@ -128,6 +128,11 @@
>> > >  #define USPACE_SVC_STACK_BOTTOM          (USPACE_SVC_STACK_TOP - 0x1000)
>> > >  #define USPACE_UNDEF_STACK_TOP           (USPACE_SVC_STACK_BOTTOM - 0x10)
>> > >  #define USPACE_UNDEF_STACK_BOTTOM        (FPCONTEXTSIZE + 10)
>> > > +
>> > > +#ifndef VM_BCACHE_SIZE_MAX
>> > > +#define  VM_BCACHE_SIZE_MAX      (128 * 1024 * 1024)
>> > > +#endif
>> > > +
>> > >  /*
>> > >   * Mach derived conversion macros
>> > >   */
>> >
>> >
>> > I tested it with my changes reverted and it works indeed, so I'm fine with
>> > this being committed and my changes being reverted.
>> >
>>
>> In fact I spoke too soon. It's getting further, but I'm ending up getting
>> vm_thread_new: kstack allocation failed
>> Probably because I have a local patch that aligns the stack on 32kB, which
>> is something we have to do if we want to store curthread on the kstack.
>> It will boot if I reduce VM_DCACHE_SIZE_MAX to 64MB, but it's probably not
>> the best thing to do.
>
> The other cause of increased KVA use is the vm radix trie used to keep
> the collection of the vm object' pages. When I profiled KVA use for PAE
> on i386, which has similar problem of exhausted KVA, the radix trie
> popped up as the reason.
>
> IMO the current sizing of the trie for the worst case is not attainable
> for any practical situation.  Anyway, this is separate.

I discussed with Jeff a way to not depend by the preallocated pool of
nodes and I think we can fix it. However I still have to finish some
things before to get into this but I will try to commit to this before
code slush.

Attilio


--
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 10:06:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 75302154;
 Tue, 11 Jun 2013 10:06:08 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 680A919B5;
 Tue, 11 Jun 2013 10:06:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BA68oL078619;
 Tue, 11 Jun 2013 10:06:08 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BA68cI078618;
 Tue, 11 Jun 2013 10:06:08 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306111006.r5BA68cI078618@svn.freebsd.org>
From: Alexander Motin 
Date: Tue, 11 Jun 2013 10:06:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251616 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 10:06:08 -0000

Author: mav
Date: Tue Jun 11 10:06:07 2013
New Revision: 251616
URL: http://svnweb.freebsd.org/changeset/base/251616

Log:
  Don't update provider properties and don't set DISKFLAG_OPEN if d_open()
  disk method call returned error.  GEOM considers devices in such case as
  still closed, and won't call symmetric d_close() for them.

Modified:
  head/sys/geom/geom_disk.c

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Tue Jun 11 06:22:09 2013	(r251615)
+++ head/sys/geom/geom_disk.c	Tue Jun 11 10:06:07 2013	(r251616)
@@ -138,6 +138,8 @@ g_disk_access(struct g_provider *pp, int
 				printf("Opened disk %s -> %d\n",
 				    pp->name, error);
 			g_disk_unlock_giant(dp);
+			if (error != 0)
+				return (error);
 		}
 		pp->mediasize = dp->d_mediasize;
 		pp->sectorsize = dp->d_sectorsize;

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 10:17:03 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7AD7853B;
 Tue, 11 Jun 2013 10:17:03 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-ie0-x22c.google.com (mail-ie0-x22c.google.com
 [IPv6:2607:f8b0:4001:c03::22c])
 by mx1.freebsd.org (Postfix) with ESMTP id 467211A1C;
 Tue, 11 Jun 2013 10:17:03 +0000 (UTC)
Received: by mail-ie0-f172.google.com with SMTP id 17so19515265iea.31
 for ; Tue, 11 Jun 2013 03:17:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=ne5RIRPCaQWUTLpT6xpT+00kVTQ/dO6sh6OeCs4kDuA=;
 b=O8B255XF1sb92R7a8Id3puvEbKkxsTH5hmXJT+6FtNc+Ej2jPusR79MZbsOIDSpIeo
 rQD3o3SHaOV/Ed6+IItCUUByfErxUbuJvOO2ljCDCISY0kN3zg+0g6H0zS0XlZXoxc0P
 9siPx6Xatob5jXCIsbrTwLbiEfLKoHy8Qy7yVieCOiQNsWpkim5IKZ0GVAL4OdogGMf8
 XVem1X9XM4ggN79BKpSaSoBPKhvmjdVpfuf4l4ZUjfvjifGNNE6EpIXGZhJohjG6ph8+
 IBubFwPay2RpJF3wqiJqzX9dd7EwXA/z8O90ZOKddU8UF1EIq7gSMHiGqI5RvDVIICSa
 bwkA==
MIME-Version: 1.0
X-Received: by 10.50.129.37 with SMTP id nt5mr578043igb.9.1370945822945; Tue,
 11 Jun 2013 03:17:02 -0700 (PDT)
Sender: asmrookie@gmail.com
Received: by 10.42.253.129 with HTTP; Tue, 11 Jun 2013 03:17:02 -0700 (PDT)
In-Reply-To: <20130611052152.GG3047@kib.kiev.ua>
References: <201306092251.r59MpCmW006162@svn.freebsd.org>
 <20130610035547.GX3047@kib.kiev.ua>
 <20130610110847.GA46614@ci0.org> <51B6069C.6060704@rice.edu>
 <20130610193736.GF3047@kib.kiev.ua>
 <20130610211358.GA55399@ci0.org> <20130610231052.GA57152@ci0.org>
 <20130611052152.GG3047@kib.kiev.ua>
Date: Tue, 11 Jun 2013 12:17:02 +0200
X-Google-Sender-Auth: CVF9WqEmDB5Q-WDWGxK1Pta_3hM
Message-ID: 
Subject: Re: svn commit: r251586 - head/sys/arm/ti
From: Attilio Rao 
To: Konstantin Belousov 
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 Olivier Houchard , Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 10:17:03 -0000

On Tue, Jun 11, 2013 at 7:21 AM, Konstantin Belousov
 wrote:
> On Tue, Jun 11, 2013 at 01:10:52AM +0200, Olivier Houchard wrote:
>> On Mon, Jun 10, 2013 at 11:13:58PM +0200, Olivier Houchard wrote:
>> > On Mon, Jun 10, 2013 at 10:37:36PM +0300, Konstantin Belousov wrote:
>> > > On Mon, Jun 10, 2013 at 12:02:20PM -0500, Alan Cox wrote:
>> > > > On 06/10/2013 06:08, Olivier Houchard wrote:
>> > > > > On Mon, Jun 10, 2013 at 06:55:47AM +0300, Konstantin Belousov wrote:
>> > > > >> On Sun, Jun 09, 2013 at 10:51:12PM +0000, Olivier Houchard wrote:
>> > > > >>> Author: cognet
>> > > > >>> Date: Sun Jun  9 22:51:11 2013
>> > > > >>> New Revision: 251586
>> > > > >>> URL: http://svnweb.freebsd.org/changeset/base/251586
>> > > > >>>
>> > > > >>> Log:
>> > > > >>>   Increase the maximum KVM available on TI chips. Not sure why we suddenly need
>> > > > >>>   that much, but that lets me boot with 1GB of RAM.
>> > > > >> I suspect that the cause is the combination of limited KVA and
>> > > > >> lack of any limitation for the buffer map. I noted that ARM lacks
>> > > > >> VM_BCACHE_SIZE_MAX after a report from mav about similar (?) problem a
>> > > > >> day ago.
>> > > > >>
>> > > > >> In essence, the buffer map is allowed to take up to ~330MB when no
>> > > > >> upper limit from VM_BCACHE_SIZE_MAX is specified.
>> > > > >
>> > > > > Hi Konstantin,
>> > > > >
>> > > > > Thanks for the hint !
>> > > > > It seems only i386 and sparc64 sets it, what would be a good value, 200M, as
>> > > > > it is on i386 ?
>> > > > >
>> > > >
>> > > > Since there are many arm platforms with less than 1 GB of kernel virtual
>> > > > address (KVA) space, VM_BCACHE_SIZE_MAX should be made to scale down
>> > > > from 200 MB with the available KVA space.  See how VM_KMEM_SIZE_MAX is
>> > > > currently defined on arm.
>> > >
>> > > In fact, Ithink it does not make much sense to scale the buffer cache up.
>> > > It is mostly wasted space now.  As I measured it, on typical load you
>> > > have only 10-20% of instantiated buffers mapped.
>> > >
>> > > Alexander Motin reported that he tested the equivalent of the following
>> > > change.  With it committed, I think that r251586 could be reverted.
>> > >
>> > > diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
>> > > index 9ffb118..5c738c2 100644
>> > > --- a/sys/arm/include/param.h
>> > > +++ b/sys/arm/include/param.h
>> > > @@ -128,6 +128,11 @@
>> > >  #define USPACE_SVC_STACK_BOTTOM          (USPACE_SVC_STACK_TOP - 0x1000)
>> > >  #define USPACE_UNDEF_STACK_TOP           (USPACE_SVC_STACK_BOTTOM - 0x10)
>> > >  #define USPACE_UNDEF_STACK_BOTTOM        (FPCONTEXTSIZE + 10)
>> > > +
>> > > +#ifndef VM_BCACHE_SIZE_MAX
>> > > +#define  VM_BCACHE_SIZE_MAX      (128 * 1024 * 1024)
>> > > +#endif
>> > > +
>> > >  /*
>> > >   * Mach derived conversion macros
>> > >   */
>> >
>> >
>> > I tested it with my changes reverted and it works indeed, so I'm fine with
>> > this being committed and my changes being reverted.
>> >
>>
>> In fact I spoke too soon. It's getting further, but I'm ending up getting
>> vm_thread_new: kstack allocation failed
>> Probably because I have a local patch that aligns the stack on 32kB, which
>> is something we have to do if we want to store curthread on the kstack.
>> It will boot if I reduce VM_DCACHE_SIZE_MAX to 64MB, but it's probably not
>> the best thing to do.
>
> The other cause of increased KVA use is the vm radix trie used to keep
> the collection of the vm object' pages. When I profiled KVA use for PAE
> on i386, which has similar problem of exhausted KVA, the radix trie
> popped up as the reason.

BTW, it would be interesting to see data from your analysis. When
radix trie was developed I get pho@ to test PAE too and no
exhaustation was reported.

Also, on a related note, I wonder how relevant is PAE support on i386
nowadays. Maybe we should consider axing it.

Attilio


--
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 15:37:07 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D5AA27EF;
 Tue, 11 Jun 2013 15:37:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C83401AE4;
 Tue, 11 Jun 2013 15:37:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BFb7L9087201;
 Tue, 11 Jun 2013 15:37:07 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BFb7Tj087199;
 Tue, 11 Jun 2013 15:37:07 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306111537.r5BFb7Tj087199@svn.freebsd.org>
From: John Baldwin 
Date: Tue, 11 Jun 2013 15:37:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251617 - head/sys/ofed/include/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 15:37:07 -0000

Author: jhb
Date: Tue Jun 11 15:37:07 2013
New Revision: 251617
URL: http://svnweb.freebsd.org/changeset/base/251617

Log:
  Store a reference to the vnode associated with a file descriptor in the
  linux_file structure and use it instead of directly accessing td_fpop
  when destroying the linux_file structure.  The td_fpop pointer is not
  valid when a cdevpriv destructor is run, and the type-specific close
  method has already been called, so f_vnode may not be valid (and the
  vnode might have been recycled without our own reference).
  
  Tested by:	Julian Stecklina 
  MFC after:	1 week

Modified:
  head/sys/ofed/include/linux/fs.h
  head/sys/ofed/include/linux/linux_compat.c

Modified: head/sys/ofed/include/linux/fs.h
==============================================================================
--- head/sys/ofed/include/linux/fs.h	Tue Jun 11 10:06:07 2013	(r251616)
+++ head/sys/ofed/include/linux/fs.h	Tue Jun 11 15:37:07 2013	(r251617)
@@ -73,6 +73,7 @@ struct linux_file {
 	struct dentry	f_dentry_store;
 	struct selinfo	f_selinfo;
 	struct sigio	*f_sigio;
+	struct vnode	*f_vnode;
 };
 
 #define	file		linux_file

Modified: head/sys/ofed/include/linux/linux_compat.c
==============================================================================
--- head/sys/ofed/include/linux/linux_compat.c	Tue Jun 11 10:06:07 2013	(r251616)
+++ head/sys/ofed/include/linux/linux_compat.c	Tue Jun 11 15:37:07 2013	(r251617)
@@ -212,7 +212,8 @@ linux_file_dtor(void *cdp)
 	struct linux_file *filp;
 
 	filp = cdp;
-	filp->f_op->release(curthread->td_fpop->f_vnode, filp);
+	filp->f_op->release(filp->f_vnode, filp);
+	vdrop(filp->f_vnode);
 	kfree(filp);
 }
 
@@ -232,6 +233,8 @@ linux_dev_open(struct cdev *dev, int ofl
 	filp->f_dentry = &filp->f_dentry_store;
 	filp->f_op = ldev->ops;
 	filp->f_flags = file->f_flag;
+	vhold(file->f_vnode);
+	filp->f_vnode = file->f_vnode;
 	if (filp->f_op->open) {
 		error = -filp->f_op->open(file->f_vnode, filp);
 		if (error) {

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 17:46:33 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3EA4549B;
 Tue, 11 Jun 2013 17:46:33 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30FF51156;
 Tue, 11 Jun 2013 17:46:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BHkXMX028423;
 Tue, 11 Jun 2013 17:46:33 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BHkX5u028422;
 Tue, 11 Jun 2013 17:46:33 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201306111746.r5BHkX5u028422@svn.freebsd.org>
From: Florian Smeets 
Date: Tue, 11 Jun 2013 17:46:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251618 - head/sbin/dmesg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 17:46:33 -0000

Author: flo (ports committer)
Date: Tue Jun 11 17:46:32 2013
New Revision: 251618
URL: http://svnweb.freebsd.org/changeset/base/251618

Log:
  Move the check whether the clear flag is set. This has 2 advantages
  
  - When operating on a core file (-M) and -c is specified we don't clear
    the message buffer of the running system.
  - If we don't have permission to clear the buffer print the error message
    only. That's what Linux does in this case, where this feature was ported
    from, and it ensures that the error message doesn't get lost in the noise.
  
  Discussed with:	antoine, cognet
  Approved by:	cognet

Modified:
  head/sbin/dmesg/dmesg.c

Modified: head/sbin/dmesg/dmesg.c
==============================================================================
--- head/sbin/dmesg/dmesg.c	Tue Jun 11 15:37:07 2013	(r251617)
+++ head/sbin/dmesg/dmesg.c	Tue Jun 11 17:46:32 2013	(r251618)
@@ -120,6 +120,9 @@ main(int argc, char *argv[])
 			errx(1, "malloc failed");
 		if (sysctlbyname("kern.msgbuf", bp, &buflen, NULL, 0) == -1)
 			err(1, "sysctl kern.msgbuf");
+		if (clear)
+			if (sysctlbyname("kern.msgbuf_clear", NULL, NULL, &clear, sizeof(int)))
+				err(1, "sysctl kern.msgbuf_clear");
 	} else {
 		/* Read in kernel message buffer and do sanity checks. */
 		kd = kvm_open(nlistf, memf, NULL, O_RDONLY, "dmesg");
@@ -196,10 +199,6 @@ main(int argc, char *argv[])
 		(void)strvisx(visbp, p, nextp - p, 0);
 		(void)printf("%s", visbp);
 	}
-	if (clear)
-		if (sysctlbyname("kern.msgbuf_clear", NULL, NULL, &clear, sizeof(int)))
-			err(1, "sysctl kern.msgbuf_clear");
-
 	exit(0);
 }
 

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:28:26 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 76694CCD;
 Tue, 11 Jun 2013 18:28:26 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 67D3A130D;
 Tue, 11 Jun 2013 18:28:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BISQ9u041684;
 Tue, 11 Jun 2013 18:28:26 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BISQbk041683;
 Tue, 11 Jun 2013 18:28:26 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111828.r5BISQbk041683@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251619 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor-sys/illumos/dist/uts/common/fs/zfs/sys
 vendor/illumos/dist/lib/libzfs/common
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:28:26 -0000

Author: delphij
Date: Tue Jun 11 18:28:25 2013
New Revision: 251619
URL: http://svnweb.freebsd.org/changeset/base/251619

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14045:9475b3fef59d
  
  Illumos ZFS issues:
    3741 zfs needs better comments

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_zfetch.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -4452,6 +4452,11 @@ zfs_get_holds(zfs_handle_t *zhp, nvlist_
 	return (err);
 }
 
+/*
+ * Convert the zvol's volume size to an appropriate reservation.
+ * Note: If this routine is updated, it is necessary to update the ZFS test
+ * suite's shell version in reservation.kshlib.
+ */
 uint64_t
 zvol_volsize_to_reservation(uint64_t volsize, nvlist_t *props)
 {

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:28:28 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DE31BCCE;
 Tue, 11 Jun 2013 18:28:28 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C0268130E;
 Tue, 11 Jun 2013 18:28:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BISSHg041706;
 Tue, 11 Jun 2013 18:28:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BISQtD041693;
 Tue, 11 Jun 2013 18:28:26 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111828.r5BISQtD041693@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251619 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor-sys/illumos/dist/uts/common/fs/zfs/sys
 vendor/illumos/dist/lib/libzfs/common
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:28:28 -0000

Author: delphij
Date: Tue Jun 11 18:28:25 2013
New Revision: 251619
URL: http://svnweb.freebsd.org/changeset/base/251619

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14045:9475b3fef59d
  
  Illumos ZFS issues:
    3741 zfs needs better comments

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_zfetch.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -256,7 +256,18 @@ typedef struct arc_stats {
 	kstat_named_t arcstat_mfu_ghost_hits;
 	kstat_named_t arcstat_deleted;
 	kstat_named_t arcstat_recycle_miss;
+	/*
+	 * Number of buffers that could not be evicted because the hash lock
+	 * was held by another thread.  The lock may not necessarily be held
+	 * by something using the same buffer, since hash locks are shared
+	 * by multiple buffers.
+	 */
 	kstat_named_t arcstat_mutex_miss;
+	/*
+	 * Number of buffers skipped because they have I/O in progress, are
+	 * indrect prefetch buffers that have not lived long enough, or are
+	 * not from the spa we're trying to evict from.
+	 */
 	kstat_named_t arcstat_evict_skip;
 	kstat_named_t arcstat_evict_l2_cached;
 	kstat_named_t arcstat_evict_l2_eligible;
@@ -2989,6 +3000,10 @@ top:
 
 		mutex_exit(hash_lock);
 
+		/*
+		 * At this point, we have a level 1 cache miss.  Try again in
+		 * L2ARC if possible.
+		 */
 		ASSERT3U(hdr->b_size, ==, size);
 		DTRACE_PROBE4(arc__miss, arc_buf_hdr_t *, hdr, blkptr_t *, bp,
 		    uint64_t, size, zbookmark_t *, zb);
@@ -3223,8 +3238,8 @@ arc_buf_evict(arc_buf_t *buf)
 }
 
 /*
- * Release this buffer from the cache.  This must be done
- * after a read and prior to modifying the buffer contents.
+ * Release this buffer from the cache, making it an anonymous buffer.  This
+ * must be done after a read and prior to modifying the buffer contents.
  * If the buffer has more than one reference, we must make
  * a new hdr for the buffer.
  */

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -641,6 +641,14 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio
 		if (!havepzio)
 			err = zio_wait(zio);
 	} else {
+		/*
+		 * Another reader came in while the dbuf was in flight
+		 * between UNCACHED and CACHED.  Either a writer will finish
+		 * writing the buffer (sending the dbuf to CACHED) or the
+		 * first reader's request will reach the read_done callback
+		 * and send the dbuf to CACHED.  Otherwise, a failure
+		 * occurred and the dbuf went to UNCACHED.
+		 */
 		mutex_exit(&db->db_mtx);
 		if (prefetch)
 			dmu_zfetch(&dn->dn_zfetch, db->db.db_offset,
@@ -649,6 +657,7 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio
 			rw_exit(&dn->dn_struct_rwlock);
 		DB_DNODE_EXIT(db);
 
+		/* Skip the wait per the caller's request. */
 		mutex_enter(&db->db_mtx);
 		if ((flags & DB_RF_NEVERWAIT) == 0) {
 			while (db->db_state == DB_READ ||
@@ -1264,7 +1273,8 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t 
 }
 
 /*
- * Return TRUE if this evicted the dbuf.
+ * Undirty a buffer in the transaction group referenced by the given
+ * transaction.  Return whether this evicted the dbuf.
  */
 static boolean_t
 dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
@@ -2225,6 +2235,7 @@ dbuf_sync_indirect(dbuf_dirty_record_t *
 	ASSERT(db->db_level > 0);
 	DBUF_VERIFY(db);
 
+	/* Read the block if it hasn't been read yet. */
 	if (db->db_buf == NULL) {
 		mutex_exit(&db->db_mtx);
 		(void) dbuf_read(db, NULL, DB_RF_MUST_SUCCEED);
@@ -2235,10 +2246,12 @@ dbuf_sync_indirect(dbuf_dirty_record_t *
 
 	DB_DNODE_ENTER(db);
 	dn = DB_DNODE(db);
+	/* Indirect block size must match what the dnode thinks it is. */
 	ASSERT3U(db->db.db_size, ==, 1<dn_phys->dn_indblkshift);
 	dbuf_check_blkptr(dn, db);
 	DB_DNODE_EXIT(db);
 
+	/* Provide the pending dirty record to child dbufs */
 	db->db_data_pending = dr;
 
 	mutex_exit(&db->db_mtx);
@@ -2625,6 +2638,7 @@ dbuf_write_override_done(zio_t *zio)
 	dbuf_write_done(zio, NULL, db);
 }
 
+/* Issue I/O to commit a dirty buffer to disk. */
 static void
 dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 {
@@ -2659,11 +2673,19 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_
 	}
 
 	if (parent != dn->dn_dbuf) {
+		/* Our parent is an indirect block. */
+		/* We have a dirty parent that has been scheduled for write. */
 		ASSERT(parent && parent->db_data_pending);
+		/* Our parent's buffer is one level closer to the dnode. */
 		ASSERT(db->db_level == parent->db_level-1);
+		/*
+		 * We're about to modify our parent's db_data by modifying
+		 * our block pointer, so the parent must be released.
+		 */
 		ASSERT(arc_released(parent->db_buf));
 		zio = parent->db_data_pending->dr_zio;
 	} else {
+		/* Our parent is the dnode itself. */
 		ASSERT((db->db_level == dn->dn_phys->dn_nlevels-1 &&
 		    db->db_blkid != DMU_SPILL_BLKID) ||
 		    (db->db_blkid == DMU_SPILL_BLKID && db->db_level == 0));

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -1826,7 +1826,7 @@ dmu_init(void)
 void
 dmu_fini(void)
 {
-	arc_fini();
+	arc_fini(); /* arc depends on l2arc, so arc must go first */
 	l2arc_fini();
 	zfetch_fini();
 	dbuf_fini();

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -1014,6 +1014,10 @@ dmu_tx_unassign(dmu_tx_t *tx)
 
 	txg_rele_to_quiesce(&tx->tx_txgh);
 
+	/*
+	 * Walk the transaction's hold list, removing the hold on the
+	 * associated dnode, and notifying waiters if the refcount drops to 0.
+	 */
 	for (txh = list_head(&tx->tx_holds); txh != tx->tx_needassign_txh;
 	    txh = list_next(&tx->tx_holds, txh)) {
 		dnode_t *dn = txh->txh_dnode;
@@ -1126,6 +1130,10 @@ dmu_tx_commit(dmu_tx_t *tx)
 
 	ASSERT(tx->tx_txg != 0);
 
+	/*
+	 * Go through the transaction's hold list and remove holds on
+	 * associated dnodes, notifying waiters if no holds remain.
+	 */
 	while (txh = list_head(&tx->tx_holds)) {
 		dnode_t *dn = txh->txh_dnode;
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_zfetch.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_zfetch.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_zfetch.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -48,11 +48,11 @@ uint32_t	zfetch_block_cap = 256;
 uint64_t	zfetch_array_rd_sz = 1024 * 1024;
 
 /* forward decls for static routines */
-static int		dmu_zfetch_colinear(zfetch_t *, zstream_t *);
+static boolean_t	dmu_zfetch_colinear(zfetch_t *, zstream_t *);
 static void		dmu_zfetch_dofetch(zfetch_t *, zstream_t *);
 static uint64_t		dmu_zfetch_fetch(dnode_t *, uint64_t, uint64_t);
 static uint64_t		dmu_zfetch_fetchsz(dnode_t *, uint64_t, uint64_t);
-static int		dmu_zfetch_find(zfetch_t *, zstream_t *, int);
+static boolean_t	dmu_zfetch_find(zfetch_t *, zstream_t *, int);
 static int		dmu_zfetch_stream_insert(zfetch_t *, zstream_t *);
 static zstream_t	*dmu_zfetch_stream_reclaim(zfetch_t *);
 static void		dmu_zfetch_stream_remove(zfetch_t *, zstream_t *);
@@ -104,9 +104,9 @@ kstat_t		*zfetch_ksp;
  * last stream, then we are probably in a strided access pattern.  So
  * combine the two sequential streams into a single strided stream.
  *
- * If no co-linear streams are found, return NULL.
+ * Returns whether co-linear streams were found.
  */
-static int
+static boolean_t
 dmu_zfetch_colinear(zfetch_t *zf, zstream_t *zh)
 {
 	zstream_t	*z_walk;
@@ -326,7 +326,7 @@ dmu_zfetch_fetchsz(dnode_t *dn, uint64_t
  * for this block read.  If so, it starts a prefetch for the stream it
  * located and returns true, otherwise it returns false
  */
-static int
+static boolean_t
 dmu_zfetch_find(zfetch_t *zf, zstream_t *zh, int prefetched)
 {
 	zstream_t	*zs;
@@ -639,7 +639,7 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset
 {
 	zstream_t	zst;
 	zstream_t	*newstream;
-	int		fetched;
+	boolean_t	fetched;
 	int		inserted;
 	unsigned int	blkshft;
 	uint64_t	blksz;
@@ -665,7 +665,8 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset
 		ZFETCHSTAT_BUMP(zfetchstat_hits);
 	} else {
 		ZFETCHSTAT_BUMP(zfetchstat_misses);
-		if (fetched = dmu_zfetch_colinear(zf, &zst)) {
+		fetched = dmu_zfetch_colinear(zf, &zst);
+		if (fetched) {
 			ZFETCHSTAT_BUMP(zfetchstat_colinear_hits);
 		} else {
 			ZFETCHSTAT_BUMP(zfetchstat_colinear_misses);

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -26,6 +26,8 @@
  */
 
 /*
+ * SPA: Storage Pool Allocator
+ *
  * This file contains all the routines used when modifying on-disk SPA state.
  * This includes opening, importing, destroying, exporting a pool, and syncing a
  * pool.

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h	Tue Jun 11 18:28:25 2013	(r251619)
@@ -409,6 +409,8 @@ void dmu_write_policy(objset_t *os, stru
  * object must be held in an assigned transaction before calling
  * dmu_buf_will_dirty.  You may use dmu_buf_set_user() on the bonus
  * buffer as well.  You must release your hold with dmu_buf_rele().
+ *
+ * Returns ENOENT, EIO, or 0.
  */
 int dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **);
 int dmu_bonus_max(void);
@@ -664,8 +666,14 @@ extern const dmu_object_byteswap_info_t 
  * If doi is NULL, just indicates whether the object exists.
  */
 int dmu_object_info(objset_t *os, uint64_t object, dmu_object_info_t *doi);
+/* Like dmu_object_info, but faster if you have a held dnode in hand. */
 void dmu_object_info_from_dnode(struct dnode *dn, dmu_object_info_t *doi);
+/* Like dmu_object_info, but faster if you have a held dbuf in hand. */
 void dmu_object_info_from_db(dmu_buf_t *db, dmu_object_info_t *doi);
+/*
+ * Like dmu_object_info_from_db, but faster still when you only care about
+ * the size.  This is specifically optimized for zfs_getattr().
+ */
 void dmu_object_size_from_db(dmu_buf_t *db, uint32_t *blksize,
     u_longlong_t *nblk512);
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -343,6 +343,12 @@ txg_rele_to_sync(txg_handle_t *th)
 	th->th_cpu = NULL;	/* defensive */
 }
 
+/*
+ * Blocks until all transactions in the group are committed.
+ *
+ * On return, the transaction group has reached a stable state in which it can
+ * then be passed off to the syncing context.
+ */
 static void
 txg_quiesce(dsl_pool_t *dp, uint64_t txg)
 {
@@ -393,6 +399,9 @@ txg_do_callbacks(list_t *cb_list)
 
 /*
  * Dispatch the commit callbacks registered on this txg to worker threads.
+ *
+ * If no callbacks are registered for a given TXG, nothing happens.
+ * This function creates a taskq for the associated pool, if needed.
  */
 static void
 txg_dispatch_callbacks(dsl_pool_t *dp, uint64_t txg)
@@ -403,7 +412,10 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
 
 	for (c = 0; c < max_ncpus; c++) {
 		tx_cpu_t *tc = &tx->tx_cpu[c];
-		/* No need to lock tx_cpu_t at this point */
+		/*
+		 * No need to lock tx_cpu_t at this point, since this can
+		 * only be called once a txg has been synced.
+		 */
 
 		int g = txg & TXG_MASK;
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -1028,6 +1028,7 @@ vdev_uberblock_sync(zio_t *zio, uberbloc
 	zio_buf_free(ubbuf, VDEV_UBERBLOCK_SIZE(vd));
 }
 
+/* Sync the uberblocks to all vdevs in svd[] */
 int
 vdev_uberblock_sync_list(vdev_t **svd, int svdcount, uberblock_t *ub, int flags)
 {

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -431,23 +431,50 @@ static const zio_vsd_ops_t vdev_raidz_vs
 	vdev_raidz_cksum_report
 };
 
+/*
+ * Divides the IO evenly across all child vdevs; usually, dcols is
+ * the number of children in the target vdev.
+ */
 static raidz_map_t *
 vdev_raidz_map_alloc(zio_t *zio, uint64_t unit_shift, uint64_t dcols,
     uint64_t nparity)
 {
 	raidz_map_t *rm;
+	/* The starting RAIDZ (parent) vdev sector of the block. */
 	uint64_t b = zio->io_offset >> unit_shift;
+	/* The zio's size in units of the vdev's minimum sector size. */
 	uint64_t s = zio->io_size >> unit_shift;
+	/* The first column for this stripe. */
 	uint64_t f = b % dcols;
+	/* The starting byte offset on each child vdev. */
 	uint64_t o = (b / dcols) << unit_shift;
 	uint64_t q, r, c, bc, col, acols, scols, coff, devidx, asize, tot;
 
+	/*
+	 * "Quotient": The number of data sectors for this stripe on all but
+	 * the "big column" child vdevs that also contain "remainder" data.
+	 */
 	q = s / (dcols - nparity);
+
+	/*
+	 * "Remainder": The number of partial stripe data sectors in this I/O.
+	 * This will add a sector to some, but not all, child vdevs.
+	 */
 	r = s - q * (dcols - nparity);
+
+	/* The number of "big columns" - those which contain remainder data. */
 	bc = (r == 0 ? 0 : r + nparity);
+
+	/*
+	 * The total number of data and parity sectors associated with
+	 * this I/O.
+	 */
 	tot = s + nparity * (q + (r == 0 ? 0 : 1));
 
+	/* acols: The columns that will be accessed. */
+	/* scols: The columns that will be accessed or skipped. */
 	if (q == 0) {
+		/* Our I/O request doesn't span all child vdevs. */
 		acols = bc;
 		scols = MIN(dcols, roundup(bc, nparity + 1));
 	} else {
@@ -1521,6 +1548,23 @@ vdev_raidz_child_done(zio_t *zio)
 	rc->rc_skipped = 0;
 }
 
+/*
+ * Start an IO operation on a RAIDZ VDev
+ *
+ * Outline:
+ * - For write operations:
+ *   1. Generate the parity data
+ *   2. Create child zio write operations to each column's vdev, for both
+ *      data and parity.
+ *   3. If the column skips any sectors for padding, create optional dummy
+ *      write zio children for those areas to improve aggregation continuity.
+ * - For read operations:
+ *   1. Create child zio read operations to each data column's vdev to read
+ *      the range of data required for zio.
+ *   2. If this is a scrub or resilver operation, or if any of the data
+ *      vdevs have had errors, then create zio read operations to the parity
+ *      columns' VDevs as well.
+ */
 static int
 vdev_raidz_io_start(zio_t *zio)
 {
@@ -1861,6 +1905,27 @@ done:
 	return (ret);
 }
 
+/*
+ * Complete an IO operation on a RAIDZ VDev
+ *
+ * Outline:
+ * - For write operations:
+ *   1. Check for errors on the child IOs.
+ *   2. Return, setting an error code if too few child VDevs were written
+ *      to reconstruct the data later.  Note that partial writes are
+ *      considered successful if they can be reconstructed at all.
+ * - For read operations:
+ *   1. Check for errors on the child IOs.
+ *   2. If data errors occurred:
+ *      a. Try to reassemble the data from the parity available.
+ *      b. If we haven't yet read the parity drives, read them now.
+ *      c. If all parity drives have been read but the data still doesn't
+ *         reassemble with a correct checksum, then try combinatorial
+ *         reconstruction.
+ *      d. If that doesn't work, return an error.
+ *   3. If there were unexpected errors or this is a resilver operation,
+ *      rewrite the vdevs that had errors.
+ */
 static void
 vdev_raidz_io_done(zio_t *zio)
 {

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 17:46:32 2013	(r251618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 18:28:25 2013	(r251619)
@@ -505,6 +505,11 @@ static const fs_operation_def_t zfsctl_t
 	{ NULL }
 };
 
+/*
+ * Gets the full dataset name that corresponds to the given snapshot name
+ * Example:
+ * 	zfsctl_snapshot_zname("snap1") -> "mypool/myfs@snap1"
+ */
 static int
 zfsctl_snapshot_zname(vnode_t *vp, const char *name, int len, char *zname)
 {

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:32:55 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 99DCB260;
 Tue, 11 Jun 2013 18:32:55 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8AFFC1351;
 Tue, 11 Jun 2013 18:32:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIWtbu044183;
 Tue, 11 Jun 2013 18:32:55 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIWmlm044130;
 Tue, 11 Jun 2013 18:32:48 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111832.r5BIWmlm044130@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:32:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251620 - in vendor-sys/illumos/dist/uts/common/fs/zfs: .
 sys
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:32:55 -0000

Author: delphij
Date: Tue Jun 11 18:32:47 2013
New Revision: 251620
URL: http://svnweb.freebsd.org/changeset/base/251620

Log:
  Update vendor-sys/illumos/dist to illumos-gate 14046:6a5a2f4a47db
  
  Illumos ZFS issues:
    3742 zfs comments need cleaner, more consistent style

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_prop.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa_misc.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/ddt.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dnode.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_pool.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/sa_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/unique.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap_leaf.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_acl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_rlock.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_znode.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zil.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zio_compress.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_queue.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_log.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_rlock.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_sa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vfsops.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zil.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -58,11 +58,11 @@
  * tight.
  *
  * 3. The Megiddo and Modha model assumes a fixed page size. All
- * elements of the cache are therefor exactly the same size.  So
+ * elements of the cache are therefore exactly the same size.  So
  * when adjusting the cache size following a cache miss, its simply
  * a matter of choosing a single page to evict.  In our model, we
  * have variable sized cache blocks (rangeing from 512 bytes to
- * 128K bytes).  We therefor choose a set of blocks to evict to make
+ * 128K bytes).  We therefore choose a set of blocks to evict to make
  * space for a cache miss that approximates as closely as possible
  * the space used by the new block.
  *
@@ -77,7 +77,7 @@
  * ways: 1) via a hash table lookup using the DVA as a key,
  * or 2) via one of the ARC lists.  The arc_read() interface
  * uses method 1, while the internal arc algorithms for
- * adjusting the cache use method 2.  We therefor provide two
+ * adjusting the cache use method 2.  We therefore provide two
  * types of locks: 1) the hash table lock array, and 2) the
  * arc list locks.
  *
@@ -385,7 +385,7 @@ static arc_stats_t arc_stats = {
 #define	ARCSTAT(stat)	(arc_stats.stat.value.ui64)
 
 #define	ARCSTAT_INCR(stat, val) \
-	atomic_add_64(&arc_stats.stat.value.ui64, (val));
+	atomic_add_64(&arc_stats.stat.value.ui64, (val))
 
 #define	ARCSTAT_BUMP(stat)	ARCSTAT_INCR(stat, 1)
 #define	ARCSTAT_BUMPDOWN(stat)	ARCSTAT_INCR(stat, -1)
@@ -613,9 +613,7 @@ uint64_t zfs_crc64_table[256];
 #define	l2arc_writes_sent	ARCSTAT(arcstat_l2_writes_sent)
 #define	l2arc_writes_done	ARCSTAT(arcstat_l2_writes_done)
 
-/*
- * L2ARC Performance Tunables
- */
+/* L2ARC Performance Tunables */
 uint64_t l2arc_write_max = L2ARC_WRITE_SIZE;	/* default max write size */
 uint64_t l2arc_write_boost = L2ARC_WRITE_SIZE;	/* extra write during warmup */
 uint64_t l2arc_headroom = L2ARC_HEADROOM;	/* number of dev writes */
@@ -3628,7 +3626,7 @@ arc_tempreserve_space(uint64_t reserve, 
 
 	/*
 	 * Writes will, almost always, require additional memory allocations
-	 * in order to compress/encrypt/etc the data.  We therefor need to
+	 * in order to compress/encrypt/etc the data.  We therefore need to
 	 * make sure that there is sufficient available memory for this.
 	 */
 	if (error = arc_memory_throttle(reserve, anon_size, txg))

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -43,7 +43,7 @@
  * dsl_scan_sync. This allows the delete operation to finish without traversing
  * all the dataset's blocks.
  *
- * Note that while bt_begin and bt_end are only ever incremented in this code
+ * Note that while bt_begin and bt_end are only ever incremented in this code,
  * they are effectively reset to 0 every time the entire bptree is freed because
  * the bptree's object is destroyed and re-created.
  */

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -1803,14 +1803,16 @@ dnode_willuse_space(dnode_t *dn, int64_t
 }
 
 /*
- * This function scans a block at the indicated "level" looking for
- * a hole or data (depending on 'flags').  If level > 0, then we are
- * scanning an indirect block looking at its pointers.  If level == 0,
- * then we are looking at a block of dnodes.  If we don't find what we
- * are looking for in the block, we return ESRCH.  Otherwise, return
- * with *offset pointing to the beginning (if searching forwards) or
- * end (if searching backwards) of the range covered by the block
- * pointer we matched on (or dnode).
+ * Scans a block at the indicated "level" looking for a hole or data,
+ * depending on 'flags'.
+ *
+ * If level > 0, then we are scanning an indirect block looking at its
+ * pointers.  If level == 0, then we are looking at a block of dnodes.
+ *
+ * If we don't find what we are looking for in the block, we return ESRCH.
+ * Otherwise, return with *offset pointing to the beginning (if searching
+ * forwards) or end (if searching backwards) of the range covered by the
+ * block pointer we matched on (or dnode).
  *
  * The basic search algorithm used below by dnode_next_offset() is to
  * use this function to search up the block tree (widen the search) until

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -302,7 +302,7 @@ free_children(dmu_buf_impl_t *db, uint64
 }
 
 /*
- * free_range: Traverse the indicated range of the provided file
+ * Traverse the indicated range of the provided file
  * and "free" all the blocks contained there.
  */
 static void
@@ -370,7 +370,7 @@ dnode_sync_free_range(dnode_t *dn, uint6
 }
 
 /*
- * Try to kick all the dnodes dbufs out of the cache...
+ * Try to kick all the dnode's dbufs out of the cache...
  */
 void
 dnode_evict_dbufs(dnode_t *dn)

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_prop.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_prop.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_prop.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -380,7 +380,7 @@ dsl_prop_predict(dsl_dir_t *dd, const ch
 
 /*
  * Unregister this callback.  Return 0 on success, ENOENT if ddname is
- * invalid, ENOMSG if no matching callback registered.
+ * invalid, or ENOMSG if no matching callback registered.
  */
 int
 dsl_prop_unregister(dsl_dataset_t *ds, const char *propname,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sa.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sa.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -111,6 +111,7 @@
  * location.
  *
  * Byteswap implications:
+ *
  * Since the SA attributes are not entirely self describing we can't do
  * the normal byteswap processing.  The special ZAP layout attribute and
  * attribute registration attributes define the byteswap function and the
@@ -189,7 +190,6 @@ sa_attr_reg_t sa_legacy_attrs[] = {
 };
 
 /*
- * ZPL legacy layout
  * This is only used for objects of type DMU_OT_ZNODE
  */
 sa_attr_type_t sa_legacy_zpl_layout[] = {
@@ -199,7 +199,6 @@ sa_attr_type_t sa_legacy_zpl_layout[] = 
 /*
  * Special dummy layout used for buffers with no attributes.
  */
-
 sa_attr_type_t sa_dummy_zpl_layout[] = { 0 };
 
 static int sa_legacy_attr_count = 16;

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -4516,6 +4516,7 @@ spa_vdev_attach(spa_t *spa, uint64_t gui
 
 /*
  * Detach a device from a mirror or replacing vdev.
+ *
  * If 'replace_done' is specified, only detach if the parent
  * is a replacing vdev.
  */
@@ -5170,11 +5171,9 @@ spa_vdev_remove_from_namespace(spa_t *sp
  * the spa_vdev_config_[enter/exit] functions which allow us to
  * grab and release the spa_config_lock while still holding the namespace
  * lock.  During each step the configuration is synced out.
- */
-
-/*
- * Remove a device from the pool.  Currently, this supports removing only hot
- * spares, slogs, and level 2 ARC devices.
+ *
+ * Currently, this supports removing only hot spares, slogs, and level 2 ARC
+ * devices.
  */
 int
 spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
@@ -5284,7 +5283,7 @@ spa_vdev_remove(spa_t *spa, uint64_t gui
 
 /*
  * Find any device that's done replacing, or a vdev marked 'unspare' that's
- * current spared, so we can detach it.
+ * currently spared, so we can detach it.
  */
 static vdev_t *
 spa_vdev_resilver_done_hunt(vdev_t *vd)

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -317,6 +317,7 @@ spa_config_set(spa_t *spa, nvlist_t *con
 
 /*
  * Generate the pool's configuration based on the current in-core state.
+ *
  * We infer whether to generate a complete config or just one top-level config
  * based on whether vd is the root vdev.
  */

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_misc.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_misc.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -1334,7 +1334,7 @@ zfs_panic_recover(const char *fmt, ...)
 
 /*
  * This is a stripped-down version of strtoull, suitable only for converting
- * lowercase hexidecimal numbers that don't overflow.
+ * lowercase hexadecimal numbers that don't overflow.
  */
 uint64_t
 strtonum(const char *str, char **nptr)

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/ddt.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/ddt.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/ddt.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -63,16 +63,15 @@ enum ddt_class {
  */
 typedef struct ddt_key {
 	zio_cksum_t	ddk_cksum;	/* 256-bit block checksum */
-	uint64_t	ddk_prop;	/* LSIZE, PSIZE, compression */
+	/*
+	 * Encoded with logical & physical size, and compression, as follows:
+	 *   +-------+-------+-------+-------+-------+-------+-------+-------+
+	 *   |   0   |   0   |   0   | comp  |     PSIZE     |     LSIZE     |
+	 *   +-------+-------+-------+-------+-------+-------+-------+-------+
+	 */
+	uint64_t	ddk_prop;
 } ddt_key_t;
 
-/*
- * ddk_prop layout:
- *
- *	+-------+-------+-------+-------+-------+-------+-------+-------+
- *	|   0	|   0	|   0	| comp	|     PSIZE	|     LSIZE	|
- *	+-------+-------+-------+-------+-------+-------+-------+-------+
- */
 #define	DDK_GET_LSIZE(ddk)	\
 	BF64_GET_SB((ddk)->ddk_prop, 0, 16, SPA_MINBLOCKSHIFT, 1)
 #define	DDK_SET_LSIZE(ddk, x)	\

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dnode.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dnode.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dnode.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -145,9 +145,8 @@ typedef struct dnode_phys {
 
 typedef struct dnode {
 	/*
-	 * dn_struct_rwlock protects the structure of the dnode,
-	 * including the number of levels of indirection (dn_nlevels),
-	 * dn_maxblkid, and dn_next_*
+	 * Protects the structure of the dnode, including the number of levels
+	 * of indirection (dn_nlevels), dn_maxblkid, and dn_next_*
 	 */
 	krwlock_t dn_struct_rwlock;
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_pool.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_pool.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_pool.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -110,6 +110,7 @@ typedef struct dsl_pool {
 
 	/*
 	 * Protects administrative changes (properties, namespace)
+	 *
 	 * It is only held for write in syncing context.  Therefore
 	 * syncing context does not need to ever have it for read, since
 	 * nobody else could possibly have it for write.

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/sa_impl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/sa_impl.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/sa_impl.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -150,6 +150,7 @@ struct sa_os {
 
 /*
  * header for all bonus and spill buffers.
+ *
  * The header has a fixed portion with a variable number
  * of "lengths" depending on the number of variable sized
  * attribues which are determined by the "layout number"
@@ -158,29 +159,27 @@ struct sa_os {
 #define	SA_MAGIC	0x2F505A  /* ZFS SA */
 typedef struct sa_hdr_phys {
 	uint32_t sa_magic;
-	uint16_t sa_layout_info;  /* Encoded with hdrsize and layout number */
+	/*
+	 * Encoded with hdrsize and layout number as follows:
+	 * 16      10       0
+	 * +--------+-------+
+	 * | hdrsz  |layout |
+	 * +--------+-------+
+	 *
+	 * Bits 0-10 are the layout number
+	 * Bits 11-16 are the size of the header.
+	 * The hdrsize is the number * 8
+	 *
+	 * For example.
+	 * hdrsz of 1 ==> 8 byte header
+	 *          2 ==> 16 byte header
+	 *
+	 */
+	uint16_t sa_layout_info;
 	uint16_t sa_lengths[1];	/* optional sizes for variable length attrs */
 	/* ... Data follows the lengths.  */
 } sa_hdr_phys_t;
 
-/*
- * sa_hdr_phys -> sa_layout_info
- *
- * 16      10       0
- * +--------+-------+
- * | hdrsz  |layout |
- * +--------+-------+
- *
- * Bits 0-10 are the layout number
- * Bits 11-16 are the size of the header.
- * The hdrsize is the number * 8
- *
- * For example.
- * hdrsz of 1 ==> 8 byte header
- *          2 ==> 16 byte header
- *
- */
-
 #define	SA_HDR_LAYOUT_NUM(hdr) BF32_GET(hdr->sa_layout_info, 0, 10)
 #define	SA_HDR_SIZE(hdr) BF32_GET_SB(hdr->sa_layout_info, 10, 6, 3, 0)
 #define	SA_HDR_LAYOUT_INFO_ENCODE(x, num, size) \

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -239,7 +239,7 @@ struct spa {
 	kmutex_t	spa_iokstat_lock;	/* protects spa_iokstat_* */
 	struct kstat	*spa_iokstat;		/* kstat of io to this pool */
 	/*
-	 * spa_refcnt & spa_config_lock must be the last elements
+	 * spa_refcount & spa_config_lock must be the last elements
 	 * because refcount_t changes size based on compilation options.
 	 * In order for the MDB module to function correctly, the other
 	 * fields must remain in the same location.

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -94,7 +94,6 @@ struct space_map_ops {
  *   63  62    60 59        50 49                               0
  *
  *
- *
  * non-debug entry
  *
  *    1               47                   1           15

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/unique.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/unique.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/unique.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -26,8 +26,6 @@
 #ifndef	_SYS_UNIQUE_H
 #define	_SYS_UNIQUE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include 
 
 #ifdef	__cplusplus
@@ -42,7 +40,7 @@ void unique_fini(void);
 
 /*
  * Return a new unique value (which will not be uniquified against until
- * it is unique_insert()-ed.
+ * it is unique_insert()-ed).
  */
 uint64_t unique_create(void);
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev_impl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev_impl.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev_impl.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -245,12 +245,13 @@ typedef struct vdev_label {
 #define	VDD_METASLAB	0x01
 #define	VDD_DTL		0x02
 
+/* Offset of embedded boot loader region on each label */
+#define	VDEV_BOOT_OFFSET	(2 * sizeof (vdev_label_t))
 /*
- * Size and offset of embedded boot loader region on each label.
+ * Size of embedded boot loader region on each label.
  * The total size of the first two labels plus the boot area is 4MB.
  */
-#define	VDEV_BOOT_OFFSET	(2 * sizeof (vdev_label_t))
-#define	VDEV_BOOT_SIZE		(7ULL << 19)			/* 3.5M	*/
+#define	VDEV_BOOT_SIZE		(7ULL << 19)			/* 3.5M */
 
 /*
  * Size of label regions at the start and end of each leaf device.
@@ -317,8 +318,9 @@ extern uint64_t vdev_get_min_asize(vdev_
 extern void vdev_set_min_asize(vdev_t *vd);
 
 /*
- * zdb uses this tunable, so it must be declared here to make lint happy.
+ * Global variables
  */
+/* zdb uses this tunable, so it must be declared here to make lint happy. */
 extern int zfs_vdev_cache_size;
 
 /*

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -86,18 +86,22 @@ extern "C" {
 #endif
 
 /*
- * The matchtype specifies which entry will be accessed.
- * MT_EXACT: only find an exact match (non-normalized)
- * MT_FIRST: find the "first" normalized (case and Unicode
- *     form) match; the designated "first" match will not change as long
- *     as the set of entries with this normalization doesn't change
- * MT_BEST: if there is an exact match, find that, otherwise find the
- *     first normalized match
+ * Specifies matching criteria for ZAP lookups.
  */
 typedef enum matchtype
 {
+	/* Only find an exact match (non-normalized) */
 	MT_EXACT,
+	/*
+	 * If there is an exact match, find that, otherwise find the
+	 * first normalized match.
+	 */
 	MT_BEST,
+	/*
+	 * Find the "first" normalized (case and Unicode form) match;
+	 * the designated "first" match will not change as long as the
+	 * set of entries with this normalization doesn't change.
+	 */
 	MT_FIRST
 } matchtype_t;
 
@@ -174,16 +178,21 @@ int zap_destroy(objset_t *ds, uint64_t z
  * call will fail and return EINVAL.
  *
  * If 'integer_size' is equal to or larger than the attribute's integer
- * size, the call will succeed and return 0.  * When converting to a
- * larger integer size, the integers will be treated as unsigned (ie. no
- * sign-extension will be performed).
+ * size, the call will succeed and return 0.
+ *
+ * When converting to a larger integer size, the integers will be treated as
+ * unsigned (ie. no sign-extension will be performed).
  *
  * 'num_integers' is the length (in integers) of 'buf'.
  *
  * If the attribute is longer than the buffer, as many integers as will
  * fit will be transferred to 'buf'.  If the entire attribute was not
  * transferred, the call will return EOVERFLOW.
- *
+ */
+int zap_lookup(objset_t *ds, uint64_t zapobj, const char *name,
+    uint64_t integer_size, uint64_t num_integers, void *buf);
+
+/*
  * If rn_len is nonzero, realname will be set to the name of the found
  * entry (which may be different from the requested name if matchtype is
  * not MT_EXACT).
@@ -191,8 +200,6 @@ int zap_destroy(objset_t *ds, uint64_t z
  * If normalization_conflictp is not NULL, it will be set if there is
  * another name with the same case/unicode normalized form.
  */
-int zap_lookup(objset_t *ds, uint64_t zapobj, const char *name,
-    uint64_t integer_size, uint64_t num_integers, void *buf);
 int zap_lookup_norm(objset_t *ds, uint64_t zapobj, const char *name,
     uint64_t integer_size, uint64_t num_integers, void *buf,
     matchtype_t mt, char *realname, int rn_len,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap_leaf.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap_leaf.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zap_leaf.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -101,6 +101,7 @@ typedef enum zap_chunk_type {
  */
 typedef struct zap_leaf_phys {
 	struct zap_leaf_header {
+		/* Public to ZAP */
 		uint64_t lh_block_type;		/* ZBT_LEAF */
 		uint64_t lh_pad1;
 		uint64_t lh_prefix;		/* hash prefix of this leaf */
@@ -109,8 +110,7 @@ typedef struct zap_leaf_phys {
 		uint16_t lh_nentries;		/* number of entries */
 		uint16_t lh_prefix_len;		/* num bits used to id this */
 
-/* above is accessable to zap, below is zap_leaf private */
-
+		/* Private to zap_leaf */
 		uint16_t lh_freelist;		/* chunk head of free list */
 		uint8_t lh_flags;		/* ZLF_* flags */
 		uint8_t lh_pad2[11];
@@ -161,13 +161,13 @@ typedef struct zap_leaf {
 
 
 typedef struct zap_entry_handle {
-	/* below is set by zap_leaf.c and is public to zap.c */
+	/* Set by zap_leaf and public to ZAP */
 	uint64_t zeh_num_integers;
 	uint64_t zeh_hash;
 	uint32_t zeh_cd;
 	uint8_t zeh_integer_size;
 
-	/* below is private to zap_leaf.c */
+	/* Private to zap_leaf */
 	uint16_t zeh_fakechunk;
 	uint16_t *zeh_chunkp;
 	zap_leaf_t *zeh_leaf;
@@ -202,7 +202,7 @@ extern int zap_entry_read_name(struct za
 /*
  * Replace the value of an existing entry.
  *
- * zap_entry_update may fail if it runs out of space (ENOSPC).
+ * May fail if it runs out of space (ENOSPC).
  */
 extern int zap_entry_update(zap_entry_handle_t *zeh,
     uint8_t integer_size, uint64_t num_integers, const void *buf);
@@ -221,10 +221,7 @@ extern int zap_entry_create(zap_leaf_t *
     uint8_t integer_size, uint64_t num_integers, const void *buf,
     zap_entry_handle_t *zeh);
 
-/*
- * Return true if there are additional entries with the same normalized
- * form.
- */
+/* Determine whether there is another entry with the same normalized form. */
 extern boolean_t zap_entry_normalization_conflict(zap_entry_handle_t *zeh,
     struct zap_name *zn, const char *name, struct zap *zap);
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_acl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_acl.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_acl.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -46,7 +46,8 @@ struct znode_phys;
 #define	ZFS_ACL_VERSION		ZFS_ACL_VERSION_FUID
 
 /*
- * ZFS ACLs are store in various forms.
+ * ZFS ACLs (Access Control Lists) are stored in various forms.
+ *
  * Files created with ACL version ZFS_ACL_VERSION_INITIAL
  * will all be created with fixed length ACEs of type
  * zfs_oldace_t.
@@ -136,8 +137,8 @@ typedef struct acl_ops {
 	size_t		(*ace_size)(void *acep); /* how big is this ace */
 	size_t		(*ace_abstract_size)(void); /* sizeof abstract entry */
 	int		(*ace_mask_off)(void); /* off of access mask in ace */
+	/* ptr to data if any */
 	int		(*ace_data)(void *acep, void **datap);
-			    /* ptr to data if any */
 } acl_ops_t;
 
 /*

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_rlock.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_rlock.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_rlock.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -26,8 +26,6 @@
 #ifndef	_SYS_FS_ZFS_RLOCK_H
 #define	_SYS_FS_ZFS_RLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -57,16 +55,14 @@ typedef struct rl {
 } rl_t;
 
 /*
- * Lock a range (offset, length) as either shared (READER)
- * or exclusive (WRITER or APPEND). APPEND is a special type that
- * is converted to WRITER that specified to lock from the start of the
- * end of file.  zfs_range_lock() returns the range lock structure.
+ * Lock a range (offset, length) as either shared (RL_READER)
+ * or exclusive (RL_WRITER or RL_APPEND).  RL_APPEND is a special type that
+ * is converted to RL_WRITER that specified to lock from the start of the
+ * end of file.  Returns the range lock structure.
  */
 rl_t *zfs_range_lock(znode_t *zp, uint64_t off, uint64_t len, rl_type_t type);
 
-/*
- * Unlock range and destroy range lock structure.
- */
+/* Unlock range and destroy range lock structure. */
 void zfs_range_unlock(rl_t *rl);
 
 /*
@@ -76,7 +72,8 @@ void zfs_range_unlock(rl_t *rl);
 void zfs_range_reduce(rl_t *rl, uint64_t off, uint64_t len);
 
 /*
- * AVL comparison function used to compare range locks
+ * AVL comparison function used to order range locks
+ * Locks are ordered on the start offset of the range.
  */
 int zfs_range_compare(const void *arg1, const void *arg2);
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_znode.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_znode.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_znode.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -138,8 +138,9 @@ extern "C" {
 
 #define	ZFS_MAX_BLOCKSIZE	(SPA_MAXBLOCKSIZE)
 
-/* Path component length */
 /*
+ * Path component length
+ *
  * The generic fs code uses MAXNAMELEN to represent
  * what the largest component length is.  Unfortunately,
  * this length includes the terminating NULL.  ZFS needs
@@ -234,11 +235,7 @@ typedef struct znode {
 #define	ZTOV(ZP)	((ZP)->z_vnode)
 #define	VTOZ(VP)	((znode_t *)(VP)->v_data)
 
-/*
- * ZFS_ENTER() is called on entry to each ZFS vnode and vfs operation.
- * ZFS_EXIT() must be called before exitting the vop.
- * ZFS_VERIFY_ZP() verifies the znode is valid.
- */
+/* Called on entry to each ZFS vnode and vfs operation  */
 #define	ZFS_ENTER(zfsvfs) \
 	{ \
 		rrw_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); \
@@ -248,8 +245,10 @@ typedef struct znode {
 		} \
 	}
 
+/* Must be called before exiting the vop */
 #define	ZFS_EXIT(zfsvfs) rrw_exit(&(zfsvfs)->z_teardown_lock, FTAG)
 
+/* Verifies the znode is valid */
 #define	ZFS_VERIFY_ZP(zp) \
 	if ((zp)->z_sa_hdl == NULL) { \
 		ZFS_EXIT((zp)->z_zfsvfs); \
@@ -269,15 +268,14 @@ typedef struct znode {
 #define	ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num) \
 	mutex_exit(ZFS_OBJ_MUTEX((zfsvfs), (obj_num)))
 
-/*
- * Macros to encode/decode ZFS stored time values from/to struct timespec
- */
+/* Encode ZFS stored time values from a struct timespec */
 #define	ZFS_TIME_ENCODE(tp, stmp)		\
 {						\
 	(stmp)[0] = (uint64_t)(tp)->tv_sec;	\
 	(stmp)[1] = (uint64_t)(tp)->tv_nsec;	\
 }
 
+/* Decode ZFS stored time values to a struct timespec */
 #define	ZFS_TIME_DECODE(tp, stmp)		\
 {						\
 	(tp)->tv_sec = (time_t)(stmp)[0];		\

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zil.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zil.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zil.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -242,6 +242,12 @@ typedef struct {
  * information needed for replaying the create.  If the
  * file doesn't have any actual ACEs then the lr_aclcnt
  * would be zero.
+ *
+ * After lr_acl_flags, there are a lr_acl_bytes number of variable sized ace's.
+ * If create is also setting xvattr's, then acl data follows xvattr.
+ * If ACE FUIDs are needed then they will follow the xvattr_t.  Following
+ * the FUIDs will be the domain table information.  The FUIDs for the owner
+ * and group will be in lr_create.  Name follows ACL data.
  */
 typedef struct {
 	lr_create_t	lr_create;	/* common create portion */
@@ -250,13 +256,6 @@ typedef struct {
 	uint64_t	lr_fuidcnt;	/* number of real fuids */
 	uint64_t	lr_acl_bytes;	/* number of bytes in ACL */
 	uint64_t	lr_acl_flags;	/* ACL flags */
-	/* lr_acl_bytes number of variable sized ace's follows */
-	/* if create is also setting xvattr's, then acl data follows xvattr */
-	/* if ACE FUIDs are needed then they will follow the xvattr_t */
-	/* Following the FUIDs will be the domain table information. */
-	/* The FUIDs for the owner and group will be in the lr_create */
-	/* portion of the record. */
-	/* name follows ACL data */
 } lr_acl_create_t;
 
 typedef struct {

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zio_compress.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zio_compress.h	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zio_compress.h	Tue Jun 11 18:32:47 2013	(r251620)
@@ -36,11 +36,10 @@
 extern "C" {
 #endif
 
-/*
- * Common signature for all zio compress/decompress functions.
- */
+/* Common signature for all zio compress functions. */
 typedef size_t zio_compress_func_t(void *src, void *dst,
     size_t s_len, size_t d_len, int);
+/* Common signature for all zio decompress functions. */
 typedef int zio_decompress_func_t(void *src, void *dst,
     size_t s_len, size_t d_len, int);
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -567,8 +567,8 @@ txg_quiesce_thread(dsl_pool_t *dp)
 
 /*
  * Delay this thread by delay nanoseconds if we are still in the open
- * transaction group and there is already a waiting txg quiesing or quiesced.
- * Abort the delay if this txg stalls or enters the quiesing state.
+ * transaction group and there is already a waiting txg quiescing or quiesced.
+ * Abort the delay if this txg stalls or enters the quiescing state.
  */
 void
 txg_delay(dsl_pool_t *dp, uint64_t txg, hrtime_t delay, hrtime_t resolution)
@@ -576,7 +576,7 @@ txg_delay(dsl_pool_t *dp, uint64_t txg, 
 	tx_state_t *tx = &dp->dp_tx;
 	hrtime_t start = gethrtime();
 
-	/* don't delay if this txg could transition to quiesing immediately */
+	/* don't delay if this txg could transition to quiescing immediately */
 	if (tx->tx_open_txg > txg ||
 	    tx->tx_syncing_txg == txg-1 || tx->tx_synced_txg == txg-1)
 		return;

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -956,9 +956,11 @@ vdev_probe_done(zio_t *zio)
 }
 
 /*
- * Determine whether this device is accessible by reading and writing
- * to several known locations: the pad regions of each vdev label
- * but the first (which we leave alone in case it contains a VTOC).
+ * Determine whether this device is accessible.
+ *
+ * Read and write to several known locations: the pad regions of each
+ * vdev label but the first, which we leave alone in case it contains
+ * a VTOC.
  */
 zio_t *
 vdev_probe(vdev_t *vd, zio_t *zio)
@@ -2179,10 +2181,12 @@ vdev_degrade(spa_t *spa, uint64_t guid, 
 }
 
 /*
- * Online the given vdev.  If 'unspare' is set, it implies two things.  First,
- * any attached spare device should be detached when the device finishes
- * resilvering.  Second, the online should be treated like a 'test' online case,
- * so no FMA events are generated if the device fails to open.
+ * Online the given vdev.
+ *
+ * If 'ZFS_ONLINE_UNSPARE' is set, it implies two things.  First, any attached
+ * spare device should be detached when the device finishes resilvering.
+ * Second, the online should be treated like a 'test' online case, so no FMA
+ * events are generated if the device fails to open.
  */
 int
 vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate)

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_queue.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_queue.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_queue.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -36,13 +36,14 @@
 /*
  * These tunables are for performance analysis.
  */
+
+/* The maximum number of I/Os concurrently pending to each device. */
+int zfs_vdev_max_pending = 10;
+
 /*
- * zfs_vdev_max_pending is the maximum number of i/os concurrently
- * pending to each device.  zfs_vdev_min_pending is the initial number
- * of i/os pending to each device (before it starts ramping up to
- * max_pending).
+ * The initial number of I/Os pending to each device, before it starts ramping
+ * up to zfs_vdev_max_pending.
  */
-int zfs_vdev_max_pending = 10;
 int zfs_vdev_min_pending = 4;
 
 /*

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -60,6 +60,7 @@
  *   o addition (+) is represented by a bitwise XOR
  *   o subtraction (-) is therefore identical to addition: A + B = A - B
  *   o multiplication of A by 2 is defined by the following bitwise expression:
+ *
  *	(A * 2)_7 = A_6
  *	(A * 2)_6 = A_5
  *	(A * 2)_5 = A_4
@@ -118,7 +119,7 @@ typedef struct raidz_map {
 	uint64_t rm_missingparity;	/* Count of missing parity devices */
 	uint64_t rm_firstdatacol;	/* First data column/parity count */
 	uint64_t rm_nskip;		/* Skipped sectors for padding */
-	uint64_t rm_skipstart;	/* Column index of padding start */
+	uint64_t rm_skipstart;		/* Column index of padding start */
 	void *rm_datacopy;		/* rm_asize-buffer of copied data */
 	uintptr_t rm_reports;		/* # of referencing checksum reports */
 	uint8_t	rm_freed;		/* map no longer has referencing ZIO */
@@ -158,10 +159,7 @@ typedef struct raidz_map {
  */
 int vdev_raidz_default_to_general;
 
-/*
- * These two tables represent powers and logs of 2 in the Galois field defined
- * above. These values were computed by repeatedly multiplying by 2 as above.
- */
+/* Powers of 2 in the Galois field defined above. */
 static const uint8_t vdev_raidz_pow2[256] = {
 	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
 	0x1d, 0x3a, 0x74, 0xe8, 0xcd, 0x87, 0x13, 0x26,
@@ -196,6 +194,7 @@ static const uint8_t vdev_raidz_pow2[256
 	0x2c, 0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83,
 	0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x01
 };
+/* Logs of 2 in the Galois field defined above. */
 static const uint8_t vdev_raidz_log2[256] = {
 	0x00, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6,
 	0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -1362,7 +1362,8 @@ zfs_acl_chmod(vtype_t vtype, uint64_t mo
 		zacep = (void *)((uintptr_t)zacep + abstract_size);
 		new_count++;
 		new_bytes += abstract_size;
-	} if (masks.deny1) {
+	}
+	if (masks.deny1) {
 		zfs_set_ace(aclp, zacep, masks.deny1, DENY, -1, ACE_OWNER);
 		zacep = (void *)((uintptr_t)zacep + abstract_size);
 		new_count++;
@@ -1766,7 +1767,7 @@ zfs_acl_ids_overquota(zfsvfs_t *zfsvfs, 
 }
 
 /*
- * Retrieve a files ACL
+ * Retrieve a file's ACL
  */
 int
 zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
@@ -1921,7 +1922,7 @@ zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_
 }
 
 /*
- * Set a files ACL
+ * Set a file's ACL
  */
 int
 zfs_setacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
@@ -2342,6 +2343,7 @@ slow:
 
 /*
  * Determine whether Access should be granted/denied.
+ *
  * The least priv subsytem is always consulted as a basic privilege
  * can define any form of access.
  */
@@ -2537,7 +2539,6 @@ zfs_delete_final_check(znode_t *zp, znod
  * Determine whether Access should be granted/deny, without
  * consulting least priv subsystem.
  *
- *
  * The following chart is the recommended NFSv4 enforcement for
  * ability to delete an object.
  *

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -1051,6 +1051,7 @@ zfsctl_shares_readdir(vnode_t *vp, uio_t
 
 /*
  * pvp is the '.zfs' directory (zfsctl_node_t).
+ *
  * Creates vp, which is '.zfs/snapshot' (zfsctl_snapdir_t).
  *
  * This function is the callback to create a GFS vnode for '.zfs/snapshot'

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -323,9 +323,7 @@ zfs_is_bootfs(const char *name)
 }
 
 /*
- * zfs_earlier_version
- *
- *	Return non-zero if the spa version is less than requested version.
+ * Return non-zero if the spa version is less than requested version.
  */
 static int
 zfs_earlier_version(const char *name, int version)
@@ -343,8 +341,6 @@ zfs_earlier_version(const char *name, in
 }
 
 /*
- * zpl_earlier_version
- *
  * Return TRUE if the ZPL version is less than requested version.
  */
 static boolean_t
@@ -2955,10 +2951,10 @@ zfs_create_cb(objset_t *os, void *arg, c
 
 /*
  * inputs:
- * createprops		list of properties requested by creator
- * default_zplver	zpl version to use if unspecified in createprops
- * fuids_ok		fuids allowed in this version of the spa?
  * os			parent objset pointer (NULL if root fs)
+ * fuids_ok		fuids allowed in this version of the spa?
+ * sa_ok		SAs allowed in this version of the spa?
+ * createprops		list of properties requested by creator
  *
  * outputs:
  * zplprops	values for the zplprops we attach to the master node object

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_log.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_log.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_log.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -211,9 +211,8 @@ zfs_log_fuid_domains(zfs_fuid_info_t *fu
 }
 
 /*
- * zfs_log_create() is used to handle TX_CREATE, TX_CREATE_ATTR, TX_MKDIR,
- * TX_MKDIR_ATTR and TX_MKXATTR
- * transactions.
+ * Handles TX_CREATE, TX_CREATE_ATTR, TX_MKDIR, TX_MKDIR_ATTR and
+ * TK_MKXATTR transactions.
  *
  * TX_CREATE and TX_MKDIR are standard creates, but they may have FUID
  * domain information appended prior to the name.  In this case the
@@ -340,7 +339,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_remove() handles both TX_REMOVE and TX_RMDIR transactions.
+ * Handles both TX_REMOVE and TX_RMDIR transactions.
  */
 void
 zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -364,7 +363,7 @@ zfs_log_remove(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_link() handles TX_LINK transactions.
+ * Handles TX_LINK transactions.
  */
 void
 zfs_log_link(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -387,7 +386,7 @@ zfs_log_link(zilog_t *zilog, dmu_tx_t *t
 }
 
 /*
- * zfs_log_symlink() handles TX_SYMLINK transactions.
+ * Handles TX_SYMLINK transactions.
  */
 void
 zfs_log_symlink(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -419,7 +418,7 @@ zfs_log_symlink(zilog_t *zilog, dmu_tx_t
 }
 
 /*
- * zfs_log_rename() handles TX_RENAME transactions.
+ * Handles TX_RENAME transactions.
  */
 void
 zfs_log_rename(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -445,7 +444,7 @@ zfs_log_rename(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_write() handles TX_WRITE transactions.
+ * Handles TX_WRITE transactions.
  */
 ssize_t zfs_immediate_write_sz = 32768;
 
@@ -524,7 +523,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *
 }
 
 /*
- * zfs_log_truncate() handles TX_TRUNCATE transactions.
+ * Handles TX_TRUNCATE transactions.
  */
 void
 zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
@@ -547,7 +546,7 @@ zfs_log_truncate(zilog_t *zilog, dmu_tx_
 }
 
 /*
- * zfs_log_setattr() handles TX_SETATTR transactions.
+ * Handles TX_SETATTR transactions.
  */
 void
 zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype,
@@ -609,7 +608,7 @@ zfs_log_setattr(zilog_t *zilog, dmu_tx_t
 }
 
 /*
- * zfs_log_acl() handles TX_ACL transactions.
+ * Handles TX_ACL transactions.
  */
 void
 zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_rlock.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_rlock.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_rlock.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -28,7 +28,7 @@
 
 /*
  * This file contains the code to implement file range locking in
- * ZFS, although there isn't much specific to ZFS (all that comes to mind
+ * ZFS, although there isn't much specific to ZFS (all that comes to mind is
  * support for growing the blocksize).
  *
  * Interface

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_sa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_sa.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_sa.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -187,7 +187,7 @@ zfs_sa_set_scanstamp(znode_t *zp, xvattr
 /*
  * I'm not convinced we should do any of this upgrade.
  * since the SA code can read both old/new znode formats
- * with probably little to know performance difference.
+ * with probably little to no performance difference.
  *
  * All new files will be created with the new format.
  */

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vfsops.c	Tue Jun 11 18:28:25 2013	(r251619)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vfsops.c	Tue Jun 11 18:32:47 2013	(r251620)
@@ -1348,13 +1348,12 @@ zfs_parse_bootfs(char *bpath, char *outp
 }
 
 /*
- * zfs_check_global_label:
- *	Check that the hex label string is appropriate for the dataset
- *	being mounted into the global_zone proper.
+ * Check that the hex label string is appropriate for the dataset being
+ * mounted into the global_zone proper.
  *

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:34:09 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 20A4B3D4;
 Tue, 11 Jun 2013 18:34:09 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 12BDE1363;
 Tue, 11 Jun 2013 18:34:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIY8L3044451;
 Tue, 11 Jun 2013 18:34:08 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIY8tX044448;
 Tue, 11 Jun 2013 18:34:08 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111834.r5BIY8tX044448@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:34:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251621 - vendor-sys/illumos/dist/uts/common/fs/zfs
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:34:09 -0000

Author: delphij
Date: Tue Jun 11 18:34:08 2013
New Revision: 251621
URL: http://svnweb.freebsd.org/changeset/base/251621

Log:
  Update vendor-sys/illumos/dist to illumos-gate 14047:e8c1f215cb15
  
  Illumos ZFS issues:
    3743 zfs needs a refcount audit

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa_errlog.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zap.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c	Tue Jun 11 18:32:47 2013	(r251620)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c	Tue Jun 11 18:34:08 2013	(r251621)
@@ -356,8 +356,10 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin
 
 	/* Make sure dsobj has the correct object type. */
 	dmu_object_info_from_db(dbuf, &doi);
-	if (doi.doi_type != DMU_OT_DSL_DATASET)
+	if (doi.doi_type != DMU_OT_DSL_DATASET) {
+		dmu_buf_rele(dbuf, tag);
 		return (SET_ERROR(EINVAL));
+	}
 
 	ds = dmu_buf_get_user(dbuf);
 	if (ds == NULL) {

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_errlog.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_errlog.c	Tue Jun 11 18:32:47 2013	(r251620)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_errlog.c	Tue Jun 11 18:34:08 2013	(r251621)
@@ -183,8 +183,10 @@ process_error_log(spa_t *spa, uint64_t o
 
 		if (copyout(&zb, (char *)addr +
 		    (*count - 1) * sizeof (zbookmark_t),
-		    sizeof (zbookmark_t)) != 0)
+		    sizeof (zbookmark_t)) != 0) {
+			zap_cursor_fini(&zc);
 			return (SET_ERROR(EFAULT));
+		}
 
 		*count -= 1;
 	}

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zap.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zap.c	Tue Jun 11 18:32:47 2013	(r251620)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zap.c	Tue Jun 11 18:34:08 2013	(r251621)
@@ -295,7 +295,8 @@ zap_table_load(zap_t *zap, zap_table_phy
 		err = dmu_buf_hold(zap->zap_objset, zap->zap_object,
 		    (tbl->zt_nextblk + blk) << bs, FTAG, &db,
 		    DMU_READ_NO_PREFETCH);
-		dmu_buf_rele(db, FTAG);
+		if (err == 0)
+			dmu_buf_rele(db, FTAG);
 	}
 	return (err);
 }
@@ -992,18 +993,21 @@ zap_join(objset_t *os, uint64_t fromobj,
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 		err = zap_add(os, intoobj, za.za_name,
 		    8, 1, &za.za_first_integer, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int
@@ -1014,18 +1018,21 @@ zap_join_key(objset_t *os, uint64_t from
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 		err = zap_add(os, intoobj, za.za_name,
 		    8, 1, &value, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int
@@ -1036,24 +1043,27 @@ zap_join_increment(objset_t *os, uint64_
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
 		uint64_t delta = 0;
 
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 
 		err = zap_lookup(os, intoobj, za.za_name, 8, 1, &delta);
 		if (err != 0 && err != ENOENT)
-			return (err);
+			break;
 		delta += za.za_first_integer;
 		err = zap_update(os, intoobj, za.za_name, 8, 1, &delta, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:35:15 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 60AC453C;
 Tue, 11 Jun 2013 18:35:15 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 43281136F;
 Tue, 11 Jun 2013 18:35:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIZFZv044654;
 Tue, 11 Jun 2013 18:35:15 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIZEXJ044651;
 Tue, 11 Jun 2013 18:35:14 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111835.r5BIZEXJ044651@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:35:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251622 - in vendor-sys/illumos/dist/uts/common/fs/zfs: .
 sys
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:35:15 -0000

Author: delphij
Date: Tue Jun 11 18:35:14 2013
New Revision: 251622
URL: http://svnweb.freebsd.org/changeset/base/251622

Log:
  Update vendor-sys/illumos/dist to illumos-gate 14048:ce96ca723606
  
  Illumos ZFS issues:
    3744 zfs shouldn't ignore errors unmounting snapshots

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_ioctl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c	Tue Jun 11 18:34:08 2013	(r251621)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c	Tue Jun 11 18:35:14 2013	(r251622)
@@ -433,7 +433,7 @@ dsl_dataset_user_release_tmp(dsl_pool_t 
 		dsl_dataset_name(ds, name);
 		dsl_dataset_rele(ds, FTAG);
 		dsl_pool_config_exit(dp, FTAG);
-		zfs_unmount_snap(name);
+		(void) zfs_unmount_snap(name);
 	} else {
 		dsl_pool_config_exit(dp, FTAG);
 	}

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_ioctl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_ioctl.h	Tue Jun 11 18:34:08 2013	(r251621)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/zfs_ioctl.h	Tue Jun 11 18:35:14 2013	(r251622)
@@ -344,7 +344,7 @@ extern int zfs_secpolicy_rename_perms(co
     const char *to, cred_t *cr);
 extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
 extern int zfs_busy(void);
-extern void zfs_unmount_snap(const char *);
+extern int zfs_unmount_snap(const char *);
 extern void zfs_destroy_unmount_origin(const char *);
 
 /*

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 18:34:08 2013	(r251621)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 18:35:14 2013	(r251622)
@@ -3356,41 +3356,44 @@ zfs_ioc_log_history(const char *unused, 
  *
  * This function is best-effort.  Callers must deal gracefully if it
  * remains mounted (or is remounted after this call).
+ *
+ * Returns 0 if the argument is not a snapshot, or it is not currently a
+ * filesystem, or we were able to unmount it.  Returns error code otherwise.
  */
-void
+int
 zfs_unmount_snap(const char *snapname)
 {
 	vfs_t *vfsp;
 	zfsvfs_t *zfsvfs;
+	int err;
 
 	if (strchr(snapname, '@') == NULL)
-		return;
+		return (0);
 
 	vfsp = zfs_get_vfs(snapname);
 	if (vfsp == NULL)
-		return;
+		return (0);
 
 	zfsvfs = vfsp->vfs_data;
 	ASSERT(!dsl_pool_config_held(dmu_objset_pool(zfsvfs->z_os)));
 
-	if (vn_vfswlock(vfsp->vfs_vnodecovered) != 0) {
-		VFS_RELE(vfsp);
-		return;
-	}
+	err = vn_vfswlock(vfsp->vfs_vnodecovered);
 	VFS_RELE(vfsp);
+	if (err != 0)
+		return (SET_ERROR(err));
 
 	/*
 	 * Always force the unmount for snapshots.
 	 */
 	(void) dounmount(vfsp, MS_FORCE, kcred);
+	return (0);
 }
 
 /* ARGSUSED */
 static int
 zfs_unmount_snap_cb(const char *snapname, void *arg)
 {
-	zfs_unmount_snap(snapname);
-	return (0);
+	return (zfs_unmount_snap(snapname));
 }
 
 /*
@@ -3413,7 +3416,7 @@ zfs_destroy_unmount_origin(const char *f
 		char originname[MAXNAMELEN];
 		dsl_dataset_name(ds->ds_prev, originname);
 		dmu_objset_rele(os, FTAG);
-		zfs_unmount_snap(originname);
+		(void) zfs_unmount_snap(originname);
 	} else {
 		dmu_objset_rele(os, FTAG);
 	}
@@ -3431,7 +3434,7 @@ zfs_destroy_unmount_origin(const char *f
 static int
 zfs_ioc_destroy_snaps(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
 {
-	int poollen;
+	int error, poollen;
 	nvlist_t *snaps;
 	nvpair_t *pair;
 	boolean_t defer;
@@ -3452,7 +3455,9 @@ zfs_ioc_destroy_snaps(const char *poolna
 		    (name[poollen] != '/' && name[poollen] != '@'))
 			return (SET_ERROR(EXDEV));
 
-		zfs_unmount_snap(name);
+		error = zfs_unmount_snap(name);
+		if (error != 0)
+			return (error);
 	}
 
 	return (dsl_destroy_snapshots_nvl(snaps, defer, outnvl));
@@ -3470,8 +3475,12 @@ static int
 zfs_ioc_destroy(zfs_cmd_t *zc)
 {
 	int err;
-	if (strchr(zc->zc_name, '@') && zc->zc_objset_type == DMU_OST_ZFS)
-		zfs_unmount_snap(zc->zc_name);
+
+	if (zc->zc_objset_type == DMU_OST_ZFS) {
+		err = zfs_unmount_snap(zc->zc_name);
+		if (err != 0)
+			return (err);
+	}
 
 	if (strchr(zc->zc_name, '@'))
 		err = dsl_destroy_snapshot(zc->zc_name, zc->zc_defer_destroy);
@@ -3517,8 +3526,7 @@ recursive_unmount(const char *fsname, vo
 	char fullname[MAXNAMELEN];
 
 	(void) snprintf(fullname, sizeof (fullname), "%s@%s", fsname, snapname);
-	zfs_unmount_snap(fullname);
-	return (0);
+	return (zfs_unmount_snap(fullname));
 }
 
 /*
@@ -4977,14 +4985,18 @@ static int
 zfs_ioc_release(const char *pool, nvlist_t *holds, nvlist_t *errlist)
 {
 	nvpair_t *pair;
+	int err;
 
 	/*
 	 * The release may cause the snapshot to be destroyed; make sure it
 	 * is not mounted.
 	 */
 	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(holds, pair))
-		zfs_unmount_snap(nvpair_name(pair));
+	    pair = nvlist_next_nvpair(holds, pair)) {
+		err = zfs_unmount_snap(nvpair_name(pair));
+		if (err != 0)
+			return (err);
+	}
 
 	return (dsl_dataset_user_release(holds, errlist));
 }

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:39:38 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D08AD87C;
 Tue, 11 Jun 2013 18:39:38 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C0F7D13AD;
 Tue, 11 Jun 2013 18:39:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIdcIx045367;
 Tue, 11 Jun 2013 18:39:38 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIdcA6045365;
 Tue, 11 Jun 2013 18:39:38 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111839.r5BIdcA6045365@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:39:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251623 - in vendor/illumos/dist: cmd/zpool
 lib/libzfs/common
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:39:38 -0000

Author: delphij
Date: Tue Jun 11 18:39:38 2013
New Revision: 251623
URL: http://svnweb.freebsd.org/changeset/base/251623

Log:
  Update vendor/illumos/dist to illumos-gate 14049:4a7f6353bcf0
  
  Illumos ZFS issues:
    3745 zpool create should treat -O mountpoint and -m the same

Modified:
  vendor/illumos/dist/cmd/zpool/zpool_main.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c

Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c	Tue Jun 11 18:35:14 2013	(r251622)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c	Tue Jun 11 18:39:38 2013	(r251623)
@@ -677,6 +677,7 @@ zpool_do_create(int argc, char **argv)
 				goto errout;
 			break;
 		case 'm':
+			/* Equivalent to -O mountpoint=optarg */
 			mountpoint = optarg;
 			break;
 		case 'o':
@@ -715,8 +716,18 @@ zpool_do_create(int argc, char **argv)
 			*propval = '\0';
 			propval++;
 
-			if (add_prop_list(optarg, propval, &fsprops, B_FALSE))
+			/*
+			 * Mountpoints are checked and then added later.
+			 * Uniquely among properties, they can be specified
+			 * more than once, to avoid conflict with -m.
+			 */
+			if (0 == strcmp(optarg,
+			    zfs_prop_to_name(ZFS_PROP_MOUNTPOINT))) {
+				mountpoint = propval;
+			} else if (add_prop_list(optarg, propval, &fsprops,
+			    B_FALSE)) {
 				goto errout;
+			}
 			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
@@ -833,6 +844,18 @@ zpool_do_create(int argc, char **argv)
 		}
 	}
 
+	/*
+	 * Now that the mountpoint's validity has been checked, ensure that
+	 * the property is set appropriately prior to creating the pool.
+	 */
+	if (mountpoint != NULL) {
+		ret = add_prop_list(zfs_prop_to_name(ZFS_PROP_MOUNTPOINT),
+		    mountpoint, &fsprops, B_FALSE);
+		if (ret != 0)
+			goto errout;
+	}
+
+	ret = 1;
 	if (dryrun) {
 		/*
 		 * For a dry run invocation, print out a basic message and run
@@ -867,21 +890,19 @@ zpool_do_create(int argc, char **argv)
 				if (nvlist_exists(props, propname))
 					continue;
 
-				if (add_prop_list(propname, ZFS_FEATURE_ENABLED,
-				    &props, B_TRUE) != 0)
+				ret = add_prop_list(propname,
+				    ZFS_FEATURE_ENABLED, &props, B_TRUE);
+				if (ret != 0)
 					goto errout;
 			}
 		}
+
+		ret = 1;
 		if (zpool_create(g_zfs, poolname,
 		    nvroot, props, fsprops) == 0) {
 			zfs_handle_t *pool = zfs_open(g_zfs, poolname,
 			    ZFS_TYPE_FILESYSTEM);
 			if (pool != NULL) {
-				if (mountpoint != NULL)
-					verify(zfs_prop_set(pool,
-					    zfs_prop_to_name(
-					    ZFS_PROP_MOUNTPOINT),
-					    mountpoint) == 0);
 				if (zfs_mount(pool, NULL, 0) == 0)
 					ret = zfs_shareall(pool);
 				zfs_close(pool);

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c	Tue Jun 11 18:35:14 2013	(r251622)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c	Tue Jun 11 18:39:38 2013	(r251623)
@@ -1080,7 +1080,6 @@ zpool_create(libzfs_handle_t *hdl, const
 	nvlist_t *zc_fsprops = NULL;
 	nvlist_t *zc_props = NULL;
 	char msg[1024];
-	char *altroot;
 	int ret = -1;
 
 	(void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
@@ -1179,21 +1178,6 @@ zpool_create(libzfs_handle_t *hdl, const
 		}
 	}
 
-	/*
-	 * If this is an alternate root pool, then we automatically set the
-	 * mountpoint of the root dataset to be '/'.
-	 */
-	if (nvlist_lookup_string(props, zpool_prop_to_name(ZPOOL_PROP_ALTROOT),
-	    &altroot) == 0) {
-		zfs_handle_t *zhp;
-
-		verify((zhp = zfs_open(hdl, pool, ZFS_TYPE_DATASET)) != NULL);
-		verify(zfs_prop_set(zhp, zfs_prop_to_name(ZFS_PROP_MOUNTPOINT),
-		    "/") == 0);
-
-		zfs_close(zhp);
-	}
-
 create_failed:
 	zcmd_free_nvlists(&zc);
 	nvlist_free(zc_props);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:43:26 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 66ABFB73;
 Tue, 11 Jun 2013 18:43:26 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 588EC145B;
 Tue, 11 Jun 2013 18:43:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIhP93047639;
 Tue, 11 Jun 2013 18:43:25 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIhPSX047638;
 Tue, 11 Jun 2013 18:43:25 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111843.r5BIhPSX047638@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:43:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251624 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor/illumos/dist/cmd/ztest
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:43:26 -0000

Author: delphij
Date: Tue Jun 11 18:43:25 2013
New Revision: 251624
URL: http://svnweb.freebsd.org/changeset/base/251624

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14050:0c8d9998d589
  
  Illumos ZFS issues:
    3747 txg commit callbacks don't work

Modified:
  vendor/illumos/dist/cmd/ztest/ztest.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c

Modified: vendor/illumos/dist/cmd/ztest/ztest.c
==============================================================================
--- vendor/illumos/dist/cmd/ztest/ztest.c	Tue Jun 11 18:39:38 2013	(r251623)
+++ vendor/illumos/dist/cmd/ztest/ztest.c	Tue Jun 11 18:43:25 2013	(r251624)
@@ -4507,7 +4507,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *z
 	 */
 	tmp_cb = list_head(&zcl.zcl_callbacks);
 	if (tmp_cb != NULL &&
-	    tmp_cb->zcd_txg > txg - ZTEST_COMMIT_CALLBACK_THRESH) {
+	    (txg - ZTEST_COMMIT_CALLBACK_THRESH) > tmp_cb->zcd_txg) {
 		fatal(0, "Commit callback threshold exceeded, oldest txg: %"
 		    PRIu64 ", open txg: %" PRIu64 "\n", tmp_cb->zcd_txg, txg);
 	}

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:43:26 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 671A9B74;
 Tue, 11 Jun 2013 18:43:26 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 591FD145C;
 Tue, 11 Jun 2013 18:43:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIhQ2C047646;
 Tue, 11 Jun 2013 18:43:26 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIhQnU047645;
 Tue, 11 Jun 2013 18:43:26 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111843.r5BIhQnU047645@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:43:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251624 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor/illumos/dist/cmd/ztest
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:43:26 -0000

Author: delphij
Date: Tue Jun 11 18:43:25 2013
New Revision: 251624
URL: http://svnweb.freebsd.org/changeset/base/251624

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14050:0c8d9998d589
  
  Illumos ZFS issues:
    3747 txg commit callbacks don't work

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/ztest/ztest.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 18:39:38 2013	(r251623)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c	Tue Jun 11 18:43:25 2013	(r251624)
@@ -435,7 +435,7 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
 		list_create(cb_list, sizeof (dmu_tx_callback_t),
 		    offsetof(dmu_tx_callback_t, dcb_node));
 
-		list_move_tail(&tc->tc_callbacks[g], cb_list);
+		list_move_tail(cb_list, &tc->tc_callbacks[g]);
 
 		(void) taskq_dispatch(tx->tx_commit_cb_taskq, (task_func_t *)
 		    txg_do_callbacks, cb_list, TQ_SLEEP);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:43:27 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D817BB75;
 Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
 (envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CAC3C145D;
 Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIhRFg047687;
 Tue, 11 Jun 2013 18:43:27 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIhR0I047686;
 Tue, 11 Jun 2013 18:43:27 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201306111843.r5BIhR0I047686@svn.freebsd.org>
From: Guy Helmer 
Date: Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251625 - head/libexec/atrun
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:43:27 -0000

Author: ghelmer
Date: Tue Jun 11 18:43:27 2013
New Revision: 251625
URL: http://svnweb.freebsd.org/changeset/base/251625

Log:
  Prevent races running the queue by serializing access to the
  queue directory.
  
  PR:		bin/113239

Modified:
  head/libexec/atrun/atrun.c

Modified: head/libexec/atrun/atrun.c
==============================================================================
--- head/libexec/atrun/atrun.c	Tue Jun 11 18:43:25 2013	(r251624)
+++ head/libexec/atrun/atrun.c	Tue Jun 11 18:43:27 2013	(r251625)
@@ -31,6 +31,7 @@ static const char rcsid[] =
 /* System Headers */
 
 #include 
+#include 
 #include 
 #include 
 #ifdef __FreeBSD__
@@ -521,6 +522,9 @@ main(int argc, char *argv[])
     if ((spool = opendir(".")) == NULL)
 	perr("cannot read %s", ATJOB_DIR);
 
+    if (flock(dirfd(spool), LOCK_EX) == -1)
+	perr("cannot lock %s", ATJOB_DIR);
+
     now = time(NULL);
     run_batch = 0;
     batch_uid = (uid_t) -1;

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:46:38 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C742016A;
 Tue, 11 Jun 2013 18:46:38 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B921F1491;
 Tue, 11 Jun 2013 18:46:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIkcp0048337;
 Tue, 11 Jun 2013 18:46:38 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIkbBQ048331;
 Tue, 11 Jun 2013 18:46:37 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111846.r5BIkbBQ048331@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 18:46:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251626 - in vendor-sys/illumos/dist/uts/common: fs/zfs
 fs/zfs/sys sys/fm/fs
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:46:38 -0000

Author: delphij
Date: Tue Jun 11 18:46:37 2013
New Revision: 251626
URL: http://svnweb.freebsd.org/changeset/base/251626

Log:
  Update vendor-sys/illumos/dist to illumos-gate 14051:849852750426
  
  Illumos ZFS issues:
    3749 zfs event processing should work on R/O root filesystems

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h
  vendor-sys/illumos/dist/uts/common/sys/fm/fs/zfs.h

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 18:43:27 2013	(r251625)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Tue Jun 11 18:46:37 2013	(r251626)
@@ -79,6 +79,12 @@
 #include "zfs_prop.h"
 #include "zfs_comutil.h"
 
+/*
+ * The interval, in seconds, at which failed configuration cache file writes
+ * should be retried.
+ */
+static int zfs_ccw_retry_interval = 300;
+
 typedef enum zti_modes {
 	ZTI_MODE_FIXED,			/* value is # of threads (min 1) */
 	ZTI_MODE_ONLINE_PERCENT,	/* value is % of online CPUs */
@@ -5662,13 +5668,34 @@ spa_async_resume(spa_t *spa)
 	mutex_exit(&spa->spa_async_lock);
 }
 
+static boolean_t
+spa_async_tasks_pending(spa_t *spa)
+{
+	uint_t non_config_tasks;
+	uint_t config_task;
+	boolean_t config_task_suspended;
+
+	non_config_tasks = spa->spa_async_tasks & ~SPA_ASYNC_CONFIG_UPDATE;
+	config_task = spa->spa_async_tasks & SPA_ASYNC_CONFIG_UPDATE;
+	if (spa->spa_ccw_fail_time == 0) {
+		config_task_suspended = B_FALSE;
+	} else {
+		config_task_suspended =
+		    (gethrtime() - spa->spa_ccw_fail_time) <
+		    (zfs_ccw_retry_interval * NANOSEC);
+	}
+
+	return (non_config_tasks || (config_task && !config_task_suspended));
+}
+
 static void
 spa_async_dispatch(spa_t *spa)
 {
 	mutex_enter(&spa->spa_async_lock);
-	if (spa->spa_async_tasks && !spa->spa_async_suspended &&
+	if (spa_async_tasks_pending(spa) &&
+	    !spa->spa_async_suspended &&
 	    spa->spa_async_thread == NULL &&
-	    rootdir != NULL && !vn_is_readonly(rootdir))
+	    rootdir != NULL)
 		spa->spa_async_thread = thread_create(NULL, 0,
 		    spa_async_thread, spa, 0, &p0, TS_RUN, maxclsyspri);
 	mutex_exit(&spa->spa_async_lock);

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c	Tue Jun 11 18:43:27 2013	(r251625)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c	Tue Jun 11 18:46:37 2013	(r251626)
@@ -26,6 +26,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -140,7 +141,7 @@ out:
 	kobj_close_file(file);
 }
 
-static void
+static int
 spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 {
 	size_t buflen;
@@ -148,13 +149,14 @@ spa_config_write(spa_config_dirent_t *dp
 	vnode_t *vp;
 	int oflags = FWRITE | FTRUNC | FCREAT | FOFFMAX;
 	char *temp;
+	int err;
 
 	/*
 	 * If the nvlist is empty (NULL), then remove the old cachefile.
 	 */
 	if (nvl == NULL) {
-		(void) vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
-		return;
+		err = vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
+		return (err);
 	}
 
 	/*
@@ -175,12 +177,14 @@ spa_config_write(spa_config_dirent_t *dp
 	 */
 	(void) snprintf(temp, MAXPATHLEN, "%s.tmp", dp->scd_path);
 
-	if (vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0) == 0) {
-		if (vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
-		    0, RLIM64_INFINITY, kcred, NULL) == 0 &&
-		    VOP_FSYNC(vp, FSYNC, kcred, NULL) == 0) {
-			(void) vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
-		}
+	err = vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0);
+	if (err == 0) {
+		err = vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
+		    0, RLIM64_INFINITY, kcred, NULL);
+		if (err == 0)
+			err = VOP_FSYNC(vp, FSYNC, kcred, NULL);
+		if (err == 0)
+			err = vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
 		(void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
 		VN_RELE(vp);
 	}
@@ -189,6 +193,7 @@ spa_config_write(spa_config_dirent_t *dp
 
 	kmem_free(buf, buflen);
 	kmem_free(temp, MAXPATHLEN);
+	return (err);
 }
 
 /*
@@ -200,6 +205,8 @@ spa_config_sync(spa_t *target, boolean_t
 {
 	spa_config_dirent_t *dp, *tdp;
 	nvlist_t *nvl;
+	boolean_t ccw_failure;
+	int error;
 
 	ASSERT(MUTEX_HELD(&spa_namespace_lock));
 
@@ -211,6 +218,7 @@ spa_config_sync(spa_t *target, boolean_t
 	 * cachefile is changed, the new one is pushed onto this list, allowing
 	 * us to update previous cachefiles that no longer contain this pool.
 	 */
+	ccw_failure = B_FALSE;
 	for (dp = list_head(&target->spa_config_list); dp != NULL;
 	    dp = list_next(&target->spa_config_list, dp)) {
 		spa_t *spa = NULL;
@@ -251,10 +259,32 @@ spa_config_sync(spa_t *target, boolean_t
 			mutex_exit(&spa->spa_props_lock);
 		}
 
-		spa_config_write(dp, nvl);
+		error = spa_config_write(dp, nvl);
+		if (error != 0)
+			ccw_failure = B_TRUE;
 		nvlist_free(nvl);
 	}
 
+	if (ccw_failure) {
+		/*
+		 * Keep trying so that configuration data is
+		 * written if/when any temporary filesystem
+		 * resource issues are resolved.
+		 */
+		if (target->spa_ccw_fail_time == 0) {
+			zfs_ereport_post(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE,
+			    target, NULL, NULL, 0, 0);
+		}
+		target->spa_ccw_fail_time = gethrtime();
+		spa_async_request(target, SPA_ASYNC_CONFIG_UPDATE);
+	} else {
+		/*
+		 * Do not rate limit future attempts to update
+		 * the config cache.
+		 */
+		target->spa_ccw_fail_time = 0;
+	}
+
 	/*
 	 * Remove any config entries older than the current one.
 	 */

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 18:43:27 2013	(r251625)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 18:46:37 2013	(r251626)
@@ -238,6 +238,7 @@ struct spa {
 	uint64_t	spa_deadman_synctime;	/* deadman expiration timer */
 	kmutex_t	spa_iokstat_lock;	/* protects spa_iokstat_* */
 	struct kstat	*spa_iokstat;		/* kstat of io to this pool */
+	hrtime_t	spa_ccw_fail_time;	/* Conf cache write fail time */
 	/*
 	 * spa_refcount & spa_config_lock must be the last elements
 	 * because refcount_t changes size based on compilation options.

Modified: vendor-sys/illumos/dist/uts/common/sys/fm/fs/zfs.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/fm/fs/zfs.h	Tue Jun 11 18:43:27 2013	(r251625)
+++ vendor-sys/illumos/dist/uts/common/sys/fm/fs/zfs.h	Tue Jun 11 18:46:37 2013	(r251626)
@@ -46,6 +46,7 @@ extern "C" {
 #define	FM_EREPORT_ZFS_IO_FAILURE		"io_failure"
 #define	FM_EREPORT_ZFS_PROBE_FAILURE		"probe_failure"
 #define	FM_EREPORT_ZFS_LOG_REPLAY		"log_replay"
+#define	FM_EREPORT_ZFS_CONFIG_CACHE_WRITE	"config_cache_write"
 
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL		"pool"
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL_FAILMODE	"pool_failmode"

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:46:47 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1803E2BA;
 Tue, 11 Jun 2013 18:46:47 +0000 (UTC)
 (envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B7FA1493;
 Tue, 11 Jun 2013 18:46:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIkkpZ048395;
 Tue, 11 Jun 2013 18:46:46 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIkk2Q048394;
 Tue, 11 Jun 2013 18:46:46 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201306111846.r5BIkk2Q048394@svn.freebsd.org>
From: Guy Helmer 
Date: Tue, 11 Jun 2013 18:46:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251627 - head/libexec/atrun
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 18:46:47 -0000

Author: ghelmer
Date: Tue Jun 11 18:46:46 2013
New Revision: 251627
URL: http://svnweb.freebsd.org/changeset/base/251627

Log:
  Add the name of the file that could not be opened to the error message
  regarding the failure.
  
  Suggested while working on PR bin/113239.

Modified:
  head/libexec/atrun/atrun.c

Modified: head/libexec/atrun/atrun.c
==============================================================================
--- head/libexec/atrun/atrun.c	Tue Jun 11 18:46:37 2013	(r251626)
+++ head/libexec/atrun/atrun.c	Tue Jun 11 18:46:46 2013	(r251627)
@@ -198,7 +198,7 @@ run_file(const char *filename, uid_t uid
     PRIV_END
 
     if (stream == NULL)
-	perr("cannot open input file");
+	perr("cannot open input file %s", filename);
 
     if ((fd_in = dup(fileno(stream))) <0)
 	perr("error duplicating input file descriptor");

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:02:39 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 770E8AEA;
 Tue, 11 Jun 2013 19:02:39 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6784E16B2;
 Tue, 11 Jun 2013 19:02:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJ2dRx054569;
 Tue, 11 Jun 2013 19:02:39 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJ2bNZ054550;
 Tue, 11 Jun 2013 19:02:37 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111902.r5BJ2bNZ054550@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:02:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251629 - in head:
 cddl/contrib/opensolaris/lib/libzfs/common
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:02:39 -0000

Author: delphij
Date: Tue Jun 11 19:02:36 2013
New Revision: 251629
URL: http://svnweb.freebsd.org/changeset/base/251629

Log:
  MFV r251619:
  
  ZFS needs better comments.
  
  Illumos ZFS issues:
    3741 zfs needs better comments
  
  MFC after:      2 weeks

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -4538,6 +4538,11 @@ zfs_get_holds(zfs_handle_t *zhp, nvlist_
 	return (err);
 }
 
+/*
+ * Convert the zvol's volume size to an appropriate reservation.
+ * Note: If this routine is updated, it is necessary to update the ZFS test
+ * suite's shell version in reservation.kshlib.
+ */
 uint64_t
 zvol_volsize_to_reservation(uint64_t volsize, nvlist_t *props)
 {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -289,7 +289,18 @@ typedef struct arc_stats {
 	kstat_named_t arcstat_deleted;
 	kstat_named_t arcstat_stolen;
 	kstat_named_t arcstat_recycle_miss;
+	/*
+	 * Number of buffers that could not be evicted because the hash lock
+	 * was held by another thread.  The lock may not necessarily be held
+	 * by something using the same buffer, since hash locks are shared
+	 * by multiple buffers.
+	 */
 	kstat_named_t arcstat_mutex_miss;
+	/*
+	 * Number of buffers skipped because they have I/O in progress, are
+	 * indrect prefetch buffers that have not lived long enough, or are
+	 * not from the spa we're trying to evict from.
+	 */
 	kstat_named_t arcstat_evict_skip;
 	kstat_named_t arcstat_evict_l2_cached;
 	kstat_named_t arcstat_evict_l2_eligible;
@@ -3247,6 +3258,10 @@ top:
 
 		mutex_exit(hash_lock);
 
+		/*
+		 * At this point, we have a level 1 cache miss.  Try again in
+		 * L2ARC if possible.
+		 */
 		ASSERT3U(hdr->b_size, ==, size);
 		DTRACE_PROBE4(arc__miss, arc_buf_hdr_t *, hdr, blkptr_t *, bp,
 		    uint64_t, size, zbookmark_t *, zb);
@@ -3488,8 +3503,8 @@ arc_buf_evict(arc_buf_t *buf)
 }
 
 /*
- * Release this buffer from the cache.  This must be done
- * after a read and prior to modifying the buffer contents.
+ * Release this buffer from the cache, making it an anonymous buffer.  This
+ * must be done after a read and prior to modifying the buffer contents.
  * If the buffer has more than one reference, we must make
  * a new hdr for the buffer.
  */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -641,6 +641,14 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio
 		if (!havepzio)
 			err = zio_wait(zio);
 	} else {
+		/*
+		 * Another reader came in while the dbuf was in flight
+		 * between UNCACHED and CACHED.  Either a writer will finish
+		 * writing the buffer (sending the dbuf to CACHED) or the
+		 * first reader's request will reach the read_done callback
+		 * and send the dbuf to CACHED.  Otherwise, a failure
+		 * occurred and the dbuf went to UNCACHED.
+		 */
 		mutex_exit(&db->db_mtx);
 		if (prefetch)
 			dmu_zfetch(&dn->dn_zfetch, db->db.db_offset,
@@ -649,6 +657,7 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio
 			rw_exit(&dn->dn_struct_rwlock);
 		DB_DNODE_EXIT(db);
 
+		/* Skip the wait per the caller's request. */
 		mutex_enter(&db->db_mtx);
 		if ((flags & DB_RF_NEVERWAIT) == 0) {
 			while (db->db_state == DB_READ ||
@@ -1264,7 +1273,8 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t 
 }
 
 /*
- * Return TRUE if this evicted the dbuf.
+ * Undirty a buffer in the transaction group referenced by the given
+ * transaction.  Return whether this evicted the dbuf.
  */
 static boolean_t
 dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
@@ -2225,6 +2235,7 @@ dbuf_sync_indirect(dbuf_dirty_record_t *
 	ASSERT(db->db_level > 0);
 	DBUF_VERIFY(db);
 
+	/* Read the block if it hasn't been read yet. */
 	if (db->db_buf == NULL) {
 		mutex_exit(&db->db_mtx);
 		(void) dbuf_read(db, NULL, DB_RF_MUST_SUCCEED);
@@ -2235,10 +2246,12 @@ dbuf_sync_indirect(dbuf_dirty_record_t *
 
 	DB_DNODE_ENTER(db);
 	dn = DB_DNODE(db);
+	/* Indirect block size must match what the dnode thinks it is. */
 	ASSERT3U(db->db.db_size, ==, 1<dn_phys->dn_indblkshift);
 	dbuf_check_blkptr(dn, db);
 	DB_DNODE_EXIT(db);
 
+	/* Provide the pending dirty record to child dbufs */
 	db->db_data_pending = dr;
 
 	mutex_exit(&db->db_mtx);
@@ -2629,6 +2642,7 @@ dbuf_write_override_done(zio_t *zio)
 	dbuf_write_done(zio, NULL, db);
 }
 
+/* Issue I/O to commit a dirty buffer to disk. */
 static void
 dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 {
@@ -2663,11 +2677,19 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_
 	}
 
 	if (parent != dn->dn_dbuf) {
+		/* Our parent is an indirect block. */
+		/* We have a dirty parent that has been scheduled for write. */
 		ASSERT(parent && parent->db_data_pending);
+		/* Our parent's buffer is one level closer to the dnode. */
 		ASSERT(db->db_level == parent->db_level-1);
+		/*
+		 * We're about to modify our parent's db_data by modifying
+		 * our block pointer, so the parent must be released.
+		 */
 		ASSERT(arc_released(parent->db_buf));
 		zio = parent->db_data_pending->dr_zio;
 	} else {
+		/* Our parent is the dnode itself. */
 		ASSERT((db->db_level == dn->dn_phys->dn_nlevels-1 &&
 		    db->db_blkid != DMU_SPILL_BLKID) ||
 		    (db->db_blkid == DMU_SPILL_BLKID && db->db_level == 0));

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -1839,7 +1839,7 @@ dmu_init(void)
 void
 dmu_fini(void)
 {
-	arc_fini();
+	arc_fini(); /* arc depends on l2arc, so arc must go first */
 	l2arc_fini();
 	zfetch_fini();
 	dbuf_fini();

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -1014,6 +1014,10 @@ dmu_tx_unassign(dmu_tx_t *tx)
 
 	txg_rele_to_quiesce(&tx->tx_txgh);
 
+	/*
+	 * Walk the transaction's hold list, removing the hold on the
+	 * associated dnode, and notifying waiters if the refcount drops to 0.
+	 */
 	for (txh = list_head(&tx->tx_holds); txh != tx->tx_needassign_txh;
 	    txh = list_next(&tx->tx_holds, txh)) {
 		dnode_t *dn = txh->txh_dnode;
@@ -1126,6 +1130,10 @@ dmu_tx_commit(dmu_tx_t *tx)
 
 	ASSERT(tx->tx_txg != 0);
 
+	/*
+	 * Go through the transaction's hold list and remove holds on
+	 * associated dnodes, notifying waiters if no holds remain.
+	 */
 	while (txh = list_head(&tx->tx_holds)) {
 		dnode_t *dn = txh->txh_dnode;
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -66,11 +66,11 @@ SYSCTL_UQUAD(_vfs_zfs_zfetch, OID_AUTO, 
     "Number of bytes in a array_read at which we stop prefetching");
 
 /* forward decls for static routines */
-static int		dmu_zfetch_colinear(zfetch_t *, zstream_t *);
+static boolean_t	dmu_zfetch_colinear(zfetch_t *, zstream_t *);
 static void		dmu_zfetch_dofetch(zfetch_t *, zstream_t *);
 static uint64_t		dmu_zfetch_fetch(dnode_t *, uint64_t, uint64_t);
 static uint64_t		dmu_zfetch_fetchsz(dnode_t *, uint64_t, uint64_t);
-static int		dmu_zfetch_find(zfetch_t *, zstream_t *, int);
+static boolean_t	dmu_zfetch_find(zfetch_t *, zstream_t *, int);
 static int		dmu_zfetch_stream_insert(zfetch_t *, zstream_t *);
 static zstream_t	*dmu_zfetch_stream_reclaim(zfetch_t *);
 static void		dmu_zfetch_stream_remove(zfetch_t *, zstream_t *);
@@ -122,9 +122,9 @@ kstat_t		*zfetch_ksp;
  * last stream, then we are probably in a strided access pattern.  So
  * combine the two sequential streams into a single strided stream.
  *
- * If no co-linear streams are found, return NULL.
+ * Returns whether co-linear streams were found.
  */
-static int
+static boolean_t
 dmu_zfetch_colinear(zfetch_t *zf, zstream_t *zh)
 {
 	zstream_t	*z_walk;
@@ -344,7 +344,7 @@ dmu_zfetch_fetchsz(dnode_t *dn, uint64_t
  * for this block read.  If so, it starts a prefetch for the stream it
  * located and returns true, otherwise it returns false
  */
-static int
+static boolean_t
 dmu_zfetch_find(zfetch_t *zf, zstream_t *zh, int prefetched)
 {
 	zstream_t	*zs;
@@ -669,7 +669,7 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset
 {
 	zstream_t	zst;
 	zstream_t	*newstream;
-	int		fetched;
+	boolean_t	fetched;
 	int		inserted;
 	unsigned int	blkshft;
 	uint64_t	blksz;
@@ -695,7 +695,8 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset
 		ZFETCHSTAT_BUMP(zfetchstat_hits);
 	} else {
 		ZFETCHSTAT_BUMP(zfetchstat_misses);
-		if (fetched = dmu_zfetch_colinear(zf, &zst)) {
+		fetched = dmu_zfetch_colinear(zf, &zst);
+		if (fetched) {
 			ZFETCHSTAT_BUMP(zfetchstat_colinear_hits);
 		} else {
 			ZFETCHSTAT_BUMP(zfetchstat_colinear_misses);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -27,6 +27,8 @@
  */
 
 /*
+ * SPA: Storage Pool Allocator
+ *
  * This file contains all the routines used when modifying on-disk SPA state.
  * This includes opening, importing, destroying, exporting a pool, and syncing a
  * pool.

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Tue Jun 11 19:02:36 2013	(r251629)
@@ -411,6 +411,8 @@ void dmu_write_policy(objset_t *os, stru
  * object must be held in an assigned transaction before calling
  * dmu_buf_will_dirty.  You may use dmu_buf_set_user() on the bonus
  * buffer as well.  You must release your hold with dmu_buf_rele().
+ *
+ * Returns ENOENT, EIO, or 0.
  */
 int dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **);
 int dmu_bonus_max(void);
@@ -666,8 +668,14 @@ extern const dmu_object_byteswap_info_t 
  * If doi is NULL, just indicates whether the object exists.
  */
 int dmu_object_info(objset_t *os, uint64_t object, dmu_object_info_t *doi);
+/* Like dmu_object_info, but faster if you have a held dnode in hand. */
 void dmu_object_info_from_dnode(struct dnode *dn, dmu_object_info_t *doi);
+/* Like dmu_object_info, but faster if you have a held dbuf in hand. */
 void dmu_object_info_from_db(dmu_buf_t *db, dmu_object_info_t *doi);
+/*
+ * Like dmu_object_info_from_db, but faster still when you only care about
+ * the size.  This is specifically optimized for zfs_getattr().
+ */
 void dmu_object_size_from_db(dmu_buf_t *db, uint32_t *blksize,
     u_longlong_t *nblk512);
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -348,6 +348,12 @@ txg_rele_to_sync(txg_handle_t *th)
 	th->th_cpu = NULL;	/* defensive */
 }
 
+/*
+ * Blocks until all transactions in the group are committed.
+ *
+ * On return, the transaction group has reached a stable state in which it can
+ * then be passed off to the syncing context.
+ */
 static void
 txg_quiesce(dsl_pool_t *dp, uint64_t txg)
 {
@@ -397,6 +403,9 @@ txg_do_callbacks(void *arg)
 
 /*
  * Dispatch the commit callbacks registered on this txg to worker threads.
+ *
+ * If no callbacks are registered for a given TXG, nothing happens.
+ * This function creates a taskq for the associated pool, if needed.
  */
 static void
 txg_dispatch_callbacks(dsl_pool_t *dp, uint64_t txg)
@@ -407,7 +416,10 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
 
 	for (c = 0; c < max_ncpus; c++) {
 		tx_cpu_t *tc = &tx->tx_cpu[c];
-		/* No need to lock tx_cpu_t at this point */
+		/*
+		 * No need to lock tx_cpu_t at this point, since this can
+		 * only be called once a txg has been synced.
+		 */
 
 		int g = txg & TXG_MASK;
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -1044,6 +1044,7 @@ vdev_uberblock_sync(zio_t *zio, uberbloc
 	zio_buf_free(ubbuf, VDEV_UBERBLOCK_SIZE(vd));
 }
 
+/* Sync the uberblocks to all vdevs in svd[] */
 int
 vdev_uberblock_sync_list(vdev_t **svd, int svdcount, uberblock_t *ub, int flags)
 {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -433,23 +433,50 @@ static const zio_vsd_ops_t vdev_raidz_vs
 	vdev_raidz_cksum_report
 };
 
+/*
+ * Divides the IO evenly across all child vdevs; usually, dcols is
+ * the number of children in the target vdev.
+ */
 static raidz_map_t *
 vdev_raidz_map_alloc(zio_t *zio, uint64_t unit_shift, uint64_t dcols,
     uint64_t nparity)
 {
 	raidz_map_t *rm;
+	/* The starting RAIDZ (parent) vdev sector of the block. */
 	uint64_t b = zio->io_offset >> unit_shift;
+	/* The zio's size in units of the vdev's minimum sector size. */
 	uint64_t s = zio->io_size >> unit_shift;
+	/* The first column for this stripe. */
 	uint64_t f = b % dcols;
+	/* The starting byte offset on each child vdev. */
 	uint64_t o = (b / dcols) << unit_shift;
 	uint64_t q, r, c, bc, col, acols, scols, coff, devidx, asize, tot;
 
+	/*
+	 * "Quotient": The number of data sectors for this stripe on all but
+	 * the "big column" child vdevs that also contain "remainder" data.
+	 */
 	q = s / (dcols - nparity);
+
+	/*
+	 * "Remainder": The number of partial stripe data sectors in this I/O.
+	 * This will add a sector to some, but not all, child vdevs.
+	 */
 	r = s - q * (dcols - nparity);
+
+	/* The number of "big columns" - those which contain remainder data. */
 	bc = (r == 0 ? 0 : r + nparity);
+
+	/*
+	 * The total number of data and parity sectors associated with
+	 * this I/O.
+	 */
 	tot = s + nparity * (q + (r == 0 ? 0 : 1));
 
+	/* acols: The columns that will be accessed. */
+	/* scols: The columns that will be accessed or skipped. */
 	if (q == 0) {
+		/* Our I/O request doesn't span all child vdevs. */
 		acols = bc;
 		scols = MIN(dcols, roundup(bc, nparity + 1));
 	} else {
@@ -1529,6 +1556,23 @@ vdev_raidz_child_done(zio_t *zio)
 	rc->rc_skipped = 0;
 }
 
+/*
+ * Start an IO operation on a RAIDZ VDev
+ *
+ * Outline:
+ * - For write operations:
+ *   1. Generate the parity data
+ *   2. Create child zio write operations to each column's vdev, for both
+ *      data and parity.
+ *   3. If the column skips any sectors for padding, create optional dummy
+ *      write zio children for those areas to improve aggregation continuity.
+ * - For read operations:
+ *   1. Create child zio read operations to each data column's vdev to read
+ *      the range of data required for zio.
+ *   2. If this is a scrub or resilver operation, or if any of the data
+ *      vdevs have had errors, then create zio read operations to the parity
+ *      columns' VDevs as well.
+ */
 static int
 vdev_raidz_io_start(zio_t *zio)
 {
@@ -1881,6 +1925,27 @@ done:
 	return (ret);
 }
 
+/*
+ * Complete an IO operation on a RAIDZ VDev
+ *
+ * Outline:
+ * - For write operations:
+ *   1. Check for errors on the child IOs.
+ *   2. Return, setting an error code if too few child VDevs were written
+ *      to reconstruct the data later.  Note that partial writes are
+ *      considered successful if they can be reconstructed at all.
+ * - For read operations:
+ *   1. Check for errors on the child IOs.
+ *   2. If data errors occurred:
+ *      a. Try to reassemble the data from the parity available.
+ *      b. If we haven't yet read the parity drives, read them now.
+ *      c. If all parity drives have been read but the data still doesn't
+ *         reassemble with a correct checksum, then try combinatorial
+ *         reconstruction.
+ *      d. If that doesn't work, return an error.
+ *   3. If there were unexpected errors or this is a resilver operation,
+ *      rewrite the vdevs that had errors.
+ */
 static void
 vdev_raidz_io_done(zio_t *zio)
 {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 19:02:10 2013	(r251628)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 19:02:36 2013	(r251629)
@@ -633,6 +633,11 @@ static struct vop_vector zfsctl_ops_root
 	.vop_fid =	zfsctl_common_fid,
 };
 
+/*
+ * Gets the full dataset name that corresponds to the given snapshot name
+ * Example:
+ * 	zfsctl_snapshot_zname("snap1") -> "mypool/myfs@snap1"
+ */
 static int
 zfsctl_snapshot_zname(vnode_t *vp, const char *name, int len, char *zname)
 {

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:05:30 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 295D2D6F;
 Tue, 11 Jun 2013 19:05:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1C3DE16EC;
 Tue, 11 Jun 2013 19:05:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJ5Tdo055137;
 Tue, 11 Jun 2013 19:05:29 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJ5TGv055136;
 Tue, 11 Jun 2013 19:05:29 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306111905.r5BJ5TGv055136@svn.freebsd.org>
From: John Baldwin 
Date: Tue, 11 Jun 2013 19:05:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251630 - head/usr.bin/top
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:05:30 -0000

Author: jhb
Date: Tue Jun 11 19:05:29 2013
New Revision: 251630
URL: http://svnweb.freebsd.org/changeset/base/251630

Log:
  Bump the CPU/WCPU column width by one so that it fits values from 100% up
  to 999.99% CPU.  It still won't be aligned if you have a multithreaded
  process using more than 1000% CPU (e.g. idle process on an idle 12-way
  system), but 100% is a common case.
  
  Submitted by:	Jeremy Chadwick (partial)
  MFC after:	1 week

Modified:
  head/usr.bin/top/machine.c

Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c	Tue Jun 11 19:02:36 2013	(r251629)
+++ head/usr.bin/top/machine.c	Tue Jun 11 19:05:29 2013	(r251630)
@@ -107,20 +107,20 @@ static char io_header[] =
     "%5d%s %-*.*s %6ld %6ld %6ld %6ld %6ld %6ld %6.2f%% %.*s"
 
 static char smp_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %7s COMMAND";
 static char smp_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %7s COMMAND";
 
 #define smp_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %6.2f%% %.*s"
 
 static char up_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %7s COMMAND";
 static char up_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE    TIME %7s COMMAND";
 
 #define up_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s%.0d%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s%.0d%7s %6.2f%% %.*s"
 
 
 /* process state names for the "STATE" column of the display */

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:12:14 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1F80C257;
 Tue, 11 Jun 2013 19:12:14 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 10E341752;
 Tue, 11 Jun 2013 19:12:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJCEFJ058018;
 Tue, 11 Jun 2013 19:12:14 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJC60O057969;
 Tue, 11 Jun 2013 19:12:06 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111912.r5BJC60O057969@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:12:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251631 - in
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:12:14 -0000

Author: delphij
Date: Tue Jun 11 19:12:06 2013
New Revision: 251631
URL: http://svnweb.freebsd.org/changeset/base/251631

Log:
  MFV r251620:
  
  ZFS comments need cleaner, more consistent style
  
  Illumos ZFS issues:
    3741 zfs comments need cleaner, more consistent style
  
  MFC after:      2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -58,11 +58,11 @@
  * tight.
  *
  * 3. The Megiddo and Modha model assumes a fixed page size. All
- * elements of the cache are therefor exactly the same size.  So
+ * elements of the cache are therefore exactly the same size.  So
  * when adjusting the cache size following a cache miss, its simply
  * a matter of choosing a single page to evict.  In our model, we
  * have variable sized cache blocks (rangeing from 512 bytes to
- * 128K bytes).  We therefor choose a set of blocks to evict to make
+ * 128K bytes).  We therefore choose a set of blocks to evict to make
  * space for a cache miss that approximates as closely as possible
  * the space used by the new block.
  *
@@ -77,7 +77,7 @@
  * ways: 1) via a hash table lookup using the DVA as a key,
  * or 2) via one of the ARC lists.  The arc_read() interface
  * uses method 1, while the internal arc algorithms for
- * adjusting the cache use method 2.  We therefor provide two
+ * adjusting the cache use method 2.  We therefore provide two
  * types of locks: 1) the hash table lock array, and 2) the
  * arc list locks.
  *
@@ -438,7 +438,7 @@ static arc_stats_t arc_stats = {
 #define	ARCSTAT(stat)	(arc_stats.stat.value.ui64)
 
 #define	ARCSTAT_INCR(stat, val) \
-	atomic_add_64(&arc_stats.stat.value.ui64, (val));
+	atomic_add_64(&arc_stats.stat.value.ui64, (val))
 
 #define	ARCSTAT_BUMP(stat)	ARCSTAT_INCR(stat, 1)
 #define	ARCSTAT_BUMPDOWN(stat)	ARCSTAT_INCR(stat, -1)
@@ -672,9 +672,7 @@ uint64_t zfs_crc64_table[256];
 #define	l2arc_writes_sent	ARCSTAT(arcstat_l2_writes_sent)
 #define	l2arc_writes_done	ARCSTAT(arcstat_l2_writes_done)
 
-/*
- * L2ARC Performance Tunables
- */
+/* L2ARC Performance Tunables */
 uint64_t l2arc_write_max = L2ARC_WRITE_SIZE;	/* default max write size */
 uint64_t l2arc_write_boost = L2ARC_WRITE_SIZE;	/* extra write during warmup */
 uint64_t l2arc_headroom = L2ARC_HEADROOM;	/* number of dev writes */
@@ -3900,7 +3898,7 @@ arc_tempreserve_space(uint64_t reserve, 
 
 	/*
 	 * Writes will, almost always, require additional memory allocations
-	 * in order to compress/encrypt/etc the data.  We therefor need to
+	 * in order to compress/encrypt/etc the data.  We therefore need to
 	 * make sure that there is sufficient available memory for this.
 	 */
 	if (error = arc_memory_throttle(reserve, anon_size, txg))

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -43,7 +43,7 @@
  * dsl_scan_sync. This allows the delete operation to finish without traversing
  * all the dataset's blocks.
  *
- * Note that while bt_begin and bt_end are only ever incremented in this code
+ * Note that while bt_begin and bt_end are only ever incremented in this code,
  * they are effectively reset to 0 every time the entire bptree is freed because
  * the bptree's object is destroyed and re-created.
  */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -1808,14 +1808,16 @@ dnode_willuse_space(dnode_t *dn, int64_t
 }
 
 /*
- * This function scans a block at the indicated "level" looking for
- * a hole or data (depending on 'flags').  If level > 0, then we are
- * scanning an indirect block looking at its pointers.  If level == 0,
- * then we are looking at a block of dnodes.  If we don't find what we
- * are looking for in the block, we return ESRCH.  Otherwise, return
- * with *offset pointing to the beginning (if searching forwards) or
- * end (if searching backwards) of the range covered by the block
- * pointer we matched on (or dnode).
+ * Scans a block at the indicated "level" looking for a hole or data,
+ * depending on 'flags'.
+ *
+ * If level > 0, then we are scanning an indirect block looking at its
+ * pointers.  If level == 0, then we are looking at a block of dnodes.
+ *
+ * If we don't find what we are looking for in the block, we return ESRCH.
+ * Otherwise, return with *offset pointing to the beginning (if searching
+ * forwards) or end (if searching backwards) of the range covered by the
+ * block pointer we matched on (or dnode).
  *
  * The basic search algorithm used below by dnode_next_offset() is to
  * use this function to search up the block tree (widen the search) until

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -302,7 +302,7 @@ free_children(dmu_buf_impl_t *db, uint64
 }
 
 /*
- * free_range: Traverse the indicated range of the provided file
+ * Traverse the indicated range of the provided file
  * and "free" all the blocks contained there.
  */
 static void
@@ -370,7 +370,7 @@ dnode_sync_free_range(dnode_t *dn, uint6
 }
 
 /*
- * Try to kick all the dnodes dbufs out of the cache...
+ * Try to kick all the dnode's dbufs out of the cache...
  */
 void
 dnode_evict_dbufs(dnode_t *dn)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -379,7 +379,7 @@ dsl_prop_predict(dsl_dir_t *dd, const ch
 
 /*
  * Unregister this callback.  Return 0 on success, ENOENT if ddname is
- * invalid, ENOMSG if no matching callback registered.
+ * invalid, or ENOMSG if no matching callback registered.
  */
 int
 dsl_prop_unregister(dsl_dataset_t *ds, const char *propname,

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -111,6 +111,7 @@
  * location.
  *
  * Byteswap implications:
+ *
  * Since the SA attributes are not entirely self describing we can't do
  * the normal byteswap processing.  The special ZAP layout attribute and
  * attribute registration attributes define the byteswap function and the
@@ -189,7 +190,6 @@ sa_attr_reg_t sa_legacy_attrs[] = {
 };
 
 /*
- * ZPL legacy layout
  * This is only used for objects of type DMU_OT_ZNODE
  */
 sa_attr_type_t sa_legacy_zpl_layout[] = {
@@ -199,7 +199,6 @@ sa_attr_type_t sa_legacy_zpl_layout[] = 
 /*
  * Special dummy layout used for buffers with no attributes.
  */
-
 sa_attr_type_t sa_dummy_zpl_layout[] = { 0 };
 
 static int sa_legacy_attr_count = 16;

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -4698,6 +4698,7 @@ spa_vdev_attach(spa_t *spa, uint64_t gui
 
 /*
  * Detach a device from a mirror or replacing vdev.
+ *
  * If 'replace_done' is specified, only detach if the parent
  * is a replacing vdev.
  */
@@ -5359,11 +5360,9 @@ spa_vdev_remove_from_namespace(spa_t *sp
  * the spa_vdev_config_[enter/exit] functions which allow us to
  * grab and release the spa_config_lock while still holding the namespace
  * lock.  During each step the configuration is synced out.
- */
-
-/*
- * Remove a device from the pool.  Currently, this supports removing only hot
- * spares, slogs, and level 2 ARC devices.
+ *
+ * Currently, this supports removing only hot spares, slogs, and level 2 ARC
+ * devices.
  */
 int
 spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
@@ -5473,7 +5472,7 @@ spa_vdev_remove(spa_t *spa, uint64_t gui
 
 /*
  * Find any device that's done replacing, or a vdev marked 'unspare' that's
- * current spared, so we can detach it.
+ * currently spared, so we can detach it.
  */
 static vdev_t *
 spa_vdev_resilver_done_hunt(vdev_t *vd)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -315,6 +315,7 @@ spa_config_set(spa_t *spa, nvlist_t *con
 
 /*
  * Generate the pool's configuration based on the current in-core state.
+ *
  * We infer whether to generate a complete config or just one top-level config
  * based on whether vd is the root vdev.
  */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -1369,7 +1369,7 @@ zfs_panic_recover(const char *fmt, ...)
 
 /*
  * This is a stripped-down version of strtoull, suitable only for converting
- * lowercase hexidecimal numbers that don't overflow.
+ * lowercase hexadecimal numbers that don't overflow.
  */
 uint64_t
 zfs_strtonum(const char *str, char **nptr)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -63,16 +63,15 @@ enum ddt_class {
  */
 typedef struct ddt_key {
 	zio_cksum_t	ddk_cksum;	/* 256-bit block checksum */
-	uint64_t	ddk_prop;	/* LSIZE, PSIZE, compression */
+	/*
+	 * Encoded with logical & physical size, and compression, as follows:
+	 *   +-------+-------+-------+-------+-------+-------+-------+-------+
+	 *   |   0   |   0   |   0   | comp  |     PSIZE     |     LSIZE     |
+	 *   +-------+-------+-------+-------+-------+-------+-------+-------+
+	 */
+	uint64_t	ddk_prop;
 } ddt_key_t;
 
-/*
- * ddk_prop layout:
- *
- *	+-------+-------+-------+-------+-------+-------+-------+-------+
- *	|   0	|   0	|   0	| comp	|     PSIZE	|     LSIZE	|
- *	+-------+-------+-------+-------+-------+-------+-------+-------+
- */
 #define	DDK_GET_LSIZE(ddk)	\
 	BF64_GET_SB((ddk)->ddk_prop, 0, 16, SPA_MINBLOCKSHIFT, 1)
 #define	DDK_SET_LSIZE(ddk, x)	\

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -145,9 +145,8 @@ typedef struct dnode_phys {
 
 typedef struct dnode {
 	/*
-	 * dn_struct_rwlock protects the structure of the dnode,
-	 * including the number of levels of indirection (dn_nlevels),
-	 * dn_maxblkid, and dn_next_*
+	 * Protects the structure of the dnode, including the number of levels
+	 * of indirection (dn_nlevels), dn_maxblkid, and dn_next_*
 	 */
 	krwlock_t dn_struct_rwlock;
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -110,6 +110,7 @@ typedef struct dsl_pool {
 
 	/*
 	 * Protects administrative changes (properties, namespace)
+	 *
 	 * It is only held for write in syncing context.  Therefore
 	 * syncing context does not need to ever have it for read, since
 	 * nobody else could possibly have it for write.

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -150,6 +150,7 @@ struct sa_os {
 
 /*
  * header for all bonus and spill buffers.
+ *
  * The header has a fixed portion with a variable number
  * of "lengths" depending on the number of variable sized
  * attribues which are determined by the "layout number"
@@ -158,29 +159,27 @@ struct sa_os {
 #define	SA_MAGIC	0x2F505A  /* ZFS SA */
 typedef struct sa_hdr_phys {
 	uint32_t sa_magic;
-	uint16_t sa_layout_info;  /* Encoded with hdrsize and layout number */
+	/*
+	 * Encoded with hdrsize and layout number as follows:
+	 * 16      10       0
+	 * +--------+-------+
+	 * | hdrsz  |layout |
+	 * +--------+-------+
+	 *
+	 * Bits 0-10 are the layout number
+	 * Bits 11-16 are the size of the header.
+	 * The hdrsize is the number * 8
+	 *
+	 * For example.
+	 * hdrsz of 1 ==> 8 byte header
+	 *          2 ==> 16 byte header
+	 *
+	 */
+	uint16_t sa_layout_info;
 	uint16_t sa_lengths[1];	/* optional sizes for variable length attrs */
 	/* ... Data follows the lengths.  */
 } sa_hdr_phys_t;
 
-/*
- * sa_hdr_phys -> sa_layout_info
- *
- * 16      10       0
- * +--------+-------+
- * | hdrsz  |layout |
- * +--------+-------+
- *
- * Bits 0-10 are the layout number
- * Bits 11-16 are the size of the header.
- * The hdrsize is the number * 8
- *
- * For example.
- * hdrsz of 1 ==> 8 byte header
- *          2 ==> 16 byte header
- *
- */
-
 #define	SA_HDR_LAYOUT_NUM(hdr) BF32_GET(hdr->sa_layout_info, 0, 10)
 #define	SA_HDR_SIZE(hdr) BF32_GET_SB(hdr->sa_layout_info, 10, 6, 3, 0)
 #define	SA_HDR_LAYOUT_INFO_ENCODE(x, num, size) \

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -242,7 +242,7 @@ struct spa {
 	uint64_t	spa_sync_starttime;	/* starting time fo spa_sync */
 	uint64_t	spa_deadman_synctime;	/* deadman expiration timer */
 	/*
-	 * spa_refcnt & spa_config_lock must be the last elements
+	 * spa_refcount & spa_config_lock must be the last elements
 	 * because refcount_t changes size based on compilation options.
 	 * In order for the MDB module to function correctly, the other
 	 * fields must remain in the same location.

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -94,7 +94,6 @@ struct space_map_ops {
  *   63  62    60 59        50 49                               0
  *
  *
- *
  * non-debug entry
  *
  *    1               47                   1           15

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -26,8 +26,6 @@
 #ifndef	_SYS_UNIQUE_H
 #define	_SYS_UNIQUE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include 
 
 #ifdef	__cplusplus
@@ -42,7 +40,7 @@ void unique_fini(void);
 
 /*
  * Return a new unique value (which will not be uniquified against until
- * it is unique_insert()-ed.
+ * it is unique_insert()-ed).
  */
 uint64_t unique_create(void);
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -247,12 +247,13 @@ typedef struct vdev_label {
 #define	VDD_METASLAB	0x01
 #define	VDD_DTL		0x02
 
+/* Offset of embedded boot loader region on each label */
+#define	VDEV_BOOT_OFFSET	(2 * sizeof (vdev_label_t))
 /*
- * Size and offset of embedded boot loader region on each label.
+ * Size of embedded boot loader region on each label.
  * The total size of the first two labels plus the boot area is 4MB.
  */
-#define	VDEV_BOOT_OFFSET	(2 * sizeof (vdev_label_t))
-#define	VDEV_BOOT_SIZE		(7ULL << 19)			/* 3.5M	*/
+#define	VDEV_BOOT_SIZE		(7ULL << 19)			/* 3.5M */
 
 /*
  * Size of label regions at the start and end of each leaf device.
@@ -323,8 +324,9 @@ extern uint64_t vdev_get_min_asize(vdev_
 extern void vdev_set_min_asize(vdev_t *vd);
 
 /*
- * zdb uses this tunable, so it must be declared here to make lint happy.
+ * Global variables
  */
+/* zdb uses this tunable, so it must be declared here to make lint happy. */
 extern int zfs_vdev_cache_size;
 
 #ifdef	__cplusplus

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -86,18 +86,22 @@ extern "C" {
 #endif
 
 /*
- * The matchtype specifies which entry will be accessed.
- * MT_EXACT: only find an exact match (non-normalized)
- * MT_FIRST: find the "first" normalized (case and Unicode
- *     form) match; the designated "first" match will not change as long
- *     as the set of entries with this normalization doesn't change
- * MT_BEST: if there is an exact match, find that, otherwise find the
- *     first normalized match
+ * Specifies matching criteria for ZAP lookups.
  */
 typedef enum matchtype
 {
+	/* Only find an exact match (non-normalized) */
 	MT_EXACT,
+	/*
+	 * If there is an exact match, find that, otherwise find the
+	 * first normalized match.
+	 */
 	MT_BEST,
+	/*
+	 * Find the "first" normalized (case and Unicode form) match;
+	 * the designated "first" match will not change as long as the
+	 * set of entries with this normalization doesn't change.
+	 */
 	MT_FIRST
 } matchtype_t;
 
@@ -174,16 +178,21 @@ int zap_destroy(objset_t *ds, uint64_t z
  * call will fail and return EINVAL.
  *
  * If 'integer_size' is equal to or larger than the attribute's integer
- * size, the call will succeed and return 0.  * When converting to a
- * larger integer size, the integers will be treated as unsigned (ie. no
- * sign-extension will be performed).
+ * size, the call will succeed and return 0.
+ *
+ * When converting to a larger integer size, the integers will be treated as
+ * unsigned (ie. no sign-extension will be performed).
  *
  * 'num_integers' is the length (in integers) of 'buf'.
  *
  * If the attribute is longer than the buffer, as many integers as will
  * fit will be transferred to 'buf'.  If the entire attribute was not
  * transferred, the call will return EOVERFLOW.
- *
+ */
+int zap_lookup(objset_t *ds, uint64_t zapobj, const char *name,
+    uint64_t integer_size, uint64_t num_integers, void *buf);
+
+/*
  * If rn_len is nonzero, realname will be set to the name of the found
  * entry (which may be different from the requested name if matchtype is
  * not MT_EXACT).
@@ -191,8 +200,6 @@ int zap_destroy(objset_t *ds, uint64_t z
  * If normalization_conflictp is not NULL, it will be set if there is
  * another name with the same case/unicode normalized form.
  */
-int zap_lookup(objset_t *ds, uint64_t zapobj, const char *name,
-    uint64_t integer_size, uint64_t num_integers, void *buf);
 int zap_lookup_norm(objset_t *ds, uint64_t zapobj, const char *name,
     uint64_t integer_size, uint64_t num_integers, void *buf,
     matchtype_t mt, char *realname, int rn_len,

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -101,6 +101,7 @@ typedef enum zap_chunk_type {
  */
 typedef struct zap_leaf_phys {
 	struct zap_leaf_header {
+		/* Public to ZAP */
 		uint64_t lh_block_type;		/* ZBT_LEAF */
 		uint64_t lh_pad1;
 		uint64_t lh_prefix;		/* hash prefix of this leaf */
@@ -109,8 +110,7 @@ typedef struct zap_leaf_phys {
 		uint16_t lh_nentries;		/* number of entries */
 		uint16_t lh_prefix_len;		/* num bits used to id this */
 
-/* above is accessable to zap, below is zap_leaf private */
-
+		/* Private to zap_leaf */
 		uint16_t lh_freelist;		/* chunk head of free list */
 		uint8_t lh_flags;		/* ZLF_* flags */
 		uint8_t lh_pad2[11];
@@ -161,13 +161,13 @@ typedef struct zap_leaf {
 
 
 typedef struct zap_entry_handle {
-	/* below is set by zap_leaf.c and is public to zap.c */
+	/* Set by zap_leaf and public to ZAP */
 	uint64_t zeh_num_integers;
 	uint64_t zeh_hash;
 	uint32_t zeh_cd;
 	uint8_t zeh_integer_size;
 
-	/* below is private to zap_leaf.c */
+	/* Private to zap_leaf */
 	uint16_t zeh_fakechunk;
 	uint16_t *zeh_chunkp;
 	zap_leaf_t *zeh_leaf;
@@ -202,7 +202,7 @@ extern int zap_entry_read_name(struct za
 /*
  * Replace the value of an existing entry.
  *
- * zap_entry_update may fail if it runs out of space (ENOSPC).
+ * May fail if it runs out of space (ENOSPC).
  */
 extern int zap_entry_update(zap_entry_handle_t *zeh,
     uint8_t integer_size, uint64_t num_integers, const void *buf);
@@ -221,10 +221,7 @@ extern int zap_entry_create(zap_leaf_t *
     uint8_t integer_size, uint64_t num_integers, const void *buf,
     zap_entry_handle_t *zeh);
 
-/*
- * Return true if there are additional entries with the same normalized
- * form.
- */
+/* Determine whether there is another entry with the same normalized form. */
 extern boolean_t zap_entry_normalization_conflict(zap_entry_handle_t *zeh,
     struct zap_name *zn, const char *name, struct zap *zap);
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -45,7 +45,8 @@ struct znode_phys;
 #define	ZFS_ACL_VERSION		ZFS_ACL_VERSION_FUID
 
 /*
- * ZFS ACLs are store in various forms.
+ * ZFS ACLs (Access Control Lists) are stored in various forms.
+ *
  * Files created with ACL version ZFS_ACL_VERSION_INITIAL
  * will all be created with fixed length ACEs of type
  * zfs_oldace_t.
@@ -135,8 +136,8 @@ typedef struct acl_ops {
 	size_t		(*ace_size)(void *acep); /* how big is this ace */
 	size_t		(*ace_abstract_size)(void); /* sizeof abstract entry */
 	int		(*ace_mask_off)(void); /* off of access mask in ace */
+	/* ptr to data if any */
 	int		(*ace_data)(void *acep, void **datap);
-			    /* ptr to data if any */
 } acl_ops_t;
 
 /*

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -26,8 +26,6 @@
 #ifndef	_SYS_FS_ZFS_RLOCK_H
 #define	_SYS_FS_ZFS_RLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -57,16 +55,14 @@ typedef struct rl {
 } rl_t;
 
 /*
- * Lock a range (offset, length) as either shared (READER)
- * or exclusive (WRITER or APPEND). APPEND is a special type that
- * is converted to WRITER that specified to lock from the start of the
- * end of file.  zfs_range_lock() returns the range lock structure.
+ * Lock a range (offset, length) as either shared (RL_READER)
+ * or exclusive (RL_WRITER or RL_APPEND).  RL_APPEND is a special type that
+ * is converted to RL_WRITER that specified to lock from the start of the
+ * end of file.  Returns the range lock structure.
  */
 rl_t *zfs_range_lock(znode_t *zp, uint64_t off, uint64_t len, rl_type_t type);
 
-/*
- * Unlock range and destroy range lock structure.
- */
+/* Unlock range and destroy range lock structure. */
 void zfs_range_unlock(rl_t *rl);
 
 /*
@@ -76,7 +72,8 @@ void zfs_range_unlock(rl_t *rl);
 void zfs_range_reduce(rl_t *rl, uint64_t off, uint64_t len);
 
 /*
- * AVL comparison function used to compare range locks
+ * AVL comparison function used to order range locks
+ * Locks are ordered on the start offset of the range.
  */
 int zfs_range_compare(const void *arg1, const void *arg2);
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -135,8 +135,9 @@ extern "C" {
 
 #define	ZFS_MAX_BLOCKSIZE	(SPA_MAXBLOCKSIZE)
 
-/* Path component length */
 /*
+ * Path component length
+ *
  * The generic fs code uses MAXNAMELEN to represent
  * what the largest component length is.  Unfortunately,
  * this length includes the terminating NULL.  ZFS needs
@@ -252,12 +253,7 @@ VTOZ(vnode_t *vp)
 #define	VTOZ(VP)	((znode_t *)(VP)->v_data)
 #endif
 
-/*
- * ZFS_ENTER() is called on entry to each ZFS vnode and vfs operation.
- * ZFS_ENTER_NOERROR() is called when we can't return EIO.
- * ZFS_EXIT() must be called before exitting the vop.
- * ZFS_VERIFY_ZP() verifies the znode is valid.
- */
+/* Called on entry to each ZFS vnode and vfs operation  */
 #define	ZFS_ENTER(zfsvfs) \
 	{ \
 		rrw_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); \
@@ -267,11 +263,14 @@ VTOZ(vnode_t *vp)
 		} \
 	}
 
+/* Called on entry to each ZFS vnode and vfs operation that can not return EIO */
 #define	ZFS_ENTER_NOERROR(zfsvfs) \
 	rrw_enter(&(zfsvfs)->z_teardown_lock, RW_READER, FTAG)
 
+/* Must be called before exiting the vop */
 #define	ZFS_EXIT(zfsvfs) rrw_exit(&(zfsvfs)->z_teardown_lock, FTAG)
 
+/* Verifies the znode is valid */
 #define	ZFS_VERIFY_ZP(zp) \
 	if ((zp)->z_sa_hdl == NULL) { \
 		ZFS_EXIT((zp)->z_zfsvfs); \
@@ -291,15 +290,14 @@ VTOZ(vnode_t *vp)
 #define	ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num) \
 	mutex_exit(ZFS_OBJ_MUTEX((zfsvfs), (obj_num)))
 
-/*
- * Macros to encode/decode ZFS stored time values from/to struct timespec
- */
+/* Encode ZFS stored time values from a struct timespec */
 #define	ZFS_TIME_ENCODE(tp, stmp)		\
 {						\
 	(stmp)[0] = (uint64_t)(tp)->tv_sec;	\
 	(stmp)[1] = (uint64_t)(tp)->tv_nsec;	\
 }
 
+/* Decode ZFS stored time values to a struct timespec */
 #define	ZFS_TIME_DECODE(tp, stmp)		\
 {						\
 	(tp)->tv_sec = (time_t)(stmp)[0];		\

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -242,6 +242,12 @@ typedef struct {
  * information needed for replaying the create.  If the
  * file doesn't have any actual ACEs then the lr_aclcnt
  * would be zero.
+ *
+ * After lr_acl_flags, there are a lr_acl_bytes number of variable sized ace's.
+ * If create is also setting xvattr's, then acl data follows xvattr.
+ * If ACE FUIDs are needed then they will follow the xvattr_t.  Following
+ * the FUIDs will be the domain table information.  The FUIDs for the owner
+ * and group will be in lr_create.  Name follows ACL data.
  */
 typedef struct {
 	lr_create_t	lr_create;	/* common create portion */
@@ -250,13 +256,6 @@ typedef struct {
 	uint64_t	lr_fuidcnt;	/* number of real fuids */
 	uint64_t	lr_acl_bytes;	/* number of bytes in ACL */
 	uint64_t	lr_acl_flags;	/* ACL flags */
-	/* lr_acl_bytes number of variable sized ace's follows */
-	/* if create is also setting xvattr's, then acl data follows xvattr */
-	/* if ACE FUIDs are needed then they will follow the xvattr_t */
-	/* Following the FUIDs will be the domain table information. */
-	/* The FUIDs for the owner and group will be in the lr_create */
-	/* portion of the record. */
-	/* name follows ACL data */
 } lr_acl_create_t;
 
 typedef struct {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h	Tue Jun 11 19:12:06 2013	(r251631)
@@ -36,11 +36,10 @@
 extern "C" {
 #endif
 
-/*
- * Common signature for all zio compress/decompress functions.
- */
+/* Common signature for all zio compress functions. */
 typedef size_t zio_compress_func_t(void *src, void *dst,
     size_t s_len, size_t d_len, int);
+/* Common signature for all zio decompress functions. */
 typedef int zio_decompress_func_t(void *src, void *dst,
     size_t s_len, size_t d_len, int);
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -570,8 +570,8 @@ txg_quiesce_thread(void *arg)
 
 /*
  * Delay this thread by 'ticks' if we are still in the open transaction
- * group and there is already a waiting txg quiesing or quiesced.  Abort
- * the delay if this txg stalls or enters the quiesing state.
+ * group and there is already a waiting txg quiescing or quiesced.
+ * Abort the delay if this txg stalls or enters the quiescing state.
  */
 void
 txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks)
@@ -579,7 +579,7 @@ txg_delay(dsl_pool_t *dp, uint64_t txg, 
 	tx_state_t *tx = &dp->dp_tx;
 	clock_t timeout = ddi_get_lbolt() + ticks;
 
-	/* don't delay if this txg could transition to quiesing immediately */
+	/* don't delay if this txg could transition to quiescing immediately */
 	if (tx->tx_open_txg > txg ||
 	    tx->tx_syncing_txg == txg-1 || tx->tx_synced_txg == txg-1)
 		return;

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -963,9 +963,11 @@ vdev_probe_done(zio_t *zio)
 }
 
 /*
- * Determine whether this device is accessible by reading and writing
- * to several known locations: the pad regions of each vdev label
- * but the first (which we leave alone in case it contains a VTOC).
+ * Determine whether this device is accessible.
+ *
+ * Read and write to several known locations: the pad regions of each
+ * vdev label but the first, which we leave alone in case it contains
+ * a VTOC.
  */
 zio_t *
 vdev_probe(vdev_t *vd, zio_t *zio)
@@ -2190,10 +2192,12 @@ vdev_degrade(spa_t *spa, uint64_t guid, 
 }
 
 /*
- * Online the given vdev.  If 'unspare' is set, it implies two things.  First,
- * any attached spare device should be detached when the device finishes
- * resilvering.  Second, the online should be treated like a 'test' online case,
- * so no FMA events are generated if the device fails to open.
+ * Online the given vdev.
+ *
+ * If 'ZFS_ONLINE_UNSPARE' is set, it implies two things.  First, any attached
+ * spare device should be detached when the device finishes resilvering.
+ * Second, the online should be treated like a 'test' online case, so no FMA
+ * events are generated if the device fails to open.
  */
 int
 vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -35,13 +35,14 @@
 /*
  * These tunables are for performance analysis.
  */
+
+/* The maximum number of I/Os concurrently pending to each device. */
+int zfs_vdev_max_pending = 10;
+
 /*
- * zfs_vdev_max_pending is the maximum number of i/os concurrently
- * pending to each device.  zfs_vdev_min_pending is the initial number
- * of i/os pending to each device (before it starts ramping up to
- * max_pending).
+ * The initial number of I/Os pending to each device, before it starts ramping
+ * up to zfs_vdev_max_pending.
  */
-int zfs_vdev_max_pending = 10;
 int zfs_vdev_min_pending = 4;
 
 /*

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -60,6 +60,7 @@
  *   o addition (+) is represented by a bitwise XOR
  *   o subtraction (-) is therefore identical to addition: A + B = A - B
  *   o multiplication of A by 2 is defined by the following bitwise expression:
+ *
  *	(A * 2)_7 = A_6
  *	(A * 2)_6 = A_5
  *	(A * 2)_5 = A_4
@@ -118,7 +119,7 @@ typedef struct raidz_map {
 	uint64_t rm_missingparity;	/* Count of missing parity devices */
 	uint64_t rm_firstdatacol;	/* First data column/parity count */
 	uint64_t rm_nskip;		/* Skipped sectors for padding */
-	uint64_t rm_skipstart;	/* Column index of padding start */
+	uint64_t rm_skipstart;		/* Column index of padding start */
 	void *rm_datacopy;		/* rm_asize-buffer of copied data */
 	uintptr_t rm_reports;		/* # of referencing checksum reports */
 	uint8_t	rm_freed;		/* map no longer has referencing ZIO */
@@ -158,10 +159,7 @@ typedef struct raidz_map {
  */
 int vdev_raidz_default_to_general;
 
-/*
- * These two tables represent powers and logs of 2 in the Galois field defined
- * above. These values were computed by repeatedly multiplying by 2 as above.
- */
+/* Powers of 2 in the Galois field defined above. */
 static const uint8_t vdev_raidz_pow2[256] = {
 	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
 	0x1d, 0x3a, 0x74, 0xe8, 0xcd, 0x87, 0x13, 0x26,
@@ -196,6 +194,7 @@ static const uint8_t vdev_raidz_pow2[256
 	0x2c, 0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83,
 	0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x01
 };
+/* Logs of 2 in the Galois field defined above. */
 static const uint8_t vdev_raidz_log2[256] = {
 	0x00, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6,
 	0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b,

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -1359,7 +1359,8 @@ zfs_acl_chmod(vtype_t vtype, uint64_t mo
 		zacep = (void *)((uintptr_t)zacep + abstract_size);
 		new_count++;
 		new_bytes += abstract_size;
-	} if (masks.deny1) {
+	}
+	if (masks.deny1) {
 		zfs_set_ace(aclp, zacep, masks.deny1, DENY, -1, ACE_OWNER);
 		zacep = (void *)((uintptr_t)zacep + abstract_size);
 		new_count++;
@@ -1767,7 +1768,7 @@ zfs_acl_ids_overquota(zfsvfs_t *zfsvfs, 
 }
 
 /*
- * Retrieve a files ACL
+ * Retrieve a file's ACL
  */
 int
 zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
@@ -1922,7 +1923,7 @@ zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_
 }
 
 /*
- * Set a files ACL
+ * Set a file's ACL
  */
 int
 zfs_setacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
@@ -2355,6 +2356,7 @@ slow:
 
 /*
  * Determine whether Access should be granted/denied.
+ *
  * The least priv subsytem is always consulted as a basic privilege
  * can define any form of access.
  */
@@ -2560,7 +2562,6 @@ zfs_delete_final_check(znode_t *zp, znod
  * Determine whether Access should be granted/deny, without
  * consulting least priv subsystem.
  *
- *
  * The following chart is the recommended NFSv4 enforcement for
  * ability to delete an object.
  *

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -1234,6 +1234,7 @@ zfsctl_shares_readdir(ap)
 
 /*
  * pvp is the '.zfs' directory (zfsctl_node_t).
+ *
  * Creates vp, which is '.zfs/snapshot' (zfsctl_snapdir_t).
  *
  * This function is the callback to create a GFS vnode for '.zfs/snapshot'

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -335,9 +335,7 @@ zfs_is_bootfs(const char *name)
 }
 
 /*
- * zfs_earlier_version
- *
- *	Return non-zero if the spa version is less than requested version.
+ * Return non-zero if the spa version is less than requested version.
  */
 static int
 zfs_earlier_version(const char *name, int version)
@@ -355,8 +353,6 @@ zfs_earlier_version(const char *name, in
 }
 
 /*
- * zpl_earlier_version
- *
  * Return TRUE if the ZPL version is less than requested version.
  */
 static boolean_t
@@ -3000,10 +2996,10 @@ zfs_create_cb(objset_t *os, void *arg, c
 
 /*
  * inputs:
- * createprops		list of properties requested by creator
- * default_zplver	zpl version to use if unspecified in createprops
- * fuids_ok		fuids allowed in this version of the spa?
  * os			parent objset pointer (NULL if root fs)
+ * fuids_ok		fuids allowed in this version of the spa?
+ * sa_ok		SAs allowed in this version of the spa?
+ * createprops		list of properties requested by creator
  *
  * outputs:
  * zplprops	values for the zplprops we attach to the master node object

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -216,9 +216,8 @@ zfs_log_fuid_domains(zfs_fuid_info_t *fu
 }
 
 /*
- * zfs_log_create() is used to handle TX_CREATE, TX_CREATE_ATTR, TX_MKDIR,
- * TX_MKDIR_ATTR and TX_MKXATTR
- * transactions.
+ * Handles TX_CREATE, TX_CREATE_ATTR, TX_MKDIR, TX_MKDIR_ATTR and
+ * TK_MKXATTR transactions.
  *
  * TX_CREATE and TX_MKDIR are standard creates, but they may have FUID
  * domain information appended prior to the name.  In this case the
@@ -345,7 +344,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_remove() handles both TX_REMOVE and TX_RMDIR transactions.
+ * Handles both TX_REMOVE and TX_RMDIR transactions.
  */
 void
 zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -369,7 +368,7 @@ zfs_log_remove(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_link() handles TX_LINK transactions.
+ * Handles TX_LINK transactions.
  */
 void
 zfs_log_link(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -392,7 +391,7 @@ zfs_log_link(zilog_t *zilog, dmu_tx_t *t
 }
 
 /*
- * zfs_log_symlink() handles TX_SYMLINK transactions.
+ * Handles TX_SYMLINK transactions.
  */
 void
 zfs_log_symlink(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -424,7 +423,7 @@ zfs_log_symlink(zilog_t *zilog, dmu_tx_t
 }
 
 /*
- * zfs_log_rename() handles TX_RENAME transactions.
+ * Handles TX_RENAME transactions.
  */
 void
 zfs_log_rename(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
@@ -450,7 +449,7 @@ zfs_log_rename(zilog_t *zilog, dmu_tx_t 
 }
 
 /*
- * zfs_log_write() handles TX_WRITE transactions.
+ * Handles TX_WRITE transactions.
  */
 ssize_t zfs_immediate_write_sz = 32768;
 
@@ -529,7 +528,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *
 }
 
 /*
- * zfs_log_truncate() handles TX_TRUNCATE transactions.
+ * Handles TX_TRUNCATE transactions.
  */
 void
 zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
@@ -552,7 +551,7 @@ zfs_log_truncate(zilog_t *zilog, dmu_tx_
 }
 
 /*
- * zfs_log_setattr() handles TX_SETATTR transactions.
+ * Handles TX_SETATTR transactions.
  */
 void
 zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype,
@@ -614,7 +613,7 @@ zfs_log_setattr(zilog_t *zilog, dmu_tx_t
 }
 
 /*
- * zfs_log_acl() handles TX_ACL transactions.
+ * Handles TX_ACL transactions.
  */
 void
 zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -28,7 +28,7 @@
 
 /*
  * This file contains the code to implement file range locking in
- * ZFS, although there isn't much specific to ZFS (all that comes to mind
+ * ZFS, although there isn't much specific to ZFS (all that comes to mind is
  * support for growing the blocksize).
  *
  * Interface

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -187,7 +187,7 @@ zfs_sa_set_scanstamp(znode_t *zp, xvattr
 /*
  * I'm not convinced we should do any of this upgrade.
  * since the SA code can read both old/new znode formats
- * with probably little to know performance difference.
+ * with probably little to no performance difference.
  *
  * All new files will be created with the new format.
  */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Tue Jun 11 19:05:29 2013	(r251630)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Tue Jun 11 19:12:06 2013	(r251631)
@@ -1340,13 +1340,12 @@ zfs_parse_bootfs(char *bpath, char *outp
 }
 
 /*
- * zfs_check_global_label:

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:16:15 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B65BE4E4;
 Tue, 11 Jun 2013 19:16:15 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A84931779;
 Tue, 11 Jun 2013 19:16:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJGF4R058745;
 Tue, 11 Jun 2013 19:16:15 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJGFVW058740;
 Tue, 11 Jun 2013 19:16:15 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111916.r5BJGFVW058740@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:16:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251632 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:16:15 -0000

Author: delphij
Date: Tue Jun 11 19:16:14 2013
New Revision: 251632
URL: http://svnweb.freebsd.org/changeset/base/251632

Log:
  MFV r251621:
  
  ZFS needs a refcount audit
  
  Illumos ZFS issues:
    3741 zfs needs a refcount audit
  
  MFC after:      2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Jun 11 19:12:06 2013	(r251631)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Jun 11 19:16:14 2013	(r251632)
@@ -361,8 +361,10 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin
 
 	/* Make sure dsobj has the correct object type. */
 	dmu_object_info_from_db(dbuf, &doi);
-	if (doi.doi_type != DMU_OT_DSL_DATASET)
+	if (doi.doi_type != DMU_OT_DSL_DATASET) {
+		dmu_buf_rele(dbuf, tag);
 		return (SET_ERROR(EINVAL));
+	}
 
 	ds = dmu_buf_get_user(dbuf);
 	if (ds == NULL) {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c	Tue Jun 11 19:12:06 2013	(r251631)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c	Tue Jun 11 19:16:14 2013	(r251632)
@@ -183,8 +183,10 @@ process_error_log(spa_t *spa, uint64_t o
 
 		if (copyout(&zb, (char *)addr +
 		    (*count - 1) * sizeof (zbookmark_t),
-		    sizeof (zbookmark_t)) != 0)
+		    sizeof (zbookmark_t)) != 0) {
+			zap_cursor_fini(&zc);
 			return (SET_ERROR(EFAULT));
+		}
 
 		*count -= 1;
 	}

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c	Tue Jun 11 19:12:06 2013	(r251631)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c	Tue Jun 11 19:16:14 2013	(r251632)
@@ -295,7 +295,8 @@ zap_table_load(zap_t *zap, zap_table_phy
 		err = dmu_buf_hold(zap->zap_objset, zap->zap_object,
 		    (tbl->zt_nextblk + blk) << bs, FTAG, &db,
 		    DMU_READ_NO_PREFETCH);
-		dmu_buf_rele(db, FTAG);
+		if (err == 0)
+			dmu_buf_rele(db, FTAG);
 	}
 	return (err);
 }
@@ -992,18 +993,21 @@ zap_join(objset_t *os, uint64_t fromobj,
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 		err = zap_add(os, intoobj, za.za_name,
 		    8, 1, &za.za_first_integer, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int
@@ -1014,18 +1018,21 @@ zap_join_key(objset_t *os, uint64_t from
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 		err = zap_add(os, intoobj, za.za_name,
 		    8, 1, &value, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int
@@ -1036,24 +1043,27 @@ zap_join_increment(objset_t *os, uint64_
 	zap_attribute_t za;
 	int err;
 
+	err = 0;
 	for (zap_cursor_init(&zc, os, fromobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    (void) zap_cursor_advance(&zc)) {
 		uint64_t delta = 0;
 
-		if (za.za_integer_length != 8 || za.za_num_integers != 1)
-			return (SET_ERROR(EINVAL));
+		if (za.za_integer_length != 8 || za.za_num_integers != 1) {
+			err = SET_ERROR(EINVAL);
+			break;
+		}
 
 		err = zap_lookup(os, intoobj, za.za_name, 8, 1, &delta);
 		if (err != 0 && err != ENOENT)
-			return (err);
+			break;
 		delta += za.za_first_integer;
 		err = zap_update(os, intoobj, za.za_name, 8, 1, &delta, tx);
 		if (err)
-			return (err);
+			break;
 	}
 	zap_cursor_fini(&zc);
-	return (0);
+	return (err);
 }
 
 int

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:22:21 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EE4DC756;
 Tue, 11 Jun 2013 19:22:21 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D11D317B0;
 Tue, 11 Jun 2013 19:22:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJML1G061269;
 Tue, 11 Jun 2013 19:22:21 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJMLEv061264;
 Tue, 11 Jun 2013 19:22:21 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111922.r5BJMLEv061264@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251633 - in
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:22:22 -0000

Author: delphij
Date: Tue Jun 11 19:22:20 2013
New Revision: 251633
URL: http://svnweb.freebsd.org/changeset/base/251633

Log:
  MFV r251622:
  
  ZFS shouldn't ignore errors unmounting snapshots
  
  Illumos ZFS issues:
    3744 zfs shouldn't ignore errors unmounting snapshots
  
  MFC after:      2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c	Tue Jun 11 19:16:14 2013	(r251632)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c	Tue Jun 11 19:22:20 2013	(r251633)
@@ -433,7 +433,7 @@ dsl_dataset_user_release_tmp(dsl_pool_t 
 		dsl_dataset_name(ds, name);
 		dsl_dataset_rele(ds, FTAG);
 		dsl_pool_config_exit(dp, FTAG);
-		zfs_unmount_snap(name);
+		(void) zfs_unmount_snap(name);
 	} else {
 		dsl_pool_config_exit(dp, FTAG);
 	}

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h	Tue Jun 11 19:16:14 2013	(r251632)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h	Tue Jun 11 19:22:20 2013	(r251633)
@@ -360,7 +360,7 @@ extern int zfs_secpolicy_rename_perms(co
     const char *to, cred_t *cr);
 extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
 extern int zfs_busy(void);
-extern void zfs_unmount_snap(const char *);
+extern int zfs_unmount_snap(const char *);
 extern void zfs_destroy_unmount_origin(const char *);
 
 /*

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 19:16:14 2013	(r251632)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Jun 11 19:22:20 2013	(r251633)
@@ -3405,28 +3405,31 @@ zfs_ioc_log_history(const char *unused, 
  *
  * This function is best-effort.  Callers must deal gracefully if it
  * remains mounted (or is remounted after this call).
+ *
+ * Returns 0 if the argument is not a snapshot, or it is not currently a
+ * filesystem, or we were able to unmount it.  Returns error code otherwise.
  */
-void
+int
 zfs_unmount_snap(const char *snapname)
 {
 	vfs_t *vfsp;
 	zfsvfs_t *zfsvfs;
+	int err;
 
 	if (strchr(snapname, '@') == NULL)
-		return;
+		return (0);
 
 	vfsp = zfs_get_vfs(snapname);
 	if (vfsp == NULL)
-		return;
+		return (0);
 
 	zfsvfs = vfsp->vfs_data;
 	ASSERT(!dsl_pool_config_held(dmu_objset_pool(zfsvfs->z_os)));
 
-	if (vn_vfswlock(vfsp->vfs_vnodecovered) != 0) {
-		VFS_RELE(vfsp);
-		return;
-	}
+	err = vn_vfswlock(vfsp->vfs_vnodecovered);
 	VFS_RELE(vfsp);
+	if (err != 0)
+		return (SET_ERROR(err));
 
 	/*
 	 * Always force the unmount for snapshots.
@@ -3436,17 +3439,17 @@ zfs_unmount_snap(const char *snapname)
 	(void) dounmount(vfsp, MS_FORCE, kcred);
 #else
 	mtx_lock(&Giant);	/* dounmount() */
-	dounmount(vfsp, MS_FORCE, curthread);
+	(void) dounmount(vfsp, MS_FORCE, curthread);
 	mtx_unlock(&Giant);	/* dounmount() */
 #endif
+	return (0);
 }
 
 /* ARGSUSED */
 static int
 zfs_unmount_snap_cb(const char *snapname, void *arg)
 {
-	zfs_unmount_snap(snapname);
-	return (0);
+	return (zfs_unmount_snap(snapname));
 }
 
 /*
@@ -3469,7 +3472,7 @@ zfs_destroy_unmount_origin(const char *f
 		char originname[MAXNAMELEN];
 		dsl_dataset_name(ds->ds_prev, originname);
 		dmu_objset_rele(os, FTAG);
-		zfs_unmount_snap(originname);
+		(void) zfs_unmount_snap(originname);
 	} else {
 		dmu_objset_rele(os, FTAG);
 	}
@@ -3487,7 +3490,7 @@ zfs_destroy_unmount_origin(const char *f
 static int
 zfs_ioc_destroy_snaps(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
 {
-	int poollen;
+	int error, poollen;
 	nvlist_t *snaps;
 	nvpair_t *pair;
 	boolean_t defer;
@@ -3508,7 +3511,9 @@ zfs_ioc_destroy_snaps(const char *poolna
 		    (name[poollen] != '/' && name[poollen] != '@'))
 			return (SET_ERROR(EXDEV));
 
-		zfs_unmount_snap(name);
+		error = zfs_unmount_snap(name);
+		if (error != 0)
+			return (error);
 		(void) zvol_remove_minor(name);
 	}
 
@@ -3527,8 +3532,12 @@ static int
 zfs_ioc_destroy(zfs_cmd_t *zc)
 {
 	int err;
-	if (strchr(zc->zc_name, '@') && zc->zc_objset_type == DMU_OST_ZFS)
-		zfs_unmount_snap(zc->zc_name);
+
+	if (zc->zc_objset_type == DMU_OST_ZFS) {
+		err = zfs_unmount_snap(zc->zc_name);
+		if (err != 0)
+			return (err);
+	}
 
 	if (strchr(zc->zc_name, '@'))
 		err = dsl_destroy_snapshot(zc->zc_name, zc->zc_defer_destroy);
@@ -3574,8 +3583,7 @@ recursive_unmount(const char *fsname, vo
 	char fullname[MAXNAMELEN];
 
 	(void) snprintf(fullname, sizeof (fullname), "%s@%s", fsname, snapname);
-	zfs_unmount_snap(fullname);
-	return (0);
+	return (zfs_unmount_snap(fullname));
 }
 
 /*
@@ -5071,14 +5079,18 @@ static int
 zfs_ioc_release(const char *pool, nvlist_t *holds, nvlist_t *errlist)
 {
 	nvpair_t *pair;
+	int err;
 
 	/*
 	 * The release may cause the snapshot to be destroyed; make sure it
 	 * is not mounted.
 	 */
 	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(holds, pair))
-		zfs_unmount_snap(nvpair_name(pair));
+	    pair = nvlist_next_nvpair(holds, pair)) {
+		err = zfs_unmount_snap(nvpair_name(pair));
+		if (err != 0)
+			return (err);
+	}
 
 	return (dsl_dataset_user_release(holds, errlist));
 }

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:25:49 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CEB2B9F8;
 Tue, 11 Jun 2013 19:25:49 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C10C617E2;
 Tue, 11 Jun 2013 19:25:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJPnGV061866;
 Tue, 11 Jun 2013 19:25:49 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJPnwS061864;
 Tue, 11 Jun 2013 19:25:49 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111925.r5BJPnwS061864@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:25:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251634 - in head/cddl/contrib/opensolaris: cmd/zpool
 lib/libzfs/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:25:49 -0000

Author: delphij
Date: Tue Jun 11 19:25:49 2013
New Revision: 251634
URL: http://svnweb.freebsd.org/changeset/base/251634

Log:
  MFV r251623:
  
  zpool create should treat -O mountpoint and -m the same
  
  Illumos ZFS issues:
    3745 zpool create should treat -O mountpoint and -m the same
  
  MFC after:      2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Jun 11 19:22:20 2013	(r251633)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Jun 11 19:25:49 2013	(r251634)
@@ -804,6 +804,7 @@ zpool_do_create(int argc, char **argv)
 				goto errout;
 			break;
 		case 'm':
+			/* Equivalent to -O mountpoint=optarg */
 			mountpoint = optarg;
 			break;
 		case 'o':
@@ -842,8 +843,18 @@ zpool_do_create(int argc, char **argv)
 			*propval = '\0';
 			propval++;
 
-			if (add_prop_list(optarg, propval, &fsprops, B_FALSE))
+			/*
+			 * Mountpoints are checked and then added later.
+			 * Uniquely among properties, they can be specified
+			 * more than once, to avoid conflict with -m.
+			 */
+			if (0 == strcmp(optarg,
+			    zfs_prop_to_name(ZFS_PROP_MOUNTPOINT))) {
+				mountpoint = propval;
+			} else if (add_prop_list(optarg, propval, &fsprops,
+			    B_FALSE)) {
 				goto errout;
+			}
 			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
@@ -961,6 +972,18 @@ zpool_do_create(int argc, char **argv)
 		}
 	}
 
+	/*
+	 * Now that the mountpoint's validity has been checked, ensure that
+	 * the property is set appropriately prior to creating the pool.
+	 */
+	if (mountpoint != NULL) {
+		ret = add_prop_list(zfs_prop_to_name(ZFS_PROP_MOUNTPOINT),
+		    mountpoint, &fsprops, B_FALSE);
+		if (ret != 0)
+			goto errout;
+	}
+
+	ret = 1;
 	if (dryrun) {
 		/*
 		 * For a dry run invocation, print out a basic message and run
@@ -995,21 +1018,19 @@ zpool_do_create(int argc, char **argv)
 				if (nvlist_exists(props, propname))
 					continue;
 
-				if (add_prop_list(propname, ZFS_FEATURE_ENABLED,
-				    &props, B_TRUE) != 0)
+				ret = add_prop_list(propname,
+				    ZFS_FEATURE_ENABLED, &props, B_TRUE);
+				if (ret != 0)
 					goto errout;
 			}
 		}
+
+		ret = 1;
 		if (zpool_create(g_zfs, poolname,
 		    nvroot, props, fsprops) == 0) {
 			zfs_handle_t *pool = zfs_open(g_zfs, poolname,
 			    ZFS_TYPE_FILESYSTEM);
 			if (pool != NULL) {
-				if (mountpoint != NULL)
-					verify(zfs_prop_set(pool,
-					    zfs_prop_to_name(
-					    ZFS_PROP_MOUNTPOINT),
-					    mountpoint) == 0);
 				if (zfs_mount(pool, NULL, 0) == 0)
 					ret = zfs_shareall(pool);
 				zfs_close(pool);

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Jun 11 19:22:20 2013	(r251633)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Jun 11 19:25:49 2013	(r251634)
@@ -1112,7 +1112,6 @@ zpool_create(libzfs_handle_t *hdl, const
 	nvlist_t *zc_fsprops = NULL;
 	nvlist_t *zc_props = NULL;
 	char msg[1024];
-	char *altroot;
 	int ret = -1;
 
 	(void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
@@ -1211,21 +1210,6 @@ zpool_create(libzfs_handle_t *hdl, const
 		}
 	}
 
-	/*
-	 * If this is an alternate root pool, then we automatically set the
-	 * mountpoint of the root dataset to be '/'.
-	 */
-	if (nvlist_lookup_string(props, zpool_prop_to_name(ZPOOL_PROP_ALTROOT),
-	    &altroot) == 0) {
-		zfs_handle_t *zhp;
-
-		verify((zhp = zfs_open(hdl, pool, ZFS_TYPE_DATASET)) != NULL);
-		verify(zfs_prop_set(zhp, zfs_prop_to_name(ZFS_PROP_MOUNTPOINT),
-		    "/") == 0);
-
-		zfs_close(zhp);
-	}
-
 create_failed:
 	zcmd_free_nvlists(&zc);
 	nvlist_free(zc_props);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:29:32 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 766F8C8F;
 Tue, 11 Jun 2013 19:29:32 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 688611804;
 Tue, 11 Jun 2013 19:29:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJTWbo062484;
 Tue, 11 Jun 2013 19:29:32 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJTWFU062482;
 Tue, 11 Jun 2013 19:29:32 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111929.r5BJTWFU062482@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:29:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251635 - in head: cddl/contrib/opensolaris/cmd/ztest
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:29:32 -0000

Author: delphij
Date: Tue Jun 11 19:29:31 2013
New Revision: 251635
URL: http://svnweb.freebsd.org/changeset/base/251635

Log:
  MFV r251624:
  
  txg commit callbacks don't work
  
  Illumos ZFS issues:
    3747 txg commit callbacks don't work
  
  MFC after:      2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Tue Jun 11 19:25:49 2013	(r251634)
+++ head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Tue Jun 11 19:29:31 2013	(r251635)
@@ -4509,7 +4509,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *z
 	 */
 	tmp_cb = list_head(&zcl.zcl_callbacks);
 	if (tmp_cb != NULL &&
-	    tmp_cb->zcd_txg > txg - ZTEST_COMMIT_CALLBACK_THRESH) {
+	    (txg - ZTEST_COMMIT_CALLBACK_THRESH) > tmp_cb->zcd_txg) {
 		fatal(0, "Commit callback threshold exceeded, oldest txg: %"
 		    PRIu64 ", open txg: %" PRIu64 "\n", tmp_cb->zcd_txg, txg);
 	}

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:25:49 2013	(r251634)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Tue Jun 11 19:29:31 2013	(r251635)
@@ -439,7 +439,7 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
 		list_create(cb_list, sizeof (dmu_tx_callback_t),
 		    offsetof(dmu_tx_callback_t, dcb_node));
 
-		list_move_tail(&tc->tc_callbacks[g], cb_list);
+		list_move_tail(cb_list, &tc->tc_callbacks[g]);
 
 		(void) taskq_dispatch(tx->tx_commit_cb_taskq, (task_func_t *)
 		    txg_do_callbacks, cb_list, TQ_SLEEP);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 19:35:45 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A838016F;
 Tue, 11 Jun 2013 19:35:45 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8A9EA1893;
 Tue, 11 Jun 2013 19:35:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BJZjSS065065;
 Tue, 11 Jun 2013 19:35:45 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BJZi7q065058;
 Tue, 11 Jun 2013 19:35:44 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306111935.r5BJZi7q065058@svn.freebsd.org>
From: Xin LI 
Date: Tue, 11 Jun 2013 19:35:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251636 - in
 head/sys/cddl/contrib/opensolaris/uts/common: fs/zfs fs/zfs/sys sys/fm/fs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 19:35:45 -0000

Author: delphij
Date: Tue Jun 11 19:35:44 2013
New Revision: 251636
URL: http://svnweb.freebsd.org/changeset/base/251636

Log:
  MFV r251626:
  
  ZFS event processing should work on R/O root filesystems
  
  Illumos ZFS issues:
    3749 zfs event processing should work on R/O root filesystems
  
  MFC after:      2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:29:31 2013	(r251635)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Tue Jun 11 19:35:44 2013	(r251636)
@@ -88,6 +88,12 @@ TUNABLE_INT("vfs.zfs.check_hostid", &che
 SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RW, &check_hostid, 0,
     "Check hostid on import?");
 
+/*
+ * The interval, in seconds, at which failed configuration cache file writes
+ * should be retried.
+ */
+static int zfs_ccw_retry_interval = 300;
+
 typedef enum zti_modes {
 	zti_mode_fixed,			/* value is # of threads (min 1) */
 	zti_mode_online_percent,	/* value is % of online CPUs */
@@ -5852,13 +5858,34 @@ spa_async_resume(spa_t *spa)
 	mutex_exit(&spa->spa_async_lock);
 }
 
+static boolean_t
+spa_async_tasks_pending(spa_t *spa)
+{
+	uint_t non_config_tasks;
+	uint_t config_task;
+	boolean_t config_task_suspended;
+
+	non_config_tasks = spa->spa_async_tasks & ~SPA_ASYNC_CONFIG_UPDATE;
+	config_task = spa->spa_async_tasks & SPA_ASYNC_CONFIG_UPDATE;
+	if (spa->spa_ccw_fail_time == 0) {
+		config_task_suspended = B_FALSE;
+	} else {
+		config_task_suspended =
+		    (gethrtime() - spa->spa_ccw_fail_time) <
+		    (zfs_ccw_retry_interval * NANOSEC);
+	}
+
+	return (non_config_tasks || (config_task && !config_task_suspended));
+}
+
 static void
 spa_async_dispatch(spa_t *spa)
 {
 	mutex_enter(&spa->spa_async_lock);
-	if (spa->spa_async_tasks && !spa->spa_async_suspended &&
+	if (spa_async_tasks_pending(spa) &&
+	    !spa->spa_async_suspended &&
 	    spa->spa_async_thread == NULL &&
-	    rootdir != NULL && !vn_is_readonly(rootdir))
+	    rootdir != NULL)
 		spa->spa_async_thread = thread_create(NULL, 0,
 		    spa_async_thread, spa, 0, &p0, TS_RUN, maxclsyspri);
 	mutex_exit(&spa->spa_async_lock);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Tue Jun 11 19:29:31 2013	(r251635)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Tue Jun 11 19:35:44 2013	(r251636)
@@ -27,6 +27,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -139,7 +140,7 @@ out:
 	kobj_close_file(file);
 }
 
-static void
+static int
 spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 {
 	size_t buflen;
@@ -147,13 +148,14 @@ spa_config_write(spa_config_dirent_t *dp
 	vnode_t *vp;
 	int oflags = FWRITE | FTRUNC | FCREAT | FOFFMAX;
 	char *temp;
+	int err;
 
 	/*
 	 * If the nvlist is empty (NULL), then remove the old cachefile.
 	 */
 	if (nvl == NULL) {
-		(void) vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
-		return;
+		err = vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
+		return (err);
 	}
 
 	/*
@@ -174,12 +176,14 @@ spa_config_write(spa_config_dirent_t *dp
 	 */
 	(void) snprintf(temp, MAXPATHLEN, "%s.tmp", dp->scd_path);
 
-	if (vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0) == 0) {
-		if (vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
-		    0, RLIM64_INFINITY, kcred, NULL) == 0 &&
-		    VOP_FSYNC(vp, FSYNC, kcred, NULL) == 0) {
-			(void) vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
-		}
+	err = vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0);
+	if (err == 0) {
+		err = vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
+		    0, RLIM64_INFINITY, kcred, NULL);
+		if (err == 0)
+			err = VOP_FSYNC(vp, FSYNC, kcred, NULL);
+		if (err == 0)
+			err = vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
 		(void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
 	}
 
@@ -187,6 +191,7 @@ spa_config_write(spa_config_dirent_t *dp
 
 	kmem_free(buf, buflen);
 	kmem_free(temp, MAXPATHLEN);
+	return (err);
 }
 
 /*
@@ -198,6 +203,8 @@ spa_config_sync(spa_t *target, boolean_t
 {
 	spa_config_dirent_t *dp, *tdp;
 	nvlist_t *nvl;
+	boolean_t ccw_failure;
+	int error;
 
 	ASSERT(MUTEX_HELD(&spa_namespace_lock));
 
@@ -209,6 +216,7 @@ spa_config_sync(spa_t *target, boolean_t
 	 * cachefile is changed, the new one is pushed onto this list, allowing
 	 * us to update previous cachefiles that no longer contain this pool.
 	 */
+	ccw_failure = B_FALSE;
 	for (dp = list_head(&target->spa_config_list); dp != NULL;
 	    dp = list_next(&target->spa_config_list, dp)) {
 		spa_t *spa = NULL;
@@ -249,10 +257,32 @@ spa_config_sync(spa_t *target, boolean_t
 			mutex_exit(&spa->spa_props_lock);
 		}
 
-		spa_config_write(dp, nvl);
+		error = spa_config_write(dp, nvl);
+		if (error != 0)
+			ccw_failure = B_TRUE;
 		nvlist_free(nvl);
 	}
 
+	if (ccw_failure) {
+		/*
+		 * Keep trying so that configuration data is
+		 * written if/when any temporary filesystem
+		 * resource issues are resolved.
+		 */
+		if (target->spa_ccw_fail_time == 0) {
+			zfs_ereport_post(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE,
+			    target, NULL, NULL, 0, 0);
+		}
+		target->spa_ccw_fail_time = gethrtime();
+		spa_async_request(target, SPA_ASYNC_CONFIG_UPDATE);
+	} else {
+		/*
+		 * Do not rate limit future attempts to update
+		 * the config cache.
+		 */
+		target->spa_ccw_fail_time = 0;
+	}
+
 	/*
 	 * Remove any config entries older than the current one.
 	 */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 19:29:31 2013	(r251635)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h	Tue Jun 11 19:35:44 2013	(r251636)
@@ -241,6 +241,7 @@ struct spa {
 	uint64_t	spa_deadman_calls;	/* number of deadman calls */
 	uint64_t	spa_sync_starttime;	/* starting time fo spa_sync */
 	uint64_t	spa_deadman_synctime;	/* deadman expiration timer */
+	hrtime_t	spa_ccw_fail_time;	/* Conf cache write fail time */
 	/*
 	 * spa_refcount & spa_config_lock must be the last elements
 	 * because refcount_t changes size based on compilation options.

Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h	Tue Jun 11 19:29:31 2013	(r251635)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h	Tue Jun 11 19:35:44 2013	(r251636)
@@ -46,6 +46,7 @@ extern "C" {
 #define	FM_EREPORT_ZFS_IO_FAILURE		"io_failure"
 #define	FM_EREPORT_ZFS_PROBE_FAILURE		"probe_failure"
 #define	FM_EREPORT_ZFS_LOG_REPLAY		"log_replay"
+#define	FM_EREPORT_ZFS_CONFIG_CACHE_WRITE	"config_cache_write"
 
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL		"pool"
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL_FAILMODE	"pool_failmode"

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 20:00:50 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2BFD4A74;
 Tue, 11 Jun 2013 20:00:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1F02919A8;
 Tue, 11 Jun 2013 20:00:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BK0onL073813;
 Tue, 11 Jun 2013 20:00:50 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BK0nae073812;
 Tue, 11 Jun 2013 20:00:50 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306112000.r5BK0nae073812@svn.freebsd.org>
From: John Baldwin 
Date: Tue, 11 Jun 2013 20:00:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251637 - head/lib/libprocstat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 20:00:50 -0000

Author: jhb
Date: Tue Jun 11 20:00:49 2013
New Revision: 251637
URL: http://svnweb.freebsd.org/changeset/base/251637

Log:
  Borrow the algorithm from kvm_getprocs() to fix procstat_getprocs() to
  handle the case where the process tables grows in between the calls to
  fetch the size and fetch the table.
  
  MFC after:	1 week

Modified:
  head/lib/libprocstat/libprocstat.c

Modified: head/lib/libprocstat/libprocstat.c
==============================================================================
--- head/lib/libprocstat/libprocstat.c	Tue Jun 11 19:35:44 2013	(r251636)
+++ head/lib/libprocstat/libprocstat.c	Tue Jun 11 20:00:49 2013	(r251637)
@@ -253,7 +253,7 @@ procstat_getprocs(struct procstat *procs
     unsigned int *count)
 {
 	struct kinfo_proc *p0, *p;
-	size_t len;
+	size_t len, olen;
 	int name[4];
 	int cnt;
 	int error;
@@ -290,12 +290,16 @@ procstat_getprocs(struct procstat *procs
 			warnx("no processes?");
 			goto fail;
 		}
-		p = malloc(len);
-		if (p == NULL) {
-			warnx("malloc(%zu)", len);
-			goto fail;
-		}
-		error = sysctl(name, 4, p, &len, NULL, 0);
+		do {
+			len += len / 10;
+			p = reallocf(p, len);
+			if (p == NULL) {
+				warnx("reallocf(%zu)", len);
+				goto fail;
+			}
+			olen = len;
+			error = sysctl(name, 4, p, &len, NULL, 0);
+		} while (error < 0 && errno == ENOMEM && olen == len);
 		if (error < 0 && errno != EPERM) {
 			warn("sysctl(kern.proc)");
 			goto fail;

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 21:20:24 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DE986345;
 Tue, 11 Jun 2013 21:20:24 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C14AE1D9C;
 Tue, 11 Jun 2013 21:20:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BLKOti098038;
 Tue, 11 Jun 2013 21:20:24 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BLKOLR098035;
 Tue, 11 Jun 2013 21:20:24 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201306112120.r5BLKOLR098035@svn.freebsd.org>
From: Navdeep Parhar 
Date: Tue, 11 Jun 2013 21:20:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251638 - head/sys/dev/cxgbe/tom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 21:20:24 -0000

Author: np
Date: Tue Jun 11 21:20:23 2013
New Revision: 251638
URL: http://svnweb.freebsd.org/changeset/base/251638

Log:
  cxgbe/tom: Allow caller to select the queue (control or data) used to
  send the CPL_SET_TCB_FIELD request in t4_set_tcb_field().
  
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/tom/t4_cpl_io.c
  head/sys/dev/cxgbe/tom/t4_ddp.c
  head/sys/dev/cxgbe/tom/t4_tom.h

Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c	Tue Jun 11 20:00:49 2013	(r251637)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c	Tue Jun 11 21:20:23 2013	(r251638)
@@ -1410,13 +1410,13 @@ do_set_tcb_rpl(struct sge_iq *iq, const 
 }
 
 void
-t4_set_tcb_field(struct adapter *sc, struct toepcb *toep, uint16_t word,
-    uint64_t mask, uint64_t val)
+t4_set_tcb_field(struct adapter *sc, struct toepcb *toep, int ctrl,
+    uint16_t word, uint64_t mask, uint64_t val)
 {
 	struct wrqe *wr;
 	struct cpl_set_tcb_field *req;
 
-	wr = alloc_wrqe(sizeof(*req), toep->ctrlq);
+	wr = alloc_wrqe(sizeof(*req), ctrl ? toep->ctrlq : toep->ofld_txq);
 	if (wr == NULL) {
 		/* XXX */
 		panic("%s: allocation failure.", __func__);

Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_ddp.c	Tue Jun 11 20:00:49 2013	(r251637)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c	Tue Jun 11 21:20:23 2013	(r251638)
@@ -541,12 +541,12 @@ enable_ddp(struct adapter *sc, struct to
 	    __func__, toep->tid, time_uptime);
 
 	toep->ddp_flags |= DDP_SC_REQ;
-	t4_set_tcb_field(sc, toep, W_TCB_RX_DDP_FLAGS,
+	t4_set_tcb_field(sc, toep, 1, W_TCB_RX_DDP_FLAGS,
 	    V_TF_DDP_OFF(1) | V_TF_DDP_INDICATE_OUT(1) |
 	    V_TF_DDP_BUF0_INDICATE(1) | V_TF_DDP_BUF1_INDICATE(1) |
 	    V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_BUF1_VALID(1),
 	    V_TF_DDP_BUF0_INDICATE(1) | V_TF_DDP_BUF1_INDICATE(1));
-	t4_set_tcb_field(sc, toep, W_TCB_T_FLAGS,
+	t4_set_tcb_field(sc, toep, 1, W_TCB_T_FLAGS,
 	    V_TF_RCV_COALESCE_ENABLE(1), 0);
 }
 
@@ -562,9 +562,9 @@ disable_ddp(struct adapter *sc, struct t
 	    __func__, toep->tid, time_uptime);
 
 	toep->ddp_flags |= DDP_SC_REQ;
-	t4_set_tcb_field(sc, toep, W_TCB_T_FLAGS,
+	t4_set_tcb_field(sc, toep, 1, W_TCB_T_FLAGS,
 	    V_TF_RCV_COALESCE_ENABLE(1), V_TF_RCV_COALESCE_ENABLE(1));
-	t4_set_tcb_field(sc, toep, W_TCB_RX_DDP_FLAGS, V_TF_DDP_OFF(1),
+	t4_set_tcb_field(sc, toep, 1, W_TCB_RX_DDP_FLAGS, V_TF_DDP_OFF(1),
 	    V_TF_DDP_OFF(1));
 }
 

Modified: head/sys/dev/cxgbe/tom/t4_tom.h
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_tom.h	Tue Jun 11 20:00:49 2013	(r251637)
+++ head/sys/dev/cxgbe/tom/t4_tom.h	Tue Jun 11 21:20:23 2013	(r251638)
@@ -269,8 +269,8 @@ void t4_rcvd(struct toedev *, struct tcp
 int t4_tod_output(struct toedev *, struct tcpcb *);
 int t4_send_fin(struct toedev *, struct tcpcb *);
 int t4_send_rst(struct toedev *, struct tcpcb *);
-void t4_set_tcb_field(struct adapter *, struct toepcb *, uint16_t, uint64_t,
-    uint64_t);
+void t4_set_tcb_field(struct adapter *, struct toepcb *, int, uint16_t,
+    uint64_t, uint64_t);
 
 /* t4_ddp.c */
 void t4_init_ddp(struct adapter *, struct tom_data *);

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 21:40:21 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 47B4DF36;
 Tue, 11 Jun 2013 21:40:21 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 20DBE1EAD;
 Tue, 11 Jun 2013 21:40:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BLeLdx006079;
 Tue, 11 Jun 2013 21:40:21 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BLeLSc006078;
 Tue, 11 Jun 2013 21:40:21 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201306112140.r5BLeLSc006078@svn.freebsd.org>
From: Jilles Tjoelker 
Date: Tue, 11 Jun 2013 21:40:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251639 - head/share/man/man3
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 21:40:21 -0000

Author: jilles
Date: Tue Jun 11 21:40:20 2013
New Revision: 251639
URL: http://svnweb.freebsd.org/changeset/base/251639

Log:
  pthread_testcancel(3): Update list of cancellation points.
  
  This should be a fairly complete list of cancellation points in libc, libthr
  and librt, including standard as well as non-standard functions.

Modified:
  head/share/man/man3/pthread_testcancel.3

Modified: head/share/man/man3/pthread_testcancel.3
==============================================================================
--- head/share/man/man3/pthread_testcancel.3	Tue Jun 11 21:20:23 2013	(r251638)
+++ head/share/man/man3/pthread_testcancel.3	Tue Jun 11 21:40:20 2013	(r251639)
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd January 17, 1999
+.Dd June 11, 2013
 .Dt PTHREAD_TESTCANCEL 3
 .Os
 .Sh NAME
@@ -100,28 +100,59 @@ type will be in effect.
 .Ss Cancellation Points
 Cancellation points will occur when a thread is executing the following
 functions:
+.Fn accept ,
+.Fn accept4 ,
+.Fn aio_suspend ,
+.Fn connect ,
 .Fn close ,
 .Fn creat ,
-.Fn fcntl ,
 .Fn fsync ,
+.Fn mq_receive ,
+.Fn mq_send ,
+.Fn mq_timedreceive ,
+.Fn mq_timedsend ,
 .Fn msync ,
 .Fn nanosleep ,
 .Fn open ,
+.Fn openat ,
 .Fn pause ,
+.Fn poll ,
+.Fn pselect ,
 .Fn pthread_cond_timedwait ,
 .Fn pthread_cond_wait ,
 .Fn pthread_join ,
 .Fn pthread_testcancel ,
 .Fn read ,
-.Fn sigwaitinfo ,
+.Fn readv ,
+.Fn recv ,
+.Fn recvfrom ,
+.Fn recvmsg ,
+.Fn select ,
+.Fn sem_timedwait ,
+.Fn sem_wait ,
+.Fn send ,
+.Fn sendmsg ,
+.Fn sendto ,
 .Fn sigsuspend ,
+.Fn sigtimedwait ,
+.Fn sigwaitinfo ,
 .Fn sigwait ,
 .Fn sleep ,
 .Fn system ,
 .Fn tcdrain ,
+.Fn usleep ,
 .Fn wait ,
+.Fn wait3 ,
+.Fn wait4 ,
 .Fn waitpid ,
-.Fn write .
+.Fn write ,
+.Fn writev .
+The
+.Fn fcntl
+function is a cancellation point if
+.Fa cmd
+is
+.Dv F_SETLKW .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_setcancelstate
@@ -201,6 +232,8 @@ The
 .Fn pthread_testcancel
 function conforms to
 .St -p1003.1-96 .
+The standard allows implementations to make many more functions
+cancellation points.
 .Sh AUTHORS
 This manual page was written by
 .An David Leonard Aq d@openbsd.org

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 21:47:17 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2A82F3A1;
 Tue, 11 Jun 2013 21:47:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0E4491EFB;
 Tue, 11 Jun 2013 21:47:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BLlGe1007190;
 Tue, 11 Jun 2013 21:47:16 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BLlG19007189;
 Tue, 11 Jun 2013 21:47:16 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306112147.r5BLlG19007189@svn.freebsd.org>
From: Eitan Adler 
Date: Tue, 11 Jun 2013 21:47:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251640 - head/share/misc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 21:47:17 -0000

Author: eadler
Date: Tue Jun 11 21:47:16 2013
New Revision: 251640
URL: http://svnweb.freebsd.org/changeset/base/251640

Log:
  Merge latest NetBSD changes.
  This adds some new NetBSD releases and makes some simple formatting changes.
  
  With this commit NetBSD and FreeBSD should have identical files.
  DragonflyFBSD has the version immediately prior to this commit.
  
  When committing to this file please try to coordinate with all three groups.
  
  Submitted by:	Alan Barrett 

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==============================================================================
--- head/share/misc/bsd-family-tree	Tue Jun 11 21:40:20 2013	(r251639)
+++ head/share/misc/bsd-family-tree	Tue Jun 11 21:47:16 2013	(r251640)
@@ -221,51 +221,58 @@ FreeBSD 5.2           |      |          
  *--FreeBSD    |      |      |    |            |                DragonFly 1.12.0
  |    7.0      |      |      |    |            |                       |
  |     |       |      |      |    |        OpenBSD 4.3                 |
- |     |       |      |      | NetBSD 4.0.1    |                DragonFly 2.0.0
- |     |    FreeBSD   |      |             OpenBSD 4.4                 |
+ |     |       |      |      | NetBSD          |                DragonFly 2.0.0
+ |     |    FreeBSD   |      |  4.0.1      OpenBSD 4.4                 |
  |     |      6.4     |      |                 |                       |
  |     |              |      |                 |                       |
  |  FreeBSD 7.1       |      |                 |                       |
  |     |              |      |                 |                DragonFly 2.2.0
  |  FreeBSD 7.2       |   NetBSD 5.0       OpenBSD 4.5                 |
- |             \      |      |    |            |                       |
- |              |  Mac OS X  |    |            |                       |
- |              |    10.6    |    |            |                       |
- |              |     |      |    |            |                DragonFly 2.4.0
- |              |     |      |    |        OpenBSD 4.6                 |
- |              |     |      |    |            |                       |
- *--FreeBSD     |     |      |    |            |                       |
- |    8.0       |     |      |    |            |                       |
- |     |     FreeBSD  |      |    |            |                       |
- |     |       7.3    |      |    |            |                DragonFly 2.6.0
- |     |        |     |      |    |        OpenBSD 4.7                 |
- |  FreeBSD     |     |      |    |            |                       |
- |    8.1       |     |      |    |            |                       |
- |     |        |     |      |    |            |                DragonFly 2.8.2
- |     |        |     |      |    |        OpenBSD 4.8                 |
- |     |        |     |      | NetBSD 5.1      |                       |
- |  FreeBSD  FreeBSD  |      |    |            |                       |
- |    8.2      7.4    |      |    |            |               DragonFly 2.10.1
- |     |              |      |    |        OpenBSD 4.9                 |
- |     `-----.     Mac OS X  |    |            |                       |
- |            \      10.7    |    |            |                       |
- |             |      |      |    |        OpenBSD 5.0                 |
- *--FreeBSD    |      |      |    |            |                       |
- |    9.0      |      |      | NetBSD 5.1.2    |               DragonFly 3.0.1
- |     |    FreeBSD   |      |                 |                       |
- |     |      8.3     |      |             OpenBSD 5.1                 |
- |     |       |   Mac OS X  |                 |                       |
- |     |       |     10.8    |                 |                       |
- |     |       |      |   NetBSD 6.0           |                       |
- |     |       |      |      |             OpenBSD 5.2         DragonFly 3.2.1
- |  FreeBSD    |      |      |                 |                       |
- |    9.1      |      |      |                 |                       |
- |             |      |      |                 |                       |
- |             |      |      |            OpenBSD 5.3          DragonFly 3.4.1
- |             |      |   NetBSD 6.1           |                       |
+ |             \      |      | |    \          |                       |
+ |              |  Mac OS X  | |     \         |                       |
+ |              |    10.6    | |      \        |                       |
+ |              |     |      | |   NetBSD      |                DragonFly 2.4.0
+ |              |     |      | |    5.0.1  OpenBSD 4.6                 |
+ |              |     |      | |       |       |                       |
+ *--FreeBSD     |     |      | |       |       |                       |
+ |    8.0       |     |      | |       |       |                       |
+ |     |     FreeBSD  |      | |   NetBSD      |                       |
+ |     |       7.3    |      | |    5.0.2      |                DragonFly 2.6.0
+ |     |        |     |      | |           OpenBSD 4.7                 |
+ |  FreeBSD     |     |      | |               |                       |
+ |    8.1       |     |      | |               |                       |
+ |     |        |     |      | |               |                DragonFly 2.8.2
+ |     |        |     |      | |           OpenBSD 4.8                 |
+ |     |        |     |      | *--NetBSD       |                       |
+ |  FreeBSD  FreeBSD  |      | |    5.1        |                       |
+ |    8.2      7.4    |      | |      |        |               DragonFly 2.10.1
+ |     |              |      | |      |    OpenBSD 4.9                 |
+ |     `-----.     Mac OS X  | |      |        |                       |
+ |            \      10.7    | |      |        |                       |
+ |             |      |      | |      |    OpenBSD 5.0                 |
+ *--FreeBSD    |      |      | |      |        |                       |
+ |    9.0      |      |      | |   NetBSD      |               DragonFly 3.0.1
+ |     |    FreeBSD   |      | |    5.1.2      |                       |
+ |     |      8.3     |      | |           OpenBSD 5.1                 |
+ |     |       |   Mac OS X  | `----.          |                       |
+ |     |       |     10.8    |       \         |                       |
+ |     |       |      |   NetBSD 6.0  |        |                       |
+ |     |       |      |      | | |    |    OpenBSD 5.2         DragonFly 3.2.1
+ |  FreeBSD    |      |      | | | NetBSD      |                       |
+ |    9.1      |      |      | | |   5.2       |                       |
+ |             |      |      | |  \            |                       |
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.1      |                       |
+ |             |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.2      |                       |
+ |             |      |      | |               |                       |
+ |             |      |      |  `-NetBSD 6.1   |                       |
  |          FreeBSD   |      |                 |                       |
  |            8.4     |      |                 |                       |
  |                    |      |                 |                       |
+ |                    |      |                 |                       |
+ |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
  v                    v      v                 v                       v
@@ -565,9 +572,12 @@ Mac OS X 10.8		2012-07-25 [APL]
 NetBSD 6.0		2012-10-17 [NBD]
 OpenBSD 5.2		2012-11-01 [OBD]
 DragonFly 3.2.1		2012-11-02 [DFB]
+NetBSD 5.2		2012-12-03 [NBD]
+NetBSD 6.0.1		2012-12-26 [NBD] (security/critical release)
 FreeBSD 9.1		2012-12-30 [FBD]
 DragonFly 3.4.1		2013-04-29 [DFB]
 OpenBSD 5.3		2013-05-01 [OBD]
+NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
 NetBSD 6.1		2013-05-18 [NBD]
 FreeBSD 8.4		2013-06-07 [FBD]
 

From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 23:19:06 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3849293D;
 Tue, 11 Jun 2013 23:19:06 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 28673136F;
 Tue, 11 Jun 2013 23:19:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BNJ6Gc036172;
 Tue, 11 Jun 2013 23:19:06 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BNJ2Dn036152;
 Tue, 11 Jun 2013 23:19:02 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201306112319.r5BNJ2Dn036152@svn.freebsd.org>
From: "Kenneth D. Merry" 
Date: Tue, 11 Jun 2013 23:19:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251641 - in stable/9/sys: conf fs/nfs fs/nfsclient
 fs/nfsserver modules/nfsd modules/nfsserver nfs nfsserver
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Tue, 11 Jun 2013 23:19:06 -0000

Author: ken
Date: Tue Jun 11 23:19:02 2013
New Revision: 251641
URL: http://svnweb.freebsd.org/changeset/base/251641

Log:
  MFC NFS FHA changes 249592 and 249596:
  
    ------------------------------------------------------------------------
    r249592 | ken | 2013-04-17 15:00:22 -0600 (Wed, 17 Apr 2013) | 180 lines
  
    Revamp the old NFS server's File Handle Affinity (FHA) code so that
    it will work with either the old or new server.
  
    The FHA code keeps a cache of currently active file handles for
    NFSv2 and v3 requests, so that read and write requests for the same
    file are directed to the same group of threads (reads) or thread
    (writes).  It does not currently work for NFSv4 requests.  They are
    more complex, and will take more work to support.
  
    This improves read-ahead performance, especially with ZFS, if the
    FHA tuning parameters are configured appropriately.  Without the
    FHA code, concurrent reads that are part of a sequential read from
    a file will be directed to separate NFS threads.  This has the
    effect of confusing the ZFS zfetch (prefetch) code and makes
    sequential reads significantly slower with clients like Linux that
    do a lot of prefetching.
  
    The FHA code has also been updated to direct write requests to nearby
    file offsets to the same thread in the same way it batches reads,
    and the FHA code will now also send writes to multiple threads when
    needed.
  
    This improves sequential write performance in ZFS, because writes
    to a file are now more ordered.  Since NFS writes (generally
    less than 64K) are smaller than the typical ZFS record size
    (usually 128K), out of order NFS writes to the same block can
    trigger a read in ZFS.  Sending them down the same thread increases
    the odds of their being in order.
  
    In order for multiple write threads per file in the FHA code to be
    useful, writes in the NFS server have been changed to use a LK_SHARED
    vnode lock, and upgrade that to LK_EXCLUSIVE if the filesystem
    doesn't allow multiple writers to a file at once.  ZFS is currently
    the only filesystem that allows multiple writers to a file, because
    it has internal file range locking.  This change does not affect the
    NFSv4 code.
  
    This improves random write performance to a single file in ZFS, since
    we can now have multiple writers inside ZFS at one time.
  
    I have changed the default tuning parameters to a 22 bit (4MB)
    window size (from 256K) and unlimited commands per thread as a
    result of my benchmarking with ZFS.
  
    The FHA code has been updated to allow configuring the tuning
    parameters from loader tunable variables in addition to sysctl
    variables.  The read offset window calculation has been slightly
    modified as well.  Instead of having separate bins, each file
    handle has a rolling window of bin_shift size.  This minimizes
    glitches in throughput when shifting from one bin to another.
  
    sys/conf/files:
    	Add nfs_fha_new.c and nfs_fha_old.c.  Compile nfs_fha.c
    	when either the old or the new NFS server is built.
  
    sys/fs/nfs/nfsport.h,
    sys/fs/nfs/nfs_commonport.c:
    	Bring in changes from Rick Macklem to newnfs_realign that
    	allow it to operate in blocking (M_WAITOK) or non-blocking
    	(M_NOWAIT) mode.
  
    sys/fs/nfs/nfs_commonsubs.c,
    sys/fs/nfs/nfs_var.h:
    	Bring in a change from Rick Macklem to allow telling
    	nfsm_dissect() whether or not to wait for mallocs.
  
    sys/fs/nfs/nfsm_subs.h:
    	Bring in changes from Rick Macklem to create a new
    	nfsm_dissect_nonblock() inline function and
    	NFSM_DISSECT_NONBLOCK() macro.
  
    sys/fs/nfs/nfs_commonkrpc.c,
    sys/fs/nfsclient/nfs_clkrpc.c:
    	Add the malloc wait flag to a newnfs_realign() call.
  
    sys/fs/nfsserver/nfs_nfsdkrpc.c:
    	Setup the new NFS server's RPC thread pool so that it will
    	call the FHA code.
  
    	Add the malloc flag argument to newnfs_realign().
  
    	Unstaticize newnfs_nfsv3_procid[] so that we can use it in
    	the FHA code.
  
    sys/fs/nfsserver/nfs_nfsdsocket.c:
    	In nfsrvd_dorpc(), add NFSPROC_WRITE to the list of RPC types
    	that use the LK_SHARED lock type.
  
    sys/fs/nfsserver/nfs_nfsdport.c:
    	In nfsd_fhtovp(), if we're starting a write, check to see
    	whether the underlying filesystem supports shared writes.
    	If not, upgrade the lock type from LK_SHARED to LK_EXCLUSIVE.
  
    sys/nfsserver/nfs_fha.c:
    	Remove all code that is specific to the NFS server
    	implementation.  Anything that is server-specific is now
    	accessed through a callback supplied by that server's FHA
    	shim in the new softc.
  
    	There are now separate sysctls and tunables for the FHA
    	implementations for the old and new NFS servers.  The new
    	NFS server has its tunables under vfs.nfsd.fha, the old
    	NFS server's tunables are under vfs.nfsrv.fha as before.
  
    	In fha_extract_info(), use callouts for all server-specific
    	code.  Getting file handles and offsets is now done in the
    	individual server's shim module.
  
    	In fha_hash_entry_choose_thread(), change the way we decide
    	whether two reads are in proximity to each other.
    	Previously, the calculation was a simple shift operation to
    	see whether the offsets were in the same power of 2 bucket.
    	The issue was that there would be a bucket (and therefore
    	thread) transition, even if the reads were in close
    	proximity.  When there is a thread transition, reads wind
    	up going somewhat out of order, and ZFS gets confused.
  
    	The new calculation simply tries to see whether the offsets
    	are within 1 << bin_shift of each other.  If they are, the
    	reads will be sent to the same thread.
  
    	The effect of this change is that for sequential reads, if
    	the client doesn't exceed the max_reqs_per_nfsd parameter
    	and the bin_shift is set to a reasonable value (22, or
    	4MB works well in my tests), the reads in any sequential
    	stream will largely be confined to a single thread.
  
    	Change fha_assign() so that it takes a softc argument.  It
    	is now called from the individual server's shim code, which
    	will pass in the softc.
  
    	Change fhe_stats_sysctl() so that it takes a softc
    	parameter.  It is now called from the individual server's
    	shim code.  Add the current offset to the list of things
    	printed out about each active thread.
  
    	Change the num_reads and num_writes counters in the
    	fha_hash_entry structure to 32-bit values, and rename them
    	num_rw and num_exclusive, respectively, to reflect their
    	changed usage.
  
    	Add an enable sysctl and tunable that allows the user to
    	disable the FHA code (when vfs.XXX.fha.enable = 0).  This
    	is useful for before/after performance comparisons.
  
    nfs_fha.h:
    	Move most structure definitions out of nfs_fha.c and into
    	the header file, so that the individual server shims can
    	see them.
  
    	Change the default bin_shift to 22 (4MB) instead of 18
    	(256K).  Allow unlimited commands per thread.
  
    sys/nfsserver/nfs_fha_old.c,
    sys/nfsserver/nfs_fha_old.h,
    sys/fs/nfsserver/nfs_fha_new.c,
    sys/fs/nfsserver/nfs_fha_new.h:
    	Add shims for the old and new NFS servers to interface with
    	the FHA code, and callbacks for the
  
    	The shims contain all of the code and definitions that are
    	specific to the NFS servers.
  
    	They setup the server-specific callbacks and set the server
    	name for the sysctl and loader tunable variables.
  
    sys/nfsserver/nfs_srvkrpc.c:
    	Configure the RPC code to call fhaold_assign() instead of
    	fha_assign().
  
    sys/modules/nfsd/Makefile:
    	Add nfs_fha.c and nfs_fha_new.c.
  
    sys/modules/nfsserver/Makefile:
    	Add nfs_fha_old.c.
  
    Reviewed by:	rmacklem
    Sponsored by:	Spectra Logic
  
    ------------------------------------------------------------------------
    r249596 | ken | 2013-04-17 16:42:43 -0600 (Wed, 17 Apr 2013) | 7 lines
  
    Move the NFS FHA (File Handle Affinity) code from sys/nfsserver to
    sys/nfs, since it is now shared by the two NFS servers.
  
    Suggested by:	rmacklem
    Sponsored by:	Spectra Logic
    ------------------------------------------------------------------------
  
  Sponsored by:	Spectra Logic

Added:
  stable/9/sys/fs/nfsserver/nfs_fha_new.c
     - copied, changed from r249592, head/sys/fs/nfsserver/nfs_fha_new.c
  stable/9/sys/fs/nfsserver/nfs_fha_new.h
     - copied unchanged from r249592, head/sys/fs/nfsserver/nfs_fha_new.h
  stable/9/sys/nfs/nfs_fha.c
     - copied unchanged from r249596, head/sys/nfs/nfs_fha.c
  stable/9/sys/nfs/nfs_fha.h
     - copied unchanged from r249596, head/sys/nfs/nfs_fha.h
  stable/9/sys/nfsserver/nfs_fha_old.c
     - copied, changed from r249592, head/sys/nfsserver/nfs_fha_old.c
  stable/9/sys/nfsserver/nfs_fha_old.h
     - copied unchanged from r249592, head/sys/nfsserver/nfs_fha_old.h
Deleted:
  stable/9/sys/nfsserver/nfs_fha.c
  stable/9/sys/nfsserver/nfs_fha.h
Modified:
  stable/9/sys/conf/files
  stable/9/sys/fs/nfs/nfs_commonkrpc.c
  stable/9/sys/fs/nfs/nfs_commonport.c
  stable/9/sys/fs/nfs/nfs_commonsubs.c
  stable/9/sys/fs/nfs/nfs_var.h
  stable/9/sys/fs/nfs/nfsm_subs.h
  stable/9/sys/fs/nfs/nfsport.h
  stable/9/sys/fs/nfsclient/nfs_clkrpc.c
  stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c
  stable/9/sys/fs/nfsserver/nfs_nfsdport.c
  stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c
  stable/9/sys/modules/nfsd/Makefile
  stable/9/sys/modules/nfsserver/Makefile
  stable/9/sys/nfsserver/nfs_srvkrpc.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/conf/files
==============================================================================
--- stable/9/sys/conf/files	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/conf/files	Tue Jun 11 23:19:02 2013	(r251641)
@@ -2169,6 +2169,7 @@ fs/nfsclient/nfs_clvfsops.c	optional nfs
 fs/nfsclient/nfs_clport.c	optional nfscl
 fs/nfsclient/nfs_clbio.c	optional nfscl
 fs/nfsclient/nfs_clnfsiod.c	optional nfscl
+fs/nfsserver/nfs_fha_new.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsocket.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsubs.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdstate.c	optional nfsd inet
@@ -2991,6 +2992,7 @@ nfs/bootp_subr.c		optional bootp nfsclie
 nfs/krpc_subr.c			optional bootp nfsclient | bootp nfscl
 nfs/nfs_common.c		optional nfsclient | nfsserver
 nfs/nfs_diskless.c		optional nfsclient nfs_root | nfscl nfs_root
+nfs/nfs_fha.c			optional nfsserver | nfsd
 nfs/nfs_lock.c			optional nfsclient | nfscl | nfslockd | nfsd
 nfsclient/nfs_bio.c		optional nfsclient
 nfsclient/nfs_node.c		optional nfsclient
@@ -2999,7 +3001,7 @@ nfsclient/nfs_subs.c		optional nfsclient
 nfsclient/nfs_nfsiod.c		optional nfsclient
 nfsclient/nfs_vfsops.c		optional nfsclient
 nfsclient/nfs_vnops.c		optional nfsclient
-nfsserver/nfs_fha.c		optional nfsserver
+nfsserver/nfs_fha_old.c		optional nfsserver
 nfsserver/nfs_serv.c		optional nfsserver
 nfsserver/nfs_srvkrpc.c		optional nfsserver
 nfsserver/nfs_srvsubs.c		optional nfsserver

Modified: stable/9/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonkrpc.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfs_commonkrpc.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -771,7 +771,7 @@ tryagain:
 	 * These could cause pointer alignment problems, so copy them to
 	 * well aligned mbufs.
 	 */
-	newnfs_realign(&nd->nd_mrep);
+	newnfs_realign(&nd->nd_mrep, M_WAITOK);
 	nd->nd_md = nd->nd_mrep;
 	nd->nd_dpos = NFSMTOD(nd->nd_md, caddr_t);
 	nd->nd_repstat = 0;

Modified: stable/9/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonport.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfs_commonport.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -126,11 +126,11 @@ static int nfssvc_call(struct thread *, 
 /*
  * These architectures don't need re-alignment, so just return.
  */
-void
-newnfs_realign(struct mbuf **pm)
+int
+newnfs_realign(struct mbuf **pm, int how)
 {
 
-	return;
+	return (0);
 }
 #else	/* !__NO_STRICT_ALIGNMENT */
 /*
@@ -149,8 +149,8 @@ newnfs_realign(struct mbuf **pm)
  *	with TCP.  Use vfs.nfs.realign_count and realign_test to check this.
  *
  */
-void
-newnfs_realign(struct mbuf **pm)
+int
+newnfs_realign(struct mbuf **pm, int how)
 {
 	struct mbuf *m, *n;
 	int off, space;
@@ -167,11 +167,11 @@ newnfs_realign(struct mbuf **pm)
 			space = m_length(m, NULL);
 			if (space >= MINCLSIZE) {
 				/* NB: m_copyback handles space > MCLBYTES */
-				n = m_getcl(M_WAITOK, MT_DATA, 0);
+				n = m_getcl(how, MT_DATA, 0);
 			} else
-				n = m_get(M_WAITOK, MT_DATA);
+				n = m_get(how, MT_DATA);
 			if (n == NULL)
-				return;
+				return (ENOMEM);
 			/*
 			 * Align the remainder of the mbuf chain.
 			 */
@@ -189,6 +189,8 @@ newnfs_realign(struct mbuf **pm)
 		}
 		pm = &m->m_next;
 	}
+
+	return (0);
 }
 #endif	/* __NO_STRICT_ALIGNMENT */
 

Modified: stable/9/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonsubs.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfs_commonsubs.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -252,7 +252,7 @@ out:
  * cases.
  */
 APPLESTATIC void *
-nfsm_dissct(struct nfsrv_descript *nd, int siz)
+nfsm_dissct(struct nfsrv_descript *nd, int siz, int how)
 {
 	mbuf_t mp2;
 	int siz2, xfer;
@@ -277,7 +277,9 @@ nfsm_dissct(struct nfsrv_descript *nd, i
 	} else if (siz > ncl_mbuf_mhlen) {
 		panic("nfs S too big");
 	} else {
-		NFSMGET(mp2);
+		MGET(mp2, MT_DATA, how);
+		if (mp2 == NULL)
+			return (NULL);
 		mbuf_setnext(mp2, mbuf_next(nd->nd_md));
 		mbuf_setnext(nd->nd_md, mp2);
 		mbuf_setlen(nd->nd_md, mbuf_len(nd->nd_md) - left);

Modified: stable/9/sys/fs/nfs/nfs_var.h
==============================================================================
--- stable/9/sys/fs/nfs/nfs_var.h	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfs_var.h	Tue Jun 11 23:19:02 2013	(r251641)
@@ -232,7 +232,7 @@ int nfsm_strtom(struct nfsrv_descript *,
 int nfsm_mbufuio(struct nfsrv_descript *, struct uio *, int);
 int nfsm_fhtom(struct nfsrv_descript *, u_int8_t *, int, int);
 int nfsm_advance(struct nfsrv_descript *, int, int);
-void *nfsm_dissct(struct nfsrv_descript *, int);
+void *nfsm_dissct(struct nfsrv_descript *, int, int);
 void newnfs_trimleading(struct nfsrv_descript *);
 void newnfs_trimtrailing(struct nfsrv_descript *, mbuf_t,
     caddr_t);

Modified: stable/9/sys/fs/nfs/nfsm_subs.h
==============================================================================
--- stable/9/sys/fs/nfs/nfsm_subs.h	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfsm_subs.h	Tue Jun 11 23:19:02 2013	(r251641)
@@ -100,7 +100,23 @@ nfsm_dissect(struct nfsrv_descript *nd, 
 		retp = (void *)nd->nd_dpos; 
 		nd->nd_dpos += siz; 
 	} else { 
-		retp = nfsm_dissct(nd, siz); 
+		retp = nfsm_dissct(nd, siz, M_WAITOK); 
+	}
+	return (retp);
+}
+
+static __inline void *
+nfsm_dissect_nonblock(struct nfsrv_descript *nd, int siz)
+{
+	int tt1; 
+	void *retp;
+
+	tt1 = NFSMTOD(nd->nd_md, caddr_t) + nd->nd_md->m_len - nd->nd_dpos; 
+	if (tt1 >= siz) { 
+		retp = (void *)nd->nd_dpos; 
+		nd->nd_dpos += siz; 
+	} else { 
+		retp = nfsm_dissct(nd, siz, M_NOWAIT); 
 	}
 	return (retp);
 }
@@ -113,6 +129,15 @@ nfsm_dissect(struct nfsrv_descript *nd, 
 			goto nfsmout; 					\
 		}							\
 	} while (0)
+
+#define	NFSM_DISSECT_NONBLOCK(a, c, s) 					\
+	do {								\
+		(a) = (c)nfsm_dissect_nonblock(nd, (s));		\
+		if ((a) == NULL) { 					\
+			error = EBADRPC; 				\
+			goto nfsmout; 					\
+		}							\
+	} while (0)
 #endif	/* !APPLE */
 
 #define	NFSM_STRSIZ(s, m)  						\

Modified: stable/9/sys/fs/nfs/nfsport.h
==============================================================================
--- stable/9/sys/fs/nfs/nfsport.h	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfs/nfsport.h	Tue Jun 11 23:19:02 2013	(r251641)
@@ -730,7 +730,7 @@ MALLOC_DECLARE(M_NEWNFSDROLLBACK);
  */
 int nfscl_loadattrcache(struct vnode **, struct nfsvattr *, void *, void *,
     int, int);
-void newnfs_realign(struct mbuf **);
+int newnfs_realign(struct mbuf **, int);
 
 /*
  * If the port runs on an SMP box that can enforce Atomic ops with low

Modified: stable/9/sys/fs/nfsclient/nfs_clkrpc.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clkrpc.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfsclient/nfs_clkrpc.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -82,7 +82,7 @@ nfscb_program(struct svc_req *rqst, SVCX
 	 */
 	nd.nd_mrep = rqst->rq_args;
 	rqst->rq_args = NULL;
-	newnfs_realign(&nd.nd_mrep);
+	newnfs_realign(&nd.nd_mrep, M_WAITOK);
 	nd.nd_md = nd.nd_mrep;
 	nd.nd_dpos = mtod(nd.nd_md, caddr_t);
 	nd.nd_nam = svc_getrpccaller(rqst);

Copied and modified: stable/9/sys/fs/nfsserver/nfs_fha_new.c (from r249592, head/sys/fs/nfsserver/nfs_fha_new.c)
==============================================================================
--- head/sys/fs/nfsserver/nfs_fha_new.c	Wed Apr 17 21:00:22 2013	(r249592, copy source)
+++ stable/9/sys/fs/nfsserver/nfs_fha_new.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -30,11 +30,11 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 static void fhanew_init(void *foo);

Copied: stable/9/sys/fs/nfsserver/nfs_fha_new.h (from r249592, head/sys/fs/nfsserver/nfs_fha_new.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/sys/fs/nfsserver/nfs_fha_new.h	Tue Jun 11 23:19:02 2013	(r251641, copy of r249592, head/sys/fs/nfsserver/nfs_fha_new.h)
@@ -0,0 +1,39 @@
+/*-
+ * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
+ * Copyright (c) 2013 Spectra Logic Corporation
+ *
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/* $FreeBSD$ */
+
+#ifndef	_NFS_FHA_NEW_H
+#define	_NFS_FHA_NEW_H 1
+
+#ifdef	_KERNEL
+
+#define	FHANEW_SERVER_NAME	"nfsd"
+
+SVCTHREAD *fhanew_assign(SVCTHREAD *this_thread, struct svc_req *req);
+#endif /* _KERNEL */
+
+#endif /* _NFS_FHA_NEW_H */

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -42,6 +42,9 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
+#include 
+
 #include 
 
 NFSDLOCKMUTEX;
@@ -51,7 +54,7 @@ struct nfsv4lock nfsd_suspend_lock;
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
-static int newnfs_nfsv3_procid[NFS_V3NPROCS] = {
+int newnfs_nfsv3_procid[NFS_V3NPROCS] = {
 	NFSPROC_NULL,
 	NFSPROC_GETATTR,
 	NFSPROC_SETATTR,
@@ -147,7 +150,7 @@ nfssvc_program(struct svc_req *rqst, SVC
 	 */
 	nd.nd_mrep = rqst->rq_args;
 	rqst->rq_args = NULL;
-	newnfs_realign(&nd.nd_mrep);
+	newnfs_realign(&nd.nd_mrep, M_WAITOK);
 	nd.nd_md = nd.nd_mrep;
 	nd.nd_dpos = mtod(nd.nd_md, caddr_t);
 	nd.nd_nam = svc_getrpccaller(rqst);
@@ -491,8 +494,8 @@ nfsrvd_init(int terminating)
 
 	nfsrvd_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
 	nfsrvd_pool->sp_rcache = NULL;
-	nfsrvd_pool->sp_assign = NULL;
-	nfsrvd_pool->sp_done = NULL;
+	nfsrvd_pool->sp_assign = fhanew_assign;
+	nfsrvd_pool->sp_done = fha_nd_complete;
 
 	NFSD_LOCK();
 }

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdport.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdport.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -2707,9 +2707,11 @@ nfsd_fhtovp(struct nfsrv_descript *nd, s
 		goto out;
 	}
 
-	if (startwrite)
+	if (startwrite) {
 		vn_start_write(NULL, mpp, V_WAIT);
-
+		if (lktype == LK_SHARED && !(MNT_SHARED_WRITES(mp)))
+			lktype = LK_EXCLUSIVE;
+	}
 	nd->nd_repstat = nfsvno_fhtovp(mp, fhp, nd->nd_nam, lktype, vpp, exp,
 	    &credanon);
 	vfs_unbusy(mp);

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c	Tue Jun 11 23:19:02 2013	(r251641)
@@ -379,6 +379,7 @@ nfsrvd_dorpc(struct nfsrv_descript *nd, 
 				goto out;
 			}
 			if (nd->nd_procnum == NFSPROC_READ ||
+			    nd->nd_procnum == NFSPROC_WRITE ||
 			    nd->nd_procnum == NFSPROC_READDIR ||
 			    nd->nd_procnum == NFSPROC_READLINK ||
 			    nd->nd_procnum == NFSPROC_GETATTR ||

Modified: stable/9/sys/modules/nfsd/Makefile
==============================================================================
--- stable/9/sys/modules/nfsd/Makefile	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/modules/nfsd/Makefile	Tue Jun 11 23:19:02 2013	(r251641)
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../fs/nfsserver
+.PATH: ${.CURDIR}/../../fs/nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsd
 SRCS=	vnode_if.h \
+	nfs_fha.c \
+	nfs_fha_new.c \
 	nfs_nfsdserv.c \
 	nfs_nfsdcache.c \
 	nfs_nfsdkrpc.c \

Modified: stable/9/sys/modules/nfsserver/Makefile
==============================================================================
--- stable/9/sys/modules/nfsserver/Makefile	Tue Jun 11 21:47:16 2013	(r251640)
+++ stable/9/sys/modules/nfsserver/Makefile	Tue Jun 11 23:19:02 2013	(r251641)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../nfsserver
+.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver
 SRCS=	vnode_if.h \
-	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
+	nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
 	opt_mac.h \
 	opt_kgssapi.h \
 	opt_nfs.h

Copied: stable/9/sys/nfs/nfs_fha.c (from r249596, head/sys/nfs/nfs_fha.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/sys/nfs/nfs_fha.c	Tue Jun 11 23:19:02 2013	(r251641, copy of r249596, head/sys/nfs/nfs_fha.c)
@@ -0,0 +1,556 @@
+/*-
+ * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+static MALLOC_DEFINE(M_NFS_FHA, "NFS FHA", "NFS FHA");
+
+/*
+ * XXX need to commonize definitions between old and new NFS code.  Define
+ * this here so we don't include one nfsproto.h over the other.
+ */
+#define	NFS_PROG		100003
+
+void
+fha_init(struct fha_params *softc)
+{
+	char tmpstr[128];
+
+	/*
+	 * A small hash table to map filehandles to fha_hash_entry
+	 * structures.
+	 */
+	softc->g_fha.hashtable = hashinit(256, M_NFS_FHA,
+	    &softc->g_fha.hashmask);
+
+	/*
+	 * Set the default tuning parameters.
+	 */
+	softc->ctls.enable = FHA_DEF_ENABLE;
+	softc->ctls.bin_shift = FHA_DEF_BIN_SHIFT;
+	softc->ctls.max_nfsds_per_fh = FHA_DEF_MAX_NFSDS_PER_FH;
+	softc->ctls.max_reqs_per_nfsd = FHA_DEF_MAX_REQS_PER_NFSD;
+
+	/*
+	 * Allow the user to override the defaults at boot time with
+	 * tunables.
+	 */
+	snprintf(tmpstr, sizeof(tmpstr), "vfs.%s.fha.enable",
+	    softc->server_name);
+	TUNABLE_INT_FETCH(tmpstr, &softc->ctls.enable);
+	snprintf(tmpstr, sizeof(tmpstr), "vfs.%s.fha.bin_shift",
+	    softc->server_name);
+	TUNABLE_INT_FETCH(tmpstr, &softc->ctls.bin_shift);
+	snprintf(tmpstr, sizeof(tmpstr), "vfs.%s.fha.max_nfsds_per_fh",
+	    softc->server_name);
+	TUNABLE_INT_FETCH(tmpstr, &softc->ctls.max_nfsds_per_fh);
+	snprintf(tmpstr, sizeof(tmpstr), "vfs.%s.fha.max_reqs_per_nfsd",
+	    softc->server_name);
+	TUNABLE_INT_FETCH(tmpstr, &softc->ctls.max_reqs_per_nfsd);
+
+	/*
+	 * Add sysctls so the user can change the tuning parameters at
+	 * runtime.
+	 */
+	SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
+	    OID_AUTO, "enable", CTLFLAG_RW,
+	    &softc->ctls.enable, 0, "Enable NFS File Handle Affinity (FHA)");
+
+	SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
+	    OID_AUTO, "bin_shift", CTLFLAG_RW,
+	    &softc->ctls.bin_shift, 0, "For FHA reads, no two requests will "
+	    "contend if they're 2^(bin_shift) bytes apart");
+
+	SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
+	    OID_AUTO, "max_nfsds_per_fh", CTLFLAG_RW,
+	    &softc->ctls.max_nfsds_per_fh, 0, "Maximum nfsd threads that "
+	    "should be working on requests for the same file handle");
+
+	SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
+	    OID_AUTO, "max_reqs_per_nfsd", CTLFLAG_RW,
+	    &softc->ctls.max_reqs_per_nfsd, 0, "Maximum requests that "
+	    "single nfsd thread should be working on at any time");
+
+	SYSCTL_ADD_OID(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
+	    OID_AUTO, "fhe_stats", CTLTYPE_STRING | CTLFLAG_RD, 0, 0,
+	    softc->callbacks.fhe_stats_sysctl, "A", "");
+
+}
+
+void
+fha_uninit(struct fha_params *softc)
+{
+	sysctl_ctx_free(&softc->sysctl_ctx);
+	hashdestroy(softc->g_fha.hashtable, M_NFS_FHA, softc->g_fha.hashmask);
+}
+
+/*
+ * This just specifies that offsets should obey affinity when within
+ * the same 1Mbyte (1<<20) chunk for the file (reads only for now).
+ */
+static void
+fha_extract_info(struct svc_req *req, struct fha_info *i,
+    struct fha_callbacks *cb)
+{
+	struct mbuf *md;
+	fhandle_t fh;
+	caddr_t dpos;
+	static u_int64_t random_fh = 0;
+	int error;
+	int v3 = (req->rq_vers == 3);
+	rpcproc_t procnum;
+
+	/*
+	 * We start off with a random fh.  If we get a reasonable
+	 * procnum, we set the fh.  If there's a concept of offset
+	 * that we're interested in, we set that.
+	 */
+	i->fh = ++random_fh;
+	i->offset = 0;
+	i->locktype = LK_EXCLUSIVE;
+
+	/*
+	 * Extract the procnum and convert to v3 form if necessary,
+	 * taking care to deal with out-of-range procnums.  Caller will
+	 * ensure that rq_vers is either 2 or 3.
+	 */
+	procnum = req->rq_proc;
+	if (!v3) {
+		rpcproc_t tmp_procnum;
+
+		tmp_procnum = cb->get_procnum(procnum);
+		if (tmp_procnum == -1)
+			goto out;
+		procnum = tmp_procnum;
+	}
+
+	/*
+	 * We do affinity for most.  However, we divide a realm of affinity
+	 * by file offset so as to allow for concurrent random access.  We
+	 * only do this for reads today, but this may change when IFS supports
+	 * efficient concurrent writes.
+	 */
+	if (cb->no_offset(procnum))
+		goto out;
+
+	error = cb->realign(&req->rq_args, M_NOWAIT);
+	if (error)
+		goto out;
+	md = req->rq_args;
+	dpos = mtod(md, caddr_t);
+
+	/* Grab the filehandle. */
+	error = cb->get_fh(&fh, v3, &md, &dpos);
+	if (error)
+		goto out;
+
+	bcopy(fh.fh_fid.fid_data, &i->fh, sizeof(i->fh));
+
+	/* Content ourselves with zero offset for all but reads. */
+	if (cb->is_read(procnum) || cb->is_write(procnum))
+		cb->get_offset(&md, &dpos, v3, i);
+
+out:
+	cb->set_locktype(procnum, i);
+}
+
+static struct fha_hash_entry *
+fha_hash_entry_new(u_int64_t fh)
+{
+	struct fha_hash_entry *e;
+
+	e = malloc(sizeof(*e), M_NFS_FHA, M_WAITOK);
+	e->fh = fh;
+	e->num_rw = 0;
+	e->num_exclusive = 0;
+	e->num_threads = 0;
+	LIST_INIT(&e->threads);
+
+	return (e);
+}
+
+static void
+fha_hash_entry_destroy(struct fha_hash_entry *e)
+{
+
+	if (e->num_rw + e->num_exclusive)
+		panic("nonempty fhe");
+	free(e, M_NFS_FHA);
+}
+
+static void
+fha_hash_entry_remove(struct fha_hash_entry *e)
+{
+
+	LIST_REMOVE(e, link);
+	fha_hash_entry_destroy(e);
+}
+
+static struct fha_hash_entry *
+fha_hash_entry_lookup(struct fha_params *softc, u_int64_t fh)
+{
+	SVCPOOL *pool;
+
+	pool = *softc->pool;
+
+	struct fha_hash_entry *fhe, *new_fhe;
+
+	LIST_FOREACH(fhe, &softc->g_fha.hashtable[fh % softc->g_fha.hashmask],
+	    link)
+		if (fhe->fh == fh)
+			break;
+
+	if (!fhe) {
+		/* Allocate a new entry. */
+		mtx_unlock(&pool->sp_lock);
+		new_fhe = fha_hash_entry_new(fh);
+		mtx_lock(&pool->sp_lock);
+
+		/* Double-check to make sure we still need the new entry. */
+		LIST_FOREACH(fhe,
+		    &softc->g_fha.hashtable[fh % softc->g_fha.hashmask], link)
+			if (fhe->fh == fh)
+				break;
+		if (!fhe) {
+			fhe = new_fhe;
+			LIST_INSERT_HEAD(
+			    &softc->g_fha.hashtable[fh % softc->g_fha.hashmask],
+			    fhe, link);
+		} else
+			fha_hash_entry_destroy(new_fhe);
+	}
+
+	return (fhe);
+}
+
+static void
+fha_hash_entry_add_thread(struct fha_hash_entry *fhe, SVCTHREAD *thread)
+{
+
+	LIST_INSERT_HEAD(&fhe->threads, thread, st_alink);
+	fhe->num_threads++;
+}
+
+static void
+fha_hash_entry_remove_thread(struct fha_hash_entry *fhe, SVCTHREAD *thread)
+{
+
+	LIST_REMOVE(thread, st_alink);
+	fhe->num_threads--;
+}
+
+/*
+ * Account for an ongoing operation associated with this file.
+ */
+static void
+fha_hash_entry_add_op(struct fha_hash_entry *fhe, int locktype, int count)
+{
+
+	if (LK_EXCLUSIVE == locktype)
+		fhe->num_exclusive += count;
+	else
+		fhe->num_rw += count;
+}
+
+static SVCTHREAD *
+get_idle_thread(SVCPOOL *pool)
+{
+	SVCTHREAD *st;
+
+	LIST_FOREACH(st, &pool->sp_idlethreads, st_ilink) {
+		if (st->st_xprt == NULL && STAILQ_EMPTY(&st->st_reqs))
+			return (st);
+	}
+	return (NULL);
+}
+
+
+/*
+ * Get the service thread currently associated with the fhe that is
+ * appropriate to handle this operation.
+ */
+SVCTHREAD *
+fha_hash_entry_choose_thread(struct fha_params *softc,
+    struct fha_hash_entry *fhe, struct fha_info *i, SVCTHREAD *this_thread);
+
+SVCTHREAD *
+fha_hash_entry_choose_thread(struct fha_params *softc,
+    struct fha_hash_entry *fhe, struct fha_info *i, SVCTHREAD *this_thread)
+{
+	SVCTHREAD *thread, *min_thread = NULL;
+	SVCPOOL *pool;
+	int req_count, min_count = 0;
+	off_t offset1, offset2;
+
+	pool = *softc->pool;
+
+	LIST_FOREACH(thread, &fhe->threads, st_alink) {
+		req_count = thread->st_reqcount;
+
+		/* If there are any writes in progress, use the first thread. */
+		if (fhe->num_exclusive) {
+#if 0
+			ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+			    "fha: %p(%d)w", thread, req_count);
+#endif
+			return (thread);
+		}
+
+		/*
+		 * Check for read locality, making sure that we won't
+		 * exceed our per-thread load limit in the process.
+		 */
+		offset1 = i->offset;
+		offset2 = STAILQ_FIRST(&thread->st_reqs)->rq_p3;
+
+		if (((offset1 >= offset2)
+		  && ((offset1 - offset2) < (1 << softc->ctls.bin_shift)))
+		 || ((offset2 > offset1)
+		  && ((offset2 - offset1) < (1 << softc->ctls.bin_shift)))) {
+			if ((softc->ctls.max_reqs_per_nfsd == 0) ||
+			    (req_count < softc->ctls.max_reqs_per_nfsd)) {
+#if 0
+				ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+				    "fha: %p(%d)r", thread, req_count);
+#endif
+				return (thread);
+			}
+		}
+
+		/*
+		 * We don't have a locality match, so skip this thread,
+		 * but keep track of the most attractive thread in case
+		 * we need to come back to it later.
+		 */
+#if 0
+		ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+		    "fha: %p(%d)s off1 %llu off2 %llu", thread,
+		    req_count, offset1, offset2);
+#endif
+		if ((min_thread == NULL) || (req_count < min_count)) {
+			min_count = req_count;
+			min_thread = thread;
+		}
+	}
+
+	/*
+	 * We didn't find a good match yet.  See if we can add
+	 * a new thread to this file handle entry's thread list.
+	 */
+	if ((softc->ctls.max_nfsds_per_fh == 0) ||
+	    (fhe->num_threads < softc->ctls.max_nfsds_per_fh)) {
+		/*
+		 * We can add a new thread, so try for an idle thread
+		 * first, and fall back to this_thread if none are idle.
+		 */
+		if (STAILQ_EMPTY(&this_thread->st_reqs)) {
+			thread = this_thread;
+#if 0
+			ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+			    "fha: %p(%d)t", thread, thread->st_reqcount);
+#endif
+		} else if ((thread = get_idle_thread(pool))) {
+#if 0
+			ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+			    "fha: %p(%d)i", thread, thread->st_reqcount);
+#endif
+		} else {
+			thread = this_thread;
+#if 0
+			ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO,
+			    "fha: %p(%d)b", thread, thread->st_reqcount);
+#endif
+		}
+		fha_hash_entry_add_thread(fhe, thread);
+	} else {
+		/*
+		 * We don't want to use any more threads for this file, so
+		 * go back to the most attractive nfsd we're already using.
+		 */
+		thread = min_thread;
+	}
+
+	return (thread);
+}
+
+/*
+ * After getting a request, try to assign it to some thread.  Usually we
+ * handle it ourselves.
+ */
+SVCTHREAD *
+fha_assign(SVCTHREAD *this_thread, struct svc_req *req,
+    struct fha_params *softc)
+{
+	SVCPOOL *pool;
+	SVCTHREAD *thread;
+	struct fha_info i;
+	struct fha_hash_entry *fhe;
+	struct fha_callbacks *cb;
+
+	cb = &softc->callbacks;
+
+	/* Check to see whether we're enabled. */
+	if (softc->ctls.enable == 0)
+		return (this_thread);
+
+	/*
+	 * Only do placement if this is an NFS request.
+	 */
+	if (req->rq_prog != NFS_PROG)
+		return (this_thread);
+
+	if (req->rq_vers != 2 && req->rq_vers != 3)
+		return (this_thread);
+
+	pool = req->rq_xprt->xp_pool;
+	fha_extract_info(req, &i, cb);
+
+	/*
+	 * We save the offset associated with this request for later
+	 * nfsd matching.
+	 */
+	fhe = fha_hash_entry_lookup(softc, i.fh);
+	req->rq_p1 = fhe;
+	req->rq_p2 = i.locktype;
+	req->rq_p3 = i.offset;
+
+	/*
+	 * Choose a thread, taking into consideration locality, thread load,
+	 * and the number of threads already working on this file.
+	 */
+	thread = fha_hash_entry_choose_thread(softc, fhe, &i, this_thread);
+	KASSERT(thread, ("fha_assign: NULL thread!"));
+	fha_hash_entry_add_op(fhe, i.locktype, 1);
+
+	return (thread);
+}
+
+/*
+ * Called when we're done with an operation.  The request has already
+ * been de-queued.
+ */
+void
+fha_nd_complete(SVCTHREAD *thread, struct svc_req *req)
+{
+	struct fha_hash_entry *fhe = req->rq_p1;
+
+	/*
+	 * This may be called for reqs that didn't go through
+	 * fha_assign (e.g. extra NULL ops used for RPCSEC_GSS.
+	 */
+	if (!fhe)
+		return;
+
+	fha_hash_entry_add_op(fhe, req->rq_p2, -1);
+
+	if (thread->st_reqcount == 0) {
+		fha_hash_entry_remove_thread(fhe, thread);
+		if (0 == fhe->num_rw + fhe->num_exclusive)
+			fha_hash_entry_remove(fhe);
+	}
+}
+
+int
+fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc)
+{
+	int error, count, i;
+	struct sbuf sb;
+	struct fha_hash_entry *fhe;
+	bool_t first = TRUE;
+	SVCTHREAD *thread;
+	SVCPOOL *pool;
+
+	sbuf_new(&sb, NULL, 4096, SBUF_FIXEDLEN);
+
+	pool = NULL;
+
+	if (!*softc->pool) {
+		sbuf_printf(&sb, "NFSD not running\n");
+		goto out;
+	}
+	pool = *softc->pool;
+
+	mtx_lock(&pool->sp_lock);
+	count = 0;
+	for (i = 0; i <= softc->g_fha.hashmask; i++)
+		if (!LIST_EMPTY(&softc->g_fha.hashtable[i]))
+			count++;
+
+	if (count == 0) {
+		sbuf_printf(&sb, "No file handle entries.\n");
+		goto out;
+	}
+
+	for (i = 0; i <= softc->g_fha.hashmask; i++) {
+		LIST_FOREACH(fhe, &softc->g_fha.hashtable[i], link) {
+			sbuf_printf(&sb, "%sfhe %p: {\n", first ? "" : ", ", fhe);
+
+			sbuf_printf(&sb, "    fh: %ju\n", (uintmax_t) fhe->fh);
+			sbuf_printf(&sb, "    num_rw: %d\n", fhe->num_rw);
+			sbuf_printf(&sb, "    num_exclusive: %d\n", fhe->num_exclusive);
+			sbuf_printf(&sb, "    num_threads: %d\n", fhe->num_threads);
+
+			LIST_FOREACH(thread, &fhe->threads, st_alink) {
+				sbuf_printf(&sb, "    thread %p offset %ju "
+				    "(count %d)\n", thread,
+				    STAILQ_FIRST(&thread->st_reqs)->rq_p3,
+				    thread->st_reqcount);
+			}
+
+			sbuf_printf(&sb, "}");
+			first = FALSE;
+
+			/* Limit the output. */
+			if (++count > 128) {
+				sbuf_printf(&sb, "...");
+				break;
+			}
+		}
+	}
+
+ out:
+	if (pool)
+		mtx_unlock(&pool->sp_lock);
+	sbuf_trim(&sb);
+	sbuf_finish(&sb);
+	error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);
+	sbuf_delete(&sb);
+	return (error);
+}

Copied: stable/9/sys/nfs/nfs_fha.h (from r249596, head/sys/nfs/nfs_fha.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/sys/nfs/nfs_fha.h	Tue Jun 11 23:19:02 2013	(r251641, copy of r249596, head/sys/nfs/nfs_fha.h)
@@ -0,0 +1,112 @@
+/*-
+ * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/* $FreeBSD$ */
+
+#ifndef	_NFS_FHA_H
+#define	_NFS_FHA_H 1
+
+#ifdef	_KERNEL
+
+/* Sysctl defaults. */
+#define FHA_DEF_ENABLE			1
+#define FHA_DEF_BIN_SHIFT		22 /* 4MB */
+#define FHA_DEF_MAX_NFSDS_PER_FH	8
+#define FHA_DEF_MAX_REQS_PER_NFSD	0  /* Unlimited */
+
+/* This is the global structure that represents the state of the fha system. */
+struct fha_global {
+	struct fha_hash_entry_list *hashtable;
+	u_long hashmask;
+};
+
+struct fha_ctls {
+	int	 enable;
+	uint32_t bin_shift;
+	uint32_t max_nfsds_per_fh;
+	uint32_t max_reqs_per_nfsd;
+};
+
+/*
+ * These are the entries in the filehandle hash.  They talk about a specific
+ * file, requests against which are being handled by one or more nfsds.  We
+ * keep a chain of nfsds against the file. We only have more than one if reads
+ * are ongoing, and then only if the reads affect disparate regions of the
+ * file.
+ *
+ * In general, we want to assign a new request to an existing nfsd if it is
+ * going to contend with work happening already on that nfsd, or if the
+ * operation is a read and the nfsd is already handling a proximate read.  We
+ * do this to avoid jumping around in the read stream unnecessarily, and to
+ * avoid contention between threads over single files.
+ */
+struct fha_hash_entry {
+	LIST_ENTRY(fha_hash_entry) link;
+	u_int64_t fh;
+	u_int32_t num_rw;
+	u_int32_t num_exclusive;
+	u_int8_t num_threads;
+	struct svcthread_list threads;
+};
+
+LIST_HEAD(fha_hash_entry_list, fha_hash_entry);
+
+/* A structure used for passing around data internally. */
+struct fha_info {
+	u_int64_t fh;
+	off_t offset;
+	int locktype;
+};
+
+struct fha_callbacks {
+	rpcproc_t (*get_procnum)(rpcproc_t procnum);
+	int (*realign)(struct mbuf **mb, int malloc_flags);
+	int (*get_fh)(fhandle_t *fh, int v3, struct mbuf **md, caddr_t *dpos);
+	int (*is_read)(rpcproc_t procnum);
+	int (*is_write)(rpcproc_t procnum);
+	int (*get_offset)(struct mbuf **md, caddr_t *dpos, int v3, struct
+			  fha_info *info);
+	int (*no_offset)(rpcproc_t procnum);
+	void (*set_locktype)(rpcproc_t procnum, struct fha_info *info);
+	int (*fhe_stats_sysctl)(SYSCTL_HANDLER_ARGS);
+};
+
+struct fha_params {
+	struct fha_global g_fha; 
+	struct sysctl_ctx_list sysctl_ctx;
+	struct sysctl_oid *sysctl_tree;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 00:33:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 58A02249;
 Wed, 12 Jun 2013 00:33:31 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4A8FE1734;
 Wed, 12 Jun 2013 00:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C0XV1C060199;
 Wed, 12 Jun 2013 00:33:31 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C0XVp1060198;
 Wed, 12 Jun 2013 00:33:31 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306120033.r5C0XVp1060198@svn.freebsd.org>
From: Xin LI 
Date: Wed, 12 Jun 2013 00:33:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251642 - stable/9/rescue/rescue
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 00:33:31 -0000

Author: delphij
Date: Wed Jun 12 00:33:30 2013
New Revision: 251642
URL: http://svnweb.freebsd.org/changeset/base/251642

Log:
  MFC r250626:
  
  Add less to rescue build.

Modified:
  stable/9/rescue/rescue/Makefile
Directory Properties:
  stable/9/rescue/rescue/   (props changed)

Modified: stable/9/rescue/rescue/Makefile
==============================================================================
--- stable/9/rescue/rescue/Makefile	Tue Jun 11 23:19:02 2013	(r251641)
+++ stable/9/rescue/rescue/Makefile	Wed Jun 12 00:33:30 2013	(r251642)
@@ -190,6 +190,9 @@ CRUNCH_PROGS_usr.bin+= bzip2
 CRUNCH_ALIAS_bzip2= bunzip2 bzcat
 CRUNCH_LIBS+= -lbz2
 
+CRUNCH_PROGS_usr.bin+= less
+CRUNCH_ALIAS_less= more
+
 CRUNCH_PROGS_usr.bin+= xz
 CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
 CRUNCH_LIBS+= -llzma

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 00:39:14 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D6F913ED;
 Wed, 12 Jun 2013 00:39:14 +0000 (UTC)
 (envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
 [211.29.132.53])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A65C1757;
 Wed, 12 Jun 2013 00:39:13 +0000 (UTC)
Received: from c122-106-156-23.carlnfd1.nsw.optusnet.com.au
 (c122-106-156-23.carlnfd1.nsw.optusnet.com.au [122.106.156.23])
 by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id 1750CD40D31;
 Wed, 12 Jun 2013 10:39:07 +1000 (EST)
Date: Wed, 12 Jun 2013 10:39:06 +1000 (EST)
From: Bruce Evans 
X-X-Sender: bde@besplex.bde.org
To: John Baldwin 
Subject: Re: svn commit: r251630 - head/usr.bin/top
In-Reply-To: <201306111905.r5BJ5TGv055136@svn.freebsd.org>
Message-ID: <20130612094322.T966@besplex.bde.org>
References: <201306111905.r5BJ5TGv055136@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.0 cv=K8x6hFqI c=1 sm=1 a=zP_2p2BGIC4A:10
 a=kj9zAlcOel0A:10 a=PO7r1zJSAAAA:8 a=JzwRw_2MAAAA:8 a=6Djc_KAXMDkA:10
 a=O-ir2R5c2G3AhLcHeosA:9 a=CjuIK1q_8ugA:10 a=ebeQFi2P/qHVC0Yw9JDJ4g==:117
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 00:39:14 -0000

On Tue, 11 Jun 2013, John Baldwin wrote:

> Log:
>  Bump the CPU/WCPU column width by one so that it fits values from 100% up
>  to 999.99% CPU.  It still won't be aligned if you have a multithreaded
>  process using more than 1000% CPU (e.g. idle process on an idle 12-way
>  system), but 100% is a common case.
>
>  Submitted by:	Jeremy Chadwick (partial)
>  MFC after:	1 week

There was a negative amount of space available for expansion.  The COMMAND
field was down to 7 columns.  Just enough to not truncate its own name.
top doesn't support much window sizing.  It doesn't support the COLUMNS
environment variable, and its non-interactive output still truncates the
COMMAND column by formatting for 80-column terminals.  OTOH, systat
makes a mess of the screen when COLUMNS is set to a non-physical value,
since it uses full curses.

ps has similar bugs.  ps l still has 15 columns for COMMAND, but ps
doesn't remove path prefixes like top does, so command names like
/usr/libexec/getty were shifted out of the screen/window long ago.

systat handles this problem to some extent using special format routines
that switch the format if the default one wouldn't fit.  IIRC, it handles
the rare case of 100.0% idle by switching the format to 100%.  It has to
do more complicated switches for numeric values that can range from 0 to
millions and need to be displayed in 3 or 4 columns.

While here, I will complain about someone breaking ruptime using a grossly
large fixed-width field for the machine name.  Other field widths (just
the time?) can vary, so sometimes (after several days of uptime?) the full
width is 80 columns so it wraps especially horribly on 80-column terminals
with auto-wrap.

There is plenty of space to spare in ruptime.  I thought that top had
dynamic sizing for its USERNAME column, but on freefall now this column
is very wide.  There is just one long name in it ("auditdistd") and
several unnecessary spaces even for that.  This accounts for all of the
8 lost columns in its COMMAND field compared with my local system.

Also, vmstat -i was broken for some arches by right-padding interrupt
names with spaces.  vmstat doesn't understand the spaces, so its
autosizing of the name column has no effect (it uses strlen() to
determine the maximum width needed, but strlen() counts the spaces).

top's dynamic sizing seems to be broken in a different way by its naive
use of strlen().  It seems to search the entire password database to
find the longest name according to strlen().  It takes the minimum of
the result of this and either SMPUNAMELEN = 13 or UPNAMELEN = 15.
It also has a lower limit of 8 (so the field has space for its own
name, unlike COMMAND now) and an option TOP_USERNAME_LEN to change
the lower limit.  On a system with many users, the search wastes time
searching the password database for a value that will always be larger
than 15.  Someone will have a long name.  If the system allowed, then
jokers would right-pad their names with spaces to confuse utilties.

The magic difference of 2 between SMPNAMELEN and UPNAMELEN seems to
be broken too.  I think the C field width used to be 2 and this difference
allowed for its addition by stealing space from the USERNAME field.
But now there are systems with more than 9 cores and the C field width
is 3.

User names should be truncated to width TOP_USERNAME_LEN (default 8).
They are much less important than command names.  If you want dynamic
sizing and slowness, search all active usernames and all active
command names to find the best combination of widths on every refresh.

Bruce

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 06:01:55 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9143E4CB;
 Wed, 12 Jun 2013 06:01:55 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 73ADC116A;
 Wed, 12 Jun 2013 06:01:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C61sEv063780;
 Wed, 12 Jun 2013 06:01:54 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C61su5063777;
 Wed, 12 Jun 2013 06:01:54 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306120601.r5C61su5063777@svn.freebsd.org>
From: Adrian Chadd 
Date: Wed, 12 Jun 2013 06:01:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251643 - head/sys/dev/ath/ath_hal/ar9002
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 06:01:55 -0000

Author: adrian
Date: Wed Jun 12 06:01:53 2013
New Revision: 251643
URL: http://svnweb.freebsd.org/changeset/base/251643

Log:
  Remove the AR9285 specific structure for LNA diversity and use the HAL.
  
  The AR9300 HAL update included the LNA diversity configuration information
  so it can be used in the AR9485 configuration code.

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
  head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
  head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c	Wed Jun 12 00:33:30 2013	(r251642)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c	Wed Jun 12 06:01:53 2013	(r251643)
@@ -59,16 +59,16 @@ ath_is_alt_ant_ratio_better(int alt_rati
 
 static void
 ath_lnaconf_alt_good_scan(struct ar9285_ant_comb *antcomb,
-    struct ar9285_antcomb_conf ant_conf, int main_rssi_avg)
+    HAL_ANT_COMB_CONFIG *ant_conf, int main_rssi_avg)
 {
 	antcomb->quick_scan_cnt = 0;
 
-	if (ant_conf.main_lna_conf == HAL_ANT_DIV_COMB_LNA2)
+	if (ant_conf->main_lna_conf == HAL_ANT_DIV_COMB_LNA2)
 		antcomb->rssi_lna2 = main_rssi_avg;
-	else if (ant_conf.main_lna_conf == HAL_ANT_DIV_COMB_LNA1)
+	else if (ant_conf->main_lna_conf == HAL_ANT_DIV_COMB_LNA1)
 		antcomb->rssi_lna1 = main_rssi_avg;
 
-	switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
+	switch ((ant_conf->main_lna_conf << 4) | ant_conf->alt_lna_conf) {
 	case (0x10): /* LNA2 A-B */
 		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
 		antcomb->first_quick_scan_conf =
@@ -114,7 +114,7 @@ ath_lnaconf_alt_good_scan(struct ar9285_
 
 static void
 ath_select_ant_div_from_quick_scan(struct ar9285_ant_comb *antcomb,
-    struct ar9285_antcomb_conf *div_ant_conf, int main_rssi_avg,
+    HAL_ANT_COMB_CONFIG *div_ant_conf, int main_rssi_avg,
     int alt_rssi_avg, int alt_ratio)
 {
 	/* alt_good */
@@ -312,7 +312,7 @@ ath_select_ant_div_from_quick_scan(struc
 }
 
 static void
-ath_ant_div_conf_fast_divbias(struct ar9285_antcomb_conf *ant_conf)
+ath_ant_div_conf_fast_divbias(HAL_ANT_COMB_CONFIG *ant_conf)
 {
 	/* Adjust the fast_div_bias based on main and alt lna conf */
 	switch ((ant_conf->main_lna_conf << 4) | ant_conf->alt_lna_conf) {
@@ -362,7 +362,7 @@ void
 ar9285_ant_comb_scan(struct ath_hal *ah, struct ath_rx_status *rs,
     unsigned long ticks, int hz)
 {
-	struct ar9285_antcomb_conf div_ant_conf;
+	HAL_ANT_COMB_CONFIG div_ant_conf;
 	struct ar9285_ant_comb *antcomb = &AH9285(ah)->ant_comb;
 	int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
 	int curr_main_set, curr_bias;
@@ -431,6 +431,7 @@ ar9285_ant_comb_scan(struct ath_hal *ah,
 				 antcomb->total_pkt_count);
 	}
 
+	OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf));
 	ar9285_antdiv_comb_conf_get(ah, &div_ant_conf);
 	curr_alt_set = div_ant_conf.alt_lna_conf;
 	curr_main_set = div_ant_conf.main_lna_conf;
@@ -440,7 +441,7 @@ ar9285_ant_comb_scan(struct ath_hal *ah,
 
 	if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
 		if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-			ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
+			ath_lnaconf_alt_good_scan(antcomb, &div_ant_conf,
 						  main_rssi_avg);
 			antcomb->alt_good = AH_TRUE;
 		} else {

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun 12 00:33:30 2013	(r251642)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun 12 06:01:53 2013	(r251643)
@@ -40,8 +40,7 @@
 #include "ar9002/ar9285_phy.h"
 
 void
-ar9285_antdiv_comb_conf_get(struct ath_hal *ah,
-    struct ar9285_antcomb_conf *antconf)
+ar9285_antdiv_comb_conf_get(struct ath_hal *ah, HAL_ANT_COMB_CONFIG *antconf)
 {
 	uint32_t regval;
 
@@ -55,8 +54,7 @@ ar9285_antdiv_comb_conf_get(struct ath_h
 }
 
 void
-ar9285_antdiv_comb_conf_set(struct ath_hal *ah,
-    struct ar9285_antcomb_conf *antconf)
+ar9285_antdiv_comb_conf_set(struct ath_hal *ah, HAL_ANT_COMB_CONFIG *antconf)
 {
 	uint32_t regval;
 

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h	Wed Jun 12 00:33:30 2013	(r251642)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h	Wed Jun 12 06:01:53 2013	(r251643)
@@ -31,16 +31,11 @@
 /*
  * Manipulate AR9285 antenna diversity configuration
  */
-struct ar9285_antcomb_conf {
-	uint8_t main_lna_conf;
-	uint8_t alt_lna_conf;
-	uint8_t fast_div_bias;
-};
 
 extern	void ar9285_antdiv_comb_conf_set(struct ath_hal *ah,
-		struct ar9285_antcomb_conf *antconf);
+		HAL_ANT_COMB_CONFIG *antconf);
 extern	void ar9285_antdiv_comb_conf_get(struct ath_hal *ah,
-		struct ar9285_antcomb_conf *antconf);
+		HAL_ANT_COMB_CONFIG *antconf);
 extern	HAL_BOOL ar9285_check_div_comb(struct ath_hal *ah);
 
 #endif

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 06:56:18 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 115F8119;
 Wed, 12 Jun 2013 06:56:18 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 019C0139E;
 Wed, 12 Jun 2013 06:56:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C6uHfx080218;
 Wed, 12 Jun 2013 06:56:17 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C6uGDe080208;
 Wed, 12 Jun 2013 06:56:16 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306120656.r5C6uGDe080208@svn.freebsd.org>
From: Xin LI 
Date: Wed, 12 Jun 2013 06:56:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251644 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zfs
 vendor/illumos/dist/cmd/zhack vendor/illumos/dist/cmd/ztest...
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 06:56:18 -0000

Author: delphij
Date: Wed Jun 12 06:56:15 2013
New Revision: 251644
URL: http://svnweb.freebsd.org/changeset/base/251644

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14052:1a272fe1337b
  
  Illumos ZFS issues:
    3740 Poor ZFS send / receive performance due to snapshot
         hold / release processing

Modified:
  vendor/illumos/dist/cmd/zfs/zfs_main.c
  vendor/illumos/dist/cmd/zhack/zhack.c
  vendor/illumos/dist/cmd/ztest/ztest.c
  vendor/illumos/dist/lib/libzfs/common/libzfs.h
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
  vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_userhold.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Modified: vendor/illumos/dist/cmd/zfs/zfs_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zfs/zfs_main.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/cmd/zfs/zfs_main.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2012 Milan Jurik. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland.  All rights reserved.
  */
 
 #include 
@@ -5164,8 +5165,7 @@ zfs_do_hold_rele_impl(int argc, char **a
 			continue;
 		}
 		if (holding) {
-			if (zfs_hold(zhp, delim+1, tag, recursive,
-			    B_FALSE, -1) != 0)
+			if (zfs_hold(zhp, delim+1, tag, recursive, -1) != 0)
 				++errors;
 		} else {
 			if (zfs_release(zhp, delim+1, tag, recursive) != 0)

Modified: vendor/illumos/dist/cmd/zhack/zhack.c
==============================================================================
--- vendor/illumos/dist/cmd/zhack/zhack.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/cmd/zhack/zhack.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -153,7 +154,7 @@ import_pool(const char *target, boolean_
 	g_importargs.poolname = g_pool;
 	pools = zpool_search_import(g_zfs, &g_importargs);
 
-	if (pools == NULL || nvlist_next_nvpair(pools, NULL) == NULL) {
+	if (nvlist_empty(pools)) {
 		if (!g_importargs.can_be_active) {
 			g_importargs.can_be_active = B_TRUE;
 			if (zpool_search_import(g_zfs, &g_importargs) != NULL ||

Modified: vendor/illumos/dist/cmd/ztest/ztest.c
==============================================================================
--- vendor/illumos/dist/cmd/ztest/ztest.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/cmd/ztest/ztest.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -22,6 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -4711,7 +4712,7 @@ ztest_dmu_snapshot_hold(ztest_ds_t *zd, 
 
 	error = user_release_one(fullname, tag);
 	if (error)
-		fatal(0, "user_release_one(%s)", fullname, tag);
+		fatal(0, "user_release_one(%s, %s) = %d", fullname, tag, error);
 
 	VERIFY3U(dmu_objset_hold(fullname, FTAG, &origin), ==, ENOENT);
 

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs.h
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs.h	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs.h	Wed Jun 12 06:56:15 2013	(r251644)
@@ -24,6 +24,7 @@
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #ifndef	_LIBZFS_H
@@ -594,7 +595,8 @@ extern int zfs_send(zfs_handle_t *, cons
 
 extern int zfs_promote(zfs_handle_t *);
 extern int zfs_hold(zfs_handle_t *, const char *, const char *,
-    boolean_t, boolean_t, int);
+    boolean_t, int);
+extern int zfs_hold_nvl(zfs_handle_t *, int, nvlist_t *);
 extern int zfs_release(zfs_handle_t *, const char *, const char *, boolean_t);
 extern int zfs_get_holds(zfs_handle_t *, nvlist_t **);
 extern uint64_t zvol_volsize_to_reservation(uint64_t, nvlist_t *);

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2013 Martin Matuska. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -3104,18 +3105,14 @@ static int
 zfs_check_snap_cb(zfs_handle_t *zhp, void *arg)
 {
 	struct destroydata *dd = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, dd->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name))
 		verify(nvlist_add_boolean(dd->nvl, name) == 0);
-		zfs_close(szhp);
-	}
 
 	rv = zfs_iter_filesystems(zhp, zfs_check_snap_cb, dd);
 	zfs_close(zhp);
@@ -3135,7 +3132,7 @@ zfs_destroy_snaps(zfs_handle_t *zhp, cha
 	verify(nvlist_alloc(&dd.nvl, NV_UNIQUE_NAME, 0) == 0);
 	(void) zfs_check_snap_cb(zfs_handle_dup(zhp), &dd);
 
-	if (nvlist_next_nvpair(dd.nvl, NULL) == NULL) {
+	if (nvlist_empty(dd.nvl)) {
 		ret = zfs_standard_error_fmt(zhp->zfs_hdl, ENOENT,
 		    dgettext(TEXT_DOMAIN, "cannot destroy '%s@%s'"),
 		    zhp->zfs_name, snapname);
@@ -3160,7 +3157,7 @@ zfs_destroy_snaps_nvl(libzfs_handle_t *h
 	if (ret == 0)
 		return (0);
 
-	if (nvlist_next_nvpair(errlist, NULL) == NULL) {
+	if (nvlist_empty(errlist)) {
 		char errbuf[1024];
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN, "cannot destroy snapshots"));
@@ -4082,18 +4079,14 @@ static int
 zfs_hold_one(zfs_handle_t *zhp, void *arg)
 {
 	struct holdarg *ha = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, ha->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name))
 		fnvlist_add_string(ha->nvl, name, ha->tag);
-		zfs_close(szhp);
-	}
 
 	if (ha->recursive)
 		rv = zfs_iter_filesystems(zhp, zfs_hold_one, ha);
@@ -4103,14 +4096,10 @@ zfs_hold_one(zfs_handle_t *zhp, void *ar
 
 int
 zfs_hold(zfs_handle_t *zhp, const char *snapname, const char *tag,
-    boolean_t recursive, boolean_t enoent_ok, int cleanup_fd)
+    boolean_t recursive, int cleanup_fd)
 {
 	int ret;
 	struct holdarg ha;
-	nvlist_t *errors;
-	libzfs_handle_t *hdl = zhp->zfs_hdl;
-	char errbuf[1024];
-	nvpair_t *elem;
 
 	ha.nvl = fnvlist_alloc();
 	ha.snapname = snapname;
@@ -4118,26 +4107,44 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	ha.recursive = recursive;
 	(void) zfs_hold_one(zfs_handle_dup(zhp), &ha);
 
-	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+	if (nvlist_empty(ha.nvl)) {
+		char errbuf[1024];
+
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
-		if (!enoent_ok) {
-			(void) snprintf(errbuf, sizeof (errbuf),
-			    dgettext(TEXT_DOMAIN,
-			    "cannot hold snapshot '%s@%s'"),
-			    zhp->zfs_name, snapname);
-			(void) zfs_standard_error(hdl, ret, errbuf);
-		}
+		(void) snprintf(errbuf, sizeof (errbuf),
+		    dgettext(TEXT_DOMAIN,
+		    "cannot hold snapshot '%s@%s'"),
+		    zhp->zfs_name, snapname);
+		(void) zfs_standard_error(zhp->zfs_hdl, ret, errbuf);
 		return (ret);
 	}
 
-	ret = lzc_hold(ha.nvl, cleanup_fd, &errors);
+	ret = zfs_hold_nvl(zhp, cleanup_fd, ha.nvl);
 	fnvlist_free(ha.nvl);
 
-	if (ret == 0)
+	return (ret);
+}
+
+int
+zfs_hold_nvl(zfs_handle_t *zhp, int cleanup_fd, nvlist_t *holds)
+{
+	int ret;
+	nvlist_t *errors;
+	libzfs_handle_t *hdl = zhp->zfs_hdl;
+	char errbuf[1024];
+	nvpair_t *elem;
+
+	errors = NULL;
+	ret = lzc_hold(holds, cleanup_fd, &errors);
+
+	if (ret == 0) {
+		/* There may be errors even in the success case. */
+		fnvlist_free(errors);
 		return (0);
+	}
 
-	if (nvlist_next_nvpair(errors, NULL) == NULL) {
+	if (nvlist_empty(errors)) {
 		/* no hold-specific errors */
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN, "cannot hold"));
@@ -4177,10 +4184,6 @@ zfs_hold(zfs_handle_t *zhp, const char *
 		case EEXIST:
 			(void) zfs_error(hdl, EZFS_REFTAG_HOLD, errbuf);
 			break;
-		case ENOENT:
-			if (enoent_ok)
-				return (ENOENT);
-			/* FALLTHROUGH */
 		default:
 			(void) zfs_standard_error(hdl,
 			    fnvpair_value_int32(elem), errbuf);
@@ -4191,30 +4194,21 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	return (ret);
 }
 
-struct releasearg {
-	nvlist_t *nvl;
-	const char *snapname;
-	const char *tag;
-	boolean_t recursive;
-};
-
 static int
 zfs_release_one(zfs_handle_t *zhp, void *arg)
 {
 	struct holdarg *ha = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, ha->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name)) {
 		nvlist_t *holds = fnvlist_alloc();
 		fnvlist_add_boolean(holds, ha->tag);
 		fnvlist_add_nvlist(ha->nvl, name, holds);
-		zfs_close(szhp);
+		fnvlist_free(holds);
 	}
 
 	if (ha->recursive)
@@ -4229,7 +4223,7 @@ zfs_release(zfs_handle_t *zhp, const cha
 {
 	int ret;
 	struct holdarg ha;
-	nvlist_t *errors;
+	nvlist_t *errors = NULL;
 	nvpair_t *elem;
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
 	char errbuf[1024];
@@ -4240,7 +4234,7 @@ zfs_release(zfs_handle_t *zhp, const cha
 	ha.recursive = recursive;
 	(void) zfs_release_one(zfs_handle_dup(zhp), &ha);
 
-	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+	if (nvlist_empty(ha.nvl)) {
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
 		(void) snprintf(errbuf, sizeof (errbuf),
@@ -4254,10 +4248,13 @@ zfs_release(zfs_handle_t *zhp, const cha
 	ret = lzc_release(ha.nvl, &errors);
 	fnvlist_free(ha.nvl);
 
-	if (ret == 0)
+	if (ret == 0) {
+		/* There may be errors even in the success case. */
+		fnvlist_free(errors);
 		return (0);
+	}
 
-	if (nvlist_next_nvpair(errors, NULL) == NULL) {
+	if (nvlist_empty(errors)) {
 		/* no hold-specific errors */
 		(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
 		    "cannot release"));

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -793,6 +794,7 @@ typedef struct send_dump_data {
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
+	nvlist_t *snapholds;
 	avl_tree_t *fsavl;
 	snapfilter_cb_t *filter_cb;
 	void *filter_cb_arg;
@@ -942,41 +944,19 @@ dump_ioctl(zfs_handle_t *zhp, const char
 	return (0);
 }
 
-static int
-hold_for_send(zfs_handle_t *zhp, send_dump_data_t *sdd)
+static void
+gather_holds(zfs_handle_t *zhp, send_dump_data_t *sdd)
 {
-	zfs_handle_t *pzhp;
-	int error = 0;
-	char *thissnap;
-
 	assert(zhp->zfs_type == ZFS_TYPE_SNAPSHOT);
 
-	if (sdd->dryrun)
-		return (0);
-
 	/*
-	 * zfs_send() only opens a cleanup_fd for sends that need it,
+	 * zfs_send() only sets snapholds for sends that need them,
 	 * e.g. replication and doall.
 	 */
-	if (sdd->cleanup_fd == -1)
-		return (0);
-
-	thissnap = strchr(zhp->zfs_name, '@') + 1;
-	*(thissnap - 1) = '\0';
-	pzhp = zfs_open(zhp->zfs_hdl, zhp->zfs_name, ZFS_TYPE_DATASET);
-	*(thissnap - 1) = '@';
-
-	/*
-	 * It's OK if the parent no longer exists.  The send code will
-	 * handle that error.
-	 */
-	if (pzhp) {
-		error = zfs_hold(pzhp, thissnap, sdd->holdtag,
-		    B_FALSE, B_TRUE, sdd->cleanup_fd);
-		zfs_close(pzhp);
-	}
+	if (sdd->snapholds == NULL)
+		return;
 
-	return (error);
+	fnvlist_add_string(sdd->snapholds, zhp->zfs_name, sdd->holdtag);
 }
 
 static void *
@@ -1032,28 +1012,23 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 	send_dump_data_t *sdd = arg;
 	progress_arg_t pa = { 0 };
 	pthread_t tid;
-
 	char *thissnap;
 	int err;
 	boolean_t isfromsnap, istosnap, fromorigin;
 	boolean_t exclude = B_FALSE;
 
+	err = 0;
 	thissnap = strchr(zhp->zfs_name, '@') + 1;
 	isfromsnap = (sdd->fromsnap != NULL &&
 	    strcmp(sdd->fromsnap, thissnap) == 0);
 
 	if (!sdd->seenfrom && isfromsnap) {
-		err = hold_for_send(zhp, sdd);
-		if (err == 0) {
-			sdd->seenfrom = B_TRUE;
-			(void) strcpy(sdd->prevsnap, thissnap);
-			sdd->prevsnap_obj = zfs_prop_get_int(zhp,
-			    ZFS_PROP_OBJSETID);
-		} else if (err == ENOENT) {
-			err = 0;
-		}
+		gather_holds(zhp, sdd);
+		sdd->seenfrom = B_TRUE;
+		(void) strcpy(sdd->prevsnap, thissnap);
+		sdd->prevsnap_obj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
 		zfs_close(zhp);
-		return (err);
+		return (0);
 	}
 
 	if (sdd->seento || !sdd->seenfrom) {
@@ -1104,14 +1079,7 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 		return (0);
 	}
 
-	err = hold_for_send(zhp, sdd);
-	if (err) {
-		if (err == ENOENT)
-			err = 0;
-		zfs_close(zhp);
-		return (err);
-	}
-
+	gather_holds(zhp, sdd);
 	fromorigin = sdd->prevsnap[0] == '\0' &&
 	    (sdd->fromorigin || sdd->replicate);
 
@@ -1379,7 +1347,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	avl_tree_t *fsavl = NULL;
 	static uint64_t holdseq;
 	int spa_version;
-	pthread_t tid;
+	pthread_t tid = 0;
 	int pipefd[2];
 	dedup_arg_t dda = { 0 };
 	int featureflags = 0;
@@ -1452,11 +1420,8 @@ zfs_send(zfs_handle_t *zhp, const char *
 				*debugnvp = hdrnv;
 			else
 				nvlist_free(hdrnv);
-			if (err) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
+			if (err)
 				goto stderr_out;
-			}
 		}
 
 		if (!flags->dryrun) {
@@ -1480,8 +1445,6 @@ zfs_send(zfs_handle_t *zhp, const char *
 			}
 			free(packbuf);
 			if (err == -1) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
 				err = errno;
 				goto stderr_out;
 			}
@@ -1492,8 +1455,6 @@ zfs_send(zfs_handle_t *zhp, const char *
 			drr.drr_u.drr_end.drr_checksum = zc;
 			err = write(outfd, &drr, sizeof (drr));
 			if (err == -1) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
 				err = errno;
 				goto stderr_out;
 			}
@@ -1505,7 +1466,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	/* dump each stream */
 	sdd.fromsnap = fromsnap;
 	sdd.tosnap = tosnap;
-	if (flags->dedup)
+	if (tid != 0)
 		sdd.outfd = pipefd[0];
 	else
 		sdd.outfd = outfd;
@@ -1542,36 +1503,71 @@ zfs_send(zfs_handle_t *zhp, const char *
 			err = errno;
 			goto stderr_out;
 		}
+		sdd.snapholds = fnvlist_alloc();
 	} else {
 		sdd.cleanup_fd = -1;
+		sdd.snapholds = NULL;
 	}
-	if (flags->verbose) {
+	if (flags->verbose || sdd.snapholds != NULL) {
 		/*
 		 * Do a verbose no-op dry run to get all the verbose output
-		 * before generating any data.  Then do a non-verbose real
-		 * run to generate the streams.
+		 * or to gather snapshot hold's before generating any data,
+		 * then do a non-verbose real run to generate the streams.
 		 */
 		sdd.dryrun = B_TRUE;
 		err = dump_filesystems(zhp, &sdd);
-		sdd.dryrun = flags->dryrun;
-		sdd.verbose = B_FALSE;
-		if (flags->parsable) {
-			(void) fprintf(stderr, "size\t%llu\n",
-			    (longlong_t)sdd.size);
-		} else {
-			char buf[16];
-			zfs_nicenum(sdd.size, buf, sizeof (buf));
-			(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
-			    "total estimated size is %s\n"), buf);
+
+		if (err != 0)
+			goto stderr_out;
+
+		if (flags->verbose) {
+			if (flags->parsable) {
+				(void) fprintf(stderr, "size\t%llu\n",
+				    (longlong_t)sdd.size);
+			} else {
+				char buf[16];
+				zfs_nicenum(sdd.size, buf, sizeof (buf));
+				(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+				    "total estimated size is %s\n"), buf);
+			}
+		}
+
+		/* Ensure no snaps found is treated as an error. */
+		if (!sdd.seento) {
+			err = ENOENT;
+			goto err_out;
 		}
+
+		/* Skip the second run if dryrun was requested. */
+		if (flags->dryrun)
+			goto err_out;
+
+		if (sdd.snapholds != NULL) {
+			err = zfs_hold_nvl(zhp, sdd.cleanup_fd, sdd.snapholds);
+			if (err != 0)
+				goto stderr_out;
+
+			fnvlist_free(sdd.snapholds);
+			sdd.snapholds = NULL;
+		}
+
+		sdd.dryrun = B_FALSE;
+		sdd.verbose = B_FALSE;
 	}
+
 	err = dump_filesystems(zhp, &sdd);
 	fsavl_destroy(fsavl);
 	nvlist_free(fss);
 
-	if (flags->dedup) {
-		(void) close(pipefd[0]);
+	/* Ensure no snaps found is treated as an error. */
+	if (err == 0 && !sdd.seento)
+		err = ENOENT;
+
+	if (tid != 0) {
+		if (err != 0)
+			(void) pthread_cancel(tid);
 		(void) pthread_join(tid, NULL);
+		(void) close(pipefd[0]);
 	}
 
 	if (sdd.cleanup_fd != -1) {
@@ -1599,9 +1595,13 @@ zfs_send(zfs_handle_t *zhp, const char *
 stderr_out:
 	err = zfs_standard_error(zhp->zfs_hdl, err, errbuf);
 err_out:
+	fsavl_destroy(fsavl);
+	nvlist_free(fss);
+	fnvlist_free(sdd.snapholds);
+
 	if (sdd.cleanup_fd != -1)
 		VERIFY(0 == close(sdd.cleanup_fd));
-	if (flags->dedup) {
+	if (tid != 0) {
 		(void) pthread_cancel(tid);
 		(void) pthread_join(tid, NULL);
 		(void) close(pipefd[0]);

Modified: vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -254,8 +255,11 @@ lzc_snapshot(nvlist_t *snaps, nvlist_t *
  * marked for deferred destruction, and will be destroyed when the last hold
  * or clone is removed/destroyed.
  *
+ * The return value will be ENOENT if none of the snapshots existed.
+ *
  * The return value will be 0 if all snapshots were destroyed (or marked for
- * later destruction if 'defer' is set) or didn't exist to begin with.
+ * later destruction if 'defer' is set) or didn't exist to begin with and
+ * at least one snapshot was destroyed.
  *
  * Otherwise the return value will be the errno of a (unspecified) snapshot
  * that failed, no snapshots will be destroyed, and the errlist will have an
@@ -286,7 +290,6 @@ lzc_destroy_snaps(nvlist_t *snaps, boole
 	nvlist_free(args);
 
 	return (error);
-
 }
 
 int
@@ -346,11 +349,22 @@ lzc_exists(const char *dataset)
  * uncleanly, the holds will be released when the pool is next opened
  * or imported.
  *
- * The return value will be 0 if all holds were created. Otherwise the return
- * value will be the errno of a (unspecified) hold that failed, no holds will
- * be created, and the errlist will have an entry for each hold that
- * failed (name = snapshot).  The value in the errlist will be the error
- * code (int32).
+ * Holds for snapshots which don't exist will be skipped and have an entry
+ * added to errlist, but will not cause an overall failure, except in the
+ * case that all holds where skipped.
+ *
+ * The return value will be ENOENT if none of the snapshots for the requested
+ * holds existed.
+ *
+ * The return value will be 0 if the nvl holds was empty or all holds, for
+ * snapshots that existed, were succesfully created and at least one hold
+ * was created.
+ *
+ * Otherwise the return value will be the errno of a (unspecified) hold that
+ * failed and no holds will be created.
+ *
+ * In all cases the errlist will have an entry for each hold that failed
+ * (name = snapshot), with its value being the error code (int32).
  */
 int
 lzc_hold(nvlist_t *holds, int cleanup_fd, nvlist_t **errlist)
@@ -387,11 +401,20 @@ lzc_hold(nvlist_t *holds, int cleanup_fd
  * The snapshots must all be in the same pool.
  * The value is a nvlist whose keys are the holds to remove.
  *
- * The return value will be 0 if all holds were removed.
- * Otherwise the return value will be the errno of a (unspecified) release
- * that failed, no holds will be released, and the errlist will have an
- * entry for each snapshot that has failed releases (name = snapshot).
- * The value in the errlist will be the error code (int32) of a failed release.
+ * Holds which failed to release because they didn't exist will have an entry
+ * added to errlist, but will not cause an overall failure, except in the
+ * case that all releases where skipped.
+ *
+ * The return value will be ENOENT if none of the specified holds existed.
+ *
+ * The return value will be 0 if the nvl holds was empty or all holds that
+ * existed, were successfully removed and at least one hold was removed.
+ *
+ * Otherwise the return value will be the errno of a (unspecified) hold that
+ * failed to release and no holds will be released.
+ *
+ * In all cases the errlist will have an entry for each hold that failed to
+ * to release.
  */
 int
 lzc_release(nvlist_t *holds, nvlist_t **errlist)

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 06:56:19 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 010FF11C;
 Wed, 12 Jun 2013 06:56:18 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D69B513A0;
 Wed, 12 Jun 2013 06:56:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C6uIkp080230;
 Wed, 12 Jun 2013 06:56:18 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C6uHNK080223;
 Wed, 12 Jun 2013 06:56:17 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306120656.r5C6uHNK080223@svn.freebsd.org>
From: Xin LI 
Date: Wed, 12 Jun 2013 06:56:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251644 - vendor-sys/illumos/dist/uts/common/fs/zfs
 vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zfs
 vendor/illumos/dist/cmd/zhack vendor/illumos/dist/cmd/ztest...
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 06:56:19 -0000

Author: delphij
Date: Wed Jun 12 06:56:15 2013
New Revision: 251644
URL: http://svnweb.freebsd.org/changeset/base/251644

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 14052:1a272fe1337b
  
  Illumos ZFS issues:
    3740 Poor ZFS send / receive performance due to snapshot
         hold / release processing

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_userhold.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/zfs/zfs_main.c
  vendor/illumos/dist/cmd/zhack/zhack.c
  vendor/illumos/dist/cmd/ztest/ztest.c
  vendor/illumos/dist/lib/libzfs/common/libzfs.h
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
  vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -127,6 +128,10 @@ dsl_destroy_snapshot_check(void *arg, dm
 	pair = nvlist_next_nvpair(dsda->dsda_errlist, NULL);
 	if (pair != NULL)
 		return (fnvpair_value_int32(pair));
+
+	if (nvlist_empty(dsda->dsda_successful_snaps))
+		return (SET_ERROR(ENOENT));
+
 	return (0);
 }
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -836,23 +837,34 @@ dsl_pool_clean_tmp_userrefs(dsl_pool_t *
 	zap_cursor_t zc;
 	objset_t *mos = dp->dp_meta_objset;
 	uint64_t zapobj = dp->dp_tmp_userrefs_obj;
+	nvlist_t *holds;
 
 	if (zapobj == 0)
 		return;
 	ASSERT(spa_version(dp->dp_spa) >= SPA_VERSION_USERREFS);
 
+	holds = fnvlist_alloc();
+
 	for (zap_cursor_init(&zc, mos, zapobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    zap_cursor_advance(&zc)) {
 		char *htag;
-		uint64_t dsobj;
+		nvlist_t *tags;
 
 		htag = strchr(za.za_name, '-');
 		*htag = '\0';
 		++htag;
-		dsobj = strtonum(za.za_name, NULL);
-		dsl_dataset_user_release_tmp(dp, dsobj, htag);
+		if (nvlist_lookup_nvlist(holds, za.za_name, &tags) != 0) {
+			tags = fnvlist_alloc();
+			fnvlist_add_boolean(tags, htag);
+			fnvlist_add_nvlist(holds, za.za_name, tags);
+			fnvlist_free(tags);
+		} else {
+			fnvlist_add_boolean(tags, htag);
+		}
 	}
+	dsl_dataset_user_release_tmp(dp, holds);
+	fnvlist_free(holds);
 	zap_cursor_fini(&zc);
 }
 

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -37,6 +38,7 @@
 
 typedef struct dsl_dataset_user_hold_arg {
 	nvlist_t *dduha_holds;
+	nvlist_t *dduha_chkholds;
 	nvlist_t *dduha_errlist;
 	minor_t dduha_minor;
 } dsl_dataset_user_hold_arg_t;
@@ -53,25 +55,24 @@ dsl_dataset_user_hold_check_one(dsl_data
 	objset_t *mos = dp->dp_meta_objset;
 	int error = 0;
 
+	ASSERT(dsl_pool_config_held(dp));
+
 	if (strlen(htag) > MAXNAMELEN)
-		return (E2BIG);
+		return (SET_ERROR(E2BIG));
 	/* Tempholds have a more restricted length */
 	if (temphold && strlen(htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
-		return (E2BIG);
+		return (SET_ERROR(E2BIG));
 
 	/* tags must be unique (if ds already exists) */
-	if (ds != NULL) {
-		mutex_enter(&ds->ds_lock);
-		if (ds->ds_phys->ds_userrefs_obj != 0) {
-			uint64_t value;
-			error = zap_lookup(mos, ds->ds_phys->ds_userrefs_obj,
-			    htag, 8, 1, &value);
-			if (error == 0)
-				error = SET_ERROR(EEXIST);
-			else if (error == ENOENT)
-				error = 0;
-		}
-		mutex_exit(&ds->ds_lock);
+	if (ds != NULL && ds->ds_phys->ds_userrefs_obj != 0) {
+		uint64_t value;
+
+		error = zap_lookup(mos, ds->ds_phys->ds_userrefs_obj,
+		    htag, 8, 1, &value);
+		if (error == 0)
+			error = SET_ERROR(EEXIST);
+		else if (error == ENOENT)
+			error = 0;
 	}
 
 	return (error);
@@ -82,52 +83,67 @@ dsl_dataset_user_hold_check(void *arg, d
 {
 	dsl_dataset_user_hold_arg_t *dduha = arg;
 	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
-	int rv = 0;
 
 	if (spa_version(dp->dp_spa) < SPA_VERSION_USERREFS)
 		return (SET_ERROR(ENOTSUP));
 
-	for (pair = nvlist_next_nvpair(dduha->dduha_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
-		int error = 0;
+	if (!dmu_tx_is_syncing(tx))
+		return (0);
+
+	for (nvpair_t *pair = nvlist_next_nvpair(dduha->dduha_holds, NULL);
+	    pair != NULL; pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
 		dsl_dataset_t *ds;
-		char *htag;
+		int error = 0;
+		char *htag, *name;
 
 		/* must be a snapshot */
-		if (strchr(nvpair_name(pair), '@') == NULL)
+		name = nvpair_name(pair);
+		if (strchr(name, '@') == NULL)
 			error = SET_ERROR(EINVAL);
 
 		if (error == 0)
 			error = nvpair_value_string(pair, &htag);
-		if (error == 0) {
-			error = dsl_dataset_hold(dp,
-			    nvpair_name(pair), FTAG, &ds);
-		}
+
+		if (error == 0)
+			error = dsl_dataset_hold(dp, name, FTAG, &ds);
+
 		if (error == 0) {
 			error = dsl_dataset_user_hold_check_one(ds, htag,
 			    dduha->dduha_minor != 0, tx);
 			dsl_dataset_rele(ds, FTAG);
 		}
 
-		if (error != 0) {
-			rv = error;
-			fnvlist_add_int32(dduha->dduha_errlist,
-			    nvpair_name(pair), error);
+		if (error == 0) {
+			fnvlist_add_string(dduha->dduha_chkholds, name, htag);
+		} else {
+			/*
+			 * We register ENOENT errors so they can be correctly
+			 * reported if needed, such as when all holds fail.
+			 */
+			fnvlist_add_int32(dduha->dduha_errlist, name, error);
+			if (error != ENOENT)
+				return (error);
 		}
 	}
-	return (rv);
+
+	/* Return ENOENT if no holds would be created. */
+	if (nvlist_empty(dduha->dduha_chkholds))
+		return (SET_ERROR(ENOENT));
+
+	return (0);
 }
 
-void
-dsl_dataset_user_hold_sync_one(dsl_dataset_t *ds, const char *htag,
-    minor_t minor, uint64_t now, dmu_tx_t *tx)
+
+static void
+dsl_dataset_user_hold_sync_one_impl(nvlist_t *tmpholds, dsl_dataset_t *ds,
+    const char *htag, minor_t minor, uint64_t now, dmu_tx_t *tx)
 {
 	dsl_pool_t *dp = ds->ds_dir->dd_pool;
 	objset_t *mos = dp->dp_meta_objset;
 	uint64_t zapobj;
 
-	mutex_enter(&ds->ds_lock);
+	ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+
 	if (ds->ds_phys->ds_userrefs_obj == 0) {
 		/*
 		 * This is the first user hold for this dataset.  Create
@@ -140,14 +156,26 @@ dsl_dataset_user_hold_sync_one(dsl_datas
 		zapobj = ds->ds_phys->ds_userrefs_obj;
 	}
 	ds->ds_userrefs++;
-	mutex_exit(&ds->ds_lock);
 
 	VERIFY0(zap_add(mos, zapobj, htag, 8, 1, &now, tx));
 
 	if (minor != 0) {
+		char name[MAXNAMELEN];
+		nvlist_t *tags;
+
 		VERIFY0(dsl_pool_user_hold(dp, ds->ds_object,
 		    htag, now, tx));
-		dsl_register_onexit_hold_cleanup(ds, htag, minor);
+		(void) snprintf(name, sizeof (name), "%llx",
+		    (u_longlong_t)ds->ds_object);
+
+		if (nvlist_lookup_nvlist(tmpholds, name, &tags) != 0) {
+			tags = fnvlist_alloc();
+			fnvlist_add_boolean(tags, htag);
+			fnvlist_add_nvlist(tmpholds, name, tags);
+			fnvlist_free(tags);
+		} else {
+			fnvlist_add_boolean(tags, htag);
+		}
 	}
 
 	spa_history_log_internal_ds(ds, "hold", tx,
@@ -155,140 +183,296 @@ dsl_dataset_user_hold_sync_one(dsl_datas
 	    htag, minor != 0, ds->ds_userrefs);
 }
 
+typedef struct zfs_hold_cleanup_arg {
+	char zhca_spaname[MAXNAMELEN];
+	uint64_t zhca_spa_load_guid;
+	nvlist_t *zhca_holds;
+} zfs_hold_cleanup_arg_t;
+
+static void
+dsl_dataset_user_release_onexit(void *arg)
+{
+	zfs_hold_cleanup_arg_t *ca = arg;
+	spa_t *spa;
+	int error;
+
+	error = spa_open(ca->zhca_spaname, &spa, FTAG);
+	if (error != 0) {
+		zfs_dbgmsg("couldn't release holds on pool=%s "
+		    "because pool is no longer loaded",
+		    ca->zhca_spaname);
+		return;
+	}
+	if (spa_load_guid(spa) != ca->zhca_spa_load_guid) {
+		zfs_dbgmsg("couldn't release holds on pool=%s "
+		    "because pool is no longer loaded (guid doesn't match)",
+		    ca->zhca_spaname);
+		spa_close(spa, FTAG);
+		return;
+	}
+
+	(void) dsl_dataset_user_release_tmp(spa_get_dsl(spa), ca->zhca_holds);
+	fnvlist_free(ca->zhca_holds);
+	kmem_free(ca, sizeof (zfs_hold_cleanup_arg_t));
+	spa_close(spa, FTAG);
+}
+
+static void
+dsl_onexit_hold_cleanup(spa_t *spa, nvlist_t *holds, minor_t minor)
+{
+	zfs_hold_cleanup_arg_t *ca;
+
+	if (minor == 0 || nvlist_empty(holds)) {
+		fnvlist_free(holds);
+		return;
+	}
+
+	ASSERT(spa != NULL);
+	ca = kmem_alloc(sizeof (*ca), KM_SLEEP);
+
+	(void) strlcpy(ca->zhca_spaname, spa_name(spa),
+	    sizeof (ca->zhca_spaname));
+	ca->zhca_spa_load_guid = spa_load_guid(spa);
+	ca->zhca_holds = holds;
+	VERIFY0(zfs_onexit_add_cb(minor,
+	    dsl_dataset_user_release_onexit, ca, NULL));
+}
+
+void
+dsl_dataset_user_hold_sync_one(dsl_dataset_t *ds, const char *htag,
+    minor_t minor, uint64_t now, dmu_tx_t *tx)
+{
+	nvlist_t *tmpholds;
+
+	if (minor != 0)
+		tmpholds = fnvlist_alloc();
+	else
+		tmpholds = NULL;
+	dsl_dataset_user_hold_sync_one_impl(tmpholds, ds, htag, minor, now, tx);
+	dsl_onexit_hold_cleanup(dsl_dataset_get_spa(ds), tmpholds, minor);
+}
+
 static void
 dsl_dataset_user_hold_sync(void *arg, dmu_tx_t *tx)
 {
 	dsl_dataset_user_hold_arg_t *dduha = arg;
 	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
+	nvlist_t *tmpholds;
 	uint64_t now = gethrestime_sec();
 
-	for (pair = nvlist_next_nvpair(dduha->dduha_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
+	if (dduha->dduha_minor != 0)
+		tmpholds = fnvlist_alloc();
+	else
+		tmpholds = NULL;
+	for (nvpair_t *pair = nvlist_next_nvpair(dduha->dduha_chkholds, NULL);
+	    pair != NULL;
+	    pair = nvlist_next_nvpair(dduha->dduha_chkholds, pair)) {
 		dsl_dataset_t *ds;
+
 		VERIFY0(dsl_dataset_hold(dp, nvpair_name(pair), FTAG, &ds));
-		dsl_dataset_user_hold_sync_one(ds, fnvpair_value_string(pair),
-		    dduha->dduha_minor, now, tx);
+		dsl_dataset_user_hold_sync_one_impl(tmpholds, ds,
+		    fnvpair_value_string(pair), dduha->dduha_minor, now, tx);
 		dsl_dataset_rele(ds, FTAG);
 	}
+	dsl_onexit_hold_cleanup(dp->dp_spa, tmpholds, dduha->dduha_minor);
 }
 
 /*
+ * The full semantics of this function are described in the comment above
+ * lzc_hold().
+ *
+ * To summarize:
  * holds is nvl of snapname -> holdname
  * errlist will be filled in with snapname -> error
- * if cleanup_minor is not 0, the holds will be temporary, cleaned up
- * when the process exits.
  *
- * if any fails, all will fail.
+ * The snaphosts must all be in the same pool.
+ *
+ * Holds for snapshots that don't exist will be skipped.
+ *
+ * If none of the snapshots for requested holds exist then ENOENT will be
+ * returned.
+ *
+ * If cleanup_minor is not 0, the holds will be temporary, which will be cleaned
+ * up when the process exits.
+ *
+ * On success all the holds, for snapshots that existed, will be created and 0
+ * will be returned.
+ *
+ * On failure no holds will be created, the errlist will be filled in,
+ * and an errno will returned.
+ *
+ * In all cases the errlist will contain entries for holds where the snapshot
+ * didn't exist.
  */
 int
 dsl_dataset_user_hold(nvlist_t *holds, minor_t cleanup_minor, nvlist_t *errlist)
 {
 	dsl_dataset_user_hold_arg_t dduha;
 	nvpair_t *pair;
+	int ret;
 
 	pair = nvlist_next_nvpair(holds, NULL);
 	if (pair == NULL)
 		return (0);
 
 	dduha.dduha_holds = holds;
+	dduha.dduha_chkholds = fnvlist_alloc();
 	dduha.dduha_errlist = errlist;
 	dduha.dduha_minor = cleanup_minor;
 
-	return (dsl_sync_task(nvpair_name(pair), dsl_dataset_user_hold_check,
-	    dsl_dataset_user_hold_sync, &dduha, fnvlist_num_pairs(holds)));
+	ret = dsl_sync_task(nvpair_name(pair), dsl_dataset_user_hold_check,
+	    dsl_dataset_user_hold_sync, &dduha, fnvlist_num_pairs(holds));
+	fnvlist_free(dduha.dduha_chkholds);
+
+	return (ret);
 }
 
+typedef int (dsl_holdfunc_t)(dsl_pool_t *dp, const char *name, void *tag,
+    dsl_dataset_t **dsp);
+
 typedef struct dsl_dataset_user_release_arg {
+	dsl_holdfunc_t *ddura_holdfunc;
 	nvlist_t *ddura_holds;
 	nvlist_t *ddura_todelete;
 	nvlist_t *ddura_errlist;
+	nvlist_t *ddura_chkholds;
 } dsl_dataset_user_release_arg_t;
 
+/* Place a dataset hold on the snapshot identified by passed dsobj string */
 static int
-dsl_dataset_user_release_check_one(dsl_dataset_t *ds,
-    nvlist_t *holds, boolean_t *todelete)
+dsl_dataset_hold_obj_string(dsl_pool_t *dp, const char *dsobj, void *tag,
+    dsl_dataset_t **dsp)
 {
-	uint64_t zapobj;
-	nvpair_t *pair;
-	objset_t *mos = ds->ds_dir->dd_pool->dp_meta_objset;
-	int error;
-	int numholds = 0;
+	return (dsl_dataset_hold_obj(dp, strtonum(dsobj, NULL), tag, dsp));
+}
 
-	*todelete = B_FALSE;
+static int
+dsl_dataset_user_release_check_one(dsl_dataset_user_release_arg_t *ddura,
+    dsl_dataset_t *ds, nvlist_t *holds, const char *snapname)
+{
+	uint64_t zapobj;
+	nvlist_t *holds_found;
+	objset_t *mos;
+	int numholds;
 
 	if (!dsl_dataset_is_snapshot(ds))
 		return (SET_ERROR(EINVAL));
 
+	if (nvlist_empty(holds))
+		return (0);
+
+	numholds = 0;
+	mos = ds->ds_dir->dd_pool->dp_meta_objset;
 	zapobj = ds->ds_phys->ds_userrefs_obj;
-	if (zapobj == 0)
-		return (SET_ERROR(ESRCH));
+	holds_found = fnvlist_alloc();
 
-	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
+	for (nvpair_t *pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
 	    pair = nvlist_next_nvpair(holds, pair)) {
-		/* Make sure the hold exists */
 		uint64_t tmp;
-		error = zap_lookup(mos, zapobj, nvpair_name(pair), 8, 1, &tmp);
-		if (error == ENOENT)
-			error = SET_ERROR(ESRCH);
-		if (error != 0)
+		int error;
+		const char *holdname = nvpair_name(pair);
+
+		if (zapobj != 0)
+			error = zap_lookup(mos, zapobj, holdname, 8, 1, &tmp);
+		else
+			error = SET_ERROR(ENOENT);
+
+		/*
+		 * Non-existent holds are put on the errlist, but don't
+		 * cause an overall failure.
+		 */
+		if (error == ENOENT) {
+			if (ddura->ddura_errlist != NULL) {
+				char *errtag = kmem_asprintf("%s#%s",
+				    snapname, holdname);
+				fnvlist_add_int32(ddura->ddura_errlist, errtag,
+				    ENOENT);
+				strfree(errtag);
+			}
+			continue;
+		}
+
+		if (error != 0) {
+			fnvlist_free(holds_found);
 			return (error);
+		}
+
+		fnvlist_add_boolean(holds_found, holdname);
 		numholds++;
 	}
 
 	if (DS_IS_DEFER_DESTROY(ds) && ds->ds_phys->ds_num_children == 1 &&
 	    ds->ds_userrefs == numholds) {
 		/* we need to destroy the snapshot as well */
-
-		if (dsl_dataset_long_held(ds))
+		if (dsl_dataset_long_held(ds)) {
+			fnvlist_free(holds_found);
 			return (SET_ERROR(EBUSY));
-		*todelete = B_TRUE;
+		}
+		fnvlist_add_boolean(ddura->ddura_todelete, snapname);
 	}
+
+	if (numholds != 0) {
+		fnvlist_add_nvlist(ddura->ddura_chkholds, snapname,
+		    holds_found);
+	}
+	fnvlist_free(holds_found);
+
 	return (0);
 }
 
 static int
 dsl_dataset_user_release_check(void *arg, dmu_tx_t *tx)
 {
-	dsl_dataset_user_release_arg_t *ddura = arg;
-	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
-	int rv = 0;
+	dsl_dataset_user_release_arg_t *ddura;
+	dsl_holdfunc_t *holdfunc;
+	dsl_pool_t *dp;
 
 	if (!dmu_tx_is_syncing(tx))
 		return (0);
 
-	for (pair = nvlist_next_nvpair(ddura->ddura_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(ddura->ddura_holds, pair)) {
-		const char *name = nvpair_name(pair);
+	dp = dmu_tx_pool(tx);
+
+	ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+
+	ddura = arg;
+	holdfunc = ddura->ddura_holdfunc;
+
+	for (nvpair_t *pair = nvlist_next_nvpair(ddura->ddura_holds, NULL);
+	    pair != NULL; pair = nvlist_next_nvpair(ddura->ddura_holds, pair)) {
 		int error;
 		dsl_dataset_t *ds;
 		nvlist_t *holds;
+		const char *snapname = nvpair_name(pair);
 
 		error = nvpair_value_nvlist(pair, &holds);
 		if (error != 0)
-			return (SET_ERROR(EINVAL));
-
-		error = dsl_dataset_hold(dp, name, FTAG, &ds);
+			error = (SET_ERROR(EINVAL));
+		else
+			error = holdfunc(dp, snapname, FTAG, &ds);
 		if (error == 0) {
-			boolean_t deleteme;
-			error = dsl_dataset_user_release_check_one(ds,
-			    holds, &deleteme);
-			if (error == 0 && deleteme) {
-				fnvlist_add_boolean(ddura->ddura_todelete,
-				    name);
-			}
+			error = dsl_dataset_user_release_check_one(ddura, ds,
+			    holds, snapname);
 			dsl_dataset_rele(ds, FTAG);
 		}
 		if (error != 0) {
 			if (ddura->ddura_errlist != NULL) {
 				fnvlist_add_int32(ddura->ddura_errlist,
-				    name, error);
+				    snapname, error);
 			}
-			rv = error;
+			/*
+			 * Non-existent snapshots are put on the errlist,
+			 * but don't cause an overall failure.
+			 */
+			if (error != ENOENT)
+				return (error);
 		}
 	}
-	return (rv);
+
+	/* Return ENOENT if none of the holds existed. */
+	if (nvlist_empty(ddura->ddura_chkholds))
+		return (SET_ERROR(ENOENT));
+
+	return (0);
 }
 
 static void
@@ -297,22 +481,22 @@ dsl_dataset_user_release_sync_one(dsl_da
 {
 	dsl_pool_t *dp = ds->ds_dir->dd_pool;
 	objset_t *mos = dp->dp_meta_objset;
-	uint64_t zapobj;
-	int error;
-	nvpair_t *pair;
 
-	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
+	for (nvpair_t *pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
 	    pair = nvlist_next_nvpair(holds, pair)) {
-		ds->ds_userrefs--;
-		error = dsl_pool_user_release(dp, ds->ds_object,
-		    nvpair_name(pair), tx);
+		int error;
+		const char *holdname = nvpair_name(pair);
+
+		/* Remove temporary hold if one exists. */
+		error = dsl_pool_user_release(dp, ds->ds_object, holdname, tx);
 		VERIFY(error == 0 || error == ENOENT);
-		zapobj = ds->ds_phys->ds_userrefs_obj;
-		VERIFY0(zap_remove(mos, zapobj, nvpair_name(pair), tx));
+
+		VERIFY0(zap_remove(mos, ds->ds_phys->ds_userrefs_obj, holdname,
+		    tx));
+		ds->ds_userrefs--;
 
 		spa_history_log_internal_ds(ds, "release", tx,
-		    "tag=%s refs=%lld", nvpair_name(pair),
-		    (longlong_t)ds->ds_userrefs);
+		    "tag=%s refs=%lld", holdname, (longlong_t)ds->ds_userrefs);
 	}
 }
 
@@ -320,18 +504,22 @@ static void
 dsl_dataset_user_release_sync(void *arg, dmu_tx_t *tx)
 {
 	dsl_dataset_user_release_arg_t *ddura = arg;
+	dsl_holdfunc_t *holdfunc = ddura->ddura_holdfunc;
 	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
 
-	for (pair = nvlist_next_nvpair(ddura->ddura_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(ddura->ddura_holds, pair)) {
+	ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+
+	for (nvpair_t *pair = nvlist_next_nvpair(ddura->ddura_chkholds, NULL);
+	    pair != NULL; pair = nvlist_next_nvpair(ddura->ddura_chkholds,
+	    pair)) {
 		dsl_dataset_t *ds;
+		const char *name = nvpair_name(pair);
+
+		VERIFY0(holdfunc(dp, name, FTAG, &ds));
 
-		VERIFY0(dsl_dataset_hold(dp, nvpair_name(pair), FTAG, &ds));
 		dsl_dataset_user_release_sync_one(ds,
 		    fnvpair_value_nvlist(pair), tx);
-		if (nvlist_exists(ddura->ddura_todelete,
-		    nvpair_name(pair))) {
+		if (nvlist_exists(ddura->ddura_todelete, name)) {
 			ASSERT(ds->ds_userrefs == 0 &&
 			    ds->ds_phys->ds_num_children == 1 &&
 			    DS_IS_DEFER_DESTROY(ds));
@@ -342,161 +530,108 @@ dsl_dataset_user_release_sync(void *arg,
 }
 
 /*
+ * The full semantics of this function are described in the comment above
+ * lzc_release().
+ *
+ * To summarize:
+ * Releases holds specified in the nvl holds.
+ *
  * holds is nvl of snapname -> { holdname, ... }
  * errlist will be filled in with snapname -> error
  *
- * if any fails, all will fail.
+ * If tmpdp is not NULL the names for holds should be the dsobj's of snapshots,
+ * otherwise they should be the names of shapshots.
+ *
+ * As a release may cause snapshots to be destroyed this trys to ensure they
+ * aren't mounted.
+ *
+ * The release of non-existent holds are skipped.
+ *
+ * At least one hold must have been released for the this function to succeed
+ * and return 0.
  */
-int
-dsl_dataset_user_release(nvlist_t *holds, nvlist_t *errlist)
+static int
+dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
+    dsl_pool_t *tmpdp)
 {
 	dsl_dataset_user_release_arg_t ddura;
 	nvpair_t *pair;
+	char *pool;
 	int error;
 
 	pair = nvlist_next_nvpair(holds, NULL);
 	if (pair == NULL)
 		return (0);
 
+	/*
+	 * The release may cause snapshots to be destroyed; make sure they
+	 * are not mounted.
+	 */
+	if (tmpdp != NULL) {
+		/* Temporary holds are specified by dsobj string. */
+		ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
+		pool = spa_name(tmpdp->dp_spa);
+#ifdef _KERNEL
+		dsl_pool_config_enter(tmpdp, FTAG);
+		for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
+		    pair = nvlist_next_nvpair(holds, pair)) {
+			dsl_dataset_t *ds;
+
+			error = dsl_dataset_hold_obj_string(tmpdp,
+			    nvpair_name(pair), FTAG, &ds);
+			if (error == 0) {
+				char name[MAXNAMELEN];
+				dsl_dataset_name(ds, name);
+				dsl_dataset_rele(ds, FTAG);
+				(void) zfs_unmount_snap(name);
+			}
+		}
+		dsl_pool_config_exit(tmpdp, FTAG);
+#endif
+	} else {
+		/* Non-temporary holds are specified by name. */
+		ddura.ddura_holdfunc = dsl_dataset_hold;
+		pool = nvpair_name(pair);
+#ifdef _KERNEL
+		for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
+		    pair = nvlist_next_nvpair(holds, pair)) {
+			(void) zfs_unmount_snap(nvpair_name(pair));
+		}
+#endif
+	}
+
 	ddura.ddura_holds = holds;
 	ddura.ddura_errlist = errlist;
 	ddura.ddura_todelete = fnvlist_alloc();
+	ddura.ddura_chkholds = fnvlist_alloc();
 
-	error = dsl_sync_task(nvpair_name(pair), dsl_dataset_user_release_check,
-	    dsl_dataset_user_release_sync, &ddura, fnvlist_num_pairs(holds));
+	error = dsl_sync_task(pool, dsl_dataset_user_release_check,
+	    dsl_dataset_user_release_sync, &ddura,
+	    fnvlist_num_pairs(holds));
 	fnvlist_free(ddura.ddura_todelete);
-	return (error);
-}
-
-typedef struct dsl_dataset_user_release_tmp_arg {
-	uint64_t ddurta_dsobj;
-	nvlist_t *ddurta_holds;
-	boolean_t ddurta_deleteme;
-} dsl_dataset_user_release_tmp_arg_t;
-
-static int
-dsl_dataset_user_release_tmp_check(void *arg, dmu_tx_t *tx)
-{
-	dsl_dataset_user_release_tmp_arg_t *ddurta = arg;
-	dsl_pool_t *dp = dmu_tx_pool(tx);
-	dsl_dataset_t *ds;
-	int error;
-
-	if (!dmu_tx_is_syncing(tx))
-		return (0);
-
-	error = dsl_dataset_hold_obj(dp, ddurta->ddurta_dsobj, FTAG, &ds);
-	if (error)
-		return (error);
+	fnvlist_free(ddura.ddura_chkholds);
 
-	error = dsl_dataset_user_release_check_one(ds,
-	    ddurta->ddurta_holds, &ddurta->ddurta_deleteme);
-	dsl_dataset_rele(ds, FTAG);
 	return (error);
 }
 
-static void
-dsl_dataset_user_release_tmp_sync(void *arg, dmu_tx_t *tx)
-{
-	dsl_dataset_user_release_tmp_arg_t *ddurta = arg;
-	dsl_pool_t *dp = dmu_tx_pool(tx);
-	dsl_dataset_t *ds;
-
-	VERIFY0(dsl_dataset_hold_obj(dp, ddurta->ddurta_dsobj, FTAG, &ds));
-	dsl_dataset_user_release_sync_one(ds, ddurta->ddurta_holds, tx);
-	if (ddurta->ddurta_deleteme) {
-		ASSERT(ds->ds_userrefs == 0 &&
-		    ds->ds_phys->ds_num_children == 1 &&
-		    DS_IS_DEFER_DESTROY(ds));
-		dsl_destroy_snapshot_sync_impl(ds, B_FALSE, tx);
-	}
-	dsl_dataset_rele(ds, FTAG);
-}
-
 /*
- * Called at spa_load time to release a stale temporary user hold.
- * Also called by the onexit code.
+ * holds is nvl of snapname -> { holdname, ... }
+ * errlist will be filled in with snapname -> error
  */
-void
-dsl_dataset_user_release_tmp(dsl_pool_t *dp, uint64_t dsobj, const char *htag)
-{
-	dsl_dataset_user_release_tmp_arg_t ddurta;
-	dsl_dataset_t *ds;
-	int error;
-
-#ifdef _KERNEL
-	/* Make sure it is not mounted. */
-	dsl_pool_config_enter(dp, FTAG);
-	error = dsl_dataset_hold_obj(dp, dsobj, FTAG, &ds);
-	if (error == 0) {
-		char name[MAXNAMELEN];
-		dsl_dataset_name(ds, name);
-		dsl_dataset_rele(ds, FTAG);
-		dsl_pool_config_exit(dp, FTAG);
-		(void) zfs_unmount_snap(name);
-	} else {
-		dsl_pool_config_exit(dp, FTAG);
-	}
-#endif
-
-	ddurta.ddurta_dsobj = dsobj;
-	ddurta.ddurta_holds = fnvlist_alloc();
-	fnvlist_add_boolean(ddurta.ddurta_holds, htag);
-
-	(void) dsl_sync_task(spa_name(dp->dp_spa),
-	    dsl_dataset_user_release_tmp_check,
-	    dsl_dataset_user_release_tmp_sync, &ddurta, 1);
-	fnvlist_free(ddurta.ddurta_holds);
-}
-
-typedef struct zfs_hold_cleanup_arg {
-	char zhca_spaname[MAXNAMELEN];
-	uint64_t zhca_spa_load_guid;
-	uint64_t zhca_dsobj;
-	char zhca_htag[MAXNAMELEN];
-} zfs_hold_cleanup_arg_t;
-
-static void
-dsl_dataset_user_release_onexit(void *arg)
+int
+dsl_dataset_user_release(nvlist_t *holds, nvlist_t *errlist)
 {
-	zfs_hold_cleanup_arg_t *ca = arg;
-	spa_t *spa;
-	int error;
-
-	error = spa_open(ca->zhca_spaname, &spa, FTAG);
-	if (error != 0) {
-		zfs_dbgmsg("couldn't release hold on pool=%s ds=%llu tag=%s "
-		    "because pool is no longer loaded",
-		    ca->zhca_spaname, ca->zhca_dsobj, ca->zhca_htag);
-		return;
-	}
-	if (spa_load_guid(spa) != ca->zhca_spa_load_guid) {
-		zfs_dbgmsg("couldn't release hold on pool=%s ds=%llu tag=%s "
-		    "because pool is no longer loaded (guid doesn't match)",
-		    ca->zhca_spaname, ca->zhca_dsobj, ca->zhca_htag);
-		spa_close(spa, FTAG);
-		return;
-	}
-
-	dsl_dataset_user_release_tmp(spa_get_dsl(spa),
-	    ca->zhca_dsobj, ca->zhca_htag);
-	kmem_free(ca, sizeof (zfs_hold_cleanup_arg_t));
-	spa_close(spa, FTAG);
+	return (dsl_dataset_user_release_impl(holds, errlist, NULL));
 }
 
+/*
+ * holds is nvl of snapdsobj -> { holdname, ... }
+ */
 void
-dsl_register_onexit_hold_cleanup(dsl_dataset_t *ds, const char *htag,
-    minor_t minor)
+dsl_dataset_user_release_tmp(struct dsl_pool *dp, nvlist_t *holds)
 {
-	zfs_hold_cleanup_arg_t *ca = kmem_alloc(sizeof (*ca), KM_SLEEP);
-	spa_t *spa = dsl_dataset_get_spa(ds);
-	(void) strlcpy(ca->zhca_spaname, spa_name(spa),
-	    sizeof (ca->zhca_spaname));
-	ca->zhca_spa_load_guid = spa_load_guid(spa);
-	ca->zhca_dsobj = ds->ds_object;
-	(void) strlcpy(ca->zhca_htag, htag, sizeof (ca->zhca_htag));
-	VERIFY0(zfs_onexit_add_cb(minor,
-	    dsl_dataset_user_release_onexit, ca, NULL));
+	ASSERT(dp != NULL);
+	(void) dsl_dataset_user_release_impl(holds, NULL, dp);
 }
 
 int

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h	Wed Jun 12 06:56:15 2013	(r251644)
@@ -22,6 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #ifndef	_SYS_DSL_DATASET_H
@@ -187,8 +188,6 @@ int dsl_dataset_own_obj(struct dsl_pool 
 void dsl_dataset_disown(dsl_dataset_t *ds, void *tag);
 void dsl_dataset_name(dsl_dataset_t *ds, char *name);
 boolean_t dsl_dataset_tryown(dsl_dataset_t *ds, void *tag);
-void dsl_register_onexit_hold_cleanup(dsl_dataset_t *ds, const char *htag,
-    minor_t minor);
 uint64_t dsl_dataset_create_sync(dsl_dir_t *pds, const char *lastname,
     dsl_dataset_t *origin, uint64_t flags, cred_t *, dmu_tx_t *);
 uint64_t dsl_dataset_create_sync_dd(dsl_dir_t *dd, dsl_dataset_t *origin,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_userhold.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_userhold.h	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_userhold.h	Wed Jun 12 06:56:15 2013	(r251644)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #ifndef	_SYS_DSL_USERHOLD_H
@@ -43,8 +44,7 @@ int dsl_dataset_user_hold(nvlist_t *hold
     nvlist_t *errlist);
 int dsl_dataset_user_release(nvlist_t *holds, nvlist_t *errlist);
 int dsl_dataset_get_holds(const char *dsname, nvlist_t *nvl);
-void dsl_dataset_user_release_tmp(struct dsl_pool *dp, uint64_t dsobj,
-    const char *htag);
+void dsl_dataset_user_release_tmp(struct dsl_pool *dp, nvlist_t *holds);
 int dsl_dataset_user_hold_check_one(struct dsl_dataset *ds, const char *htag,
     boolean_t temphold, struct dmu_tx *tx);
 void dsl_dataset_user_hold_sync_one(struct dsl_dataset *ds, const char *htag,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Wed Jun 12 06:01:53 2013	(r251643)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Wed Jun 12 06:56:15 2013	(r251644)
@@ -26,6 +26,7 @@
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -4984,20 +4985,6 @@ zfs_ioc_get_holds(const char *snapname, 
 static int
 zfs_ioc_release(const char *pool, nvlist_t *holds, nvlist_t *errlist)
 {
-	nvpair_t *pair;
-	int err;
-
-	/*
-	 * The release may cause the snapshot to be destroyed; make sure it
-	 * is not mounted.
-	 */
-	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(holds, pair)) {
-		err = zfs_unmount_snap(nvpair_name(pair));
-		if (err != 0)
-			return (err);
-	}
-
 	return (dsl_dataset_user_release(holds, errlist));
 }
 

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 07:04:27 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BDCD5524;
 Wed, 12 Jun 2013 07:04:27 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9F7B2145E;
 Wed, 12 Jun 2013 07:04:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C74RqV083344;
 Wed, 12 Jun 2013 07:04:27 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C74RXI083343;
 Wed, 12 Jun 2013 07:04:27 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201306120704.r5C74RXI083343@svn.freebsd.org>
From: Dimitry Andric 
Date: Wed, 12 Jun 2013 07:04:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251645 - stable/9/contrib/llvm/lib/CodeGen/AsmPrinter
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 07:04:27 -0000

Author: dim
Date: Wed Jun 12 07:04:27 2013
New Revision: 251645
URL: http://svnweb.freebsd.org/changeset/base/251645

Log:
  MFC r251431:
  
  Pull in r183297 from upstream llvm trunk:
  
    PR15662: Optimized debug info produces out of order function
    parameters
  
    When a function is inlined we lazily construct the variables
    representing the function's parameters. After that, we add any
    remaining unused parameters.
  
    If the function doesn't use all the parameters, or uses them out of
    order, then the DWARF would produce them in that order, producing a
    parameter order that doesn't match the source.
  
    This fix causes us to always keep the arg variables at the start of
    the variable list & in the original order from the source.
  
  Reported by:	avg

Modified:
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Modified: stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
==============================================================================
--- stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Wed Jun 12 06:56:15 2013	(r251644)
+++ stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Wed Jun 12 07:04:27 2013	(r251645)
@@ -1447,9 +1447,37 @@ void DwarfDebug::beginFunction(const Mac
 }
 
 void DwarfDebug::addScopeVariable(LexicalScope *LS, DbgVariable *Var) {
-//  SmallVector &Vars = ScopeVariables.lookup(LS);
-  ScopeVariables[LS].push_back(Var);
-//  Vars.push_back(Var);
+  SmallVectorImpl &Vars = ScopeVariables[LS];
+  DIVariable DV = Var->getVariable();
+  if (DV.getTag() == dwarf::DW_TAG_arg_variable) {
+    DISubprogram Ctxt(DV.getContext());
+    DIArray Variables = Ctxt.getVariables();
+    // If the variable is a parameter (arg_variable) and this is an optimized
+    // build (the subprogram has a 'variables' list) make sure we keep the
+    // parameters in order. Otherwise we would produce an incorrect function
+    // type with parameters out of order if function parameters were used out of
+    // order or unused (see the call to addScopeVariable in endFunction where
+    // the remaining unused variables (including parameters) are added).
+    if (unsigned NumVariables = Variables.getNumElements()) {
+      // Keep the parameters at the start of the variables list. Search through
+      // current variable list (Vars) and the full function variable list in
+      // lock-step looking for this parameter in the full list to find the
+      // insertion point.
+      SmallVectorImpl::iterator I = Vars.begin();
+      unsigned j = 0;
+      while (I != Vars.end() && j != NumVariables &&
+             Variables.getElement(j) != DV &&
+             (*I)->getVariable().getTag() == dwarf::DW_TAG_arg_variable) {
+        if (Variables.getElement(j) == (*I)->getVariable())
+          ++I;
+        ++j;
+      }
+      Vars.insert(I, Var);
+      return;
+    }
+  }
+
+  Vars.push_back(Var);
 }
 
 /// endFunction - Gather and emit post-function debug information.

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 07:07:09 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 52C95758;
 Wed, 12 Jun 2013 07:07:09 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 42E961562;
 Wed, 12 Jun 2013 07:07:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C779bV083890;
 Wed, 12 Jun 2013 07:07:09 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C777G1083875;
 Wed, 12 Jun 2013 07:07:07 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306120707.r5C777G1083875@svn.freebsd.org>
From: Xin LI 
Date: Wed, 12 Jun 2013 07:07:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251646 - in head: cddl/contrib/opensolaris/cmd/zfs
 cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opensolaris/cmd/ztest
 cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensol...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 07:07:09 -0000

Author: delphij
Date: Wed Jun 12 07:07:06 2013
New Revision: 251646
URL: http://svnweb.freebsd.org/changeset/base/251646

Log:
  MFV r251644:
  
  Poor ZFS send / receive performance due to snapshot
  hold / release processing (by smh@)
  
  Illumos ZFS issues:
    3740 Poor ZFS send / receive performance due to snapshot
         hold / release processing
  
  MFC after:      2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  head/cddl/contrib/opensolaris/cmd/zhack/zhack.c
  head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -28,6 +28,7 @@
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek .
  * All rights reserved.
  * Copyright (c) 2012 Martin Matuska . All rights reserved.
+ * Copyright (c) 2013 Steven Hartland.  All rights reserved.
  */
 
 #include 
@@ -5233,8 +5234,7 @@ zfs_do_hold_rele_impl(int argc, char **a
 			continue;
 		}
 		if (holding) {
-			if (zfs_hold(zhp, delim+1, tag, recursive,
-			    B_FALSE, -1) != 0)
+			if (zfs_hold(zhp, delim+1, tag, recursive, -1) != 0)
 				++errors;
 		} else {
 			if (zfs_release(zhp, delim+1, tag, recursive) != 0)

Modified: head/cddl/contrib/opensolaris/cmd/zhack/zhack.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -153,7 +154,7 @@ import_pool(const char *target, boolean_
 	g_importargs.poolname = g_pool;
 	pools = zpool_search_import(g_zfs, &g_importargs);
 
-	if (pools == NULL || nvlist_next_nvpair(pools, NULL) == NULL) {
+	if (nvlist_empty(pools)) {
 		if (!g_importargs.can_be_active) {
 			g_importargs.can_be_active = B_TRUE;
 			if (zpool_search_import(g_zfs, &g_importargs) != NULL ||

Modified: head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -23,6 +23,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 Martin Matuska .  All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -4713,7 +4714,7 @@ ztest_dmu_snapshot_hold(ztest_ds_t *zd, 
 
 	error = user_release_one(fullname, tag);
 	if (error)
-		fatal(0, "user_release_one(%s)", fullname, tag);
+		fatal(0, "user_release_one(%s, %s) = %d", fullname, tag, error);
 
 	VERIFY3U(dmu_objset_hold(fullname, FTAG, &origin), ==, ENOENT);
 

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Wed Jun 12 07:07:06 2013	(r251646)
@@ -27,6 +27,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 Martin Matuska . All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #ifndef	_LIBZFS_H
@@ -611,7 +612,8 @@ extern int zfs_send(zfs_handle_t *, cons
 
 extern int zfs_promote(zfs_handle_t *);
 extern int zfs_hold(zfs_handle_t *, const char *, const char *,
-    boolean_t, boolean_t, int);
+    boolean_t, int);
+extern int zfs_hold_nvl(zfs_handle_t *, int, nvlist_t *);
 extern int zfs_release(zfs_handle_t *, const char *, const char *, boolean_t);
 extern int zfs_get_holds(zfs_handle_t *, nvlist_t **);
 extern uint64_t zvol_volsize_to_reservation(uint64_t, nvlist_t *);

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -27,6 +27,7 @@
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek .
  * All rights reserved.
  * Copyright (c) 2012 Martin Matuska . All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -3158,18 +3159,14 @@ static int
 zfs_check_snap_cb(zfs_handle_t *zhp, void *arg)
 {
 	struct destroydata *dd = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, dd->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name))
 		verify(nvlist_add_boolean(dd->nvl, name) == 0);
-		zfs_close(szhp);
-	}
 
 	rv = zfs_iter_filesystems(zhp, zfs_check_snap_cb, dd);
 	zfs_close(zhp);
@@ -3189,7 +3186,7 @@ zfs_destroy_snaps(zfs_handle_t *zhp, cha
 	verify(nvlist_alloc(&dd.nvl, NV_UNIQUE_NAME, 0) == 0);
 	(void) zfs_check_snap_cb(zfs_handle_dup(zhp), &dd);
 
-	if (nvlist_next_nvpair(dd.nvl, NULL) == NULL) {
+	if (nvlist_empty(dd.nvl)) {
 		ret = zfs_standard_error_fmt(zhp->zfs_hdl, ENOENT,
 		    dgettext(TEXT_DOMAIN, "cannot destroy '%s@%s'"),
 		    zhp->zfs_name, snapname);
@@ -3214,7 +3211,7 @@ zfs_destroy_snaps_nvl(libzfs_handle_t *h
 	if (ret == 0)
 		return (0);
 
-	if (nvlist_next_nvpair(errlist, NULL) == NULL) {
+	if (nvlist_empty(errlist)) {
 		char errbuf[1024];
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN, "cannot destroy snapshots"));
@@ -4168,18 +4165,14 @@ static int
 zfs_hold_one(zfs_handle_t *zhp, void *arg)
 {
 	struct holdarg *ha = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, ha->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name))
 		fnvlist_add_string(ha->nvl, name, ha->tag);
-		zfs_close(szhp);
-	}
 
 	if (ha->recursive)
 		rv = zfs_iter_filesystems(zhp, zfs_hold_one, ha);
@@ -4189,14 +4182,10 @@ zfs_hold_one(zfs_handle_t *zhp, void *ar
 
 int
 zfs_hold(zfs_handle_t *zhp, const char *snapname, const char *tag,
-    boolean_t recursive, boolean_t enoent_ok, int cleanup_fd)
+    boolean_t recursive, int cleanup_fd)
 {
 	int ret;
 	struct holdarg ha;
-	nvlist_t *errors;
-	libzfs_handle_t *hdl = zhp->zfs_hdl;
-	char errbuf[1024];
-	nvpair_t *elem;
 
 	ha.nvl = fnvlist_alloc();
 	ha.snapname = snapname;
@@ -4204,26 +4193,44 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	ha.recursive = recursive;
 	(void) zfs_hold_one(zfs_handle_dup(zhp), &ha);
 
-	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+	if (nvlist_empty(ha.nvl)) {
+		char errbuf[1024];
+
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
-		if (!enoent_ok) {
-			(void) snprintf(errbuf, sizeof (errbuf),
-			    dgettext(TEXT_DOMAIN,
-			    "cannot hold snapshot '%s@%s'"),
-			    zhp->zfs_name, snapname);
-			(void) zfs_standard_error(hdl, ret, errbuf);
-		}
+		(void) snprintf(errbuf, sizeof (errbuf),
+		    dgettext(TEXT_DOMAIN,
+		    "cannot hold snapshot '%s@%s'"),
+		    zhp->zfs_name, snapname);
+		(void) zfs_standard_error(zhp->zfs_hdl, ret, errbuf);
 		return (ret);
 	}
 
-	ret = lzc_hold(ha.nvl, cleanup_fd, &errors);
+	ret = zfs_hold_nvl(zhp, cleanup_fd, ha.nvl);
 	fnvlist_free(ha.nvl);
 
-	if (ret == 0)
+	return (ret);
+}
+
+int
+zfs_hold_nvl(zfs_handle_t *zhp, int cleanup_fd, nvlist_t *holds)
+{
+	int ret;
+	nvlist_t *errors;
+	libzfs_handle_t *hdl = zhp->zfs_hdl;
+	char errbuf[1024];
+	nvpair_t *elem;
+
+	errors = NULL;
+	ret = lzc_hold(holds, cleanup_fd, &errors);
+
+	if (ret == 0) {
+		/* There may be errors even in the success case. */
+		fnvlist_free(errors);
 		return (0);
+	}
 
-	if (nvlist_next_nvpair(errors, NULL) == NULL) {
+	if (nvlist_empty(errors)) {
 		/* no hold-specific errors */
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN, "cannot hold"));
@@ -4263,10 +4270,6 @@ zfs_hold(zfs_handle_t *zhp, const char *
 		case EEXIST:
 			(void) zfs_error(hdl, EZFS_REFTAG_HOLD, errbuf);
 			break;
-		case ENOENT:
-			if (enoent_ok)
-				return (ENOENT);
-			/* FALLTHROUGH */
 		default:
 			(void) zfs_standard_error(hdl,
 			    fnvpair_value_int32(elem), errbuf);
@@ -4277,30 +4280,21 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	return (ret);
 }
 
-struct releasearg {
-	nvlist_t *nvl;
-	const char *snapname;
-	const char *tag;
-	boolean_t recursive;
-};
-
 static int
 zfs_release_one(zfs_handle_t *zhp, void *arg)
 {
 	struct holdarg *ha = arg;
-	zfs_handle_t *szhp;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, ha->snapname);
 
-	szhp = make_dataset_handle(zhp->zfs_hdl, name);
-	if (szhp) {
+	if (lzc_exists(name)) {
 		nvlist_t *holds = fnvlist_alloc();
 		fnvlist_add_boolean(holds, ha->tag);
 		fnvlist_add_nvlist(ha->nvl, name, holds);
-		zfs_close(szhp);
+		fnvlist_free(holds);
 	}
 
 	if (ha->recursive)
@@ -4315,7 +4309,7 @@ zfs_release(zfs_handle_t *zhp, const cha
 {
 	int ret;
 	struct holdarg ha;
-	nvlist_t *errors;
+	nvlist_t *errors = NULL;
 	nvpair_t *elem;
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
 	char errbuf[1024];
@@ -4326,7 +4320,7 @@ zfs_release(zfs_handle_t *zhp, const cha
 	ha.recursive = recursive;
 	(void) zfs_release_one(zfs_handle_dup(zhp), &ha);
 
-	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+	if (nvlist_empty(ha.nvl)) {
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
 		(void) snprintf(errbuf, sizeof (errbuf),
@@ -4340,10 +4334,13 @@ zfs_release(zfs_handle_t *zhp, const cha
 	ret = lzc_release(ha.nvl, &errors);
 	fnvlist_free(ha.nvl);
 
-	if (ret == 0)
+	if (ret == 0) {
+		/* There may be errors even in the success case. */
+		fnvlist_free(errors);
 		return (0);
+	}
 
-	if (nvlist_next_nvpair(errors, NULL) == NULL) {
+	if (nvlist_empty(errors)) {
 		/* no hold-specific errors */
 		(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
 		    "cannot release"));

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 Pawel Jakub Dawidek .
  * All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -802,6 +803,7 @@ typedef struct send_dump_data {
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
+	nvlist_t *snapholds;
 	avl_tree_t *fsavl;
 	snapfilter_cb_t *filter_cb;
 	void *filter_cb_arg;
@@ -952,41 +954,19 @@ dump_ioctl(zfs_handle_t *zhp, const char
 	return (0);
 }
 
-static int
-hold_for_send(zfs_handle_t *zhp, send_dump_data_t *sdd)
+static void
+gather_holds(zfs_handle_t *zhp, send_dump_data_t *sdd)
 {
-	zfs_handle_t *pzhp;
-	int error = 0;
-	char *thissnap;
-
 	assert(zhp->zfs_type == ZFS_TYPE_SNAPSHOT);
 
-	if (sdd->dryrun)
-		return (0);
-
 	/*
-	 * zfs_send() only opens a cleanup_fd for sends that need it,
+	 * zfs_send() only sets snapholds for sends that need them,
 	 * e.g. replication and doall.
 	 */
-	if (sdd->cleanup_fd == -1)
-		return (0);
-
-	thissnap = strchr(zhp->zfs_name, '@') + 1;
-	*(thissnap - 1) = '\0';
-	pzhp = zfs_open(zhp->zfs_hdl, zhp->zfs_name, ZFS_TYPE_DATASET);
-	*(thissnap - 1) = '@';
-
-	/*
-	 * It's OK if the parent no longer exists.  The send code will
-	 * handle that error.
-	 */
-	if (pzhp) {
-		error = zfs_hold(pzhp, thissnap, sdd->holdtag,
-		    B_FALSE, B_TRUE, sdd->cleanup_fd);
-		zfs_close(pzhp);
-	}
+	if (sdd->snapholds == NULL)
+		return;
 
-	return (error);
+	fnvlist_add_string(sdd->snapholds, zhp->zfs_name, sdd->holdtag);
 }
 
 static void *
@@ -1042,28 +1022,23 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 	send_dump_data_t *sdd = arg;
 	progress_arg_t pa = { 0 };
 	pthread_t tid;
-
 	char *thissnap;
 	int err;
 	boolean_t isfromsnap, istosnap, fromorigin;
 	boolean_t exclude = B_FALSE;
 
+	err = 0;
 	thissnap = strchr(zhp->zfs_name, '@') + 1;
 	isfromsnap = (sdd->fromsnap != NULL &&
 	    strcmp(sdd->fromsnap, thissnap) == 0);
 
 	if (!sdd->seenfrom && isfromsnap) {
-		err = hold_for_send(zhp, sdd);
-		if (err == 0) {
-			sdd->seenfrom = B_TRUE;
-			(void) strcpy(sdd->prevsnap, thissnap);
-			sdd->prevsnap_obj = zfs_prop_get_int(zhp,
-			    ZFS_PROP_OBJSETID);
-		} else if (err == ENOENT) {
-			err = 0;
-		}
+		gather_holds(zhp, sdd);
+		sdd->seenfrom = B_TRUE;
+		(void) strcpy(sdd->prevsnap, thissnap);
+		sdd->prevsnap_obj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
 		zfs_close(zhp);
-		return (err);
+		return (0);
 	}
 
 	if (sdd->seento || !sdd->seenfrom) {
@@ -1114,14 +1089,7 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 		return (0);
 	}
 
-	err = hold_for_send(zhp, sdd);
-	if (err) {
-		if (err == ENOENT)
-			err = 0;
-		zfs_close(zhp);
-		return (err);
-	}
-
+	gather_holds(zhp, sdd);
 	fromorigin = sdd->prevsnap[0] == '\0' &&
 	    (sdd->fromorigin || sdd->replicate);
 
@@ -1389,7 +1357,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	avl_tree_t *fsavl = NULL;
 	static uint64_t holdseq;
 	int spa_version;
-	pthread_t tid;
+	pthread_t tid = 0;
 	int pipefd[2];
 	dedup_arg_t dda = { 0 };
 	int featureflags = 0;
@@ -1462,11 +1430,8 @@ zfs_send(zfs_handle_t *zhp, const char *
 				*debugnvp = hdrnv;
 			else
 				nvlist_free(hdrnv);
-			if (err) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
+			if (err)
 				goto stderr_out;
-			}
 		}
 
 		if (!flags->dryrun) {
@@ -1490,8 +1455,6 @@ zfs_send(zfs_handle_t *zhp, const char *
 			}
 			free(packbuf);
 			if (err == -1) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
 				err = errno;
 				goto stderr_out;
 			}
@@ -1502,8 +1465,6 @@ zfs_send(zfs_handle_t *zhp, const char *
 			drr.drr_u.drr_end.drr_checksum = zc;
 			err = write(outfd, &drr, sizeof (drr));
 			if (err == -1) {
-				fsavl_destroy(fsavl);
-				nvlist_free(fss);
 				err = errno;
 				goto stderr_out;
 			}
@@ -1515,7 +1476,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	/* dump each stream */
 	sdd.fromsnap = fromsnap;
 	sdd.tosnap = tosnap;
-	if (flags->dedup)
+	if (tid != 0)
 		sdd.outfd = pipefd[0];
 	else
 		sdd.outfd = outfd;
@@ -1552,36 +1513,71 @@ zfs_send(zfs_handle_t *zhp, const char *
 			err = errno;
 			goto stderr_out;
 		}
+		sdd.snapholds = fnvlist_alloc();
 	} else {
 		sdd.cleanup_fd = -1;
+		sdd.snapholds = NULL;
 	}
-	if (flags->verbose) {
+	if (flags->verbose || sdd.snapholds != NULL) {
 		/*
 		 * Do a verbose no-op dry run to get all the verbose output
-		 * before generating any data.  Then do a non-verbose real
-		 * run to generate the streams.
+		 * or to gather snapshot hold's before generating any data,
+		 * then do a non-verbose real run to generate the streams.
 		 */
 		sdd.dryrun = B_TRUE;
 		err = dump_filesystems(zhp, &sdd);
-		sdd.dryrun = flags->dryrun;
-		sdd.verbose = B_FALSE;
-		if (flags->parsable) {
-			(void) fprintf(stderr, "size\t%llu\n",
-			    (longlong_t)sdd.size);
-		} else {
-			char buf[16];
-			zfs_nicenum(sdd.size, buf, sizeof (buf));
-			(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
-			    "total estimated size is %s\n"), buf);
+
+		if (err != 0)
+			goto stderr_out;
+
+		if (flags->verbose) {
+			if (flags->parsable) {
+				(void) fprintf(stderr, "size\t%llu\n",
+				    (longlong_t)sdd.size);
+			} else {
+				char buf[16];
+				zfs_nicenum(sdd.size, buf, sizeof (buf));
+				(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+				    "total estimated size is %s\n"), buf);
+			}
+		}
+
+		/* Ensure no snaps found is treated as an error. */
+		if (!sdd.seento) {
+			err = ENOENT;
+			goto err_out;
 		}
+
+		/* Skip the second run if dryrun was requested. */
+		if (flags->dryrun)
+			goto err_out;
+
+		if (sdd.snapholds != NULL) {
+			err = zfs_hold_nvl(zhp, sdd.cleanup_fd, sdd.snapholds);
+			if (err != 0)
+				goto stderr_out;
+
+			fnvlist_free(sdd.snapholds);
+			sdd.snapholds = NULL;
+		}
+
+		sdd.dryrun = B_FALSE;
+		sdd.verbose = B_FALSE;
 	}
+
 	err = dump_filesystems(zhp, &sdd);
 	fsavl_destroy(fsavl);
 	nvlist_free(fss);
 
-	if (flags->dedup) {
-		(void) close(pipefd[0]);
+	/* Ensure no snaps found is treated as an error. */
+	if (err == 0 && !sdd.seento)
+		err = ENOENT;
+
+	if (tid != 0) {
+		if (err != 0)
+			(void) pthread_cancel(tid);
 		(void) pthread_join(tid, NULL);
+		(void) close(pipefd[0]);
 	}
 
 	if (sdd.cleanup_fd != -1) {
@@ -1609,9 +1605,13 @@ zfs_send(zfs_handle_t *zhp, const char *
 stderr_out:
 	err = zfs_standard_error(zhp->zfs_hdl, err, errbuf);
 err_out:
+	fsavl_destroy(fsavl);
+	nvlist_free(fss);
+	fnvlist_free(sdd.snapholds);
+
 	if (sdd.cleanup_fd != -1)
 		VERIFY(0 == close(sdd.cleanup_fd));
-	if (flags->dedup) {
+	if (tid != 0) {
 		(void) pthread_cancel(tid);
 		(void) pthread_join(tid, NULL);
 		(void) close(pipefd[0]);

Modified: head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*
@@ -301,8 +302,11 @@ lzc_snapshot(nvlist_t *snaps, nvlist_t *
  * marked for deferred destruction, and will be destroyed when the last hold
  * or clone is removed/destroyed.
  *
+ * The return value will be ENOENT if none of the snapshots existed.
+ *
  * The return value will be 0 if all snapshots were destroyed (or marked for
- * later destruction if 'defer' is set) or didn't exist to begin with.
+ * later destruction if 'defer' is set) or didn't exist to begin with and
+ * at least one snapshot was destroyed.
  *
  * Otherwise the return value will be the errno of a (unspecified) snapshot
  * that failed, no snapshots will be destroyed, and the errlist will have an
@@ -333,7 +337,6 @@ lzc_destroy_snaps(nvlist_t *snaps, boole
 	nvlist_free(args);
 
 	return (error);
-
 }
 
 int
@@ -393,11 +396,22 @@ lzc_exists(const char *dataset)
  * uncleanly, the holds will be released when the pool is next opened
  * or imported.
  *
- * The return value will be 0 if all holds were created. Otherwise the return
- * value will be the errno of a (unspecified) hold that failed, no holds will
- * be created, and the errlist will have an entry for each hold that
- * failed (name = snapshot).  The value in the errlist will be the error
- * code (int32).
+ * Holds for snapshots which don't exist will be skipped and have an entry
+ * added to errlist, but will not cause an overall failure, except in the
+ * case that all holds where skipped.
+ *
+ * The return value will be ENOENT if none of the snapshots for the requested
+ * holds existed.
+ *
+ * The return value will be 0 if the nvl holds was empty or all holds, for
+ * snapshots that existed, were succesfully created and at least one hold
+ * was created.
+ *
+ * Otherwise the return value will be the errno of a (unspecified) hold that
+ * failed and no holds will be created.
+ *
+ * In all cases the errlist will have an entry for each hold that failed
+ * (name = snapshot), with its value being the error code (int32).
  */
 int
 lzc_hold(nvlist_t *holds, int cleanup_fd, nvlist_t **errlist)
@@ -434,11 +448,20 @@ lzc_hold(nvlist_t *holds, int cleanup_fd
  * The snapshots must all be in the same pool.
  * The value is a nvlist whose keys are the holds to remove.
  *
- * The return value will be 0 if all holds were removed.
- * Otherwise the return value will be the errno of a (unspecified) release
- * that failed, no holds will be released, and the errlist will have an
- * entry for each snapshot that has failed releases (name = snapshot).
- * The value in the errlist will be the error code (int32) of a failed release.
+ * Holds which failed to release because they didn't exist will have an entry
+ * added to errlist, but will not cause an overall failure, except in the
+ * case that all releases where skipped.
+ *
+ * The return value will be ENOENT if none of the specified holds existed.
+ *
+ * The return value will be 0 if the nvl holds was empty or all holds that
+ * existed, were successfully removed and at least one hold was removed.
+ *
+ * Otherwise the return value will be the errno of a (unspecified) hold that
+ * failed to release and no holds will be released.
+ *
+ * In all cases the errlist will have an entry for each hold that failed to
+ * to release.
  */
 int
 lzc_release(nvlist_t *holds, nvlist_t **errlist)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -127,6 +128,10 @@ dsl_destroy_snapshot_check(void *arg, dm
 	pair = nvlist_next_nvpair(dsda->dsda_errlist, NULL);
 	if (pair != NULL)
 		return (fnvpair_value_int32(pair));
+
+	if (nvlist_empty(dsda->dsda_successful_snaps))
+		return (SET_ERROR(ENOENT));
+
 	return (0);
 }
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -856,23 +857,34 @@ dsl_pool_clean_tmp_userrefs(dsl_pool_t *
 	zap_cursor_t zc;
 	objset_t *mos = dp->dp_meta_objset;
 	uint64_t zapobj = dp->dp_tmp_userrefs_obj;
+	nvlist_t *holds;
 
 	if (zapobj == 0)
 		return;
 	ASSERT(spa_version(dp->dp_spa) >= SPA_VERSION_USERREFS);
 
+	holds = fnvlist_alloc();
+
 	for (zap_cursor_init(&zc, mos, zapobj);
 	    zap_cursor_retrieve(&zc, &za) == 0;
 	    zap_cursor_advance(&zc)) {
 		char *htag;
-		uint64_t dsobj;
+		nvlist_t *tags;
 
 		htag = strchr(za.za_name, '-');
 		*htag = '\0';
 		++htag;
-		dsobj = strtonum(za.za_name, NULL);
-		dsl_dataset_user_release_tmp(dp, dsobj, htag);
+		if (nvlist_lookup_nvlist(holds, za.za_name, &tags) != 0) {
+			tags = fnvlist_alloc();
+			fnvlist_add_boolean(tags, htag);
+			fnvlist_add_nvlist(holds, za.za_name, tags);
+			fnvlist_free(tags);
+		} else {
+			fnvlist_add_boolean(tags, htag);
+		}
 	}
+	dsl_dataset_user_release_tmp(dp, holds);
+	fnvlist_free(holds);
 	zap_cursor_fini(&zc);
 }
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c	Wed Jun 12 07:04:27 2013	(r251645)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c	Wed Jun 12 07:07:06 2013	(r251646)
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 #include 
@@ -37,6 +38,7 @@
 
 typedef struct dsl_dataset_user_hold_arg {
 	nvlist_t *dduha_holds;
+	nvlist_t *dduha_chkholds;
 	nvlist_t *dduha_errlist;
 	minor_t dduha_minor;
 } dsl_dataset_user_hold_arg_t;
@@ -53,25 +55,24 @@ dsl_dataset_user_hold_check_one(dsl_data
 	objset_t *mos = dp->dp_meta_objset;
 	int error = 0;
 
+	ASSERT(dsl_pool_config_held(dp));
+
 	if (strlen(htag) > MAXNAMELEN)
-		return (E2BIG);
+		return (SET_ERROR(E2BIG));
 	/* Tempholds have a more restricted length */
 	if (temphold && strlen(htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
-		return (E2BIG);
+		return (SET_ERROR(E2BIG));
 
 	/* tags must be unique (if ds already exists) */
-	if (ds != NULL) {
-		mutex_enter(&ds->ds_lock);
-		if (ds->ds_phys->ds_userrefs_obj != 0) {
-			uint64_t value;
-			error = zap_lookup(mos, ds->ds_phys->ds_userrefs_obj,
-			    htag, 8, 1, &value);
-			if (error == 0)
-				error = SET_ERROR(EEXIST);
-			else if (error == ENOENT)
-				error = 0;
-		}
-		mutex_exit(&ds->ds_lock);
+	if (ds != NULL && ds->ds_phys->ds_userrefs_obj != 0) {
+		uint64_t value;
+
+		error = zap_lookup(mos, ds->ds_phys->ds_userrefs_obj,
+		    htag, 8, 1, &value);
+		if (error == 0)
+			error = SET_ERROR(EEXIST);
+		else if (error == ENOENT)
+			error = 0;
 	}
 
 	return (error);
@@ -82,52 +83,67 @@ dsl_dataset_user_hold_check(void *arg, d
 {
 	dsl_dataset_user_hold_arg_t *dduha = arg;
 	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
-	int rv = 0;
 
 	if (spa_version(dp->dp_spa) < SPA_VERSION_USERREFS)
 		return (SET_ERROR(ENOTSUP));
 
-	for (pair = nvlist_next_nvpair(dduha->dduha_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
-		int error = 0;
+	if (!dmu_tx_is_syncing(tx))
+		return (0);
+
+	for (nvpair_t *pair = nvlist_next_nvpair(dduha->dduha_holds, NULL);
+	    pair != NULL; pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
 		dsl_dataset_t *ds;
-		char *htag;
+		int error = 0;
+		char *htag, *name;
 
 		/* must be a snapshot */
-		if (strchr(nvpair_name(pair), '@') == NULL)
+		name = nvpair_name(pair);
+		if (strchr(name, '@') == NULL)
 			error = SET_ERROR(EINVAL);
 
 		if (error == 0)
 			error = nvpair_value_string(pair, &htag);
-		if (error == 0) {
-			error = dsl_dataset_hold(dp,
-			    nvpair_name(pair), FTAG, &ds);
-		}
+
+		if (error == 0)
+			error = dsl_dataset_hold(dp, name, FTAG, &ds);
+
 		if (error == 0) {
 			error = dsl_dataset_user_hold_check_one(ds, htag,
 			    dduha->dduha_minor != 0, tx);
 			dsl_dataset_rele(ds, FTAG);
 		}
 
-		if (error != 0) {
-			rv = error;
-			fnvlist_add_int32(dduha->dduha_errlist,
-			    nvpair_name(pair), error);
+		if (error == 0) {
+			fnvlist_add_string(dduha->dduha_chkholds, name, htag);
+		} else {
+			/*
+			 * We register ENOENT errors so they can be correctly
+			 * reported if needed, such as when all holds fail.
+			 */
+			fnvlist_add_int32(dduha->dduha_errlist, name, error);
+			if (error != ENOENT)
+				return (error);
 		}
 	}
-	return (rv);
+
+	/* Return ENOENT if no holds would be created. */
+	if (nvlist_empty(dduha->dduha_chkholds))
+		return (SET_ERROR(ENOENT));
+
+	return (0);
 }
 
-void
-dsl_dataset_user_hold_sync_one(dsl_dataset_t *ds, const char *htag,
-    minor_t minor, uint64_t now, dmu_tx_t *tx)
+
+static void
+dsl_dataset_user_hold_sync_one_impl(nvlist_t *tmpholds, dsl_dataset_t *ds,
+    const char *htag, minor_t minor, uint64_t now, dmu_tx_t *tx)
 {
 	dsl_pool_t *dp = ds->ds_dir->dd_pool;
 	objset_t *mos = dp->dp_meta_objset;
 	uint64_t zapobj;
 
-	mutex_enter(&ds->ds_lock);
+	ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+
 	if (ds->ds_phys->ds_userrefs_obj == 0) {
 		/*
 		 * This is the first user hold for this dataset.  Create
@@ -140,14 +156,26 @@ dsl_dataset_user_hold_sync_one(dsl_datas
 		zapobj = ds->ds_phys->ds_userrefs_obj;
 	}
 	ds->ds_userrefs++;
-	mutex_exit(&ds->ds_lock);
 
 	VERIFY0(zap_add(mos, zapobj, htag, 8, 1, &now, tx));
 
 	if (minor != 0) {
+		char name[MAXNAMELEN];
+		nvlist_t *tags;
+
 		VERIFY0(dsl_pool_user_hold(dp, ds->ds_object,
 		    htag, now, tx));
-		dsl_register_onexit_hold_cleanup(ds, htag, minor);
+		(void) snprintf(name, sizeof (name), "%llx",
+		    (u_longlong_t)ds->ds_object);
+
+		if (nvlist_lookup_nvlist(tmpholds, name, &tags) != 0) {
+			tags = fnvlist_alloc();
+			fnvlist_add_boolean(tags, htag);
+			fnvlist_add_nvlist(tmpholds, name, tags);
+			fnvlist_free(tags);
+		} else {
+			fnvlist_add_boolean(tags, htag);
+		}
 	}
 
 	spa_history_log_internal_ds(ds, "hold", tx,
@@ -155,140 +183,296 @@ dsl_dataset_user_hold_sync_one(dsl_datas
 	    htag, minor != 0, ds->ds_userrefs);
 }
 
+typedef struct zfs_hold_cleanup_arg {
+	char zhca_spaname[MAXNAMELEN];
+	uint64_t zhca_spa_load_guid;
+	nvlist_t *zhca_holds;
+} zfs_hold_cleanup_arg_t;
+
+static void
+dsl_dataset_user_release_onexit(void *arg)
+{
+	zfs_hold_cleanup_arg_t *ca = arg;
+	spa_t *spa;
+	int error;
+
+	error = spa_open(ca->zhca_spaname, &spa, FTAG);
+	if (error != 0) {
+		zfs_dbgmsg("couldn't release holds on pool=%s "
+		    "because pool is no longer loaded",
+		    ca->zhca_spaname);
+		return;
+	}
+	if (spa_load_guid(spa) != ca->zhca_spa_load_guid) {
+		zfs_dbgmsg("couldn't release holds on pool=%s "
+		    "because pool is no longer loaded (guid doesn't match)",
+		    ca->zhca_spaname);
+		spa_close(spa, FTAG);
+		return;
+	}
+
+	(void) dsl_dataset_user_release_tmp(spa_get_dsl(spa), ca->zhca_holds);
+	fnvlist_free(ca->zhca_holds);
+	kmem_free(ca, sizeof (zfs_hold_cleanup_arg_t));
+	spa_close(spa, FTAG);
+}
+
+static void
+dsl_onexit_hold_cleanup(spa_t *spa, nvlist_t *holds, minor_t minor)
+{
+	zfs_hold_cleanup_arg_t *ca;
+
+	if (minor == 0 || nvlist_empty(holds)) {
+		fnvlist_free(holds);
+		return;
+	}
+
+	ASSERT(spa != NULL);
+	ca = kmem_alloc(sizeof (*ca), KM_SLEEP);
+
+	(void) strlcpy(ca->zhca_spaname, spa_name(spa),
+	    sizeof (ca->zhca_spaname));
+	ca->zhca_spa_load_guid = spa_load_guid(spa);
+	ca->zhca_holds = holds;
+	VERIFY0(zfs_onexit_add_cb(minor,
+	    dsl_dataset_user_release_onexit, ca, NULL));
+}
+
+void
+dsl_dataset_user_hold_sync_one(dsl_dataset_t *ds, const char *htag,
+    minor_t minor, uint64_t now, dmu_tx_t *tx)
+{
+	nvlist_t *tmpholds;
+
+	if (minor != 0)
+		tmpholds = fnvlist_alloc();
+	else
+		tmpholds = NULL;
+	dsl_dataset_user_hold_sync_one_impl(tmpholds, ds, htag, minor, now, tx);
+	dsl_onexit_hold_cleanup(dsl_dataset_get_spa(ds), tmpholds, minor);
+}
+
 static void
 dsl_dataset_user_hold_sync(void *arg, dmu_tx_t *tx)
 {
 	dsl_dataset_user_hold_arg_t *dduha = arg;
 	dsl_pool_t *dp = dmu_tx_pool(tx);
-	nvpair_t *pair;
+	nvlist_t *tmpholds;
 	uint64_t now = gethrestime_sec();
 
-	for (pair = nvlist_next_nvpair(dduha->dduha_holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(dduha->dduha_holds, pair)) {
+	if (dduha->dduha_minor != 0)
+		tmpholds = fnvlist_alloc();
+	else
+		tmpholds = NULL;
+	for (nvpair_t *pair = nvlist_next_nvpair(dduha->dduha_chkholds, NULL);
+	    pair != NULL;
+	    pair = nvlist_next_nvpair(dduha->dduha_chkholds, pair)) {
 		dsl_dataset_t *ds;
+
 		VERIFY0(dsl_dataset_hold(dp, nvpair_name(pair), FTAG, &ds));
-		dsl_dataset_user_hold_sync_one(ds, fnvpair_value_string(pair),
-		    dduha->dduha_minor, now, tx);
+		dsl_dataset_user_hold_sync_one_impl(tmpholds, ds,
+		    fnvpair_value_string(pair), dduha->dduha_minor, now, tx);
 		dsl_dataset_rele(ds, FTAG);
 	}
+	dsl_onexit_hold_cleanup(dp->dp_spa, tmpholds, dduha->dduha_minor);
 }
 
 /*
+ * The full semantics of this function are described in the comment above
+ * lzc_hold().
+ *
+ * To summarize:

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 07:52:50 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A09E911F;
 Wed, 12 Jun 2013 07:52:50 +0000 (UTC)
 (envelope-from grog@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8162A17E4;
 Wed, 12 Jun 2013 07:52:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C7qo8K098830;
 Wed, 12 Jun 2013 07:52:50 GMT (envelope-from grog@svn.freebsd.org)
Received: (from grog@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C7qnP7098823;
 Wed, 12 Jun 2013 07:52:49 GMT (envelope-from grog@svn.freebsd.org)
Message-Id: <201306120752.r5C7qnP7098823@svn.freebsd.org>
From: Greg Lehey 
Date: Wed, 12 Jun 2013 07:52:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251647 - head/usr.bin/calendar
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 07:52:50 -0000

Author: grog
Date: Wed Jun 12 07:52:49 2013
New Revision: 251647
URL: http://svnweb.freebsd.org/changeset/base/251647

Log:
  Handle some expression regressions.
  Explicitly use GNU cpp for preprocessing.
  Remove explicit debugging code.
  Change some variable names to be less confusing.
  Improve some comments.
  Improve indentation.
  
  PR:		162211
  		168785
  MFC after:	2 weeks

Modified:
  head/usr.bin/calendar/calendar.h
  head/usr.bin/calendar/dates.c
  head/usr.bin/calendar/io.c
  head/usr.bin/calendar/parsedata.c
  head/usr.bin/calendar/pathnames.h
  head/usr.bin/calendar/sunpos.c

Modified: head/usr.bin/calendar/calendar.h
==============================================================================
--- head/usr.bin/calendar/calendar.h	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/calendar.h	Wed Jun 12 07:52:49 2013	(r251647)
@@ -101,11 +101,11 @@ extern int EastLongitude;
 					 * program wrong.
 					 */
 
-/* 
+/*
  * All the astronomical calculations are carried out for the meridian 120
  * degrees east of Greenwich.
  */
-#define UTCOFFSET_CNY		8.0		
+#define UTCOFFSET_CNY		8.0
 
 extern int	debug;		/* show parsing of the input */
 extern int	year1, year2;
@@ -174,7 +174,7 @@ int	j2g(int);
 
 /* dates.c */
 extern int cumdaytab[][14];
-extern int mondaytab[][14];
+extern int monthdaytab[][14];
 extern int debug_remember;
 void	generatedates(struct tm *tp1, struct tm *tp2);
 void	dumpdates(void);

Modified: head/usr.bin/calendar/dates.c
==============================================================================
--- head/usr.bin/calendar/dates.c	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/dates.c	Wed Jun 12 07:52:49 2013	(r251647)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,7 +22,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  */
 
 #include 
@@ -73,8 +73,8 @@ int	cumdaytab[][14] = {
 	{0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
 };
 /* 1-based month, individual */
-static int *mondays;
-int	mondaytab[][14] = {
+static int *monthdays;
+int	monthdaytab[][14] = {
 	{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
 	{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
 };
@@ -192,11 +192,11 @@ generatedates(struct tm *tp1, struct tm 
 		 * - Take all days from 
 		 * - Take the first days from m2
 		 */
-		mondays = mondaytab[isleap(y1)];
-		for (d = d1; d <= mondays[m1]; d++)
+		monthdays = monthdaytab[isleap(y1)];
+		for (d = d1; d <= monthdays[m1]; d++)
 			createdate(y1, m1, d);
 		for (m = m1 + 1; m < m2; m++)
-			for (d = 1; d <= mondays[m]; d++)
+			for (d = 1; d <= monthdays[m]; d++)
 				createdate(y1, m, d);
 		for (d = 1; d <= d2; d++)
 			createdate(y1, m2, d);
@@ -210,21 +210,21 @@ generatedates(struct tm *tp1, struct tm 
 	 * - Take all days from y2-[1 .. m2>
 	 * - Take the first days of y2-m2
 	 */
-	mondays = mondaytab[isleap(y1)];
-	for (d = d1; d <= mondays[m1]; d++)
+	monthdays = monthdaytab[isleap(y1)];
+	for (d = d1; d <= monthdays[m1]; d++)
 		createdate(y1, m1, d);
 	for (m = m1 + 1; m <= 12; m++)
-		for (d = 1; d <= mondays[m]; d++)
+		for (d = 1; d <= monthdays[m]; d++)
 			createdate(y1, m, d);
 	for (y = y1 + 1; y < y2; y++) {
-		mondays = mondaytab[isleap(y)];
+		monthdays = monthdaytab[isleap(y)];
 		for (m = 1; m <= 12; m++)
-			for (d = 1; d <= mondays[m]; d++)
+			for (d = 1; d <= monthdays[m]; d++)
 				createdate(y, m, d);
 	}
-	mondays = mondaytab[isleap(y2)];
+	monthdays = monthdaytab[isleap(y2)];
 	for (m = 1; m < m2; m++)
-		for (d = 1; d <= mondays[m]; d++)
+		for (d = 1; d <= monthdays[m]; d++)
 			createdate(y2, m, d);
 	for (d = 1; d <= d2; d++)
 		createdate(y2, m2, d);
@@ -360,12 +360,12 @@ first_dayofweek_of_month(int yy, int mm)
 				return (m->firstdayofweek);
 			m = m->nextmonth;
 		}
-		/* Should not happen */
+		/* No data for this month */
 		return (-1);
 	}
 
-	/* Should not happen */
-	return (-1);
+	/* No data for this year.  Error? */
+        return (-1);
 }
 
 int

Modified: head/usr.bin/calendar/io.c
==============================================================================
--- head/usr.bin/calendar/io.c	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/io.c	Wed Jun 12 07:52:49 2013	(r251647)
@@ -273,7 +273,7 @@ opencal(void)
 			_exit(1);
 		}
 		execl(_PATH_CPP, "cpp", "-P",
-		    "-traditional", "-nostdinc",	/* GCC specific opts */
+		    "-traditional-cpp", "-nostdinc",	/* GCC specific opts */
 		    "-I.", "-I", _PATH_INCLUDE, (char *)NULL);
 		warn(_PATH_CPP);
 		_exit(1);

Modified: head/usr.bin/calendar/parsedata.c
==============================================================================
--- head/usr.bin/calendar/parsedata.c	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/parsedata.c	Wed Jun 12 07:52:49 2013	(r251647)
@@ -47,6 +47,7 @@ static int indextooffset(char *s);
 static int parseoffset(char *s);
 static char *floattoday(int year, double f);
 static char *floattotime(double f);
+static int wdayom (int day, int offset, int month, int year);
 
 /*
  * Expected styles:
@@ -184,7 +185,7 @@ determinestyle(char *date, int *flags,
 	}
 
 	/*
-	 * AFTER this, leave by goto-ing to "allfine" or "fail" to restore the
+	 * After this, leave by goto-ing to "allfine" or "fail" to restore the
 	 * original data in `date'.
 	 */
 	pold = *p;
@@ -203,15 +204,9 @@ determinestyle(char *date, int *flags,
 		*flags |= F_YEAR;
 	}
 
-	/*
-	printf("p1: %s\n", p1);
-	printf("p2: %s\n", p2);
-	printf("year: %s\n", year);
-	*/
-
 	/* Check if there is a month-string in the date */
 	if ((checkmonth(p1, &len, &offset, &pmonth) != 0)
-	 || (checkmonth(p2, &len, &offset, &pmonth) != 0 && (p2 = p1))) {
+	    || (checkmonth(p2, &len, &offset, &pmonth) != 0 && (p2 = p1))) {
 		/* p2 is the non-month part */
 		*flags |= F_MONTH;
 		*imonth = offset;
@@ -239,13 +234,12 @@ determinestyle(char *date, int *flags,
 			*flags |= F_MODIFIERINDEX;
 			goto allfine;
 		}
-
 		goto fail;
 	}
 
 	/* Check if there is an every-day or every-month in the string */
 	if ((strcmp(p1, "*") == 0 && isonlydigits(p2, 1))
-	 || (strcmp(p2, "*") == 0 && isonlydigits(p1, 1) && (p2 = p1))) {
+	    || (strcmp(p2, "*") == 0 && isonlydigits(p1, 1) && (p2 = p1))) {
 		int d;
 
 		*flags |= F_ALLMONTH;
@@ -258,7 +252,7 @@ determinestyle(char *date, int *flags,
 
 	/* Month as a number, then a weekday */
 	if (isonlydigits(p1, 1)
-	 && checkdayofweek(p2, &len, &offset, &dow) != 0) {
+	    && checkdayofweek(p2, &len, &offset, &dow) != 0) {
 		int d;
 
 		*flags |= F_MONTH;
@@ -316,7 +310,10 @@ allfine:
 
 }
 
-static void
+void
+remember(int *rememberindex, int *y, int *m, int *d, char **ed, int yy, int mm,
+    int dd, char *extra);
+void
 remember(int *rememberindex, int *y, int *m, int *d, char **ed, int yy, int mm,
     int dd, char *extra)
 {
@@ -367,16 +364,60 @@ debug_determinestyle(int dateonly, char 
 		printf("specialday: |%s|\n", specialday);
 }
 
-struct yearinfo {
+static struct yearinfo {
 	int year;
 	int ieaster, ipaskha, firstcnyday;
 	double ffullmoon[MAXMOONS], fnewmoon[MAXMOONS];
 	double ffullmooncny[MAXMOONS], fnewmooncny[MAXMOONS];
 	int ichinesemonths[MAXMOONS];
 	double equinoxdays[2], solsticedays[2];
-	int *mondays;
+	int *monthdays;
 	struct yearinfo *next;
-};
+} *years, *yearinfo;
+
+/*
+ * Calculate dates with offset from weekdays, like Thurs-3, Wed+2, etc.
+ * day is the day of the week,
+ * offset the ordinal number of the weekday in the month.
+ */
+static int
+wdayom (int day, int offset, int month, int year)
+{
+/* Weekday of first day in month */
+	int wday1;                                /* first day of month */
+/* Weekday of last day in month */
+	int wdayn;
+	int d;
+
+	wday1 = first_dayofweek_of_month(year, month);
+	if (wday1 < 0)                          /* not set */
+		return (wday1);
+	/*
+	 * Date of zeroth or first of our weekday in month, depending on the
+	 * relationship with the first of the month.  The range is -6:6.
+	 */
+	d = (day - wday1 + 1) % 7;
+	/*
+	 * Which way are we counting?  Offset 0 is invalid, abs (offset) > 5 is
+	 * meaningless, but that's OK.  Offset 5 may or may not be meaningless,
+	 * so there's no point in complaining for complaining's sake.
+	 */
+	if (offset < 0) {			/* back from end of month */
+						/* FIXME */
+		wdayn = d;
+		while (wdayn <= yearinfo->monthdays[month])
+			wdayn += 7;
+		d = offset * 7 + wdayn;
+	} else if (offset > 0){
+		if (d > 0)
+			d += offset * 7 - 7;
+		else
+			d += offset * 7;
+	} else
+		warnx ("Invalid offset 0");
+	return (d);
+}
+
 /*
  * Possible date formats include any combination of:
  *	3-charmonth			(January, Jan, Jan)
@@ -400,8 +441,6 @@ parsedaymonth(char *date, int *yearp, in
 	char *ed;
 	int retvalsign = 1;
 
-	static struct yearinfo *years, *yearinfo;
-
 	/*
 	 * CONVENTION
 	 *
@@ -419,8 +458,8 @@ parsedaymonth(char *date, int *yearp, in
 		    dayofmonth, idayofmonth, dayofweek, idayofweek,
 		    modifieroffset, modifierindex, specialday, syear, iyear);
 	if (determinestyle(date, flags, month, &imonth, dayofmonth,
-	    &idayofmonth, dayofweek, &idayofweek, modifieroffset,
-	    modifierindex, specialday, syear, &iyear) == 0) {
+		&idayofmonth, dayofweek, &idayofweek, modifieroffset,
+		modifierindex, specialday, syear, &iyear) == 0) {
 		if (debug)
 			printf("Failed!\n");
 		return (0);
@@ -457,7 +496,7 @@ parsedaymonth(char *date, int *yearp, in
 			yearinfo->next = years;
 			years = yearinfo;
 
-			yearinfo->mondays = mondaytab[isleap(year)];
+			yearinfo->monthdays = monthdaytab[isleap(year)];
 			yearinfo->ieaster = easter(year);
 			yearinfo->ipaskha = paskha(year);
 			fpom(year, UTCOffset, yearinfo->ffullmoon,
@@ -514,7 +553,7 @@ parsedaymonth(char *date, int *yearp, in
 
 		/* Every day of a month */
 		if (lflags == (F_ALLDAY | F_MONTH)) {
-			for (d = 1; d <= yearinfo->mondays[imonth]; d++) {
+			for (d = 1; d <= yearinfo->monthdays[imonth]; d++) {
 				if (!remember_ymd(year, imonth, d))
 					continue;
 				remember(&remindex, yearp, monthp, dayp, edp,
@@ -548,14 +587,15 @@ parsedaymonth(char *date, int *yearp, in
 			continue;
 		}
 
-		/* Every so-manied dayofweek of every month of the year */
+		/*
+	         * Every so-manied dayofweek of every month of the year:
+	         * Thu-3
+	         */
 		if (lflags == (F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
 			offset = indextooffset(modifierindex);
 
-			for (m = 0; m < 12; m++) {
-				dow = first_dayofweek_of_month(year, m);
-				d = (idayofweek - dow + 8) % 7;
-				d += (offset - 1) * 7;
+			for (m = 0; m <= 12; m++) {
+	                        d = wdayom (idayofweek, offset, m, year);
 				if (remember_ymd(year, m, d)) {
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -566,7 +606,10 @@ parsedaymonth(char *date, int *yearp, in
 			continue;
 		}
 
-		/* A certain dayofweek of a month */
+		/*
+	         * A certain dayofweek of a month
+	         * Jan/Thu-3
+	         */
 		if (lflags ==
 		    (F_MONTH | F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
 			offset = indextooffset(modifierindex);
@@ -574,9 +617,9 @@ parsedaymonth(char *date, int *yearp, in
 			d = (idayofweek - dow + 8) % 7;
 
 			if (offset > 0) {
-				while (d <= yearinfo->mondays[imonth]) {
+				while (d <= yearinfo->monthdays[imonth]) {
 					if (--offset == 0
-					 && remember_ymd(year, imonth, d)) {
+					    && remember_ymd(year, imonth, d)) {
 						remember(&remindex,
 						    yearp, monthp, dayp, edp,
 						    year, imonth, d, NULL);
@@ -587,7 +630,7 @@ parsedaymonth(char *date, int *yearp, in
 				continue;
 			}
 			if (offset < 0) {
-				while (d <= yearinfo->mondays[imonth])
+				while (d <= yearinfo->monthdays[imonth])
 					d += 7;
 				while (offset != 0) {
 					offset++;
@@ -606,7 +649,7 @@ parsedaymonth(char *date, int *yearp, in
 		if (lflags == (F_DAYOFWEEK | F_MONTH | F_VARIABLE)) {
 			dow = first_dayofweek_of_month(year, imonth);
 			d = (idayofweek - dow + 8) % 7;
-			while (d <= yearinfo->mondays[imonth]) {
+			while (d <= yearinfo->monthdays[imonth]) {
 				if (remember_ymd(year, imonth, d))
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -623,7 +666,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->ieaster + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -636,7 +679,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->ipaskha + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -649,7 +692,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->firstcnyday + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -665,7 +708,7 @@ parsedaymonth(char *date, int *yearp, in
 				offset = parseoffset(modifieroffset);
 			for (i = 0; yearinfo->ffullmoon[i] > 0; i++) {
 				if (remember_yd(year,
-				    floor(yearinfo->ffullmoon[i]) + offset,
+	                                floor(yearinfo->ffullmoon[i]) + offset,
 					&rm, &rd)) {
 					ed = floattotime(
 					    yearinfo->ffullmoon[i]);
@@ -687,8 +730,8 @@ parsedaymonth(char *date, int *yearp, in
 				offset = parseoffset(modifieroffset);
 			for (i = 0; yearinfo->ffullmoon[i] > 0; i++) {
 				if (remember_yd(year,
-				    floor(yearinfo->fnewmoon[i]) + offset,
-				    &rm, &rd)) {
+					floor(yearinfo->fnewmoon[i]) + offset,
+					&rm, &rd)) {
 					ed = floattotime(yearinfo->fnewmoon[i]);
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -705,7 +748,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->equinoxdays[0] + offset,
-			    &rm, &rd)) {
+				&rm, &rd)) {
 				ed = floattotime(yearinfo->equinoxdays[0]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -733,7 +776,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year,
-			    yearinfo->solsticedays[0] + offset, &rm, &rd)) {
+				yearinfo->solsticedays[0] + offset, &rm, &rd)) {
 				ed = floattotime(yearinfo->solsticedays[0]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -746,7 +789,7 @@ parsedaymonth(char *date, int *yearp, in
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year,
-			    yearinfo->solsticedays[1] + offset, &rm, &rd)) {
+				yearinfo->solsticedays[1] + offset, &rm, &rd)) {
 				ed = floattotime(yearinfo->solsticedays[1]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -755,11 +798,11 @@ parsedaymonth(char *date, int *yearp, in
 		}
 
 		if (debug) {
-		    printf("Unprocessed:\n");
-		    debug_determinestyle(2, date, lflags, month, imonth,
-			dayofmonth, idayofmonth, dayofweek, idayofweek,
-			modifieroffset, modifierindex, specialday, syear,
-			iyear);
+			printf("Unprocessed:\n");
+			debug_determinestyle(2, date, lflags, month, imonth,
+			    dayofmonth, idayofmonth, dayofweek, idayofweek,
+			    modifieroffset, modifierindex, specialday, syear,
+			    iyear);
 		}
 		retvalsign = -1;
 	}
@@ -972,7 +1015,6 @@ indextooffset(char *s)
 static int
 parseoffset(char *s)
 {
-
 	return strtol(s, NULL, 10);
 }
 

Modified: head/usr.bin/calendar/pathnames.h
==============================================================================
--- head/usr.bin/calendar/pathnames.h	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/pathnames.h	Wed Jun 12 07:52:49 2013	(r251647)
@@ -32,5 +32,5 @@
 
 #include 
 
-#define	_PATH_CPP	"/usr/bin/cpp"
+#define	_PATH_CPP	"/usr/bin/gcpp"
 #define	_PATH_INCLUDE	"/usr/share/calendar"

Modified: head/usr.bin/calendar/sunpos.c
==============================================================================
--- head/usr.bin/calendar/sunpos.c	Wed Jun 12 07:07:06 2013	(r251646)
+++ head/usr.bin/calendar/sunpos.c	Wed Jun 12 07:52:49 2013	(r251647)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,7 +22,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  */
 
 #include 
@@ -373,7 +373,7 @@ calculatesunlongitude30(int year, int de
 	int firstmonth330 = -1;
 
 	cumdays = cumdaytab[isleap(year)];
-	monthdays = mondaytab[isleap(year)];
+	monthdays = monthdaytab[isleap(year)];
 	pichinesemonths = ichinesemonths;
 
 	h = 0;

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 07:54:00 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7BF59383;
 Wed, 12 Jun 2013 07:54:00 +0000 (UTC)
 (envelope-from grog@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6EC5A17F3;
 Wed, 12 Jun 2013 07:54:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C7s094099095;
 Wed, 12 Jun 2013 07:54:00 GMT (envelope-from grog@svn.freebsd.org)
Received: (from grog@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C7s0qx099093;
 Wed, 12 Jun 2013 07:54:00 GMT (envelope-from grog@svn.freebsd.org)
Message-Id: <201306120754.r5C7s0qx099093@svn.freebsd.org>
From: Greg Lehey 
Date: Wed, 12 Jun 2013 07:54:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251648 - head/usr.bin/calendar
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 07:54:00 -0000

Author: grog
Date: Wed Jun 12 07:53:59 2013
New Revision: 251648
URL: http://svnweb.freebsd.org/changeset/base/251648

Log:
  style(9)
  
  MFC after:	2 weeks

Modified:
  head/usr.bin/calendar/calendar.c

Modified: head/usr.bin/calendar/calendar.c
==============================================================================
--- head/usr.bin/calendar/calendar.c	Wed Jun 12 07:52:49 2013	(r251647)
+++ head/usr.bin/calendar/calendar.c	Wed Jun 12 07:53:59 2013	(r251648)
@@ -218,7 +218,6 @@ main(int argc, char *argv[])
 static void __dead2
 usage(void)
 {
-
 	fprintf(stderr, "%s\n%s\n%s\n",
 	    "usage: calendar [-A days] [-a] [-B days] [-D sun|moon] [-d]",
 	    "		     [-F friday] [-f calendarfile] [-l longitude]",

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 09:07:16 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2D02070;
 Wed, 12 Jun 2013 09:07:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1F9061AFA;
 Wed, 12 Jun 2013 09:07:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C97GG2022050;
 Wed, 12 Jun 2013 09:07:16 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C97FTN022047;
 Wed, 12 Jun 2013 09:07:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306120907.r5C97FTN022047@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 09:07:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251649 - in head/sys/cam: ata scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 09:07:16 -0000

Author: mav
Date: Wed Jun 12 09:07:15 2013
New Revision: 251649
URL: http://svnweb.freebsd.org/changeset/base/251649

Log:
  Acquire periph reference when handling d_getattr() method call.
  
  While GEOM in general has provider opened while sending BIO_GETATTR,
  GEOM DISK does not really need to open disk to read medium-unrelated
  attributes for own use.
  
  Proposed by:	ken

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Wed Jun 12 07:53:59 2013	(r251648)
+++ head/sys/cam/ata/ata_da.c	Wed Jun 12 09:07:15 2013	(r251649)
@@ -1080,10 +1080,13 @@ adagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
+	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
+		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
+	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Wed Jun 12 07:53:59 2013	(r251648)
+++ head/sys/cam/scsi/scsi_da.c	Wed Jun 12 09:07:15 2013	(r251649)
@@ -1427,10 +1427,13 @@ dagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
+	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
+		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
+	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 12:38:13 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0A6DD679;
 Wed, 12 Jun 2013 12:38:13 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D78EA18A8;
 Wed, 12 Jun 2013 12:38:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CCcCMs087762;
 Wed, 12 Jun 2013 12:38:12 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CCcCuV087761;
 Wed, 12 Jun 2013 12:38:12 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201306121238.r5CCcCuV087761@svn.freebsd.org>
From: Nathan Whitehorn 
Date: Wed, 12 Jun 2013 12:38:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251650 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 12:38:13 -0000

Author: nwhitehorn
Date: Wed Jun 12 12:38:12 2013
New Revision: 251650
URL: http://svnweb.freebsd.org/changeset/base/251650

Log:
  Add missing copyright notice.

Modified:
  head/release/generate-release.sh

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Wed Jun 12 09:07:15 2013	(r251649)
+++ head/release/generate-release.sh	Wed Jun 12 12:38:12 2013	(r251650)
@@ -1,4 +1,31 @@
 #!/bin/sh
+#-
+# Copyright (c) 2011 Nathan Whitehorn
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
 
 # generate-release.sh: check out source trees, and build release components with
 #  totally clean, fresh trees.
@@ -16,8 +43,6 @@
 #  WORLD_FLAGS: optional flags to pass to buildworld (e.g. -j)
 #  KERNEL_FLAGS: optional flags to pass to buildkernel (e.g. -j)
 #
-# $FreeBSD$
-#
 
 usage()
 {

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 12:51:44 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9A519CAC;
 Wed, 12 Jun 2013 12:51:44 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7401119D3;
 Wed, 12 Jun 2013 12:51:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CCpiPZ092935;
 Wed, 12 Jun 2013 12:51:44 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CCpiFo092933;
 Wed, 12 Jun 2013 12:51:44 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121251.r5CCpiFo092933@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 12:51:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251651 - in head/sys/dev: cfi nand
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 12:51:44 -0000

Author: mav
Date: Wed Jun 12 12:51:43 2013
New Revision: 251651
URL: http://svnweb.freebsd.org/changeset/base/251651

Log:
  Use direct custom implementations instead of g_handleattr() for CFI and NAND
  d_getattr().  Since these drivers use disk(9) KPI and not directly GEOM, use
  of that function means KPI layering violation, causing extra g_io_deliver()
  call for the request.

Modified:
  head/sys/dev/cfi/cfi_disk.c
  head/sys/dev/nand/nand_geom.c

Modified: head/sys/dev/cfi/cfi_disk.c
==============================================================================
--- head/sys/dev/cfi/cfi_disk.c	Wed Jun 12 12:38:12 2013	(r251650)
+++ head/sys/dev/cfi/cfi_disk.c	Wed Jun 12 12:51:43 2013	(r251651)
@@ -292,14 +292,13 @@ cfi_disk_getattr(struct bio *bp)
 	sc = dsc->parent;
 	dev = sc->sc_dev;
 
-	do {
-		if (g_handleattr(bp, "CFI::device", &dev, sizeof(device_t)))
-			break;
-
-		return (ERESTART);
-	} while(0);
-
-	return (EJUSTRETURN);
+	if (strcmp(bp->bio_attribute, "CFI::device") == 0) {
+		if (bp->bio_length != sizeof(dev))
+			return (EFAULT);
+		bcopy(&dev, bp->bio_data, sizeof(dev));
+	} else
+		return (-1);
+	return (0);
 }
 
 

Modified: head/sys/dev/nand/nand_geom.c
==============================================================================
--- head/sys/dev/nand/nand_geom.c	Wed Jun 12 12:38:12 2013	(r251650)
+++ head/sys/dev/nand/nand_geom.c	Wed Jun 12 12:51:43 2013	(r251651)
@@ -156,6 +156,7 @@ nand_getattr(struct bio *bp)
 	struct nand_chip *chip;
 	struct chip_geom *cg;
 	device_t dev;
+	int val;
 
 	if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL)
 		return (ENXIO);
@@ -166,22 +167,25 @@ nand_getattr(struct bio *bp)
 	dev = device_get_parent(chip->dev);
 	dev = device_get_parent(dev);
 
-	do {
-		if (g_handleattr_int(bp, "NAND::oobsize", cg->oob_size))
-			break;
-		else if (g_handleattr_int(bp, "NAND::pagesize", cg->page_size))
-			break;
-		else if (g_handleattr_int(bp, "NAND::blocksize",
-		    cg->block_size))
-			break;
-		else if (g_handleattr(bp, "NAND::device", &(dev),
-		    sizeof(device_t)))
-			break;
-
-		return (ERESTART);
-	} while (0);
-
-	return (EJUSTRETURN);
+	if (strcmp(bp->bio_attribute, "NAND::device") == 0) {
+		if (bp->bio_length != sizeof(dev))
+			return (EFAULT);
+		bcopy(&dev, bp->bio_data, sizeof(dev));
+	} else {
+		if (strcmp(bp->bio_attribute, "NAND::oobsize") == 0)
+			val = cg->oob_size;
+		else if (strcmp(bp->bio_attribute, "NAND::pagesize") == 0)
+			val = cg->page_size;
+		else if (strcmp(bp->bio_attribute, "NAND::blocksize") == 0)
+			val = cg->block_size;
+		else
+			return (-1);
+		if (bp->bio_length != sizeof(val))
+			return (EFAULT);
+		bcopy(&val, bp->bio_data, sizeof(val));
+	}
+	bp->bio_completed = bp->bio_length;
+	return (0);
 }
 
 static int

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 13:15:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6BAF9868;
 Wed, 12 Jun 2013 13:15:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4F3221BB7;
 Wed, 12 Jun 2013 13:15:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CDFTKS001050;
 Wed, 12 Jun 2013 13:15:29 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CDFS7r001048;
 Wed, 12 Jun 2013 13:15:28 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306121315.r5CDFS7r001048@svn.freebsd.org>
From: Glen Barber 
Date: Wed, 12 Jun 2013 13:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251652 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 13:15:29 -0000

Author: gjb
Date: Wed Jun 12 13:15:28 2013
New Revision: 251652
URL: http://svnweb.freebsd.org/changeset/base/251652

Log:
  Add new script to run release builds.  The script is heavily based upon
  the release/generate-release.sh script by nwhitehorn.
  
  This script can use optional configuration file to override defaults,
  making running multiple serialzied builds with different specific
  configurations or architecture-specific tunings quite easy.
  
  Sample overrideable options are included in the release.conf.sample
  file.
  
  Approved by:	kib (mentor)
  MFC After:	2 weeks
  X-MFC-To:	stable/9 only

Added:
  head/release/release.conf.sample   (contents, props changed)
  head/release/release.sh   (contents, props changed)

Added: head/release/release.conf.sample
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/release/release.conf.sample	Wed Jun 12 13:15:28 2013	(r251652)
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+## Set the directory within which the release will be built.
+CHROOTDIR="/scratch"
+
+## Set the svn host.
+SVNROOT="svn://svn.FreeBSD.org"
+
+## Set the src/, ports/, and doc/ branches or tags.
+SRCBRANCH="base/head"
+DOCBRANCH="doc/head"
+PORTBRANCH="ports/head"
+
+## Set the src/, ports/, and doc/ revisions.
+SRCREVISION="-rHEAD"
+DOCREVISION="-rHEAD"
+PORTREVISION="-rHEAD"
+
+## Set to override the default target architecture.
+#TARGET="amd64"
+#TARGET_ARCH="amd64"
+#KERNEL="GENERIC"
+
+## Set to specify a custom make.conf and/or src.conf
+#MAKE_CONF="/etc/local/make.conf"
+#SRC_CONF="/etc/local/src.conf"
+
+## Set to use make(1) flags.
+#MAKE_FLAGS="-s"
+
+## Set to use world- and kernel-specific make(1) flags.
+#WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+#KERNEL_FLAGS="-j $(expr $(sysctl -n hw.ncpu) / 2)"
+
+## Set miscellaneous 'make release' settings.
+#NODOC=
+#NOPORTS=
+#RELSTRING=

Added: head/release/release.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/release/release.sh	Wed Jun 12 13:15:28 2013	(r251652)
@@ -0,0 +1,193 @@
+#!/bin/sh
+#-
+# Copyright (c) 2013 Glen Barber
+# Copyright (c) 2011 Nathan Whitehorn
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# release.sh: check out source trees, and build release components with
+#  totally clean, fresh trees.
+# Based on release/generate-release.sh written by Nathan Whitehorn
+#
+# $FreeBSD$
+#
+
+PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
+export PATH
+
+# The directory within which the release will be built.
+CHROOTDIR="/scratch"
+
+# The default svn checkout server, and svn branches for src/, doc/,
+# and ports/.
+SVNROOT="svn://svn.freebsd.org"
+SRCBRANCH="base/head"
+DOCBRANCH="doc/head"
+PORTBRANCH="ports/head"
+
+# The default src/, doc/, and ports/ revisions.
+SRCREVISION="-rHEAD"
+DOCREVISION="-rHEAD"
+PORTREVISION="-rHEAD"
+
+# The default make.conf and src.conf to use.  Set to /dev/null
+# by default to avoid polluting the chroot(8) environment with
+# non-default settings.
+MAKE_CONF="/dev/null"
+SRC_CONF="/dev/null"
+
+# The number of make(1) jobs, defaults to the number of CPUs available for
+# buildworld, and half of number of CPUs available for buildkernel.
+WORLD_FLAGS="-j$(sysctl -n hw.ncpu)"
+KERNEL_FLAGS="-j$(expr $(sysctl -n hw.ncpu) / 2)"
+MAKE_FLAGS="-s"
+
+# The name of the kernel to build, defaults to GENERIC.
+KERNEL="GENERIC"
+
+# The TARGET and TARGET_ARCH to build, defaults to the running system.
+TARGET="$(uname -p)"
+TARGET_ARCH="${TARGET}"
+
+# Set to non-empty value to disable checkout of doc/ and/or ports/.  Disabling
+# ports/ checkout also forces NODOC to be set.
+NODOC=
+NOPORTS=
+MAKE_FLAGS="${MAKE_FLAGS}"
+
+get_rev_branch () {
+	# Set up the OSVERSION, BRANCH, and REVISION based on the src/ tree
+	# checked out.
+	OSVERSION=$(grep '#define __FreeBSD_version' ${CHROOTDIR}/usr/src/sys/sys/param.h | awk '{print $3}')
+	BRANCH=$(grep '^BRANCH=' ${CHROOTDIR}/usr/src/sys/conf/newvers.sh \
+		| awk -F\= '{print $2}' | sed -e 's,",,g')
+	REVISION=$(grep '^REVISION=' ${CHROOTDIR}/usr/src/sys/conf/newvers.sh \
+		| awk -F\= '{print $2}' | sed -e 's,",,g')
+	OSRELEASE="${REVISION}-${BRANCH}"
+}
+
+usage() {
+	echo "Usage: $0 [-c release.conf]"
+	exit 1
+}
+
+while getopts c: opt; do
+	case ${opt} in
+	c)
+		RELEASECONF="${OPTARG}"
+		if [ ! -e "${RELEASECONF}" ]; then
+			echo "ERROR: Configuration file ${RELEASECONF} does not exist."
+			exit 1
+		fi
+		# Source the specified configuration file for overrides
+		. ${RELEASECONF}
+		;;
+	\?)
+		usage
+		;;
+	esac
+done
+shift $(($OPTIND - 1))
+
+# The aggregated build-time flags based upon variables defined within
+# this file, unless overridden by release.conf.  In most cases, these
+# will not need to be changed.
+CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
+ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
+CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
+CHROOT_IMAKEFLAGS="${CONF_FILES}"
+CHROOT_DMAKEFLAGS="${CONF_FILES}"
+RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
+RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=${KERNEL} ${ARCH_FLAGS} ${CONF_FILES}"
+RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=${KERNEL} ${CONF_FILES} \
+	NODOC=${NODOC} NOPORTS=${NOPORTS}"
+
+# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
+# is required to build the documentation set.
+if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then
+	echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
+	echo "            and NOPORTS is set."
+	NODOC=1
+fi
+
+if [ ! ${CHROOTDIR} ]; then
+	echo "Please set CHROOTDIR."
+	exit 1
+fi
+
+if [ $(id -u) -ne 0 ]; then
+	echo "Needs to be run as root."
+	exit 1
+fi
+
+set -e # Everything must succeed
+
+mkdir -p ${CHROOTDIR}/usr
+
+svn co ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION
+if [ "x${NODOC}" = "x" ]; then
+	svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc $DOCREVISION
+fi
+if [ "x${NOPORTS}" = "x" ]; then
+	svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports $PORTREVISION
+fi
+
+get_rev_branch
+
+cd ${CHROOTDIR}/usr/src
+make ${CHROOT_WMAKEFLAGS} buildworld
+make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
+make ${CHROOT_DMAKEFLAGS} distribution DESTDIR=${CHROOTDIR}
+mount -t devfs devfs ${CHROOTDIR}/dev
+trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
+
+build_doc_ports() {
+	## Trick the ports 'run-autotools-fixup' target to do the right thing.
+	_OSVERSION=$(sysctl -n kern.osreldate)
+	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" != "x" ]; then
+		PBUILD_FLAGS="OSVERSION=${OSVERSION} WITHOUT_JADETEX=yes BATCH=yes"
+		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
+			${PBUILD_FLAGS} install
+	fi
+}
+
+if [ -d ${CHROOTDIR}/usr/ports ]; then
+	cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
+	build_doc_ports ${CHROOTDIR}
+fi
+
+if [ "x${RELSTRING}" = "x" ]; then
+	RELSTRING="$(chroot ${CHROOTDIR} uname -s)-${OSRELEASE}-${TARGET_ARCH}"
+fi
+
+chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
+chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
+chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
+	release RELSTRING=${RELSTRING}
+chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
+	install DESTDIR=/R RELSTRING=${RELSTRING}
+
+cd ${CHROOTDIR}/R
+
+sha256 FreeBSD-* > CHECKSUM.SHA256
+md5 FreeBSD-* > CHECKSUM.MD5

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 13:17:44 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6C8D8A10;
 Wed, 12 Jun 2013 13:17:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5EEFA1BD2;
 Wed, 12 Jun 2013 13:17:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CDHiBv001400;
 Wed, 12 Jun 2013 13:17:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CDHiak001397;
 Wed, 12 Jun 2013 13:17:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306121317.r5CDHiak001397@svn.freebsd.org>
From: Glen Barber 
Date: Wed, 12 Jun 2013 13:17:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251653 - stable/9
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 13:17:44 -0000

Author: gjb
Date: Wed Jun 12 13:17:43 2013
New Revision: 251653
URL: http://svnweb.freebsd.org/changeset/base/251653

Log:
  MFC r240403 (obrien):
    Not all Pmake derivatives silently handle empty shell output, so ensure
    there is something for make(1) to consume.  Bmake gives output such as:
    "warning: Couldn't read shell's output for "/bin/sh -c true"
  
  Approved by:	kib (mentor)

Modified:
  stable/9/Makefile   (contents, props changed)
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile
==============================================================================
--- stable/9/Makefile	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile	Wed Jun 12 13:17:43 2013	(r251653)
@@ -216,7 +216,7 @@ ${TGTS}:
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
-CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo
 .if !empty(CHECK_TIME)
 .error check your date/time: ${STARTTIME}
 .endif

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile.inc1	Wed Jun 12 13:17:43 2013	(r251653)
@@ -1658,7 +1658,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
 FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
-	${KERNCONFDIR}/${KERNCONF}
+	${KERNCONFDIR}/${KERNCONF} ; echo
 .endif
 .endif
 

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 13:36:22 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F1AB1323;
 Wed, 12 Jun 2013 13:36:21 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E27301CD9;
 Wed, 12 Jun 2013 13:36:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CDaLhw007674;
 Wed, 12 Jun 2013 13:36:21 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CDaKUF007665;
 Wed, 12 Jun 2013 13:36:20 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121336.r5CDaKUF007665@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 13:36:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251654 - in head/sys: cam cam/scsi geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 13:36:22 -0000

Author: mav
Date: Wed Jun 12 13:36:20 2013
New Revision: 251654
URL: http://svnweb.freebsd.org/changeset/base/251654

Log:
  Make CAM return and GEOM DISK pass through new GEOM::lunid attribute.
  
  SPC-4 specification states that serial number may be property of device,
  but not a specific logical unit.  People reported about FC storages using
  serial number in that way, making it unusable for purposes of LUN multipath
  detection.  SPC-4 states that designators associated with logical unit from
  the VPD page 83h "Device Identification" should be used for that purpose.
  Report first of them in the new attribute in such preference order: NAA,
  EUI-64, T10 and SCSI name string.
  
  While there, make GEOM DISK properly report GEOM::ident in XML output also
  using d_getattr() method, if available.  This fixes serial numbers reporting
  for SCSI disks in `geom disk list` output and confxml.
  
  Discussed with:	gibbs, ken
  Sponsored by:	iXsystems, Inc.
  MFC after:	2 weeks

Modified:
  head/sys/cam/cam_xpt.c
  head/sys/cam/scsi/scsi_all.c
  head/sys/cam/scsi/scsi_all.h
  head/sys/cam/scsi/scsi_enc_ses.c
  head/sys/geom/geom_disk.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Wed Jun 12 13:17:43 2013	(r251653)
+++ head/sys/cam/cam_xpt.c	Wed Jun 12 13:36:20 2013	(r251654)
@@ -1096,8 +1096,9 @@ xpt_announce_quirks(struct cam_periph *p
 int
 xpt_getattr(char *buf, size_t len, const char *attr, struct cam_path *path)
 {
-	int ret = -1;
+	int ret = -1, l;
 	struct ccb_dev_advinfo cdai;
+	struct scsi_vpd_id_descriptor *idd;
 
 	mtx_assert(path->bus->sim->mtx, MA_OWNED);
 
@@ -1110,7 +1111,10 @@ xpt_getattr(char *buf, size_t len, const
 		cdai.buftype = CDAI_TYPE_SERIAL_NUM;
 	else if (!strcmp(attr, "GEOM::physpath"))
 		cdai.buftype = CDAI_TYPE_PHYS_PATH;
-	else
+	else if (!strcmp(attr, "GEOM::lunid")) {
+		cdai.buftype = CDAI_TYPE_SCSI_DEVID;
+		cdai.bufsiz = CAM_SCSI_DEVID_MAXLEN;
+	} else
 		goto out;
 
 	cdai.buf = malloc(cdai.bufsiz, M_CAMXPT, M_NOWAIT|M_ZERO);
@@ -1123,9 +1127,42 @@ xpt_getattr(char *buf, size_t len, const
 		cam_release_devq(cdai.ccb_h.path, 0, 0, 0, FALSE);
 	if (cdai.provsiz == 0)
 		goto out;
-	ret = 0;
-	if (strlcpy(buf, cdai.buf, len) >= len)
-		ret = EFAULT;
+	if (cdai.buftype == CDAI_TYPE_SCSI_DEVID) {
+		idd = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
+		    cdai.provsiz, scsi_devid_is_lun_naa);
+		if (idd == NULL)
+			idd = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
+			    cdai.provsiz, scsi_devid_is_lun_eui64);
+		if (idd == NULL)
+			idd = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
+			    cdai.provsiz, scsi_devid_is_lun_t10);
+		if (idd == NULL)
+			idd = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
+			    cdai.provsiz, scsi_devid_is_lun_name);
+		if (idd == NULL)
+			goto out;
+		ret = 0;
+		if ((idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_ASCII ||
+		    (idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_UTF8) {
+			l = strnlen(idd->identifier, idd->length);
+			if (l < len) {
+				bcopy(idd->identifier, buf, l);
+				buf[l] = 0;
+			} else
+				ret = EFAULT;
+		} else {
+			if (idd->length * 2 < len) {
+				for (l = 0; l < idd->length; l++)
+					sprintf(buf + l * 2, "%02x",
+					    idd->identifier[l]);
+			} else
+				ret = EFAULT;
+		}
+	} else {
+		ret = 0;
+		if (strlcpy(buf, cdai.buf, len) >= len)
+			ret = EFAULT;
+	}
 
 out:
 	if (cdai.buf != NULL)

Modified: head/sys/cam/scsi/scsi_all.c
==============================================================================
--- head/sys/cam/scsi/scsi_all.c	Wed Jun 12 13:17:43 2013	(r251653)
+++ head/sys/cam/scsi/scsi_all.c	Wed Jun 12 13:36:20 2013	(r251654)
@@ -5173,7 +5173,59 @@ scsi_devid_is_sas_target(uint8_t *bufp)
 	return 1;
 }
 
-uint8_t *
+int
+scsi_devid_is_lun_eui64(uint8_t *bufp)
+{
+	struct scsi_vpd_id_descriptor *descr;
+
+	descr = (struct scsi_vpd_id_descriptor *)bufp;
+	if ((descr->id_type & SVPD_ID_ASSOC_MASK) != SVPD_ID_ASSOC_LUN)
+		return 0;
+	if ((descr->id_type & SVPD_ID_TYPE_MASK) != SVPD_ID_TYPE_EUI64)
+		return 0;
+	return 1;
+}
+
+int
+scsi_devid_is_lun_naa(uint8_t *bufp)
+{
+	struct scsi_vpd_id_descriptor *descr;
+
+	descr = (struct scsi_vpd_id_descriptor *)bufp;
+	if ((descr->id_type & SVPD_ID_ASSOC_MASK) != SVPD_ID_ASSOC_LUN)
+		return 0;
+	if ((descr->id_type & SVPD_ID_TYPE_MASK) != SVPD_ID_TYPE_NAA)
+		return 0;
+	return 1;
+}
+
+int
+scsi_devid_is_lun_t10(uint8_t *bufp)
+{
+	struct scsi_vpd_id_descriptor *descr;
+
+	descr = (struct scsi_vpd_id_descriptor *)bufp;
+	if ((descr->id_type & SVPD_ID_ASSOC_MASK) != SVPD_ID_ASSOC_LUN)
+		return 0;
+	if ((descr->id_type & SVPD_ID_TYPE_MASK) != SVPD_ID_TYPE_T10)
+		return 0;
+	return 1;
+}
+
+int
+scsi_devid_is_lun_name(uint8_t *bufp)
+{
+	struct scsi_vpd_id_descriptor *descr;
+
+	descr = (struct scsi_vpd_id_descriptor *)bufp;
+	if ((descr->id_type & SVPD_ID_ASSOC_MASK) != SVPD_ID_ASSOC_LUN)
+		return 0;
+	if ((descr->id_type & SVPD_ID_TYPE_MASK) != SVPD_ID_TYPE_SCSI_NAME)
+		return 0;
+	return 1;
+}
+
+struct scsi_vpd_id_descriptor *
 scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t page_len,
     scsi_devid_checkfn_t ck_fn)
 {
@@ -5194,7 +5246,7 @@ scsi_get_devid(struct scsi_vpd_device_id
 						    + desc->length)) {
 
 		if (ck_fn == NULL || ck_fn((uint8_t *)desc) != 0)
-			return (desc->identifier);
+			return (desc);
 	}
 
 	return (NULL);

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h	Wed Jun 12 13:17:43 2013	(r251653)
+++ head/sys/cam/scsi/scsi_all.h	Wed Jun 12 13:36:20 2013	(r251654)
@@ -1292,6 +1292,7 @@ struct scsi_vpd_id_descriptor
 #define	SVPD_ID_PROTO_SHIFT	4
 #define	SVPD_ID_CODESET_BINARY	0x01
 #define	SVPD_ID_CODESET_ASCII	0x02
+#define	SVPD_ID_CODESET_UTF8	0x03
 #define	SVPD_ID_CODESET_MASK	0x0f
 	u_int8_t	id_type;
 #define	SVPD_ID_PIV		0x80
@@ -2316,7 +2317,12 @@ u_int		scsi_calc_syncparam(u_int period)
 typedef int	(*scsi_devid_checkfn_t)(uint8_t *);
 int		scsi_devid_is_naa_ieee_reg(uint8_t *bufp);
 int		scsi_devid_is_sas_target(uint8_t *bufp);
-uint8_t *	scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t len,
+int		scsi_devid_is_lun_eui64(uint8_t *bufp);
+int		scsi_devid_is_lun_naa(uint8_t *bufp);
+int		scsi_devid_is_lun_name(uint8_t *bufp);
+int		scsi_devid_is_lun_t10(uint8_t *bufp);
+struct scsi_vpd_id_descriptor *
+		scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t len,
 			       scsi_devid_checkfn_t ck_fn);
 
 void		scsi_test_unit_ready(struct ccb_scsiio *csio, u_int32_t retries,

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Wed Jun 12 13:17:43 2013	(r251653)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Wed Jun 12 13:36:20 2013	(r251654)
@@ -1056,7 +1056,8 @@ ses_set_physpath(enc_softc_t *enc, enc_e
 	ses_setphyspath_callback_args_t args;
 	int i, ret;
 	struct sbuf sb;
-	uint8_t *devid, *elmaddr;
+	struct scsi_vpd_id_descriptor *idd;
+	uint8_t *devid;
 	ses_element_t *elmpriv;
 	const char *c;
 
@@ -1084,9 +1085,9 @@ ses_set_physpath(enc_softc_t *enc, enc_e
 	if (cdai.ccb_h.status != CAM_REQ_CMP)
 		goto out;
 
-	elmaddr = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
+	idd = scsi_get_devid((struct scsi_vpd_device_id *)cdai.buf,
 	    cdai.provsiz, scsi_devid_is_naa_ieee_reg);
-	if (elmaddr == NULL)
+	if (idd == NULL)
 		goto out;
 
 	if (sbuf_new(&sb, NULL, 128, SBUF_AUTOEXTEND) == NULL) {
@@ -1095,7 +1096,7 @@ ses_set_physpath(enc_softc_t *enc, enc_e
 	}
 	/* Next, generate the physical path string */
 	sbuf_printf(&sb, "id1,enc@n%jx/type@%x/slot@%x",
-	    scsi_8btou64(elmaddr), iter->type_index,
+	    scsi_8btou64(idd->identifier), iter->type_index,
 	    iter->type_element_index);
 	/* Append the element descriptor if one exists */
 	elmpriv = elm->elm_private;

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Wed Jun 12 13:17:43 2013	(r251653)
+++ head/sys/geom/geom_disk.c	Wed Jun 12 13:36:20 2013	(r251654)
@@ -427,8 +427,11 @@ g_disk_start(struct bio *bp)
 static void
 g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp)
 {
+	struct bio *bp;
 	struct disk *dp;
 	struct g_disk_softc *sc;
+	char *buf;
+	int res = 0;
 
 	sc = gp->softc;
 	if (sc == NULL || (dp = sc->dp) == NULL)
@@ -443,7 +446,27 @@ g_disk_dumpconf(struct sbuf *sb, const c
 		    indent, dp->d_fwheads);
 		sbuf_printf(sb, "%s%u\n",
 		    indent, dp->d_fwsectors);
-		sbuf_printf(sb, "%s%s\n", indent, dp->d_ident);
+		if (dp->d_getattr != NULL) {
+			buf = g_malloc(DISK_IDENT_SIZE, M_WAITOK);
+			bp = g_alloc_bio();
+			bp->bio_disk = dp;
+			bp->bio_attribute = "GEOM::ident";
+			bp->bio_length = DISK_IDENT_SIZE;
+			bp->bio_data = buf;
+			res = dp->d_getattr(bp);
+			sbuf_printf(sb, "%s%s\n", indent,
+			    res == 0 ? buf: dp->d_ident);
+			bp->bio_attribute = "GEOM::lunid";
+			bp->bio_length = DISK_IDENT_SIZE;
+			bp->bio_data = buf;
+			if (dp->d_getattr(bp) == 0)
+				sbuf_printf(sb, "%s%s\n",
+				    indent, buf);
+			g_destroy_bio(bp);
+			g_free(buf);
+		} else
+			sbuf_printf(sb, "%s%s\n", indent,
+			    dp->d_ident);
 		sbuf_printf(sb, "%s%s\n", indent, dp->d_descr);
 	}
 }

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:08:36 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DC5E049F;
 Wed, 12 Jun 2013 14:08:36 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id 581101EAD;
 Wed, 12 Jun 2013 14:08:36 +0000 (UTC)
Received: from alph.d.allbsd.org (p3086-ipbf906funabasi.chiba.ocn.ne.jp
 [122.26.46.86]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r5CE8Jwl010219
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Wed, 12 Jun 2013 23:08:29 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.d.allbsd.org (8.14.5/8.14.5) with ESMTP id r5CE8IiF014164;
 Wed, 12 Jun 2013 23:08:19 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Wed, 12 Jun 2013 23:08:00 +0900 (JST)
Message-Id: <20130612.230800.1862462548384264440.hrs@allbsd.org>
To: gjb@FreeBSD.org
Subject: Re: svn commit: r251652 - head/release
From: Hiroki Sato 
In-Reply-To: <201306121315.r5CDFS7r001048@svn.freebsd.org>
References: <201306121315.r5CDFS7r001048@svn.freebsd.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Wed_Jun_12_23_08_00_2013_833)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Wed, 12 Jun 2013 23:08:29 +0900 (JST)
X-Spam-Status: No, score=-88.3 required=13.0 tests=CONTENT_TYPE_PRESENT,
 DIRECTOCNDYN,DYN_PBL,ONLY1HOPDIRECT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,
 SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:08:36 -0000

----Security_Multipart(Wed_Jun_12_23_08_00_2013_833)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Glen Barber  wrote
  in <201306121315.r5CDFS7r001048@svn.freebsd.org>:

gj> Author: gjb
gj> Date: Wed Jun 12 13:15:28 2013
gj> New Revision: 251652
gj> URL: http://svnweb.freebsd.org/changeset/base/251652
gj>
gj> Log:
gj>   Add new script to run release builds.  The script is heavily based upon
gj>   the release/generate-release.sh script by nwhitehorn.
gj>
gj>   This script can use optional configuration file to override defaults,
gj>   making running multiple serialzied builds with different specific
gj>   configurations or architecture-specific tunings quite easy.
gj>
gj>   Sample overrideable options are included in the release.conf.sample
gj>   file.
gj>
gj>   Approved by:	kib (mentor)
gj>   MFC After:	2 weeks
gj>   X-MFC-To:	stable/9 only

 Are you planning to replace generate-release.sh with this or keep the
 two scripts?

-- Hiroki

----Security_Multipart(Wed_Jun_12_23_08_00_2013_833)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (FreeBSD)

iEYEABECAAYFAlG4gMAACgkQTyzT2CeTzy24EwCdFHovpgC8zi8bLWQMf4T4mWgf
cLYAnjyzxzj16DIIBbmUHv8Vx38oVBG7
=7k19
-----END PGP SIGNATURE-----

----Security_Multipart(Wed_Jun_12_23_08_00_2013_833)----

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:12:07 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D20B1663;
 Wed, 12 Jun 2013 14:12:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us [199.48.134.227])
 by mx1.freebsd.org (Postfix) with ESMTP id B104A1ED4;
 Wed, 12 Jun 2013 14:12:07 +0000 (UTC)
Received: from glenbarber.us (70.15.88.86.res-cmts.sewb.ptd.net [70.15.88.86])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id C3CD123F848;
 Wed, 12 Jun 2013 10:12:06 -0400 (EDT)
DKIM-Filter: OpenDKIM Filter v2.8.3 onyx.glenbarber.us C3CD123F848
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none
Date: Wed, 12 Jun 2013 10:12:04 -0400
From: Glen Barber 
To: Hiroki Sato 
Subject: Re: svn commit: r251652 - head/release
Message-ID: <20130612141204.GG1558@glenbarber.us>
References: <201306121315.r5CDFS7r001048@svn.freebsd.org>
 <20130612.230800.1862462548384264440.hrs@allbsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="q5r20fdKX+PFtYHw"
Content-Disposition: inline
In-Reply-To: <20130612.230800.1862462548384264440.hrs@allbsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:12:07 -0000


--q5r20fdKX+PFtYHw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jun 12, 2013 at 11:08:00PM +0900, Hiroki Sato wrote:
> gj> Author: gjb
> gj> Date: Wed Jun 12 13:15:28 2013
> gj> New Revision: 251652
> gj> URL: http://svnweb.freebsd.org/changeset/base/251652
> gj>
> gj> Log:
> gj>   Add new script to run release builds.  The script is heavily based =
upon
> gj>   the release/generate-release.sh script by nwhitehorn.
> gj>
> gj>   This script can use optional configuration file to override default=
s,
> gj>   making running multiple serialzied builds with different specific
> gj>   configurations or architecture-specific tunings quite easy.
> gj>
> gj>   Sample overrideable options are included in the release.conf.sample
> gj>   file.
> gj>
> gj>   Approved by:	kib (mentor)
> gj>   MFC After:	2 weeks
> gj>   X-MFC-To:	stable/9 only
>=20
>  Are you planning to replace generate-release.sh with this or keep the
>  two scripts?
>=20

The plan is to eventually replace the generate-release.sh script.

Glen


--q5r20fdKX+PFtYHw
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQEcBAEBCAAGBQJRuIG0AAoJEFJPDDeguUaju6wIALLgAxwyzec6OOSpiTiKSXy0
urt5aSZm4AJZv1r3qTHw74DfxUs7WHttD2OseX/eXpmJqIKgbEDtX5AAJEuCaSGv
fFnpS/2ORqmga/x7rd1duuxzWCC5/EHRVO3EcO9RmzQ2Oa96aumXBdktnAXGPf0q
FrFOV9YTOV0gkuy3yR9KJ5hc9WWTsLKUIsoCjSsdLYsVz/Stjw6eRK2T0HIkCwRv
ekNRWcDeBSJNbFDQYTxfqnamoUWnQQC0c72k4Bj/Y6BQ8/NOVkfyyFx5u1tkDwkZ
8U9LSNTkLvJ64lF7hUgjPrOVHLeoWwW0JL5Md1tRnuG0J9LTbTRIPRkdrmUbzos=
=D60j
-----END PGP SIGNATURE-----

--q5r20fdKX+PFtYHw--

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:16:49 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E51EBB1F;
 Wed, 12 Jun 2013 14:16:49 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from smtpauth3.wiscmail.wisc.edu (wmauth3.doit.wisc.edu
 [144.92.197.226])
 by mx1.freebsd.org (Postfix) with ESMTP id BE9E61F22;
 Wed, 12 Jun 2013 14:16:49 +0000 (UTC)
MIME-version: 1.0
Content-transfer-encoding: 7BIT
Content-type: text/plain; CHARSET=US-ASCII; format=flowed
Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by
 smtpauth3.wiscmail.wisc.edu
 (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug
 30 2012)) id <0MOA00200A397Y00@smtpauth3.wiscmail.wisc.edu>; Wed,
 12 Jun 2013 09:16:49 -0500 (CDT)
X-Spam-PmxInfo: Server=avs-3, Version=6.0.2.2308539,
 Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.6.12.140919,
 SenderIP=0.0.0.0
X-Spam-Report: AuthenticatedSender=yes, SenderIP=0.0.0.0
Received: from comporellon.tachypleus.net
 (adsl-76-208-69-84.dsl.mdsnwi.sbcglobal.net [76.208.69.84])
 by smtpauth3.wiscmail.wisc.edu
 (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug
 30 2012)) with ESMTPSA id <0MOA00MVZABZOJ00@smtpauth3.wiscmail.wisc.edu>; Wed,
 12 Jun 2013 09:16:48 -0500 (CDT)
Message-id: <51B882CF.7070403@freebsd.org>
Date: Wed, 12 Jun 2013 09:16:47 -0500
From: Nathan Whitehorn 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130410
 Thunderbird/17.0.5
To: Glen Barber 
Subject: Re: svn commit: r251652 - head/release
References: <201306121315.r5CDFS7r001048@svn.freebsd.org>
 <20130612.230800.1862462548384264440.hrs@allbsd.org>
 <20130612141204.GG1558@glenbarber.us>
In-reply-to: <20130612141204.GG1558@glenbarber.us>
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 Hiroki Sato , src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:16:50 -0000

On 06/12/13 09:12, Glen Barber wrote:
> On Wed, Jun 12, 2013 at 11:08:00PM +0900, Hiroki Sato wrote:
>> gj> Author: gjb
>> gj> Date: Wed Jun 12 13:15:28 2013
>> gj> New Revision: 251652
>> gj> URL: http://svnweb.freebsd.org/changeset/base/251652
>> gj>
>> gj> Log:
>> gj>   Add new script to run release builds.  The script is heavily based upon
>> gj>   the release/generate-release.sh script by nwhitehorn.
>> gj>
>> gj>   This script can use optional configuration file to override defaults,
>> gj>   making running multiple serialzied builds with different specific
>> gj>   configurations or architecture-specific tunings quite easy.
>> gj>
>> gj>   Sample overrideable options are included in the release.conf.sample
>> gj>   file.
>> gj>
>> gj>   Approved by:	kib (mentor)
>> gj>   MFC After:	2 weeks
>> gj>   X-MFC-To:	stable/9 only
>>
>>   Are you planning to replace generate-release.sh with this or keep the
>>   two scripts?
>>
> The plan is to eventually replace the generate-release.sh script.
>
> Glen
>

As I mentioned in a private email to Glen, it might be reasonable just 
to replace it now. generate-release.sh exists solely for the convenience 
of re@ (the main tool is just make release) and so we should just have 
whichever tools re@ finds more convenient. I suspect it is the new script.
-Nathan

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:42:51 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 853C22D6;
 Wed, 12 Jun 2013 14:42:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id 7555710B4;
 Wed, 12 Jun 2013 14:42:50 +0000 (UTC)
Received: from alph.d.allbsd.org (p3086-ipbf906funabasi.chiba.ocn.ne.jp
 [122.26.46.86]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r5CEgXA5014475
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Wed, 12 Jun 2013 23:42:43 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.d.allbsd.org (8.14.5/8.14.5) with ESMTP id r5CEgVOT014425;
 Wed, 12 Jun 2013 23:42:33 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Wed, 12 Jun 2013 23:42:24 +0900 (JST)
Message-Id: <20130612.234224.888649268051803264.hrs@allbsd.org>
To: nwhitehorn@FreeBSD.org
Subject: Re: svn commit: r251652 - head/release
From: Hiroki Sato 
In-Reply-To: <51B882CF.7070403@freebsd.org>
References: <20130612.230800.1862462548384264440.hrs@allbsd.org>
 <20130612141204.GG1558@glenbarber.us>
 <51B882CF.7070403@freebsd.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Wed_Jun_12_23_42_25_2013_382)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Wed, 12 Jun 2013 23:42:43 +0900 (JST)
X-Spam-Status: No, score=-88.3 required=13.0 tests=CONTENT_TYPE_PRESENT,
 DIRECTOCNDYN,DYN_PBL,ONLY1HOPDIRECT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,
 SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-src-head@FreeBSD.org, gjb@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:42:51 -0000

----Security_Multipart(Wed_Jun_12_23_42_25_2013_382)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Nathan Whitehorn  wrote
  in <51B882CF.7070403@freebsd.org>:

nw> On 06/12/13 09:12, Glen Barber wrote:
nw> > On Wed, Jun 12, 2013 at 11:08:00PM +0900, Hiroki Sato wrote:
nw> >> gj> Author: gjb
nw> >> gj> Date: Wed Jun 12 13:15:28 2013
nw> >> gj> New Revision: 251652
nw> >> gj> URL: http://svnweb.freebsd.org/changeset/base/251652
nw> >> gj>
nw> >> gj> Log:
nw> >> gj> Add new script to run release builds.  The script is heavily based
nw> >> upon
nw> >> gj>   the release/generate-release.sh script by nwhitehorn.
nw> >> gj>
nw> >> gj> This script can use optional configuration file to override
nw> >> defaults,
nw> >> gj> making running multiple serialzied builds with different specific
nw> >> gj>   configurations or architecture-specific tunings quite easy.
nw> >> gj>
nw> >> gj> Sample overrideable options are included in the
nw> >> release.conf.sample
nw> >> gj>   file.
nw> >> gj>
nw> >> gj>   Approved by:	kib (mentor)
nw> >> gj>   MFC After:	2 weeks
nw> >> gj>   X-MFC-To:	stable/9 only
nw> >>
nw> >>   Are you planning to replace generate-release.sh with this or keep the
nw> >>   two scripts?
nw> >>
nw> > The plan is to eventually replace the generate-release.sh script.
nw> >
nw> > Glen
nw> >
nw>
nw> As I mentioned in a private email to Glen, it might be reasonable just
nw> to replace it now. generate-release.sh exists solely for the
nw> convenience of re@ (the main tool is just make release) and so we
nw> should just have whichever tools re@ finds more convenient. I suspect
nw> it is the new script.

 I agree.  Maintaining two scripts are confusing.

 However, I do not think the imported version of release.sh is ready
 because it has non-reasonable default values like
 TARGET_ARCH=${TARGET}, for example.  When this script was submitted
 by Glen a while ago, I did not merge parts which were problematic or
 difficult to maintain.

-- Hiroki

----Security_Multipart(Wed_Jun_12_23_42_25_2013_382)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (FreeBSD)

iEYEABECAAYFAlG4iNEACgkQTyzT2CeTzy0SIwCfRDKLuHrTiByrzSM0H2qAIPhS
EX0AoLyCUjMfapNcQdET8NQOK7YjFWJw
=OJGd
-----END PGP SIGNATURE-----

----Security_Multipart(Wed_Jun_12_23_42_25_2013_382)----

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:52:59 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B27C1950;
 Wed, 12 Jun 2013 14:52:59 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A38F1118A;
 Wed, 12 Jun 2013 14:52:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CEqx2P032969;
 Wed, 12 Jun 2013 14:52:59 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CEqveg032952;
 Wed, 12 Jun 2013 14:52:57 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306121452.r5CEqveg032952@svn.freebsd.org>
From: Adrian Chadd 
Date: Wed, 12 Jun 2013 14:52:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251655 - in head/sys: conf dev/ath dev/ath/ath_hal
 dev/ath/ath_hal/ar9002 modules/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:52:59 -0000

Author: adrian
Date: Wed Jun 12 14:52:57 2013
New Revision: 251655
URL: http://svnweb.freebsd.org/changeset/base/251655

Log:
  Migrate the LNA mixing diversity machinery from the AR9285 HAL to the driver.
  
  The AR9485 chip and AR933x SoC both implement LNA diversity.
  There are a few extra things that need to happen before this can be
  flipped on for those chips (mostly to do with setting up the different
  bias values and LNA1/LNA2 RSSI differences) but the first stage is
  putting this code into the driver layer so it can be reused.
  
  This has the added benefit of making it easier to expose configuration
  options and diagnostic information via the ioctl API.  That's not yet
  being done but it sure would be nice to do so.
  
  Tested:
  
  * AR9285, with LNA diversity enabled
  * AR9285, with LNA diversity disabled in EEPROM

Added:
  head/sys/dev/ath/if_ath_lna_div.c   (contents, props changed)
  head/sys/dev/ath/if_ath_lna_div.h   (contents, props changed)
Modified:
  head/sys/conf/files
  head/sys/dev/ath/ath_hal/ah.h
  head/sys/dev/ath/ath_hal/ar9002/ar9285.h
  head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
  head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
  head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
  head/sys/dev/ath/if_ath.c
  head/sys/dev/ath/if_ath_debug.h
  head/sys/dev/ath/if_ath_rx.c
  head/sys/dev/ath/if_athvar.h
  head/sys/modules/ath/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/conf/files	Wed Jun 12 14:52:57 2013	(r251655)
@@ -733,6 +733,8 @@ dev/ath/if_ath_keycache.c	optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_led.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_lna_div.c	optional ath \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tx.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/if_ath_tx_edma.c	optional ath \

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ah.h	Wed Jun 12 14:52:57 2013	(r251655)
@@ -1402,9 +1402,6 @@ struct ath_hal {
 				const struct ieee80211_channel *);
 	void	  __ahdecl(*ah_procMibEvent)(struct ath_hal *,
 				const HAL_NODE_STATS *);
-	void	  __ahdecl(*ah_rxAntCombDiversity)(struct ath_hal *,
-				struct ath_rx_status *,
-				unsigned long, int);
 
 	/* Misc Functions */
 	HAL_STATUS __ahdecl(*ah_getCapability)(struct ath_hal *,
@@ -1585,6 +1582,12 @@ struct ath_hal {
 				uint32_t, uint32_t);
 	void	    __ahdecl(*ah_btCoexDisable)(struct ath_hal *);
 	int	    __ahdecl(*ah_btCoexEnable)(struct ath_hal *);
+
+	/* LNA diversity configuration */
+	void	    __ahdecl(*ah_divLnaConfGet)(struct ath_hal *,
+				HAL_ANT_COMB_CONFIG *);
+	void	    __ahdecl(*ah_divLnaConfSet)(struct ath_hal *,
+				HAL_ANT_COMB_CONFIG *);
 };
 
 /* 

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285.h	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285.h	Wed Jun 12 14:52:57 2013	(r251655)
@@ -20,42 +20,12 @@
 
 #include "ar5416/ar5416.h"
 
-struct ar9285_ant_comb {
-	uint16_t count;
-	uint16_t total_pkt_count;
-	HAL_BOOL scan;
-	HAL_BOOL scan_not_start;
-	int main_total_rssi;
-	int alt_total_rssi;
-	int alt_recv_cnt;
-	int main_recv_cnt;
-	int rssi_lna1;
-	int rssi_lna2;
-	int rssi_add;
-	int rssi_sub;
-	int rssi_first;
-	int rssi_second;
-	int rssi_third;
-	HAL_BOOL alt_good;
-	int quick_scan_cnt;
-	int main_conf;
-	HAL_ANT_DIV_COMB_LNA_CONF first_quick_scan_conf;
-	HAL_ANT_DIV_COMB_LNA_CONF second_quick_scan_conf;
-	int first_bias;
-	int second_bias;
-	HAL_BOOL first_ratio;
-	HAL_BOOL second_ratio;
-	unsigned long scan_start_time;
-};
-
 struct ath_hal_9285 {
 	struct ath_hal_5416 ah_5416;
 
 	HAL_INI_ARRAY	ah_ini_txgain;
 	HAL_INI_ARRAY	ah_ini_rxgain;
 
-	struct ar9285_ant_comb ant_comb;	/* Kite Antenna comb/diversity */
-
 	struct {
 		int32_t prev_offset;	/* Previous value of PA offset value */
 		int8_t max_skipcount;	/* Max No. of times PACAL can be skipped */
@@ -71,7 +41,6 @@ struct ath_hal_9285 {
 #define	AR_PHY_CCA_MIN_GOOD_VAL_9285_2GHZ	-127
 #define	AR_PHY_CCA_MAX_GOOD_VAL_9285_2GHZ	-108
 
-HAL_BOOL ar9285SetAntennaSwitch(struct ath_hal *, HAL_ANT_SETTING);
 HAL_BOOL ar9285RfAttach(struct ath_hal *, HAL_STATUS *);
 
 extern	HAL_BOOL ar9285SetTransmitPower(struct ath_hal *,

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Wed Jun 12 14:52:57 2013	(r251655)
@@ -180,6 +180,8 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s
 	ah->ah_setTxPower		= ar9285SetTransmitPower;
 	ah->ah_setBoardValues		= ar9285SetBoardValues;
 	ah->ah_btCoexSetParameter	= ar9285BTCoexSetParameter;
+	ah->ah_divLnaConfGet		= ar9285_antdiv_comb_conf_get;
+	ah->ah_divLnaConfSet		= ar9285_antdiv_comb_conf_set;
 
 	AH5416(ah)->ah_cal.iqCalData.calData = &ar9280_iq_cal;
 	AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9280_adc_gain_cal;
@@ -341,7 +343,6 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s
 	/* Print out whether the EEPROM settings enable AR9285 diversity */
 	if (ar9285_check_div_comb(ah)) {
 		ath_hal_printf(ah, "[ath] Enabling diversity for Kite\n");
-		ah->ah_rxAntCombDiversity = ar9285_ant_comb_scan;
 	}
 
 	/* Disable 11n for the AR2427 */

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c	Wed Jun 12 14:52:57 2013	(r251655)
@@ -33,609 +33,13 @@
 #include "ah_eeprom_v4k.h"
 
 #include "ar9002/ar9280.h"
-#include "ar9002/ar9285_diversity.h"
 #include "ar9002/ar9285.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 #include "ar9002/ar9285phy.h"
 #include "ar9002/ar9285_phy.h"
 
-
-/* Linux compability macros */
-/*
- * XXX these don't handle rounding, underflow, overflow, wrapping!
- */
-#define	msecs_to_jiffies(a)		( (a) * hz / 1000 )
-#define	time_after(a, b)		( (long) (b) - (long) (a) < 0 )
-
-static HAL_BOOL
-ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta, int mindelta,
-    int main_rssi_avg, int alt_rssi_avg, int pkt_count)
-{
-	return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-		(alt_rssi_avg > main_rssi_avg + maxdelta)) ||
-		(alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
-}
-
-static void
-ath_lnaconf_alt_good_scan(struct ar9285_ant_comb *antcomb,
-    HAL_ANT_COMB_CONFIG *ant_conf, int main_rssi_avg)
-{
-	antcomb->quick_scan_cnt = 0;
-
-	if (ant_conf->main_lna_conf == HAL_ANT_DIV_COMB_LNA2)
-		antcomb->rssi_lna2 = main_rssi_avg;
-	else if (ant_conf->main_lna_conf == HAL_ANT_DIV_COMB_LNA1)
-		antcomb->rssi_lna1 = main_rssi_avg;
-
-	switch ((ant_conf->main_lna_conf << 4) | ant_conf->alt_lna_conf) {
-	case (0x10): /* LNA2 A-B */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA1;
-		break;
-	case (0x20): /* LNA1 A-B */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA2;
-		break;
-	case (0x21): /* LNA1 LNA2 */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA2;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->second_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		break;
-	case (0x12): /* LNA2 LNA1 */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->second_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		break;
-	case (0x13): /* LNA2 A+B */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA1;
-		break;
-	case (0x23): /* LNA1 A+B */
-		antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-		antcomb->first_quick_scan_conf =
-			HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-		antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA2;
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ath_select_ant_div_from_quick_scan(struct ar9285_ant_comb *antcomb,
-    HAL_ANT_COMB_CONFIG *div_ant_conf, int main_rssi_avg,
-    int alt_rssi_avg, int alt_ratio)
-{
-	/* alt_good */
-	switch (antcomb->quick_scan_cnt) {
-	case 0:
-		/* set alt to main, and alt to first conf */
-		div_ant_conf->main_lna_conf = antcomb->main_conf;
-		div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf;
-		break;
-	case 1:
-		/* set alt to main, and alt to first conf */
-		div_ant_conf->main_lna_conf = antcomb->main_conf;
-		div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf;
-		antcomb->rssi_first = main_rssi_avg;
-		antcomb->rssi_second = alt_rssi_avg;
-
-		if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) {
-			/* main is LNA1 */
-			if (ath_is_alt_ant_ratio_better(alt_ratio,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-						main_rssi_avg, alt_rssi_avg,
-						antcomb->total_pkt_count))
-				antcomb->first_ratio = AH_TRUE;
-			else
-				antcomb->first_ratio = AH_FALSE;
-		} else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2) {
-			if (ath_is_alt_ant_ratio_better(alt_ratio,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-						main_rssi_avg, alt_rssi_avg,
-						antcomb->total_pkt_count))
-				antcomb->first_ratio = AH_TRUE;
-			else
-				antcomb->first_ratio = AH_FALSE;
-		} else {
-			if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-			    (alt_rssi_avg > main_rssi_avg +
-			    ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-			    (alt_rssi_avg > main_rssi_avg)) &&
-			    (antcomb->total_pkt_count > 50))
-				antcomb->first_ratio = AH_TRUE;
-			else
-				antcomb->first_ratio = AH_FALSE;
-		}
-		break;
-	case 2:
-		antcomb->alt_good = AH_FALSE;
-		antcomb->scan_not_start = AH_FALSE;
-		antcomb->scan = AH_FALSE;
-		antcomb->rssi_first = main_rssi_avg;
-		antcomb->rssi_third = alt_rssi_avg;
-
-		if (antcomb->second_quick_scan_conf == HAL_ANT_DIV_COMB_LNA1)
-			antcomb->rssi_lna1 = alt_rssi_avg;
-		else if (antcomb->second_quick_scan_conf ==
-			 HAL_ANT_DIV_COMB_LNA2)
-			antcomb->rssi_lna2 = alt_rssi_avg;
-		else if (antcomb->second_quick_scan_conf ==
-			 HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
-			if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2)
-				antcomb->rssi_lna2 = main_rssi_avg;
-			else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1)
-				antcomb->rssi_lna1 = main_rssi_avg;
-		}
-
-		if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
-		    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)
-			div_ant_conf->main_lna_conf = HAL_ANT_DIV_COMB_LNA2;
-		else
-			div_ant_conf->main_lna_conf = HAL_ANT_DIV_COMB_LNA1;
-
-		if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) {
-			if (ath_is_alt_ant_ratio_better(alt_ratio,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-						main_rssi_avg, alt_rssi_avg,
-						antcomb->total_pkt_count))
-				antcomb->second_ratio = AH_TRUE;
-			else
-				antcomb->second_ratio = AH_FALSE;
-		} else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2) {
-			if (ath_is_alt_ant_ratio_better(alt_ratio,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-						ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-						main_rssi_avg, alt_rssi_avg,
-						antcomb->total_pkt_count))
-				antcomb->second_ratio = AH_TRUE;
-			else
-				antcomb->second_ratio = AH_FALSE;
-		} else {
-			if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-			    (alt_rssi_avg > main_rssi_avg +
-			    ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-			    (alt_rssi_avg > main_rssi_avg)) &&
-			    (antcomb->total_pkt_count > 50))
-				antcomb->second_ratio = AH_TRUE;
-			else
-				antcomb->second_ratio = AH_FALSE;
-		}
-
-		/* set alt to the conf with maximun ratio */
-		if (antcomb->first_ratio && antcomb->second_ratio) {
-			if (antcomb->rssi_second > antcomb->rssi_third) {
-				/* first alt*/
-				if ((antcomb->first_quick_scan_conf ==
-				    HAL_ANT_DIV_COMB_LNA1) ||
-				    (antcomb->first_quick_scan_conf ==
-				    HAL_ANT_DIV_COMB_LNA2))
-					/* Set alt LNA1 or LNA2*/
-					if (div_ant_conf->main_lna_conf ==
-					    HAL_ANT_DIV_COMB_LNA2)
-						div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA1;
-					else
-						div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA2;
-				else
-					/* Set alt to A+B or A-B */
-					div_ant_conf->alt_lna_conf =
-						antcomb->first_quick_scan_conf;
-			} else if ((antcomb->second_quick_scan_conf ==
-				   HAL_ANT_DIV_COMB_LNA1) ||
-				   (antcomb->second_quick_scan_conf ==
-				   HAL_ANT_DIV_COMB_LNA2)) {
-				/* Set alt LNA1 or LNA2 */
-				if (div_ant_conf->main_lna_conf ==
-				    HAL_ANT_DIV_COMB_LNA2)
-					div_ant_conf->alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-				else
-					div_ant_conf->alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-			} else {
-				/* Set alt to A+B or A-B */
-				div_ant_conf->alt_lna_conf =
-					antcomb->second_quick_scan_conf;
-			}
-		} else if (antcomb->first_ratio) {
-			/* first alt */
-			if ((antcomb->first_quick_scan_conf ==
-			    HAL_ANT_DIV_COMB_LNA1) ||
-			    (antcomb->first_quick_scan_conf ==
-			    HAL_ANT_DIV_COMB_LNA2))
-					/* Set alt LNA1 or LNA2 */
-				if (div_ant_conf->main_lna_conf ==
-				    HAL_ANT_DIV_COMB_LNA2)
-					div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA1;
-				else
-					div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA2;
-			else
-				/* Set alt to A+B or A-B */
-				div_ant_conf->alt_lna_conf =
-						antcomb->first_quick_scan_conf;
-		} else if (antcomb->second_ratio) {
-				/* second alt */
-			if ((antcomb->second_quick_scan_conf ==
-			    HAL_ANT_DIV_COMB_LNA1) ||
-			    (antcomb->second_quick_scan_conf ==
-			    HAL_ANT_DIV_COMB_LNA2))
-				/* Set alt LNA1 or LNA2 */
-				if (div_ant_conf->main_lna_conf ==
-				    HAL_ANT_DIV_COMB_LNA2)
-					div_ant_conf->alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-				else
-					div_ant_conf->alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-			else
-				/* Set alt to A+B or A-B */
-				div_ant_conf->alt_lna_conf =
-						antcomb->second_quick_scan_conf;
-		} else {
-			/* main is largest */
-			if ((antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) ||
-			    (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2))
-				/* Set alt LNA1 or LNA2 */
-				if (div_ant_conf->main_lna_conf ==
-				    HAL_ANT_DIV_COMB_LNA2)
-					div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA1;
-				else
-					div_ant_conf->alt_lna_conf =
-							HAL_ANT_DIV_COMB_LNA2;
-			else
-				/* Set alt to A+B or A-B */
-				div_ant_conf->alt_lna_conf = antcomb->main_conf;
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ath_ant_div_conf_fast_divbias(HAL_ANT_COMB_CONFIG *ant_conf)
-{
-	/* Adjust the fast_div_bias based on main and alt lna conf */
-	switch ((ant_conf->main_lna_conf << 4) | ant_conf->alt_lna_conf) {
-	case (0x01): /* A-B LNA2 */
-		ant_conf->fast_div_bias = 0x3b;
-		break;
-	case (0x02): /* A-B LNA1 */
-		ant_conf->fast_div_bias = 0x3d;
-		break;
-	case (0x03): /* A-B A+B */
-		ant_conf->fast_div_bias = 0x1;
-		break;
-	case (0x10): /* LNA2 A-B */
-		ant_conf->fast_div_bias = 0x7;
-		break;
-	case (0x12): /* LNA2 LNA1 */
-		ant_conf->fast_div_bias = 0x2;
-		break;
-	case (0x13): /* LNA2 A+B */
-		ant_conf->fast_div_bias = 0x7;
-		break;
-	case (0x20): /* LNA1 A-B */
-		ant_conf->fast_div_bias = 0x6;
-		break;
-	case (0x21): /* LNA1 LNA2 */
-		ant_conf->fast_div_bias = 0x0;
-		break;
-	case (0x23): /* LNA1 A+B */
-		ant_conf->fast_div_bias = 0x6;
-		break;
-	case (0x30): /* A+B A-B */
-		ant_conf->fast_div_bias = 0x1;
-		break;
-	case (0x31): /* A+B LNA2 */
-		ant_conf->fast_div_bias = 0x3b;
-		break;
-	case (0x32): /* A+B LNA1 */
-		ant_conf->fast_div_bias = 0x3d;
-		break;
-	default:
-		break;
-	}
-}
-
-/* Antenna diversity and combining */
-void
-ar9285_ant_comb_scan(struct ath_hal *ah, struct ath_rx_status *rs,
-    unsigned long ticks, int hz)
-{
-	HAL_ANT_COMB_CONFIG div_ant_conf;
-	struct ar9285_ant_comb *antcomb = &AH9285(ah)->ant_comb;
-	int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
-	int curr_main_set, curr_bias;
-	int main_rssi = rs->rs_rssi_ctl[0];
-	int alt_rssi = rs->rs_rssi_ctl[1];
-	int rx_ant_conf, main_ant_conf, alt_ant_conf;
-	HAL_BOOL short_scan = AH_FALSE;
-
-	rx_ant_conf = (rs->rs_rssi_ctl[2] >> 4) & ATH_ANT_RX_MASK;
-	main_ant_conf = (rs->rs_rssi_ctl[2] >> 2) & ATH_ANT_RX_MASK;
-	alt_ant_conf = (rs->rs_rssi_ctl[2] >> 0) & ATH_ANT_RX_MASK;
-
-#if 0
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: RSSI %d/%d, conf %x/%x, rxconf %x, LNA: %d; ANT: %d; FastDiv: %d\n",
-	    __func__, main_rssi, alt_rssi, main_ant_conf,alt_ant_conf, rx_ant_conf,
-	    !!(rs->rs_rssi_ctl[2] & 0x80), !!(rs->rs_rssi_ctl[2] & 0x40), !!(rs->rs_rssi_ext[2] & 0x40));
-#endif
-
-	if (! ar9285_check_div_comb(ah))
-		return;
-
-	if (AH5212(ah)->ah_diversity == AH_FALSE)
-		return;
-
-#if 0
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: main: %d, alt: %d, rx_ant_conf: %x, main_ant_conf: %x\n",
-	    __func__, main_rssi, alt_rssi, rx_ant_conf, main_ant_conf);
-#endif
-
-	/* Record packet only when alt_rssi is positive */
-	if (main_rssi > 0 && alt_rssi > 0) {
-		antcomb->total_pkt_count++;
-		antcomb->main_total_rssi += main_rssi;
-		antcomb->alt_total_rssi  += alt_rssi;
-		if (main_ant_conf == rx_ant_conf)
-			antcomb->main_recv_cnt++;
-		else
-			antcomb->alt_recv_cnt++;
-	}
-
-	/* Short scan check */
-	if (antcomb->scan && antcomb->alt_good) {
-		if (time_after(ticks, antcomb->scan_start_time +
-		    msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
-			short_scan = AH_TRUE;
-		else
-			if (antcomb->total_pkt_count ==
-			    ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
-				alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-					    antcomb->total_pkt_count);
-				if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-					short_scan = AH_TRUE;
-			}
-	}
-
-	if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
-	    rs->rs_moreaggr) && !short_scan)
-		return;
-
-	if (antcomb->total_pkt_count) {
-		alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-			     antcomb->total_pkt_count);
-		main_rssi_avg = (antcomb->main_total_rssi /
-				 antcomb->total_pkt_count);
-		alt_rssi_avg = (antcomb->alt_total_rssi /
-				 antcomb->total_pkt_count);
-	}
-
-	OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf));
-	ar9285_antdiv_comb_conf_get(ah, &div_ant_conf);
-	curr_alt_set = div_ant_conf.alt_lna_conf;
-	curr_main_set = div_ant_conf.main_lna_conf;
-	curr_bias = div_ant_conf.fast_div_bias;
-
-	antcomb->count++;
-
-	if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
-		if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-			ath_lnaconf_alt_good_scan(antcomb, &div_ant_conf,
-						  main_rssi_avg);
-			antcomb->alt_good = AH_TRUE;
-		} else {
-			antcomb->alt_good = AH_FALSE;
-		}
-
-		antcomb->count = 0;
-		antcomb->scan = AH_TRUE;
-		antcomb->scan_not_start = AH_TRUE;
-	}
-
-	if (!antcomb->scan) {
-		if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-			if (curr_alt_set == HAL_ANT_DIV_COMB_LNA2) {
-				/* Switch main and alt LNA */
-				div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-				div_ant_conf.alt_lna_conf  =
-						HAL_ANT_DIV_COMB_LNA1;
-			} else if (curr_alt_set == HAL_ANT_DIV_COMB_LNA1) {
-				div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-				div_ant_conf.alt_lna_conf  =
-						HAL_ANT_DIV_COMB_LNA2;
-			}
-
-			goto div_comb_done;
-		} else if ((curr_alt_set != HAL_ANT_DIV_COMB_LNA1) &&
-			   (curr_alt_set != HAL_ANT_DIV_COMB_LNA2)) {
-			/* Set alt to another LNA */
-			if (curr_main_set == HAL_ANT_DIV_COMB_LNA2)
-				div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-			else if (curr_main_set == HAL_ANT_DIV_COMB_LNA1)
-				div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-
-			goto div_comb_done;
-		}
-
-		if ((alt_rssi_avg < (main_rssi_avg +
-		    ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA)))
-			goto div_comb_done;
-	}
-
-	if (!antcomb->scan_not_start) {
-		switch (curr_alt_set) {
-		case HAL_ANT_DIV_COMB_LNA2:
-			antcomb->rssi_lna2 = alt_rssi_avg;
-			antcomb->rssi_lna1 = main_rssi_avg;
-			antcomb->scan = AH_TRUE;
-			/* set to A+B */
-			div_ant_conf.main_lna_conf =
-				HAL_ANT_DIV_COMB_LNA1;
-			div_ant_conf.alt_lna_conf  =
-				HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-			break;
-		case HAL_ANT_DIV_COMB_LNA1:
-			antcomb->rssi_lna1 = alt_rssi_avg;
-			antcomb->rssi_lna2 = main_rssi_avg;
-			antcomb->scan = AH_TRUE;
-			/* set to A+B */
-			div_ant_conf.main_lna_conf = HAL_ANT_DIV_COMB_LNA2;
-			div_ant_conf.alt_lna_conf  =
-				HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-			break;
-		case HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2:
-			antcomb->rssi_add = alt_rssi_avg;
-			antcomb->scan = AH_TRUE;
-			/* set to A-B */
-			div_ant_conf.alt_lna_conf =
-				HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-			break;
-		case HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2:
-			antcomb->rssi_sub = alt_rssi_avg;
-			antcomb->scan = AH_FALSE;
-			if (antcomb->rssi_lna2 >
-			    (antcomb->rssi_lna1 +
-			    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
-				/* use LNA2 as main LNA */
-				if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
-				    (antcomb->rssi_add > antcomb->rssi_sub)) {
-					/* set to A+B */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-					div_ant_conf.alt_lna_conf  =
-						HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-				} else if (antcomb->rssi_sub >
-					   antcomb->rssi_lna1) {
-					/* set to A-B */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-					div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-				} else {
-					/* set to LNA1 */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-					div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-				}
-			} else {
-				/* use LNA1 as main LNA */
-				if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
-				    (antcomb->rssi_add > antcomb->rssi_sub)) {
-					/* set to A+B */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-					div_ant_conf.alt_lna_conf  =
-						HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-				} else if (antcomb->rssi_sub >
-					   antcomb->rssi_lna1) {
-					/* set to A-B */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-					div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-				} else {
-					/* set to LNA2 */
-					div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-					div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	} else {
-		if (!antcomb->alt_good) {
-			antcomb->scan_not_start = AH_FALSE;
-			/* Set alt to another LNA */
-			if (curr_main_set == HAL_ANT_DIV_COMB_LNA2) {
-				div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-				div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-			} else if (curr_main_set == HAL_ANT_DIV_COMB_LNA1) {
-				div_ant_conf.main_lna_conf =
-						HAL_ANT_DIV_COMB_LNA1;
-				div_ant_conf.alt_lna_conf =
-						HAL_ANT_DIV_COMB_LNA2;
-			}
-			goto div_comb_done;
-		}
-	}
-
-	ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
-					   main_rssi_avg, alt_rssi_avg,
-					   alt_ratio);
-
-	antcomb->quick_scan_cnt++;
-
-div_comb_done:
-	ath_ant_div_conf_fast_divbias(&div_ant_conf);
-
-	ar9285_antdiv_comb_conf_set(ah, &div_ant_conf);
-
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: total_pkt_count=%d\n",
-	   __func__, antcomb->total_pkt_count);
-
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: main_total_rssi=%d\n",
-	   __func__, antcomb->main_total_rssi);
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: alt_total_rssi=%d\n",
-	   __func__, antcomb->alt_total_rssi);
-
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: main_rssi_avg=%d\n",
-	   __func__, main_rssi_avg);
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: alt_alt_rssi_avg=%d\n",
-	   __func__, alt_rssi_avg);
-
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: main_recv_cnt=%d\n",
-	   __func__, antcomb->main_recv_cnt);
-	HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: alt_recv_cnt=%d\n",
-	   __func__, antcomb->alt_recv_cnt);
-
-//	if (curr_alt_set != div_ant_conf.alt_lna_conf)
-		HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: lna_conf: %x -> %x\n",
-		    __func__, curr_alt_set, div_ant_conf.alt_lna_conf);
-//	if (curr_main_set != div_ant_conf.main_lna_conf)
-		HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: main_lna_conf: %x -> %x\n",
-		    __func__, curr_main_set, div_ant_conf.main_lna_conf);
-//	if (curr_bias != div_ant_conf.fast_div_bias)
-		HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: fast_div_bias: %x -> %x\n",
-		    __func__, curr_bias, div_ant_conf.fast_div_bias);
-
-	antcomb->scan_start_time = ticks;
-	antcomb->total_pkt_count = 0;
-	antcomb->main_total_rssi = 0;
-	antcomb->alt_total_rssi = 0;
-	antcomb->main_recv_cnt = 0;
-	antcomb->alt_recv_cnt = 0;
-}
+#include "ar9002/ar9285_diversity.h"
 
 /*
  * Set the antenna switch to control RX antenna diversity.

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h	Wed Jun 12 14:52:57 2013	(r251655)
@@ -28,26 +28,6 @@
 #ifndef	__AR9285_DIVERSITY_H__
 #define	__AR9285_DIVERSITY_H__
 
-/* Antenna diversity/combining */
-#define	ATH_ANT_RX_CURRENT_SHIFT	4
-#define	ATH_ANT_RX_MAIN_SHIFT		2
-#define	ATH_ANT_RX_MASK			0x3
-
-#define	ATH_ANT_DIV_COMB_SHORT_SCAN_INTR	50
-#define	ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT	0x100
-#define	ATH_ANT_DIV_COMB_MAX_PKTCOUNT		0x200
-#define	ATH_ANT_DIV_COMB_INIT_COUNT		95
-#define	ATH_ANT_DIV_COMB_MAX_COUNT		100
-#define	ATH_ANT_DIV_COMB_ALT_ANT_RATIO		30
-#define	ATH_ANT_DIV_COMB_ALT_ANT_RATIO2		20
-
-#define	ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA	-3
-#define	ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA	-1
-#define	ATH_ANT_DIV_COMB_LNA1_DELTA_HI		-4
-#define	ATH_ANT_DIV_COMB_LNA1_DELTA_MID		-2
-#define	ATH_ANT_DIV_COMB_LNA1_DELTA_LOW		2
-
-extern	void ar9285_ant_comb_scan(struct ath_hal *ah, struct ath_rx_status *rs,
-		unsigned long ticks, int hz);
+extern	HAL_BOOL ar9285SetAntennaSwitch(struct ath_hal *, HAL_ANT_SETTING);
 
 #endif

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c	Wed Jun 12 14:52:57 2013	(r251655)
@@ -38,6 +38,7 @@
 #include "ar9002/ar9002phy.h"
 #include "ar9002/ar9285phy.h"
 #include "ar9002/ar9285an.h"
+#include "ar9002/ar9285_diversity.h"
 
 /* Eeprom versioning macros. Returns true if the version is equal or newer than the ver specified */ 
 #define	EEP_MINOR(_ah) \

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/if_ath.c	Wed Jun 12 14:52:57 2013	(r251655)
@@ -113,6 +113,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #ifdef ATH_TX99_DIAG
@@ -530,6 +531,14 @@ ath_attach(u_int16_t devid, struct ath_s
 		goto bad2;
 	}
 
+	/* Attach LNA diversity module */
+	if (ath_lna_div_attach(sc) < 0) {
+		device_printf(sc->sc_dev,
+		    "%s: unable to attach LNA diversity\n", __func__);
+		error = EIO;
+		goto bad2;
+	}
+
 	/* Start DFS processing tasklet */
 	TASK_INIT(&sc->sc_dfstask, 0, ath_dfs_tasklet, sc);
 
@@ -680,6 +689,8 @@ ath_attach(u_int16_t devid, struct ath_s
 	sc->sc_rxtsf32 = ath_hal_has_long_rxdesc_tsf(ah);
 	sc->sc_hasenforcetxop = ath_hal_hasenforcetxop(ah);
 	sc->sc_rx_lnamixer = ath_hal_hasrxlnamixer(ah);
+	sc->sc_hasdivcomb = ath_hal_hasdivantcomb(ah);
+
 	if (ath_hal_hasfastframes(ah))
 		ic->ic_caps |= IEEE80211_C_FF;
 	wmodes = ath_hal_getwirelessmodes(ah);
@@ -1038,6 +1049,7 @@ ath_detach(struct ath_softc *sc)
 #ifdef	ATH_DEBUG_ALQ
 	if_ath_alq_tidyup(&sc->sc_alq);
 #endif
+	ath_lna_div_detach(sc);
 	ath_btcoex_detach(sc);
 	ath_spectral_detach(sc);
 	ath_dfs_detach(sc);

Modified: head/sys/dev/ath/if_ath_debug.h
==============================================================================
--- head/sys/dev/ath/if_ath_debug.h	Wed Jun 12 13:36:20 2013	(r251654)
+++ head/sys/dev/ath/if_ath_debug.h	Wed Jun 12 14:52:57 2013	(r251655)
@@ -67,6 +67,7 @@ enum { 
 	ATH_DEBUG_EDMA_RX	= 0x200000000ULL,	/* RX EDMA state */
 	ATH_DEBUG_SW_TX_FILT	= 0x400000000ULL,	/* SW TX FF */
 	ATH_DEBUG_NODE_PWRSAVE	= 0x800000000ULL,	/* node powersave */
+	ATH_DEBUG_DIVERSITY	= 0x1000000000ULL,	/* Diversity logic */
 
 	ATH_DEBUG_ANY		= 0xffffffffffffffffULL
 };

Added: head/sys/dev/ath/if_ath_lna_div.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/ath/if_ath_lna_div.c	Wed Jun 12 14:52:57 2013	(r251655)
@@ -0,0 +1,798 @@
+/*-
+ * Copyright (c) 2013 Adrian Chadd 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * $FreeBSD$
+ */
+#include 
+__FBSDID("$FreeBSD$");
+
+/*
+ * This module handles LNA diversity for those chips which implement LNA
+ * mixing (AR9285/AR9485.)
+ */
+#include "opt_ath.h"
+#include "opt_inet.h"
+#include "opt_wlan.h"
+
+#include 
+#include  
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+ 
+#include 
+#include 
+#include 
+#include 		/* XXX for ether_sprintf */
+
+#include 
+
+#include 
+
+#ifdef INET
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+
+/* Linux compability macros */
+/*
+ * XXX these don't handle rounding, underflow, overflow, wrapping!
+ */
+#define	msecs_to_jiffies(a)		( (a) * hz / 1000 )
+
+/*
+ * Methods which are required
+ */
+
+/*
+ * Attach the LNA diversity to the given interface
+ */
+int
+ath_lna_div_attach(struct ath_softc *sc)
+{
+	struct if_ath_ant_comb_state *ss;
+
+	/* Only do this if diversity is enabled */
+	if (! ath_hal_hasdivantcomb(sc->sc_ah))
+		return (0);
+
+	ss = malloc(sizeof(struct if_ath_ant_comb_state),
+	    M_TEMP, M_WAITOK | M_ZERO);
+	if (ss == NULL) {
+		device_printf(sc->sc_dev, "%s: failed to allocate\n",
+		    __func__);
+		/* Don't fail at this point */
+		return (0);
+	}
+
+	/* Let's flip this on */
+	sc->sc_lna_div = ss;
+	sc->sc_dolnadiv = 1;
+
+	return (0);
+}
+
+/*
+ * Detach the LNA diversity state from the given interface
+ */
+int
+ath_lna_div_detach(struct ath_softc *sc)
+{
+	if (sc->sc_lna_div != NULL) {
+		free(sc->sc_lna_div, M_TEMP);
+		sc->sc_lna_div = NULL;
+	}
+	sc->sc_dolnadiv = 0;
+	return (0);
+}
+
+/*
+ * Enable LNA diversity on the current channel if it's required.
+ */
+int
+ath_lna_div_enable(struct ath_softc *sc, const struct ieee80211_channel *chan)
+{
+
+	return (0);
+}
+
+/*
+ * Handle ioctl requests from the diagnostic interface.
+ *
+ * The initial part of this code resembles ath_ioctl_diag();
+ * it's likely a good idea to reduce duplication between
+ * these two routines.
+ */
+int
+ath_lna_div_ioctl(struct ath_softc *sc, struct ath_diag *ad)
+{
+	unsigned int id = ad->ad_id & ATH_DIAG_ID;
+	void *indata = NULL;
+	void *outdata = NULL;
+	u_int32_t insize = ad->ad_in_size;
+	u_int32_t outsize = ad->ad_out_size;
+	int error = 0;
+//	int val;
+
+	if (ad->ad_id & ATH_DIAG_IN) {
+		/*
+		 * Copy in data.
+		 */
+		indata = malloc(insize, M_TEMP, M_NOWAIT);
+		if (indata == NULL) {
+			error = ENOMEM;
+			goto bad;
+		}
+		error = copyin(ad->ad_in_data, indata, insize);
+		if (error)
+			goto bad;
+	}
+	if (ad->ad_id & ATH_DIAG_DYN) {
+		/*
+		 * Allocate a buffer for the results (otherwise the HAL
+		 * returns a pointer to a buffer where we can read the
+		 * results).  Note that we depend on the HAL leaving this
+		 * pointer for us to use below in reclaiming the buffer;
+		 * may want to be more defensive.
+		 */
+		outdata = malloc(outsize, M_TEMP, M_NOWAIT);
+		if (outdata == NULL) {
+			error = ENOMEM;
+			goto bad;
+		}
+	}
+	switch (id) {
+		default:
+			error = EINVAL;
+	}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 14:56:39 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 70AFCB5C;
 Wed, 12 Jun 2013 14:56:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us [199.48.134.227])
 by mx1.freebsd.org (Postfix) with ESMTP id 370A811D0;
 Wed, 12 Jun 2013 14:56:39 +0000 (UTC)
Received: from glenbarber.us (70.15.88.86.res-cmts.sewb.ptd.net [70.15.88.86])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id 0897623F848;
 Wed, 12 Jun 2013 10:56:37 -0400 (EDT)
DKIM-Filter: OpenDKIM Filter v2.8.3 onyx.glenbarber.us 0897623F848
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none
Date: Wed, 12 Jun 2013 10:56:36 -0400
From: Glen Barber 
To: Hiroki Sato 
Subject: Re: svn commit: r251652 - head/release
Message-ID: <20130612145636.GH1558@glenbarber.us>
References: <20130612.230800.1862462548384264440.hrs@allbsd.org>
 <20130612141204.GG1558@glenbarber.us>
 <51B882CF.7070403@freebsd.org>
 <20130612.234224.888649268051803264.hrs@allbsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="aziWXe2aaRGlkyg3"
Content-Disposition: inline
In-Reply-To: <20130612.234224.888649268051803264.hrs@allbsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org, nwhitehorn@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 14:56:39 -0000


--aziWXe2aaRGlkyg3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jun 12, 2013 at 11:42:24PM +0900, Hiroki Sato wrote:
> nw> On 06/12/13 09:12, Glen Barber wrote:
> nw> > On Wed, Jun 12, 2013 at 11:08:00PM +0900, Hiroki Sato wrote:
> nw> >> gj> Author: gjb
> nw> >> gj> Date: Wed Jun 12 13:15:28 2013
> nw> >> gj> New Revision: 251652
> nw> >> gj> URL: http://svnweb.freebsd.org/changeset/base/251652
> nw> >> gj>
> nw> >> gj> Log:
> nw> >> gj> Add new script to run release builds.  The script is heavily b=
ased
> nw> >> upon
> nw> >> gj>   the release/generate-release.sh script by nwhitehorn.
> nw> >> gj>
> nw> >> gj> This script can use optional configuration file to override
> nw> >> defaults,
> nw> >> gj> making running multiple serialzied builds with different speci=
fic
> nw> >> gj>   configurations or architecture-specific tunings quite easy.
> nw> >> gj>
> nw> >> gj> Sample overrideable options are included in the
> nw> >> release.conf.sample
> nw> >> gj>   file.
> nw> >> gj>
> nw> >> gj>   Approved by:	kib (mentor)
> nw> >> gj>   MFC After:	2 weeks
> nw> >> gj>   X-MFC-To:	stable/9 only
> nw> >>
> nw> >>   Are you planning to replace generate-release.sh with this or kee=
p the
> nw> >>   two scripts?
> nw> >>
> nw> > The plan is to eventually replace the generate-release.sh script.
> nw> >
> nw> > Glen
> nw> >
> nw>
> nw> As I mentioned in a private email to Glen, it might be reasonable just
> nw> to replace it now. generate-release.sh exists solely for the
> nw> convenience of re@ (the main tool is just make release) and so we
> nw> should just have whichever tools re@ finds more convenient. I suspect
> nw> it is the new script.
>=20
>  I agree.  Maintaining two scripts are confusing.
>=20
>  However, I do not think the imported version of release.sh is ready
>  because it has non-reasonable default values like
>  TARGET_ARCH=3D${TARGET}, for example.  When this script was submitted
>  by Glen a while ago, I did not merge parts which were problematic or
>  difficult to maintain.
>=20

In cases such as amd64 and i386, TARGET and TARGET_ARCH are set to the
same value.

For architectures like pc98, mips, etc., they surely will differ.
However, IMHO, for these cases, that is where reading in a configuration
file makes things much easier to tune per-build, rather than setting
environment values.

When I originally proposed these changes, buildworld with empty
TARGET/TARGET_ARCH would cause the build to fail.  I would need to find
the thread in my email archives to remember specifically where it was
broken.

I can rework it so TARGET and TARGET_ARCH are only included in make(1)
arguments if set if that is desired.

Glen


--aziWXe2aaRGlkyg3
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQEcBAEBCAAGBQJRuIwkAAoJEFJPDDeguUajrlEIAIC0YbQ5bCwiMbUXRfkaHPXO
tCo9m1a7lE9sLkm6gI7kkJj10nc1v31BOmRtV5siiUfoF7dQm0W+D0iPz0AJuesm
IrYG9GrbsKOr0lq311oIMxPjkdDMw5WUkQ+ZMfzHePF//vhHADAfIz9uY9KXwVs2
gTZZpBcKQuBqRYDCqjXh9oi9eBbQ57lFLxl334ncNiC60J+gwEBFf9q7FNzJ0hq/
YKBCRy78hh9NXZDibsX8qN1C8hSGQreM/3YailfrNtnvdm7GGihbsV4SLIyCezhb
udIACtfarwCEU4V01+3z23+Kd8AumykYtsbRshM7A9NVREisYNvMahswo2+y8Xg=
=WdH4
-----END PGP SIGNATURE-----

--aziWXe2aaRGlkyg3--

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 15:18:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A5DEB272;
 Wed, 12 Jun 2013 15:18:08 +0000 (UTC)
 (envelope-from utisoft@gmail.com)
Received: from mail-we0-x233.google.com (mail-we0-x233.google.com
 [IPv6:2a00:1450:400c:c03::233])
 by mx1.freebsd.org (Postfix) with ESMTP id BC73E1396;
 Wed, 12 Jun 2013 15:18:07 +0000 (UTC)
Received: by mail-we0-f179.google.com with SMTP id w59so7119388wes.10
 for ; Wed, 12 Jun 2013 08:18:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=date:from:to:cc:message-id:in-reply-to:references:subject
 :mime-version:content-type:content-transfer-encoding;
 bh=MNm2C/6j8q8rsSNjpg9aHpGfiKvJ2LrrZX5O2UV/u3Y=;
 b=TDc6tgaSBIBJUXNA5+i7UqoIvhRqP5Gon4IUFEq8XFX1JgfrlgyWMZYP6AyLLVeXnK
 ECTVe+ggUfjTr1TyRT6W+hLKEPlfo3m9BgzNUGt1jjIbCwKWkIcogkUhAss8Pegv8D+b
 9rYDh6Dec8BnGfE+NFHvSwfuA8E0eimAhD1bQXnd8Om7Qf3YaFg1qAhYvUiQAGLFi5AA
 jWtsxem9sKvun3AePZicfGofn8dm3U4Y91AxZliRY3VXZT4HzjBvMIGwrpDp0efM1Gh3
 SjPHY6T+0J3bk4IPyKjHVsgLi8QbOdeKqTdbXrlbezWekhlgDxcRbCmW+opjhr/rSBM4
 q8AA==
X-Received: by 10.194.237.38 with SMTP id uz6mr12293976wjc.73.1371050286776;
 Wed, 12 Jun 2013 08:18:06 -0700 (PDT)
Received: from com.flipdogsolutions (genld-218-198.t-mobile.co.uk.
 [149.254.218.198])
 by mx.google.com with ESMTPSA id eq15sm4075320wic.4.2013.06.12.08.18.03
 for 
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Wed, 12 Jun 2013 08:18:05 -0700 (PDT)
Date: Wed, 12 Jun 2013 16:17:50 +0100
From: Chris Rees 
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org, Greg Lehey 
Message-ID: <8981d989-583a-4d06-9077-788a447d3255.maildroid@localhost>
In-Reply-To: <201306120754.r5C7s0qx099093@svn.freebsd.org>
References: <201306120754.r5C7s0qx099093@svn.freebsd.org>
Subject: Re: svn commit: r251648 - head/usr.bin/calendar
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: crees@physics.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 15:18:08 -0000

This looks backwards unless we did actually change style(9).

Chris

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 15:18:11 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6AC08276;
 Wed, 12 Jun 2013 15:18:11 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5D5D21398;
 Wed, 12 Jun 2013 15:18:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CFIBLZ040398;
 Wed, 12 Jun 2013 15:18:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CFIBQK040397;
 Wed, 12 Jun 2013 15:18:11 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306121518.r5CFIBQK040397@svn.freebsd.org>
From: Adrian Chadd 
Date: Wed, 12 Jun 2013 15:18:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251656 - head/sys/dev/ath/ath_hal/ar9002
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 15:18:11 -0000

Author: adrian
Date: Wed Jun 12 15:18:10 2013
New Revision: 251656
URL: http://svnweb.freebsd.org/changeset/base/251656

Log:
  Set the antenna "config group" field.
  
  The reference HAL pushes a config group parameter to the driver layer
  to inform it which particular chip behaviour to implement.
  
  This particular value tags it as an AR9285.

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun 12 14:52:57 2013	(r251655)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun 12 15:18:10 2013	(r251656)
@@ -51,6 +51,7 @@ ar9285_antdiv_comb_conf_get(struct ath_h
 				 AR_PHY_9285_ANT_DIV_ALT_LNACONF_S;
 	antconf->fast_div_bias = (regval & AR_PHY_9285_FAST_DIV_BIAS) >>
 				  AR_PHY_9285_FAST_DIV_BIAS_S;
+	antconf->antdiv_configgroup = DEFAULT_ANTDIV_CONFIG_GROUP;
 }
 
 void

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 15:23:18 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 659D7605;
 Wed, 12 Jun 2013 15:23:18 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 577001465;
 Wed, 12 Jun 2013 15:23:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CFNIN2042792;
 Wed, 12 Jun 2013 15:23:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CFNI8w042791;
 Wed, 12 Jun 2013 15:23:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306121523.r5CFNI8w042791@svn.freebsd.org>
From: Adrian Chadd 
Date: Wed, 12 Jun 2013 15:23:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251657 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 15:23:18 -0000

Author: adrian
Date: Wed Jun 12 15:23:17 2013
New Revision: 251657
URL: http://svnweb.freebsd.org/changeset/base/251657

Log:
  Tie in the LNA diversity configuration functions into the HAL.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Wed Jun 12 15:18:10 2013	(r251656)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Wed Jun 12 15:23:17 2013	(r251657)
@@ -235,6 +235,12 @@ ar9300_attach_freebsd_ops(struct ath_hal
 	ah->ah_setChainMasks = ar9300SetChainMasks;
 	/* ah_get11nRxClear */
 	/* ah_set11nRxClear */
+
+	/* bluetooth coexistence functions */
+
+	/* LNA diversity functions */
+	ah->ah_divLnaConfGet = ar9300_ant_div_comb_get_config;
+	ah->ah_divLnaConfSet = ar9300_ant_div_comb_set_config;
 }
 
 HAL_BOOL

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 15:24:49 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 797C07B3;
 Wed, 12 Jun 2013 15:24:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5BD681485;
 Wed, 12 Jun 2013 15:24:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CFOnSg043032;
 Wed, 12 Jun 2013 15:24:49 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CFOmcD043027;
 Wed, 12 Jun 2013 15:24:48 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306121524.r5CFOmcD043027@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Wed, 12 Jun 2013 15:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251658 - head/sys/fs/ext2fs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 15:24:49 -0000

Author: pfg
Date: Wed Jun 12 15:24:48 2013
New Revision: 251658
URL: http://svnweb.freebsd.org/changeset/base/251658

Log:
  Turn DIAGNOSTICs to INVARIANTS in ext2fs.
  
  This is done to be consistent with what other filesystems and
  particularly ffs already does (see r173464).
  
  MFC after:	5 days

Modified:
  head/sys/fs/ext2fs/ext2_alloc.c
  head/sys/fs/ext2fs/ext2_balloc.c
  head/sys/fs/ext2fs/ext2_inode.c
  head/sys/fs/ext2fs/ext2_lookup.c
  head/sys/fs/ext2fs/ext2_vnops.c

Modified: head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_alloc.c	Wed Jun 12 15:23:17 2013	(r251657)
+++ head/sys/fs/ext2fs/ext2_alloc.c	Wed Jun 12 15:24:48 2013	(r251658)
@@ -91,7 +91,7 @@ ext2_alloc(struct inode *ip, int32_t lbn
 	fs = ip->i_e2fs;
 	ump = ip->i_ump;
 	mtx_assert(EXT2_MTX(ump), MA_OWNED);
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((u_int)size > fs->e2fs_bsize || blkoff(fs, size) != 0) {
 		vn_printf(ip->i_devvp, "bsize = %lu, size = %d, fs = %s\n",
 		    (long unsigned int)fs->e2fs_bsize, size, fs->e2fs_fsmnt);
@@ -99,7 +99,7 @@ ext2_alloc(struct inode *ip, int32_t lbn
 	}
 	if (cred == NOCRED)
 		panic("ext2_alloc: missing credential");
-#endif /* DIAGNOSTIC */
+#endif /* INVARIANTS */
 	if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0)
 		goto nospace;
 	if (cred->cr_uid != 0 && 
@@ -183,7 +183,7 @@ ext2_reallocblks(struct vop_reallocblks_
 	len = buflist->bs_nchildren;
 	start_lbn = buflist->bs_children[0]->b_lblkno;
 	end_lbn = start_lbn + len - 1;
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	for (i = 1; i < len; i++)
 		if (buflist->bs_children[i]->b_lblkno != start_lbn + i)
 			panic("ext2_reallocblks: non-cluster");
@@ -232,7 +232,7 @@ ext2_reallocblks(struct vop_reallocblks_
 	if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) {
 		ssize = len;
 	} else {
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 		if (start_ap[start_lvl-1].in_lbn == idp->in_lbn)
 			panic("ext2_reallocblks: start == end");
 #endif
@@ -271,7 +271,7 @@ ext2_reallocblks(struct vop_reallocblks_
 			bap = ebap;
 			soff = -i;
 		}
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 		if (buflist->bs_children[i]->b_blkno != fsbtodb(fs, *bap))
 			panic("ext2_reallocblks: alloc mismatch");
 #endif
@@ -748,7 +748,7 @@ retry:
 		return (0);
 	}
 gotit:
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if (isset(bbp, bno)) {
 		printf("ext2fs_alloccgblk: cg=%d bno=%jd fs=%s\n",
 			cg, (intmax_t)bno, fs->e2fs_fsmnt);

Modified: head/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_balloc.c	Wed Jun 12 15:23:17 2013	(r251657)
+++ head/sys/fs/ext2fs/ext2_balloc.c	Wed Jun 12 15:24:48 2013	(r251658)
@@ -152,7 +152,7 @@ ext2_balloc(struct inode *ip, int32_t lb
 	pref = 0;
 	if ((error = ext2_getlbns(vp, lbn, indirs, &num)) != 0)
 		return (error);
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if (num < 1)
 		panic ("ext2_balloc: ext2_getlbns returned indirect block");
 #endif

Modified: head/sys/fs/ext2fs/ext2_inode.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_inode.c	Wed Jun 12 15:23:17 2013	(r251657)
+++ head/sys/fs/ext2fs/ext2_inode.c	Wed Jun 12 15:24:48 2013	(r251658)
@@ -133,7 +133,7 @@ ext2_truncate(struct vnode *vp, off_t le
 
 	if (ovp->v_type == VLNK &&
 	    oip->i_size < ovp->v_mount->mnt_maxsymlinklen) {
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 		if (length != 0)
 			panic("ext2_truncate: partial truncate of symlink");
 #endif
@@ -319,7 +319,7 @@ ext2_truncate(struct vnode *vp, off_t le
 		}
 	}
 done:
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	for (level = SINGLE; level <= TRIPLE; level++)
 		if (newblks[NDADDR + level] != oip->i_ib[level])
 			panic("itrunc1");
@@ -331,7 +331,7 @@ done:
 	    bo->bo_clean.bv_cnt != 0))
 		panic("itrunc3");
 	BO_UNLOCK(bo);
-#endif /* DIAGNOSTIC */
+#endif /* INVARIANTS */
 	/*
 	 * Put back the real size.
 	 */

Modified: head/sys/fs/ext2fs/ext2_lookup.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_lookup.c	Wed Jun 12 15:23:17 2013	(r251657)
+++ head/sys/fs/ext2fs/ext2_lookup.c	Wed Jun 12 15:24:48 2013	(r251658)
@@ -62,7 +62,7 @@
 #include 
 #include 
 
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 static int dirchk = 1;
 #else
 static int dirchk = 0;
@@ -790,7 +790,7 @@ ext2_direnter(struct inode *ip, struct v
 	int     DIRBLKSIZ = ip->i_e2fs->e2fs_bsize;
 
 
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((cnp->cn_flags & SAVENAME) == 0)
 		panic("ext2_direnter: missing name");
 #endif

Modified: head/sys/fs/ext2fs/ext2_vnops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vnops.c	Wed Jun 12 15:23:17 2013	(r251657)
+++ head/sys/fs/ext2fs/ext2_vnops.c	Wed Jun 12 15:24:48 2013	(r251658)
@@ -657,7 +657,7 @@ ext2_link(struct vop_link_args *ap)
 	struct inode *ip;
 	int error;
 
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("ext2_link: no name");
 #endif
@@ -726,7 +726,7 @@ ext2_rename(struct vop_rename_args *ap)
 	int error = 0;
 	u_char namlen;
 
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((tcnp->cn_flags & HASBUF) == 0 ||
 	    (fcnp->cn_flags & HASBUF) == 0)
 		panic("ext2_rename: no name");
@@ -1077,7 +1077,7 @@ ext2_mkdir(struct vop_mkdir_args *ap)
 	struct dirtemplate dirtemplate, *dtp;
 	int error, dmode;
 
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("ext2_mkdir: no name");
 #endif
@@ -1486,7 +1486,7 @@ ext2_makeinode(int mode, struct vnode *d
 	int error;
 
 	pdir = VTOI(dvp);
-#ifdef DIAGNOSTIC
+#ifdef INVARIANTS
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("ext2_makeinode: no name");
 #endif

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 16:13:05 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 953B5766;
 Wed, 12 Jun 2013 16:13:05 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 87DCD193C;
 Wed, 12 Jun 2013 16:13:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CGD5Jc058889;
 Wed, 12 Jun 2013 16:13:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CGD5Ol058888;
 Wed, 12 Jun 2013 16:13:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121613.r5CGD5Ol058888@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 16:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251659 - head/sbin/camcontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 16:13:05 -0000

Author: mav
Date: Wed Jun 12 16:13:05 2013
New Revision: 251659
URL: http://svnweb.freebsd.org/changeset/base/251659

Log:
  Use CAM_DIR_NONE for requests without data.
  Wrong values there confuse some drivers.
  
  MFC after:	1 week

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Wed Jun 12 15:24:48 2013	(r251658)
+++ head/sbin/camcontrol/camcontrol.c	Wed Jun 12 16:13:05 2013	(r251659)
@@ -1784,7 +1784,7 @@ ata_read_native_max(struct cam_device *d
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_IN,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1828,7 +1828,7 @@ atahpa_set_max(struct cam_device *device
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1895,7 +1895,7 @@ atahpa_lock(struct cam_device *device, i
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1962,7 +1962,7 @@ atahpa_freeze_lock(struct cam_device *de
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 16:44:19 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 28F9A2ED;
 Wed, 12 Jun 2013 16:44:19 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 017E51CE2;
 Wed, 12 Jun 2013 16:44:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CGiImt068246;
 Wed, 12 Jun 2013 16:44:18 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CGiIEh068242;
 Wed, 12 Jun 2013 16:44:18 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201306121644.r5CGiIEh068242@svn.freebsd.org>
From: Chris Rees 
Date: Wed, 12 Jun 2013 16:44:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251660 - in head/etc: defaults rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 16:44:19 -0000

Author: crees (doc,ports committer)
Date: Wed Jun 12 16:44:17 2013
New Revision: 251660
URL: http://svnweb.freebsd.org/changeset/base/251660

Log:
  Clean up swapfile memory disk on shutdown
  
  Make the md unit number configurable so that it can be predicted
  
  PR:		bin/168544
  Submitted by:	wblock (based on)
  Approved by:	kevlo

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/addswap

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Wed Jun 12 16:13:05 2013	(r251659)
+++ head/etc/defaults/rc.conf	Wed Jun 12 16:44:17 2013	(r251660)
@@ -33,6 +33,7 @@ always_force_depends="NO"	# Set to check
 				# running during boot (can increase boot time).
 
 swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
+swapfile_mdunit="99"	# Swapfile md(4) unit number created by mdconfig(8).
 apm_enable="NO"		# Set to YES to enable APM BIOS functions (or NO).
 apmd_enable="NO"	# Run apmd to handle APM event from userland.
 apmd_flags=""		# Flags to apmd (if enabled).

Modified: head/etc/rc.d/addswap
==============================================================================
--- head/etc/rc.d/addswap	Wed Jun 12 16:13:05 2013	(r251659)
+++ head/etc/rc.d/addswap	Wed Jun 12 16:44:17 2013	(r251660)
@@ -8,13 +8,13 @@
 # PROVIDE: addswap
 # REQUIRE: FILESYSTEMS kld
 # BEFORE:  netif
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 
 name="addswap"
 start_cmd="addswap_start"
-stop_cmd=":"
+stop_cmd="addswap_stop"
 
 addswap_start()
 {
@@ -23,8 +23,43 @@ addswap_start()
 		;;
 	*)
 		if [ -w "${swapfile}" ]; then
-			echo "Adding ${swapfile} as additional swap"
-			mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev}
+			check_startmsgs && echo "Adding ${swapfile} as additional swap"
+
+			if [ -n "${swapfile_mdunit}" ]; then
+				mdev="/dev/md${swapfile_mdunit#md}"
+				mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit}
+			else
+				mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`"
+			fi
+
+			if [ $? -eq 0 ]; then
+				swapon ${mdev}
+			else
+				echo "error creating swapfile device"
+			fi
+		fi
+		;;
+	esac
+}
+
+addswap_stop()
+{
+	case ${swapfile} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		if [ -n "${swapfile_mdunit}" ]; then
+			mdev="/dev/md${swapfile_mdunit#md}"
+		else
+			mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`"
+			swapfile_mdunit=${mdev#md}
+		fi
+		if [ -n "${swapfile_mdunit}" ]; then
+			swapctl -l | grep -q ${mdev}
+			if [ $? -eq 0 ]; then
+				echo "Dismounting swapfile ${swapfile}"
+				swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit}
+			fi
 		fi
 		;;
 	esac

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 17:01:27 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C148CB3B;
 Wed, 12 Jun 2013 17:01:27 +0000 (UTC) (envelope-from ken@kdm.org)
Received: from nargothrond.kdm.org (nargothrond.kdm.org [70.56.43.81])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B1B61F85;
 Wed, 12 Jun 2013 17:01:27 +0000 (UTC)
Received: from nargothrond.kdm.org (localhost [127.0.0.1])
 by nargothrond.kdm.org (8.14.2/8.14.2) with ESMTP id r5CH1QaD009247;
 Wed, 12 Jun 2013 11:01:26 -0600 (MDT)
 (envelope-from ken@nargothrond.kdm.org)
Received: (from ken@localhost)
 by nargothrond.kdm.org (8.14.2/8.14.2/Submit) id r5CH1QXE009246;
 Wed, 12 Jun 2013 11:01:26 -0600 (MDT) (envelope-from ken)
Date: Wed, 12 Jun 2013 11:01:26 -0600
From: "Kenneth D. Merry" 
To: Alexander Motin 
Subject: Re: svn commit: r251649 - in head/sys/cam: ata scsi
Message-ID: <20130612170126.GA8081@nargothrond.kdm.org>
References: <201306120907.r5C97FTN022047@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201306120907.r5C97FTN022047@svn.freebsd.org>
User-Agent: Mutt/1.4.2i
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 17:01:27 -0000

On Wed, Jun 12, 2013 at 09:07:15 +0000, Alexander Motin wrote:
> Author: mav
> Date: Wed Jun 12 09:07:15 2013
> New Revision: 251649
> URL: http://svnweb.freebsd.org/changeset/base/251649
> 
> Log:
>   Acquire periph reference when handling d_getattr() method call.
>   
>   While GEOM in general has provider opened while sending BIO_GETATTR,
>   GEOM DISK does not really need to open disk to read medium-unrelated
>   attributes for own use.
>   
>   Proposed by:	ken

I forgot proposing that, but it seems like we probably don't need to
acquire a reference there.  The primary thing we want to insure is that the
peripheral is valid and doesn't go away.  We acquire a reference when we do
the disk_create(), and then release that reference when our GEOM provider
has gone away.  (GEOM calls the d_gone() callback, and so we know that it
will not call into the CAM peripheral driver again.)

I assume that once the provider has gone away, there won't be any more
d_getattr() method calls.  If so, the existing reference should be enough
to protect it.  (If we can get d_getattr() calls after the provider has
gone away, then that needs to be fixed.)

Ken
-- 
Kenneth Merry
ken@FreeBSD.ORG

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 17:39:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AFF93A1B;
 Wed, 12 Jun 2013 17:39:54 +0000 (UTC)
 (envelope-from mavbsd@gmail.com)
Received: from mail-ea0-x235.google.com (mail-ea0-x235.google.com
 [IPv6:2a00:1450:4013:c01::235])
 by mx1.freebsd.org (Postfix) with ESMTP id C2BAE1322;
 Wed, 12 Jun 2013 17:39:53 +0000 (UTC)
Received: by mail-ea0-f181.google.com with SMTP id a15so4744646eae.26
 for ; Wed, 12 Jun 2013 10:39:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:content-type:content-transfer-encoding;
 bh=KaHidGR7evbj7a9f54tLFaqFBISmqBg3psPZ8KSuDxo=;
 b=yREwslADwernxyyX857EIpb6OH9tqrpsPYVG07DsYFwZz92Qv+89ml8/y+TbNVqEtF
 oqUjQTclZhGzOqesqKGL4xhTsSR6c9F0w/48pq+c7Yp5PpAFeOCnnqZ0AXOTE8PlXsdi
 1Dzcnwb0vv1ZHa1fqDAY87Rw2RWOTCxvyCD1BzoDvIGy9HmR23qpL7DgNUfghfcKF8d8
 x1kFykF0Ag0u2Oj3N/bV1cVGqM710lDCI41TFMzImegYVyKjW+7PgVMfTGL6r4B0TGwu
 ieWMHkC1Tm+P7+6+KNsn4dMwzLlQqHLqUJz5ckn98aXvWFhddJUdoGOsIsVa8Ik8lSq1
 uEiQ==
X-Received: by 10.14.4.130 with SMTP id 2mr11750847eej.96.1371058792889;
 Wed, 12 Jun 2013 10:39:52 -0700 (PDT)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
 by mx.google.com with ESMTPSA id
 s8sm38312296eeo.4.2013.06.12.10.39.50 for 
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Wed, 12 Jun 2013 10:39:51 -0700 (PDT)
Sender: Alexander Motin 
Message-ID: <51B8B265.8010306@FreeBSD.org>
Date: Wed, 12 Jun 2013 20:39:49 +0300
From: Alexander Motin 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130413 Thunderbird/17.0.5
MIME-Version: 1.0
To: "Kenneth D. Merry" 
Subject: Re: svn commit: r251649 - in head/sys/cam: ata scsi
References: <201306120907.r5C97FTN022047@svn.freebsd.org>
 <20130612170126.GA8081@nargothrond.kdm.org>
In-Reply-To: <20130612170126.GA8081@nargothrond.kdm.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 17:39:54 -0000

On 12.06.2013 20:01, Kenneth D. Merry wrote:
> On Wed, Jun 12, 2013 at 09:07:15 +0000, Alexander Motin wrote:
>> Author: mav
>> Date: Wed Jun 12 09:07:15 2013
>> New Revision: 251649
>> URL: http://svnweb.freebsd.org/changeset/base/251649
>>
>> Log:
>>    Acquire periph reference when handling d_getattr() method call.
>>
>>    While GEOM in general has provider opened while sending BIO_GETATTR,
>>    GEOM DISK does not really need to open disk to read medium-unrelated
>>    attributes for own use.
>>
>>    Proposed by:	ken
>
> I forgot proposing that, but it seems like we probably don't need to
> acquire a reference there.

Ah, may be for this point it still was Justin. Sorry, if so.

> The primary thing we want to insure is that the
> peripheral is valid and doesn't go away.  We acquire a reference when we do
> the disk_create(), and then release that reference when our GEOM provider
> has gone away.  (GEOM calls the d_gone() callback, and so we know that it
> will not call into the CAM peripheral driver again.)
>
> I assume that once the provider has gone away, there won't be any more
> d_getattr() method calls.  If so, the existing reference should be enough
> to protect it.  (If we can get d_getattr() calls after the provider has
> gone away, then that needs to be fixed.)

You seems to be right. I've forgot about that d_gone() method. It wasn't 
there in original design. Then probably we don't need reference counting 
on d_open()/d_close() either any more.

-- 
Alexander Motin

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 18:08:12 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4D5E4C7D;
 Wed, 12 Jun 2013 18:08:12 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FEC017D7;
 Wed, 12 Jun 2013 18:08:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CI8CLg094721;
 Wed, 12 Jun 2013 18:08:12 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CI8C4e094720;
 Wed, 12 Jun 2013 18:08:12 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121808.r5CI8C4e094720@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 18:08:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251661 - head/sys/dev/mvs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 18:08:12 -0000

Author: mav
Date: Wed Jun 12 18:08:11 2013
New Revision: 251661
URL: http://svnweb.freebsd.org/changeset/base/251661

Log:
  Replicate r242422 from ata(4) to mvs(4):
  Only four specific ATA PIO commands transfer several sectors per DRQ block
  (interrupt).  All other ATA PIO commands transfer one sector or 512 bytes
  at one time.  Hardcode these exceptions in mvs(4) with ATA_CAM option.
  This fixes timeout of READ LOG EXT command used by `smartctl -x /dev/adaX`.
  Also it fixes timeout of DOWNLOAD_MICROCODE on `camcontrol fwdownload`.

Modified:
  head/sys/dev/mvs/mvs.c

Modified: head/sys/dev/mvs/mvs.c
==============================================================================
--- head/sys/dev/mvs/mvs.c	Wed Jun 12 16:44:17 2013	(r251660)
+++ head/sys/dev/mvs/mvs.c	Wed Jun 12 18:08:11 2013	(r251661)
@@ -894,7 +894,7 @@ mvs_legacy_intr(device_t dev, int poll)
 		    if (ccb->ataio.dxfer_len > ch->donecount) {
 			/* Set this transfer size according to HW capabilities */
 			ch->transfersize = min(ccb->ataio.dxfer_len - ch->donecount,
-			    ch->curr[ccb->ccb_h.target_id].bytecount);
+			    ch->transfersize);
 			/* If data write command - put them */
 			if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) {
 				if (mvs_wait(dev, ATA_S_DRQ, ATA_S_BUSY, 1000) < 0) {
@@ -1334,8 +1334,14 @@ mvs_legacy_execute_transaction(struct mv
 			return;
 		}
 		ch->donecount = 0;
-		ch->transfersize = min(ccb->ataio.dxfer_len,
-		    ch->curr[port].bytecount);
+		if (ccb->ataio.cmd.command == ATA_READ_MUL ||
+		    ccb->ataio.cmd.command == ATA_READ_MUL48 ||
+		    ccb->ataio.cmd.command == ATA_WRITE_MUL ||
+		    ccb->ataio.cmd.command == ATA_WRITE_MUL48) {
+			ch->transfersize = min(ccb->ataio.dxfer_len,
+			    ch->curr[port].bytecount);
+		} else
+			ch->transfersize = min(ccb->ataio.dxfer_len, 512);
 		if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE)
 			ch->fake_busy = 1;
 		/* If data write command - output the data */

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 18:26:36 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 820ECB73;
 Wed, 12 Jun 2013 18:26:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id 58F501944;
 Wed, 12 Jun 2013 18:26:36 +0000 (UTC)
Received: from glenbarber.us (70.15.88.86.res-cmts.sewb.ptd.net [70.15.88.86])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id 8ED6F23F848;
 Wed, 12 Jun 2013 14:26:31 -0400 (EDT)
DKIM-Filter: OpenDKIM Filter v2.8.3 onyx.glenbarber.us 8ED6F23F848
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none
Date: Wed, 12 Jun 2013 14:26:29 -0400
From: Glen Barber 
To: Alexander Motin 
Subject: Re: svn commit: r251654 - in head/sys: cam cam/scsi geom
Message-ID: <20130612182629.GK1558@glenbarber.us>
References: <201306121336.r5CDaKUF007665@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="N/GrjenRD+RJfyz+"
Content-Disposition: inline
In-Reply-To: <201306121336.r5CDaKUF007665@svn.freebsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 18:26:36 -0000


--N/GrjenRD+RJfyz+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jun 12, 2013 at 01:36:20PM +0000, Alexander Motin wrote:
> Author: mav
> Date: Wed Jun 12 13:36:20 2013
> New Revision: 251654
> URL: http://svnweb.freebsd.org/changeset/base/251654
>=20
> Log:
>   Make CAM return and GEOM DISK pass through new GEOM::lunid attribute.
>  =20
>   SPC-4 specification states that serial number may be property of device,
>   but not a specific logical unit.  People reported about FC storages usi=
ng
>   serial number in that way, making it unusable for purposes of LUN multi=
path
>   detection.  SPC-4 states that designators associated with logical unit =
=66rom
>   the VPD page 83h "Device Identification" should be used for that purpos=
e.
>   Report first of them in the new attribute in such preference order: NAA,
>   EUI-64, T10 and SCSI name string.
>  =20
>   While there, make GEOM DISK properly report GEOM::ident in XML output a=
lso
>   using d_getattr() method, if available.  This fixes serial numbers repo=
rting
>   for SCSI disks in `geom disk list` output and confxml.
>  =20

I think this change breaks the build.

cc  -O -pipe  -DRESCUE -std=3Dgnu99 -Qunused-arguments -Wsystem-headers -We=
rror -Wall -Wno-format-
y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpoi=
nter-arith -Wno-unini
tialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-tautol=
ogical-compare -Wno-u
nused-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion =
-c /src/sbin/camcontrol/camcontrol.c
/src/sbin/camcontrol/camcontrol.c:6955:13: error: incompatible pointer
types assigning to 'uint8_t *' (aka 'unsigned char *') from 'struct scsi_vp=
d_id_descriptor *'
[-Werror,-Wincompatible-pointer-types]
                item_addr =3D scsi_get_devid(item->device_id,
                          ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
*** Error code 1

Stop.
make: stopped in /src/sbin/camcontrol
*** Error code 1

Glen


--N/GrjenRD+RJfyz+
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQEcBAEBCAAGBQJRuL1VAAoJEFJPDDeguUajSKkIALnbFD7mMVZMX93PK8D8B9Mz
3EsYfL4uPptiNpF/QnMUIIAUrB8j+gIAfAEA075O4ml5/kLfDTHBxiDNppIArvOu
E9XX6llJAklFgFAyFjSLPb+PQhjzyEjZLpmRtcOTR8+c9XrlmfhwqjaVIrGVFKlX
ytez3g7PhF4JtZPFayYyMUIzfDeuSOGQl0+9Pzi/qS0nQoJuYu4GyQ9T0tQLjnO+
UoTSFw40aB8WDytFgHKIQgR4TK+AJG63YRthDes2hsTSgOgj2hXcr7dXkglQVytu
98Sw04uYnQDmFQnpNPT9xedBelaih3+mA/hkm4jGQTJG6Yvz39JpKV+wcRS88cg=
=/lxB
-----END PGP SIGNATURE-----

--N/GrjenRD+RJfyz+--

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 18:29:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 383B0DB3;
 Wed, 12 Jun 2013 18:29:29 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com
 [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26])
 by mx1.freebsd.org (Postfix) with ESMTP id D46701963;
 Wed, 12 Jun 2013 18:29:28 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7::9d49:a585:bd3b:11af] (unknown
 [IPv6:2001:7b8:3a7:0:9d49:a585:bd3b:11af])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id 73B475C44;
 Wed, 12 Jun 2013 20:29:26 +0200 (CEST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r251654 - in head/sys: cam cam/scsi geom
From: Dimitry Andric 
In-Reply-To: <201306121336.r5CDaKUF007665@svn.freebsd.org>
Date: Wed, 12 Jun 2013 20:29:25 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: 
References: <201306121336.r5CDaKUF007665@svn.freebsd.org>
To: Alexander Motin 
X-Mailer: Apple Mail (2.1508)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 18:29:29 -0000

On Jun 12, 2013, at 15:36, Alexander Motin  wrote:
> Author: mav
> Date: Wed Jun 12 13:36:20 2013
> New Revision: 251654
> URL: http://svnweb.freebsd.org/changeset/base/251654
>=20
> Log:
>  Make CAM return and GEOM DISK pass through new GEOM::lunid attribute.
>=20
>  SPC-4 specification states that serial number may be property of =
device,
>  but not a specific logical unit.  People reported about FC storages =
using
>  serial number in that way, making it unusable for purposes of LUN =
multipath
>  detection.  SPC-4 states that designators associated with logical =
unit from
>  the VPD page 83h "Device Identification" should be used for that =
purpose.
>  Report first of them in the new attribute in such preference order: =
NAA,
>  EUI-64, T10 and SCSI name string.
>=20
>  While there, make GEOM DISK properly report GEOM::ident in XML output =
also
>  using d_getattr() method, if available.  This fixes serial numbers =
reporting
>  for SCSI disks in `geom disk list` output and confxml.
>=20
>  Discussed with:	gibbs, ken
>  Sponsored by:	iXsystems, Inc.
>  MFC after:	2 weeks
>=20
> Modified:
>  head/sys/cam/cam_xpt.c
>  head/sys/cam/scsi/scsi_all.c
>  head/sys/cam/scsi/scsi_all.h
>  head/sys/cam/scsi/scsi_enc_ses.c
>  head/sys/geom/geom_disk.c
....
> Modified: head/sys/cam/scsi/scsi_all.h
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/cam/scsi/scsi_all.h	Wed Jun 12 13:17:43 2013	=
(r251653)
> +++ head/sys/cam/scsi/scsi_all.h	Wed Jun 12 13:36:20 2013	=
(r251654)
> @@ -1292,6 +1292,7 @@ struct scsi_vpd_id_descriptor
> #define	SVPD_ID_PROTO_SHIFT	4
> #define	SVPD_ID_CODESET_BINARY	0x01
> #define	SVPD_ID_CODESET_ASCII	0x02
> +#define	SVPD_ID_CODESET_UTF8	0x03
> #define	SVPD_ID_CODESET_MASK	0x0f
> 	u_int8_t	id_type;
> #define	SVPD_ID_PIV		0x80
> @@ -2316,7 +2317,12 @@ u_int		scsi_calc_syncparam(u_int =
period)
> typedef int	(*scsi_devid_checkfn_t)(uint8_t *);
> int		scsi_devid_is_naa_ieee_reg(uint8_t *bufp);
> int		scsi_devid_is_sas_target(uint8_t *bufp);
> -uint8_t *	scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t =
len,
> +int		scsi_devid_is_lun_eui64(uint8_t *bufp);
> +int		scsi_devid_is_lun_naa(uint8_t *bufp);
> +int		scsi_devid_is_lun_name(uint8_t *bufp);
> +int		scsi_devid_is_lun_t10(uint8_t *bufp);
> +struct scsi_vpd_id_descriptor *
> +		scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t =
len,
> 			       scsi_devid_checkfn_t ck_fn);

This prototype change breaks head:

cc  -O2 -pipe  -DRESCUE -std=3Dgnu99 -Qunused-arguments =
-fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W =
-Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes =
-Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch =
-Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline =
-Wnested-externs -Wredundant-decls -Wold-style-definition =
-Wmissing-variable-declarations -Wno-pointer-sign -Wno-empty-body =
-Wno-string-plus-int -c /src/sbin/camcontrol/camcontrol.c
/src/sbin/camcontrol/camcontrol.c:6955:13: error: incompatible pointer =
types assigning to 'uint8_t *' (aka 'unsigned char *') from 'struct =
scsi_vpd_id_descriptor *' [-Werror,-Wincompatible-pointer-types]
                item_addr =3D scsi_get_devid(item->device_id,
                          ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.


From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 18:32:02 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 53B23FB6;
 Wed, 12 Jun 2013 18:32:02 +0000 (UTC)
 (envelope-from mavbsd@gmail.com)
Received: from mail-ee0-x231.google.com (mail-ee0-x231.google.com
 [IPv6:2a00:1450:4013:c00::231])
 by mx1.freebsd.org (Postfix) with ESMTP id 3DBD5197F;
 Wed, 12 Jun 2013 18:32:01 +0000 (UTC)
Received: by mail-ee0-f49.google.com with SMTP id b57so4533539eek.8
 for ; Wed, 12 Jun 2013 11:32:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:content-type:content-transfer-encoding;
 bh=3aYRGiT2BQ4TAzxiFiXT5CoxvokVzv6Ms2ziSDQ+NEU=;
 b=fzMJZ7EjbzfGtBejB4kFg2SldeOo//KqjhKsFehS6WEMkRQe4uAFURm7aV+I39N+mn
 NHjMDrGeM8e+IXoWrU0Ui7mUGMoX+o5Ad5Xss3559bTP0b546luBuBK+cBFnzLajMMfI
 zFfYJ8yx9ZoJY98biOFELapuHqeBa12eKNee5JDFl8RXTzPZV6KCGCyRWV7sdQkN3mxH
 IPE2AY70+clTdVjl2TxgSWZ0S5XNhoSE7vqBQJJzmyVFyGRZuQHalWIFEonemQy7LUCL
 I0If3hAflIo28Nj8aH4iyNhMHBXvWOM/fVi8nZxf6bHBpoXbvO8CQrmpDtxvd3wV6Hpc
 A4zQ==
X-Received: by 10.14.9.136 with SMTP id 8mr22722594eet.37.1371061920211;
 Wed, 12 Jun 2013 11:32:00 -0700 (PDT)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
 by mx.google.com with ESMTPSA id
 y10sm38588729eev.3.2013.06.12.11.31.58 for 
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Wed, 12 Jun 2013 11:31:59 -0700 (PDT)
Sender: Alexander Motin 
Message-ID: <51B8BE9C.7070301@FreeBSD.org>
Date: Wed, 12 Jun 2013 21:31:56 +0300
From: Alexander Motin 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130413 Thunderbird/17.0.5
MIME-Version: 1.0
To: Dimitry Andric 
Subject: Re: svn commit: r251654 - in head/sys: cam cam/scsi geom
References: <201306121336.r5CDaKUF007665@svn.freebsd.org>
 
In-Reply-To: 
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, Glen Barber ,
 svn-src-all@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 18:32:02 -0000

On 12.06.2013 21:29, Dimitry Andric wrote:
> On Jun 12, 2013, at 15:36, Alexander Motin  wrote:
>> Author: mav
>> Date: Wed Jun 12 13:36:20 2013
>> New Revision: 251654
>> URL: http://svnweb.freebsd.org/changeset/base/251654
>>
>> Log:
>>   Make CAM return and GEOM DISK pass through new GEOM::lunid attribute.
>>
>>   SPC-4 specification states that serial number may be property of device,
>>   but not a specific logical unit.  People reported about FC storages using
>>   serial number in that way, making it unusable for purposes of LUN multipath
>>   detection.  SPC-4 states that designators associated with logical unit from
>>   the VPD page 83h "Device Identification" should be used for that purpose.
>>   Report first of them in the new attribute in such preference order: NAA,
>>   EUI-64, T10 and SCSI name string.
>>
>>   While there, make GEOM DISK properly report GEOM::ident in XML output also
>>   using d_getattr() method, if available.  This fixes serial numbers reporting
>>   for SCSI disks in `geom disk list` output and confxml.
>>
>>   Discussed with:	gibbs, ken
>>   Sponsored by:	iXsystems, Inc.
>>   MFC after:	2 weeks
>
> This prototype change breaks head:
>
> cc  -O2 -pipe  -DRESCUE -std=gnu99 -Qunused-arguments -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wmissing-variable-declarations -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -c /src/sbin/camcontrol/camcontrol.c
> /src/sbin/camcontrol/camcontrol.c:6955:13: error: incompatible pointer types assigning to 'uint8_t *' (aka 'unsigned char *') from 'struct scsi_vpd_id_descriptor *' [-Werror,-Wincompatible-pointer-types]
>                  item_addr = scsi_get_devid(item->device_id,
>                            ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Thank you for your reports, already testing fix.

I'm sorry.

-- 
Alexander Motin

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 18:48:59 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5F273D41;
 Wed, 12 Jun 2013 18:48:59 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 321EA1AD9;
 Wed, 12 Jun 2013 18:48:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CImwHl007462;
 Wed, 12 Jun 2013 18:48:58 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CImsAQ007439;
 Wed, 12 Jun 2013 18:48:54 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201306121848.r5CImsAQ007439@svn.freebsd.org>
From: Dimitry Andric 
Date: Wed, 12 Jun 2013 18:48:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251662 - in head: contrib/llvm/include/llvm
 contrib/llvm/include/llvm-c contrib/llvm/include/llvm-c/Transforms
 contrib/llvm/include/llvm/ADT contrib/llvm/include/llvm/Analysis contrib/...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 18:48:59 -0000

Author: dim
Date: Wed Jun 12 18:48:53 2013
New Revision: 251662
URL: http://svnweb.freebsd.org/changeset/base/251662

Log:
  Upgrade our copy of llvm/clang to 3.3 release.
  
  Release notes are still in the works, these will follow soon.
  
  MFC after:	1 month

Added:
  head/contrib/llvm/include/llvm/DebugInfo/DWARFFormValue.h
     - copied unchanged from r251610, vendor/llvm/dist/include/llvm/DebugInfo/DWARFFormValue.h
  head/contrib/llvm/include/llvm/ExecutionEngine/ObjectCache.h
     - copied unchanged from r251610, vendor/llvm/dist/include/llvm/ExecutionEngine/ObjectCache.h
  head/contrib/llvm/include/llvm/Support/CBindingWrapping.h
     - copied unchanged from r251610, vendor/llvm/dist/include/llvm/Support/CBindingWrapping.h
  head/contrib/llvm/include/llvm/Support/Compression.h
     - copied unchanged from r251610, vendor/llvm/dist/include/llvm/Support/Compression.h
  head/contrib/llvm/lib/Support/Compression.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Support/Compression.cpp
  head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp
  head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h
  head/contrib/llvm/lib/Target/Mips/MicroMipsInstrFormats.td
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MicroMipsInstrFormats.td
  head/contrib/llvm/lib/Target/Mips/MicroMipsInstrInfo.td
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MicroMipsInstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MipsModuleISelDAGToDAG.h
  head/contrib/llvm/lib/Target/Mips/MipsOs16.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MipsOs16.cpp
  head/contrib/llvm/lib/Target/Mips/MipsOs16.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Mips/MipsOs16.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
  head/contrib/llvm/lib/Target/PowerPC/AsmParser/
     - copied from r251610, vendor/llvm/dist/lib/Target/PowerPC/AsmParser/
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp
  head/contrib/llvm/lib/Target/R600/R600Packetizer.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/R600/R600Packetizer.cpp
  head/contrib/llvm/lib/Target/R600/SIDefines.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/R600/SIDefines.h
  head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h
  head/contrib/llvm/lib/Target/SystemZ/
     - copied from r251610, vendor/llvm/dist/lib/Target/SystemZ/
  head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/X86/X86FixupLEAs.cpp
  head/contrib/llvm/lib/Target/XCore/XCoreLowerThreadLocal.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Target/XCore/XCoreLowerThreadLocal.cpp
  head/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Transforms/Vectorize/SLPVectorizer.cpp
  head/contrib/llvm/lib/Transforms/Vectorize/VecUtils.cpp
     - copied unchanged from r251610, vendor/llvm/dist/lib/Transforms/Vectorize/VecUtils.cpp
  head/contrib/llvm/lib/Transforms/Vectorize/VecUtils.h
     - copied unchanged from r251610, vendor/llvm/dist/lib/Transforms/Vectorize/VecUtils.h
  head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def
     - copied unchanged from r251610, vendor/clang/dist/include/clang/Basic/BuiltinsAArch64.def
  head/contrib/llvm/tools/clang/include/clang/Basic/CapturedStmt.h
     - copied unchanged from r251610, vendor/clang/dist/include/clang/Basic/CapturedStmt.h
  head/contrib/llvm/tools/clang/include/clang/Lex/MacroArgs.h
     - copied unchanged from r251610, vendor/clang/dist/include/clang/Lex/MacroArgs.h
  head/contrib/llvm/tools/clang/lib/Format/BreakableToken.cpp
     - copied unchanged from r251610, vendor/clang/dist/lib/Format/BreakableToken.cpp
  head/contrib/llvm/tools/clang/lib/Format/BreakableToken.h
     - copied unchanged from r251610, vendor/clang/dist/lib/Format/BreakableToken.h
  head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp
     - copied unchanged from r251610, vendor/clang/dist/lib/Format/WhitespaceManager.cpp
  head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h
     - copied unchanged from r251610, vendor/clang/dist/lib/Format/WhitespaceManager.h
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.cpp
     - copied unchanged from r251610, vendor/clang/dist/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.h
     - copied unchanged from r251610, vendor/clang/dist/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.h
  head/lib/clang/include/clang/Parse/AttrExprArgs.inc   (contents, props changed)
Deleted:
  head/contrib/llvm/include/llvm/ADT/InMemoryStruct.h
  head/contrib/llvm/include/llvm/Object/MachOObject.h
  head/contrib/llvm/lib/DebugInfo/DWARFFormValue.h
  head/contrib/llvm/lib/Linker/Linker.cpp
  head/contrib/llvm/lib/Object/MachOObject.cpp
  head/contrib/llvm/lib/Target/PowerPC/AsmParser/CMakeLists.txt
  head/contrib/llvm/lib/Target/PowerPC/AsmParser/LLVMBuild.txt
  head/contrib/llvm/lib/Target/PowerPC/AsmParser/Makefile
  head/contrib/llvm/lib/Target/R600/AMDILPeepholeOptimizer.cpp
  head/contrib/llvm/lib/Target/SystemZ/AsmParser/CMakeLists.txt
  head/contrib/llvm/lib/Target/SystemZ/AsmParser/LLVMBuild.txt
  head/contrib/llvm/lib/Target/SystemZ/AsmParser/Makefile
  head/contrib/llvm/lib/Target/SystemZ/CMakeLists.txt
  head/contrib/llvm/lib/Target/SystemZ/InstPrinter/CMakeLists.txt
  head/contrib/llvm/lib/Target/SystemZ/InstPrinter/LLVMBuild.txt
  head/contrib/llvm/lib/Target/SystemZ/InstPrinter/Makefile
  head/contrib/llvm/lib/Target/SystemZ/LLVMBuild.txt
  head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
  head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt
  head/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/Makefile
  head/contrib/llvm/lib/Target/SystemZ/Makefile
  head/contrib/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt
  head/contrib/llvm/lib/Target/SystemZ/TargetInfo/LLVMBuild.txt
  head/contrib/llvm/lib/Target/SystemZ/TargetInfo/Makefile
  head/contrib/llvm/tools/clang/lib/Lex/MacroArgs.h
Modified:
  head/contrib/llvm/include/llvm-c/Core.h
  head/contrib/llvm/include/llvm-c/ExecutionEngine.h
  head/contrib/llvm/include/llvm-c/Object.h
  head/contrib/llvm/include/llvm-c/Target.h
  head/contrib/llvm/include/llvm-c/TargetMachine.h
  head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h
  head/contrib/llvm/include/llvm-c/Transforms/Vectorize.h
  head/contrib/llvm/include/llvm/ADT/ArrayRef.h
  head/contrib/llvm/include/llvm/ADT/DenseMap.h
  head/contrib/llvm/include/llvm/ADT/Hashing.h
  head/contrib/llvm/include/llvm/ADT/PointerIntPair.h
  head/contrib/llvm/include/llvm/ADT/StringRef.h
  head/contrib/llvm/include/llvm/ADT/Triple.h
  head/contrib/llvm/include/llvm/ADT/Twine.h
  head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h
  head/contrib/llvm/include/llvm/Analysis/RegionInfo.h
  head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h
  head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h
  head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h
  head/contrib/llvm/include/llvm/CodeGen/FastISel.h
  head/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h
  head/contrib/llvm/include/llvm/CodeGen/LiveInterval.h
  head/contrib/llvm/include/llvm/CodeGen/LiveRangeEdit.h
  head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h
  head/contrib/llvm/include/llvm/CodeGen/MachineFunction.h
  head/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h
  head/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
  head/contrib/llvm/include/llvm/CodeGen/MachineScheduler.h
  head/contrib/llvm/include/llvm/CodeGen/MachineTraceMetrics.h
  head/contrib/llvm/include/llvm/CodeGen/Passes.h
  head/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h
  head/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h
  head/contrib/llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h
  head/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h
  head/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h
  head/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h
  head/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
  head/contrib/llvm/include/llvm/CodeGen/ValueTypes.td
  head/contrib/llvm/include/llvm/DIBuilder.h
  head/contrib/llvm/include/llvm/DebugInfo.h
  head/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
  head/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h
  head/contrib/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h
  head/contrib/llvm/include/llvm/IR/Argument.h
  head/contrib/llvm/include/llvm/IR/Attributes.h
  head/contrib/llvm/include/llvm/IR/BasicBlock.h
  head/contrib/llvm/include/llvm/IR/Constants.h
  head/contrib/llvm/include/llvm/IR/DataLayout.h
  head/contrib/llvm/include/llvm/IR/DerivedTypes.h
  head/contrib/llvm/include/llvm/IR/GlobalValue.h
  head/contrib/llvm/include/llvm/IR/IRBuilder.h
  head/contrib/llvm/include/llvm/IR/Intrinsics.h
  head/contrib/llvm/include/llvm/IR/IntrinsicsMips.td
  head/contrib/llvm/include/llvm/IR/IntrinsicsNVVM.td
  head/contrib/llvm/include/llvm/IR/IntrinsicsPowerPC.td
  head/contrib/llvm/include/llvm/IR/LLVMContext.h
  head/contrib/llvm/include/llvm/IR/MDBuilder.h
  head/contrib/llvm/include/llvm/IR/Module.h
  head/contrib/llvm/include/llvm/IR/Type.h
  head/contrib/llvm/include/llvm/IR/Use.h
  head/contrib/llvm/include/llvm/IR/Value.h
  head/contrib/llvm/include/llvm/InitializePasses.h
  head/contrib/llvm/include/llvm/LinkAllPasses.h
  head/contrib/llvm/include/llvm/Linker.h
  head/contrib/llvm/include/llvm/MC/MCAsmInfo.h
  head/contrib/llvm/include/llvm/MC/MCAssembler.h
  head/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h
  head/contrib/llvm/include/llvm/MC/MCELFStreamer.h
  head/contrib/llvm/include/llvm/MC/MCExpr.h
  head/contrib/llvm/include/llvm/MC/MCInst.h
  head/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h
  head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h
  head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h
  head/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h
  head/contrib/llvm/include/llvm/MC/MCSection.h
  head/contrib/llvm/include/llvm/MC/MCSectionCOFF.h
  head/contrib/llvm/include/llvm/MC/MCSectionELF.h
  head/contrib/llvm/include/llvm/MC/MCSectionMachO.h
  head/contrib/llvm/include/llvm/MC/MCStreamer.h
  head/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h
  head/contrib/llvm/include/llvm/MC/MCWinCOFFObjectWriter.h
  head/contrib/llvm/include/llvm/MC/MachineLocation.h
  head/contrib/llvm/include/llvm/MC/SubtargetFeature.h
  head/contrib/llvm/include/llvm/Object/Binary.h
  head/contrib/llvm/include/llvm/Object/ELF.h
  head/contrib/llvm/include/llvm/Object/MachO.h
  head/contrib/llvm/include/llvm/Object/ObjectFile.h
  head/contrib/llvm/include/llvm/Object/RelocVisitor.h
  head/contrib/llvm/include/llvm/PassManager.h
  head/contrib/llvm/include/llvm/PassRegistry.h
  head/contrib/llvm/include/llvm/Support/CodeGen.h
  head/contrib/llvm/include/llvm/Support/CommandLine.h
  head/contrib/llvm/include/llvm/Support/ELF.h
  head/contrib/llvm/include/llvm/Support/Endian.h
  head/contrib/llvm/include/llvm/Support/Host.h
  head/contrib/llvm/include/llvm/Support/MemoryBuffer.h
  head/contrib/llvm/include/llvm/Support/PatternMatch.h
  head/contrib/llvm/include/llvm/Support/Program.h
  head/contrib/llvm/include/llvm/Support/SourceMgr.h
  head/contrib/llvm/include/llvm/Target/Target.td
  head/contrib/llvm/include/llvm/Target/TargetCallingConv.h
  head/contrib/llvm/include/llvm/Target/TargetInstrInfo.h
  head/contrib/llvm/include/llvm/Target/TargetLowering.h
  head/contrib/llvm/include/llvm/Target/TargetMachine.h
  head/contrib/llvm/include/llvm/Target/TargetOptions.h
  head/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td
  head/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
  head/contrib/llvm/include/llvm/Transforms/Utils/BlackList.h
  head/contrib/llvm/include/llvm/Transforms/Utils/Local.h
  head/contrib/llvm/include/llvm/Transforms/Vectorize.h
  head/contrib/llvm/lib/Analysis/Analysis.cpp
  head/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp
  head/contrib/llvm/lib/Analysis/ConstantFolding.cpp
  head/contrib/llvm/lib/Analysis/IPA/IPA.cpp
  head/contrib/llvm/lib/Analysis/InstructionSimplify.cpp
  head/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp
  head/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
  head/contrib/llvm/lib/Analysis/RegionInfo.cpp
  head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp
  head/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp
  head/contrib/llvm/lib/AsmParser/LLLexer.cpp
  head/contrib/llvm/lib/AsmParser/LLParser.cpp
  head/contrib/llvm/lib/AsmParser/LLToken.h
  head/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp
  head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
  head/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp
  head/contrib/llvm/lib/CodeGen/Analysis.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
  head/contrib/llvm/lib/CodeGen/BasicTargetTransformInfo.cpp
  head/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp
  head/contrib/llvm/lib/CodeGen/CallingConvLower.cpp
  head/contrib/llvm/lib/CodeGen/CodeGen.cpp
  head/contrib/llvm/lib/CodeGen/IfConversion.cpp
  head/contrib/llvm/lib/CodeGen/InlineSpiller.cpp
  head/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp
  head/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp
  head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp
  head/contrib/llvm/lib/CodeGen/MachineBlockPlacement.cpp
  head/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp
  head/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp
  head/contrib/llvm/lib/CodeGen/MachineScheduler.cpp
  head/contrib/llvm/lib/CodeGen/MachineTraceMetrics.cpp
  head/contrib/llvm/lib/CodeGen/MachineVerifier.cpp
  head/contrib/llvm/lib/CodeGen/Passes.cpp
  head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp
  head/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp
  head/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp
  head/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp
  head/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp
  head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
  head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
  head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
  head/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp
  head/contrib/llvm/lib/CodeGen/TargetLoweringBase.cpp
  head/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  head/contrib/llvm/lib/CodeGen/TargetOptionsImpl.cpp
  head/contrib/llvm/lib/CodeGen/TargetSchedule.cpp
  head/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
  head/contrib/llvm/lib/DebugInfo/DWARFCompileUnit.cpp
  head/contrib/llvm/lib/DebugInfo/DWARFContext.cpp
  head/contrib/llvm/lib/DebugInfo/DWARFContext.h
  head/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp
  head/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.h
  head/contrib/llvm/lib/DebugInfo/DWARFFormValue.cpp
  head/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
  head/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp
  head/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
  head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
  head/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h
  head/contrib/llvm/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
  head/contrib/llvm/lib/IR/AsmWriter.cpp
  head/contrib/llvm/lib/IR/AttributeImpl.h
  head/contrib/llvm/lib/IR/Attributes.cpp
  head/contrib/llvm/lib/IR/Constants.cpp
  head/contrib/llvm/lib/IR/ConstantsContext.h
  head/contrib/llvm/lib/IR/Core.cpp
  head/contrib/llvm/lib/IR/DIBuilder.cpp
  head/contrib/llvm/lib/IR/DataLayout.cpp
  head/contrib/llvm/lib/IR/DebugInfo.cpp
  head/contrib/llvm/lib/IR/Function.cpp
  head/contrib/llvm/lib/IR/Metadata.cpp
  head/contrib/llvm/lib/IR/PassManager.cpp
  head/contrib/llvm/lib/IR/Type.cpp
  head/contrib/llvm/lib/IR/Value.cpp
  head/contrib/llvm/lib/IR/Verifier.cpp
  head/contrib/llvm/lib/Linker/LinkModules.cpp
  head/contrib/llvm/lib/MC/MCAsmInfo.cpp
  head/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp
  head/contrib/llvm/lib/MC/MCAsmStreamer.cpp
  head/contrib/llvm/lib/MC/MCAssembler.cpp
  head/contrib/llvm/lib/MC/MCDwarf.cpp
  head/contrib/llvm/lib/MC/MCELFStreamer.cpp
  head/contrib/llvm/lib/MC/MCExpr.cpp
  head/contrib/llvm/lib/MC/MCMachOStreamer.cpp
  head/contrib/llvm/lib/MC/MCNullStreamer.cpp
  head/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
  head/contrib/llvm/lib/MC/MCObjectStreamer.cpp
  head/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
  head/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
  head/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp
  head/contrib/llvm/lib/MC/MCPureStreamer.cpp
  head/contrib/llvm/lib/MC/MCSectionCOFF.cpp
  head/contrib/llvm/lib/MC/MCSectionELF.cpp
  head/contrib/llvm/lib/MC/MCSectionMachO.cpp
  head/contrib/llvm/lib/MC/MCStreamer.cpp
  head/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp
  head/contrib/llvm/lib/Object/COFFObjectFile.cpp
  head/contrib/llvm/lib/Object/MachOObjectFile.cpp
  head/contrib/llvm/lib/Object/Object.cpp
  head/contrib/llvm/lib/Object/ObjectFile.cpp
  head/contrib/llvm/lib/Support/CommandLine.cpp
  head/contrib/llvm/lib/Support/DataExtractor.cpp
  head/contrib/llvm/lib/Support/FoldingSet.cpp
  head/contrib/llvm/lib/Support/Host.cpp
  head/contrib/llvm/lib/Support/LockFileManager.cpp
  head/contrib/llvm/lib/Support/PathV2.cpp
  head/contrib/llvm/lib/Support/Triple.cpp
  head/contrib/llvm/lib/Support/Unix/Memory.inc
  head/contrib/llvm/lib/Support/Unix/PathV2.inc
  head/contrib/llvm/lib/Support/Unix/Program.inc
  head/contrib/llvm/lib/Support/Unix/Signals.inc
  head/contrib/llvm/lib/Support/Windows/Program.inc
  head/contrib/llvm/lib/Support/Windows/Signals.inc
  head/contrib/llvm/lib/Support/YAMLParser.cpp
  head/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
  head/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
  head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h
  head/contrib/llvm/lib/Target/AArch64/AArch64InstrFormats.td
  head/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td
  head/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp
  head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
  head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h
  head/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
  head/contrib/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp
  head/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.cpp
  head/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h
  head/contrib/llvm/lib/Target/ARM/ARM.td
  head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
  head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h
  head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
  head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h
  head/contrib/llvm/lib/Target/ARM/ARMCallingConv.h
  head/contrib/llvm/lib/Target/ARM/ARMCallingConv.td
  head/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp
  head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
  head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  head/contrib/llvm/lib/Target/ARM/ARMISelLowering.h
  head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
  head/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td
  head/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td
  head/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
  head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h
  head/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp
  head/contrib/llvm/lib/Target/ARM/ARMSubtarget.h
  head/contrib/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp
  head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
  head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
  head/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
  head/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h
  head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
  head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOp.h
  head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp
  head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp
  head/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp
  head/contrib/llvm/lib/Target/Hexagon/Hexagon.h
  head/contrib/llvm/lib/Target/Hexagon/Hexagon.td
  head/contrib/llvm/lib/Target/Hexagon/HexagonCFGOptimizer.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonExpandPredSpillCode.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonHardwareLoops.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.h
  head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.h
  head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.td
  head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV3.td
  head/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV4.td
  head/contrib/llvm/lib/Target/Hexagon/HexagonMachineFunctionInfo.h
  head/contrib/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonPeephole.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonRemoveSZExtArgs.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonSplitTFRCondSets.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
  head/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
  head/contrib/llvm/lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td
  head/contrib/llvm/lib/Target/Mangler.cpp
  head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  head/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
  head/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.h
  head/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.cpp
  head/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.cpp
  head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
  head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
  head/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp
  head/contrib/llvm/lib/Target/Mips/MipsDSPInstrFormats.td
  head/contrib/llvm/lib/Target/Mips/MipsDSPInstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  head/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  head/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td
  head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp
  head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp
  head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp
  head/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h
  head/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp
  head/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h
  head/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp
  head/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp
  head/contrib/llvm/lib/Target/Mips/MipsSubtarget.h
  head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp
  head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTX.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
  head/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
  head/contrib/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td
  head/contrib/llvm/lib/Target/NVPTX/NVPTXSection.h
  head/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
  head/contrib/llvm/lib/Target/NVPTX/NVVMReflect.cpp
  head/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
  head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
  head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
  head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
  head/contrib/llvm/lib/Target/PowerPC/PPC.h
  head/contrib/llvm/lib/Target/PowerPC/PPC.td
  head/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
  head/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
  head/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
  head/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td
  head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h
  head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
  head/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
  head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
  head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h
  head/contrib/llvm/lib/Target/PowerPC/PPCScheduleA2.td
  head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
  head/contrib/llvm/lib/Target/R600/AMDGPU.h
  head/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp
  head/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.h
  head/contrib/llvm/lib/Target/R600/AMDGPUCallingConv.td
  head/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.h
  head/contrib/llvm/lib/Target/R600/AMDGPUInstructions.td
  head/contrib/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp
  head/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.cpp
  head/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.h
  head/contrib/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
  head/contrib/llvm/lib/Target/R600/AMDILBase.td
  head/contrib/llvm/lib/Target/R600/AMDILDeviceInfo.cpp
  head/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
  head/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
  head/contrib/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
  head/contrib/llvm/lib/Target/R600/Processors.td
  head/contrib/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp
  head/contrib/llvm/lib/Target/R600/R600Defines.h
  head/contrib/llvm/lib/Target/R600/R600ISelLowering.cpp
  head/contrib/llvm/lib/Target/R600/R600InstrInfo.cpp
  head/contrib/llvm/lib/Target/R600/R600InstrInfo.h
  head/contrib/llvm/lib/Target/R600/R600Instructions.td
  head/contrib/llvm/lib/Target/R600/R600MachineFunctionInfo.h
  head/contrib/llvm/lib/Target/R600/R600RegisterInfo.td
  head/contrib/llvm/lib/Target/R600/R600Schedule.td
  head/contrib/llvm/lib/Target/R600/SIISelLowering.cpp
  head/contrib/llvm/lib/Target/R600/SIISelLowering.h
  head/contrib/llvm/lib/Target/R600/SIInstrFormats.td
  head/contrib/llvm/lib/Target/R600/SIInstrInfo.cpp
  head/contrib/llvm/lib/Target/R600/SIInstrInfo.h
  head/contrib/llvm/lib/Target/R600/SIInstrInfo.td
  head/contrib/llvm/lib/Target/R600/SIInstructions.td
  head/contrib/llvm/lib/Target/R600/SIIntrinsics.td
  head/contrib/llvm/lib/Target/R600/SIRegisterInfo.td
  head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcCallingConv.td
  head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h
  head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h
  head/contrib/llvm/lib/Target/Sparc/SparcInstr64Bit.td
  head/contrib/llvm/lib/Target/Sparc/SparcInstrFormats.td
  head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td
  head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcSubtarget.h
  head/contrib/llvm/lib/Target/Target.cpp
  head/contrib/llvm/lib/Target/TargetMachineC.cpp
  head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
  head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
  head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
  head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
  head/contrib/llvm/lib/Target/X86/X86.h
  head/contrib/llvm/lib/Target/X86/X86.td
  head/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp
  head/contrib/llvm/lib/Target/X86/X86FastISel.cpp
  head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
  head/contrib/llvm/lib/Target/X86/X86FrameLowering.h
  head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  head/contrib/llvm/lib/Target/X86/X86ISelLowering.h
  head/contrib/llvm/lib/Target/X86/X86InstrFormats.td
  head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
  head/contrib/llvm/lib/Target/X86/X86InstrInfo.td
  head/contrib/llvm/lib/Target/X86/X86InstrSSE.td
  head/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td
  head/contrib/llvm/lib/Target/X86/X86InstrSystem.td
  head/contrib/llvm/lib/Target/X86/X86SchedHaswell.td
  head/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td
  head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
  head/contrib/llvm/lib/Target/X86/X86Subtarget.h
  head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp
  head/contrib/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
  head/contrib/llvm/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp
  head/contrib/llvm/lib/Target/XCore/InstPrinter/XCoreInstPrinter.cpp
  head/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
  head/contrib/llvm/lib/Target/XCore/XCore.h
  head/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
  head/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp
  head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp
  head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h
  head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td
  head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp
  head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp
  head/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp
  head/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp
  head/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp
  head/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp
  head/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
  head/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
  head/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
  head/contrib/llvm/lib/Transforms/Instrumentation/BlackList.cpp
  head/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp
  head/contrib/llvm/lib/Transforms/ObjCARC/ObjCARC.cpp
  head/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp
  head/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
  head/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
  head/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  head/contrib/llvm/lib/Transforms/Scalar/GlobalMerge.cpp
  head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp
  head/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp
  head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
  head/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
  head/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp
  head/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp
  head/contrib/llvm/lib/Transforms/Utils/Local.cpp
  head/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
  head/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
  head/contrib/llvm/lib/Transforms/Utils/Utils.cpp
  head/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp
  head/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  head/contrib/llvm/lib/Transforms/Vectorize/Vectorize.cpp
  head/contrib/llvm/tools/bugpoint/BugDriver.cpp
  head/contrib/llvm/tools/clang/include/clang-c/Index.h
  head/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
  head/contrib/llvm/tools/clang/include/clang/AST/ASTUnresolvedSet.h
  head/contrib/llvm/tools/clang/include/clang/AST/CommentCommands.td
  head/contrib/llvm/tools/clang/include/clang/AST/CommentLexer.h
  head/contrib/llvm/tools/clang/include/clang/AST/Decl.h
  head/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h
  head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h
  head/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h
  head/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h
  head/contrib/llvm/tools/clang/include/clang/AST/EvaluatedExprVisitor.h
  head/contrib/llvm/tools/clang/include/clang/AST/Expr.h
  head/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h
  head/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h
  head/contrib/llvm/tools/clang/include/clang/AST/Mangle.h
  head/contrib/llvm/tools/clang/include/clang/AST/RawCommentList.h
  head/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h
  head/contrib/llvm/tools/clang/include/clang/AST/Stmt.h
  head/contrib/llvm/tools/clang/include/clang/AST/Type.h
  head/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def
  head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchers.h
  head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td
  head/contrib/llvm/tools/clang/include/clang/Basic/CommentOptions.h
  head/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td
  head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommentKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.def
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSerializationKinds.td
  head/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h
  head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def
  head/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h
  head/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h
  head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h
  head/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td
  head/contrib/llvm/tools/clang/include/clang/Basic/TargetBuiltins.h
  head/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
  head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def
  head/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td
  head/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h
  head/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td
  head/contrib/llvm/tools/clang/include/clang/Driver/Driver.h
  head/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  head/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
  head/contrib/llvm/tools/clang/include/clang/Format/Format.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticConsumer.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/ChainedIncludesSource.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def
  head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/LogDiagnosticPrinter.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticBuffer.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
  head/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h
  head/contrib/llvm/tools/clang/include/clang/Lex/ModuleMap.h
  head/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h
  head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h
  head/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h
  head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h
  head/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/FixItRewriter.h
  head/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h
  head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h
  head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h
  head/contrib/llvm/tools/clang/include/clang/Sema/ObjCMethodList.h
  head/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h
  head/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h
  head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
  head/contrib/llvm/tools/clang/include/clang/Sema/Template.h
  head/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h
  head/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
  head/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h
  head/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h
  head/contrib/llvm/tools/clang/include/clang/Serialization/GlobalModuleIndex.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
  head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
  head/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp
  head/contrib/llvm/tools/clang/lib/ARCMigrate/TransAPIUses.cpp
  head/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp
  head/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.h
  head/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  head/contrib/llvm/tools/clang/lib/AST/ASTDumper.cpp
  head/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp
  head/contrib/llvm/tools/clang/lib/AST/Comment.cpp
  head/contrib/llvm/tools/clang/lib/AST/CommentLexer.cpp
  head/contrib/llvm/tools/clang/lib/AST/CommentParser.cpp
  head/contrib/llvm/tools/clang/lib/AST/Decl.cpp
  head/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp
  head/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
  head/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp
  head/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp
  head/contrib/llvm/tools/clang/lib/AST/Expr.cpp
  head/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp
  head/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp
  head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
  head/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp
  head/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp
  head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp
  head/contrib/llvm/tools/clang/lib/AST/RawCommentList.cpp
  head/contrib/llvm/tools/clang/lib/AST/Stmt.cpp
  head/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp
  head/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp
  head/contrib/llvm/tools/clang/lib/AST/Type.cpp
  head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp
  head/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp
  head/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp
  head/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
  head/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp
  head/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp
  head/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
  head/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
  head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  head/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CGAtomic.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h
  head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp
  head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp
  head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
  head/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.h
  head/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  head/contrib/llvm/tools/clang/lib/Driver/WindowsToolChain.cpp
  head/contrib/llvm/tools/clang/lib/Edit/EditedSource.cpp
  head/contrib/llvm/tools/clang/lib/Format/Format.cpp
  head/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp
  head/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.h
  head/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp
  head/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.h
  head/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/ChainedIncludesSource.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/DiagnosticRenderer.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnostic.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
  head/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp
  head/contrib/llvm/tools/clang/lib/Headers/avxintrin.h
  head/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
  head/contrib/llvm/tools/clang/lib/Headers/stddef.h
  head/contrib/llvm/tools/clang/lib/Headers/stdint.h
  head/contrib/llvm/tools/clang/lib/Headers/xopintrin.h
  head/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp
  head/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
  head/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp
  head/contrib/llvm/tools/clang/lib/Lex/ModuleMap.cpp
  head/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp
  head/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp
  head/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp
  head/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp
  head/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp
  head/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h
  head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp
  head/contrib/llvm/tools/clang/lib/Parse/Parser.cpp
  head/contrib/llvm/tools/clang/lib/Rewrite/Frontend/FixItRewriter.cpp
  head/contrib/llvm/tools/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp
  head/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp
  head/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp
  head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
  head/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp
  head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaPseudoObject.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp
  head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp
  head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h
  head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h
  head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp
  head/contrib/llvm/tools/clang/lib/Serialization/GlobalModuleIndex.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp
  head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/ClangCommentCommandInfoEmitter.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp
  head/contrib/llvm/tools/clang/utils/TableGen/TableGenBackends.h
  head/contrib/llvm/tools/llc/llc.cpp
  head/contrib/llvm/tools/llvm-as/llvm-as.cpp
  head/contrib/llvm/tools/llvm-dis/llvm-dis.cpp
  head/contrib/llvm/tools/llvm-extract/llvm-extract.cpp
  head/contrib/llvm/tools/llvm-link/llvm-link.cpp
  head/contrib/llvm/tools/llvm-mc/llvm-mc.cpp
  head/contrib/llvm/tools/llvm-objdump/MachODump.cpp
  head/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp
  head/contrib/llvm/tools/llvm-ranlib/llvm-ranlib.cpp
  head/contrib/llvm/tools/llvm-readobj/COFFDumper.cpp
  head/contrib/llvm/tools/llvm-readobj/ELFDumper.cpp
  head/contrib/llvm/tools/llvm-readobj/MachODumper.cpp
  head/contrib/llvm/tools/llvm-readobj/ObjDumper.h
  head/contrib/llvm/tools/llvm-readobj/llvm-readobj.cpp
  head/contrib/llvm/tools/llvm-readobj/llvm-readobj.h
  head/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
  head/contrib/llvm/tools/macho-dump/macho-dump.cpp
  head/contrib/llvm/tools/opt/opt.cpp
  head/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp
  head/contrib/llvm/utils/TableGen/CodeGenSchedule.cpp
  head/contrib/llvm/utils/TableGen/CodeGenSchedule.h
  head/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp
  head/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp
  head/lib/clang/clang.build.mk
  head/lib/clang/include/clang/Basic/Version.inc
  head/lib/clang/include/llvm/Config/config.h
  head/lib/clang/include/llvm/Config/llvm-config.h
  head/lib/clang/libclangparse/Makefile
  head/lib/clang/libclangstaticanalyzercheckers/Makefile
  head/lib/clang/libllvmarmdesc/Makefile
  head/lib/clang/libllvmlinker/Makefile
  head/lib/clang/libllvmmipscodegen/Makefile
  head/lib/clang/libllvmobject/Makefile
  head/lib/clang/libllvmsupport/Makefile
  head/lib/clang/libllvmvectorize/Makefile
  head/lib/clang/libllvmx86codegen/Makefile
  head/usr.bin/clang/clang/clang.1
  head/usr.bin/clang/llc/llc.1
  head/usr.bin/clang/llvm-objdump/Makefile
  head/usr.bin/clang/llvm-rtdyld/Makefile
  head/usr.bin/clang/opt/opt.1
Directory Properties:
  head/contrib/llvm/   (props changed)
  head/contrib/llvm/tools/clang/   (props changed)

Modified: head/contrib/llvm/include/llvm-c/Core.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/Core.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/Core.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -18,13 +18,6 @@
 #include "llvm/Support/DataTypes.h"
 
 #ifdef __cplusplus
-
-/* Need these includes to support the LLVM 'cast' template for the C++ 'wrap' 
-   and 'unwrap' conversion functions. */
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Module.h"
-#include "llvm/PassRegistry.h"
-
 extern "C" {
 #endif
 
@@ -60,11 +53,6 @@ extern "C" {
  * with C++ due to name mangling. So in addition to C, this interface enables
  * tools written in such languages.
  *
- * When included into a C++ source file, also declares 'wrap' and 'unwrap'
- * helpers to perform opaque reference<-->pointer conversions. These helpers
- * are shorter and more tightly typed than writing the casts by hand when
- * authoring bindings. In assert builds, they will do runtime type checking.
- *
  * @{
  */
 
@@ -352,6 +340,63 @@ typedef enum {
   LLVMLandingPadFilter    /**< A filter clause  */
 } LLVMLandingPadClauseTy;
 
+typedef enum {
+  LLVMNotThreadLocal = 0,
+  LLVMGeneralDynamicTLSModel,
+  LLVMLocalDynamicTLSModel,
+  LLVMInitialExecTLSModel,
+  LLVMLocalExecTLSModel
+} LLVMThreadLocalMode;
+
+typedef enum {
+  LLVMAtomicOrderingNotAtomic = 0, /**< A load or store which is not atomic */
+  LLVMAtomicOrderingUnordered = 1, /**< Lowest level of atomicity, guarantees
+                                     somewhat sane results, lock free. */
+  LLVMAtomicOrderingMonotonic = 2, /**< guarantees that if you take all the 
+                                     operations affecting a specific address, 
+                                     a consistent ordering exists */
+  LLVMAtomicOrderingAcquire = 4, /**< Acquire provides a barrier of the sort 
+                                   necessary to acquire a lock to access other 
+                                   memory with normal loads and stores. */
+  LLVMAtomicOrderingRelease = 5, /**< Release is similar to Acquire, but with 
+                                   a barrier of the sort necessary to release 
+                                   a lock. */
+  LLVMAtomicOrderingAcquireRelease = 6, /**< provides both an Acquire and a 
+                                          Release barrier (for fences and 
+                                          operations which both read and write
+                                           memory). */
+  LLVMAtomicOrderingSequentiallyConsistent = 7 /**< provides Acquire semantics 
+                                                 for loads and Release 
+                                                 semantics for stores. 
+                                                 Additionally, it guarantees 
+                                                 that a total ordering exists 
+                                                 between all 
+                                                 SequentiallyConsistent 
+                                                 operations. */
+} LLVMAtomicOrdering;
+
+typedef enum {
+    LLVMAtomicRMWBinOpXchg, /**< Set the new value and return the one old */
+    LLVMAtomicRMWBinOpAdd, /**< Add a value and return the old one */
+    LLVMAtomicRMWBinOpSub, /**< Subtract a value and return the old one */
+    LLVMAtomicRMWBinOpAnd, /**< And a value and return the old one */
+    LLVMAtomicRMWBinOpNand, /**< Not-And a value and return the old one */
+    LLVMAtomicRMWBinOpOr, /**< OR a value and return the old one */
+    LLVMAtomicRMWBinOpXor, /**< Xor a value and return the old one */
+    LLVMAtomicRMWBinOpMax, /**< Sets the value if it's greater than the
+                             original using a signed comparison and return 
+                             the old one */
+    LLVMAtomicRMWBinOpMin, /**< Sets the value if it's Smaller than the
+                             original using a signed comparison and return 
+                             the old one */
+    LLVMAtomicRMWBinOpUMax, /**< Sets the value if it's greater than the
+                             original using an unsigned comparison and return 
+                             the old one */
+    LLVMAtomicRMWBinOpUMin /**< Sets the value if it's greater than the
+                             original using an unsigned comparison  and return 
+                             the old one */
+} LLVMAtomicRMWBinOp;
+
 /**
  * @}
  */
@@ -1057,24 +1102,24 @@ LLVMTypeRef LLVMX86MMXType(void);
         macro(SwitchInst)                   \
         macro(UnreachableInst)              \
         macro(ResumeInst)                   \
-    macro(UnaryInstruction)                 \
-      macro(AllocaInst)                     \
-      macro(CastInst)                       \
-        macro(BitCastInst)                  \
-        macro(FPExtInst)                    \
-        macro(FPToSIInst)                   \
-        macro(FPToUIInst)                   \
-        macro(FPTruncInst)                  \
-        macro(IntToPtrInst)                 \
-        macro(PtrToIntInst)                 \
-        macro(SExtInst)                     \
-        macro(SIToFPInst)                   \
-        macro(TruncInst)                    \
-        macro(UIToFPInst)                   \
-        macro(ZExtInst)                     \
-      macro(ExtractValueInst)               \
-      macro(LoadInst)                       \
-      macro(VAArgInst)
+      macro(UnaryInstruction)               \
+        macro(AllocaInst)                   \
+        macro(CastInst)                     \
+          macro(BitCastInst)                \
+          macro(FPExtInst)                  \
+          macro(FPToSIInst)                 \
+          macro(FPToUIInst)                 \
+          macro(FPTruncInst)                \
+          macro(IntToPtrInst)               \
+          macro(PtrToIntInst)               \
+          macro(SExtInst)                   \
+          macro(SIToFPInst)                 \
+          macro(TruncInst)                  \
+          macro(UIToFPInst)                 \
+          macro(ZExtInst)                   \
+        macro(ExtractValueInst)             \
+        macro(LoadInst)                     \
+        macro(VAArgInst)
 
 /**
  * @defgroup LLVMCCoreValueGeneral General APIs
@@ -1606,6 +1651,10 @@ LLVMBool LLVMIsThreadLocal(LLVMValueRef 
 void LLVMSetThreadLocal(LLVMValueRef GlobalVar, LLVMBool IsThreadLocal);
 LLVMBool LLVMIsGlobalConstant(LLVMValueRef GlobalVar);
 void LLVMSetGlobalConstant(LLVMValueRef GlobalVar, LLVMBool IsConstant);
+LLVMThreadLocalMode LLVMGetThreadLocalMode(LLVMValueRef GlobalVar);
+void LLVMSetThreadLocalMode(LLVMValueRef GlobalVar, LLVMThreadLocalMode Mode);
+LLVMBool LLVMIsExternallyInitialized(LLVMValueRef GlobalVar);
+void LLVMSetExternallyInitialized(LLVMValueRef GlobalVar, LLVMBool IsExtInit);
 
 /**
  * @}
@@ -1694,6 +1743,13 @@ void LLVMSetGC(LLVMValueRef Fn, const ch
 void LLVMAddFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA);
 
 /**
+ * Add a target-dependent attribute to a fuction
+ * @see llvm::AttrBuilder::addAttribute()
+ */
+void LLVMAddTargetDependentFunctionAttr(LLVMValueRef Fn, const char *A,
+                                        const char *V);
+
+/**
  * Obtain an attribute from a function.
  *
  * @see llvm::Function::getAttributes()
@@ -2515,6 +2571,10 @@ LLVMValueRef LLVMBuildIsNotNull(LLVMBuil
                                 const char *Name);
 LLVMValueRef LLVMBuildPtrDiff(LLVMBuilderRef, LLVMValueRef LHS,
                               LLVMValueRef RHS, const char *Name);
+LLVMValueRef LLVMBuildAtomicRMW(LLVMBuilderRef B,LLVMAtomicRMWBinOp op,  
+                                LLVMValueRef PTR, LLVMValueRef Val, 
+                                LLVMAtomicOrdering ordering, 
+                                LLVMBool singleThread);
 
 /**
  * @}
@@ -2560,6 +2620,8 @@ LLVMMemoryBufferRef LLVMCreateMemoryBuff
 LLVMMemoryBufferRef LLVMCreateMemoryBufferWithMemoryRangeCopy(const char *InputData,
                                                               size_t InputDataLength,
                                                               const char *BufferName);
+const char *LLVMGetBufferStart(LLVMMemoryBufferRef MemBuf);
+size_t LLVMGetBufferSize(LLVMMemoryBufferRef MemBuf);
 void LLVMDisposeMemoryBuffer(LLVMMemoryBufferRef MemBuf);
 
 /**
@@ -2669,100 +2731,6 @@ LLVMBool LLVMIsMultithreaded();
 
 #ifdef __cplusplus
 }
-
-namespace llvm {
-  class MemoryBuffer;
-  class PassManagerBase;
-  
-  #define DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref)   \
-    inline ty *unwrap(ref P) {                          \
-      return reinterpret_cast(P);                  \
-    }                                                   \
-                                                        \
-    inline ref wrap(const ty *P) {                      \
-      return reinterpret_cast(const_cast(P)); \
-    }
-  
-  #define DEFINE_ISA_CONVERSION_FUNCTIONS(ty, ref)  \
-    DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref)         \
-                                                        \
-    template                                \
-    inline T *unwrap(ref P) {                           \
-      return cast(unwrap(P));                        \
-    }
-  
-  #define DEFINE_STDCXX_CONVERSION_FUNCTIONS(ty, ref)   \
-    DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref)         \
-                                                        \
-    template                                \
-    inline T *unwrap(ref P) {                           \
-      T *Q = (T*)unwrap(P);                             \
-      assert(Q && "Invalid cast!");                     \
-      return Q;                                         \
-    }
-  
-  DEFINE_ISA_CONVERSION_FUNCTIONS   (Type,               LLVMTypeRef          )
-  DEFINE_ISA_CONVERSION_FUNCTIONS   (Value,              LLVMValueRef         )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Module,             LLVMModuleRef        )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(BasicBlock,         LLVMBasicBlockRef    )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(IRBuilder<>,        LLVMBuilderRef       )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer,       LLVMMemoryBufferRef  )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext,        LLVMContextRef       )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use,                LLVMUseRef           )
-  DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase,    LLVMPassManagerRef   )
-  DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry,       LLVMPassRegistryRef  )
-  /* LLVMModuleProviderRef exists for historical reasons, but now just holds a
-   * Module.
-   */
-  inline Module *unwrap(LLVMModuleProviderRef MP) {
-    return reinterpret_cast(MP);
-  }
-  
-  #undef DEFINE_STDCXX_CONVERSION_FUNCTIONS
-  #undef DEFINE_ISA_CONVERSION_FUNCTIONS
-  #undef DEFINE_SIMPLE_CONVERSION_FUNCTIONS
-
-  /* Specialized opaque context conversions.
-   */
-  inline LLVMContext **unwrap(LLVMContextRef* Tys) {
-    return reinterpret_cast(Tys);
-  }
-  
-  inline LLVMContextRef *wrap(const LLVMContext **Tys) {
-    return reinterpret_cast(const_cast(Tys));
-  }
-  
-  /* Specialized opaque type conversions.
-   */
-  inline Type **unwrap(LLVMTypeRef* Tys) {
-    return reinterpret_cast(Tys);
-  }
-  
-  inline LLVMTypeRef *wrap(Type **Tys) {
-    return reinterpret_cast(const_cast(Tys));
-  }
-  
-  /* Specialized opaque value conversions.
-   */ 
-  inline Value **unwrap(LLVMValueRef *Vals) {
-    return reinterpret_cast(Vals);
-  }
-  
-  template
-  inline T **unwrap(LLVMValueRef *Vals, unsigned Length) {
-    #ifdef DEBUG
-    for (LLVMValueRef *I = Vals, *E = Vals + Length; I != E; ++I)
-      cast(*I);
-    #endif
-    (void)Length;
-    return reinterpret_cast(Vals);
-  }
-  
-  inline LLVMValueRef *wrap(const Value **Vals) {
-    return reinterpret_cast(const_cast(Vals));
-  }
-}
-
 #endif /* !defined(__cplusplus) */
 
 #endif /* !defined(LLVM_C_CORE_H) */

Modified: head/contrib/llvm/include/llvm-c/ExecutionEngine.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/ExecutionEngine.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/ExecutionEngine.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -21,6 +21,7 @@
 
 #include "llvm-c/Core.h"
 #include "llvm-c/Target.h"
+#include "llvm-c/TargetMachine.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,11 +35,19 @@ extern "C" {
  */
 
 void LLVMLinkInJIT(void);
+void LLVMLinkInMCJIT(void);
 void LLVMLinkInInterpreter(void);
 
 typedef struct LLVMOpaqueGenericValue *LLVMGenericValueRef;
 typedef struct LLVMOpaqueExecutionEngine *LLVMExecutionEngineRef;
 
+struct LLVMMCJITCompilerOptions {
+  unsigned OptLevel;
+  LLVMCodeModel CodeModel;
+  LLVMBool NoFramePointerElim;
+  LLVMBool EnableFastISel;
+};
+
 /*===-- Operations on generic values --------------------------------------===*/
 
 LLVMGenericValueRef LLVMCreateGenericValueOfInt(LLVMTypeRef Ty,
@@ -75,6 +84,31 @@ LLVMBool LLVMCreateJITCompilerForModule(
                                         unsigned OptLevel,
                                         char **OutError);
 
+void LLVMInitializeMCJITCompilerOptions(
+  struct LLVMMCJITCompilerOptions *Options, size_t SizeOfOptions);
+
+/**
+ * Create an MCJIT execution engine for a module, with the given options. It is
+ * the responsibility of the caller to ensure that all fields in Options up to
+ * the given SizeOfOptions are initialized. It is correct to pass a smaller
+ * value of SizeOfOptions that omits some fields. The canonical way of using
+ * this is:
+ *
+ * LLVMMCJITCompilerOptions options;
+ * LLVMInitializeMCJITCompilerOptions(&options, sizeof(options));
+ * ... fill in those options you care about
+ * LLVMCreateMCJITCompilerForModule(&jit, mod, &options, sizeof(options),
+ *                                  &error);
+ *
+ * Note that this is also correct, though possibly suboptimal:
+ *
+ * LLVMCreateMCJITCompilerForModule(&jit, mod, 0, 0, &error);
+ */
+LLVMBool LLVMCreateMCJITCompilerForModule(
+  LLVMExecutionEngineRef *OutJIT, LLVMModuleRef M,
+  struct LLVMMCJITCompilerOptions *Options, size_t SizeOfOptions,
+  char **OutError);
+
 /** Deprecated: Use LLVMCreateExecutionEngineForModule instead. */
 LLVMBool LLVMCreateExecutionEngine(LLVMExecutionEngineRef *OutEE,
                                    LLVMModuleProviderRef MP,
@@ -123,7 +157,8 @@ LLVMBool LLVMRemoveModuleProvider(LLVMEx
 LLVMBool LLVMFindFunction(LLVMExecutionEngineRef EE, const char *Name,
                           LLVMValueRef *OutFn);
 
-void *LLVMRecompileAndRelinkFunction(LLVMExecutionEngineRef EE, LLVMValueRef Fn);
+void *LLVMRecompileAndRelinkFunction(LLVMExecutionEngineRef EE,
+                                     LLVMValueRef Fn);
 
 LLVMTargetDataRef LLVMGetExecutionEngineTargetData(LLVMExecutionEngineRef EE);
 
@@ -137,27 +172,7 @@ void *LLVMGetPointerToGlobal(LLVMExecuti
  */
 
 #ifdef __cplusplus
-}
-
-namespace llvm {
-  struct GenericValue;
-  class ExecutionEngine;
-  
-  #define DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref)   \
-    inline ty *unwrap(ref P) {                          \
-      return reinterpret_cast(P);                  \
-    }                                                   \
-                                                        \
-    inline ref wrap(const ty *P) {                      \
-      return reinterpret_cast(const_cast(P)); \
-    }
-  
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue,    LLVMGenericValueRef   )
-  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef)
-  
-  #undef DEFINE_SIMPLE_CONVERSION_FUNCTIONS
-}
-  
+}  
 #endif /* defined(__cplusplus) */
 
 #endif

Modified: head/contrib/llvm/include/llvm-c/Object.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/Object.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/Object.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -23,8 +23,6 @@
 #include "llvm/Config/llvm-config.h"
 
 #ifdef __cplusplus
-#include "llvm/Object/ObjectFile.h"
-
 extern "C" {
 #endif
 
@@ -99,50 +97,6 @@ const char *LLVMGetRelocationValueString
 
 #ifdef __cplusplus
 }
-
-namespace llvm {
-  namespace object {
-    inline ObjectFile *unwrap(LLVMObjectFileRef OF) {
-      return reinterpret_cast(OF);
-    }
-
-    inline LLVMObjectFileRef wrap(const ObjectFile *OF) {
-      return reinterpret_cast(const_cast(OF));
-    }
-
-    inline section_iterator *unwrap(LLVMSectionIteratorRef SI) {
-      return reinterpret_cast(SI);
-    }
-
-    inline LLVMSectionIteratorRef
-    wrap(const section_iterator *SI) {
-      return reinterpret_cast
-        (const_cast(SI));
-    }
-
-    inline symbol_iterator *unwrap(LLVMSymbolIteratorRef SI) {
-      return reinterpret_cast(SI);
-    }
-
-    inline LLVMSymbolIteratorRef
-    wrap(const symbol_iterator *SI) {
-      return reinterpret_cast
-        (const_cast(SI));
-    }
-
-    inline relocation_iterator *unwrap(LLVMRelocationIteratorRef SI) {
-      return reinterpret_cast(SI);
-    }
-
-    inline LLVMRelocationIteratorRef
-    wrap(const relocation_iterator *SI) {
-      return reinterpret_cast
-        (const_cast(SI));
-    }
-
-  }
-}
-
 #endif /* defined(__cplusplus) */
 
 #endif

Modified: head/contrib/llvm/include/llvm-c/Target.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/Target.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/Target.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -235,29 +235,6 @@ void LLVMDisposeTargetData(LLVMTargetDat
 
 #ifdef __cplusplus
 }
-
-namespace llvm {
-  class DataLayout;
-  class TargetLibraryInfo;
-
-  inline DataLayout *unwrap(LLVMTargetDataRef P) {
-    return reinterpret_cast(P);
-  }
-  
-  inline LLVMTargetDataRef wrap(const DataLayout *P) {
-    return reinterpret_cast(const_cast(P));
-  }
-
-  inline TargetLibraryInfo *unwrap(LLVMTargetLibraryInfoRef P) {
-    return reinterpret_cast(P);
-  }
-
-  inline LLVMTargetLibraryInfoRef wrap(const TargetLibraryInfo *P) {
-    TargetLibraryInfo *X = const_cast(P);
-    return reinterpret_cast(X);
-  }
-}
-
 #endif /* defined(__cplusplus) */
 
 #endif

Modified: head/contrib/llvm/include/llvm-c/TargetMachine.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/TargetMachine.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/TargetMachine.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef struct LLVMTargetMachine *LLVMTargetMachineRef;
+typedef struct LLVMOpaqueTargetMachine *LLVMTargetMachineRef;
 typedef struct LLVMTarget *LLVMTargetRef;
 
 typedef enum {
@@ -114,30 +114,11 @@ LLVMTargetDataRef LLVMGetTargetMachineDa
 LLVMBool LLVMTargetMachineEmitToFile(LLVMTargetMachineRef T, LLVMModuleRef M,
   char *Filename, LLVMCodeGenFileType codegen, char **ErrorMessage);
 
-
-
-
+/** Compile the LLVM IR stored in \p M and store the result in \p OutMemBuf. */
+LLVMBool LLVMTargetMachineEmitToMemoryBuffer(LLVMTargetMachineRef T, LLVMModuleRef M,
+  LLVMCodeGenFileType codegen, char** ErrorMessage, LLVMMemoryBufferRef *OutMemBuf);
 #ifdef __cplusplus
 }
-
-namespace llvm {
-  class TargetMachine;
-  class Target;
-
-  inline TargetMachine *unwrap(LLVMTargetMachineRef P) {
-    return reinterpret_cast(P);
-  }
-  inline Target *unwrap(LLVMTargetRef P) {
-    return reinterpret_cast(P);
-  }
-  inline LLVMTargetMachineRef wrap(const TargetMachine *P) {
-    return reinterpret_cast(
-      const_cast(P));
-  }
-  inline LLVMTargetRef wrap(const Target * P) {
-    return reinterpret_cast(const_cast(P));
-  }
-}
 #endif
 
 #endif

Modified: head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -86,16 +86,6 @@ void LLVMPassManagerBuilderPopulateLTOPa
 
 #ifdef __cplusplus
 }
-
-namespace llvm {
-  inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
-    return reinterpret_cast(P);
-  }
-
-  inline LLVMPassManagerBuilderRef wrap(PassManagerBuilder *P) {
-    return reinterpret_cast(P);
-  }
-}
 #endif
 
 #endif

Modified: head/contrib/llvm/include/llvm-c/Transforms/Vectorize.h
==============================================================================
--- head/contrib/llvm/include/llvm-c/Transforms/Vectorize.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm-c/Transforms/Vectorize.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -39,6 +39,9 @@ void LLVMAddBBVectorizePass(LLVMPassMana
 /** See llvm::createLoopVectorizePass function. */
 void LLVMAddLoopVectorizePass(LLVMPassManagerRef PM);
 
+/** See llvm::createSLPVectorizerPass function. */
+void LLVMAddSLPVectorizePass(LLVMPassManagerRef PM);
+
 /**
  * @}
  */

Modified: head/contrib/llvm/include/llvm/ADT/ArrayRef.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/ArrayRef.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/ArrayRef.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -10,6 +10,7 @@
 #ifndef LLVM_ADT_ARRAYREF_H
 #define LLVM_ADT_ARRAYREF_H
 
+#include "llvm/ADT/None.h"
 #include "llvm/ADT/SmallVector.h"
 #include 
 
@@ -49,6 +50,9 @@ namespace llvm {
     /// Construct an empty ArrayRef.
     /*implicit*/ ArrayRef() : Data(0), Length(0) {}
 
+    /// Construct an empty ArrayRef from None.
+    /*implicit*/ ArrayRef(NoneType) : Data(0), Length(0) {}
+
     /// Construct an ArrayRef from a single element.
     /*implicit*/ ArrayRef(const T &OneElt)
       : Data(&OneElt), Length(1) {}
@@ -174,9 +178,12 @@ namespace llvm {
   public:
     typedef T *iterator;
 
-    /// Construct an empty ArrayRef.
+    /// Construct an empty MutableArrayRef.
     /*implicit*/ MutableArrayRef() : ArrayRef() {}
 
+    /// Construct an empty MutableArrayRef from None.
+    /*implicit*/ MutableArrayRef(NoneType) : ArrayRef() {}
+
     /// Construct an MutableArrayRef from a single element.
     /*implicit*/ MutableArrayRef(T &OneElt) : ArrayRef(OneElt) {}
 

Modified: head/contrib/llvm/include/llvm/ADT/DenseMap.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/DenseMap.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/DenseMap.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -618,7 +618,7 @@ public:
     unsigned OldNumBuckets = NumBuckets;
     BucketT *OldBuckets = Buckets;
 
-    allocateBuckets(std::max(64, NextPowerOf2(AtLeast-1)));
+    allocateBuckets(std::max(64, static_cast(NextPowerOf2(AtLeast-1))));
     assert(Buckets);
     if (!OldBuckets) {
       this->BaseT::initEmpty();

Modified: head/contrib/llvm/include/llvm/ADT/Hashing.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/Hashing.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/Hashing.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -151,7 +151,7 @@ namespace detail {
 inline uint64_t fetch64(const char *p) {
   uint64_t result;
   memcpy(&result, p, sizeof(result));
-  if (sys::isBigEndianHost())
+  if (sys::IsBigEndianHost)
     return sys::SwapByteOrder(result);
   return result;
 }
@@ -159,7 +159,7 @@ inline uint64_t fetch64(const char *p) {
 inline uint32_t fetch32(const char *p) {
   uint32_t result;
   memcpy(&result, p, sizeof(result));
-  if (sys::isBigEndianHost())
+  if (sys::IsBigEndianHost)
     return sys::SwapByteOrder(result);
   return result;
 }

Modified: head/contrib/llvm/include/llvm/ADT/PointerIntPair.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/PointerIntPair.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/PointerIntPair.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -29,7 +29,7 @@ struct DenseMapInfo;
 /// on the number of bits available according to PointerLikeTypeTraits for the
 /// type.
 ///
-/// Note that PointerIntPair always puts the Int part in the highest bits
+/// Note that PointerIntPair always puts the IntVal part in the highest bits
 /// possible.  For example, PointerIntPair will put the bit for
 /// the bool into bit #2, not bit #0, which allows the low two bits to be used
 /// for something else.  For example, this allows:
@@ -57,13 +57,13 @@ class PointerIntPair {
   };
 public:
   PointerIntPair() : Value(0) {}
-  PointerIntPair(PointerTy Ptr, IntType Int) {
+  PointerIntPair(PointerTy PtrVal, IntType IntVal) {
     assert(IntBits <= PtrTraits::NumLowBitsAvailable &&
            "PointerIntPair formed with integer size too large for pointer");
-    setPointerAndInt(Ptr, Int);
+    setPointerAndInt(PtrVal, IntVal);
   }
-  explicit PointerIntPair(PointerTy Ptr) {
-    initWithPointer(Ptr);
+  explicit PointerIntPair(PointerTy PtrVal) {
+    initWithPointer(PtrVal);
   }
 
   PointerTy getPointer() const {
@@ -75,41 +75,41 @@ public:
     return (IntType)((Value >> IntShift) & IntMask);
   }
 
-  void setPointer(PointerTy Ptr) {
-    intptr_t PtrVal
-      = reinterpret_cast(PtrTraits::getAsVoidPointer(Ptr));
-    assert((PtrVal & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
+  void setPointer(PointerTy PtrVal) {
+    intptr_t PtrWord
+      = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal));
+    assert((PtrWord & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
            "Pointer is not sufficiently aligned");
     // Preserve all low bits, just update the pointer.
-    Value = PtrVal | (Value & ~PointerBitMask);
+    Value = PtrWord | (Value & ~PointerBitMask);
   }
 
-  void setInt(IntType Int) {
-    intptr_t IntVal = Int;
-    assert(IntVal < (1 << IntBits) && "Integer too large for field");
+  void setInt(IntType IntVal) {
+    intptr_t IntWord = static_cast(IntVal);
+    assert(IntWord < (1 << IntBits) && "Integer too large for field");
     
     // Preserve all bits other than the ones we are updating.
     Value &= ~ShiftedIntMask;     // Remove integer field.
-    Value |= IntVal << IntShift;  // Set new integer.
+    Value |= IntWord << IntShift;  // Set new integer.
   }
 
-  void initWithPointer(PointerTy Ptr) {
-    intptr_t PtrVal
-      = reinterpret_cast(PtrTraits::getAsVoidPointer(Ptr));
-    assert((PtrVal & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
+  void initWithPointer(PointerTy PtrVal) {
+    intptr_t PtrWord
+      = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal));
+    assert((PtrWord & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
            "Pointer is not sufficiently aligned");
-    Value = PtrVal;
+    Value = PtrWord;
   }
 
-  void setPointerAndInt(PointerTy Ptr, IntType Int) {
-    intptr_t PtrVal
-      = reinterpret_cast(PtrTraits::getAsVoidPointer(Ptr));
-    assert((PtrVal & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
+  void setPointerAndInt(PointerTy PtrVal, IntType IntVal) {
+    intptr_t PtrWord
+      = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal));
+    assert((PtrWord & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
            "Pointer is not sufficiently aligned");
-    intptr_t IntVal = Int;
-    assert(IntVal < (1 << IntBits) && "Integer too large for field");
+    intptr_t IntWord = static_cast(IntVal);
+    assert(IntWord < (1 << IntBits) && "Integer too large for field");
 
-    Value = PtrVal | (IntVal << IntShift);
+    Value = PtrWord | (IntWord << IntShift);
   }
 
   PointerTy const *getAddrOfPointer() const {

Modified: head/contrib/llvm/include/llvm/ADT/StringRef.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/StringRef.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/StringRef.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -260,7 +260,7 @@ namespace llvm {
 
     /// Find the first character in the string that is \p C, or npos if not
     /// found. Same as find.
-    size_type find_first_of(char C, size_t From = 0) const {
+    size_t find_first_of(char C, size_t From = 0) const {
       return find(C, From);
     }
 
@@ -268,21 +268,21 @@ namespace llvm {
     /// not found.
     ///
     /// Complexity: O(size() + Chars.size())
-    size_type find_first_of(StringRef Chars, size_t From = 0) const;
+    size_t find_first_of(StringRef Chars, size_t From = 0) const;
 
     /// Find the first character in the string that is not \p C or npos if not
     /// found.
-    size_type find_first_not_of(char C, size_t From = 0) const;
+    size_t find_first_not_of(char C, size_t From = 0) const;
 
     /// Find the first character in the string that is not in the string
     /// \p Chars, or npos if not found.
     ///
     /// Complexity: O(size() + Chars.size())
-    size_type find_first_not_of(StringRef Chars, size_t From = 0) const;
+    size_t find_first_not_of(StringRef Chars, size_t From = 0) const;
 
     /// Find the last character in the string that is \p C, or npos if not
     /// found.
-    size_type find_last_of(char C, size_t From = npos) const {
+    size_t find_last_of(char C, size_t From = npos) const {
       return rfind(C, From);
     }
 
@@ -290,17 +290,17 @@ namespace llvm {
     /// found.
     ///
     /// Complexity: O(size() + Chars.size())
-    size_type find_last_of(StringRef Chars, size_t From = npos) const;
+    size_t find_last_of(StringRef Chars, size_t From = npos) const;
 
     /// Find the last character in the string that is not \p C, or npos if not
     /// found.
-    size_type find_last_not_of(char C, size_t From = npos) const;
+    size_t find_last_not_of(char C, size_t From = npos) const;
 
     /// Find the last character in the string that is not in \p Chars, or
     /// npos if not found.
     ///
     /// Complexity: O(size() + Chars.size())
-    size_type find_last_not_of(StringRef Chars, size_t From = npos) const;
+    size_t find_last_not_of(StringRef Chars, size_t From = npos) const;
 
     /// @}
     /// @name Helpful Algorithms
@@ -390,14 +390,14 @@ namespace llvm {
 
     /// Return a StringRef equal to 'this' but with the first \p N elements
     /// dropped.
-    StringRef drop_front(unsigned N = 1) const {
+    StringRef drop_front(size_t N = 1) const {
       assert(size() >= N && "Dropping more elements than exist");
       return substr(N);
     }
 
     /// Return a StringRef equal to 'this' but with the last \p N elements
     /// dropped.
-    StringRef drop_back(unsigned N = 1) const {
+    StringRef drop_back(size_t N = 1) const {
       assert(size() >= N && "Dropping more elements than exist");
       return substr(0, size()-N);
     }

Modified: head/contrib/llvm/include/llvm/ADT/Triple.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/Triple.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/Triple.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -43,7 +43,7 @@ public:
   enum ArchType {
     UnknownArch,
 
-    arm,     // ARM; arm, armv.*, xscale
+    arm,     // ARM: arm, armv.*, xscale
     aarch64, // AArch64: aarch64
     hexagon, // Hexagon: hexagon
     mips,    // MIPS: mips, mipsallegrex
@@ -56,6 +56,7 @@ public:
     r600,    // R600: AMD GPUs HD2XXX - HD6XXX
     sparc,   // Sparc: sparc
     sparcv9, // Sparcv9: Sparcv9
+    systemz, // SystemZ: s390x
     tce,     // TCE (http://tce.cs.tut.fi/): tce
     thumb,   // Thumb: thumb, thumbv.*
     x86,     // X86: i[3-9]86

Modified: head/contrib/llvm/include/llvm/ADT/Twine.h
==============================================================================
--- head/contrib/llvm/include/llvm/ADT/Twine.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/ADT/Twine.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -236,7 +236,7 @@ namespace llvm {
     /// getLHSKind - Get the NodeKind of the left-hand side.
     NodeKind getLHSKind() const { return (NodeKind) LHSKind; }
 
-    /// getRHSKind - Get the NodeKind of the left-hand side.
+    /// getRHSKind - Get the NodeKind of the right-hand side.
     NodeKind getRHSKind() const { return (NodeKind) RHSKind; }
 
     /// printOneChild - Print one child from a twine.

Modified: head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h
==============================================================================
--- head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -146,14 +146,6 @@ static inline CallInst *isFreeCall(Value
 bool getObjectSize(const Value *Ptr, uint64_t &Size, const DataLayout *TD,
                    const TargetLibraryInfo *TLI, bool RoundToAlign = false);
 
-/// \brief Compute the size of the underlying object pointed by Ptr. Returns
-/// true and the object size in Size if successful, and false otherwise.
-/// If RoundToAlign is true, then Size is rounded up to the aligment of allocas,
-/// byval arguments, and global variables.
-bool getUnderlyingObjectSize(const Value *Ptr, uint64_t &Size,
-                             const DataLayout *TD, const TargetLibraryInfo *TLI,
-                             bool RoundToAlign = false);
-
 
 
 typedef std::pair SizeOffsetType;
@@ -163,14 +155,12 @@ typedef std::pair SizeOffs
 class ObjectSizeOffsetVisitor
   : public InstVisitor {
 
-  typedef DenseMap CacheMapTy;
-
   const DataLayout *TD;
   const TargetLibraryInfo *TLI;
   bool RoundToAlign;
   unsigned IntTyBits;
   APInt Zero;
-  CacheMapTy CacheMap;
+  SmallPtrSet SeenInsts;
 
   APInt align(APInt Size, uint64_t Align);
 

Modified: head/contrib/llvm/include/llvm/Analysis/RegionInfo.h
==============================================================================
--- head/contrib/llvm/include/llvm/Analysis/RegionInfo.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/Analysis/RegionInfo.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -266,6 +266,24 @@ public:
   /// @param BB  The new exit basic block of the region.
   void replaceExit(BasicBlock *BB);
 
+  /// @brief Recursively replace the entry basic block of the region.
+  ///
+  /// This function replaces the entry basic block with a new basic block. It
+  /// also updates all child regions that have the same entry basic block as
+  /// this region.
+  ///
+  /// @param NewEntry The new entry basic block.
+  void replaceEntryRecursive(BasicBlock *NewEntry);
+
+  /// @brief Recursively replace the exit basic block of the region.
+  ///
+  /// This function replaces the exit basic block with a new basic block. It
+  /// also updates all child regions that have the same exit basic block as
+  /// this region.
+  ///
+  /// @param NewExit The new exit basic block.
+  void replaceExitRecursive(BasicBlock *NewExit);
+
   /// @brief Get the exit BasicBlock of the Region.
   /// @return The exit BasicBlock of the Region, NULL if this is the TopLevel
   ///         Region.

Modified: head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h
==============================================================================
--- head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -453,7 +453,8 @@ namespace llvm {
     ExitLimit ComputeExitLimitFromCond(const Loop *L,
                                        Value *ExitCond,
                                        BasicBlock *TBB,
-                                       BasicBlock *FBB);
+                                       BasicBlock *FBB,
+                                       bool IsSubExpr);
 
     /// ComputeExitLimitFromICmp - Compute the number of times the backedge of
     /// the specified loop will execute if its exit condition were a conditional
@@ -461,7 +462,8 @@ namespace llvm {
     ExitLimit ComputeExitLimitFromICmp(const Loop *L,
                                        ICmpInst *ExitCond,
                                        BasicBlock *TBB,
-                                       BasicBlock *FBB);
+                                       BasicBlock *FBB,
+                                       bool IsSubExpr);
 
     /// ComputeLoadConstantCompareExitLimit - Given an exit condition
     /// of 'icmp op load X, cst', try to see if we can compute the
@@ -483,7 +485,7 @@ namespace llvm {
     /// HowFarToZero - Return the number of times an exit condition comparing
     /// the specified value to zero will execute.  If not computable, return
     /// CouldNotCompute.
-    ExitLimit HowFarToZero(const SCEV *V, const Loop *L);
+    ExitLimit HowFarToZero(const SCEV *V, const Loop *L, bool IsSubExpr);
 
     /// HowFarToNonZero - Return the number of times an exit condition checking
     /// the specified value for nonzero will execute.  If not computable, return
@@ -495,7 +497,7 @@ namespace llvm {
     /// computable, return CouldNotCompute. isSigned specifies whether the
     /// less-than is signed.
     ExitLimit HowManyLessThans(const SCEV *LHS, const SCEV *RHS,
-                               const Loop *L, bool isSigned);
+                               const Loop *L, bool isSigned, bool IsSubExpr);
 
     /// getPredecessorWithUniqueSuccessorForBB - Return a predecessor of BB
     /// (which may not be an immediate predecessor) which has exactly one

Modified: head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h
==============================================================================
--- head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -25,6 +25,7 @@ namespace llvm {
   class BlockAddress;
   class GCStrategy;
   class Constant;
+  class ConstantArray;
   class GCMetadataPrinter;
   class GlobalValue;
   class GlobalVariable;
@@ -134,6 +135,9 @@ namespace llvm {
     /// getDataLayout - Return information about data layout.
     const DataLayout &getDataLayout() const;
 
+    /// getTargetTriple - Return the target triple string.
+    StringRef getTargetTriple() const;
+
     /// getCurrentSection() - Return the current section we are emitting to.
     const MCSection *getCurrentSection() const;
 
@@ -480,7 +484,7 @@ namespace llvm {
     void EmitJumpTableEntry(const MachineJumpTableInfo *MJTI,
                             const MachineBasicBlock *MBB,
                             unsigned uid) const;
-    void EmitLLVMUsedList(const Constant *List);
+    void EmitLLVMUsedList(const ConstantArray *InitList);
     void EmitXXStructorList(const Constant *List, bool isCtor);
     GCMetadataPrinter *GetOrCreateGCPrinter(GCStrategy *C);
   };

Modified: head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h
==============================================================================
--- head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h	Wed Jun 12 18:08:11 2013	(r251661)
+++ head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h	Wed Jun 12 18:48:53 2013	(r251662)
@@ -163,8 +163,56 @@ private:
 
   unsigned StackOffset;
   SmallVector UsedRegs;
-  unsigned FirstByValReg;
-  bool FirstByValRegValid;
+
+  // ByValInfo and SmallVector ByValRegs:
+  //
+  // Vector of ByValInfo instances (ByValRegs) is introduced for byval registers
+  // tracking.
+  // Or, in another words it tracks byval parameters that are stored in
+  // general purpose registers.
+  //
+  // For 4 byte stack alignment,
+  // instance index means byval parameter number in formal
+  // arguments set. Assume, we have some "struct_type" with size = 4 bytes,
+  // then, for function "foo":
+  //
+  // i32 foo(i32 %p, %struct_type* %r, i32 %s, %struct_type* %t)
+  //
+  // ByValRegs[0] describes how "%r" is stored (Begin == r1, End == r2)
+  // ByValRegs[1] describes how "%t" is stored (Begin == r3, End == r4).
+  //
+  // In case of 8 bytes stack alignment,
+  // ByValRegs may also contain information about wasted registers.
+  // In function shown above, r3 would be wasted according to AAPCS rules.
+  // And in that case ByValRegs[1].Waste would be "true".
+  // ByValRegs vector size still would be 2,
+  // while "%t" goes to the stack: it wouldn't be described in ByValRegs.
+  //
+  // Supposed use-case for this collection:
+  // 1. Initially ByValRegs is empty, InRegsParamsProceed is 0.
+  // 2. HandleByVal fillups ByValRegs.
+  // 3. Argument analysis (LowerFormatArguments, for example). After
+  // some byval argument was analyzed, InRegsParamsProceed is increased.
+  struct ByValInfo {
+    ByValInfo(unsigned B, unsigned E, bool IsWaste = false) :
+      Begin(B), End(E), Waste(IsWaste) {}
+    // First register allocated for current parameter.
+    unsigned Begin;
+
+    // First after last register allocated for current parameter.
+    unsigned End;
+
+    // Means that current range of registers doesn't belong to any
+    // parameters. It was wasted due to stack alignment rules.
+    // For more information see:
+    // AAPCS, 5.5 Parameter Passing, Stage C, C.3.
+    bool Waste;
+  };
+  SmallVector ByValRegs;
+
+  // InRegsParamsProceed - shows how many instances of ByValRegs was proceed
+  // during argument analysis.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 19:04:09 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F29D4387;
 Wed, 12 Jun 2013 19:04:08 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E49701B9E;
 Wed, 12 Jun 2013 19:04:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CJ48EG013112;
 Wed, 12 Jun 2013 19:04:08 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CJ48Pg013111;
 Wed, 12 Jun 2013 19:04:08 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201306121904.r5CJ48Pg013111@svn.freebsd.org>
From: Alan Somers 
Date: Wed, 12 Jun 2013 19:04:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251663 - stable/9/etc/rc.d
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 19:04:09 -0000

Author: asomers
Date: Wed Jun 12 19:04:08 2013
New Revision: 251663
URL: http://svnweb.freebsd.org/changeset/base/251663

Log:
  MFC r250617
  
  etc/rc.d/syslogd
  	Add netif as a requirement of syslogd to get lo0 up.  Currently, this
  	doesn't affect the rc order, because mountcritremote already depends on
  	netif.
  
  Reviewed by:	eadler
  Approved by:	ken (mentor)

Modified:
  stable/9/etc/rc.d/syslogd
Directory Properties:
  stable/9/etc/   (props changed)
  stable/9/etc/rc.d/   (props changed)

Modified: stable/9/etc/rc.d/syslogd
==============================================================================
--- stable/9/etc/rc.d/syslogd	Wed Jun 12 18:48:53 2013	(r251662)
+++ stable/9/etc/rc.d/syslogd	Wed Jun 12 19:04:08 2013	(r251663)
@@ -3,8 +3,10 @@
 # $FreeBSD$
 #
 
+# netif is required for lo0 because syslogd tries to open a local socket
+#
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote FILESYSTEMS newsyslog
+# REQUIRE: mountcritremote FILESYSTEMS newsyslog netif
 # BEFORE:  SERVERS
 
 . /etc/rc.subr

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 19:21:24 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 258ACDB7;
 Wed, 12 Jun 2013 19:21:24 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 181221C75;
 Wed, 12 Jun 2013 19:21:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CJLNUT019523;
 Wed, 12 Jun 2013 19:21:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CJLNED019522;
 Wed, 12 Jun 2013 19:21:23 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121921.r5CJLNED019522@svn.freebsd.org>
From: Alexander Motin 
Date: Wed, 12 Jun 2013 19:21:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251664 - head/sbin/camcontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 19:21:24 -0000

Author: mav
Date: Wed Jun 12 19:21:23 2013
New Revision: 251664
URL: http://svnweb.freebsd.org/changeset/base/251664

Log:
  Fix build after r251654.

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Wed Jun 12 19:04:08 2013	(r251663)
+++ head/sbin/camcontrol/camcontrol.c	Wed Jun 12 19:21:23 2013	(r251664)
@@ -6947,18 +6947,18 @@ findsasdevice(struct cam_devlist *devlis
 	struct cam_devitem *item;
 
 	STAILQ_FOREACH(item, &devlist->dev_queue, links) {
-		uint8_t *item_addr;
+		struct scsi_vpd_id_descriptor *idd;
 
 		/*
 		 * XXX KDM look for LUN IDs as well?
 		 */
-		item_addr = scsi_get_devid(item->device_id,
+		idd = scsi_get_devid(item->device_id,
 					   item->device_id_len,
 					   scsi_devid_is_sas_target);
-		if (item_addr == NULL)
+		if (idd == NULL)
 			continue;
 
-		if (scsi_8btou64(item_addr) == sasaddr)
+		if (scsi_8btou64(idd->identifier) == sasaddr)
 			return (item);
 	}
 

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 20:05:20 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 88547EE8;
 Wed, 12 Jun 2013 20:05:20 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 60A3C1E85;
 Wed, 12 Jun 2013 20:05:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CK5Ksj033159;
 Wed, 12 Jun 2013 20:05:20 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CK5KlO033156;
 Wed, 12 Jun 2013 20:05:20 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201306122005.r5CK5KlO033156@svn.freebsd.org>
From: Ed Maste 
Date: Wed, 12 Jun 2013 20:05:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251665 - in head/contrib: binutils/include/elf gdb/gdb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 20:05:20 -0000

Author: emaste
Date: Wed Jun 12 20:05:19 2013
New Revision: 251665
URL: http://svnweb.freebsd.org/changeset/base/251665

Log:
  Handle DW_TAG_rvalue_reference_type
  
  2012-05-21  Jim Ingham 
  
        * dwarf2read.c (process_die): Handle DW_TAG_rvalue_reference_type.
        (read_type_die): Ditto.
        (dwarf_tag_name): Ditto.
  
        * elf/dwarf2.h: Add DW_TAG_rvalue_reference_type.
  
  Obtained from:	Apple, gdb-1820

Modified:
  head/contrib/binutils/include/elf/dwarf2.h
  head/contrib/gdb/gdb/dwarf2read.c

Modified: head/contrib/binutils/include/elf/dwarf2.h
==============================================================================
--- head/contrib/binutils/include/elf/dwarf2.h	Wed Jun 12 19:21:23 2013	(r251664)
+++ head/contrib/binutils/include/elf/dwarf2.h	Wed Jun 12 20:05:19 2013	(r251665)
@@ -189,6 +189,7 @@ enum dwarf_tag
     DW_TAG_imported_unit = 0x3d,
     DW_TAG_condition = 0x3f,
     DW_TAG_shared_type = 0x40,
+    DW_TAG_rvalue_reference_type = 0x42,
     /* SGI/MIPS Extensions.  */
     DW_TAG_MIPS_loop = 0x4081,
     /* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */

Modified: head/contrib/gdb/gdb/dwarf2read.c
==============================================================================
--- head/contrib/gdb/gdb/dwarf2read.c	Wed Jun 12 19:21:23 2013	(r251664)
+++ head/contrib/gdb/gdb/dwarf2read.c	Wed Jun 12 20:05:19 2013	(r251665)
@@ -1977,6 +1977,7 @@ process_die (struct die_info *die, struc
       read_tag_ptr_to_member_type (die, cu);
       break;
     case DW_TAG_reference_type:
+    case DW_TAG_rvalue_reference_type:
       read_tag_reference_type (die, cu);
       break;
     case DW_TAG_string_type:
@@ -6097,6 +6098,7 @@ read_type_die (struct die_info *die, str
       read_tag_ptr_to_member_type (die, cu);
       break;
     case DW_TAG_reference_type:
+    case DW_TAG_rvalue_reference_type:
       read_tag_reference_type (die, cu);
       break;
     case DW_TAG_const_type:
@@ -6425,6 +6427,8 @@ dwarf_tag_name (unsigned tag)
       return "DW_TAG_pointer_type";
     case DW_TAG_reference_type:
       return "DW_TAG_reference_type";
+    case DW_TAG_rvalue_reference_type:
+      return "DW_TAG_rvalue_reference_type";
     case DW_TAG_compile_unit:
       return "DW_TAG_compile_unit";
     case DW_TAG_string_type:

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 20:08:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0A4B3524;
 Wed, 12 Jun 2013 20:08:31 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F02351EB7;
 Wed, 12 Jun 2013 20:08:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CK8UDX033737;
 Wed, 12 Jun 2013 20:08:30 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CK8U1s033734;
 Wed, 12 Jun 2013 20:08:30 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201306122008.r5CK8U1s033734@svn.freebsd.org>
From: "George V. Neville-Neil" 
Date: Wed, 12 Jun 2013 20:08:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251666 - in stable/9/sys/cddl/dev/dtrace: amd64 i386
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 20:08:31 -0000

Author: gnn
Date: Wed Jun 12 20:08:30 2013
New Revision: 251666
URL: http://svnweb.freebsd.org/changeset/base/251666

Log:
  MFC: 236567
  
  Integrate a fix for a very odd signal delivery problem found
  by Bryan Cantril and others in the Solaris/Illumos version of DTrace.
  
  Obtained from: https://www.illumos.org/issues/789

Modified:
  stable/9/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  stable/9/sys/cddl/dev/dtrace/i386/dtrace_subr.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
==============================================================================
--- stable/9/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Wed Jun 12 20:05:19 2013	(r251665)
+++ stable/9/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Wed Jun 12 20:08:30 2013	(r251666)
@@ -27,6 +27,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #include 
 #include 
 #include 
@@ -299,14 +303,15 @@ dtrace_safe_defer_signal(void)
 	}
 
 	/*
-	 * If we've executed the original instruction, but haven't performed
-	 * the jmp back to t->t_dtrace_npc or the clean up of any registers
-	 * used to emulate %rip-relative instructions in 64-bit mode, do that
-	 * here and take the signal right away. We detect this condition by
-	 * seeing if the program counter is the range [scrpc + isz, astpc).
+	 * If we have executed the original instruction, but we have performed
+	 * neither the jmp back to t->t_dtrace_npc nor the clean up of any
+	 * registers used to emulate %rip-relative instructions in 64-bit mode,
+	 * we'll save ourselves some effort by doing that here and taking the
+	 * signal right away.  We detect this condition by seeing if the program
+	 * counter is the range [scrpc + isz, astpc).
 	 */
-	if (t->t_dtrace_astpc - rp->r_pc <
-	    t->t_dtrace_astpc - t->t_dtrace_scrpc - isz) {
+	if (rp->r_pc >= t->t_dtrace_scrpc + isz &&
+	    rp->r_pc < t->t_dtrace_astpc) {
 #ifdef __amd64
 		/*
 		 * If there is a scratch register and we're on the

Modified: stable/9/sys/cddl/dev/dtrace/i386/dtrace_subr.c
==============================================================================
--- stable/9/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Wed Jun 12 20:05:19 2013	(r251665)
+++ stable/9/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Wed Jun 12 20:08:30 2013	(r251666)
@@ -27,6 +27,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #include 
 #include 
 #include 
@@ -300,14 +304,15 @@ dtrace_safe_defer_signal(void)
 	}
 
 	/*
-	 * If we've executed the original instruction, but haven't performed
-	 * the jmp back to t->t_dtrace_npc or the clean up of any registers
-	 * used to emulate %rip-relative instructions in 64-bit mode, do that
-	 * here and take the signal right away. We detect this condition by
-	 * seeing if the program counter is the range [scrpc + isz, astpc).
+	 * If we have executed the original instruction, but we have performed
+	 * neither the jmp back to t->t_dtrace_npc nor the clean up of any
+	 * registers used to emulate %rip-relative instructions in 64-bit mode,
+	 * we'll save ourselves some effort by doing that here and taking the
+	 * signal right away.  We detect this condition by seeing if the program
+	 * counter is the range [scrpc + isz, astpc).
 	 */
-	if (t->t_dtrace_astpc - rp->r_pc <
-	    t->t_dtrace_astpc - t->t_dtrace_scrpc - isz) {
+	if (rp->r_pc >= t->t_dtrace_scrpc + isz &&
+	    rp->r_pc < t->t_dtrace_astpc) {
 #ifdef __amd64
 		/*
 		 * If there is a scratch register and we're on the

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 20:11:49 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C438188A;
 Wed, 12 Jun 2013 20:11:49 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B6D141EF0;
 Wed, 12 Jun 2013 20:11:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CKBnSv036026;
 Wed, 12 Jun 2013 20:11:49 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CKBnWd036025;
 Wed, 12 Jun 2013 20:11:49 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201306122011.r5CKBnWd036025@svn.freebsd.org>
From: Ed Maste 
Date: Wed, 12 Jun 2013 20:11:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251667 - head/contrib/gdb/gdb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 20:11:49 -0000

Author: emaste
Date: Wed Jun 12 20:11:49 2013
New Revision: 251667
URL: http://svnweb.freebsd.org/changeset/base/251667

Log:
  Handle DW_TAG_unspecified_type
  
  2011-11-14  Jim Ingham  
  
          * dwarf2read.c (read_type_die): Handle DW_TAG_unspecified_type.
          (read_tag_unspecified_type): New function, add a type for the
          DW_TAG_unspecified_type die.
  
  Obtained from:	Apple, gdb-1752

Modified:
  head/contrib/gdb/gdb/dwarf2read.c

Modified: head/contrib/gdb/gdb/dwarf2read.c
==============================================================================
--- head/contrib/gdb/gdb/dwarf2read.c	Wed Jun 12 20:08:30 2013	(r251666)
+++ head/contrib/gdb/gdb/dwarf2read.c	Wed Jun 12 20:11:49 2013	(r251667)
@@ -825,6 +825,8 @@ static void read_array_type (struct die_
 
 static void read_tag_pointer_type (struct die_info *, struct dwarf2_cu *);
 
+static void read_tag_unspecified_type (struct die_info *, struct dwarf2_cu *);
+
 static void read_tag_ptr_to_member_type (struct die_info *,
 					 struct dwarf2_cu *);
 
@@ -3722,6 +3724,27 @@ read_tag_reference_type (struct die_info
 }
 
 static void
+read_tag_unspecified_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+  struct objfile *objfile = cu->objfile;
+  struct type *type;
+  struct attribute *attr;
+
+  if (die->type)
+    {
+      return;
+    }
+
+  type = alloc_type (objfile);
+  TYPE_LENGTH (type) = 0;
+  attr = dwarf2_attr (die, DW_AT_name, cu);
+  if (attr && DW_STRING (attr))
+      TYPE_NAME (type) = DW_STRING (attr);
+
+  die->type = type;
+}
+
+static void
 read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
 {
   struct type *base_type;
@@ -6094,6 +6117,9 @@ read_type_die (struct die_info *die, str
     case DW_TAG_pointer_type:
       read_tag_pointer_type (die, cu);
       break;
+    case DW_TAG_unspecified_type:
+      read_tag_unspecified_type (die, cu);
+      break;
     case DW_TAG_ptr_to_member_type:
       read_tag_ptr_to_member_type (die, cu);
       break;

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 21:12:05 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DEFD0AD1;
 Wed, 12 Jun 2013 21:12:05 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D0C0C12B4;
 Wed, 12 Jun 2013 21:12:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CLC569054935;
 Wed, 12 Jun 2013 21:12:05 GMT (envelope-from jlh@svn.freebsd.org)
Received: (from jlh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CLC5YQ054931;
 Wed, 12 Jun 2013 21:12:05 GMT (envelope-from jlh@svn.freebsd.org)
Message-Id: <201306122112.r5CLC5YQ054931@svn.freebsd.org>
From: Jeremie Le Hen 
Date: Wed, 12 Jun 2013 21:12:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251668 - head/lib/libc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 21:12:06 -0000

Author: jlh
Date: Wed Jun 12 21:12:05 2013
New Revision: 251668
URL: http://svnweb.freebsd.org/changeset/base/251668

Log:
  Turn libc.so into an ld script rather than a symlink pointing to the
  real shared object and libssp_nonshared.a.
  
  This was the last showstopper that prevented from enabling SSP for ports
  by default.  portmgr@ performed a buildworld which showed no significant
  breakage with this patch.
  
  Details:
  
  On i386 for PIC objects, gcc uses the __stack_chk_fail_local hidden
  symbol instead of calling __stack_chk_fail directly [1].  This happen
  not only with our gcc-4.2.1 but also with the latest gcc-4.8.  If you
  want the very nasty details, see [2].
  
  OTOH the problem doesn't exist on other architectures.  It also doesn't
  exist with Clang as the latter will somehow manage to create the
  function in the object file at compile time (contrary to only
  referencing it through a symbol that will be brought in at link time).
  
  In a perfect world, when an object file is compiled with
  -fstack-protector, it will be linked into a binary or a DSO with this
  same flag as well, so GCC will add libssp_nonshared.a to the linker
  command-line.  Unfortunately, we don't control softwares in ports and we
  may have such broken DSO.  This is the whole point of this patch.
  
  You can reproduce the problem on i386 by compiling a source file into an
  object file with "-fstack-protector-all -fPIE" and linking it
  into a binary without "-fstack-protector".
  
  This ld script automatically proposes libssp_nonshared.a along with the
  real libc DSO to the linker.  It is important to understand that the
  object file contained in this library will be pulled in the resulting
  binary _only if_ the linker notices one of its symbols is needed (i.e.
  one of the SSP symbol is missing).
  
  A theorical performance impact could be when compiling, but my testing
  showed less than 0.1% of difference.
  
  [1] For 32-bit code gcc saves the PIC register setup by using
      __stack_chk_fail_local hidden function instead of calling
      __stack_chk_fail directly.  See comment line 19460 in:
      src/contrib/gcc/config/i386/i386.c
  
  [2] When compiling a source file to an object file, if you use something
      which is external to the compilation unit, GCC doesn't know yet if
      this symbol will be inside or outside the DSO.  So it expects the
      worst case and routes the symbol through the GOT, which means
      additional space and extra relocation for rtld(1).
  
      Declaring a symbol has hidden tells GCC to use the optimal route (no
      GOT), but on the other hand this means the symbol has to be provided
      in the same DSO (namely libssp_nonshared.a).
  
      On i386, GCC actually uses an hidden symbol for SSP in PIC objects
      to save PIC register setup, as said in [1].
  
  PR:		ports/138228
  PR:		ports/168010
  Reviewed by:	kib, kan

Added:
  head/lib/libc/libc.ldscript   (contents, props changed)
Modified:
  head/lib/libc/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Wed Jun 12 20:11:49 2013	(r251667)
+++ head/lib/libc/Makefile	Wed Jun 12 21:12:05 2013	(r251668)
@@ -23,6 +23,7 @@ LIBC_ARCH=${MACHINE_CPUARCH}
 # to CFLAGS below.  -DSYSLIBC_SCCS affects just the system call stubs.
 LIB=c
 SHLIB_MAJOR= 7
+SHLIB_LDSCRIPT=libc.ldscript
 WARNS?=	2
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${LIBC_ARCH}

Added: head/lib/libc/libc.ldscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/libc.ldscript	Wed Jun 12 21:12:05 2013	(r251668)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+GROUP ( @@SHLIB@@ @@LIBDIR@@/libssp_nonshared.a )

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 21:41:09 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E065F8F2;
 Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D1FA315CD;
 Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CLf9m7063864;
 Wed, 12 Jun 2013 21:41:09 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CLf9ql063863;
 Wed, 12 Jun 2013 21:41:09 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201306122141.r5CLf9ql063863@svn.freebsd.org>
From: Alan Somers 
Date: Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251669 - stable/9/sbin/camcontrol
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 21:41:10 -0000

Author: asomers
Date: Wed Jun 12 21:41:09 2013
New Revision: 251669
URL: http://svnweb.freebsd.org/changeset/base/251669

Log:
  MFC r250662
  
  sbin/camcontrol/camcontrol.c
  	If an expander returns 0x00 (no device attached) in the ATTACHED DEVICE
  	field of the SMP DISCOVER response, ignore the value of ATTACHED SAS
  	ADDRESS, because it is invalid.  Some expanders zero out the address
  	when the attached device is removed, but others do not.  Section
  	9.4.3.10 of the SAS Protocol Layer 2 revision 04b does not require them
  	to do so.
  
  Approved by:	ken (mentor)

Modified:
  stable/9/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 12 21:12:05 2013	(r251668)
+++ stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 12 21:41:09 2013	(r251669)
@@ -7137,8 +7137,12 @@ smpphylist(struct cam_device *device, in
 			continue;
 		}
 
-		item = findsasdevice(&devlist,
-			scsi_8btou64(disresponse->attached_sas_address));
+		if (disresponse->attached_device == SMP_DIS_AD_TYPE_NONE) {
+			item = NULL;
+		} else {
+			item = findsasdevice(&devlist,
+			    scsi_8btou64(disresponse->attached_sas_address));
+		}
 
 		if ((quiet == 0)
 		 || (item != NULL)) {

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 22:19:51 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 46A034F7;
 Wed, 12 Jun 2013 22:19:51 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1E5F21812;
 Wed, 12 Jun 2013 22:19:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CMJorm074741;
 Wed, 12 Jun 2013 22:19:50 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CMJoTR074739;
 Wed, 12 Jun 2013 22:19:50 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201306122219.r5CMJoTR074739@svn.freebsd.org>
From: Alan Somers 
Date: Wed, 12 Jun 2013 22:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251670 - stable/9/sys/dev/mps
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 22:19:51 -0000

Author: asomers
Date: Wed Jun 12 22:19:49 2013
New Revision: 251670
URL: http://svnweb.freebsd.org/changeset/base/251670

Log:
  MFC r251396
  
  sys/dev/mps/mps.c
  sys/dev/mps/mps_user.c
          Fix uninitialized memory reference in mps_read_config_page.  It was
          referencing a field (params->hdr.Ext.ExtPageType) that would only be
          set when reading an Extended config page.  The symptom was that
          MPSIO_READ_CFG_PAGE ioctls would randomly fail with
          MPI2_IOCSTATUS_CONFIG_INVALID_PAGE errors.  The solution is to
          determine whether an extended or an ordinary config page is requested
          by looking at the PageType field, which should be available regardless.
  
          Similarly, mps_user_read_extcfg_header and mps_user_read_extcfg_page,
          which call mps_read_config_page, had to be fixed to always set the
          PageType field.  They were implicitly assuming that
          mps_read_config_page always operated on Extended pages.
  
  Reviewed by:	ken
  Approved by:	ken (mentor)

Modified:
  stable/9/sys/dev/mps/mps.c
  stable/9/sys/dev/mps/mps_user.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mps/mps.c
==============================================================================
--- stable/9/sys/dev/mps/mps.c	Wed Jun 12 21:41:09 2013	(r251669)
+++ stable/9/sys/dev/mps/mps.c	Wed Jun 12 22:19:49 2013	(r251670)
@@ -2409,7 +2409,7 @@ mps_read_config_page(struct mps_softc *s
 	req->SGLFlags = 0;
 	req->ChainOffset = 0;
 	req->PageAddress = params->page_address;
-	if (params->hdr.Ext.ExtPageType != 0) {
+	if (params->hdr.Struct.PageType == MPI2_CONFIG_PAGETYPE_EXTENDED) {
 		MPI2_CONFIG_EXTENDED_PAGE_HEADER *hdr;
 
 		hdr = ¶ms->hdr.Ext;

Modified: stable/9/sys/dev/mps/mps_user.c
==============================================================================
--- stable/9/sys/dev/mps/mps_user.c	Wed Jun 12 21:41:09 2013	(r251669)
+++ stable/9/sys/dev/mps/mps_user.c	Wed Jun 12 22:19:49 2013	(r251670)
@@ -305,6 +305,7 @@ mps_user_read_extcfg_header(struct mps_s
 	hdr = ¶ms.hdr.Ext;
 	params.action = MPI2_CONFIG_ACTION_PAGE_HEADER;
 	hdr->PageVersion = ext_page_req->header.PageVersion;
+	hdr->PageType = MPI2_CONFIG_PAGETYPE_EXTENDED;
 	hdr->ExtPageLength = 0;
 	hdr->PageNumber = ext_page_req->header.PageNumber;
 	hdr->ExtPageType = ext_page_req->header.ExtPageType;
@@ -346,6 +347,7 @@ mps_user_read_extcfg_page(struct mps_sof
 	params.action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT;
 	params.page_address = le32toh(ext_page_req->page_address);
 	hdr->PageVersion = reqhdr->PageVersion;
+	hdr->PageType = MPI2_CONFIG_PAGETYPE_EXTENDED;
 	hdr->PageNumber = reqhdr->PageNumber;
 	hdr->ExtPageType = reqhdr->ExtPageType;
 	hdr->ExtPageLength = reqhdr->ExtPageLength;

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 23:13:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B9C55D9
 for ; Wed, 12 Jun 2013 23:13:41 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 9A5E219B2
 for ; Wed, 12 Jun 2013 23:13:41 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CNDfwO028635
 for ; Wed, 12 Jun 2013 23:13:41 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5CNDfnc028630
 for svn-src-all@freebsd.org; Wed, 12 Jun 2013 23:13:41 GMT
 (envelope-from bdrewery)
Received: (qmail 21707 invoked from network); 12 Jun 2013 18:13:38 -0500
Received: from unknown (HELO ?173.160.118.90?)
 (freebsd@shatow.net@173.160.118.90)
 by sweb.xzibition.com with ESMTPA; 12 Jun 2013 18:13:38 -0500
Message-ID: <51B900A8.4010502@FreeBSD.org>
Date: Wed, 12 Jun 2013 18:13:44 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Dimitry Andric 
Subject: Re: svn commit: r251662 - in head: contrib/llvm/include/llvm
 contrib/llvm/include/llvm-c
 contrib/llvm/include/llvm-c/Transforms contrib/llvm/include/llvm/ADT
 contrib/llvm/include/llvm/Analysis contrib/...
References: <201306121848.r5CImsAQ007439@svn.freebsd.org>
In-Reply-To: <201306121848.r5CImsAQ007439@svn.freebsd.org>
X-Enigmail-Version: 1.5.1
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2QLVEJFSRNVNHIIKFTHBJ"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 23:13:41 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2QLVEJFSRNVNHIIKFTHBJ
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/12/2013 1:48 PM, Dimitry Andric wrote:
> Author: dim
> Date: Wed Jun 12 18:48:53 2013
> New Revision: 251662
> URL: http://svnweb.freebsd.org/changeset/base/251662
>=20
> Log:
>   Upgrade our copy of llvm/clang to 3.3 release.
>  =20
>   Release notes are still in the works, these will follow soon.
>  =20
>   MFC after:	1 month

With make -j16 -DNO_CLEAN buildworld:

> --- ExprConstant.o ---
> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AS=
T/ExprConstant.cpp:2173:26: error: no member named 'note_constexpr_modify=
_const_type' in namespace 'clang::diag'
>       Info.Diag(E, diag::note_constexpr_modify_const_type) << QT;
>                    ~~~~~~^
> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AS=
T/ExprConstant.cpp:2781:42: error: no member named 'note_constexpr_no_ret=
urn' in namespace 'clang::diag'; did you mean 'note_constexpr_nonliteral'=
?
>     Info.Diag(Callee->getLocEnd(), diag::note_constexpr_no_return);
>                                    ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
>                                          note_constexpr_nonliteral
> ./DiagnosticASTKinds.inc.h:51:6: note: 'note_constexpr_nonliteral' decl=
ared here
> DIAG(note_constexpr_nonliteral, CLASS_NOTE, diag::MAP_FATAL, "non-liter=
al type %0 cannot be used in a constant expression", 0, true, false, fals=
e, false, 0)
>      ^
> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/includ=
e/clang/AST/ASTDiagnostic.h:19:63: note: expanded from macro 'DIAG'
>              SFINAE,ACCESS,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,
>                                                               ^
> --- RecordLayout.o ---
> c++  -O2 -pipe -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/i=
nclude -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang=
/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/cla=
ng/lib/AST -I. -I/us
> r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/inclu=
de -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONSTA=
NT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-un=
known-freebsd10.0\" -D
> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -DDEFAULT_SYSROOT=3D\=
"/usr/obj/usr/src/tmp\" -g -I/usr/obj/usr/src/tmp/legacy/usr/include -fno=
-exceptions -fno-rtti -c /usr/src/lib/clang/libclangast/../../../contrib/=
llvm/tools/clang/lib/AST
> /RecordLayout.cpp -o RecordLayout.o
> --- Stmt.o ---
> c++  -O2 -pipe -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/i=
nclude -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang=
/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/cla=
ng/lib/AST -I. -I/us
> r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/inclu=
de -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONSTA=
NT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-un=
known-freebsd10.0\" -D
> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -DDEFAULT_SYSROOT=3D\=
"/usr/obj/usr/src/tmp\" -g -I/usr/obj/usr/src/tmp/legacy/usr/include -fno=
-exceptions -fno-rtti -c /usr/src/lib/clang/libclangast/../../../contrib/=
llvm/tools/clang/lib/AST
> /Stmt.cpp -o Stmt.o
> --- ExprConstant.o ---
> 14 errors generated.
> *** [ExprConstant.o] Error code 1
>=20
> make: stopped in /usr/src/lib/clang/libclangast
> 1 error
>=20
> make: stopped in /usr/src/lib/clang/libclangast
> =3D=3D=3D> lib/clang/libclangbasic (all)


--=20
Regards,
Bryan Drewery


------enig2QLVEJFSRNVNHIIKFTHBJ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRuQCoAAoJEG54KsA8mwz5G/kP+wQ/4p1TSwUvyWyIJjwvW55m
36qA1hmRs9PXoWMCzwPGxXafuWBOO3yqqpzVE6Jes7FERxH0tQfysRkrAPn0Suh/
UKIdmkQ3hucpPiqEs6SGEyshcE0ak4hL7fYg9B8MJeg7D2M1JdwEAVoTfOzDVYDD
2SRwtdnJSsNkFZQzSZmclE3ThT3fMfkX0ie1kmjI8GBNsF6YiUefB35ou79u8oXO
Devvs9+DhxyCDwdeMW4O57VGATshoiVW7zyY+XfJVyjo0pkJrdnCyN/KmvyjcugB
n9+Zy2gxB0nIpWJ12Ryd+R42ZLoQf1F+OlrbucITONUqeTrh3kBYtOXG4XepZrUS
+tRG4jT+tgliQuyWSIcUm74PwSd1yPpbClK78+0Au12CJp9wDHUKLXHcy6VyJA1p
rCcfdeuK4u3Y8+Vkw5KBSNn3MjX4JqZ5vWANLA9Vc73Rh/OJ9NMyFtVH9lC3p5yy
2Iq20VkuyLlGtoYEXrIpM28p3MIWZ29efgA9rMQ/0AMX4c+7Cx4cv1Nka7j6orAh
oOMeQtxHzJZWflTZaPlXgOltLoRzeIQQ02Yw1bCe4grnfWhkw6x62u4Ea/OXYGDV
0y/2TwgaxYFGzaM2HZqVFoH97A3qglOFqh/qps2lAThWuj4NJelalNKmpm9oOQui
/DMzY0LKmcBTRaMIEjI4
=gr6i
-----END PGP SIGNATURE-----

------enig2QLVEJFSRNVNHIIKFTHBJ--

From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 23:13:42 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D7A1DDD;
 Wed, 12 Jun 2013 23:13:42 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C970819B5;
 Wed, 12 Jun 2013 23:13:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CNDgCu092751;
 Wed, 12 Jun 2013 23:13:42 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CNDg9W092750;
 Wed, 12 Jun 2013 23:13:42 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306122313.r5CNDg9W092750@svn.freebsd.org>
From: Rick Macklem 
Date: Wed, 12 Jun 2013 23:13:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251671 - stable/9/sys/nfsclient
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 12 Jun 2013 23:13:42 -0000

Author: rmacklem
Date: Wed Jun 12 23:13:42 2013
New Revision: 251671
URL: http://svnweb.freebsd.org/changeset/base/251671

Log:
  MFC: r251089
  Add a patch analygous to r248567, r248581, r251079 to the
  old NFS client to avoid the panic reported in the PR by
  doing the vnode_pager_setsize() call after unlocking the mutex.

Modified:
  stable/9/sys/nfsclient/nfs_subs.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/nfsclient/nfs_subs.c
==============================================================================
--- stable/9/sys/nfsclient/nfs_subs.c	Wed Jun 12 22:19:49 2013	(r251670)
+++ stable/9/sys/nfsclient/nfs_subs.c	Wed Jun 12 23:13:42 2013	(r251671)
@@ -478,6 +478,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 	struct timespec mtime, mtime_save;
 	int v3 = NFS_ISV3(vp);
 	int error = 0;
+	u_quad_t nsize;
+	int setnsize;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
@@ -580,6 +582,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		vap->va_filerev = 0;
 	}
 	np->n_attrstamp = time_second;
+	setnsize = 0;
+	nsize = 0;
 	if (vap->va_size != np->n_size) {
 		if (vap->va_type == VREG) {
 			if (dontshrink && vap->va_size < np->n_size) {
@@ -606,7 +610,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 				np->n_size = vap->va_size;
 				np->n_flag |= NSIZECHANGED;
 			}
-			vnode_pager_setsize(vp, np->n_size);
+			setnsize = 1;
+			nsize = vap->va_size;
 		} else {
 			np->n_size = vap->va_size;
 		}
@@ -643,6 +648,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, &np->n_vattr, 0);
 #endif
 	mtx_unlock(&np->n_mtx);
+	if (setnsize)
+		vnode_pager_setsize(vp, nsize);
 out:
 #ifdef KDTRACE_HOOKS
 	if (error)

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 00:19:37 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 23EEBDBD;
 Thu, 13 Jun 2013 00:19:37 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3D881C16;
 Thu, 13 Jun 2013 00:19:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D0JaZT012420;
 Thu, 13 Jun 2013 00:19:36 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D0JV0h012382;
 Thu, 13 Jun 2013 00:19:31 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201306130019.r5D0JV0h012382@svn.freebsd.org>
From: Ed Maste 
Date: Thu, 13 Jun 2013 00:19:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251672 - head/lib/libc/stdlib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 00:19:37 -0000

Author: emaste
Date: Thu Jun 13 00:19:30 2013
New Revision: 251672
URL: http://svnweb.freebsd.org/changeset/base/251672

Log:
  Renumber clauses to reduce diffs to other versions
  
  NetBSD, OpenBSD, and Android's Bionic number the clauses 1 through 3,
  so follow suit to make comparison easier.

Modified:
  head/lib/libc/stdlib/labs.3
  head/lib/libc/stdlib/labs.c
  head/lib/libc/stdlib/ldiv.3
  head/lib/libc/stdlib/ldiv.c
  head/lib/libc/stdlib/memory.3
  head/lib/libc/stdlib/merge.c
  head/lib/libc/stdlib/qsort.3
  head/lib/libc/stdlib/qsort.c
  head/lib/libc/stdlib/radixsort.3
  head/lib/libc/stdlib/radixsort.c
  head/lib/libc/stdlib/rand.3
  head/lib/libc/stdlib/rand.c
  head/lib/libc/stdlib/random.3
  head/lib/libc/stdlib/random.c
  head/lib/libc/stdlib/realpath.3
  head/lib/libc/stdlib/strtod.3
  head/lib/libc/stdlib/strtoimax.c
  head/lib/libc/stdlib/strtol.3
  head/lib/libc/stdlib/strtol.c
  head/lib/libc/stdlib/strtoll.c
  head/lib/libc/stdlib/strtoq.c
  head/lib/libc/stdlib/strtoul.3
  head/lib/libc/stdlib/strtoul.c
  head/lib/libc/stdlib/strtoull.c
  head/lib/libc/stdlib/strtoumax.c
  head/lib/libc/stdlib/strtouq.c
  head/lib/libc/stdlib/system.3
  head/lib/libc/stdlib/system.c

Modified: head/lib/libc/stdlib/labs.3
==============================================================================
--- head/lib/libc/stdlib/labs.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/labs.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/labs.c
==============================================================================
--- head/lib/libc/stdlib/labs.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/labs.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/ldiv.3
==============================================================================
--- head/lib/libc/stdlib/ldiv.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/ldiv.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/ldiv.c
==============================================================================
--- head/lib/libc/stdlib/ldiv.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/ldiv.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/memory.3
==============================================================================
--- head/lib/libc/stdlib/memory.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/memory.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/merge.c
==============================================================================
--- head/lib/libc/stdlib/merge.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/merge.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/qsort.3
==============================================================================
--- head/lib/libc/stdlib/qsort.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/qsort.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/qsort.c
==============================================================================
--- head/lib/libc/stdlib/qsort.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/qsort.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/radixsort.3
==============================================================================
--- head/lib/libc/stdlib/radixsort.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/radixsort.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/radixsort.c
==============================================================================
--- head/lib/libc/stdlib/radixsort.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/radixsort.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/rand.3
==============================================================================
--- head/lib/libc/stdlib/rand.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/rand.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/rand.c
==============================================================================
--- head/lib/libc/stdlib/rand.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/rand.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/random.3
==============================================================================
--- head/lib/libc/stdlib/random.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/random.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/random.c
==============================================================================
--- head/lib/libc/stdlib/random.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/random.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/realpath.3
==============================================================================
--- head/lib/libc/stdlib/realpath.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/realpath.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -12,7 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/strtod.3
==============================================================================
--- head/lib/libc/stdlib/strtod.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtod.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/strtoimax.c
==============================================================================
--- head/lib/libc/stdlib/strtoimax.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoimax.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtol.3
==============================================================================
--- head/lib/libc/stdlib/strtol.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtol.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/strtol.c
==============================================================================
--- head/lib/libc/stdlib/strtol.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtol.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtoll.c
==============================================================================
--- head/lib/libc/stdlib/strtoll.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoll.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtoq.c
==============================================================================
--- head/lib/libc/stdlib/strtoq.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoq.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtoul.3
==============================================================================
--- head/lib/libc/stdlib/strtoul.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoul.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/strtoul.c
==============================================================================
--- head/lib/libc/stdlib/strtoul.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoul.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtoull.c
==============================================================================
--- head/lib/libc/stdlib/strtoull.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoull.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtoumax.c
==============================================================================
--- head/lib/libc/stdlib/strtoumax.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtoumax.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/strtouq.c
==============================================================================
--- head/lib/libc/stdlib/strtouq.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/strtouq.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/lib/libc/stdlib/system.3
==============================================================================
--- head/lib/libc/stdlib/system.3	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/system.3	Thu Jun 13 00:19:30 2013	(r251672)
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

Modified: head/lib/libc/stdlib/system.c
==============================================================================
--- head/lib/libc/stdlib/system.c	Wed Jun 12 23:13:42 2013	(r251671)
+++ head/lib/libc/stdlib/system.c	Thu Jun 13 00:19:30 2013	(r251672)
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 01:29:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A8761C49;
 Thu, 13 Jun 2013 01:29:54 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 81AF31F0F;
 Thu, 13 Jun 2013 01:29:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D1Ts9V034477;
 Thu, 13 Jun 2013 01:29:54 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D1Ts7d034476;
 Thu, 13 Jun 2013 01:29:54 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201306130129.r5D1Ts7d034476@svn.freebsd.org>
From: Kevin Lo 
Date: Thu, 13 Jun 2013 01:29:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251673 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 01:29:54 -0000

Author: kevlo
Date: Thu Jun 13 01:29:54 2013
New Revision: 251673
URL: http://svnweb.freebsd.org/changeset/base/251673

Log:
  Add PF_IEEE80211 definition.
  
  Reviewed by:	rpaulo

Modified:
  head/sys/sys/socket.h

Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h	Thu Jun 13 00:19:30 2013	(r251672)
+++ head/sys/sys/socket.h	Thu Jun 13 01:29:54 2013	(r251673)
@@ -352,6 +352,7 @@ struct sockproto {
 #define PF_SCLUSTER	AF_SCLUSTER
 #define	PF_ARP		AF_ARP
 #define	PF_BLUETOOTH	AF_BLUETOOTH
+#define	PF_IEEE80211	AF_IEEE80211
 
 #define	PF_MAX		AF_MAX
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 01:33:01 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E525EE60;
 Thu, 13 Jun 2013 01:33:01 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D82E91F6C;
 Thu, 13 Jun 2013 01:33:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D1X1sI036667;
 Thu, 13 Jun 2013 01:33:01 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D1X1OX036666;
 Thu, 13 Jun 2013 01:33:01 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201306130133.r5D1X1OX036666@svn.freebsd.org>
From: Kevin Lo 
Date: Thu, 13 Jun 2013 01:33:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251674 - head/sys/dev/usb/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 01:33:02 -0000

Author: kevlo
Date: Thu Jun 13 01:33:01 2013
New Revision: 251674
URL: http://svnweb.freebsd.org/changeset/base/251674

Log:
  Fix a typo: s/KLSI/CATC/

Modified:
  head/sys/dev/usb/net/if_cuereg.h

Modified: head/sys/dev/usb/net/if_cuereg.h
==============================================================================
--- head/sys/dev/usb/net/if_cuereg.h	Thu Jun 13 01:29:54 2013	(r251673)
+++ head/sys/dev/usb/net/if_cuereg.h	Thu Jun 13 01:33:01 2013	(r251674)
@@ -111,7 +111,7 @@
 #define	CUE_CONFIG_IDX		0	/* config number 1 */
 #define	CUE_IFACE_IDX		0
 
-/* The interrupt endpoint is currently unused by the KLSI part. */
+/* The interrupt endpoint is currently unused by the CATC part. */
 enum {
 	CUE_BULK_DT_WR,
 	CUE_BULK_DT_RD,

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 02:19:53 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A70364AC;
 Thu, 13 Jun 2013 02:19:53 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 98BA31119;
 Thu, 13 Jun 2013 02:19:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D2Jr3S050383;
 Thu, 13 Jun 2013 02:19:53 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D2Jr7M050382;
 Thu, 13 Jun 2013 02:19:53 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306130219.r5D2Jr7M050382@svn.freebsd.org>
From: Adrian Chadd 
Date: Thu, 13 Jun 2013 02:19:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251675 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 02:19:53 -0000

Author: adrian
Date: Thu Jun 13 02:19:53 2013
New Revision: 251675
URL: http://svnweb.freebsd.org/changeset/base/251675

Log:
  Return HAL_ANT_VARIABLE for now, until it's unstubbed.
  
  This is needed by the slow antenna diversity logic for the AR9485/AR9462
  as it's only engaged if the TX diveristy is set to VARIABLE.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c	Thu Jun 13 01:33:01 2013	(r251674)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c	Thu Jun 13 02:19:53 2013	(r251675)
@@ -431,7 +431,7 @@ ar9300_Stub_GetAntennaSwitch(struct ath_
 {
 
 	ath_hal_printf(ah, "%s: called\n", __func__);
-	return (HAL_ANTENNA_FIXED_A);
+	return (HAL_ANT_VARIABLE);
 }
 
 HAL_BOOL

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 02:20:46 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1A59062A;
 Thu, 13 Jun 2013 02:20:46 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0D35E1123;
 Thu, 13 Jun 2013 02:20:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D2KjOe052154;
 Thu, 13 Jun 2013 02:20:45 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D2KjDl052153;
 Thu, 13 Jun 2013 02:20:45 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306130220.r5D2KjDl052153@svn.freebsd.org>
From: Adrian Chadd 
Date: Thu, 13 Jun 2013 02:20:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251676 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 02:20:46 -0000

Author: adrian
Date: Thu Jun 13 02:20:45 2013
New Revision: 251676
URL: http://svnweb.freebsd.org/changeset/base/251676

Log:
  Set the FreeBSD capability bit to indicate that LNA diversity is enabled.
  
  This is true for the AR9485 and AR933x SoC.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Thu Jun 13 02:19:53 2013	(r251675)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Thu Jun 13 02:20:45 2013	(r251676)
@@ -2916,6 +2916,13 @@ ar9300_fill_capability_info(struct ath_h
     }
 #endif /* ATH_ANT_DIV_COMB */
 
+    /*
+     * FreeBSD: enable LNA mixing if the chip is Hornet or Poseidon.
+     */
+    if (AR_SREV_HORNET(ah) || AR_SREV_POSEIDON_11_OR_LATER(ah)) {
+        p_cap->halRxUsingLnaMixing = AH_TRUE;
+    }
+
 
 #if ATH_WOW_OFFLOAD
     if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 03:23:25 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B52C7E7E;
 Thu, 13 Jun 2013 03:23:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E2B3145B;
 Thu, 13 Jun 2013 03:23:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D3NPkq072307;
 Thu, 13 Jun 2013 03:23:25 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D3NPfF072301;
 Thu, 13 Jun 2013 03:23:25 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306130323.r5D3NPfF072301@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Thu, 13 Jun 2013 03:23:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251677 - head/sys/fs/ext2fs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 03:23:25 -0000

Author: pfg
Date: Thu Jun 13 03:23:24 2013
New Revision: 251677
URL: http://svnweb.freebsd.org/changeset/base/251677

Log:
  Relax some unnecessary unsigned type changes in ext2fs.
  
  While the changes in r245820 are in line with the ext2 spec,
  the code derived from UFS can use negative values so it is
  better to relax some types to keep them as they were, and
  somewhat more similar to UFS. While here clean some casts.
  
  Some of the original types are still wrong and will require
  more work.
  
  Discussed with:	bde
  MFC after:	3 days

Modified:
  head/sys/fs/ext2fs/ext2_alloc.c
  head/sys/fs/ext2fs/ext2_balloc.c

Modified: head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_alloc.c	Thu Jun 13 02:20:45 2013	(r251676)
+++ head/sys/fs/ext2fs/ext2_alloc.c	Thu Jun 13 03:23:24 2013	(r251677)
@@ -223,7 +223,7 @@ ext2_reallocblks(struct vop_reallocblks_
 			brelse(sbp);
 			return (ENOSPC);
 		}
-		sbap = (int32_t *)sbp->b_data;
+		sbap = (u_int *)sbp->b_data;
 		soff = idp->in_off;
 	}
 	/*
@@ -239,7 +239,7 @@ ext2_reallocblks(struct vop_reallocblks_
 		ssize = len - (idp->in_off + 1);
 		if (bread(vp, idp->in_lbn, (int)fs->e2fs_bsize, NOCRED, &ebp))
 			goto fail;
-		ebap = (int32_t *)ebp->b_data;
+		ebap = (u_int *)ebp->b_data;
 	}
 	/*
 	 * Find the preferred location for the cluster.
@@ -442,10 +442,10 @@ ext2_dirpref(struct inode *pip)
 {
 	struct m_ext2fs *fs;
         int cg, prefcg, dirsize, cgsize;
-	int avgifree, avgbfree, avgndir, curdirsize;
-	int minifree, minbfree, maxndir;
-	int mincg, minndir;
-	int maxcontigdirs;
+	u_int avgifree, avgbfree, avgndir, curdirsize;
+	u_int minifree, minbfree, maxndir;
+	u_int mincg, minndir;
+	u_int maxcontigdirs;
 
 	mtx_assert(EXT2_MTX(pip->i_ump), MA_OWNED);
 	fs = pip->i_e2fs;

Modified: head/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_balloc.c	Thu Jun 13 02:20:45 2013	(r251676)
+++ head/sys/fs/ext2fs/ext2_balloc.c	Thu Jun 13 03:23:24 2013	(r251677)
@@ -60,11 +60,11 @@ ext2_balloc(struct inode *ip, int32_t lb
 {
 	struct m_ext2fs *fs;
 	struct ext2mount *ump;
-	int32_t nb;
 	struct buf *bp, *nbp;
 	struct vnode *vp = ITOV(ip);
 	struct indir indirs[NIADDR + 2];
-	uint32_t newb, *bap, pref;
+	uint32_t nb, newb;
+	int32_t *bap, pref;
 	int osize, nsize, num, i, error;
 
 	*bpp = NULL;
@@ -165,8 +165,8 @@ ext2_balloc(struct inode *ip, int32_t lb
 		EXT2_LOCK(ump);
 		pref = ext2_blkpref(ip, lbn, indirs[0].in_off + 
 					     EXT2_NDIR_BLOCKS, &ip->i_db[0], 0);
-	        if ((error = ext2_alloc(ip, lbn, pref, 
-			(int)fs->e2fs_bsize, cred, &newb)))
+	        if ((error = ext2_alloc(ip, lbn, pref, fs->e2fs_bsize, cred,
+			&newb)))
 			return (error);
 		nb = newb;
 		bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0);

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 04:11:22 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F0F6A39A;
 Thu, 13 Jun 2013 04:11:21 +0000 (UTC)
 (envelope-from grog@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E370316BC;
 Thu, 13 Jun 2013 04:11:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D4BL3o087575;
 Thu, 13 Jun 2013 04:11:21 GMT (envelope-from grog@svn.freebsd.org)
Received: (from grog@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D4BLuZ087574;
 Thu, 13 Jun 2013 04:11:21 GMT (envelope-from grog@svn.freebsd.org)
Message-Id: <201306130411.r5D4BLuZ087574@svn.freebsd.org>
From: Greg Lehey 
Date: Thu, 13 Jun 2013 04:11:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251678 - head/usr.bin/calendar
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 04:11:22 -0000

Author: grog
Date: Thu Jun 13 04:11:21 2013
New Revision: 251678
URL: http://svnweb.freebsd.org/changeset/base/251678

Log:
  Revert revision 251648.  style(9) requires an empty line here.
  
  Reported by:	mdf@

Modified:
  head/usr.bin/calendar/calendar.c

Modified: head/usr.bin/calendar/calendar.c
==============================================================================
--- head/usr.bin/calendar/calendar.c	Thu Jun 13 03:23:24 2013	(r251677)
+++ head/usr.bin/calendar/calendar.c	Thu Jun 13 04:11:21 2013	(r251678)
@@ -218,6 +218,7 @@ main(int argc, char *argv[])
 static void __dead2
 usage(void)
 {
+
 	fprintf(stderr, "%s\n%s\n%s\n",
 	    "usage: calendar [-A days] [-a] [-B days] [-D sun|moon] [-d]",
 	    "		     [-F friday] [-f calendarfile] [-l longitude]",

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 05:46:20 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 51176AE3;
 Thu, 13 Jun 2013 05:46:20 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 440DA1970;
 Thu, 13 Jun 2013 05:46:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D5kJ1O015114;
 Thu, 13 Jun 2013 05:46:19 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D5kJxC015109;
 Thu, 13 Jun 2013 05:46:19 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201306130546.r5D5kJxC015109@svn.freebsd.org>
From: Kevin Lo 
Date: Thu, 13 Jun 2013 05:46:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251679 - head/sys/dev/usb/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 05:46:20 -0000

Author: kevlo
Date: Thu Jun 13 05:46:19 2013
New Revision: 251679
URL: http://svnweb.freebsd.org/changeset/base/251679

Log:
  Remove unused variable sc_tx_bufsz.
  The variable is initialized but not used.
  
  Reviewed by:	yongari

Modified:
  head/sys/dev/usb/net/if_axe.c
  head/sys/dev/usb/net/if_axereg.h

Modified: head/sys/dev/usb/net/if_axe.c
==============================================================================
--- head/sys/dev/usb/net/if_axe.c	Thu Jun 13 04:11:21 2013	(r251678)
+++ head/sys/dev/usb/net/if_axe.c	Thu Jun 13 05:46:19 2013	(r251679)
@@ -833,19 +833,15 @@ axe_attach_post(struct usb_ether *ue)
 	/* Initialize controller and get station address. */
 	if (sc->sc_flags & AXE_FLAG_178) {
 		axe_ax88178_init(sc);
-		sc->sc_tx_bufsz = 16 * 1024;
 		axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, ue->ue_eaddr);
 	} else if (sc->sc_flags & AXE_FLAG_772) {
 		axe_ax88772_init(sc);
-		sc->sc_tx_bufsz = 8 * 1024;
 		axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, ue->ue_eaddr);
 	} else if (sc->sc_flags & AXE_FLAG_772A) {
 		axe_ax88772a_init(sc);
-		sc->sc_tx_bufsz = 8 * 1024;
 		axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, ue->ue_eaddr);
 	} else if (sc->sc_flags & AXE_FLAG_772B) {
 		axe_ax88772b_init(sc);
-		sc->sc_tx_bufsz = 8 * 1024;
 	} else
 		axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, ue->ue_eaddr);
 

Modified: head/sys/dev/usb/net/if_axereg.h
==============================================================================
--- head/sys/dev/usb/net/if_axereg.h	Thu Jun 13 04:11:21 2013	(r251678)
+++ head/sys/dev/usb/net/if_axereg.h	Thu Jun 13 05:46:19 2013	(r251679)
@@ -349,7 +349,6 @@ struct axe_softc {
 	uint8_t			sc_phyaddrs[2];
 	uint16_t		sc_pwrcfg;
 	uint16_t		sc_lenmask;
-	int			sc_tx_bufsz;
 };
 
 #define	AXE_IS_178_FAMILY(sc)						  \

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 05:52:00 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 554B9CE1;
 Thu, 13 Jun 2013 05:52:00 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 45EF4198C;
 Thu, 13 Jun 2013 05:52:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D5q0iR017542;
 Thu, 13 Jun 2013 05:52:00 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D5q0vP017541;
 Thu, 13 Jun 2013 05:52:00 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201306130552.r5D5q0vP017541@svn.freebsd.org>
From: Hiroki Sato 
Date: Thu, 13 Jun 2013 05:52:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251680 - stable/8/release/doc/en_US.ISO8859-1/errata
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 05:52:00 -0000

Author: hrs
Date: Thu Jun 13 05:51:59 2013
New Revision: 251680
URL: http://svnweb.freebsd.org/changeset/base/251680

Log:
  Document an issue in vtnet(4) + QEMU 1.4.1 or later.

Modified:
  stable/8/release/doc/en_US.ISO8859-1/errata/article.xml

Modified: stable/8/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- stable/8/release/doc/en_US.ISO8859-1/errata/article.xml	Thu Jun 13 05:46:19 2013	(r251679)
+++ stable/8/release/doc/en_US.ISO8859-1/errata/article.xml	Thu Jun 13 05:51:59 2013	(r251680)
@@ -206,6 +206,16 @@
   
     Open Issues
 
+    [20130613] The &man.vtnet.4; network interface driver
+      displays the following message upon configuration when using
+      QEMU 1.4.1 and later:
+
+    vtnet0: error setting host MAC filter table
+
+    This message is harmless when the interface has only one MAC
+      address.  The patch for this issue is filed to a PR kern/178955.
+
     [20130609] There is incompatibility in &man.jail.8;
       configuration because the &man.jail.8; utility and
       rc.d/jail script has been changed.  More

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 05:58:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D8CB522E;
 Thu, 13 Jun 2013 05:58:52 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com [87.251.56.140])
 by mx1.freebsd.org (Postfix) with ESMTP id 6268419BE;
 Thu, 13 Jun 2013 05:58:52 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7::95a6:c7e2:a19c:e275] (unknown
 [IPv6:2001:7b8:3a7:0:95a6:c7e2:a19c:e275])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id 527FF5C44;
 Thu, 13 Jun 2013 07:58:50 +0200 (CEST)
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r251662 - in head: contrib/llvm/include/llvm
 contrib/llvm/include/llvm-c contrib/llvm/include/llvm-c/Transforms
 contrib/llvm/include/llvm/ADT contrib/llvm/include/llvm/Analysis contrib/...
From: Dimitry Andric 
In-Reply-To: <51B900A8.4010502@FreeBSD.org>
Date: Thu, 13 Jun 2013 07:58:50 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <462BF646-FB74-4510-B09D-8132BBCB17EB@FreeBSD.org>
References: <201306121848.r5CImsAQ007439@svn.freebsd.org>
 <51B900A8.4010502@FreeBSD.org>
To: Bryan Drewery 
X-Mailer: Apple Mail (2.1508)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 05:58:52 -0000

On Jun 13, 2013, at 01:13, Bryan Drewery  wrote:
> On 6/12/2013 1:48 PM, Dimitry Andric wrote:
>> Author: dim
>> Date: Wed Jun 12 18:48:53 2013
>> New Revision: 251662
>> URL: http://svnweb.freebsd.org/changeset/base/251662
>>=20
>> Log:
>>  Upgrade our copy of llvm/clang to 3.3 release.
>>=20
>>  Release notes are still in the works, these will follow soon.
>>=20
>>  MFC after:	1 month
>=20
> With make -j16 -DNO_CLEAN buildworld:
>=20
>> --- ExprConstant.o ---
>> =
/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST/E=
xprConstant.cpp:2173:26: error: no member named =
'note_constexpr_modify_const_type' in namespace 'clang::diag'
>>      Info.Diag(E, diag::note_constexpr_modify_const_type) << QT;
>>                   ~~~~~~^
>> =
/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST/E=
xprConstant.cpp:2781:42: error: no member named =
'note_constexpr_no_return' in namespace 'clang::diag'; did you mean =
'note_constexpr_nonliteral'?
>>    Info.Diag(Callee->getLocEnd(), diag::note_constexpr_no_return);
>>                                   ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
>>                                         note_constexpr_nonliteral
>> ./DiagnosticASTKinds.inc.h:51:6: note: 'note_constexpr_nonliteral' =
declared here
>> DIAG(note_constexpr_nonliteral, CLASS_NOTE, diag::MAP_FATAL, =
"non-literal type %0 cannot be used in a constant expression", 0, true, =
false, false, false, 0)
>>     ^
>> =
/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/include/c=
lang/AST/ASTDiagnostic.h:19:63: note: expanded from macro 'DIAG'
>>             SFINAE,ACCESS,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,
>>                                                              ^
>> --- RecordLayout.o ---
>> c++  -O2 -pipe =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/include =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/include=
 =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST=
 -I. -I/us
>> =
r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/include =
-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS =
-D__STDC_CONSTANT_MACROS -fno-strict-aliasing =
-DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -D
>> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" =
-DDEFAULT_SYSROOT=3D\"/usr/obj/usr/src/tmp\" -g =
-I/usr/obj/usr/src/tmp/legacy/usr/include -fno-exceptions -fno-rtti -c =
/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST
>> /RecordLayout.cpp -o RecordLayout.o
>> --- Stmt.o ---
>> c++  -O2 -pipe =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/include =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/include=
 =
-I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST=
 -I. -I/us
>> =
r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/include =
-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS =
-D__STDC_CONSTANT_MACROS -fno-strict-aliasing =
-DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -D
>> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" =
-DDEFAULT_SYSROOT=3D\"/usr/obj/usr/src/tmp\" -g =
-I/usr/obj/usr/src/tmp/legacy/usr/include -fno-exceptions -fno-rtti -c =
/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST
>> /Stmt.cpp -o Stmt.o
>> --- ExprConstant.o ---
>> 14 errors generated.
>> *** [ExprConstant.o] Error code 1

Can you please try a clean build?


From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 06:07:20 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2E26D456;
 Thu, 13 Jun 2013 06:07:20 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 206751A07;
 Thu, 13 Jun 2013 06:07:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D67KD5021874;
 Thu, 13 Jun 2013 06:07:20 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D67J1G021873;
 Thu, 13 Jun 2013 06:07:19 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201306130607.r5D67J1G021873@svn.freebsd.org>
From: Gleb Smirnoff 
Date: Thu, 13 Jun 2013 06:07:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251681 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 06:07:20 -0000

Author: glebius
Date: Thu Jun 13 06:07:19 2013
New Revision: 251681
URL: http://svnweb.freebsd.org/changeset/base/251681

Log:
  Improve locking strategy between keys hash and ID hash.
  
  Before this change state creating sequence was:
  
  1) lock wire key hash
  2) link state's wire key
  3) unlock wire key hash
  4) lock stack key hash
  5) link state's stack key
  6) unlock stack key hash
  7) lock ID hash
  8) link into ID hash
  9) unlock ID hash
  
  What could happen here is that other thread finds the state via key
  hash lookup after 6), locks ID hash and does some processing of the
  state. When the thread creating state unblocks, it finds the state
  it was inserting already non-virgin.
  
  Now we perform proper interlocking between key hash locks and ID hash
  lock:
  
  1) lock wire & stack hashes
  2) link state's keys
  3) lock ID hash
  4) unlock wire & stack hashes
  5) link into ID hash
  6) unlock ID hash
  
  To achieve that, the following hacking was performed in pf_state_key_attach():
  
  - Key hash mutex is marked with MTX_DUPOK.
  - To avoid deadlock on 2 key hash mutexes, we lock them in order determined
    by their address value.
  - pf_state_key_attach() had a magic to reuse a > FIN_WAIT_2 state. It unlinked
    the conflicting state synchronously. In theory this could require locking
    a third key hash, which we can't do now.
    Now we do not remove the state immediately, instead we leave this task to
    the purge thread. To avoid conflicts in a short period before state is
    purged, we push to the very end of the TAILQ.
  - On success, before dropping key hash locks, pf_state_key_attach() locks
    ID hash and returns.
  
  Tested by:	Ian FREISLICH 

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Thu Jun 13 05:51:59 2013	(r251680)
+++ head/sys/netpfil/pf/pf.c	Thu Jun 13 06:07:19 2013	(r251681)
@@ -724,7 +724,7 @@ pf_initialize()
 	V_pf_hashmask = V_pf_hashsize - 1;
 	for (i = 0, kh = V_pf_keyhash, ih = V_pf_idhash; i <= V_pf_hashmask;
 	    i++, kh++, ih++) {
-		mtx_init(&kh->lock, "pf_keyhash", NULL, MTX_DEF);
+		mtx_init(&kh->lock, "pf_keyhash", NULL, MTX_DEF | MTX_DUPOK);
 		mtx_init(&ih->lock, "pf_idhash", NULL, MTX_DEF);
 	}
 
@@ -851,7 +851,7 @@ static int
 pf_state_key_attach(struct pf_state_key *skw, struct pf_state_key *sks,
     struct pf_state *s)
 {
-	struct pf_keyhash	*kh;
+	struct pf_keyhash	*khs, *khw, *kh;
 	struct pf_state_key	*sk, *cur;
 	struct pf_state		*si, *olds = NULL;
 	int idx;
@@ -861,15 +861,47 @@ pf_state_key_attach(struct pf_state_key 
 	KASSERT(s->key[PF_SK_STACK] == NULL, ("%s: state has key", __func__));
 
 	/*
+	 * We need to lock hash slots of both keys. To avoid deadlock
+	 * we always lock the slot with lower address first. Unlock order
+	 * isn't important.
+	 *
+	 * We also need to lock ID hash slot before dropping key
+	 * locks. On success we return with ID hash slot locked.
+	 */
+
+	if (skw == sks) {
+		khs = khw = &V_pf_keyhash[pf_hashkey(skw)];
+		PF_HASHROW_LOCK(khs);
+	} else {
+		khs = &V_pf_keyhash[pf_hashkey(sks)];
+		khw = &V_pf_keyhash[pf_hashkey(skw)];
+		if (khs == khw) {
+			PF_HASHROW_LOCK(khs);
+		} else if (khs < khw) {
+			PF_HASHROW_LOCK(khs);
+			PF_HASHROW_LOCK(khw);
+		} else {
+			PF_HASHROW_LOCK(khw);
+			PF_HASHROW_LOCK(khs);
+		}
+	}
+
+#define	KEYS_UNLOCK()	do {			\
+	if (khs != khw) {			\
+		PF_HASHROW_UNLOCK(khs);		\
+		PF_HASHROW_UNLOCK(khw);		\
+	} else					\
+		PF_HASHROW_UNLOCK(khs);		\
+} while (0)
+
+	/*
 	 * First run: start with wire key.
 	 */
 	sk = skw;
+	kh = khw;
 	idx = PF_SK_WIRE;
 
 keyattach:
-	kh = &V_pf_keyhash[pf_hashkey(sk)];
-
-	PF_HASHROW_LOCK(kh);
 	LIST_FOREACH(cur, &kh->keys, entry)
 		if (bcmp(cur, sk, sizeof(struct pf_state_key_cmp)) == 0)
 			break;
@@ -885,10 +917,20 @@ keyattach:
 				if (sk->proto == IPPROTO_TCP &&
 				    si->src.state >= TCPS_FIN_WAIT_2 &&
 				    si->dst.state >= TCPS_FIN_WAIT_2) {
+					/*
+					 * New state matches an old >FIN_WAIT_2
+					 * state. We can't drop key hash locks,
+					 * thus we can't unlink it properly.
+					 *
+					 * As a workaround we drop it into
+					 * TCPS_CLOSED state, schedule purge
+					 * ASAP and push it into the very end
+					 * of the slot TAILQ, so that it won't
+					 * conflict with our new state.
+					 */
 					si->src.state = si->dst.state =
 					    TCPS_CLOSED;
-					/* Unlink later or cur can go away. */
-					pf_ref_state(si);
+					si->timeout = PFTM_PURGE;
 					olds = si;
 				} else {
 					if (V_pf_status.debug >= PF_DEBUG_MISC) {
@@ -911,7 +953,7 @@ keyattach:
 						printf("\n");
 					}
 					PF_HASHROW_UNLOCK(ih);
-					PF_HASHROW_UNLOCK(kh);
+					KEYS_UNLOCK();
 					uma_zfree(V_pf_state_key_z, sk);
 					if (idx == PF_SK_STACK)
 						pf_detach_state(s);
@@ -934,6 +976,13 @@ stateattach:
 	else
 		TAILQ_INSERT_HEAD(&s->key[idx]->states[idx], s, key_list[idx]);
 
+	if (olds) {
+		TAILQ_REMOVE(&s->key[idx]->states[idx], olds, key_list[idx]);
+		TAILQ_INSERT_TAIL(&s->key[idx]->states[idx], olds,
+		    key_list[idx]);
+		olds = NULL;
+	}
+
 	/*
 	 * Attach done. See how should we (or should not?)
 	 * attach a second key.
@@ -944,31 +993,24 @@ stateattach:
 		sks = NULL;
 		goto stateattach;
 	} else if (sks != NULL) {
-		PF_HASHROW_UNLOCK(kh);
-		if (olds) {
-			pf_unlink_state(olds, 0);
-			pf_release_state(olds);
-			olds = NULL;
-		}
 		/*
 		 * Continue attaching with stack key.
 		 */
 		sk = sks;
+		kh = khs;
 		idx = PF_SK_STACK;
 		sks = NULL;
 		goto keyattach;
-	} else
-		PF_HASHROW_UNLOCK(kh);
-
-	if (olds) {
-		pf_unlink_state(olds, 0);
-		pf_release_state(olds);
 	}
 
+	PF_STATE_LOCK(s);
+	KEYS_UNLOCK();
+
 	KASSERT(s->key[PF_SK_WIRE] != NULL && s->key[PF_SK_STACK] != NULL,
 	    ("%s failure", __func__));
 
 	return (0);
+#undef	KEYS_UNLOCK
 }
 
 static void
@@ -1091,11 +1133,12 @@ pf_state_insert(struct pfi_kif *kif, str
 		s->creatorid = V_pf_status.hostid;
 	}
 
+	/* Returns with ID locked on success. */
 	if ((error = pf_state_key_attach(skw, sks, s)) != 0)
 		return (error);
 
 	ih = &V_pf_idhash[PF_IDHASH(s)];
-	PF_HASHROW_LOCK(ih);
+	PF_HASHROW_ASSERT(ih);
 	LIST_FOREACH(cur, &ih->states, entry)
 		if (cur->id == s->id && cur->creatorid == s->creatorid)
 			break;

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 06:17:34 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 756E198A;
 Thu, 13 Jun 2013 06:17:34 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id 016091A51;
 Thu, 13 Jun 2013 06:17:33 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id r5D6HVXB019518;
 Thu, 13 Jun 2013 10:17:31 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id r5D6HV1N019517;
 Thu, 13 Jun 2013 10:17:31 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Thu, 13 Jun 2013 10:17:31 +0400
From: Gleb Smirnoff 
To: Greg Lehey 
Subject: Re: svn commit: r251678 - head/usr.bin/calendar
Message-ID: <20130613061731.GH12443@FreeBSD.org>
References: <201306130411.r5D4BLuZ087574@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <201306130411.r5D4BLuZ087574@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 06:17:34 -0000

  Greg,

On Thu, Jun 13, 2013 at 04:11:21AM +0000, Greg Lehey wrote:
G> Author: grog
G> Date: Thu Jun 13 04:11:21 2013
G> New Revision: 251678
G> URL: http://svnweb.freebsd.org/changeset/base/251678
G> 
G> Log:
G>   Revert revision 251648.  style(9) requires an empty line here.

I am also a bit concerned that r251647 made calendar(1) dependant on
gcc, while the latter is planned to be removed in forseeable future.

Have you seen this patch?

http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/178463

-- 
Totus tuus, Glebius.

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 08:07:43 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1635A35E;
 Thu, 13 Jun 2013 08:07:43 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 083E01E9D;
 Thu, 13 Jun 2013 08:07:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D87grS060016;
 Thu, 13 Jun 2013 08:07:42 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D87gjj060015;
 Thu, 13 Jun 2013 08:07:42 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306130807.r5D87gjj060015@svn.freebsd.org>
From: Lawrence Stewart 
Date: Thu, 13 Jun 2013 08:07:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251682 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 08:07:43 -0000

Author: lstewart
Date: Thu Jun 13 08:07:42 2013
New Revision: 251682
URL: http://svnweb.freebsd.org/changeset/base/251682

Log:
  Remove some duplicate code by making KHELP_DECLARE_MOD() a wrapper around
  KHELP_DECLARE_MOD_UMA().
  
  MFC after:	3 days

Modified:
  head/sys/sys/module_khelp.h

Modified: head/sys/sys/module_khelp.h
==============================================================================
--- head/sys/sys/module_khelp.h	Thu Jun 13 06:07:19 2013	(r251681)
+++ head/sys/sys/module_khelp.h	Thu Jun 13 08:07:42 2013	(r251682)
@@ -70,22 +70,6 @@ struct khelp_modevent_data {
 	uma_dtor		umadtor;
 };
 
-#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
-	static struct khelp_modevent_data kmd_##hname = {		\
-		.name = #hname,						\
-		.helper = hdata						\
-		.hooks = hhooks,					\
-		.nhooks = sizeof(hhooks) / sizeof(hhooks[0]),		\
-	};								\
-	static moduledata_t h_##hname = {				\
-		.name = #hname,						\
-		.evhand = khelp_modevent,				\
-		.priv = &kmd_##hname					\
-	};								\
-	DECLARE_MODULE(hname, h_##hname, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-	    SI_ORDER_ANY);						\
-	MODULE_VERSION(hname, version)
-
 #define	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, size, ctor, dtor) \
 	static struct khelp_modevent_data kmd_##hname = {		\
 		.name = #hname,						\
@@ -105,6 +89,9 @@ struct khelp_modevent_data {
 	    SI_ORDER_ANY);						\
 	MODULE_VERSION(hname, version)
 
+#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
+	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, 0, NULL, NULL)
+
 int	khelp_modevent(module_t mod, int type, void *data);
 
 #endif /* _SYS_MODULE_KHELP_H_ */

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 08:34:23 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ED42DCD6;
 Thu, 13 Jun 2013 08:34:23 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E057F1F96;
 Thu, 13 Jun 2013 08:34:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D8YNv4068965;
 Thu, 13 Jun 2013 08:34:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D8YNoP068963;
 Thu, 13 Jun 2013 08:34:23 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306130834.r5D8YNoP068963@svn.freebsd.org>
From: Alexander Motin 
Date: Thu, 13 Jun 2013 08:34:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251683 - in head/sys/cam: ata scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 08:34:24 -0000

Author: mav
Date: Thu Jun 13 08:34:23 2013
New Revision: 251683
URL: http://svnweb.freebsd.org/changeset/base/251683

Log:
  Revert r251649:
  ken@ noticed that with recently added d_gone() disk method GEOM already
  holds reference on the periph, so we don't need another one.

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Thu Jun 13 08:07:42 2013	(r251682)
+++ head/sys/cam/ata/ata_da.c	Thu Jun 13 08:34:23 2013	(r251683)
@@ -1080,13 +1080,10 @@ adagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
-	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
-		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
-	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu Jun 13 08:07:42 2013	(r251682)
+++ head/sys/cam/scsi/scsi_da.c	Thu Jun 13 08:34:23 2013	(r251683)
@@ -1427,13 +1427,10 @@ dagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
-	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
-		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
-	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 09:33:22 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A1218989;
 Thu, 13 Jun 2013 09:33:22 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 93DC9123D;
 Thu, 13 Jun 2013 09:33:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D9XMbq087892;
 Thu, 13 Jun 2013 09:33:22 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D9XM4j087891;
 Thu, 13 Jun 2013 09:33:22 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201306130933.r5D9XM4j087891@svn.freebsd.org>
From: Konstantin Belousov 
Date: Thu, 13 Jun 2013 09:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251684 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 09:33:22 -0000

Author: kib
Date: Thu Jun 13 09:33:22 2013
New Revision: 251684
URL: http://svnweb.freebsd.org/changeset/base/251684

Log:
  Fix two issues with the spin loops in the umtx(2) implementation.
  
  - When looping, check for the pending suspension.  Otherwise, other
    usermode thread which races with the looping one, could try to
    prevent the process from stopping or exiting.
  
  - Add missed checks for the faults from casuword*().  The code is
    structured in a way which makes the loops exit if the specified
    address is invalid, since both fuword() and casuword() return -1 on
    the fault.  But if the address is mapped readonly, the typical value
    read by fuword() is different from -1, while casuword() returns -1.
    Absent the checks for casuword() faults, this is interpreted as the
    race with other thread and causes non-interruptible spinning in the
    kernel.
  
  Reported and tested by:	pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Thu Jun 13 08:34:23 2013	(r251683)
+++ head/sys/kern/kern_umtx.c	Thu Jun 13 09:33:22 2013	(r251684)
@@ -628,6 +628,32 @@ umtxq_count_pi(struct umtx_key *key, str
 	return (0);
 }
 
+static int
+umtxq_check_susp(struct thread *td)
+{
+	struct proc *p;
+	int error;
+
+	/*
+	 * The check for TDF_NEEDSUSPCHK is racy, but it is enough to
+	 * eventually break the lockstep loop.
+	 */
+	if ((td->td_flags & TDF_NEEDSUSPCHK) == 0)
+		return (0);
+	error = 0;
+	p = td->td_proc;
+	PROC_LOCK(p);
+	if (P_SHOULDSTOP(p) ||
+	    ((p->p_flag & P_TRACED) && (td->td_dbgflags & TDB_SUSPEND))) {
+		if (p->p_flag & P_SINGLE_EXIT)
+			error = EINTR;
+		else
+			error = ERESTART;
+	}
+	PROC_UNLOCK(p);
+	return (error);
+}
+
 /*
  * Wake up threads waiting on an userland object.
  */
@@ -858,6 +884,10 @@ do_lock_umtx(struct thread *td, struct u
 			if (owner == -1)
 				return (EFAULT);
 
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
+
 			/* If this failed the lock has changed, restart. */
 			continue;
 		}
@@ -908,6 +938,9 @@ do_lock_umtx(struct thread *td, struct u
 		umtxq_remove(uq);
 		umtxq_unlock(&uq->uq_key);
 		umtx_key_release(&uq->uq_key);
+
+		if (error == 0)
+			error = umtxq_check_susp(td);
 	}
 
 	if (timeout == NULL) {
@@ -1032,6 +1065,10 @@ do_lock_umtx32(struct thread *td, uint32
 			if (owner == -1)
 				return (EFAULT);
 
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
+
 			/* If this failed the lock has changed, restart. */
 			continue;
 		}
@@ -1082,6 +1119,9 @@ do_lock_umtx32(struct thread *td, uint32
 		umtxq_remove(uq);
 		umtxq_unlock(&uq->uq_key);
 		umtx_key_release(&uq->uq_key);
+
+		if (error == 0)
+			error = umtxq_check_susp(td);
 	}
 
 	if (timeout == NULL) {
@@ -1272,6 +1312,10 @@ do_lock_normal(struct thread *td, struct
 				if (owner == -1)
 					return (EFAULT);
 
+				error = umtxq_check_susp(td);
+				if (error != 0)
+					return (error);
+
 				/* If this failed the lock has changed, restart. */
 				continue;
 			}
@@ -1331,6 +1375,9 @@ do_lock_normal(struct thread *td, struct
 		umtxq_remove(uq);
 		umtxq_unlock(&uq->uq_key);
 		umtx_key_release(&uq->uq_key);
+
+		if (error == 0)
+			error = umtxq_check_susp(td);
 	}
 
 	return (0);
@@ -1487,6 +1534,11 @@ do_wake2_umutex(struct thread *td, struc
 			if (old == owner)
 				break;
 			owner = old;
+			if (old == -1)
+				break;
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 		}
 	} else if (count == 1) {
 		owner = fuword32(__DEVOLATILE(uint32_t *, &m->m_owner));
@@ -1497,6 +1549,11 @@ do_wake2_umutex(struct thread *td, struc
 			if (old == owner)
 				break;
 			owner = old;
+			if (old == -1)
+				break;
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 		}
 	}
 	umtxq_lock(&key);
@@ -1961,6 +2018,10 @@ do_lock_pi(struct thread *td, struct umu
 				break;
 			}
 
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
+
 			/* If this failed the lock has changed, restart. */
 			continue;
 		}
@@ -2017,6 +2078,10 @@ do_lock_pi(struct thread *td, struct umu
 			umtxq_unbusy(&uq->uq_key);
 			umtxq_unlock(&uq->uq_key);
 		}
+
+		error = umtxq_check_susp(td);
+		if (error != 0)
+			break;
 	}
 
 	umtxq_lock(&uq->uq_key);
@@ -2663,10 +2728,17 @@ do_rw_rdlock(struct thread *td, struct u
 				return (EAGAIN);
 			}
 			oldstate = casuword32(&rwlock->rw_state, state, state + 1);
+			if (oldstate == -1) {
+				umtx_key_release(&uq->uq_key);
+				return (EFAULT);
+			}
 			if (oldstate == state) {
 				umtx_key_release(&uq->uq_key);
 				return (0);
 			}
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 			state = oldstate;
 		}
 
@@ -2687,9 +2759,22 @@ do_rw_rdlock(struct thread *td, struct u
 		/* set read contention bit */
 		while ((state & wrflags) && !(state & URWLOCK_READ_WAITERS)) {
 			oldstate = casuword32(&rwlock->rw_state, state, state | URWLOCK_READ_WAITERS);
+			if (oldstate == -1) {
+				error = EFAULT;
+				break;
+			}
 			if (oldstate == state)
 				goto sleep;
 			state = oldstate;
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
+		}
+		if (error != 0) {
+			umtxq_lock(&uq->uq_key);
+			umtxq_unbusy(&uq->uq_key);
+			umtxq_unlock(&uq->uq_key);
+			break;
 		}
 
 		/* state is changed while setting flags, restart */
@@ -2697,6 +2782,9 @@ do_rw_rdlock(struct thread *td, struct u
 			umtxq_lock(&uq->uq_key);
 			umtxq_unbusy(&uq->uq_key);
 			umtxq_unlock(&uq->uq_key);
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 			continue;
 		}
 
@@ -2729,15 +2817,24 @@ sleep:
 			for (;;) {
 				oldstate = casuword32(&rwlock->rw_state, state,
 					 state & ~URWLOCK_READ_WAITERS);
+				if (oldstate == -1) {
+					error = EFAULT;
+					break;
+				}
 				if (oldstate == state)
 					break;
 				state = oldstate;
+				error = umtxq_check_susp(td);
+				if (error != 0)
+					break;
 			}
 		}
 
 		umtxq_lock(&uq->uq_key);
 		umtxq_unbusy(&uq->uq_key);
 		umtxq_unlock(&uq->uq_key);
+		if (error != 0)
+			break;
 	}
 	umtx_key_release(&uq->uq_key);
 	if (error == ERESTART)
@@ -2770,11 +2867,18 @@ do_rw_wrlock(struct thread *td, struct u
 		state = fuword32(__DEVOLATILE(int32_t *, &rwlock->rw_state));
 		while (!(state & URWLOCK_WRITE_OWNER) && URWLOCK_READER_COUNT(state) == 0) {
 			oldstate = casuword32(&rwlock->rw_state, state, state | URWLOCK_WRITE_OWNER);
+			if (oldstate == -1) {
+				umtx_key_release(&uq->uq_key);
+				return (EFAULT);
+			}
 			if (oldstate == state) {
 				umtx_key_release(&uq->uq_key);
 				return (0);
 			}
 			state = oldstate;
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 		}
 
 		if (error) {
@@ -2804,15 +2908,31 @@ do_rw_wrlock(struct thread *td, struct u
 		while (((state & URWLOCK_WRITE_OWNER) || URWLOCK_READER_COUNT(state) != 0) &&
 		       (state & URWLOCK_WRITE_WAITERS) == 0) {
 			oldstate = casuword32(&rwlock->rw_state, state, state | URWLOCK_WRITE_WAITERS);
+			if (oldstate == -1) {
+				error = EFAULT;
+				break;
+			}
 			if (oldstate == state)
 				goto sleep;
 			state = oldstate;
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
+		}
+		if (error != 0) {
+			umtxq_lock(&uq->uq_key);
+			umtxq_unbusy(&uq->uq_key);
+			umtxq_unlock(&uq->uq_key);
+			break;
 		}
 
 		if (!(state & URWLOCK_WRITE_OWNER) && URWLOCK_READER_COUNT(state) == 0) {
 			umtxq_lock(&uq->uq_key);
 			umtxq_unbusy(&uq->uq_key);
 			umtxq_unlock(&uq->uq_key);
+			error = umtxq_check_susp(td);
+			if (error != 0)
+				break;
 			continue;
 		}
 sleep:
@@ -2842,9 +2962,21 @@ sleep:
 			for (;;) {
 				oldstate = casuword32(&rwlock->rw_state, state,
 					 state & ~URWLOCK_WRITE_WAITERS);
+				if (oldstate == -1) {
+					error = EFAULT;
+					break;
+				}
 				if (oldstate == state)
 					break;
 				state = oldstate;
+				error = umtxq_check_susp(td);
+				/*
+				 * We are leaving the URWLOCK_WRITE_WAITERS
+				 * behind, but this should not harm the
+				 * correctness.
+				 */
+				if (error != 0)
+					break;
 			}
 			blocked_readers = fuword32(&rwlock->rw_blocked_readers);
 		} else
@@ -2880,12 +3012,19 @@ do_rw_unlock(struct thread *td, struct u
 		for (;;) {
 			oldstate = casuword32(&rwlock->rw_state, state, 
 				state & ~URWLOCK_WRITE_OWNER);
+			if (oldstate == -1) {
+				error = EFAULT;
+				goto out;
+			}
 			if (oldstate != state) {
 				state = oldstate;
 				if (!(oldstate & URWLOCK_WRITE_OWNER)) {
 					error = EPERM;
 					goto out;
 				}
+				error = umtxq_check_susp(td);
+				if (error != 0)
+					goto out;
 			} else
 				break;
 		}
@@ -2893,14 +3032,20 @@ do_rw_unlock(struct thread *td, struct u
 		for (;;) {
 			oldstate = casuword32(&rwlock->rw_state, state,
 				state - 1);
+			if (oldstate == -1) {
+				error = EFAULT;
+				goto out;
+			}
 			if (oldstate != state) {
 				state = oldstate;
 				if (URWLOCK_READER_COUNT(oldstate) == 0) {
 					error = EPERM;
 					goto out;
 				}
-			}
-			else
+				error = umtxq_check_susp(td);
+				if (error != 0)
+					goto out;
+			} else
 				break;
 		}
 	} else {

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 13:05:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 90007A0F;
 Thu, 13 Jun 2013 13:05:08 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 826AB1C13;
 Thu, 13 Jun 2013 13:05:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DD58OD058047;
 Thu, 13 Jun 2013 13:05:08 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DD58Rd058046;
 Thu, 13 Jun 2013 13:05:08 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201306131305.r5DD58Rd058046@svn.freebsd.org>
From: Ed Maste 
Date: Thu, 13 Jun 2013 13:05:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251685 - head/tools/build/options
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 13:05:08 -0000

Author: emaste
Date: Thu Jun 13 13:05:08 2013
New Revision: 251685
URL: http://svnweb.freebsd.org/changeset/base/251685

Log:
  Use portable string comparison
  
  We support == in /bin/sh now, but it ought to be avoided, and my use of
  it was accidental.

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman	Thu Jun 13 09:33:22 2013	(r251684)
+++ head/tools/build/options/makeman	Thu Jun 13 13:05:08 2013	(r251685)
@@ -240,7 +240,7 @@ EOF
 
 		# Work around BIND_UTILS=no being the default when every WITH_
 		# option is enabled.
-		if [ "$(cat $t/deps2)" == WITHOUT_BIND_UTILS ]; then
+		if [ "$(cat $t/deps2)" = WITHOUT_BIND_UTILS ]; then
 			sort $t/deps $t/deps2 > $t/_deps
 			mv $t/_deps $t/deps
 			:> $t/deps2

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 14:38:30 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BF41DCB0;
 Thu, 13 Jun 2013 14:38:30 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A132F1031;
 Thu, 13 Jun 2013 14:38:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DEcUwg087150;
 Thu, 13 Jun 2013 14:38:30 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DEcU31087146;
 Thu, 13 Jun 2013 14:38:30 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201306131438.r5DEcU31087146@svn.freebsd.org>
From: Ed Maste 
Date: Thu, 13 Jun 2013 14:38:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251686 - stable/9/share/mk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 14:38:30 -0000

Author: emaste
Date: Thu Jun 13 14:38:29 2013
New Revision: 251686
URL: http://svnweb.freebsd.org/changeset/base/251686

Log:
  MFC r244224, r248753
  
    Minor refactoring prior to .symbols file changes
  
    - Combine .if x and .if !x using .else
    - Separate out beforelinking dependency
    - Add comments to clarify .if nesting
  
    Always define and use PROGNAME
  
    This avoids having separate cases in the install rule for PROGNAME set
    and not set.  This is a minor cleanup in advance of further support for
    standalone debug files.

Modified:
  stable/9/share/mk/bsd.lib.mk
  stable/9/share/mk/bsd.prog.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk	Thu Jun 13 13:05:08 2013	(r251685)
+++ stable/9/share/mk/bsd.lib.mk	Thu Jun 13 14:38:29 2013	(r251686)
@@ -39,9 +39,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
-.endif
-
-.if !defined(DEBUG_FLAGS)
+.else
 STRIP?=	-s
 .endif
 
@@ -173,10 +171,9 @@ SOLINKOPTS+=	-Wl,--fatal-warnings -Wl,--
 .endif
 
 .if target(beforelinking)
-${SHLIB_NAME}: ${SOBJS} beforelinking
-.else
-${SHLIB_NAME}: ${SOBJS}
+${SHLIB_NAME}: beforelinking
 .endif
+${SHLIB_NAME}: ${SOBJS}
 	@${ECHO} building shared library ${SHLIB_NAME}
 	@rm -f ${.TARGET} ${SHLIB_LINK}
 .if defined(SHLIB_LINK)

Modified: stable/9/share/mk/bsd.prog.mk
==============================================================================
--- stable/9/share/mk/bsd.prog.mk	Thu Jun 13 13:05:08 2013	(r251685)
+++ stable/9/share/mk/bsd.prog.mk	Thu Jun 13 14:38:29 2013	(r251686)
@@ -41,15 +41,15 @@ PROG=	${PROG_CXX}
 .endif
 
 .if defined(PROG)
+PROGNAME?=	${PROG}
 .if defined(SRCS)
 
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
 .if target(beforelinking)
-${PROG}: ${OBJS} beforelinking
-.else
-${PROG}: ${OBJS}
+${PROG}: beforelinking
 .endif
+${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .else
@@ -76,10 +76,9 @@ SRCS=	${PROG}.c
 OBJS=	${PROG}.o
 
 .if target(beforelinking)
-${PROG}: ${OBJS} beforelinking
-.else
-${PROG}: ${OBJS}
+${PROG}: beforelinking
 .endif
+${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .else
@@ -90,7 +89,7 @@ ${PROG}: ${OBJS}
 .endif
 .endif
 
-.endif
+.endif # !defined(SRCS)
 
 .if	${MK_MAN} != "no" && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
@@ -99,7 +98,7 @@ ${PROG}: ${OBJS}
 MAN=	${PROG}.1
 MAN1=	${MAN}
 .endif
-.endif
+.endif # defined(PROG)
 
 all: objwarn ${PROG} ${SCRIPTS}
 .if ${MK_MAN} != "no"
@@ -153,13 +152,8 @@ realinstall: _proginstall
 .ORDER: beforeinstall _proginstall
 _proginstall:
 .if defined(PROG)
-.if defined(PROGNAME)
 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-.else
-	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
-.endif
 .endif
 .endif	# !target(realinstall)
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 15:45:55 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 30BD7C7D;
 Thu, 13 Jun 2013 15:45:55 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 231391315;
 Thu, 13 Jun 2013 15:45:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DFjtab008971;
 Thu, 13 Jun 2013 15:45:55 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DFjtqG008970;
 Thu, 13 Jun 2013 15:45:55 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306131545.r5DFjtqG008970@svn.freebsd.org>
From: Brooks Davis 
Date: Thu, 13 Jun 2013 15:45:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251687 - stable/9/sys/sys
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 15:45:55 -0000

Author: brooks
Date: Thu Jun 13 15:45:54 2013
New Revision: 251687
URL: http://svnweb.freebsd.org/changeset/base/251687

Log:
  Bump __FreeBSD_version to bound boostrapping of ctfmerge which was fixed
  in r249243.

Modified:
  stable/9/sys/sys/param.h

Modified: stable/9/sys/sys/param.h
==============================================================================
--- stable/9/sys/sys/param.h	Thu Jun 13 14:38:29 2013	(r251686)
+++ stable/9/sys/sys/param.h	Thu Jun 13 15:45:54 2013	(r251687)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 901504	/* Master, propagated to newvers */
+#define __FreeBSD_version 901505	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 17:13:16 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 954DEDFA;
 Thu, 13 Jun 2013 17:13:16 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 86A2518BE;
 Thu, 13 Jun 2013 17:13:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DHDGTL038377;
 Thu, 13 Jun 2013 17:13:16 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DHDG0J038374;
 Thu, 13 Jun 2013 17:13:16 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306131713.r5DHDG0J038374@svn.freebsd.org>
From: Brooks Davis 
Date: Thu, 13 Jun 2013 17:13:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251688 - in stable/9/usr.sbin/makefs: . compat
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 17:13:16 -0000

Author: brooks
Date: Thu Jun 13 17:13:15 2013
New Revision: 251688
URL: http://svnweb.freebsd.org/changeset/base/251688

Log:
  MFC r250407:
  
  Remove duplicated copies of various NetBSD compatibility shims used by
  makefs and use libnetbsd, contrib/mtree, and contrib/mknod instead.
  
  Sponsored by:	DARPA, AFRL

Deleted:
  stable/9/usr.sbin/makefs/compat/
  stable/9/usr.sbin/makefs/getid.c
Modified:
  stable/9/usr.sbin/makefs/Makefile
  stable/9/usr.sbin/makefs/makefs.h
  stable/9/usr.sbin/makefs/walk.c
Directory Properties:
  stable/9/usr.sbin/makefs/   (props changed)

Modified: stable/9/usr.sbin/makefs/Makefile
==============================================================================
--- stable/9/usr.sbin/makefs/Makefile	Thu Jun 13 15:45:54 2013	(r251687)
+++ stable/9/usr.sbin/makefs/Makefile	Thu Jun 13 17:13:15 2013	(r251688)
@@ -5,7 +5,6 @@ PROG=	makefs
 CFLAGS+=-I${.CURDIR}
 
 SRCS=	cd9660.c ffs.c \
-	getid.c \
 	makefs.c \
 	mtree.c \
 	walk.c
@@ -15,19 +14,28 @@ WARNS?=	2
 
 .include "${.CURDIR}/cd9660/Makefile.inc"
 .include "${.CURDIR}/ffs/Makefile.inc"
-.include "${.CURDIR}/compat/Makefile.inc"
 
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1
 
-.PATH:	${.CURDIR}/../mtree
-CFLAGS+=-I${.CURDIR}/../mtree
-SRCS+=	misc.c spec.c
+.PATH: ${.CURDIR}/../../contrib/mtree
+CFLAGS+=-I${.CURDIR}/../../contrib/mtree
+SRCS+=	getid.c misc.c spec.c
+
+.PATH: ${.CURDIR}/../../contrib/mknod
+CFLAGS+=-I${.CURDIR}/../../contrib/mknod
+SRCS+=	pack_dev.c
 
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
 SRCS+=	ffs_tables.c
 
-DPADD=  ${LIBSBUF}
-LDADD=  -lsbuf
+CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
+LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
+LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
+DPADD+=		${LIBNETBSD}
+LDADD+=		${LIBNETBSD}
+
+DPADD+=  ${LIBSBUF} ${LIBUTIL}
+LDADD+=  -lsbuf -lutil
 
 .include 

Modified: stable/9/usr.sbin/makefs/makefs.h
==============================================================================
--- stable/9/usr.sbin/makefs/makefs.h	Thu Jun 13 15:45:54 2013	(r251687)
+++ stable/9/usr.sbin/makefs/makefs.h	Thu Jun 13 17:13:15 2013	(r251688)
@@ -282,22 +282,4 @@ void   ffs_fragacct_swap(struct fs *, in
 
 fsinode *link_check(fsinode *);
 
-/*
- * Declarations for compat routines.
- */
-long long strsuftoll(const char *, const char *, long long, long long);
-long long strsuftollx(const char *, const char *,
-                       long long, long long, char *, size_t);
-
-struct passwd;
-int uid_from_user(const char *, uid_t *);
-int pwcache_userdb(int (*)(int), void (*)(void),
-               struct passwd * (*)(const char *), struct passwd * (*)(uid_t));
-struct group;
-int gid_from_group(const char *, gid_t *);
-int pwcache_groupdb(int (*)(int), void (*)(void),
-               struct group * (*)(const char *), struct group * (*)(gid_t));
-
-int setup_getid(const char *dir);
-
 #endif	/* _MAKEFS_H */

Modified: stable/9/usr.sbin/makefs/walk.c
==============================================================================
--- stable/9/usr.sbin/makefs/walk.c	Thu Jun 13 15:45:54 2013	(r251687)
+++ stable/9/usr.sbin/makefs/walk.c	Thu Jun 13 17:13:15 2013	(r251688)
@@ -304,7 +304,7 @@ apply_specfile(const char *specfile, con
 	if ((fp = fopen(specfile, "r")) == NULL)
 		err(1, "Can't open `%s'", specfile);
 	TIMER_START(start);
-	root = mtree_readspec(fp);
+	root = spec(fp);
 	TIMER_RESULTS(start, "spec");
 	if (fclose(fp) == EOF)
 		err(1, "Can't close `%s'", specfile);
@@ -320,33 +320,6 @@ apply_specfile(const char *specfile, con
 
 }
 
-static u_int
-nodetoino(u_int type)
-{
-
-	switch (type) {
-	case F_BLOCK:
-		return S_IFBLK;
-	case F_CHAR:
-		return S_IFCHR;
-	case F_DIR:
-		return S_IFDIR;
-	case F_FIFO:
-		return S_IFIFO;
-	case F_FILE:
-		return S_IFREG;
-	case F_LINK:
-		return S_IFLNK;
-	case F_SOCK:
-		return S_IFSOCK;
-	default:
-		printf("unknown type %d", type);
-		abort();
-	}
-	/* NOTREACHED */
-}
-
-
 static void
 apply_specdir(const char *dir, NODE *specnode, fsnode *dirnode, int speconly)
 {

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:26:04 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E35A4D69;
 Thu, 13 Jun 2013 18:26:04 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D51D41CA3;
 Thu, 13 Jun 2013 18:26:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIQ4Wa060742;
 Thu, 13 Jun 2013 18:26:04 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIQ440060741;
 Thu, 13 Jun 2013 18:26:04 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306131826.r5DIQ440060741@svn.freebsd.org>
From: Brooks Davis 
Date: Thu, 13 Jun 2013 18:26:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251689 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:26:05 -0000

Author: brooks
Date: Thu Jun 13 18:26:04 2013
New Revision: 251689
URL: http://svnweb.freebsd.org/changeset/base/251689

Log:
  Be more agressive about bootstrapping ctfmerge and ctfconvert so
  builds from existing releases have a chance of working properly.
  
  Sponsored by:	DARPA, AFRL
  MFC after:	3 days

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jun 13 17:13:15 2013	(r251688)
+++ head/Makefile.inc1	Thu Jun 13 18:26:04 2013	(r251689)
@@ -1203,8 +1203,8 @@ _clang_tblgen= \
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 800038 && \
-          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+    ((${BOOTSTRAPPING} < 1000034 && \
+          !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
       || (${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

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:26:13 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 07216E90;
 Thu, 13 Jun 2013 18:26:13 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDC7E1CA5;
 Thu, 13 Jun 2013 18:26:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIQCZA060799;
 Thu, 13 Jun 2013 18:26:12 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIQCGk060798;
 Thu, 13 Jun 2013 18:26:12 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201306131826.r5DIQCGk060798@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 13 Jun 2013 18:26:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251690 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:26:13 -0000

Author: jkim
Date: Thu Jun 13 18:26:12 2013
New Revision: 251690
URL: http://svnweb.freebsd.org/changeset/base/251690

Log:
  Add a new CPUTYPE supported by Clang 3.3 for AMD Jaguar processors (btver2).

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Thu Jun 13 18:26:04 2013	(r251689)
+++ head/share/mk/bsd.cpu.mk	Thu Jun 13 18:26:12 2013	(r251690)
@@ -144,6 +144,8 @@ _CPUCFLAGS = -mcpu=ultrasparc3
 . if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
+.  elif ${CPUTYPE} == "btver2"
+MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "amdfam10"
@@ -204,6 +206,8 @@ MACHINE_CPU += i486
 . elif ${MACHINE_CPUARCH} == "amd64"
 .  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3
+.  elif ${CPUTYPE} == "btver2"
+MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "amdfam10"

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:31:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 07720136;
 Thu, 13 Jun 2013 18:31:10 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDAD11CD3;
 Thu, 13 Jun 2013 18:31:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIV9q5063153;
 Thu, 13 Jun 2013 18:31:09 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIV92M063152;
 Thu, 13 Jun 2013 18:31:09 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201306131831.r5DIV92M063152@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 13 Jun 2013 18:31:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251691 - head/share/examples/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:31:10 -0000

Author: jkim
Date: Thu Jun 13 18:31:09 2013
New Revision: 251691
URL: http://svnweb.freebsd.org/changeset/base/251691

Log:
  - Document GCC support for AMD Family 10h processors (amdfam10).
  - Document Clang support for AMD Jaguar processors (btver2).

Modified:
  head/share/examples/etc/make.conf

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Thu Jun 13 18:26:12 2013	(r251690)
+++ head/share/examples/etc/make.conf	Thu Jun 13 18:31:09 2013	(r251691)
@@ -30,10 +30,10 @@
 # NO_CPU_CFLAGS variable below.
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
-#       (AMD CPUs)	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
-#			athlon64, athlon-fx, k8, athlon-mp, athlon-xp,
-#			athlon-4, athlon-tbird, athlon, k7, geode, k6-3,
-#			k6-2, k6
+#       (AMD CPUs)	amdfam10 opteron-sse3, athlon64-sse3, k8-sse3,
+#			opteron, athlon64, athlon-fx, k8, athlon-mp,
+#			athlen-xp, athlon-4, athlon-tbird, athlon, k7,
+#			geode, k6-3, k6-2, k6
 #       (Intel CPUs)	core2, core, nocona, pentium4m, pentium4, prescott,
 #			pentium3m, pentium3, pentium-m, pentium2,
 #			pentiumpro, pentium-mmx, pentium, i486
@@ -45,7 +45,7 @@
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
-#       (AMD CPUs)	bdver2, bdver1, btver1, amdfam10
+#       (AMD CPUs)	bdver2, bdver1, btver2, btver1
 #       (Intel CPUs)	core-avx2, core-avx-i, corei7-avx, corei7, atom
 #
 # (?= allows to buildworld for a different CPUTYPE.)

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:33:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 85A7D435;
 Thu, 13 Jun 2013 18:33:54 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7820B1D08;
 Thu, 13 Jun 2013 18:33:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIXshm063597;
 Thu, 13 Jun 2013 18:33:54 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIXstl063596;
 Thu, 13 Jun 2013 18:33:54 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201306131833.r5DIXstl063596@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 13 Jun 2013 18:33:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251692 - head/share/examples/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:33:54 -0000

Author: jkim
Date: Thu Jun 13 18:33:54 2013
New Revision: 251692
URL: http://svnweb.freebsd.org/changeset/base/251692

Log:
  Add a missing comma.

Modified:
  head/share/examples/etc/make.conf

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Thu Jun 13 18:31:09 2013	(r251691)
+++ head/share/examples/etc/make.conf	Thu Jun 13 18:33:54 2013	(r251692)
@@ -30,7 +30,7 @@
 # NO_CPU_CFLAGS variable below.
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
-#       (AMD CPUs)	amdfam10 opteron-sse3, athlon64-sse3, k8-sse3,
+#       (AMD CPUs)	amdfam10, opteron-sse3, athlon64-sse3, k8-sse3,
 #			opteron, athlon64, athlon-fx, k8, athlon-mp,
 #			athlen-xp, athlon-4, athlon-tbird, athlon, k7,
 #			geode, k6-3, k6-2, k6

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:39:17 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C13D574F;
 Thu, 13 Jun 2013 18:39:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B36DB1D4D;
 Thu, 13 Jun 2013 18:39:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIdHsZ064430;
 Thu, 13 Jun 2013 18:39:17 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIdH7U064429;
 Thu, 13 Jun 2013 18:39:17 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201306131839.r5DIdH7U064429@svn.freebsd.org>
From: "Simon J. Gerraty" 
Date: Thu, 13 Jun 2013 18:39:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251693 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:39:17 -0000

Author: sjg
Date: Thu Jun 13 18:39:17 2013
New Revision: 251693
URL: http://svnweb.freebsd.org/changeset/base/251693

Log:
  Explain remedy for -J error from old make

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Jun 13 18:33:54 2013	(r251692)
+++ head/UPDATING	Thu Jun 13 18:39:17 2013	(r251693)
@@ -31,6 +31,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130613:
+	Some people report the following error after the switch to bmake:
+
+		make: illegal option -- J
+		usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable]
+			...
+		*** [buildworld] Error code 2
+
+	this likely due to an old instance of make in
+	${MAKEPATH} (${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE})
+	which src/Makefile will use that blindly, if it exists, so if
+	you see the above error:
+
+		rm -rf `make -V MAKEPATH`
+
+	should resolve it.
+
 20130516:
 	Use bmake by default.
 	Whereas before one could choose to build with bmake via

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:40:45 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BD666961;
 Thu, 13 Jun 2013 18:40:45 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AF1841D67;
 Thu, 13 Jun 2013 18:40:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIejZ1066195;
 Thu, 13 Jun 2013 18:40:45 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIejmx066194;
 Thu, 13 Jun 2013 18:40:45 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306131840.r5DIejmx066194@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 13 Jun 2013 18:40:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251694 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:40:45 -0000

Author: ed
Date: Thu Jun 13 18:40:45 2013
New Revision: 251694
URL: http://svnweb.freebsd.org/changeset/base/251694

Log:
  Minor improvements to .
  
  - Define __SYNC_ATOMICS in case we're using the __sync_*() API. This is
    not used by  itself, but may be useful for some of the
    intrinsics code to determine whether it should build the
    machine-dependent intrinsic functions.
  
  - Make is_lock_free() work in kernelspace. For now, assume atomics in
    kernelspace are always lock free. This is a quite reasonable
    assumption, as we surely shouldn't implement the atomic fallbacks for
    arbitrary sizes.

Modified:
  head/sys/sys/stdatomic.h

Modified: head/sys/sys/stdatomic.h
==============================================================================
--- head/sys/sys/stdatomic.h	Thu Jun 13 18:39:17 2013	(r251693)
+++ head/sys/sys/stdatomic.h	Thu Jun 13 18:40:45 2013	(r251694)
@@ -37,7 +37,9 @@
 #define	__CLANG_ATOMICS
 #elif __GNUC_PREREQ__(4, 7)
 #define	__GNUC_ATOMICS
-#elif !defined(__GNUC__)
+#elif defined(__GNUC__)
+#define	__SYNC_ATOMICS
+#else
 #error "stdatomic.h does not support your compiler"
 #endif
 
@@ -156,7 +158,11 @@ enum memory_order {
  * 7.17.5 Lock-free property.
  */
 
-#if defined(__CLANG_ATOMICS)
+#if defined(_KERNEL)
+/* Atomics in kernelspace are always lock-free. */
+#define	atomic_is_lock_free(obj) \
+	((void)(obj), (_Bool)1)
+#elif defined(__CLANG_ATOMICS)
 #define	atomic_is_lock_free(obj) \
 	__atomic_is_lock_free(sizeof(*(obj)), obj)
 #elif defined(__GNUC_ATOMICS)

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:46:50 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 85E5ACA1;
 Thu, 13 Jun 2013 18:46:50 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6182F1DA7;
 Thu, 13 Jun 2013 18:46:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIkod9067356;
 Thu, 13 Jun 2013 18:46:50 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIkokX067353;
 Thu, 13 Jun 2013 18:46:50 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306131846.r5DIkokX067353@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 13 Jun 2013 18:46:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251695 - in head/sys: arm/arm conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:46:50 -0000

Author: ed
Date: Thu Jun 13 18:46:49 2013
New Revision: 251695
URL: http://svnweb.freebsd.org/changeset/base/251695

Log:
  Add C11 atomic fallbacks for ARM.
  
  Basically the situation is as follows:
  
  - When using Clang + armv6, we should not need any intrinsics. It should
    support it, even though due to a target misconfiguration it does not.
    We should fix this in Clang.
  - When using Clang + noarmv6, provide __atomic_* functions that disable
    interrupts.
  - When using GCC + armv6, we can provide __sync_* intrinsics, similar to
    what we did for MIPS. As ARM and MIPS are quite similar, simply base
    this implementation on the one I did for MIPS.
  - When using GCC + noarmv6, disable the interrupts, like we do for
    Clang.
  
  This implementation still lacks functions for noarmv6 userspace. To be
  done.

Added:
  head/sys/arm/arm/stdatomic.c   (contents, props changed)
Modified:
  head/sys/conf/files.arm

Added: head/sys/arm/arm/stdatomic.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/arm/stdatomic.c	Thu Jun 13 18:46:49 2013	(r251695)
@@ -0,0 +1,540 @@
+/*-
+ * Copyright (c) 2013 Ed Schouten 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+
+#include 
+
+#ifdef _KERNEL
+#include "opt_global.h"
+#endif
+
+/*
+ * Executing statements with interrupts disabled.
+ */
+
+#ifndef SMP
+#define	WITHOUT_INTERRUPTS(s) do {					\
+	register_t regs;						\
+									\
+	regs = intr_disable();						\
+	do s while (0);							\
+	intr_restore(regs);						\
+} while (0)
+#endif /* !SMP */
+
+/*
+ * Memory barriers.
+ *
+ * It turns out __sync_synchronize() does not emit any code when used
+ * with GCC 4.2. Implement our own version that does work reliably.
+ *
+ * Although __sync_lock_test_and_set() should only perform an acquire
+ * barrier, make it do a full barrier like the other functions. This
+ * should make 's atomic_exchange_explicit() work reliably.
+ */
+
+static inline void
+do_sync(void)
+{
+
+#if defined(_KERNEL) && !defined(SMP)
+	__asm volatile ("" : : : "memory");
+#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+	__asm volatile ("dmb" : : : "memory");
+#else /* __ARM_ARCH_6__ */
+	__asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory");
+#endif
+}
+
+#if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS)
+
+/*
+ * New C11 __atomic_* API.
+ */
+
+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
+    defined(__ARM_ARCH_6ZK__) || \
+    defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+
+/* These systems should be supported by the compiler. */
+
+#elif defined(_KERNEL)
+
+#ifdef SMP
+#error "On SMP systems we should have proper atomic operations."
+#endif
+
+/* Clang doesn't allow us to reimplement builtins without this. */
+#ifdef __clang__
+#pragma redefine_extname __sync_synchronize_ext __sync_synchronize
+#define __sync_synchronize __sync_synchronize_ext
+#endif
+
+void
+__sync_synchronize(void)
+{
+
+	do_sync();
+}
+
+/*
+ * On uniprocessor systems, we can perform the atomic operations by
+ * disabling interrupts.
+ */
+
+#define	EMIT_LOAD_N(N, uintN_t)						\
+uintN_t									\
+__atomic_load_##N(uintN_t *mem, int model __unused)			\
+{									\
+	uintN_t ret;							\
+									\
+	WITHOUT_INTERRUPTS({						\
+		ret = *mem;						\
+	});								\
+	return (ret);							\
+}
+
+#define	EMIT_STORE_N(N, uintN_t)					\
+void									\
+__atomic_store_##N(uintN_t *mem, uintN_t val, int model __unused)	\
+{									\
+									\
+	WITHOUT_INTERRUPTS({						\
+		*mem = val;						\
+	});								\
+}
+
+#define	EMIT_COMPARE_EXCHANGE_N(N, uintN_t)				\
+_Bool									\
+__atomic_compare_exchange_##N(uintN_t *mem, uintN_t *expected,		\
+    uintN_t desired, int success __unused, int failure __unused)	\
+{									\
+	_Bool ret;							\
+									\
+	WITHOUT_INTERRUPTS({						\
+		if (*mem == *expected) {				\
+			*mem = desired;					\
+			ret = 1;					\
+		} else {						\
+			*expected = *mem;				\
+			ret = 0;					\
+		}							\
+	});								\
+	return (ret);							\
+}
+
+#define	EMIT_FETCH_OP_N(N, uintN_t, name, op)				\
+uintN_t									\
+__atomic_##name##_##N(uintN_t *mem, uintN_t val, int model __unused)	\
+{									\
+	uintN_t ret;							\
+									\
+	WITHOUT_INTERRUPTS({						\
+		ret = *mem;						\
+		*mem op val;						\
+	});								\
+	return (ret);							\
+}
+
+#define	EMIT_ALL_OPS_N(N, uintN_t)					\
+EMIT_LOAD_N(N, uintN_t)							\
+EMIT_STORE_N(N, uintN_t)						\
+EMIT_COMPARE_EXCHANGE_N(N, uintN_t)					\
+EMIT_FETCH_OP_N(N, uintN_t, exchange, =)				\
+EMIT_FETCH_OP_N(N, uintN_t, fetch_add, +=)				\
+EMIT_FETCH_OP_N(N, uintN_t, fetch_and, &=)				\
+EMIT_FETCH_OP_N(N, uintN_t, fetch_or, |=)				\
+EMIT_FETCH_OP_N(N, uintN_t, fetch_sub, -=)				\
+EMIT_FETCH_OP_N(N, uintN_t, fetch_xor, ^=)
+
+EMIT_ALL_OPS_N(1, uint8_t)
+EMIT_ALL_OPS_N(2, uint16_t)
+EMIT_ALL_OPS_N(4, uint32_t)
+EMIT_ALL_OPS_N(8, uint64_t)
+
+#else /* !__ARM_ARCH_6__ && !__ARM_ARCH_7__ && !_KERNEL */
+
+/* XXX: Implement intrinsics for ARMv5 userspace. */
+
+#endif
+
+#endif /* __CLANG_ATOMICS || __GNUC_ATOMICS */
+
+/*
+ * Old __sync_* API.
+ */
+
+#if defined(__SYNC_ATOMICS)
+
+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
+    defined(__ARM_ARCH_6ZK__) || \
+    defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+
+/* Implementations for old GCC versions, lacking support for atomics. */
+
+typedef union {
+	uint8_t		v8[4];
+	uint32_t	v32;
+} reg_t;
+
+/*
+ * Given a memory address pointing to an 8-bit or 16-bit integer, return
+ * the address of the 32-bit word containing it.
+ */
+
+static inline uint32_t *
+round_to_word(void *ptr)
+{
+
+	return ((uint32_t *)((intptr_t)ptr & ~3));
+}
+
+/*
+ * Utility functions for loading and storing 8-bit and 16-bit integers
+ * in 32-bit words at an offset corresponding with the location of the
+ * atomic variable.
+ */
+
+static inline void
+put_1(reg_t *r, const uint8_t *offset_ptr, uint8_t val)
+{
+	size_t offset;
+
+	offset = (intptr_t)offset_ptr & 3;
+	r->v8[offset] = val;
+}
+
+static inline uint8_t
+get_1(const reg_t *r, const uint8_t *offset_ptr)
+{
+	size_t offset;
+
+	offset = (intptr_t)offset_ptr & 3;
+	return (r->v8[offset]);
+}
+
+static inline void
+put_2(reg_t *r, const uint16_t *offset_ptr, uint16_t val)
+{
+	size_t offset;
+	union {
+		uint16_t in;
+		uint8_t out[2];
+	} bytes;
+
+	offset = (intptr_t)offset_ptr & 3;
+	bytes.in = val;
+	r->v8[offset] = bytes.out[0];
+	r->v8[offset + 1] = bytes.out[1];
+}
+
+static inline uint16_t
+get_2(const reg_t *r, const uint16_t *offset_ptr)
+{
+	size_t offset;
+	union {
+		uint8_t in[2];
+		uint16_t out;
+	} bytes;
+
+	offset = (intptr_t)offset_ptr & 3;
+	bytes.in[0] = r->v8[offset];
+	bytes.in[1] = r->v8[offset + 1];
+	return (bytes.out);
+}
+
+/*
+ * 8-bit and 16-bit routines.
+ *
+ * These operations are not natively supported by the CPU, so we use
+ * some shifting and bitmasking on top of the 32-bit instructions.
+ */
+
+#define	EMIT_LOCK_TEST_AND_SET_N(N, uintN_t)				\
+uintN_t									\
+__sync_lock_test_and_set_##N(uintN_t *mem, uintN_t val)			\
+{									\
+	uint32_t *mem32;						\
+	reg_t val32, negmask, old;					\
+	uint32_t temp1, temp2;						\
+									\
+	mem32 = round_to_word(mem);					\
+	val32.v32 = 0x00000000;						\
+	put_##N(&val32, mem, val);					\
+	negmask.v32 = 0xffffffff;					\
+	put_##N(&negmask, mem, 0);					\
+									\
+	do_sync();							\
+	__asm volatile (						\
+		"1:"							\
+		"\tldrex %0, %6\n"	/* Load old value. */		\
+		"\tand   %2, %5, %0\n"	/* Remove the old value. */	\
+		"\torr   %2, %2, %4\n"	/* Put in the new value. */	\
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
+		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
+		"\tbne   1b\n"		/* Spin if failed. */		\
+		: "=&r" (old.v32), "=m" (*mem32), "=&r" (temp1),	\
+		  "=&r" (temp2)						\
+		: "r" (val32.v32), "r" (negmask.v32), "m" (*mem32));	\
+	return (get_##N(&old, mem));					\
+}
+
+EMIT_LOCK_TEST_AND_SET_N(1, uint8_t)
+EMIT_LOCK_TEST_AND_SET_N(2, uint16_t)
+
+#define	EMIT_VAL_COMPARE_AND_SWAP_N(N, uintN_t)				\
+uintN_t									\
+__sync_val_compare_and_swap_##N(uintN_t *mem, uintN_t expected,		\
+    uintN_t desired)							\
+{									\
+	uint32_t *mem32;						\
+	reg_t expected32, desired32, posmask, negmask, old;		\
+	uint32_t temp1, temp2;						\
+									\
+	mem32 = round_to_word(mem);					\
+	expected32.v32 = 0x00000000;					\
+	put_##N(&expected32, mem, expected);				\
+	desired32.v32 = 0x00000000;					\
+	put_##N(&desired32, mem, desired);				\
+	posmask.v32 = 0x00000000;					\
+	put_##N(&posmask, mem, ~0);					\
+	negmask.v32 = ~posmask.v32;					\
+									\
+	do_sync();							\
+	__asm volatile (						\
+		"1:"							\
+		"\tldrex %0, %8\n"	/* Load old value. */		\
+		"\tand   %2, %6, %0\n"	/* Isolate the old value. */	\
+		"\tcmp   %2, %4\n"	/* Compare to expected value. */\
+		"\tbne   2f\n"		/* Values are unequal. */	\
+		"\tand   %2, %7, %0\n"	/* Remove the old value. */	\
+		"\torr   %2, %5\n"	/* Put in the new value. */	\
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
+		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
+		"\tbne   1b\n"		/* Spin if failed. */		\
+		"2:"							\
+		: "=&r" (old), "=m" (*mem32), "=&r" (temp1),		\
+		  "=&r" (temp2)						\
+		: "r" (expected32.v32), "r" (desired32.v32),		\
+		  "r" (posmask.v32), "r" (negmask.v32), "m" (*mem32));	\
+	return (get_##N(&old, mem));					\
+}
+
+EMIT_VAL_COMPARE_AND_SWAP_N(1, uint8_t)
+EMIT_VAL_COMPARE_AND_SWAP_N(2, uint16_t)
+
+#define	EMIT_ARITHMETIC_FETCH_AND_OP_N(N, uintN_t, name, op)		\
+uintN_t									\
+__sync_##name##_##N(uintN_t *mem, uintN_t val)				\
+{									\
+	uint32_t *mem32;						\
+	reg_t val32, posmask, negmask, old;				\
+	uint32_t temp1, temp2;						\
+									\
+	mem32 = round_to_word(mem);					\
+	val32.v32 = 0x00000000;						\
+	put_##N(&val32, mem, val);					\
+	posmask.v32 = 0x00000000;					\
+	put_##N(&posmask, mem, ~0);					\
+	negmask.v32 = ~posmask.v32;					\
+									\
+	do_sync();							\
+	__asm volatile (						\
+		"1:"							\
+		"\tldrex %0, %7\n"	/* Load old value. */		\
+		"\t"op"  %2, %0, %4\n"	/* Calculate new value. */	\
+		"\tand   %2, %5\n"	/* Isolate the new value. */	\
+		"\tand   %3, %6, %0\n"	/* Remove the old value. */	\
+		"\torr   %2, %2, %3\n"	/* Put in the new value. */	\
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
+		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
+		"\tbne   1b\n"		/* Spin if failed. */		\
+		: "=&r" (old.v32), "=m" (*mem32), "=&r" (temp1),	\
+		  "=&r" (temp2)						\
+		: "r" (val32.v32), "r" (posmask.v32),			\
+		  "r" (negmask.v32), "m" (*mem32));			\
+	return (get_##N(&old, mem));					\
+}
+
+EMIT_ARITHMETIC_FETCH_AND_OP_N(1, uint8_t, fetch_and_add, "add")
+EMIT_ARITHMETIC_FETCH_AND_OP_N(1, uint8_t, fetch_and_sub, "sub")
+EMIT_ARITHMETIC_FETCH_AND_OP_N(2, uint16_t, fetch_and_add, "add")
+EMIT_ARITHMETIC_FETCH_AND_OP_N(2, uint16_t, fetch_and_sub, "sub")
+
+#define	EMIT_BITWISE_FETCH_AND_OP_N(N, uintN_t, name, op, idempotence)	\
+uintN_t									\
+__sync_##name##_##N(uintN_t *mem, uintN_t val)				\
+{									\
+	uint32_t *mem32;						\
+	reg_t val32, old;						\
+	uint32_t temp1, temp2;						\
+									\
+	mem32 = round_to_word(mem);					\
+	val32.v32 = idempotence ? 0xffffffff : 0x00000000;		\
+	put_##N(&val32, mem, val);					\
+									\
+	do_sync();							\
+	__asm volatile (						\
+		"1:"							\
+		"\tldrex %0, %5\n"	/* Load old value. */		\
+		"\t"op"  %2, %4, %0\n"	/* Calculate new value. */	\
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
+		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
+		"\tbne   1b\n"		/* Spin if failed. */		\
+		: "=&r" (old.v32), "=m" (*mem32), "=&r" (temp1),	\
+		  "=&r" (temp2)						\
+		: "r" (val32.v32), "m" (*mem32));			\
+	return (get_##N(&old, mem));					\
+}
+
+EMIT_BITWISE_FETCH_AND_OP_N(1, uint8_t, fetch_and_and, "and", 1)
+EMIT_BITWISE_FETCH_AND_OP_N(1, uint8_t, fetch_and_or, "orr", 0)
+EMIT_BITWISE_FETCH_AND_OP_N(1, uint8_t, fetch_and_xor, "eor", 0)
+EMIT_BITWISE_FETCH_AND_OP_N(2, uint16_t, fetch_and_and, "and", 1)
+EMIT_BITWISE_FETCH_AND_OP_N(2, uint16_t, fetch_and_or, "orr", 0)
+EMIT_BITWISE_FETCH_AND_OP_N(2, uint16_t, fetch_and_xor, "eor", 0)
+
+/*
+ * 32-bit routines.
+ */
+
+uint32_t
+__sync_val_compare_and_swap_4(uint32_t *mem, uint32_t expected,
+    uint32_t desired)
+{
+	uint32_t old, temp1, temp2;
+
+	do_sync();
+	__asm volatile (
+		"1:"
+		"\tldrex %0, %6\n"	/* Load old value. */
+		"\tcmp   %0, %4\n"	/* Compare to expected value. */
+		"\tbne   2f\n"		/* Values are unequal. */
+		"\tmov   %2, %5\n"	/* Value to store. */
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */
+		"\tcmp   %3, #0\n"	/* Did it succeed? */
+		"\tbne   1b\n"		/* Spin if failed. */
+		"2:"
+		: "=&r" (old), "=m" (*mem), "=&r" (temp1), "=&r" (temp2)
+		: "r" (expected), "r" (desired), "m" (*mem));
+	return (old);
+}
+
+#define	EMIT_FETCH_AND_OP_4(name, op)					\
+uint32_t								\
+__sync_##name##_4(uint32_t *mem, uint32_t val)				\
+{									\
+	uint32_t old, temp1, temp2;					\
+									\
+	do_sync();							\
+	__asm volatile (						\
+		"1:"							\
+		"\tldrex %0, %5\n"	/* Load old value. */		\
+		"\t"op"\n"		/* Calculate new value. */	\
+		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
+		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
+		"\tbne   1b\n"		/* Spin if failed. */		\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp1),		\
+		  "=&r" (temp2)						\
+		: "r" (val), "m" (*mem));				\
+	return (old);							\
+}
+
+EMIT_FETCH_AND_OP_4(lock_test_and_set, "mov %2, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_add, "add %2, %0, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_and, "and %2, %0, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_or, "orr %2, %0, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_sub, "sub %2, %0, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_xor, "eor %2, %0, %4")
+
+#elif defined(_KERNEL)
+
+#ifdef SMP
+#error "On SMP systems we should have proper atomic operations."
+#endif
+
+/*
+ * On uniprocessor systems, we can perform the atomic operations by
+ * disabling interrupts.
+ */
+
+#define	EMIT_VAL_COMPARE_AND_SWAP_N(N, uintN_t)				\
+uintN_t									\
+__sync_val_compare_and_swap_##N(uintN_t *mem, uintN_t expected,		\
+    uintN_t desired)							\
+{									\
+	uintN_t ret;							\
+									\
+	WITHOUT_INTERRUPTS({						\
+		ret = *mem;						\
+		if (*mem == expected)					\
+			*mem = desired;					\
+	});								\
+	return (ret);							\
+}
+
+#define	EMIT_FETCH_AND_OP_N(N, uintN_t, name, op)			\
+uintN_t									\
+__sync_##name##_##N(uintN_t *mem, uintN_t val)				\
+{									\
+	uintN_t ret;							\
+									\
+	WITHOUT_INTERRUPTS({						\
+		ret = *mem;						\
+		*mem op val;						\
+	});								\
+	return (ret);							\
+}
+
+#define	EMIT_ALL_OPS_N(N, uintN_t)					\
+EMIT_VAL_COMPARE_AND_SWAP_N(N, uintN_t)					\
+EMIT_FETCH_AND_OP_N(N, uintN_t, lock_test_and_set, =)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, fetch_and_add, +=)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, fetch_and_and, &=)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, fetch_and_or, |=)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, fetch_and_sub, -=)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, fetch_and_xor, ^=)
+
+EMIT_ALL_OPS_N(1, uint8_t)
+EMIT_ALL_OPS_N(2, uint16_t)
+EMIT_ALL_OPS_N(4, uint32_t)
+EMIT_ALL_OPS_N(8, uint64_t)
+
+#else /* !__ARM_ARCH_6__ && !__ARM_ARCH_7__ && !_KERNEL */
+
+/* XXX: Implement intrinsics for ARMv5 userspace. */
+
+#endif
+
+#endif /* __SYNC_ATOMICS */

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Thu Jun 13 18:40:45 2013	(r251694)
+++ head/sys/conf/files.arm	Thu Jun 13 18:46:49 2013	(r251695)
@@ -40,6 +40,8 @@ arm/arm/sc_machdep.c		optional	sc
 arm/arm/setcpsr.S		standard
 arm/arm/setstack.s		standard
 arm/arm/stack_machdep.c		optional	ddb | stack
+arm/arm/stdatomic.c		standard \
+	compile-with "${NORMAL_C:N-Wmissing-prototypes}"
 arm/arm/support.S		standard
 arm/arm/swtch.S			standard
 arm/arm/sys_machdep.c		standard

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:47:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3EFC2E18;
 Thu, 13 Jun 2013 18:47:29 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30FF31DB2;
 Thu, 13 Jun 2013 18:47:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIlTCN067492;
 Thu, 13 Jun 2013 18:47:29 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIlTvi067491;
 Thu, 13 Jun 2013 18:47:29 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306131847.r5DIlTvi067491@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 13 Jun 2013 18:47:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251696 - head/sys/mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:47:29 -0000

Author: ed
Date: Thu Jun 13 18:47:28 2013
New Revision: 251696
URL: http://svnweb.freebsd.org/changeset/base/251696

Log:
  Bring the stdatomic for MIPS code slightly more in sync with the ARM version.

Modified:
  head/sys/mips/mips/stdatomic.c

Modified: head/sys/mips/mips/stdatomic.c
==============================================================================
--- head/sys/mips/mips/stdatomic.c	Thu Jun 13 18:46:49 2013	(r251695)
+++ head/sys/mips/mips/stdatomic.c	Thu Jun 13 18:47:28 2013	(r251696)
@@ -30,12 +30,15 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#include 
 #include 
 
 #ifdef _KERNEL
 #include "opt_global.h"
 #endif
 
+#if defined(__SYNC_ATOMICS)
+
 /*
  * Memory barriers.
  *
@@ -48,7 +51,7 @@ __FBSDID("$FreeBSD$");
  */
 
 static inline void
-mips_sync(void)
+do_sync(void)
 {
 
 	__asm volatile (
@@ -94,7 +97,7 @@ round_to_word(void *ptr)
  */
 
 static inline void
-put_1(reg_t *r, uint8_t *offset_ptr, uint8_t val)
+put_1(reg_t *r, const uint8_t *offset_ptr, uint8_t val)
 {
 	size_t offset;
 
@@ -103,7 +106,7 @@ put_1(reg_t *r, uint8_t *offset_ptr, uin
 }
 
 static inline uint8_t
-get_1(const reg_t *r, uint8_t *offset_ptr)
+get_1(const reg_t *r, const uint8_t *offset_ptr)
 {
 	size_t offset;
 
@@ -112,7 +115,7 @@ get_1(const reg_t *r, uint8_t *offset_pt
 }
 
 static inline void
-put_2(reg_t *r, uint16_t *offset_ptr, uint16_t val)
+put_2(reg_t *r, const uint16_t *offset_ptr, uint16_t val)
 {
 	size_t offset;
 	union {
@@ -127,7 +130,7 @@ put_2(reg_t *r, uint16_t *offset_ptr, ui
 }
 
 static inline uint16_t
-get_2(const reg_t *r, uint16_t *offset_ptr)
+get_2(const reg_t *r, const uint16_t *offset_ptr)
 {
 	size_t offset;
 	union {
@@ -162,7 +165,7 @@ __sync_lock_test_and_set_##N(uintN_t *me
 	negmask.v32 = 0xffffffff;					\
 	put_##N(&negmask, mem, 0);					\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tll	%0, %5\n"	/* Load old value. */		\
@@ -196,7 +199,7 @@ __sync_val_compare_and_swap_##N(uintN_t 
 	put_##N(&posmask, mem, ~0);					\
 	negmask.v32 = ~posmask.v32;					\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tll	%0, %7\n"	/* Load old value. */		\
@@ -231,7 +234,7 @@ __sync_##name##_##N(uintN_t *mem, uintN_
 	put_##N(&posmask, mem, ~0);					\
 	negmask.v32 = ~posmask.v32;					\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tll	%0, %7\n"	/* Load old value. */		\
@@ -265,7 +268,7 @@ __sync_##name##_##N(uintN_t *mem, uintN_
 	val32.v32 = idempotence ? 0xffffffff : 0x00000000;		\
 	put_##N(&val32, mem, val);					\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tll	%0, %4\n"	/* Load old value. */		\
@@ -294,7 +297,7 @@ __sync_val_compare_and_swap_4(uint32_t *
 {
 	uint32_t old, temp;
 
-	mips_sync();
+	do_sync();
 	__asm volatile (
 		"1:"
 		"\tll	%0, %5\n"	/* Load old value. */
@@ -314,7 +317,7 @@ __sync_##name##_4(uint32_t *mem, uint32_
 {									\
 	uint32_t old, temp;						\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tll	%0, %4\n"	/* Load old value. */		\
@@ -349,7 +352,7 @@ __sync_val_compare_and_swap_8(uint64_t *
 {
 	uint64_t old, temp;
 
-	mips_sync();
+	do_sync();
 	__asm volatile (
 		"1:"
 		"\tlld	%0, %5\n"	/* Load old value. */
@@ -369,7 +372,7 @@ __sync_##name##_8(uint64_t *mem, uint64_
 {									\
 	uint64_t old, temp;						\
 									\
-	mips_sync();							\
+	do_sync();							\
 	__asm volatile (						\
 		"1:"							\
 		"\tlld	%0, %4\n"	/* Load old value. */		\
@@ -389,3 +392,5 @@ EMIT_FETCH_AND_OP_8(fetch_and_sub, "dsub
 EMIT_FETCH_AND_OP_8(fetch_and_xor, "xor %2, %0, %3")
 
 #endif /* __mips_n32 || __mips_n64 */
+
+#endif /* __SYNC_ATOMICS */

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:47:56 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3292BF94;
 Thu, 13 Jun 2013 18:47:56 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2397B1DBD;
 Thu, 13 Jun 2013 18:47:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DIludJ067588;
 Thu, 13 Jun 2013 18:47:56 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DIlsMD067578;
 Thu, 13 Jun 2013 18:47:54 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201306131847.r5DIlsMD067578@svn.freebsd.org>
From: "George V. Neville-Neil" 
Date: Thu, 13 Jun 2013 18:47:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251697 - in stable/9: cddl/contrib/dtracetoolkit share
 share/dtrace
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:47:56 -0000

Author: gnn
Date: Thu Jun 13 18:47:53 2013
New Revision: 251697
URL: http://svnweb.freebsd.org/changeset/base/251697

Log:
  MFC: 235380,235454,235455,235456,235457,235613,235614,235628,236567,
       238125,238535,238660,238979,239972
  
  Bring all changes to the DTrace Toolkit into FreeBSD 9.

Added:
     - copied from r235613, head/share/dtrace/
  stable/9/share/dtrace/hotopen
     - copied unchanged from r238660, head/share/dtrace/hotopen
  stable/9/share/dtrace/nfsattrstats
     - copied unchanged from r238535, head/share/dtrace/nfsattrstats
  stable/9/share/dtrace/nfsclienttime
     - copied unchanged from r235614, head/share/dtrace/nfsclienttime
Directory Properties:
  stable/9/share/dtrace/   (props changed)
Replaced:
     - copied from r235380, head/cddl/contrib/dtracetoolkit/
Directory Properties:
  stable/9/cddl/contrib/dtracetoolkit/   (props changed)
Modified:
  stable/9/cddl/contrib/dtracetoolkit/dtruss
  stable/9/cddl/contrib/dtracetoolkit/execsnoop
  stable/9/cddl/contrib/dtracetoolkit/opensnoop
  stable/9/cddl/contrib/dtracetoolkit/procsystime
  stable/9/share/Makefile
  stable/9/share/dtrace/Makefile
  stable/9/share/dtrace/README
Directory Properties:
  stable/9/cddl/contrib/   (props changed)
  stable/9/share/   (props changed)

Modified: stable/9/cddl/contrib/dtracetoolkit/dtruss
==============================================================================
--- head/cddl/contrib/dtracetoolkit/dtruss	Sat May 12 21:25:48 2012	(r235380)
+++ stable/9/cddl/contrib/dtracetoolkit/dtruss	Thu Jun 13 18:47:53 2013	(r251697)
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # dtruss - print process system call time details.
 #          Written using DTrace (Solaris 10 3/05).
@@ -240,7 +240,7 @@ syscall:::entry
  */
 
 /* print 3 args, return as hex */
-syscall::lwp_sigmask:return
+syscall::sigprocmask:return
 /self->start/
 {
 	/* calculate elapsed time */
@@ -268,10 +268,11 @@ syscall::lwp_sigmask:return
 }
 
 /* print 3 args, arg0 as a string */
+syscall::access*:return,
 syscall::stat*:return, 
 syscall::lstat*:return, 
-syscall::open*:return,
-syscall::resolvepath:return
+syscall::readlink*:return,
+syscall::open*:return
 /self->start/
 {
 	/* calculate elapsed time */
@@ -329,7 +330,6 @@ syscall::*read*:return
 }
 
 /* print 0 arg output */
-syscall::gtime:return,
 syscall::*fork*:return
 /self->start/
 {
@@ -357,9 +357,6 @@ syscall::*fork*:return
 }
 
 /* print 1 arg output */
-syscall::brk:return,
-syscall::times:return,
-syscall::stime:return,
 syscall::close:return
 /self->start/
 {
@@ -387,7 +384,7 @@ syscall::close:return
 }
 
 /* print 2 arg output */
-syscall::utime:return,
+syscall::utimes:return,
 syscall::munmap:return
 /self->start/
 {

Modified: stable/9/cddl/contrib/dtracetoolkit/execsnoop
==============================================================================
--- head/cddl/contrib/dtracetoolkit/execsnoop	Sat May 12 21:25:48 2012	(r235380)
+++ stable/9/cddl/contrib/dtracetoolkit/execsnoop	Thu Jun 13 18:47:53 2013	(r251697)
@@ -1,25 +1,24 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # execsnoop - snoop process execution as it occurs.
 #             Written using DTrace (Solaris 10 3/05).
 #
 # $Id: execsnoop 3 2007-08-01 10:50:08Z brendan $
 #
-# USAGE:	execsnoop [-a|-A|-ehjsvZ] [-c command]
+# USAGE:	execsnoop [-a|-A|-ehsvJ] [-c command]
 #
 #		execsnoop	# default output
 #
 #		-a		# print all data
 #		-A		# dump all data, space delimited
 #		-e		# safe output - parseable
-#		-j		# print project ID
 #		-s		# print start time, us
 #		-v		# print start time, string
-#		-Z		# print zonename
+#		-J		# print jail ID
 #		-c command	# command name to snoop
 #	eg,
 #		execsnoop -v		# human readable timestamps
-#		execsnoop -Z		# print zonename
+#		execsnoop -J		# print jail ID
 #		execsnoop -c ls		# snoop ls commands only
 #
 # The parseable output ensures that the ARGS field doesn't contain
@@ -31,8 +30,7 @@
 #		PPID		Parent Process ID
 #		COMM		command name for the process
 #		ARGS		argument listing for the process
-#		ZONE		zonename
-#		PROJ		project ID
+#		JAIL ID		Jail ID	
 #		TIME		timestamp for the command, us
 #		STRTIME		timestamp for the command, string
 #
@@ -72,34 +70,32 @@
 
 ### default variables
 opt_dump=0; opt_cmd=0; opt_time=0; opt_timestr=0; filter=0; command=.
-opt_zone=0; opt_safe=0; opt_proj=0
+opt_jailid=0; opt_safe=0
 
 ### process options
-while getopts aAc:ehjsvZ name
+while getopts aAc:ehsvJ name
 do
 	case $name in
-	a)	opt_time=1; opt_timestr=1; opt_zone=1; opt_proj=1 ;;
+	a)	opt_time=1; opt_timestr=1; opt_jailid=1 ;;
 	A)	opt_dump=1 ;;
 	c)	opt_cmd=1; command=$OPTARG ;;
 	e)	opt_safe=1 ;;
-	j)	opt_proj=1 ;;
 	s)	opt_time=1 ;;
 	v)	opt_timestr=1 ;;
-	Z)	opt_zone=1 ;;
+	J)	opt_jailid=1 ;;
 	h|?)	cat <<-END >&2
-		USAGE: execsnoop [-a|-A|-ehjsvZ] [-c command]
+		USAGE: execsnoop [-a|-A|-ehjsvJ] [-c command]
 		       execsnoop                # default output
 		                -a              # print all data
 		                -A              # dump all data, space delimited
 		                -e              # safe output, parseable
-		                -j              # print project ID
 		                -s              # print start time, us
 		                -v              # print start time, string
-		                -Z              # print zonename
+		                -J              # print jail ID 
 		                -c command      # command name to snoop
 		  eg,
 		        execsnoop -v            # human readable timestamps
-		        execsnoop -Z		# print zonename
+		        execsnoop -J		# print jail ID 
 		        execsnoop -c ls         # snoop ls commands only
 		END
 		exit 1
@@ -108,7 +104,7 @@ done
 
 ### option logic
 if [ $opt_dump -eq 1 ]; then
-	opt_time=0; opt_timestr=0; opt_zone=0; opt_proj=0
+	opt_time=0; opt_timestr=0; opt_jailid=0
 fi
 if [ $opt_cmd -eq 1 ]; then
 	filter=1
@@ -126,9 +122,8 @@ fi
  inline int OPT_cmd 	= '$opt_cmd';
  inline int OPT_time 	= '$opt_time';
  inline int OPT_timestr	= '$opt_timestr';
- inline int OPT_zone 	= '$opt_zone';
+ inline int OPT_jailid  = '$opt_jailid';
  inline int OPT_safe 	= '$opt_safe';
- inline int OPT_proj 	= '$opt_proj';
  inline int FILTER 	= '$filter';
  inline string COMMAND 	= "'$command'";
  
@@ -143,30 +138,28 @@ fi
 	/* print optional headers */
  	OPT_time    ? printf("%-14s ", "TIME") : 1;
  	OPT_timestr ? printf("%-20s ", "STRTIME") : 1;
- 	OPT_zone    ? printf("%-10s ", "ZONE") : 1;
- 	OPT_proj    ? printf("%5s ", "PROJ") : 1;
+ 	OPT_jailid    ? printf("%-10s ", "JAIL ID") : 1;
 
 	/* print main headers */
-	OPT_dump    ? printf("%s %s %s %s %s %s %s %s\n",
-	    "TIME", "ZONE", "PROJ", "UID", "PID", "PPID", "COMM", "ARGS") :
+	OPT_dump    ? printf("%s %s %s %s %s %s %s\n",
+	    "TIME", "JAIL ID", "UID", "PID", "PPID", "COMM", "ARGS") :
 	    printf("%5s %6s %6s %s\n", "UID", "PID", "PPID", "ARGS");
  }
 
  /*
   * Print exec event
   */
- syscall::exec:return, syscall::exece:return
+ syscall::execve:return
  /(FILTER == 0) || (OPT_cmd == 1 && COMMAND == execname)/ 
  {
 	/* print optional fields */
  	OPT_time ? printf("%-14d ", timestamp/1000) : 1;
 	OPT_timestr ? printf("%-20Y ", walltimestamp) : 1;
- 	OPT_zone ? printf("%-10s ", zonename) : 1;
- 	OPT_proj ? printf("%5d ", curpsinfo->pr_projid) : 1;
+	OPT_jailid ? printf("%-10d ", curpsinfo->pr_jailid) : 1;
 
 	/* print main data */
-	OPT_dump ? printf("%d %s %d %d %d %d %s ", timestamp/1000,
-	    zonename, curpsinfo->pr_projid, uid, pid, ppid, execname) :
+	OPT_dump ? printf("%d %d %d %d %d %s ", timestamp/1000,
+	    curpsinfo->pr_jailid, uid, pid, ppid, execname) :
 	    printf("%5d %6d %6d ", uid, pid, ppid);
 	OPT_safe ? printf("%S\n", curpsinfo->pr_psargs) :
 	    printf("%s\n", curpsinfo->pr_psargs);

Modified: stable/9/cddl/contrib/dtracetoolkit/opensnoop
==============================================================================
--- head/cddl/contrib/dtracetoolkit/opensnoop	Sat May 12 21:25:48 2012	(r235380)
+++ stable/9/cddl/contrib/dtracetoolkit/opensnoop	Thu Jun 13 18:47:53 2013	(r251697)
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # opensnoop - snoop file opens as they occur.
 #             Written using DTrace (Solaris 10 3/05).
@@ -189,7 +189,7 @@ fi
  /*
   * Print open event
   */
- syscall::open:entry, syscall::open64:entry
+ syscall::open:entry
  {
 	/* save pathname */
 	self->pathp = arg0;
@@ -203,7 +203,7 @@ fi
 	/* OPT_file is checked on return to ensure pathp is mapped */
  }
 
- syscall::open:return, syscall::open64:return
+ syscall::open:return
  /self->ok && (! OPT_failonly || (int)arg0 < 0) && 
  ((OPT_file == 0) || (OPT_file == 1 && PATHNAME == copyinstr(self->pathp)))/
  {
@@ -235,7 +235,7 @@ fi
  /* 
   * Cleanup 
   */
- syscall::open:return, syscall::open64:return 
+ syscall::open:return
  /self->ok/
  {
 	self->pathp = 0;

Modified: stable/9/cddl/contrib/dtracetoolkit/procsystime
==============================================================================
--- head/cddl/contrib/dtracetoolkit/procsystime	Sat May 12 21:25:48 2012	(r235380)
+++ stable/9/cddl/contrib/dtracetoolkit/procsystime	Thu Jun 13 18:47:53 2013	(r251697)
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # procsystime - print process system call time details.
 #               Written using DTrace (Solaris 10 3/05).

Modified: stable/9/share/Makefile
==============================================================================
--- stable/9/share/Makefile	Thu Jun 13 18:47:28 2013	(r251696)
+++ stable/9/share/Makefile	Thu Jun 13 18:47:53 2013	(r251697)
@@ -8,6 +8,7 @@
 SUBDIR=	${_colldef} \
 	${_dict} \
 	${_doc} \
+	dtrace \
 	${_examples} \
 	${_i18n} \
 	${_man} \

Modified: stable/9/share/dtrace/Makefile
==============================================================================
--- head/share/dtrace/Makefile	Fri May 18 16:40:15 2012	(r235613)
+++ stable/9/share/dtrace/Makefile	Thu Jun 13 18:47:53 2013	(r251697)
@@ -12,9 +12,9 @@ SUBDIR= ${_toolkit}
 _toolkit=	toolkit
 .endif
 
-SCRIPTS=	nfsclienttime
+SCRIPTS=	nfsclienttime hotopen
 
-SCRIPTSDIR= ${SHAREDIR}/dtrace/
+SCRIPTSDIR= ${SHAREDIR}/dtrace
 
 NO_OBJ=
 

Modified: stable/9/share/dtrace/README
==============================================================================
--- head/share/dtrace/README	Fri May 18 16:40:15 2012	(r235613)
+++ stable/9/share/dtrace/README	Thu Jun 13 18:47:53 2013	(r251697)
@@ -2,7 +2,7 @@ $FreeBSD$
 
 This directory contains scripts for use with the DTrace system.  The
 toolkit/ directory contains the latest vendor import of Brendan
-Gregg's DTRaceToolkit while all the other files and directories
+Gregg's DTraceToolkit while all the other files and directories
 contain code generated by the FreeBSD Project for use with DTrace on
 FreeBSD.
 

Copied: stable/9/share/dtrace/hotopen (from r238660, head/share/dtrace/hotopen)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/share/dtrace/hotopen	Thu Jun 13 18:47:53 2013	(r251697, copy of r238660, head/share/dtrace/hotopen)
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 George V. Neville-Neil
+# All rights reserved.
+#
+# This software was developed at the University of Cambridge Computer
+# Laboratory with support from a grant from Google, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+# The hotopen D script periodically outputs  table of which UIDs
+# are opening files.   This is a very quick way to find out if
+# a paritcular user is thrashing a system with rapid calls to
+# open/close.
+#
+# Usage: hotopen
+#
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+BEGIN
+{
+	printf("Files opened per UID in the last second.\n");
+}
+
+syscall::open:entry
+{
+	@files[uid] = count();
+	output = 1;
+}
+
+tick-1sec
+/output != 0/
+{
+	printf("%-20Y \n", walltimestamp);
+	printa("uid %d\tcount %@d\n", @files, @files);
+	trunc(@files);
+	output = 0;
+}
+'

Copied: stable/9/share/dtrace/nfsattrstats (from r238535, head/share/dtrace/nfsattrstats)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/share/dtrace/nfsattrstats	Thu Jun 13 18:47:53 2013	(r251697, copy of r238535, head/share/dtrace/nfsattrstats)
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Robert N. M. Watson
+# All rights reserved.
+#
+# This software was developed at the University of Cambridge Computer
+# Laboratory with support from a grant from Google, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+# This script creates a trace of NFS RPCs, NFS attribute cache
+# activity, and NFS access cache activity, along with the system call
+# that instigated the activity. Notice that NFS events may happen
+# outside of the context of a system call, most likely due to the VM
+# system paging from NFS, in which case the system call name is
+# reported as "-"
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+
+dtrace:::BEGIN
+{
+	printf("probe\targ0\texecutable\tsyscall\n");
+}
+
+syscall:::entry
+{
+
+        self->syscallname = probefunc;
+}
+
+syscall:::return
+{
+
+        self->syscallname = "";
+}
+
+nfsclient:::
+/self->syscallname != 0 && self->syscallname != ""/
+{
+
+    printf("%s\t%s\t%s\t%s\n", probemod, stringof(arg0), execname, 
+	    self->syscallname);
+}
+
+nfsclient:::
+/self->syscallname == 0 || self->syscallname == ""/
+{
+
+    printf("%s\t%s\t%s\t%s\n", probemod, stringof(arg0), execname, 
+	    self->syscallname);
+}
+'

Copied: stable/9/share/dtrace/nfsclienttime (from r235614, head/share/dtrace/nfsclienttime)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/share/dtrace/nfsclienttime	Thu Jun 13 18:47:53 2013	(r251697, copy of r235614, head/share/dtrace/nfsclienttime)
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Robert N. M. Watson
+# All rights reserved.
+#
+# This software was developed at the University of Cambridge Computer
+# Laboratory with support from a grant from Google, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+# This script measures all time spent waiting on RPC replies for each
+# system call, and then generates a histogram of those times sorted by
+# system call name.
+#
+# Currently only supports NFSv3
+#
+# Usage: nfsclienttime
+#
+# Press Ctrl-C to exit and display statistics.
+#
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+
+dtrace:::BEGIN
+{
+	printf("Collecting data...press Ctrl-C to exit.\n");
+}
+
+syscall:::entry
+{
+
+        self->count = 0;
+}
+
+nfsclient:nfs3::start
+{
+
+        self->timestamp = timestamp;
+}
+
+nfsclient:nfs3::done
+{
+
+        self->count += (timestamp - self->timestamp);
+}
+
+syscall:::return
+/self->count != 0/  {
+
+        @syscalls[probefunc] = quantize(self->count);
+}
+'

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 18:53:15 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5CCB32C2;
 Thu, 13 Jun 2013 18:53:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com
 [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26])
 by mx1.freebsd.org (Postfix) with ESMTP id 2798D1DE8;
 Thu, 13 Jun 2013 18:53:15 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7::a1cf:34fa:e697:eadc] (unknown
 [IPv6:2001:7b8:3a7:0:a1cf:34fa:e697:eadc])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id 0E3775C44;
 Thu, 13 Jun 2013 20:53:13 +0200 (CEST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r251689 - head
From: Dimitry Andric 
In-Reply-To: <201306131826.r5DIQ440060741@svn.freebsd.org>
Date: Thu, 13 Jun 2013 20:53:14 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org>
References: <201306131826.r5DIQ440060741@svn.freebsd.org>
To: Brooks Davis 
X-Mailer: Apple Mail (2.1508)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 18:53:15 -0000

On Jun 13, 2013, at 20:26, Brooks Davis  wrote:
> Author: brooks
> Date: Thu Jun 13 18:26:04 2013
> New Revision: 251689
> URL: http://svnweb.freebsd.org/changeset/base/251689
>=20
> Log:
>  Be more agressive about bootstrapping ctfmerge and ctfconvert so
>  builds from existing releases have a chance of working properly.
>=20
>  Sponsored by:	DARPA, AFRL
>  MFC after:	3 days
>=20
> Modified:
>  head/Makefile.inc1
>=20
> Modified: head/Makefile.inc1
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/Makefile.inc1	Thu Jun 13 17:13:15 2013	=
(r251688)
> +++ head/Makefile.inc1	Thu Jun 13 18:26:04 2013	=
(r251689)
> @@ -1203,8 +1203,8 @@ _clang_tblgen=3D \
>=20
> # dtrace tools are required for older bootstrap env and cross-build
> .if ${MK_CDDL} !=3D "no" && \
> -    ((${BOOTSTRAPPING} < 800038 && \
> -          !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < =
799999)) \
> +    ((${BOOTSTRAPPING} < 1000034 && \
> +          !(${BOOTSTRAPPING} >=3D 901505 && ${BOOTSTRAPPING} < =
999999)) \
>       || (${MACHINE} !=3D ${TARGET} || ${MACHINE_ARCH} !=3D =
${TARGET_ARCH}))
> _dtrace_tools=3D cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
>     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge


Does this fix that kernel builds seem to use /usr/bin/ctfmerge (e.g.
when building on stable/8 or stable/9)?


From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 19:25:37 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 395E6DA6;
 Thu, 13 Jun 2013 19:25:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B3561F0B;
 Thu, 13 Jun 2013 19:25:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DJPbj2080523;
 Thu, 13 Jun 2013 19:25:37 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DJPb2E080522;
 Thu, 13 Jun 2013 19:25:37 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306131925.r5DJPb2E080522@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 19:25:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251698 - stable/9/sys/rpc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 19:25:37 -0000

Author: jhb
Date: Thu Jun 13 19:25:36 2013
New Revision: 251698
URL: http://svnweb.freebsd.org/changeset/base/251698

Log:
  MFC 249263: Fix a potential socket leak in the NFS server.

Modified:
  stable/9/sys/rpc/svc_vc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/rpc/svc_vc.c
==============================================================================
--- stable/9/sys/rpc/svc_vc.c	Thu Jun 13 18:47:53 2013	(r251697)
+++ stable/9/sys/rpc/svc_vc.c	Thu Jun 13 19:25:36 2013	(r251698)
@@ -137,7 +137,9 @@ svc_vc_create(SVCPOOL *pool, struct sock
 	struct sockaddr* sa;
 	int error;
 
-	if (so->so_state & SS_ISCONNECTED) {
+	SOCK_LOCK(so);
+	if (so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED)) {
+		SOCK_UNLOCK(so);
 		error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
 		if (error)
 			return (NULL);
@@ -145,6 +147,7 @@ svc_vc_create(SVCPOOL *pool, struct sock
 		free(sa, M_SONAME);
 		return (xprt);
 	}
+	SOCK_UNLOCK(so);
 
 	xprt = svc_xprt_alloc();
 	sx_init(&xprt->xp_lock, "xprt->xp_lock");

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 19:35:57 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 10076FB0;
 Thu, 13 Jun 2013 19:35:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 01BAB1F59;
 Thu, 13 Jun 2013 19:35:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DJZuts083611;
 Thu, 13 Jun 2013 19:35:56 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DJZuTk083610;
 Thu, 13 Jun 2013 19:35:56 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306131935.r5DJZuTk083610@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 19:35:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251699 - stable/8/sys/rpc
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 19:35:57 -0000

Author: jhb
Date: Thu Jun 13 19:35:56 2013
New Revision: 251699
URL: http://svnweb.freebsd.org/changeset/base/251699

Log:
  MFC 249263: Fix a potential socket leak in the NFS server.

Modified:
  stable/8/sys/rpc/svc_vc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/rpc/   (props changed)

Modified: stable/8/sys/rpc/svc_vc.c
==============================================================================
--- stable/8/sys/rpc/svc_vc.c	Thu Jun 13 19:25:36 2013	(r251698)
+++ stable/8/sys/rpc/svc_vc.c	Thu Jun 13 19:35:56 2013	(r251699)
@@ -137,7 +137,9 @@ svc_vc_create(SVCPOOL *pool, struct sock
 	struct sockaddr* sa;
 	int error;
 
-	if (so->so_state & SS_ISCONNECTED) {
+	SOCK_LOCK(so);
+	if (so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED)) {
+		SOCK_UNLOCK(so);
 		error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
 		if (error)
 			return (NULL);
@@ -145,6 +147,7 @@ svc_vc_create(SVCPOOL *pool, struct sock
 		free(sa, M_SONAME);
 		return (xprt);
 	}
+	SOCK_UNLOCK(so);
 
 	xprt = svc_xprt_alloc();
 	sx_init(&xprt->xp_lock, "xprt->xp_lock");

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 19:42:50 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C6D971F9;
 Thu, 13 Jun 2013 19:42:50 +0000 (UTC)
 (envelope-from brooks@lor.one-eyed-alien.net)
Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232])
 by mx1.freebsd.org (Postfix) with ESMTP id 7BCC91F8A;
 Thu, 13 Jun 2013 19:42:49 +0000 (UTC)
Received: from lor.one-eyed-alien.net (localhost [127.0.0.1])
 by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id r5DJgh1P011380;
 Thu, 13 Jun 2013 14:42:43 -0500 (CDT)
 (envelope-from brooks@lor.one-eyed-alien.net)
Received: (from brooks@localhost)
 by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id r5DJgh70011379;
 Thu, 13 Jun 2013 14:42:43 -0500 (CDT) (envelope-from brooks)
Date: Thu, 13 Jun 2013 14:42:43 -0500
From: Brooks Davis 
To: Dimitry Andric 
Subject: Re: svn commit: r251689 - head
Message-ID: <20130613194243.GA2199@lor.one-eyed-alien.net>
References: <201306131826.r5DIQ440060741@svn.freebsd.org>
 <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="4Ckj6UjgE2iN1+kY"
Content-Disposition: inline
In-Reply-To: <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 Brooks Davis , src-committers@FreeBSD.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 19:42:50 -0000


--4Ckj6UjgE2iN1+kY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jun 13, 2013 at 08:53:14PM +0200, Dimitry Andric wrote:
> On Jun 13, 2013, at 20:26, Brooks Davis  wrote:
> > Author: brooks
> > Date: Thu Jun 13 18:26:04 2013
> > New Revision: 251689
> > URL: http://svnweb.freebsd.org/changeset/base/251689
> >=20
> > Log:
> >  Be more agressive about bootstrapping ctfmerge and ctfconvert so
> >  builds from existing releases have a chance of working properly.
> >=20
> >  Sponsored by:	DARPA, AFRL
> >  MFC after:	3 days
> >=20
> > Modified:
> >  head/Makefile.inc1
> >=20
> > Modified: head/Makefile.inc1
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/Makefile.inc1	Thu Jun 13 17:13:15 2013	(r251688)
> > +++ head/Makefile.inc1	Thu Jun 13 18:26:04 2013	(r251689)
> > @@ -1203,8 +1203,8 @@ _clang_tblgen=3D \
> >=20
> > # dtrace tools are required for older bootstrap env and cross-build
> > .if ${MK_CDDL} !=3D "no" && \
> > -    ((${BOOTSTRAPPING} < 800038 && \
> > -          !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < 799999)=
) \
> > +    ((${BOOTSTRAPPING} < 1000034 && \
> > +          !(${BOOTSTRAPPING} >=3D 901505 && ${BOOTSTRAPPING} < 999999)=
) \
> >       || (${MACHINE} !=3D ${TARGET} || ${MACHINE_ARCH} !=3D ${TARGET_AR=
CH}))
> > _dtrace_tools=3D cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
> >     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
>=20
>=20
> Does this fix that kernel builds seem to use /usr/bin/ctfmerge (e.g.
> when building on stable/8 or stable/9)?

I believe it does.

-- Brooks

--4Ckj6UjgE2iN1+kY
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iD8DBQFRuiCzXY6L6fI4GtQRArqSAKCPFt7YaLu0C94swXSiHrg1hZtj5QCfcedV
IfYHpiUYJVd5y2Co0Jr8PWU=
=0rx8
-----END PGP SIGNATURE-----

--4Ckj6UjgE2iN1+kY--

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:29:07 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 16F74D74;
 Thu, 13 Jun 2013 20:29:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 08C03114A;
 Thu, 13 Jun 2013 20:29:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKT6bV000261;
 Thu, 13 Jun 2013 20:29:06 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKT6Ch000260;
 Thu, 13 Jun 2013 20:29:06 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306132029.r5DKT6Ch000260@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 20:29:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251700 - stable/9/sys/dev/pci
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:29:07 -0000

Author: jhb
Date: Thu Jun 13 20:29:06 2013
New Revision: 251700
URL: http://svnweb.freebsd.org/changeset/base/251700

Log:
  MFC 249315:
  Proxy allocation requests for the PCI ROM BAR from child devices similar
  to how the VGA bus driver currently proxies allocation requests for other
  PCI BARs.

Modified:
  stable/9/sys/dev/pci/vga_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/pci/vga_pci.c
==============================================================================
--- stable/9/sys/dev/pci/vga_pci.c	Thu Jun 13 19:35:56 2013	(r251699)
+++ stable/9/sys/dev/pci/vga_pci.c	Thu Jun 13 20:29:06 2013	(r251700)
@@ -56,7 +56,8 @@ struct vga_resource {
 
 struct vga_pci_softc {
 	device_t	vga_msi_child;	/* Child driver using MSI. */
-	struct vga_resource vga_res[PCIR_MAX_BAR_0 + 1];
+	struct vga_resource vga_bars[PCIR_MAX_BAR_0 + 1];
+	struct vga_resource vga_bios;
 };
 
 SYSCTL_DECL(_hw_pci);
@@ -156,12 +157,24 @@ vga_pci_teardown_intr(device_t dev, devi
 	return (BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie));
 }
 
+static struct vga_resource *
+lookup_res(struct vga_pci_softc *sc, int rid)
+{
+	int bar;
+
+	if (rid == PCIR_BIOS)
+		return (&sc->vga_bios);
+	bar = PCI_RID2BAR(rid);
+	if (bar >= 0 && bar <= PCIR_MAX_BAR_0)
+		return (&sc->vga_bars[bar]);
+	return (NULL);
+}
+
 static struct resource *
 vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
-	struct vga_pci_softc *sc;
-	int bar;
+	struct vga_resource *vr;
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -170,16 +183,15 @@ vga_pci_alloc_resource(device_t dev, dev
 		 * For BARs, we cache the resource so that we only allocate it
 		 * from the PCI bus once.
 		 */
-		bar = PCI_RID2BAR(*rid);
-		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+		vr = lookup_res(device_get_softc(dev), *rid);
+		if (vr == NULL)
 			return (NULL);
-		sc = device_get_softc(dev);
-		if (sc->vga_res[bar].vr_res == NULL)
-			sc->vga_res[bar].vr_res = bus_alloc_resource(dev, type,
-			    rid, start, end, count, flags);
-		if (sc->vga_res[bar].vr_res != NULL)
-			sc->vga_res[bar].vr_refs++;
-		return (sc->vga_res[bar].vr_res);
+		if (vr->vr_res == NULL)
+			vr->vr_res = bus_alloc_resource(dev, type, rid, start,
+			    end, count, flags);
+		if (vr->vr_res != NULL)
+			vr->vr_refs++;
+		return (vr->vr_res);
 	}
 	return (bus_alloc_resource(dev, type, rid, start, end, count, flags));
 }
@@ -188,8 +200,8 @@ static int
 vga_pci_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
-	struct vga_pci_softc *sc;
-	int bar, error;
+	struct vga_resource *vr;
+	int error;
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -198,24 +210,22 @@ vga_pci_release_resource(device_t dev, d
 		 * For BARs, we release the resource from the PCI bus
 		 * when the last child reference goes away.
 		 */
-		bar = PCI_RID2BAR(rid);
-		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+		vr = lookup_res(device_get_softc(dev), rid);
+		if (vr == NULL)
 			return (EINVAL);
-		sc = device_get_softc(dev);
-		if (sc->vga_res[bar].vr_res == NULL)
+		if (vr->vr_res == NULL)
 			return (EINVAL);
-		KASSERT(sc->vga_res[bar].vr_res == r,
-		    ("vga_pci resource mismatch"));
-		if (sc->vga_res[bar].vr_refs > 1) {
-			sc->vga_res[bar].vr_refs--;
+		KASSERT(vr->vr_res == r, ("vga_pci resource mismatch"));
+		if (vr->vr_refs > 1) {
+			vr->vr_refs--;
 			return (0);
 		}
-		KASSERT(sc->vga_res[bar].vr_refs > 0,
+		KASSERT(vr->vr_refs > 0,
 		    ("vga_pci resource reference count underflow"));
 		error = bus_release_resource(dev, type, rid, r);
 		if (error == 0) {
-			sc->vga_res[bar].vr_res = NULL;
-			sc->vga_res[bar].vr_refs = 0;
+			vr->vr_res = NULL;
+			vr->vr_refs = 0;
 		}
 		return (error);
 	}

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:40:40 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1E5CA2F5;
 Thu, 13 Jun 2013 20:40:40 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0FE6B11BD;
 Thu, 13 Jun 2013 20:40:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKed02005211;
 Thu, 13 Jun 2013 20:40:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKedvO005209;
 Thu, 13 Jun 2013 20:40:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132040.r5DKedvO005209@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 20:40:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251701 - in stable/9/sys/dev/usb: . net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:40:40 -0000

Author: eadler
Date: Thu Jun 13 20:40:39 2013
New Revision: 251701
URL: http://svnweb.freebsd.org/changeset/base/251701

Log:
  MFC r251109:
  	Add support for tethering on the iPhone 4S
  
  PR:	usb/179078

Modified:
  stable/9/sys/dev/usb/net/if_ipheth.c
  stable/9/sys/dev/usb/usbdevs
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/net/if_ipheth.c
==============================================================================
--- stable/9/sys/dev/usb/net/if_ipheth.c	Thu Jun 13 20:29:06 2013	(r251700)
+++ stable/9/sys/dev/usb/net/if_ipheth.c	Thu Jun 13 20:40:39 2013	(r251701)
@@ -161,6 +161,9 @@ static const STRUCT_USB_HOST_ID ipheth_d
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S,
+	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+	    IPHETH_USBINTF_PROTO)},
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_5,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs	Thu Jun 13 20:29:06 2013	(r251700)
+++ stable/9/sys/dev/usb/usbdevs	Thu Jun 13 20:40:39 2013	(r251701)
@@ -1081,6 +1081,7 @@ product APPLE IPOD_TOUCH	0x1291	iPod Tou
 product APPLE IPHONE_3G		0x1292	iPhone 3G
 product APPLE IPHONE_3GS	0x1294	iPhone 3GS
 product APPLE IPHONE_4		0x1297	iPhone 4
+product APPLE IPHONE_4S		0x12a0	iPhone 4S
 product APPLE IPHONE_5		0x12a8  iPhone 5
 product APPLE IPAD		0x129a	iPad
 product APPLE ETHERNET		0x1402	Ethernet A1277

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:41:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id AA6F9512;
 Thu, 13 Jun 2013 20:41:10 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32C9C11C4;
 Thu, 13 Jun 2013 20:41:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKfAjS005586;
 Thu, 13 Jun 2013 20:41:10 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKf9t3005584;
 Thu, 13 Jun 2013 20:41:09 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132041.r5DKf9t3005584@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 20:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251702 - in stable/8/sys/dev/usb: . net
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:41:10 -0000

Author: eadler
Date: Thu Jun 13 20:41:09 2013
New Revision: 251702
URL: http://svnweb.freebsd.org/changeset/base/251702

Log:
  MFC r251109:
  	Add support for tethering on the iPhone 4S
  
  PR:	usb/179078

Modified:
  stable/8/sys/dev/usb/net/if_ipheth.c
  stable/8/sys/dev/usb/usbdevs
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/usb/   (props changed)

Modified: stable/8/sys/dev/usb/net/if_ipheth.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_ipheth.c	Thu Jun 13 20:40:39 2013	(r251701)
+++ stable/8/sys/dev/usb/net/if_ipheth.c	Thu Jun 13 20:41:09 2013	(r251702)
@@ -161,6 +161,9 @@ static const STRUCT_USB_HOST_ID ipheth_d
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S,
+	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+	    IPHETH_USBINTF_PROTO)},
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_5,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs	Thu Jun 13 20:40:39 2013	(r251701)
+++ stable/8/sys/dev/usb/usbdevs	Thu Jun 13 20:41:09 2013	(r251702)
@@ -1081,6 +1081,7 @@ product APPLE IPOD_TOUCH	0x1291	iPod Tou
 product APPLE IPHONE_3G		0x1292	iPhone 3G
 product APPLE IPHONE_3GS	0x1294	iPhone 3GS
 product APPLE IPHONE_4		0x1297	iPhone 4
+product APPLE IPHONE_4S		0x12a0	iPhone 4S
 product APPLE IPHONE_5		0x12a8  iPhone 5
 product APPLE IPAD		0x129a	iPad
 product APPLE ETHERNET		0x1402	Ethernet A1277

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:46:06 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F3648801;
 Thu, 13 Jun 2013 20:46:05 +0000 (UTC)
 (envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D798711EB;
 Thu, 13 Jun 2013 20:46:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKk5hq006445;
 Thu, 13 Jun 2013 20:46:05 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKk3xd006430;
 Thu, 13 Jun 2013 20:46:03 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201306132046.r5DKk3xd006430@svn.freebsd.org>
From: Jeff Roberson 
Date: Thu, 13 Jun 2013 20:46:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251703 - in head/sys: amd64/amd64 i386/i386 i386/xen
 kern mips/mips sparc64/sparc64 sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:46:06 -0000

Author: jeff
Date: Thu Jun 13 20:46:03 2013
New Revision: 251703
URL: http://svnweb.freebsd.org/changeset/base/251703

Log:
   - Add a BIT_FFS() macro and use it to replace cpusetffs_obj()
  
  Discussed with:	attilio
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/pmap.c
  head/sys/i386/xen/mp_machdep.c
  head/sys/i386/xen/pmap.c
  head/sys/kern/kern_cpuset.c
  head/sys/mips/mips/mp_machdep.c
  head/sys/sparc64/sparc64/mp_machdep.c
  head/sys/sys/bitset.h
  head/sys/sys/cpuset.h

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/amd64/amd64/mp_machdep.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -1150,7 +1150,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask
 		ipi_all_but_self(vector);
 	} else {
 		ncpu = 0;
-		while ((cpu = cpusetobj_ffs(&mask)) != 0) {
+		while ((cpu = CPU_FFS(&mask)) != 0) {
 			cpu--;
 			CPU_CLR(cpu, &mask);
 			CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__,
@@ -1299,7 +1299,7 @@ ipi_selected(cpuset_t cpus, u_int ipi)
 	if (ipi == IPI_STOP_HARD)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &cpus);
 
-	while ((cpu = cpusetobj_ffs(&cpus)) != 0) {
+	while ((cpu = CPU_FFS(&cpus)) != 0) {
 		cpu--;
 		CPU_CLR(cpu, &cpus);
 		CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu, ipi);

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/i386/i386/mp_machdep.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -1249,7 +1249,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask
 		ipi_all_but_self(vector);
 	} else {
 		ncpu = 0;
-		while ((cpu = cpusetobj_ffs(&mask)) != 0) {
+		while ((cpu = CPU_FFS(&mask)) != 0) {
 			cpu--;
 			CPU_CLR(cpu, &mask);
 			CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu,
@@ -1398,7 +1398,7 @@ ipi_selected(cpuset_t cpus, u_int ipi)
 	if (ipi == IPI_STOP_HARD)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &cpus);
 
-	while ((cpu = cpusetobj_ffs(&cpus)) != 0) {
+	while ((cpu = CPU_FFS(&cpus)) != 0) {
 		cpu--;
 		CPU_CLR(cpu, &cpus);
 		CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu, ipi);

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/i386/i386/pmap.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -1957,7 +1957,7 @@ pmap_lazyfix(pmap_t pmap)
 		spins = 50000000;
 
 		/* Find least significant set bit. */
-		lsb = cpusetobj_ffs(&mask);
+		lsb = CPU_FFS(&mask);
 		MPASS(lsb != 0);
 		lsb--;
 		CPU_SETOF(lsb, &mask);

Modified: head/sys/i386/xen/mp_machdep.c
==============================================================================
--- head/sys/i386/xen/mp_machdep.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/i386/xen/mp_machdep.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -1039,7 +1039,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask
 		ipi_all_but_self(vector);
 	} else {
 		ncpu = 0;
-		while ((cpu = cpusetobj_ffs(&mask)) != 0) {
+		while ((cpu = CPU_FFS(&mask)) != 0) {
 			cpu--;
 			CPU_CLR(cpu, &mask);
 			CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu,
@@ -1132,7 +1132,7 @@ ipi_selected(cpuset_t cpus, u_int ipi)
 	if (ipi == IPI_STOP_HARD)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &cpus);
 
-	while ((cpu = cpusetobj_ffs(&cpus)) != 0) {
+	while ((cpu = CPU_FFS(&cpus)) != 0) {
 		cpu--;
 		CPU_CLR(cpu, &cpus);
 		CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu, ipi);

Modified: head/sys/i386/xen/pmap.c
==============================================================================
--- head/sys/i386/xen/pmap.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/i386/xen/pmap.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -1707,7 +1707,7 @@ pmap_lazyfix(pmap_t pmap)
 		spins = 50000000;
 
 		/* Find least significant set bit. */
-		lsb = cpusetobj_ffs(&mask);
+		lsb = CPU_FFS(&mask);
 		MPASS(lsb != 0);
 		lsb--;
 		CPU_SETOF(lsb, &mask);

Modified: head/sys/kern/kern_cpuset.c
==============================================================================
--- head/sys/kern/kern_cpuset.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/kern/kern_cpuset.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -621,26 +621,6 @@ out:
 }
 
 /*
- * Calculate the ffs() of the cpuset.
- */
-int
-cpusetobj_ffs(const cpuset_t *set)
-{
-	size_t i;
-	int cbit;
-
-	cbit = 0;
-	for (i = 0; i < _NCPUWORDS; i++) {
-		if (set->__bits[i] != 0) {
-			cbit = ffsl(set->__bits[i]);
-			cbit += i * _NCPUBITS;
-			break;
-		}
-	}
-	return (cbit);
-}
-
-/*
  * Return a string representing a valid layout for a cpuset_t object.
  * It expects an incoming buffer at least sized as CPUSETBUFSIZ.
  */

Modified: head/sys/mips/mips/mp_machdep.c
==============================================================================
--- head/sys/mips/mips/mp_machdep.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/mips/mips/mp_machdep.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -208,7 +208,7 @@ cpu_mp_setmaxid(void)
 	platform_cpu_mask(&cpumask);
 	mp_ncpus = 0;
 	last = 1;
-	while ((cpu = cpusetobj_ffs(&cpumask)) != 0) {
+	while ((cpu = CPU_FFS(&cpumask)) != 0) {
 		last = cpu;
 		cpu--;
 		CPU_CLR(cpu, &cpumask);
@@ -251,7 +251,7 @@ cpu_mp_start(void)
 	platform_cpu_mask(&cpumask);
 
 	while (!CPU_EMPTY(&cpumask)) {
-		cpuid = cpusetobj_ffs(&cpumask) - 1;
+		cpuid = CPU_FFS(&cpumask) - 1;
 		CPU_CLR(cpuid, &cpumask);
 
 		if (cpuid >= MAXCPU) {

Modified: head/sys/sparc64/sparc64/mp_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/mp_machdep.c	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/sparc64/sparc64/mp_machdep.c	Thu Jun 13 20:46:03 2013	(r251703)
@@ -557,7 +557,7 @@ spitfire_ipi_selected(cpuset_t cpus, u_l
 {
 	u_int cpu;
 
-	while ((cpu = cpusetobj_ffs(&cpus)) != 0) {
+	while ((cpu = CPU_FFS(&cpus)) != 0) {
 		cpu--;
 		CPU_CLR(cpu, &cpus);
 		spitfire_ipi_single(cpu, d0, d1, d2);

Modified: head/sys/sys/bitset.h
==============================================================================
--- head/sys/sys/bitset.h	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/sys/bitset.h	Thu Jun 13 20:46:03 2013	(r251703)
@@ -150,4 +150,19 @@
 		    (f)->__bits[__i]);					\
 } while (0)
 
+#define	BIT_FFS(_s, p) __extension__ ({					\
+	__size_t __i;							\
+	int __bit;							\
+									\
+	__bit = 0;							\
+	for (__i = 0; __i < __bitset_words((_s)); __i++) {		\
+		if ((p)->__bits[__i] != 0) {				\
+			__bit = ffsl((p)->__bits[__i]);			\
+			__bit += __i * _BITSET_BITS;			\
+			break;						\
+		}							\
+	}								\
+	__bit;								\
+})
+
 #endif /* !_SYS_BITSET_H_ */

Modified: head/sys/sys/cpuset.h
==============================================================================
--- head/sys/sys/cpuset.h	Thu Jun 13 20:41:09 2013	(r251702)
+++ head/sys/sys/cpuset.h	Thu Jun 13 20:46:03 2013	(r251703)
@@ -57,6 +57,7 @@
 #define	CPU_SET_ATOMIC(n, p)		BIT_SET_ATOMIC(CPU_SETSIZE, n, p)
 #define	CPU_OR_ATOMIC(d, s)		BIT_OR_ATOMIC(CPU_SETSIZE, d, s)
 #define	CPU_COPY_STORE_REL(f, t)	BIT_COPY_STORE_REL(CPU_SETSIZE, f, t)
+#define	CPU_FFS(p)			BIT_FFS(CPU_SETSIZE, p)
 
 /*
  * Valid cpulevel_t values.
@@ -118,7 +119,6 @@ void	cpuset_rel(struct cpuset *);
 int	cpuset_setthread(lwpid_t id, cpuset_t *);
 int	cpuset_create_root(struct prison *, struct cpuset **);
 int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
-int	cpusetobj_ffs(const cpuset_t *);
 char	*cpusetobj_strprint(char *, const cpuset_t *);
 int	cpusetobj_strscan(cpuset_t *, const char *);
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:46:30 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0F0B496C;
 Thu, 13 Jun 2013 20:46:30 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E5DFC11EE;
 Thu, 13 Jun 2013 20:46:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKkTI4006528;
 Thu, 13 Jun 2013 20:46:29 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKkTTR006526;
 Thu, 13 Jun 2013 20:46:29 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132046.r5DKkTTR006526@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 20:46:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251704 - stable/9/usr.bin/lockf
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:46:30 -0000

Author: eadler
Date: Thu Jun 13 20:46:29 2013
New Revision: 251704
URL: http://svnweb.freebsd.org/changeset/base/251704

Log:
  MFC r250462:
  	Add option to lockf to avoid creating a file if it does not exist.
  
  PR:	bin/170775

Modified:
  stable/9/usr.bin/lockf/lockf.1
  stable/9/usr.bin/lockf/lockf.c
Directory Properties:
  stable/9/usr.bin/lockf/   (props changed)

Modified: stable/9/usr.bin/lockf/lockf.1
==============================================================================
--- stable/9/usr.bin/lockf/lockf.1	Thu Jun 13 20:46:03 2013	(r251703)
+++ stable/9/usr.bin/lockf/lockf.1	Thu Jun 13 20:46:29 2013	(r251704)
@@ -32,7 +32,7 @@
 .Nd execute a command while holding a file lock
 .Sh SYNOPSIS
 .Nm
-.Op Fl ks
+.Op Fl kns
 .Op Fl t Ar seconds
 .Ar file
 .Ar command
@@ -90,6 +90,18 @@ Causes
 .Nm
 to operate silently.
 Failure to acquire the lock is indicated only in the exit status.
+.It Fl n
+Causes
+.Nm
+to fail if the specified lock
+.Ar file
+does not exist. If
+.Fl n
+is not specified,
+.Nm
+will create
+.Ar file
+if necessary.
 .It Fl t Ar seconds
 Specifies a timeout for waiting for the lock.
 By default,
@@ -130,6 +142,10 @@ The
 utility
 was unable to create the lock file, e.g., because of insufficient access
 privileges.
+.It Dv EX_UNAVAILABLE
+The
+.Fl n
+option is specified and the specified lock file does not exist.
 .It Dv EX_USAGE
 There was an error on the
 .Nm

Modified: stable/9/usr.bin/lockf/lockf.c
==============================================================================
--- stable/9/usr.bin/lockf/lockf.c	Thu Jun 13 20:46:03 2013	(r251703)
+++ stable/9/usr.bin/lockf/lockf.c	Thu Jun 13 20:46:29 2013	(r251704)
@@ -56,16 +56,20 @@ static volatile sig_atomic_t timed_out;
 int
 main(int argc, char **argv)
 {
-	int ch, silent, status, waitsec;
+	int ch, flags, silent, status, waitsec;
 	pid_t child;
 
 	silent = keep = 0;
+	flags = O_CREAT;
 	waitsec = -1;	/* Infinite. */
-	while ((ch = getopt(argc, argv, "skt:")) != -1) {
+	while ((ch = getopt(argc, argv, "sknt:")) != -1) {
 		switch (ch) {
 		case 'k':
 			keep = 1;
 			break;
+		case 'n':
+			flags &= ~O_CREAT;
+			break;
 		case 's':
 			silent = 1;
 			break;
@@ -118,13 +122,13 @@ main(int argc, char **argv)
 	 * avoiding the separate step of waiting for the lock.  This
 	 * yields fairness and improved performance.
 	 */
-	lockfd = acquire_lock(lockname, O_NONBLOCK);
+	lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 	while (lockfd == -1 && !timed_out && waitsec != 0) {
 		if (keep)
-			lockfd = acquire_lock(lockname, 0);
+			lockfd = acquire_lock(lockname, flags);
 		else {
 			wait_for_lock(lockname);
-			lockfd = acquire_lock(lockname, O_NONBLOCK);
+			lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 		}
 	}
 	if (waitsec > 0)
@@ -165,7 +169,7 @@ acquire_lock(const char *name, int flags
 {
 	int fd;
 
-	if ((fd = open(name, O_RDONLY|O_CREAT|O_EXLOCK|flags, 0666)) == -1) {
+	if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
 		if (errno == EAGAIN || errno == EINTR)
 			return (-1);
 		err(EX_CANTCREAT, "cannot open %s", name);
@@ -215,7 +219,7 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: lockf [-ks] [-t seconds] file command [arguments]\n");
+	    "usage: lockf [-kns] [-t seconds] file command [arguments]\n");
 	exit(EX_USAGE);
 }
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 20:46:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A400496D;
 Thu, 13 Jun 2013 20:46:31 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8650511EF;
 Thu, 13 Jun 2013 20:46:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DKkVHq006565;
 Thu, 13 Jun 2013 20:46:31 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DKkVvF006563;
 Thu, 13 Jun 2013 20:46:31 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132046.r5DKkVvF006563@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 20:46:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251705 - stable/8/usr.bin/lockf
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 20:46:31 -0000

Author: eadler
Date: Thu Jun 13 20:46:30 2013
New Revision: 251705
URL: http://svnweb.freebsd.org/changeset/base/251705

Log:
  MFC r250462:
  	Add option to lockf to avoid creating a file if it does not exist.
  
  PR:	bin/170775

Modified:
  stable/8/usr.bin/lockf/lockf.1
  stable/8/usr.bin/lockf/lockf.c
Directory Properties:
  stable/8/usr.bin/lockf/   (props changed)

Modified: stable/8/usr.bin/lockf/lockf.1
==============================================================================
--- stable/8/usr.bin/lockf/lockf.1	Thu Jun 13 20:46:29 2013	(r251704)
+++ stable/8/usr.bin/lockf/lockf.1	Thu Jun 13 20:46:30 2013	(r251705)
@@ -32,7 +32,7 @@
 .Nd execute a command while holding a file lock
 .Sh SYNOPSIS
 .Nm
-.Op Fl ks
+.Op Fl kns
 .Op Fl t Ar seconds
 .Ar file
 .Ar command
@@ -90,6 +90,18 @@ Causes
 .Nm
 to operate silently.
 Failure to acquire the lock is indicated only in the exit status.
+.It Fl n
+Causes
+.Nm
+to fail if the specified lock
+.Ar file
+does not exist. If
+.Fl n
+is not specified,
+.Nm
+will create
+.Ar file
+if necessary.
 .It Fl t Ar seconds
 Specifies a timeout for waiting for the lock.
 By default,
@@ -130,6 +142,10 @@ The
 utility
 was unable to create the lock file, e.g., because of insufficient access
 privileges.
+.It Dv EX_UNAVAILABLE
+The
+.Fl n
+option is specified and the specified lock file does not exist.
 .It Dv EX_USAGE
 There was an error on the
 .Nm

Modified: stable/8/usr.bin/lockf/lockf.c
==============================================================================
--- stable/8/usr.bin/lockf/lockf.c	Thu Jun 13 20:46:29 2013	(r251704)
+++ stable/8/usr.bin/lockf/lockf.c	Thu Jun 13 20:46:30 2013	(r251705)
@@ -56,16 +56,20 @@ static volatile sig_atomic_t timed_out;
 int
 main(int argc, char **argv)
 {
-	int ch, silent, status, waitsec;
+	int ch, flags, silent, status, waitsec;
 	pid_t child;
 
 	silent = keep = 0;
+	flags = O_CREAT;
 	waitsec = -1;	/* Infinite. */
-	while ((ch = getopt(argc, argv, "skt:")) != -1) {
+	while ((ch = getopt(argc, argv, "sknt:")) != -1) {
 		switch (ch) {
 		case 'k':
 			keep = 1;
 			break;
+		case 'n':
+			flags &= ~O_CREAT;
+			break;
 		case 's':
 			silent = 1;
 			break;
@@ -118,13 +122,13 @@ main(int argc, char **argv)
 	 * avoiding the separate step of waiting for the lock.  This
 	 * yields fairness and improved performance.
 	 */
-	lockfd = acquire_lock(lockname, O_NONBLOCK);
+	lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 	while (lockfd == -1 && !timed_out && waitsec != 0) {
 		if (keep)
-			lockfd = acquire_lock(lockname, 0);
+			lockfd = acquire_lock(lockname, flags);
 		else {
 			wait_for_lock(lockname);
-			lockfd = acquire_lock(lockname, O_NONBLOCK);
+			lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 		}
 	}
 	if (waitsec > 0)
@@ -165,7 +169,7 @@ acquire_lock(const char *name, int flags
 {
 	int fd;
 
-	if ((fd = open(name, O_RDONLY|O_CREAT|O_EXLOCK|flags, 0666)) == -1) {
+	if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
 		if (errno == EAGAIN || errno == EINTR)
 			return (-1);
 		err(EX_CANTCREAT, "cannot open %s", name);
@@ -215,7 +219,7 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: lockf [-ks] [-t seconds] file command [arguments]\n");
+	    "usage: lockf [-kns] [-t seconds] file command [arguments]\n");
 	exit(EX_USAGE);
 }
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:01:33 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 978D1FFF;
 Thu, 13 Jun 2013 21:01:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8848D12A0;
 Thu, 13 Jun 2013 21:01:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL1X1q012195;
 Thu, 13 Jun 2013 21:01:33 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL1XUo012194;
 Thu, 13 Jun 2013 21:01:33 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306132101.r5DL1XUo012194@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 21:01:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251706 - stable/8/sys/dev/pci
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:01:33 -0000

Author: jhb
Date: Thu Jun 13 21:01:33 2013
New Revision: 251706
URL: http://svnweb.freebsd.org/changeset/base/251706

Log:
  MFC 249315:
  Proxy allocation requests for the PCI ROM BAR from child devices similar
  to how the VGA bus driver currently proxies allocation requests for other
  PCI BARs.

Modified:
  stable/8/sys/dev/pci/vga_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/pci/   (props changed)

Modified: stable/8/sys/dev/pci/vga_pci.c
==============================================================================
--- stable/8/sys/dev/pci/vga_pci.c	Thu Jun 13 20:46:30 2013	(r251705)
+++ stable/8/sys/dev/pci/vga_pci.c	Thu Jun 13 21:01:33 2013	(r251706)
@@ -56,7 +56,8 @@ struct vga_resource {
 
 struct vga_pci_softc {
 	device_t	vga_msi_child;	/* Child driver using MSI. */
-	struct vga_resource vga_res[PCIR_MAX_BAR_0 + 1];
+	struct vga_resource vga_bars[PCIR_MAX_BAR_0 + 1];
+	struct vga_resource vga_bios;
 };
 
 SYSCTL_DECL(_hw_pci);
@@ -155,12 +156,24 @@ vga_pci_teardown_intr(device_t dev, devi
 	return (BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie));
 }
 
+static struct vga_resource *
+lookup_res(struct vga_pci_softc *sc, int rid)
+{
+	int bar;
+
+	if (rid == PCIR_BIOS)
+		return (&sc->vga_bios);
+	bar = PCI_RID2BAR(rid);
+	if (bar >= 0 && bar <= PCIR_MAX_BAR_0)
+		return (&sc->vga_bars[bar]);
+	return (NULL);
+}
+
 static struct resource *
 vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
-	struct vga_pci_softc *sc;
-	int bar;
+	struct vga_resource *vr;
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -169,16 +182,15 @@ vga_pci_alloc_resource(device_t dev, dev
 		 * For BARs, we cache the resource so that we only allocate it
 		 * from the PCI bus once.
 		 */
-		bar = PCI_RID2BAR(*rid);
-		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+		vr = lookup_res(device_get_softc(dev), *rid);
+		if (vr == NULL)
 			return (NULL);
-		sc = device_get_softc(dev);
-		if (sc->vga_res[bar].vr_res == NULL)
-			sc->vga_res[bar].vr_res = bus_alloc_resource(dev, type,
-			    rid, start, end, count, flags);
-		if (sc->vga_res[bar].vr_res != NULL)
-			sc->vga_res[bar].vr_refs++;
-		return (sc->vga_res[bar].vr_res);
+		if (vr->vr_res == NULL)
+			vr->vr_res = bus_alloc_resource(dev, type, rid, start,
+			    end, count, flags);
+		if (vr->vr_res != NULL)
+			vr->vr_refs++;
+		return (vr->vr_res);
 	}
 	return (bus_alloc_resource(dev, type, rid, start, end, count, flags));
 }
@@ -187,8 +199,8 @@ static int
 vga_pci_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
-	struct vga_pci_softc *sc;
-	int bar, error;
+	struct vga_resource *vr;
+	int error;
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -197,24 +209,22 @@ vga_pci_release_resource(device_t dev, d
 		 * For BARs, we release the resource from the PCI bus
 		 * when the last child reference goes away.
 		 */
-		bar = PCI_RID2BAR(rid);
-		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+		vr = lookup_res(device_get_softc(dev), rid);
+		if (vr == NULL)
 			return (EINVAL);
-		sc = device_get_softc(dev);
-		if (sc->vga_res[bar].vr_res == NULL)
+		if (vr->vr_res == NULL)
 			return (EINVAL);
-		KASSERT(sc->vga_res[bar].vr_res == r,
-		    ("vga_pci resource mismatch"));
-		if (sc->vga_res[bar].vr_refs > 1) {
-			sc->vga_res[bar].vr_refs--;
+		KASSERT(vr->vr_res == r, ("vga_pci resource mismatch"));
+		if (vr->vr_refs > 1) {
+			vr->vr_refs--;
 			return (0);
 		}
-		KASSERT(sc->vga_res[bar].vr_refs > 0,
+		KASSERT(vr->vr_refs > 0,
 		    ("vga_pci resource reference count underflow"));
 		error = bus_release_resource(dev, type, rid, r);
 		if (error == 0) {
-			sc->vga_res[bar].vr_res = NULL;
-			sc->vga_res[bar].vr_refs = 0;
+			vr->vr_res = NULL;
+			vr->vr_refs = 0;
 		}
 		return (error);
 	}

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:02:44 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9DE162A2;
 Thu, 13 Jun 2013 21:02:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8EB4012BA;
 Thu, 13 Jun 2013 21:02:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL2ia0012461;
 Thu, 13 Jun 2013 21:02:44 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL2iNY012460;
 Thu, 13 Jun 2013 21:02:44 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306132102.r5DL2iNY012460@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 21:02:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251707 - stable/9/sbin/dhclient
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:02:44 -0000

Author: jhb
Date: Thu Jun 13 21:02:44 2013
New Revision: 251707
URL: http://svnweb.freebsd.org/changeset/base/251707

Log:
  MFC 249766: Use a higher TTL (128) for DHCP packets.

Modified:
  stable/9/sbin/dhclient/packet.c
Directory Properties:
  stable/9/sbin/dhclient/   (props changed)

Modified: stable/9/sbin/dhclient/packet.c
==============================================================================
--- stable/9/sbin/dhclient/packet.c	Thu Jun 13 21:01:33 2013	(r251706)
+++ stable/9/sbin/dhclient/packet.c	Thu Jun 13 21:02:44 2013	(r251707)
@@ -128,7 +128,7 @@ assemble_udp_ip_header(unsigned char *bu
 	ip.ip_len = htons(sizeof(ip) + sizeof(udp) + len);
 	ip.ip_id = 0;
 	ip.ip_off = 0;
-	ip.ip_ttl = 16;
+	ip.ip_ttl = 128;
 	ip.ip_p = IPPROTO_UDP;
 	ip.ip_sum = 0;
 	ip.ip_src.s_addr = from;

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:03:24 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3DCDD411;
 Thu, 13 Jun 2013 21:03:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2FF7D12C0;
 Thu, 13 Jun 2013 21:03:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL3OGO012629;
 Thu, 13 Jun 2013 21:03:24 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL3OTH012628;
 Thu, 13 Jun 2013 21:03:24 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306132103.r5DL3OTH012628@svn.freebsd.org>
From: John Baldwin 
Date: Thu, 13 Jun 2013 21:03:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251708 - stable/8/sbin/dhclient
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:03:24 -0000

Author: jhb
Date: Thu Jun 13 21:03:23 2013
New Revision: 251708
URL: http://svnweb.freebsd.org/changeset/base/251708

Log:
  MFC 249766: Use a higher TTL (128) for DHCP packets.

Modified:
  stable/8/sbin/dhclient/packet.c
Directory Properties:
  stable/8/sbin/dhclient/   (props changed)

Modified: stable/8/sbin/dhclient/packet.c
==============================================================================
--- stable/8/sbin/dhclient/packet.c	Thu Jun 13 21:02:44 2013	(r251707)
+++ stable/8/sbin/dhclient/packet.c	Thu Jun 13 21:03:23 2013	(r251708)
@@ -128,7 +128,7 @@ assemble_udp_ip_header(unsigned char *bu
 	ip.ip_len = htons(sizeof(ip) + sizeof(udp) + len);
 	ip.ip_id = 0;
 	ip.ip_off = 0;
-	ip.ip_ttl = 16;
+	ip.ip_ttl = 128;
 	ip.ip_p = IPPROTO_UDP;
 	ip.ip_sum = 0;
 	ip.ip_src.s_addr = from;

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:05:39 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F27EB592;
 Thu, 13 Jun 2013 21:05:38 +0000 (UTC)
 (envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3D4C12D1;
 Thu, 13 Jun 2013 21:05:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL5car013094;
 Thu, 13 Jun 2013 21:05:38 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL5c4F013089;
 Thu, 13 Jun 2013 21:05:38 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201306132105.r5DL5c4F013089@svn.freebsd.org>
From: Jeff Roberson 
Date: Thu, 13 Jun 2013 21:05:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251709 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:05:39 -0000

Author: jeff
Date: Thu Jun 13 21:05:38 2013
New Revision: 251709
URL: http://svnweb.freebsd.org/changeset/base/251709

Log:
   - Convert the slab free item list from a linked array of indices to a
     bitmap using sys/bitset.  This is much simpler, has lower space
     overhead and is cheaper in most cases.
   - Use a second bitmap for invariants asserts and improve the quality of
     the asserts as well as the number of erroneous conditions that we will
     catch.
   - Drastically simplify sizing code.  Special case refcnt zones since they
     will be going away.
   - Update stale comments.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/vm/uma_core.c
  head/sys/vm/uma_dbg.c
  head/sys/vm/uma_int.h

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Thu Jun 13 21:03:23 2013	(r251708)
+++ head/sys/vm/uma_core.c	Thu Jun 13 21:05:38 2013	(r251709)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002-2005, 2009 Jeffrey Roberson 
+ * Copyright (c) 2002-2005, 2009, 2013 Jeffrey Roberson 
  * Copyright (c) 2004, 2005 Bosko Milekic 
  * Copyright (c) 2004-2006 Robert N. M. Watson
  * All rights reserved.
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -145,8 +146,13 @@ static int booted = 0;
 #define	UMA_STARTUP2	2
 
 /* Maximum number of allowed items-per-slab if the slab header is OFFPAGE */
-static u_int uma_max_ipers;
-static u_int uma_max_ipers_ref;
+static const u_int uma_max_ipers = SLAB_SETSIZE;
+
+/*
+ * Only mbuf clusters use ref zones.  Just provide enough references
+ * to support the one user.  New code should not use the ref facility.
+ */
+static const u_int uma_max_ipers_ref = PAGE_SIZE / MCLBYTES;
 
 /*
  * This is the handle used to schedule events that need to happen
@@ -208,7 +214,7 @@ static uint8_t bucket_size[BUCKET_ZONES]
 /*
  * Flags and enumerations to be passed to internal functions.
  */
-enum zfreeskip { SKIP_NONE, SKIP_DTOR, SKIP_FINI };
+enum zfreeskip { SKIP_NONE = 0, SKIP_DTOR, SKIP_FINI };
 
 #define	ZFREE_STATFAIL	0x00000001	/* Update zone failure statistic. */
 #define	ZFREE_STATFREE	0x00000002	/* Update zone free statistic. */
@@ -885,18 +891,15 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t
 	slab->us_keg = keg;
 	slab->us_data = mem;
 	slab->us_freecount = keg->uk_ipers;
-	slab->us_firstfree = 0;
 	slab->us_flags = flags;
-
+	BIT_FILL(SLAB_SETSIZE, &slab->us_free);
+#ifdef INVARIANTS
+	BIT_ZERO(SLAB_SETSIZE, &slab->us_debugfree);
+#endif
 	if (keg->uk_flags & UMA_ZONE_REFCNT) {
 		slabref = (uma_slabrefcnt_t)slab;
-		for (i = 0; i < keg->uk_ipers; i++) {
-			slabref->us_freelist[i].us_refcnt = 0;
-			slabref->us_freelist[i].us_item = i+1;
-		}
-	} else {
 		for (i = 0; i < keg->uk_ipers; i++)
-			slab->us_freelist[i].us_item = i+1;
+			slabref->us_refcnt[i] = 0;
 	}
 
 	if (keg->uk_init != NULL) {
@@ -1148,31 +1151,32 @@ keg_small_init(uma_keg_t keg)
 		keg->uk_ppera = 1;
 	}
 
+	/*
+	 * Calculate the size of each allocation (rsize) according to
+	 * alignment.  If the requested size is smaller than we have
+	 * allocation bits for we round it up.
+	 */
 	rsize = keg->uk_size;
-
+	if (rsize < keg->uk_slabsize / SLAB_SETSIZE)
+		rsize = keg->uk_slabsize / SLAB_SETSIZE;
 	if (rsize & keg->uk_align)
 		rsize = (rsize & ~keg->uk_align) + (keg->uk_align + 1);
-	if (rsize < keg->uk_slabsize / 256)
-		rsize = keg->uk_slabsize / 256;
-
 	keg->uk_rsize = rsize;
 
 	KASSERT((keg->uk_flags & UMA_ZONE_PCPU) == 0 ||
 	    keg->uk_rsize < sizeof(struct pcpu),
 	    ("%s: size %u too large", __func__, keg->uk_rsize));
 
-	if (keg->uk_flags & UMA_ZONE_OFFPAGE) {
+	if (keg->uk_flags & UMA_ZONE_REFCNT)
+		rsize += sizeof(uint32_t);
+
+	if (keg->uk_flags & UMA_ZONE_OFFPAGE)
 		shsize = 0;
-	} else if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		rsize += UMA_FRITMREF_SZ;	/* linkage & refcnt */
-		shsize = sizeof(struct uma_slab_refcnt);
-	} else {
-		rsize += UMA_FRITM_SZ;	/* Account for linkage */
+	else 
 		shsize = sizeof(struct uma_slab);
-	}
 
 	keg->uk_ipers = (keg->uk_slabsize - shsize) / rsize;
-	KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 256,
+	KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= SLAB_SETSIZE,
 	    ("%s: keg->uk_ipers %u", __func__, keg->uk_ipers));
 
 	memused = keg->uk_ipers * rsize + shsize;
@@ -1189,10 +1193,18 @@ keg_small_init(uma_keg_t keg)
 	    (keg->uk_flags & UMA_ZFLAG_CACHEONLY))
 		return;
 
+	/*
+	 * See if using an OFFPAGE slab will limit our waste.  Only do
+	 * this if it permits more items per-slab.
+	 *
+	 * XXX We could try growing slabsize to limit max waste as well.
+	 * Historically this was not done because the VM could not
+	 * efficiently handle contiguous allocations.
+	 */
 	if ((wastedspace >= keg->uk_slabsize / UMA_MAX_WASTE) &&
 	    (keg->uk_ipers < (keg->uk_slabsize / keg->uk_rsize))) {
 		keg->uk_ipers = keg->uk_slabsize / keg->uk_rsize;
-		KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 256,
+		KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= SLAB_SETSIZE,
 		    ("%s: keg->uk_ipers %u", __func__, keg->uk_ipers));
 #ifdef UMA_DEBUG
 		printf("UMA decided we need offpage slab headers for "
@@ -1331,34 +1343,29 @@ keg_ctor(void *mem, int size, void *udat
 		keg->uk_flags &= ~UMA_ZONE_PCPU;
 #endif
 
-	/*
-	 * The +UMA_FRITM_SZ added to uk_size is to account for the
-	 * linkage that is added to the size in keg_small_init().  If
-	 * we don't account for this here then we may end up in
-	 * keg_small_init() with a calculated 'ipers' of 0.
-	 */
-	if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		if (keg->uk_flags & UMA_ZONE_CACHESPREAD)
-			keg_cachespread_init(keg);
-		else if ((keg->uk_size+UMA_FRITMREF_SZ) >
-		    (UMA_SLAB_SIZE - sizeof(struct uma_slab_refcnt)))
+	if (keg->uk_flags & UMA_ZONE_CACHESPREAD) {
+		keg_cachespread_init(keg);
+	} else if (keg->uk_flags & UMA_ZONE_REFCNT) {
+		if (keg->uk_size >
+		    (UMA_SLAB_SIZE - sizeof(struct uma_slab_refcnt) -
+		    sizeof(uint32_t)))
 			keg_large_init(keg);
 		else
 			keg_small_init(keg);
 	} else {
-		if (keg->uk_flags & UMA_ZONE_CACHESPREAD)
-			keg_cachespread_init(keg);
-		else if ((keg->uk_size+UMA_FRITM_SZ) >
-		    (UMA_SLAB_SIZE - sizeof(struct uma_slab)))
+		if (keg->uk_size > (UMA_SLAB_SIZE - sizeof(struct uma_slab)))
 			keg_large_init(keg);
 		else
 			keg_small_init(keg);
 	}
 
 	if (keg->uk_flags & UMA_ZONE_OFFPAGE) {
-		if (keg->uk_flags & UMA_ZONE_REFCNT)
+		if (keg->uk_flags & UMA_ZONE_REFCNT) {
+			if (keg->uk_ipers > uma_max_ipers_ref)
+				panic("Too many ref items per zone: %d > %d\n",
+				    keg->uk_ipers, uma_max_ipers_ref);
 			keg->uk_slabzone = slabrefzone;
-		else
+		} else
 			keg->uk_slabzone = slabzone;
 	}
 
@@ -1398,25 +1405,17 @@ keg_ctor(void *mem, int size, void *udat
 		u_int totsize;
 
 		/* Size of the slab struct and free list */
+		totsize = sizeof(struct uma_slab);
+
+		/* Size of the reference counts. */
 		if (keg->uk_flags & UMA_ZONE_REFCNT)
-			totsize = sizeof(struct uma_slab_refcnt) +
-			    keg->uk_ipers * UMA_FRITMREF_SZ;
-		else
-			totsize = sizeof(struct uma_slab) +
-			    keg->uk_ipers * UMA_FRITM_SZ;
+			totsize += keg->uk_ipers * sizeof(uint32_t);
 
 		if (totsize & UMA_ALIGN_PTR)
 			totsize = (totsize & ~UMA_ALIGN_PTR) +
 			    (UMA_ALIGN_PTR + 1);
 		keg->uk_pgoff = (PAGE_SIZE * keg->uk_ppera) - totsize;
 
-		if (keg->uk_flags & UMA_ZONE_REFCNT)
-			totsize = keg->uk_pgoff + sizeof(struct uma_slab_refcnt)
-			    + keg->uk_ipers * UMA_FRITMREF_SZ;
-		else
-			totsize = keg->uk_pgoff + sizeof(struct uma_slab)
-			    + keg->uk_ipers * UMA_FRITM_SZ;
-
 		/*
 		 * The only way the following is possible is if with our
 		 * UMA_ALIGN_PTR adjustments we are now bigger than
@@ -1424,6 +1423,9 @@ keg_ctor(void *mem, int size, void *udat
 		 * mathematically possible for all cases, so we make
 		 * sure here anyway.
 		 */
+		totsize = keg->uk_pgoff + sizeof(struct uma_slab);
+		if (keg->uk_flags & UMA_ZONE_REFCNT)
+			totsize += keg->uk_ipers * sizeof(uint32_t);
 		if (totsize > PAGE_SIZE * keg->uk_ppera) {
 			printf("zone %s ipers %d rsize %d size %d\n",
 			    zone->uz_name, keg->uk_ipers, keg->uk_rsize,
@@ -1655,7 +1657,6 @@ uma_startup(void *bootmem, int boot_page
 	struct uma_zctor_args args;
 	uma_slab_t slab;
 	u_int slabsize;
-	u_int objsize, totsize, wsize;
 	int i;
 
 #ifdef UMA_DEBUG
@@ -1663,79 +1664,6 @@ uma_startup(void *bootmem, int boot_page
 #endif
 	mtx_init(&uma_mtx, "UMA lock", NULL, MTX_DEF);
 
-	/*
-	 * Figure out the maximum number of items-per-slab we'll have if
-	 * we're using the OFFPAGE slab header to track free items, given
-	 * all possible object sizes and the maximum desired wastage
-	 * (UMA_MAX_WASTE).
-	 *
-	 * We iterate until we find an object size for
-	 * which the calculated wastage in keg_small_init() will be
-	 * enough to warrant OFFPAGE.  Since wastedspace versus objsize
-	 * is an overall increasing see-saw function, we find the smallest
-	 * objsize such that the wastage is always acceptable for objects
-	 * with that objsize or smaller.  Since a smaller objsize always
-	 * generates a larger possible uma_max_ipers, we use this computed
-	 * objsize to calculate the largest ipers possible.  Since the
-	 * ipers calculated for OFFPAGE slab headers is always larger than
-	 * the ipers initially calculated in keg_small_init(), we use
-	 * the former's equation (UMA_SLAB_SIZE / keg->uk_rsize) to
-	 * obtain the maximum ipers possible for offpage slab headers.
-	 *
-	 * It should be noted that ipers versus objsize is an inversly
-	 * proportional function which drops off rather quickly so as
-	 * long as our UMA_MAX_WASTE is such that the objsize we calculate
-	 * falls into the portion of the inverse relation AFTER the steep
-	 * falloff, then uma_max_ipers shouldn't be too high (~10 on i386).
-	 *
-	 * Note that we have 8-bits (1 byte) to use as a freelist index
-	 * inside the actual slab header itself and this is enough to
-	 * accomodate us.  In the worst case, a UMA_SMALLEST_UNIT sized
-	 * object with offpage slab header would have ipers =
-	 * UMA_SLAB_SIZE / UMA_SMALLEST_UNIT (currently = 256), which is
-	 * 1 greater than what our byte-integer freelist index can
-	 * accomodate, but we know that this situation never occurs as
-	 * for UMA_SMALLEST_UNIT-sized objects, we will never calculate
-	 * that we need to go to offpage slab headers.  Or, if we do,
-	 * then we trap that condition below and panic in the INVARIANTS case.
-	 */
-	wsize = UMA_SLAB_SIZE - sizeof(struct uma_slab) -
-	    (UMA_SLAB_SIZE / UMA_MAX_WASTE);
-	totsize = wsize;
-	objsize = UMA_SMALLEST_UNIT;
-	while (totsize >= wsize) {
-		totsize = (UMA_SLAB_SIZE - sizeof(struct uma_slab)) /
-		    (objsize + UMA_FRITM_SZ);
-		totsize *= (UMA_FRITM_SZ + objsize);
-		objsize++;
-	}
-	if (objsize > UMA_SMALLEST_UNIT)
-		objsize--;
-	uma_max_ipers = MAX(UMA_SLAB_SIZE / objsize, 64);
-
-	wsize = UMA_SLAB_SIZE - sizeof(struct uma_slab_refcnt) -
-	    (UMA_SLAB_SIZE / UMA_MAX_WASTE);
-	totsize = wsize;
-	objsize = UMA_SMALLEST_UNIT;
-	while (totsize >= wsize) {
-		totsize = (UMA_SLAB_SIZE - sizeof(struct uma_slab_refcnt)) /
-		    (objsize + UMA_FRITMREF_SZ);
-		totsize *= (UMA_FRITMREF_SZ + objsize);
-		objsize++;
-	}
-	if (objsize > UMA_SMALLEST_UNIT)
-		objsize--;
-	uma_max_ipers_ref = MAX(UMA_SLAB_SIZE / objsize, 64);
-
-	KASSERT((uma_max_ipers_ref <= 256) && (uma_max_ipers <= 256),
-	    ("uma_startup: calculated uma_max_ipers values too large!"));
-
-#ifdef UMA_DEBUG
-	printf("Calculated uma_max_ipers (for OFFPAGE) is %d\n", uma_max_ipers);
-	printf("Calculated uma_max_ipers_ref (for OFFPAGE) is %d\n",
-	    uma_max_ipers_ref);
-#endif
-
 	/* "manually" create the initial zone */
 	args.name = "UMA Kegs";
 	args.size = sizeof(struct uma_keg);
@@ -1783,16 +1711,9 @@ uma_startup(void *bootmem, int boot_page
 	printf("Creating slab and hash zones.\n");
 #endif
 
-	/*
-	 * This is the max number of free list items we'll have with
-	 * offpage slabs.
-	 */
-	slabsize = uma_max_ipers * UMA_FRITM_SZ;
-	slabsize += sizeof(struct uma_slab);
-
 	/* Now make a zone for slab headers */
 	slabzone = uma_zcreate("UMA Slabs",
-				slabsize,
+				sizeof(struct uma_slab),
 				NULL, NULL, NULL, NULL,
 				UMA_ALIGN_PTR, UMA_ZFLAG_INTERNAL);
 
@@ -1800,8 +1721,8 @@ uma_startup(void *bootmem, int boot_page
 	 * We also create a zone for the bigger slabs with reference
 	 * counts in them, to accomodate UMA_ZONE_REFCNT zones.
 	 */
-	slabsize = uma_max_ipers_ref * UMA_FRITMREF_SZ;
-	slabsize += sizeof(struct uma_slab_refcnt);
+	slabsize = sizeof(struct uma_slab_refcnt);
+	slabsize += uma_max_ipers_ref * sizeof(uint32_t);
 	slabrefzone = uma_zcreate("UMA RCntSlabs",
 				  slabsize,
 				  NULL, NULL, NULL, NULL,
@@ -2087,11 +2008,6 @@ zalloc_start:
 			    ("uma_zalloc: Bucket pointer mangled."));
 			cache->uc_allocs++;
 			critical_exit();
-#ifdef INVARIANTS
-			ZONE_LOCK(zone);
-			uma_dbg_alloc(zone, NULL, item);
-			ZONE_UNLOCK(zone);
-#endif
 			if (zone->uz_ctor != NULL) {
 				if (zone->uz_ctor(item, zone->uz_size,
 				    udata, flags) != 0) {
@@ -2101,6 +2017,9 @@ zalloc_start:
 					return (NULL);
 				}
 			}
+#ifdef INVARIANTS
+			uma_dbg_alloc(zone, NULL, item);
+#endif
 			if (flags & M_ZERO)
 				bzero(item, zone->uz_size);
 			return (item);
@@ -2403,27 +2322,18 @@ static void *
 slab_alloc_item(uma_zone_t zone, uma_slab_t slab)
 {
 	uma_keg_t keg;
-	uma_slabrefcnt_t slabref;
 	void *item;
 	uint8_t freei;
 
 	keg = slab->us_keg;
 	mtx_assert(&keg->uk_lock, MA_OWNED);
 
-	freei = slab->us_firstfree;
-	if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		slabref = (uma_slabrefcnt_t)slab;
-		slab->us_firstfree = slabref->us_freelist[freei].us_item;
-	} else {
-		slab->us_firstfree = slab->us_freelist[freei].us_item;
-	}
+	freei = BIT_FFS(SLAB_SETSIZE, &slab->us_free) - 1;
+	BIT_CLR(SLAB_SETSIZE, freei, &slab->us_free);
 	item = slab->us_data + (keg->uk_rsize * freei);
-
 	slab->us_freecount--;
 	keg->uk_free--;
-#ifdef INVARIANTS
-	uma_dbg_alloc(zone, slab, item);
-#endif
+
 	/* Move this slab to the full list */
 	if (slab->us_freecount == 0) {
 		LIST_REMOVE(slab, us_link);
@@ -2602,6 +2512,9 @@ zone_alloc_item(uma_zone_t zone, void *u
 			return (NULL);
 		}
 	}
+#ifdef INVARIANTS
+	uma_dbg_alloc(zone, slab, item);
+#endif
 	if (flags & M_ZERO)
 		bzero(item, zone->uz_size);
 
@@ -2636,17 +2549,15 @@ uma_zfree_arg(uma_zone_t zone, void *ite
 		return;
 	}
 #endif
-	if (zone->uz_dtor)
-		zone->uz_dtor(item, zone->uz_size, udata);
-
 #ifdef INVARIANTS
-	ZONE_LOCK(zone);
 	if (zone->uz_flags & UMA_ZONE_MALLOC)
 		uma_dbg_free(zone, udata, item);
 	else
 		uma_dbg_free(zone, NULL, item);
-	ZONE_UNLOCK(zone);
 #endif
+	if (zone->uz_dtor)
+		zone->uz_dtor(item, zone->uz_size, udata);
+
 	/*
 	 * The race here is acceptable.  If we miss it we'll just have to wait
 	 * a little longer for the limits to be reset.
@@ -2807,12 +2718,19 @@ zone_free_item(uma_zone_t zone, void *it
     enum zfreeskip skip, int flags)
 {
 	uma_slab_t slab;
-	uma_slabrefcnt_t slabref;
 	uma_keg_t keg;
 	uint8_t *mem;
 	uint8_t freei;
 	int clearfull;
 
+#ifdef INVARIANTS
+	if (skip == SKIP_NONE) {
+		if (zone->uz_flags & UMA_ZONE_MALLOC)
+			uma_dbg_free(zone, udata, item);
+		else
+			uma_dbg_free(zone, NULL, item);
+	}
+#endif
 	if (skip < SKIP_DTOR && zone->uz_dtor)
 		zone->uz_dtor(item, zone->uz_size, udata);
 
@@ -2827,7 +2745,7 @@ zone_free_item(uma_zone_t zone, void *it
 		zone->uz_frees++;
 
 	if (!(zone->uz_flags & UMA_ZONE_VTOSLAB)) {
-		mem = (uint8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
+		mem = (uint8_t *)((uintptr_t)item & (~UMA_SLAB_MASK));
 		keg = zone_first_keg(zone); /* Must only be one. */
 		if (zone->uz_flags & UMA_ZONE_HASH) {
 			slab = hash_sfind(&keg->uk_hash, mem);
@@ -2855,25 +2773,12 @@ zone_free_item(uma_zone_t zone, void *it
 		LIST_INSERT_HEAD(&keg->uk_part_slab, slab, us_link);
 	}
 
-	/* Slab management stuff */
-	freei = ((unsigned long)item - (unsigned long)slab->us_data)
-		/ keg->uk_rsize;
-
-#ifdef INVARIANTS
-	if (!skip)
-		uma_dbg_free(zone, slab, item);
-#endif
-
-	if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		slabref = (uma_slabrefcnt_t)slab;
-		slabref->us_freelist[freei].us_item = slab->us_firstfree;
-	} else {
-		slab->us_freelist[freei].us_item = slab->us_firstfree;
-	}
-	slab->us_firstfree = freei;
+	/* Slab management. */
+	freei = ((uintptr_t)item - (uintptr_t)slab->us_data) / keg->uk_rsize;
+	BIT_SET(SLAB_SETSIZE, freei, &slab->us_free);
 	slab->us_freecount++;
 
-	/* Zone statistics */
+	/* Keg statistics. */
 	keg->uk_free++;
 
 	clearfull = 0;
@@ -2884,9 +2789,10 @@ zone_free_item(uma_zone_t zone, void *it
 		}
 
 		/* 
-		 * We can handle one more allocation. Since we're clearing ZFLAG_FULL,
-		 * wake up all procs blocked on pages. This should be uncommon, so 
-		 * keeping this simple for now (rather than adding count of blocked 
+		 * We can handle one more allocation. Since we're
+		 * clearing ZFLAG_FULL, wake up all procs blocked
+		 * on pages. This should be uncommon, so keeping this
+		 * simple for now (rather than adding count of blocked 
 		 * threads etc).
 		 */
 		wakeup(keg);
@@ -2898,6 +2804,7 @@ zone_free_item(uma_zone_t zone, void *it
 		ZONE_UNLOCK(zone);
 	} else
 		KEG_UNLOCK(keg);
+
 }
 
 /* See uma.h */
@@ -3107,18 +3014,18 @@ uint32_t *
 uma_find_refcnt(uma_zone_t zone, void *item)
 {
 	uma_slabrefcnt_t slabref;
+	uma_slab_t slab;
 	uma_keg_t keg;
 	uint32_t *refcnt;
 	int idx;
 
-	slabref = (uma_slabrefcnt_t)vtoslab((vm_offset_t)item &
-	    (~UMA_SLAB_MASK));
-	keg = slabref->us_keg;
-	KASSERT(slabref != NULL && slabref->us_keg->uk_flags & UMA_ZONE_REFCNT,
+	slab = vtoslab((vm_offset_t)item & (~UMA_SLAB_MASK));
+	slabref = (uma_slabrefcnt_t)slab;
+	keg = slab->us_keg;
+	KASSERT(keg->uk_flags & UMA_ZONE_REFCNT,
 	    ("uma_find_refcnt(): zone possibly not UMA_ZONE_REFCNT"));
-	idx = ((unsigned long)item - (unsigned long)slabref->us_data)
-	    / keg->uk_rsize;
-	refcnt = &slabref->us_freelist[idx].us_refcnt;
+	idx = ((uintptr_t)item - (uintptr_t)slab->us_data) / keg->uk_rsize;
+	refcnt = &slabref->us_refcnt[idx];
 	return refcnt;
 }
 
@@ -3200,9 +3107,8 @@ uma_print_stats(void)
 static void
 slab_print(uma_slab_t slab)
 {
-	printf("slab: keg %p, data %p, freecount %d, firstfree %d\n",
-		slab->us_keg, slab->us_data, slab->us_freecount,
-		slab->us_firstfree);
+	printf("slab: keg %p, data %p, freecount %d\n",
+		slab->us_keg, slab->us_data, slab->us_freecount);
 }
 
 static void

Modified: head/sys/vm/uma_dbg.c
==============================================================================
--- head/sys/vm/uma_dbg.c	Thu Jun 13 21:03:23 2013	(r251708)
+++ head/sys/vm/uma_dbg.c	Thu Jun 13 21:05:38 2013	(r251709)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -191,6 +192,7 @@ mtrash_fini(void *mem, int size)
 	(void)mtrash_ctor(mem, size, NULL, 0);
 }
 
+#ifdef INVARIANTS
 static uma_slab_t
 uma_dbg_getslab(uma_zone_t zone, void *item)
 {
@@ -198,15 +200,22 @@ uma_dbg_getslab(uma_zone_t zone, void *i
 	uma_keg_t keg;
 	uint8_t *mem;
 
-	mem = (uint8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
+	mem = (uint8_t *)((uintptr_t)item & (~UMA_SLAB_MASK));
 	if (zone->uz_flags & UMA_ZONE_VTOSLAB) {
 		slab = vtoslab((vm_offset_t)mem);
 	} else {
+		/*
+		 * It is safe to return the slab here even though the
+		 * zone is unlocked because the item's allocation state
+		 * essentially holds a reference.
+		 */
+		ZONE_LOCK(zone);
 		keg = LIST_FIRST(&zone->uz_kegs)->kl_keg;
 		if (keg->uk_flags & UMA_ZONE_HASH)
 			slab = hash_sfind(&keg->uk_hash, mem);
 		else
 			slab = (uma_slab_t)(mem + keg->uk_pgoff);
+		ZONE_UNLOCK(zone);
 	}
 
 	return (slab);
@@ -216,12 +225,10 @@ uma_dbg_getslab(uma_zone_t zone, void *i
  * Set up the slab's freei data such that uma_dbg_free can function.
  *
  */
-
 void
 uma_dbg_alloc(uma_zone_t zone, uma_slab_t slab, void *item)
 {
 	uma_keg_t keg;
-	uma_slabrefcnt_t slabref;
 	int freei;
 
 	if (slab == NULL) {
@@ -231,16 +238,12 @@ uma_dbg_alloc(uma_zone_t zone, uma_slab_
 			    item, zone->uz_name);
 	}
 	keg = slab->us_keg;
+	freei = ((uintptr_t)item - (uintptr_t)slab->us_data) / keg->uk_rsize;
 
-	freei = ((unsigned long)item - (unsigned long)slab->us_data)
-	    / keg->uk_rsize;
-
-	if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		slabref = (uma_slabrefcnt_t)slab;
-		slabref->us_freelist[freei].us_item = 255;
-	} else {
-		slab->us_freelist[freei].us_item = 255;
-	}
+	if (BIT_ISSET(SLAB_SETSIZE, freei, &slab->us_debugfree))
+		panic("Duplicate alloc of %p from zone %p(%s) slab %p(%d)\n",
+		    item, zone, zone->uz_name, slab, freei);
+	BIT_SET_ATOMIC(SLAB_SETSIZE, freei, &slab->us_debugfree);
 
 	return;
 }
@@ -250,12 +253,10 @@ uma_dbg_alloc(uma_zone_t zone, uma_slab_
  * and duplicate frees.
  *
  */
-
 void
 uma_dbg_free(uma_zone_t zone, uma_slab_t slab, void *item)
 {
 	uma_keg_t keg;
-	uma_slabrefcnt_t slabref;
 	int freei;
 
 	if (slab == NULL) {
@@ -265,49 +266,21 @@ uma_dbg_free(uma_zone_t zone, uma_slab_t
 			    item, zone->uz_name);
 	}
 	keg = slab->us_keg;
-
-	freei = ((unsigned long)item - (unsigned long)slab->us_data)
-	    / keg->uk_rsize;
+	freei = ((uintptr_t)item - (uintptr_t)slab->us_data) / keg->uk_rsize;
 
 	if (freei >= keg->uk_ipers)
-		panic("zone: %s(%p) slab %p freelist %d out of range 0-%d\n",
-		    zone->uz_name, zone, slab, freei, keg->uk_ipers-1);
+		panic("Invalid free of %p from zone %p(%s) slab %p(%d)\n",
+		    item, zone, zone->uz_name, slab, freei);
 
-	if (((freei * keg->uk_rsize) + slab->us_data) != item) {
-		printf("zone: %s(%p) slab %p freed address %p unaligned.\n",
-		    zone->uz_name, zone, slab, item);
-		panic("should be %p\n",
-		    (freei * keg->uk_rsize) + slab->us_data);
-	}
+	if (((freei * keg->uk_rsize) + slab->us_data) != item) 
+		panic("Unaligned free of %p from zone %p(%s) slab %p(%d)\n",
+		    item, zone, zone->uz_name, slab, freei);
 
-	if (keg->uk_flags & UMA_ZONE_REFCNT) {
-		slabref = (uma_slabrefcnt_t)slab;
-		if (slabref->us_freelist[freei].us_item != 255) {
-			printf("Slab at %p, freei %d = %d.\n",
-			    slab, freei, slabref->us_freelist[freei].us_item);
-			panic("Duplicate free of item %p from zone %p(%s)\n",
-			    item, zone, zone->uz_name);
-		}
+	if (!BIT_ISSET(SLAB_SETSIZE, freei, &slab->us_debugfree))
+		panic("Duplicate free of %p from zone %p(%s) slab %p(%d)\n",
+		    item, zone, zone->uz_name, slab, freei);
 
-		/*
-		 * When this is actually linked into the slab this will change.
-		 * Until then the count of valid slabs will make sure we don't
-		 * accidentally follow this and assume it's a valid index.
-		 */
-		slabref->us_freelist[freei].us_item = 0;
-	} else {
-		if (slab->us_freelist[freei].us_item != 255) {
-			printf("Slab at %p, freei %d = %d.\n",
-			    slab, freei, slab->us_freelist[freei].us_item);
-			panic("Duplicate free of item %p from zone %p(%s)\n",
-			    item, zone, zone->uz_name);
-		}
-
-		/*
-		 * When this is actually linked into the slab this will change.
-		 * Until then the count of valid slabs will make sure we don't
-		 * accidentally follow this and assume it's a valid index.
-		 */
-		slab->us_freelist[freei].us_item = 0;
-	}
+	BIT_CLR_ATOMIC(SLAB_SETSIZE, freei, &slab->us_debugfree);
 }
+
+#endif /* INVARIANTS */

Modified: head/sys/vm/uma_int.h
==============================================================================
--- head/sys/vm/uma_int.h	Thu Jun 13 21:03:23 2013	(r251708)
+++ head/sys/vm/uma_int.h	Thu Jun 13 21:05:38 2013	(r251709)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002-2005, 2009 Jeffrey Roberson 
+ * Copyright (c) 2002-2005, 2009, 2013 Jeffrey Roberson 
  * Copyright (c) 2004, 2005 Bosko Milekic 
  * All rights reserved.
  *
@@ -45,12 +45,9 @@
  *  
  * The uma_slab_t may be embedded in a UMA_SLAB_SIZE chunk of memory or it may
  * be allocated off the page from a special slab zone.  The free list within a
- * slab is managed with a linked list of indices, which are 8 bit values.  If
- * UMA_SLAB_SIZE is defined to be too large I will have to switch to 16bit
- * values.  Currently on alpha you can get 250 or so 32 byte items and on x86
- * you can get 250 or so 16byte items.  For item sizes that would yield more
- * than 10% memory waste we potentially allocate a separate uma_slab_t if this
- * will improve the number of items per slab that will fit.  
+ * slab is managed with a bitmask.  For item sizes that would yield more than
+ * 10% memory waste we potentially allocate a separate uma_slab_t if this will
+ * improve the number of items per slab that will fit.  
  *
  * Other potential space optimizations are storing the 8bit of linkage in space
  * wasted between items due to alignment problems.  This may yield a much better
@@ -133,14 +130,9 @@
 /* 
  * I should investigate other hashing algorithms.  This should yield a low
  * number of collisions if the pages are relatively contiguous.
- *
- * This is the same algorithm that most processor caches use.
- *
- * I'm shifting and masking instead of % because it should be faster.
  */
 
-#define UMA_HASH(h, s) ((((unsigned long)s) >> UMA_SLAB_SHIFT) &	\
-    (h)->uh_hashmask)
+#define UMA_HASH(h, s) ((((uintptr_t)s) >> UMA_SLAB_SHIFT) & (h)->uh_hashmask)
 
 #define UMA_HASH_INSERT(h, s, mem)					\
 		SLIST_INSERT_HEAD(&(h)->uh_slab_hash[UMA_HASH((h),	\
@@ -234,10 +226,17 @@ struct uma_keg {
 };
 typedef struct uma_keg	* uma_keg_t;
 
-/* Page management structure */
+/*
+ * Free bits per-slab.
+ */
+#define	SLAB_SETSIZE	(PAGE_SIZE / UMA_SMALLEST_UNIT)
+BITSET_DEFINE(slabbits, SLAB_SETSIZE);
 
-/* Sorry for the union, but space efficiency is important */
-struct uma_slab_head {
+/*
+ * The slab structure manages a single contiguous allocation from backing
+ * store and subdivides it into individually allocatable items.
+ */
+struct uma_slab {
 	uma_keg_t	us_keg;			/* Keg we live in */
 	union {
 		LIST_ENTRY(uma_slab)	_us_link;	/* slabs in zone */
@@ -245,55 +244,31 @@ struct uma_slab_head {
 	} us_type;
 	SLIST_ENTRY(uma_slab)	us_hlink;	/* Link for hash table */
 	uint8_t		*us_data;		/* First item */
+	struct slabbits	us_free;		/* Free bitmask. */
+#ifdef INVARIANTS
+	struct slabbits	us_debugfree;		/* Debug bitmask. */
+#endif
 	uint16_t	us_freecount;		/* How many are free? */
 	uint8_t		us_flags;		/* Page flags see uma.h */
-	uint8_t		us_firstfree;		/* First free item index */
+	uint8_t		us_pad;			/* Pad to 32bits, unused. */
 };
 
-/* The standard slab structure */
-struct uma_slab {
-	struct uma_slab_head	us_head;	/* slab header data */
-	struct {
-		uint8_t		us_item;
-	} us_freelist[1];			/* actual number bigger */
-};
+#define	us_link	us_type._us_link
+#define	us_size	us_type._us_size
 
 /*
  * The slab structure for UMA_ZONE_REFCNT zones for whose items we
  * maintain reference counters in the slab for.
  */
 struct uma_slab_refcnt {
-	struct uma_slab_head	us_head;	/* slab header data */
-	struct {
-		uint8_t		us_item;
-		uint32_t	us_refcnt;
-	} us_freelist[1];			/* actual number bigger */
+	struct uma_slab		us_head;	/* slab header data */
+	uint32_t		us_refcnt[0];	/* Actually larger. */
 };
 
-#define	us_keg		us_head.us_keg
-#define	us_link		us_head.us_type._us_link
-#define	us_size		us_head.us_type._us_size
-#define	us_hlink	us_head.us_hlink
-#define	us_data		us_head.us_data
-#define	us_flags	us_head.us_flags
-#define	us_freecount	us_head.us_freecount
-#define	us_firstfree	us_head.us_firstfree
-
 typedef struct uma_slab * uma_slab_t;
 typedef struct uma_slab_refcnt * uma_slabrefcnt_t;
 typedef uma_slab_t (*uma_slaballoc)(uma_zone_t, uma_keg_t, int);
 
-
-/*
- * These give us the size of one free item reference within our corresponding
- * uma_slab structures, so that our calculations during zone setup are correct
- * regardless of what the compiler decides to do with padding the structure
- * arrays within uma_slab.
- */
-#define	UMA_FRITM_SZ	(sizeof(struct uma_slab) - sizeof(struct uma_slab_head))
-#define	UMA_FRITMREF_SZ	(sizeof(struct uma_slab_refcnt) -	\
-    sizeof(struct uma_slab_head))
-
 struct uma_klink {
 	LIST_ENTRY(uma_klink)	kl_link;
 	uma_keg_t		kl_keg;

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:06:18 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1747A70B;
 Thu, 13 Jun 2013 21:06:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ED4C312DB;
 Thu, 13 Jun 2013 21:06:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL6H3m013290;
 Thu, 13 Jun 2013 21:06:17 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL6HS8013273;
 Thu, 13 Jun 2013 21:06:17 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132106.r5DL6HS8013273@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 21:06:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251710 - stable/8/usr.bin/split
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:06:18 -0000

Author: eadler
Date: Thu Jun 13 21:06:17 2013
New Revision: 251710
URL: http://svnweb.freebsd.org/changeset/base/251710

Log:
  MFC r227183,r229905,r250432,r250451,r250882:
  
  	- Add missing static keywords to split(1)
  
  	- Fix warning when compiling with gcc46:
  	 error: variable 'defname' set but not use
  
  	- Implement 'split -d' which allows a numeric suffix instead of an
  	alphabetic one.
  
  	- Bump .Dd for recent content change.
  	Avoid signed overflow in error handling code.
  
  PR:		bin/116209

Modified:
  stable/8/usr.bin/split/split.1
  stable/8/usr.bin/split/split.c
Directory Properties:
  stable/8/usr.bin/split/   (props changed)

Modified: stable/8/usr.bin/split/split.1
==============================================================================
--- stable/8/usr.bin/split/split.1	Thu Jun 13 21:05:38 2013	(r251709)
+++ stable/8/usr.bin/split/split.1	Thu Jun 13 21:06:17 2013	(r251710)
@@ -32,7 +32,7 @@
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
 .\" $FreeBSD$
 .\"
-.Dd September 2, 2010
+.Dd May 9, 2013
 .Dt SPLIT 1
 .Os
 .Sh NAME
@@ -40,10 +40,12 @@
 .Nd split a file into pieces
 .Sh SYNOPSIS
 .Nm
+.Fl d
 .Op Fl l Ar line_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl b Ar byte_count Ns
 .Oo
 .Sm off
@@ -53,10 +55,12 @@
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl n Ar chunk_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl p Ar pattern
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
@@ -112,6 +116,8 @@ or
 is appended to the number, the file is split into
 .Ar byte_count
 gigabyte pieces.
+.It Fl d
+Use a numeric suffix instead of a alphabetic suffix.
 .It Fl l Ar line_count
 Create split files
 .Ar line_count

Modified: stable/8/usr.bin/split/split.c
==============================================================================
--- stable/8/usr.bin/split/split.c	Thu Jun 13 21:05:38 2013	(r251709)
+++ stable/8/usr.bin/split/split.c	Thu Jun 13 21:06:17 2013	(r251710)
@@ -55,6 +55,7 @@ static const char sccsid[] = "@(#)split.
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -65,16 +66,17 @@ static const char sccsid[] = "@(#)split.
 
 #define DEFLINE	1000			/* Default num lines per file. */
 
-off_t	 bytecnt;			/* Byte count to split on. */
-off_t	 chunks = 0;			/* Chunks count to split into. */
-long	 numlines;			/* Line count to split on. */
-int	 file_open;			/* If a file open. */
-int	 ifd = -1, ofd = -1;		/* Input/output file descriptors. */
-char	 bfr[MAXBSIZE];			/* I/O buffer. */
-char	 fname[MAXPATHLEN];		/* File name prefix. */
-regex_t	 rgx;
-int	 pflag;
-long	 sufflen = 2;			/* File name suffix length. */
+static off_t	 bytecnt;		/* Byte count to split on. */
+static off_t	 chunks = 0;		/* Chunks count to split into. */
+static long	 numlines;		/* Line count to split on. */
+static int	 file_open;		/* If a file open. */
+static int	 ifd = -1, ofd = -1;	/* Input/output file descriptors. */
+static char	 bfr[MAXBSIZE];		/* I/O buffer. */
+static char	 fname[MAXPATHLEN];	/* File name prefix. */
+static regex_t	 rgx;
+static int	 pflag;
+static bool	 dflag;
+static long	 sufflen = 2;		/* File name suffix length. */
 
 static void newfile(void);
 static void split1(void);
@@ -92,7 +94,8 @@ main(int argc, char **argv)
 
 	setlocale(LC_ALL, "");
 
-	while ((ch = getopt(argc, argv, "0123456789a:b:l:n:p:")) != -1)
+	dflag = false;
+	while ((ch = getopt(argc, argv, "0123456789a:b:dl:n:p:")) != -1)
 		switch (ch) {
 		case '0': case '1': case '2': case '3': case '4':
 		case '5': case '6': case '7': case '8': case '9':
@@ -135,6 +138,9 @@ main(int argc, char **argv)
 				errx(EX_USAGE, "%s: offset too large", optarg);
 			bytecnt = (off_t)(bytecnti * scale);
 			break;
+		case 'd':		/* Decimal suffix */
+			dflag = true;
+			break;
 		case 'l':		/* Line count. */
 			if (numlines != 0)
 				usage();
@@ -352,6 +358,8 @@ newfile(void)
 	long i, maxfiles, tfnum;
 	static long fnum;
 	static char *fpnt;
+	char beg, end;
+	int pattlen;
 
 	if (ofd == -1) {
 		if (fname[0] == '\0') {
@@ -363,10 +371,22 @@ newfile(void)
 		ofd = fileno(stdout);
 	}
 
-	/* maxfiles = 26^sufflen, but don't use libm. */
+	if (dflag) {
+		beg = '0';
+		end = '9';
+	}
+	else {
+		beg = 'a';
+		end = 'z';
+	}
+	pattlen = end - beg + 1;
+
+	/* maxfiles = pattlen^sufflen, but don't use libm. */
 	for (maxfiles = 1, i = 0; i < sufflen; i++)
-		if ((maxfiles *= 26) <= 0)
+		if (LONG_MAX / pattlen < maxfiles)
 			errx(EX_USAGE, "suffix is too long (max %ld)", i);
+		else
+			maxfiles *= pattlen;
 
 	if (fnum == maxfiles)
 		errx(EX_DATAERR, "too many files");
@@ -375,8 +395,8 @@ newfile(void)
 	tfnum = fnum;
 	i = sufflen - 1;
 	do {
-		fpnt[i] = tfnum % 26 + 'a';
-		tfnum /= 26;
+		fpnt[i] = tfnum % pattlen + beg;
+		tfnum /= pattlen;
 	} while (i-- > 0);
 	fpnt[sufflen] = '\0';
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:06:18 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 849E670C;
 Thu, 13 Jun 2013 21:06:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6658C12DC;
 Thu, 13 Jun 2013 21:06:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DL6ItY013298;
 Thu, 13 Jun 2013 21:06:18 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DL6IIA013296;
 Thu, 13 Jun 2013 21:06:18 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306132106.r5DL6IIA013296@svn.freebsd.org>
From: Eitan Adler 
Date: Thu, 13 Jun 2013 21:06:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251711 - stable/9/usr.bin/split
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:06:18 -0000

Author: eadler
Date: Thu Jun 13 21:06:17 2013
New Revision: 251711
URL: http://svnweb.freebsd.org/changeset/base/251711

Log:
  MFC r227183,r229905,r250432,r250451,r250882:
  
  	- Add missing static keywords to split(1)
  
  	- Fix warning when compiling with gcc46:
  	 error: variable 'defname' set but not use
  
  	- Implement 'split -d' which allows a numeric suffix instead of an
  	alphabetic one.
  
  	- Bump .Dd for recent content change.
  	Avoid signed overflow in error handling code.
  
  PR:		bin/116209

Modified:
  stable/9/usr.bin/split/split.1
  stable/9/usr.bin/split/split.c
Directory Properties:
  stable/9/usr.bin/split/   (props changed)

Modified: stable/9/usr.bin/split/split.1
==============================================================================
--- stable/9/usr.bin/split/split.1	Thu Jun 13 21:06:17 2013	(r251710)
+++ stable/9/usr.bin/split/split.1	Thu Jun 13 21:06:17 2013	(r251711)
@@ -28,7 +28,7 @@
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
 .\" $FreeBSD$
 .\"
-.Dd September 2, 2010
+.Dd May 9, 2013
 .Dt SPLIT 1
 .Os
 .Sh NAME
@@ -36,10 +36,12 @@
 .Nd split a file into pieces
 .Sh SYNOPSIS
 .Nm
+.Fl d
 .Op Fl l Ar line_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl b Ar byte_count Ns
 .Oo
 .Sm off
@@ -49,10 +51,12 @@
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl n Ar chunk_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl p Ar pattern
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
@@ -108,6 +112,8 @@ or
 is appended to the number, the file is split into
 .Ar byte_count
 gigabyte pieces.
+.It Fl d
+Use a numeric suffix instead of a alphabetic suffix.
 .It Fl l Ar line_count
 Create split files
 .Ar line_count

Modified: stable/9/usr.bin/split/split.c
==============================================================================
--- stable/9/usr.bin/split/split.c	Thu Jun 13 21:06:17 2013	(r251710)
+++ stable/9/usr.bin/split/split.c	Thu Jun 13 21:06:17 2013	(r251711)
@@ -51,6 +51,7 @@ static const char sccsid[] = "@(#)split.
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -61,16 +62,17 @@ static const char sccsid[] = "@(#)split.
 
 #define DEFLINE	1000			/* Default num lines per file. */
 
-off_t	 bytecnt;			/* Byte count to split on. */
-off_t	 chunks = 0;			/* Chunks count to split into. */
-long	 numlines;			/* Line count to split on. */
-int	 file_open;			/* If a file open. */
-int	 ifd = -1, ofd = -1;		/* Input/output file descriptors. */
-char	 bfr[MAXBSIZE];			/* I/O buffer. */
-char	 fname[MAXPATHLEN];		/* File name prefix. */
-regex_t	 rgx;
-int	 pflag;
-long	 sufflen = 2;			/* File name suffix length. */
+static off_t	 bytecnt;		/* Byte count to split on. */
+static off_t	 chunks = 0;		/* Chunks count to split into. */
+static long	 numlines;		/* Line count to split on. */
+static int	 file_open;		/* If a file open. */
+static int	 ifd = -1, ofd = -1;	/* Input/output file descriptors. */
+static char	 bfr[MAXBSIZE];		/* I/O buffer. */
+static char	 fname[MAXPATHLEN];	/* File name prefix. */
+static regex_t	 rgx;
+static int	 pflag;
+static bool	 dflag;
+static long	 sufflen = 2;		/* File name suffix length. */
 
 static void newfile(void);
 static void split1(void);
@@ -88,7 +90,8 @@ main(int argc, char **argv)
 
 	setlocale(LC_ALL, "");
 
-	while ((ch = getopt(argc, argv, "0123456789a:b:l:n:p:")) != -1)
+	dflag = false;
+	while ((ch = getopt(argc, argv, "0123456789a:b:dl:n:p:")) != -1)
 		switch (ch) {
 		case '0': case '1': case '2': case '3': case '4':
 		case '5': case '6': case '7': case '8': case '9':
@@ -131,6 +134,9 @@ main(int argc, char **argv)
 				errx(EX_USAGE, "%s: offset too large", optarg);
 			bytecnt = (off_t)(bytecnti * scale);
 			break;
+		case 'd':		/* Decimal suffix */
+			dflag = true;
+			break;
 		case 'l':		/* Line count. */
 			if (numlines != 0)
 				usage();
@@ -348,6 +354,8 @@ newfile(void)
 	long i, maxfiles, tfnum;
 	static long fnum;
 	static char *fpnt;
+	char beg, end;
+	int pattlen;
 
 	if (ofd == -1) {
 		if (fname[0] == '\0') {
@@ -359,10 +367,22 @@ newfile(void)
 		ofd = fileno(stdout);
 	}
 
-	/* maxfiles = 26^sufflen, but don't use libm. */
+	if (dflag) {
+		beg = '0';
+		end = '9';
+	}
+	else {
+		beg = 'a';
+		end = 'z';
+	}
+	pattlen = end - beg + 1;
+
+	/* maxfiles = pattlen^sufflen, but don't use libm. */
 	for (maxfiles = 1, i = 0; i < sufflen; i++)
-		if ((maxfiles *= 26) <= 0)
+		if (LONG_MAX / pattlen < maxfiles)
 			errx(EX_USAGE, "suffix is too long (max %ld)", i);
+		else
+			maxfiles *= pattlen;
 
 	if (fnum == maxfiles)
 		errx(EX_DATAERR, "too many files");
@@ -371,8 +391,8 @@ newfile(void)
 	tfnum = fnum;
 	i = sufflen - 1;
 	do {
-		fpnt[i] = tfnum % 26 + 'a';
-		tfnum /= 26;
+		fpnt[i] = tfnum % pattlen + beg;
+		tfnum /= pattlen;
 	} while (i-- > 0);
 	fpnt[sufflen] = '\0';
 

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:31:34 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 40795183;
 Thu, 13 Jun 2013 21:31:34 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3229E1464;
 Thu, 13 Jun 2013 21:31:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DLVYh8022134;
 Thu, 13 Jun 2013 21:31:34 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DLVXbT022132;
 Thu, 13 Jun 2013 21:31:33 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201306132131.r5DLVXbT022132@svn.freebsd.org>
From: Andrew Turner 
Date: Thu, 13 Jun 2013 21:31:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251712 - in head/sys/arm: arm include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:31:34 -0000

Author: andrew
Date: Thu Jun 13 21:31:33 2013
New Revision: 251712
URL: http://svnweb.freebsd.org/changeset/base/251712

Log:
  Fix the vfp code to work with the 16 register variants of the VFP unit. We
  check which variant we are on, and if it is a VFPv3 or v4, and has 32
  double registers we save these. This fixes VFP support on Raspberry Pi.
  
  While here clean fmrx and fmxr up to use the register names from vfp.h
  as opposed to the raw register names.

Modified:
  head/sys/arm/arm/vfp.c
  head/sys/arm/include/vfp.h

Modified: head/sys/arm/arm/vfp.c
==============================================================================
--- head/sys/arm/arm/vfp.c	Thu Jun 13 21:06:17 2013	(r251711)
+++ head/sys/arm/arm/vfp.c	Thu Jun 13 21:31:33 2013	(r251712)
@@ -49,16 +49,18 @@ void	set_coprocessorACR(u_int);
 
 extern int vfp_exists;
 static struct undefined_handler vfp10_uh, vfp11_uh;
+/* If true the VFP unit has 32 double registers, otherwise it has 16 */
+static int is_d32;
 
 /* The VFMXR command using coprocessor commands */
 #define fmxr(reg, val) \
-	__asm __volatile("mcr p10, 7, %0, " #reg " , c0, 0" :: "r" (val));
+    __asm __volatile("mcr p10, 7, %0, " __STRING(reg) " , c0, 0" :: "r"(val));
 
 /* The VFMRX command using coprocessor commands */
 #define fmrx(reg) \
 ({ u_int val = 0;\
-	__asm __volatile("mrc p10, 7, %0, " #reg " , c0, 0" : "=r" (val));\
-	val; \
+    __asm __volatile("mrc p10, 7, %0, " __STRING(reg) " , c0, 0" : "=r"(val));\
+    val; \
 })
 
 u_int
@@ -83,24 +85,34 @@ void
 vfp_init(void)
 {
 	u_int fpsid, fpexc, tmp;
-	u_int coproc;
+	u_int coproc, vfp_arch;
 
 	coproc = get_coprocessorACR();
 	coproc |= COPROC10 | COPROC11;
 	set_coprocessorACR(coproc);
 	
-	fpsid = fmrx(cr0);		/* read the vfp system id */
-	fpexc = fmrx(cr8);		/* read the vfp exception reg */
+	fpsid = fmrx(VFPSID);		/* read the vfp system id */
+	fpexc = fmrx(VFPEXC);		/* read the vfp exception reg */
 
 	if (!(fpsid & VFPSID_HARDSOFT_IMP)) {
 		vfp_exists = 1;
+		is_d32 = 0;
 		PCPU_SET(vfpsid, fpsid);	/* save the VFPSID */
-		if ((fpsid & VFPSID_SUBVERSION2_MASK) == VFP_ARCH3) {
-			tmp = fmrx(cr7);	/* extended registers */
+
+		vfp_arch =
+		    (fpsid & VFPSID_SUBVERSION2_MASK) >> VFPSID_SUBVERSION_OFF;
+
+		if (vfp_arch >= VFP_ARCH3) {
+			tmp = fmrx(VMVFR0);
 			PCPU_SET(vfpmvfr0, tmp);
-			tmp = fmrx(cr6);	/* extended registers */
+
+			if ((tmp & VMVFR0_RB_MASK) == 2)
+				is_d32 = 1;
+
+			tmp = fmrx(VMVFR1);
 			PCPU_SET(vfpmvfr1, tmp);
 		}
+
 		/* initialize the coprocess 10 and 11 calls
 		 * These are called to restore the registers and enable
 		 * the VFP hardware.
@@ -129,7 +141,7 @@ vfp_bounce(u_int addr, u_int insn, struc
 
 	if (!vfp_exists)
 		return 1;		/* vfp does not exist */
-	fpexc = fmrx(cr8);		/* read the vfp exception reg */
+	fpexc = fmrx(VFPEXC);		/* read the vfp exception reg */
 	if (fpexc & VFPEXC_EN) {
 		vfptd = PCPU_GET(vfpcthread);
 		/* did the kernel call the vfp or exception that expect us
@@ -147,7 +159,7 @@ vfp_bounce(u_int addr, u_int insn, struc
 			vfp_store(&vfptd->td_pcb->pcb_vfpstate);
 
 		fpexc &= ~VFPEXC_EN;
-		fmxr(cr8, fpexc);	/* turn vfp hardware off */
+		fmxr(VFPEXC, fpexc);	/* turn vfp hardware off */
 		if (vfptd == curthread) {
 			/* kill the process - we do not handle emulation */
 			killproc(curthread->td_proc, "vfp emulation");
@@ -158,7 +170,7 @@ vfp_bounce(u_int addr, u_int insn, struc
 			vfptd, curthread);
 	}
 	fpexc |= VFPEXC_EN;
-	fmxr(cr8, fpexc);	/* enable the vfp and repeat command */
+	fmxr(VFPEXC, fpexc);	/* enable the vfp and repeat command */
 	curpcb = PCPU_GET(curpcb);
 	/* If we were the last process to use the VFP, the process did not
 	 * use a VFP on another processor, then the registers in the VFP
@@ -184,15 +196,14 @@ vfp_restore(struct vfp_state *vfpsave)
 	u_int vfpscr = 0;
 
 	if (vfpsave) {
-		__asm __volatile("ldc	p10, c0, [%0], #128\n" /* d0-d31 */
-#ifndef VFPv2
-			"ldcl	p11, c0, [%0], #128\n"	/* d16-d31 */
-#else
-			"add	%0, %0, #128\n"		/* slip missing regs */
-#endif
+		__asm __volatile("ldc	p10, c0, [%0], #128\n" /* d0-d15 */
+			"cmp	%0, 0\n"		/* -D16 or -D32? */
+			"ldcleq	p11, c0, [%0], #128\n"	/* d16-d31 */
+			"addne	%0, %0, #128\n"		/* skip missing regs */
 			"ldr	%1, [%0]\n"		/* set old vfpscr */
 			"mcr	p10, 7, %1, cr1, c0, 0\n"
-				:: "r" (vfpsave), "r" (vfpscr));
+				:: "r" (vfpsave), "r" (vfpscr), "r" (is_d32)
+				: "cc");
 		PCPU_SET(vfpcthread, PCPU_GET(curthread));
 	}
 }
@@ -211,24 +222,22 @@ vfp_store(struct vfp_state *vfpsave)
 {
 	u_int tmp, vfpscr = 0;
 
-	tmp = fmrx(cr8);		/* Is the vfp enabled? */
+	tmp = fmrx(VFPEXC);		/* Is the vfp enabled? */
 	if (vfpsave && tmp & VFPEXC_EN) {
-		__asm __volatile("stc	p11, c0, [%1], #128\n" /* d0-d31 */
-#ifndef VFPv2
-			"stcl	p11, c0, [%1], #128\n"
-#else
-			"add	%1, %1, #128\n"
-#endif
-			"mrc	p10, 7, %0, cr1, c0, 0\n"
-			"str	%0, [%1]\n"
-			:  "=&r" (vfpscr) : "r" (vfpsave));
+		__asm __volatile("stc	p11, c0, [%1], #128\n" /* d0-d15 */
+			"cmp	%0, 0\n"		/* -D16 or -D32? */
+			"stcleq	p11, c0, [%1], #128\n"	/* d16-d31 */
+			"addne	%1, %1, #128\n"		/* skip missing regs */
+			"mrc	p10, 7, %0, cr1, c0, 0\n" /* fmxr(VFPSCR) */
+			"str	%0, [%1]\n"		/* save vfpscr */
+			:  "=&r" (vfpscr) : "r" (vfpsave), "r" (is_d32) : "cc");
 	}
 #ifndef SMP
 		/* eventually we will use this information for UP also */
 	PCPU_SET(vfpcthread, 0);
 #endif
 	tmp &= ~VFPEXC_EN;	/* disable the vfp hardware */
-	fmxr(cr8 , tmp);
+	fmxr(VFPEXC , tmp);
 }
 
 /* discard the registers at cpu_thread_free() when fpcurthread == td.
@@ -240,9 +249,9 @@ vfp_discard()
 	u_int tmp = 0;
 
 	PCPU_SET(vfpcthread, 0);	/* permanent forget about reg */
-	tmp = fmrx(cr8);
+	tmp = fmrx(VFPEXC);
 	tmp &= ~VFPEXC_EN;		/* turn off VFP hardware */
-	fmxr(cr8, tmp);
+	fmxr(VFPEXC, tmp);
 }
 
 /* Enable the VFP hardware without restoring registers.
@@ -253,7 +262,7 @@ vfp_enable()
 {
 	u_int tmp = 0;
 
-	tmp = fmrx(cr8);
+	tmp = fmrx(VFPEXC);
 	tmp |= VFPEXC_EN;
-	fmxr(cr8 , tmp);
+	fmxr(VFPEXC, tmp);
 }

Modified: head/sys/arm/include/vfp.h
==============================================================================
--- head/sys/arm/include/vfp.h	Thu Jun 13 21:06:17 2013	(r251711)
+++ head/sys/arm/include/vfp.h	Thu Jun 13 21:31:33 2013	(r251712)
@@ -47,7 +47,9 @@
 #define	VFPSID_SUBVERSION_OFF	16
 #define	VFPSID_SUBVERSION2_MASK	(0x000f0000)	 /* version 1 and 2 */
 #define	VFPSID_SUBVERSION3_MASK	(0x007f0000)	 /* version 3 */
-#define VFP_ARCH3		(0x00030000)
+#define	VFP_ARCH1		0x0
+#define	VFP_ARCH2		0x1
+#define	VFP_ARCH3		0x2
 #define	VFPSID_PARTNUMBER_OFF	8
 #define	VFPSID_PARTNUMBER_MASK	(0x0000ff00)
 #define	VFPSID_VARIANT_OFF	4

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 21:47:23 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2709C510;
 Thu, 13 Jun 2013 21:47:23 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 191001613;
 Thu, 13 Jun 2013 21:47:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DLlMtr026093;
 Thu, 13 Jun 2013 21:47:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DLlM41026092;
 Thu, 13 Jun 2013 21:47:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201306132147.r5DLlM41026092@svn.freebsd.org>
From: Marius Strobl 
Date: Thu, 13 Jun 2013 21:47:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251713 - head/sys/dev/puc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 21:47:23 -0000

Author: marius
Date: Thu Jun 13 21:47:22 2013
New Revision: 251713
URL: http://svnweb.freebsd.org/changeset/base/251713

Log:
  Fix whitespace and normalize some entries.

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Thu Jun 13 21:31:33 2013	(r251712)
+++ head/sys/dev/puc/pucdata.c	Thu Jun 13 21:47:22 2013	(r251713)
@@ -512,14 +512,14 @@ const struct puc_cfg puc_pci_devices[] =
 	    "Moxa Technologies, Smartio CP-102E/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_2S, 0x14, 0, -1,
-	        .config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1025, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-102EL/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_2S, 0x14, 0, -1,
-	        .config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1040, 0xffff, 0,
@@ -550,7 +550,7 @@ const struct puc_cfg puc_pci_devices[] =
 	    "Moxa Technologies, Smartio CP-104EL-A/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_4S, 0x14, 0, -1,
-		.config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1120, 0xffff, 0,
@@ -569,14 +569,14 @@ const struct puc_cfg puc_pci_devices[] =
 	    "Moxa Technologies, Smartio CP-114EL/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_4S, 0x14, 0, -1,
-		.config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1182, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-118EL-A/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_8S, 0x14, 0, -1,
-		.config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1680, 0xffff, 0,
@@ -601,7 +601,7 @@ const struct puc_cfg puc_pci_devices[] =
 	    "Moxa Technologies, Smartio CP-168EL-A/PCIe",
 	    DEFAULT_RCLK * 8,
 	    PUC_PORT_8S, 0x14, 0, -1,
-		.config_function = puc_config_moxa
+	    .config_function = puc_config_moxa
 	},
 
 	{   0x13a8, 0x0152, 0xffff, 0,
@@ -711,10 +711,10 @@ const struct puc_cfg puc_pci_devices[] =
 	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
 	 */
 	{
-		0x1415, 0x9501, 0x10fc ,0xc070,
-		"I-O DATA RSA-PCI2/R",
-		DEFAULT_RCLK * 8,
-		PUC_PORT_2S, 0x10, 0, 8,
+	    0x1415, 0x9501, 0x10fc, 0xc070,
+	    "I-O DATA RSA-PCI2/R",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_2S, 0x10, 0, 8,
 	},
 
 	{   0x1415, 0x9501, 0x131f, 0x2050,
@@ -830,7 +830,7 @@ const struct puc_cfg puc_pci_devices[] =
 	 *
 	 * Lindy 51189 (4 port)
 	 *  
-	 * 
+	 *
 	 * StarTech.com PEX4S952 (4 port) and PEX8S952 (8 port)
 	 * 
 	 */
@@ -990,10 +990,10 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_2S, 0x10, 0, 8,
 	},
 
-	{    0x5372, 0x6873, 0xffff, 0,
-	     "Sun 1040 PCI Quad Serial",
-	     DEFAULT_RCLK,
-	     PUC_PORT_4S, 0x10, 4, 0,
+	{   0x5372, 0x6873, 0xffff, 0,
+	    "Sun 1040 PCI Quad Serial",
+	    DEFAULT_RCLK,
+	    PUC_PORT_4S, 0x10, 4, 0,
 	},
 
 	{   0x6666, 0x0001, 0xffff, 0,
@@ -1015,10 +1015,10 @@ const struct puc_cfg puc_pci_devices[] =
 	},
 
 	{   0x9710, 0x9815, 0xffff, 0,
-	    "NetMos NM9815 Dual 1284 Printer port", 
+	    "NetMos NM9815 Dual 1284 Printer port",
 	    0,
 	    PUC_PORT_2P, 0x10, 8, 0,
-	}, 
+	},
 
 	/*
 	 * This is more specific than the generic NM9835 entry that follows, and
@@ -1444,19 +1444,19 @@ puc_config_timedia(struct puc_softc *sc,
 {
 	static const uint16_t dual[] = {
 	    0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085,
-	    0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079, 
-	    0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079, 
+	    0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079,
+	    0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079,
 	    0x9137, 0x9138, 0x9237, 0x9238, 0xA079, 0xB079, 0xC079,
 	    0xD079, 0
 	};
 	static const uint16_t quad[] = {
-	    0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157, 
-	    0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159, 
+	    0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157,
+	    0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159,
 	    0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056,
 	    0xB157, 0
 	};
 	static const uint16_t octa[] = {
-	    0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166, 
+	    0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166,
 	    0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
 	};
 	static const struct {

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 22:13:42 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 65AE3B2D;
 Thu, 13 Jun 2013 22:13:42 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48A801705;
 Thu, 13 Jun 2013 22:13:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DMDgFE035328;
 Thu, 13 Jun 2013 22:13:42 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DMDgZh035327;
 Thu, 13 Jun 2013 22:13:42 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201306132213.r5DMDgZh035327@svn.freebsd.org>
From: Marius Strobl 
Date: Thu, 13 Jun 2013 22:13:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251715 - head/sys/dev/puc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 22:13:42 -0000

Author: marius
Date: Thu Jun 13 22:13:41 2013
New Revision: 251715
URL: http://svnweb.freebsd.org/changeset/base/251715

Log:
  All of Oxford/PLX OX16PCI954, OXm16PCI954 and OXu16PCI954 share the
  exact same (subsystem) device and vendor IDs. However, the reference
  design for the OXu16PCI954 uses a 14.7456 MHz clock (as does the EXSYS
  EX-41098-2 equipped with these), while at least the OX16PCI954 defaults
  to a 1.8432 MHz one. According to the datasheets of these chips, the
  only difference in PCI configuration space is that OXu16PCI954 have
  a revision ID of 1 while the other two are at 0. So employ the latter
  for determining the default clock rates of this family.
  Note that one might think that the actual clock could be derived from
  the Clock Prescaler Register (CPR) of these chips. Unfortunately, this
  is not that case and its use and content are orthogonal to the frequency
  of the crystal employed.
  Tested with an EXSYS EX-41098-2, which identifies and attaches as:
  pcib4@pci0:19:0:0:      class=0x060400 card=0x02dd1014 chip=0x10801b21
  rev=0x03 hdr=0x01
      vendor     = 'ASMedia Technology Inc.'
      device     = 'ASM1083/1085 PCIe to PCI Bridge'
      class      = bridge
      subclass   = PCI-PCI
  puc0@pci0:20:4:0:       class=0x070006 card=0x00001415 chip=0x95011415
  rev=0x01 hdr=0x00
      vendor     = 'Oxford Semiconductor Ltd'
      device     = 'OX16PCI954 (Quad 16950 UART) function 0 (Uart)'
      class      = simple comms
      subclass   = UART
  puc1@pci0:20:4:1:       class=0x068000 card=0x00001415 chip=0x95111415
  rev=0x01 hdr=0x00
      vendor     = 'Oxford Semiconductor Ltd'
      device     = 'OX16PCI954 (Quad 16950 UART) function 1 (8bit bus)'
      class      = bridge
  puc2@pci0:20:8:0:       class=0x070006 card=0x00001415 chip=0x95011415
  rev=0x01 hdr=0x00
      vendor     = 'Oxford Semiconductor Ltd'
      device     = 'OX16PCI954 (Quad 16950 UART) function 0 (Uart)'
      class      = simple comms
      subclass   = UART
  puc3@pci0:20:8:1:       class=0x068000 card=0x00001415 chip=0x95111415
  rev=0x01 hdr=0x00
      vendor     = 'Oxford Semiconductor Ltd'
      device     = 'OX16PCI954 (Quad 16950 UART) function 1 (8bit bus)'
      class      = bridge
  
  pci20:  on pcib4
  puc0:  port 0x5000-0x501f,
  0x5020-0x503f mem 0xc6000000-0xc6000fff,0xc6001000-0xc6001fff irq 16 at
  device 4.0 on pci20
  uart1: <16950 or compatible> at port 1 on puc0
  uart2: <16950 or compatible> at port 2 on puc0
  uart3: <16950 or compatible> at port 3 on puc0
  uart4: <16950 or compatible> at port 4 on puc0
  puc1:  port
  0x5040-0x505f,0x5060-0x507f mem 0xc6002000-0xc6002fff,0xc6003000-0xc6003fff
  irq 16 at device 4.1 on pci20
  puc2:  port 0x5080-0x509f,
  0x50a0-0x50bf mem 0xc6004000-0xc6004fff,0xc6005000-0xc6005fff irq 16 at
  device 8.0 on pci20
  uart5: <16950 or compatible> at port 1 on puc2
  uart6: <16950 or compatible> at port 2 on puc2
  uart7: <16950 or compatible> at port 3 on puc2
  uart8: <16950 or compatible> at port 4 on puc2
  puc3:  port
  0x50c0-0x50df,0x50e0-0x50ff mem 0xc6006000-0xc6006fff,0xc6007000-0xc6007fff
  irq 16 at device 8.1 on pci20
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Thu Jun 13 22:04:49 2013	(r251714)
+++ head/sys/dev/puc/pucdata.c	Thu Jun 13 22:13:41 2013	(r251715)
@@ -53,6 +53,7 @@ static puc_config_f puc_config_exar;
 static puc_config_f puc_config_exar_pcie;
 static puc_config_f puc_config_icbook;
 static puc_config_f puc_config_moxa;
+static puc_config_f puc_config_oxford_pci954;
 static puc_config_f puc_config_oxford_pcie;
 static puc_config_f puc_config_quatech;
 static puc_config_f puc_config_syba;
@@ -743,8 +744,9 @@ const struct puc_cfg puc_pci_devices[] =
 
 	{   0x1415, 0x9501, 0xffff, 0,
 	    "Oxford Semiconductor OX16PCI954 UARTs",
-	    DEFAULT_RCLK,
+	    0,
 	    PUC_PORT_4S, 0x10, 0, 8,
+	    .config_function = puc_config_oxford_pci954
 	},
 
 	{   0x1415, 0x950a, 0x131f, 0x2030,
@@ -1516,6 +1518,28 @@ puc_config_timedia(struct puc_softc *sc,
 }
 
 static int
+puc_config_oxford_pci954(struct puc_softc *sc, enum puc_cfg_cmd cmd,
+    int port __unused, intptr_t *res)
+{
+
+	switch (cmd) {
+	case PUC_CFG_GET_CLOCK:
+		/*
+		 * OXu16PCI954 use a 14.7456 MHz clock by default while
+		 * OX16PCI954 and OXm16PCI954 employ a 1.8432 MHz one.
+		 */
+		if (pci_get_revid(sc->sc_dev) == 1)
+			*res = DEFAULT_RCLK * 8;
+		else
+			*res = DEFAULT_RCLK;
+		return (0);
+	default:
+		break;
+	}
+	return (ENXIO);
+}
+
+static int
 puc_config_oxford_pcie(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     intptr_t *res)
 {

From owner-svn-src-all@FreeBSD.ORG  Thu Jun 13 22:51:15 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9D00A19
 for ; Thu, 13 Jun 2013 22:51:15 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id BEAF21899
 for ; Thu, 13 Jun 2013 22:51:15 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DMpF1q011038
 for ; Thu, 13 Jun 2013 22:51:15 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5DMpFIf011034
 for svn-src-all@freebsd.org; Thu, 13 Jun 2013 22:51:15 GMT
 (envelope-from bdrewery)
Received: (qmail 82012 invoked from network); 13 Jun 2013 17:51:13 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 13 Jun 2013 17:51:13 -0500
Message-ID: <51BA4CD0.30601@FreeBSD.org>
Date: Thu, 13 Jun 2013 17:50:56 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Jeff Roberson 
Subject: Re: svn commit: r251703 - in head/sys: amd64/amd64 i386/i386 i386/xen
 kern mips/mips sparc64/sparc64 sys
References: <201306132046.r5DKk3xd006430@svn.freebsd.org>
In-Reply-To: <201306132046.r5DKk3xd006430@svn.freebsd.org>
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2HPVKJFDPJSPQJBRPXIQN"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 13 Jun 2013 22:51:16 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2HPVKJFDPJSPQJBRPXIQN
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/13/2013 3:46 PM, Jeff Roberson wrote:
> Author: jeff
> Date: Thu Jun 13 20:46:03 2013
> New Revision: 251703
> URL: http://svnweb.freebsd.org/changeset/base/251703
>=20
> Log:
>    - Add a BIT_FFS() macro and use it to replace cpusetffs_obj()
>  =20
>   Discussed with:	attilio
>   Sponsored by:	EMC / Isilon Storage Division
>=20
> Modified:
>   head/sys/amd64/amd64/mp_machdep.c
>   head/sys/i386/i386/mp_machdep.c
>   head/sys/i386/i386/pmap.c
>   head/sys/i386/xen/mp_machdep.c
>   head/sys/i386/xen/pmap.c
>   head/sys/kern/kern_cpuset.c
>   head/sys/mips/mips/mp_machdep.c
>   head/sys/sparc64/sparc64/mp_machdep.c
>   head/sys/sys/bitset.h
>   head/sys/sys/cpuset.h
>=20
[...]
> Modified: head/sys/sys/cpuset.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/sys/cpuset.h	Thu Jun 13 20:41:09 2013	(r251702)
> +++ head/sys/sys/cpuset.h	Thu Jun 13 20:46:03 2013	(r251703)
> @@ -57,6 +57,7 @@
>  #define	CPU_SET_ATOMIC(n, p)		BIT_SET_ATOMIC(CPU_SETSIZE, n, p)
>  #define	CPU_OR_ATOMIC(d, s)		BIT_OR_ATOMIC(CPU_SETSIZE, d, s)
>  #define	CPU_COPY_STORE_REL(f, t)	BIT_COPY_STORE_REL(CPU_SETSIZE, f, t)=

> +#define	CPU_FFS(p)			BIT_FFS(CPU_SETSIZE, p)
> =20
>  /*
>   * Valid cpulevel_t values.
> @@ -118,7 +119,6 @@ void	cpuset_rel(struct cpuset *);
>  int	cpuset_setthread(lwpid_t id, cpuset_t *);
>  int	cpuset_create_root(struct prison *, struct cpuset **);
>  int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
> -int	cpusetobj_ffs(const cpuset_t *);
>  char	*cpusetobj_strprint(char *, const cpuset_t *);
>  int	cpusetobj_strscan(cpuset_t *, const char *);
> =20


Looks like cpusetobj_ffs() -> CPU_FFS() was missed in
sys/amd64/vmm/io/vlapic.c:

> --- vlapic.o ---
> /usr/src/sys/modules/vmm/../../amd64/vmm/io/vlapic.c:468:15: error: imp=
licit declaration of function 'cpusetobj_ffs' is invalid in C99 [-Werror,=
-Wimplicit-function-declaration]
>                 while ((i =3D cpusetobj_ffs(&dmask)) !=3D 0) {



--=20
Regards,
Bryan Drewery


------enig2HPVKJFDPJSPQJBRPXIQN
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRukzVAAoJEG54KsA8mwz5BIQP/i7A0Pjw8wD7RcbeEVF0Cci/
i7x86FMI/1k7fPpPdQEQrgrPfUlo36sgqMPuxJdq/uAtFkbHTFk5EFACi5wXKPcL
kch+a/Zu+RUgw0uLhrbMMzQMUIcUVD7rPGVmhfcFdOgrp5J7K4QhA1beWA27PpKm
nmzE9JGI/XKUhtbcYtqQjDnwFgs1FUsw6XMKAGiPmi4jzCtIr+WNwpphOD3iSP8D
2Y4+O9CqTRkbsHsCMnSPM2aQiyG3O44uRo7wega3KldbRjY1lfUhQPaiq5ukVShb
qnZEU84rTCUUCQaFOz7kdXb0WxvdM3TO1SFVl50ICxtWVde2ykyB3gA3fhNCdKoW
P5sfRytw+Y424wG1CBvcFL24EVva5bQxdk7OzJQyRWZIDVMEWtNajCArNkazJ/C8
T2w/dV8mkiAmY9h0dXnPDHEm4s66tnZ9uVXcY4kmLOnMtQAlwdXbbaxVokyzScQw
VNpgZ1IRJFGmjXMHJTxKbaKLKujnN28zPKyYJ1QhUki6mUb7goK/PSzywryMJTtI
2aio9+jzMwwKyFxUxLARiXFnPxgevqv2ZU+hG7c7L+jFicD7gL2SZovvVfdH5RIr
NwsVyS2Mfe/V1hDr6nWETbz5oWN25S8qaK1Ar2lsaYG+wxtcJ7ACxy2eXkqyIKKU
I/+pjAvj/6ei/d0jFSX3
=0QAD
-----END PGP SIGNATURE-----

------enig2HPVKJFDPJSPQJBRPXIQN--

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 00:02:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C31A438F;
 Fri, 14 Jun 2013 00:02:29 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B536D12E5;
 Fri, 14 Jun 2013 00:02:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E02TjV070467;
 Fri, 14 Jun 2013 00:02:29 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E02Tu1070466;
 Fri, 14 Jun 2013 00:02:29 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306140002.r5E02Tu1070466@svn.freebsd.org>
From: Rick Macklem 
Date: Fri, 14 Jun 2013 00:02:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251719 - stable/8/sys/nfsclient
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 00:02:29 -0000

Author: rmacklem
Date: Fri Jun 14 00:02:29 2013
New Revision: 251719
URL: http://svnweb.freebsd.org/changeset/base/251719

Log:
  MFC: r251089
  Add a patch analygous to r248567, r248581, r251079 to the
  old NFS client to avoid the panic reported in the PR by
  doing the vnode_pager_setsize() call after unlocking the mutex.

Modified:
  stable/8/sys/nfsclient/nfs_subs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/nfsclient/   (props changed)

Modified: stable/8/sys/nfsclient/nfs_subs.c
==============================================================================
--- stable/8/sys/nfsclient/nfs_subs.c	Thu Jun 13 22:30:24 2013	(r251718)
+++ stable/8/sys/nfsclient/nfs_subs.c	Fri Jun 14 00:02:29 2013	(r251719)
@@ -478,6 +478,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 	struct timespec mtime, mtime_save;
 	int v3 = NFS_ISV3(vp);
 	int error = 0;
+	u_quad_t nsize;
+	int setnsize;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
@@ -580,6 +582,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		vap->va_filerev = 0;
 	}
 	np->n_attrstamp = time_second;
+	setnsize = 0;
+	nsize = 0;
 	if (vap->va_size != np->n_size) {
 		if (vap->va_type == VREG) {
 			if (dontshrink && vap->va_size < np->n_size) {
@@ -606,7 +610,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 				np->n_size = vap->va_size;
 				np->n_flag |= NSIZECHANGED;
 			}
-			vnode_pager_setsize(vp, np->n_size);
+			setnsize = 1;
+			nsize = vap->va_size;
 		} else {
 			np->n_size = vap->va_size;
 		}
@@ -643,6 +648,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, &np->n_vattr, 0);
 #endif
 	mtx_unlock(&np->n_mtx);
+	if (setnsize)
+		vnode_pager_setsize(vp, nsize);
 out:
 #ifdef KDTRACE_HOOKS
 	if (error)

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 00:03:44 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C355150B;
 Fri, 14 Jun 2013 00:03:44 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9C52912F4;
 Fri, 14 Jun 2013 00:03:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E03iWa070711;
 Fri, 14 Jun 2013 00:03:44 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E03iiD070704;
 Fri, 14 Jun 2013 00:03:44 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201306140003.r5E03iiD070704@svn.freebsd.org>
From: Neel Natu 
Date: Fri, 14 Jun 2013 00:03:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251720 - in head/sys/amd64: amd64 include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 00:03:44 -0000

Author: neel
Date: Fri Jun 14 00:03:43 2013
New Revision: 251720
URL: http://svnweb.freebsd.org/changeset/base/251720

Log:
  Remove unused macros PTESHIFT, PDESHIFT, PDPESHIFT and PML4ESHIFT.
  
  Reviewed by:	alc

Modified:
  head/sys/amd64/amd64/genassym.c
  head/sys/amd64/amd64/pmap.c
  head/sys/amd64/include/pmap.h

Modified: head/sys/amd64/amd64/genassym.c
==============================================================================
--- head/sys/amd64/amd64/genassym.c	Fri Jun 14 00:02:29 2013	(r251719)
+++ head/sys/amd64/amd64/genassym.c	Fri Jun 14 00:03:43 2013	(r251720)
@@ -109,7 +109,6 @@ ASSYM(addr_PML4map, addr_PML4map);
 ASSYM(addr_PML4pml4e, addr_PML4pml4e);
 ASSYM(PDESIZE, sizeof(pd_entry_t));
 ASSYM(PTESIZE, sizeof(pt_entry_t));
-ASSYM(PTESHIFT, PTESHIFT);
 ASSYM(PAGE_SHIFT, PAGE_SHIFT);
 ASSYM(PAGE_MASK, PAGE_MASK);
 ASSYM(PDRSHIFT, PDRSHIFT);

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Fri Jun 14 00:02:29 2013	(r251719)
+++ head/sys/amd64/amd64/pmap.c	Fri Jun 14 00:03:43 2013	(r251720)
@@ -320,9 +320,6 @@ static void _pmap_unwire_ptp(pmap_t pmap
 static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, vm_page_t *);
 static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
 
-CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t));
-CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t));
-
 /*
  * Move the kernel virtual free pointer to the next
  * 2MB.  This is used to help improve performance

Modified: head/sys/amd64/include/pmap.h
==============================================================================
--- head/sys/amd64/include/pmap.h	Fri Jun 14 00:02:29 2013	(r251719)
+++ head/sys/amd64/include/pmap.h	Fri Jun 14 00:03:43 2013	(r251720)
@@ -157,11 +157,6 @@ typedef u_int64_t pt_entry_t;
 typedef u_int64_t pdp_entry_t;
 typedef u_int64_t pml4_entry_t;
 
-#define	PML4ESHIFT	(3)
-#define	PDPESHIFT	(3)
-#define	PTESHIFT	(3)
-#define	PDESHIFT	(3)
-
 /*
  * Address of current address space page table maps and directories.
  */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 00:30:12 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 87BDB8B1;
 Fri, 14 Jun 2013 00:30:12 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5FF9A13B8;
 Fri, 14 Jun 2013 00:30:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E0UCGp079544;
 Fri, 14 Jun 2013 00:30:12 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E0UCKN079543;
 Fri, 14 Jun 2013 00:30:12 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306140030.r5E0UCKN079543@svn.freebsd.org>
From: Rick Macklem 
Date: Fri, 14 Jun 2013 00:30:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251721 - stable/8/usr.sbin/gssd
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 00:30:12 -0000

Author: rmacklem
Date: Fri Jun 14 00:30:11 2013
New Revision: 251721
URL: http://svnweb.freebsd.org/changeset/base/251721

Log:
  MFC: r250176
  Fix the getpwuid_r() call in the gssd daemon so that it handles
  the ERANGE error return case. Without this fix, authentication
  of users for certain system setups could fail unexpectedly.

Modified:
  stable/8/usr.sbin/gssd/gssd.c
Directory Properties:
  stable/8/usr.sbin/gssd/   (props changed)

Modified: stable/8/usr.sbin/gssd/gssd.c
==============================================================================
--- stable/8/usr.sbin/gssd/gssd.c	Fri Jun 14 00:03:43 2013	(r251720)
+++ stable/8/usr.sbin/gssd/gssd.c	Fri Jun 14 00:30:11 2013	(r251721)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -475,8 +476,11 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg
 {
 	gss_name_t name = gssd_find_resource(argp->pname);
 	uid_t uid;
-	char buf[128];
+	char buf[1024], *bufp;
 	struct passwd pwd, *pw;
+	size_t buflen;
+	int error;
+	static size_t buflen_hint = 1024;
 
 	memset(result, 0, sizeof(*result));
 	if (name) {
@@ -485,7 +489,24 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg
 			    name, argp->mech, &uid);
 		if (result->major_status == GSS_S_COMPLETE) {
 			result->uid = uid;
-			getpwuid_r(uid, &pwd, buf, sizeof(buf), &pw);
+			buflen = buflen_hint;
+			for (;;) {
+				pw = NULL;
+				bufp = buf;
+				if (buflen > sizeof(buf))
+					bufp = malloc(buflen);
+				if (bufp == NULL)
+					break;
+				error = getpwuid_r(uid, &pwd, bufp, buflen,
+				    &pw);
+				if (error != ERANGE)
+					break;
+				if (buflen > sizeof(buf))
+					free(bufp);
+				buflen += 1024;
+				if (buflen > buflen_hint)
+					buflen_hint = buflen;
+			}
 			if (pw) {
 				int len = NGRPS;
 				int groups[NGRPS];
@@ -502,6 +523,8 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg
 				result->gidlist.gidlist_len = 0;
 				result->gidlist.gidlist_val = NULL;
 			}
+			if (bufp != NULL && buflen > sizeof(buf))
+				free(bufp);
 		}
 	} else {
 		result->major_status = GSS_S_BAD_NAME;

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 00:33:55 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B9CB2B04;
 Fri, 14 Jun 2013 00:33:55 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 91DA2146B;
 Fri, 14 Jun 2013 00:33:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E0XtEV080329;
 Fri, 14 Jun 2013 00:33:55 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E0XtU7080328;
 Fri, 14 Jun 2013 00:33:55 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306140033.r5E0XtU7080328@svn.freebsd.org>
From: Rick Macklem 
Date: Fri, 14 Jun 2013 00:33:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251722 - stable/8/kerberos5/lib/libgssapi_krb5
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 00:33:55 -0000

Author: rmacklem
Date: Fri Jun 14 00:33:55 2013
New Revision: 251722
URL: http://svnweb.freebsd.org/changeset/base/251722

Log:
  MFC: r250177
  Fix the getpwnam_r() call in the pname_to_uid() kerberos library function so
  that it handles the ERANGE error return case. Without this fix, authentication
  of users for certain system setups could fail unexpectedly.

Modified:
  stable/8/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
Directory Properties:
  stable/8/kerberos5/lib/libgssapi_krb5/   (props changed)

Modified: stable/8/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
==============================================================================
--- stable/8/kerberos5/lib/libgssapi_krb5/pname_to_uid.c	Fri Jun 14 00:30:11 2013	(r251721)
+++ stable/8/kerberos5/lib/libgssapi_krb5/pname_to_uid.c	Fri Jun 14 00:33:55 2013	(r251722)
@@ -26,6 +26,7 @@
  */
 /* $FreeBSD$ */
 
+#include 
 #include 
 
 #include "krb5/gsskrb5_locl.h"
@@ -37,8 +38,12 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s
 	krb5_context context;
 	krb5_const_principal name = (krb5_const_principal) pname;
 	krb5_error_code kret;
-	char lname[MAXLOGNAME + 1], buf[128];
+	char lname[MAXLOGNAME + 1], buf[1024], *bufp;
 	struct passwd pwd, *pw;
+	size_t buflen;
+	int error;
+	OM_uint32 ret;
+	static size_t buflen_hint = 1024;
 
 	GSSAPI_KRB5_INIT (&context);
 
@@ -49,11 +54,30 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s
 	}
 
 	*minor_status = 0;
-	getpwnam_r(lname, &pwd, buf, sizeof(buf), &pw);
+	buflen = buflen_hint;
+	for (;;) {
+		pw = NULL;
+		bufp = buf;
+		if (buflen > sizeof(buf))
+			bufp = malloc(buflen);
+		if (bufp == NULL)
+			break;
+		error = getpwnam_r(lname, &pwd, bufp, buflen, &pw);
+		if (error != ERANGE)
+			break;
+		if (buflen > sizeof(buf))
+			free(bufp);
+		buflen += 1024;
+		if (buflen > buflen_hint)
+			buflen_hint = buflen;
+	}
 	if (pw) {
 		*uidp = pw->pw_uid;
-		return (GSS_S_COMPLETE);
+		ret = GSS_S_COMPLETE;
 	} else {
-		return (GSS_S_FAILURE);
+		ret = GSS_S_FAILURE;
 	}
+	if (bufp != NULL && buflen > sizeof(buf))
+		free(bufp);
+	return (ret);
 }

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 01:13:00 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6016C1E2;
 Fri, 14 Jun 2013 01:13:00 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 52A3B16B0;
 Fri, 14 Jun 2013 01:13:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E1D0Zw093159;
 Fri, 14 Jun 2013 01:13:00 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E1D0el093153;
 Fri, 14 Jun 2013 01:13:00 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201306140113.r5E1D0el093153@svn.freebsd.org>
From: Mark Johnston 
Date: Fri, 14 Jun 2013 01:13:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251723 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 01:13:00 -0000

Author: markj
Date: Fri Jun 14 01:12:59 2013
New Revision: 251723
URL: http://svnweb.freebsd.org/changeset/base/251723

Log:
  The functions are called pci_{msi,msix}_count(), not pci_count_{msi,msix}().
  
  MFC after:	3 days

Modified:
  head/share/man/man9/pci.9

Modified: head/share/man/man9/pci.9
==============================================================================
--- head/share/man/man9/pci.9	Fri Jun 14 00:33:55 2013	(r251722)
+++ head/share/man/man9/pci.9	Fri Jun 14 01:12:59 2013	(r251723)
@@ -485,13 +485,13 @@ A driver is only allowed to use either M
 but not both.
 .Pp
 The
-.Fn pci_count_msi
+.Fn pci_msi_count
 function returns the maximum number of MSI messages supported by the
 device
 .Fa dev .
 If the device does not support MSI,
 then
-.Fn pci_count_msi
+.Fn pci_msi_count
 returns zero.
 .Pp
 The
@@ -538,13 +538,13 @@ The
 function returns zero on success and an error on failure.
 .Pp
 The
-.Fn pci_count_msix
+.Fn pci_msix_count
 function returns the maximum number of MSI-X messages supported by the
 device
 .Fa dev .
 If the device does not support MSI-X,
 then
-.Fn pci_count_msix
+.Fn pci_msix_count
 returns zero.
 .Pp
 The

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 02:21:32 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D5872EC;
 Fri, 14 Jun 2013 02:21:32 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B6BD018C0;
 Fri, 14 Jun 2013 02:21:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E2LWim015766;
 Fri, 14 Jun 2013 02:21:32 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E2LWMB015764;
 Fri, 14 Jun 2013 02:21:32 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201306140221.r5E2LWMB015764@svn.freebsd.org>
From: Hiroki Sato 
Date: Fri, 14 Jun 2013 02:21:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251724 - stable/9/usr.sbin/route6d
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 02:21:32 -0000

Author: hrs
Date: Fri Jun 14 02:21:32 2013
New Revision: 251724
URL: http://svnweb.freebsd.org/changeset/base/251724

Log:
  MFC 228990,243232,243233:
  
  Overhaul of route6d(8):
  
  - Use queue(3) for linked-list.
  - Use a consistent naming scheme for struct members.
  - Use ANSI C style function declaration.
  - Add check of RTM_VERSION mismatch.
  - Increase the number of retry for NET_RT_DUMP from 5 to 15.
  - Use 2001:db8:: as an example instead of deprecated 3ffe:: address block.
  - Add check for connected routes.
  - Add support of RTM_IFANNOUNCE for dyanmically-added/removed interfaces.
  - Add support of *, ?, and [ in the interface list.
  - Add -P number to specify route flag which will never expire.
  - Add -Q number to specify route flag which route6d will add to routes via RIP.
  - Add -p pidfile to specify the process ID file.

Modified:
  stable/9/usr.sbin/route6d/route6d.8
  stable/9/usr.sbin/route6d/route6d.c
Directory Properties:
  stable/9/usr.sbin/route6d/   (props changed)

Modified: stable/9/usr.sbin/route6d/route6d.8
==============================================================================
--- stable/9/usr.sbin/route6d/route6d.8	Fri Jun 14 01:12:59 2013	(r251723)
+++ stable/9/usr.sbin/route6d/route6d.8	Fri Jun 14 02:21:32 2013	(r251724)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 31, 1997
+.Dd November 18, 2012
 .Dt ROUTE6D 8
 .Os
 .Sh NAME
@@ -41,6 +41,15 @@
 .Op Fl O Ar prefix/preflen,if1[,if2...\&]
 .Ek
 .Bk -words
+.Op Fl P Ar number
+.Ek
+.Bk -words
+.Op Fl p Ar pidfile
+.Ek
+.Bk -words
+.Op Fl Q Ar number
+.Ek
+.Bk -words
 .Op Fl T Ar if1[,if2...\&]
 .Ek
 .Bk -words
@@ -80,6 +89,12 @@ and advertises the aggregated route
 .Ar prefix/preflen ,
 to the interfaces specified in the comma-separated interface list,
 .Ar if1[,if2...] .
+The characters
+.Qq Li * ,
+.Qq Li \&? ,
+and
+.Qq Li \&[
+in the interface list will be interpreted as shell-style pattern.
 The
 .Nm
 utility creates a static route to
@@ -143,7 +158,7 @@ option.
 For example, with
 .Do
 .Fl L
-.Li 3ffe::/16,if1
+.Li 2001:db8::/16,if1
 .Fl L
 .Li ::/0,if1
 .Dc
@@ -164,6 +179,33 @@ With this option
 .Nm
 will only advertise routes that matches
 .Ar prefix/preflen .
+.It Fl P Ar number
+Specifies routes to be ignored in calculation of expiration timer.
+The
+.Ar number
+must be
+.Li 1 ,
+.Li 2 ,
+or
+.Li 3
+and it means route flags of
+.Li RTF_PROTO1 ,
+.Li RTF_PROTO2 ,
+or
+.Li RTF_PROTO3 .
+When
+.Li 1
+is specified, routes with
+.Li RTF_PROTO1
+will never expire.
+.It Fl p Ar pidfile
+Specifies an alternative file in which to store the process ID.
+The default is
+.Pa /var/run/route6d.pid .
+.It Fl Q Ar number
+Specifies flag which will be used for routes added by RIP protocol.
+The default is
+.Li 2 Pq Li RTF_PROTO2 .
 .\"
 .It Fl q
 Makes

Modified: stable/9/usr.sbin/route6d/route6d.c
==============================================================================
--- stable/9/usr.sbin/route6d/route6d.c	Fri Jun 14 01:12:59 2013	(r251723)
+++ stable/9/usr.sbin/route6d/route6d.c	Fri Jun 14 02:21:32 2013	(r251724)
@@ -31,13 +31,14 @@
  */
 
 #ifndef	lint
-static char _rcsid[] = "$KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $";
+static const char _rcsid[] = "$KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $";
 #endif
 
 #include 
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -78,6 +79,7 @@ static char _rcsid[] = "$KAME: route6d.c
 #include "route6d.h"
 
 #define	MAXFILTER	40
+#define RT_DUMP_MAXRETRY	15
 
 #ifdef	DEBUG
 #define	INIT_INTERVAL6	6
@@ -102,9 +104,10 @@ static char _rcsid[] = "$KAME: route6d.c
 		(addr).s6_addr[3] = (index) & 0xff; \
 	} while (0)
 
-struct	ifc {			/* Configuration of an interface */
-	char	*ifc_name;			/* if name */
-	struct	ifc *ifc_next;
+struct ifc {			/* Configuration of an interface */
+	TAILQ_ENTRY(ifc) ifc_next;
+
+	char	ifc_name[IFNAMSIZ];		/* if name */
 	int	ifc_index;			/* if index */
 	int	ifc_mtu;			/* if mtu */
 	int	ifc_metric;			/* if metric */
@@ -112,30 +115,32 @@ struct	ifc {			/* Configuration of an in
 	short	ifc_cflags;			/* IFC_XXX */
 	struct	in6_addr ifc_mylladdr;		/* my link-local address */
 	struct	sockaddr_in6 ifc_ripsin;	/* rip multicast address */
-	struct	iff *ifc_filter;		/* filter structure */
-	struct	ifac *ifc_addr;			/* list of AF_INET6 addresses */
+	TAILQ_HEAD(, ifac) ifc_ifac_head;	/* list of AF_INET6 addrs */
+	TAILQ_HEAD(, iff) ifc_iff_head;		/* list of filters */
 	int	ifc_joined;			/* joined to ff02::9 */
 };
+TAILQ_HEAD(, ifc) ifc_head = TAILQ_HEAD_INITIALIZER(ifc_head);
+
+struct ifac {			/* Adddress associated to an interface */ 
+	TAILQ_ENTRY(ifac) ifac_next;
 
-struct	ifac {			/* Adddress associated to an interface */ 
-	struct	ifc *ifa_conf;		/* back pointer */
-	struct	ifac *ifa_next;
-	struct	in6_addr ifa_addr;	/* address */
-	struct	in6_addr ifa_raddr;	/* remote address, valid in p2p */
-	int	ifa_plen;		/* prefix length */
+	struct	ifc *ifac_ifc;		/* back pointer */
+	struct	in6_addr ifac_addr;	/* address */
+	struct	in6_addr ifac_raddr;	/* remote address, valid in p2p */
+	int	ifac_scope_id;		/* scope id */
+	int	ifac_plen;		/* prefix length */
 };
 
-struct	iff {
+struct iff {			/* Filters for an interface */
+	TAILQ_ENTRY(iff) iff_next;
+
 	int	iff_type;
 	struct	in6_addr iff_addr;
 	int	iff_plen;
-	struct	iff *iff_next;
 };
 
-struct	ifc *ifc;
-int	nifc;		/* number of valid ifc's */
 struct	ifc **index2ifc;
-int	nindex2ifc;
+unsigned int	nindex2ifc;
 struct	ifc *loopifcp = NULL;	/* pointing to loopback */
 #ifdef HAVE_POLL_H
 struct	pollfd set[2];
@@ -159,11 +164,12 @@ struct	rip6 *ripbuf;	/* packet buffer fo
  * One of the major drawbacks of the linear linked list is the difficulty
  * of representing the relationship between a couple of routes.  This may
  * be a significant problem when we have to support route aggregation with
- * supressing the specifices covered by the aggregate.
+ * suppressing the specifics covered by the aggregate.
  */
 
-struct	riprt {
-	struct	riprt *rrt_next;	/* next destination */
+struct riprt {
+	TAILQ_ENTRY(riprt) rrt_next;	/* next destination */
+
 	struct	riprt *rrt_same;	/* same destination - future use */
 	struct	netinfo6 rrt_info;	/* network info */
 	struct	in6_addr rrt_gw;	/* gateway */
@@ -172,8 +178,7 @@ struct	riprt {
 	time_t	rrt_t;			/* when the route validated */
 	int	rrt_index;		/* ifindex from which this route got */
 };
-
-struct	riprt *riprt = 0;
+TAILQ_HEAD(, riprt) riprt_head = TAILQ_HEAD_INITIALIZER(riprt_head);
 
 int	dflag = 0;	/* debug flag */
 int	qflag = 0;	/* quiet flag */
@@ -181,6 +186,8 @@ int	nflag = 0;	/* don't update kernel ro
 int	aflag = 0;	/* age out even the statically defined routes */
 int	hflag = 0;	/* don't split horizon */
 int	lflag = 0;	/* exchange site local routes */
+int	Pflag = 0;	/* don't age out routes with RTF_PROTO[123] */
+int	Qflag = RTF_PROTO2;	/* set RTF_PROTO[123] flag to routes by RIPng */
 int	sflag = 0;	/* announce static routes w/ split horizon */
 int	Sflag = 0;	/* announce static routes to every interface */
 unsigned long routetag = 0;	/* route tag attached on originating case */
@@ -222,7 +229,7 @@ int out_filter(struct riprt *, struct if
 void init(void);
 void sockopt(struct ifc *);
 void ifconfig(void);
-void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
+int ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
 void rtrecv(void);
 int rt_del(const struct sockaddr_in6 *, const struct sockaddr_in6 *,
 	const struct sockaddr_in6 *);
@@ -240,12 +247,13 @@ void applyplen(struct in6_addr *, int);
 void ifrtdump(int);
 void ifdump(int);
 void ifdump0(FILE *, const struct ifc *);
+void ifremove(int);
 void rtdump(int);
 void rt_entry(struct rt_msghdr *, int);
 void rtdexit(void);
 void riprequest(struct ifc *, struct netinfo6 *, int,
 	struct sockaddr_in6 *);
-void ripflush(struct ifc *, struct sockaddr_in6 *);
+void ripflush(struct ifc *, struct sockaddr_in6 *, int, struct netinfo6 *np);
 void sendrequest(struct ifc *);
 int sin6mask2len(const struct sockaddr_in6 *);
 int mask2len(const struct in6_addr *, int);
@@ -260,7 +268,7 @@ char *hms(void);
 const char *inet6_n2p(const struct in6_addr *);
 struct ifac *ifa_match(const struct ifc *, const struct in6_addr *, int);
 struct in6_addr *plen2mask(int);
-struct riprt *rtsearch(struct netinfo6 *, struct riprt **);
+struct riprt *rtsearch(struct netinfo6 *);
 int ripinterval(int);
 time_t ripsuptrig(void);
 void fatal(const char *, ...)
@@ -276,16 +284,23 @@ void setindex2ifc(int, struct ifc *);
 
 #define	MALLOC(type)	((type *)malloc(sizeof(type)))
 
+#define IFIL_TYPE_ANY	0x0
+#define IFIL_TYPE_A	'A'
+#define IFIL_TYPE_N	'N'
+#define IFIL_TYPE_T	'T'
+#define IFIL_TYPE_O	'O'
+#define IFIL_TYPE_L	'L'
+
 int
-main(argc, argv)
-	int	argc;
-	char	**argv;
+main(int argc, char *argv[])
 {
 	int	ch;
 	int	error = 0;
+	unsigned long proto;
 	struct	ifc *ifcp;
 	sigset_t mask, omask;
-	FILE	*pidfile;
+	const char *pidfile = ROUTE6D_PID;
+	FILE *pidfh;
 	char *progname;
 	char *ep;
 
@@ -296,7 +311,7 @@ main(argc, argv)
 		progname = *argv;
 
 	pid = getpid();
-	while ((ch = getopt(argc, argv, "A:N:O:R:T:L:t:adDhlnqsS")) != -1) {
+	while ((ch = getopt(argc, argv, "A:N:O:R:T:L:t:adDhlnp:P:Q:qsS")) != -1) {
 		switch (ch) {
 		case 'A':
 		case 'N':
@@ -318,6 +333,41 @@ main(argc, argv)
 				/*NOTREACHED*/
 			}
 			break;
+		case 'p':
+			pidfile = optarg;
+			break;
+		case 'P':
+			ep = NULL;
+			proto = strtoul(optarg, &ep, 0);
+			if (!ep || *ep != '\0' || 3 < proto) {
+				fatal("invalid P flag");
+				/*NOTREACHED*/
+			}
+			if (proto == 0)
+				Pflag = 0;
+			if (proto == 1)
+				Pflag |= RTF_PROTO1;
+			if (proto == 2)
+				Pflag |= RTF_PROTO2;
+			if (proto == 3)
+				Pflag |= RTF_PROTO3;
+			break;
+		case 'Q':
+			ep = NULL;
+			proto = strtoul(optarg, &ep, 0);
+			if (!ep || *ep != '\0' || 3 < proto) {
+				fatal("invalid Q flag");
+				/*NOTREACHED*/
+			}
+			if (proto == 0)
+				Qflag = 0;
+			if (proto == 1)
+				Qflag |= RTF_PROTO1;
+			if (proto == 2)
+				Qflag |= RTF_PROTO2;
+			if (proto == 3)
+				Qflag |= RTF_PROTO3;
+			break;
 		case 'R':
 			if ((rtlog = fopen(optarg, "w")) == NULL) {
 				fatal("Can not write to routelog");
@@ -372,11 +422,10 @@ main(argc, argv)
 
 	init();
 	ifconfig();
-	for (ifcp = ifc; ifcp; ifcp = ifcp->ifc_next) {
+	TAILQ_FOREACH(ifcp, &ifc_head, ifc_next) {
 		if (ifcp->ifc_index < 0) {
-			fprintf(stderr,
-"No ifindex found at %s (no link-local address?)\n",
-				ifcp->ifc_name);
+			fprintf(stderr, "No ifindex found at %s "
+			    "(no link-local address?)\n", ifcp->ifc_name);
 			error++;
 		}
 	}
@@ -386,20 +435,19 @@ main(argc, argv)
 		fatal("No loopback found");
 		/*NOTREACHED*/
 	}
-	for (ifcp = ifc; ifcp; ifcp = ifcp->ifc_next)
+	TAILQ_FOREACH(ifcp, &ifc_head, ifc_next) {
 		ifrt(ifcp, 0);
+	}
 	filterconfig();
 	krtread(0);
 	if (dflag)
 		ifrtdump(0);
 
-#if 1
 	pid = getpid();
-	if ((pidfile = fopen(ROUTE6D_PID, "w")) != NULL) {
-		fprintf(pidfile, "%d\n", pid);
-		fclose(pidfile);
+	if ((pidfh = fopen(pidfile, "w")) != NULL) {
+		fprintf(pidfh, "%d\n", pid);
+		fclose(pidfh);
 	}
-#endif
 
 	if ((ripbuf = (struct rip6 *)malloc(RIP6_MAXMTU)) == NULL) {
 		fatal("malloc");
@@ -427,8 +475,8 @@ main(argc, argv)
 	 */
 	alarm(ripinterval(INIT_INTERVAL6));
 
-	for (ifcp = ifc; ifcp; ifcp = ifcp->ifc_next) {
-		if (iff_find(ifcp, 'N'))
+	TAILQ_FOREACH(ifcp, &ifc_head, ifc_next) {
+		if (iff_find(ifcp, IFIL_TYPE_N) != NULL)
 			continue;
 		if (ifcp->ifc_index > 0 && (ifcp->ifc_flags & IFF_UP))
 			sendrequest(ifcp);
@@ -495,8 +543,7 @@ main(argc, argv)
 }
 
 void
-sighandler(signo)
-	int signo;
+sighandler(int signo)
 {
 
 	switch (signo) {
@@ -520,12 +567,12 @@ sighandler(signo)
  */
 /* ARGSUSED */
 void
-rtdexit()
+rtdexit(void)
 {
 	struct	riprt *rrt;
 
 	alarm(0);
-	for (rrt = riprt; rrt; rrt = rrt->rrt_next) {
+	TAILQ_FOREACH(rrt, &riprt_head, rrt_next) {
 		if (rrt->rrt_rflags & RRTF_AGGREGATE) {
 			delroute(&rrt->rrt_info, &rrt->rrt_gw);
 		}
@@ -547,39 +594,27 @@ rtdexit()
  */
 /* ARGSUSED */
 void
-ripalarm()
+ripalarm(void)
 {
 	struct	ifc *ifcp;
-	struct	riprt *rrt, *rrt_prev, *rrt_next;
+	struct	riprt *rrt, *rrt_tmp;
 	time_t	t_lifetime, t_holddown;
 
 	/* age the RIP routes */
-	rrt_prev = 0;
 	t_lifetime = time(NULL) - RIP_LIFETIME;
 	t_holddown = t_lifetime - RIP_HOLDDOWN;
-	for (rrt = riprt; rrt; rrt = rrt_next) {
-		rrt_next = rrt->rrt_next;
-
-		if (rrt->rrt_t == 0) {
-			rrt_prev = rrt;
+	TAILQ_FOREACH_SAFE(rrt, &riprt_head, rrt_next, rrt_tmp) {
+		if (rrt->rrt_t == 0)
 			continue;
-		}
-		if (rrt->rrt_t < t_holddown) {
-			if (rrt_prev) {
-				rrt_prev->rrt_next = rrt->rrt_next;
-			} else {
-				riprt = rrt->rrt_next;
-			}
+		else if (rrt->rrt_t < t_holddown) {
+			TAILQ_REMOVE(&riprt_head, rrt, rrt_next);
 			delroute(&rrt->rrt_info, &rrt->rrt_gw);
 			free(rrt);
-			continue;
-		}
-		if (rrt->rrt_t < t_lifetime)
+		} else if (rrt->rrt_t < t_lifetime)
 			rrt->rrt_info.rip6_metric = HOPCNT_INFINITY6;
-		rrt_prev = rrt;
 	}
 	/* Supply updates */
-	for (ifcp = ifc; ifcp; ifcp = ifcp->ifc_next) {
+	TAILQ_FOREACH(ifcp, &ifc_head, ifc_next) {
 		if (ifcp->ifc_index > 0 && (ifcp->ifc_flags & IFF_UP))
 			ripsend(ifcp, &ifcp->ifc_ripsin, 0);
 	}
@@ -587,15 +622,14 @@ ripalarm()
 }
 
 void
-init()
+init(void)
 {
 	int	error;
 	const int int0 = 0, int1 = 1, int255 = 255;
 	struct	addrinfo hints, *res;
 	char	port[NI_MAXSERV];
 
-	ifc = (struct ifc *)NULL;
-	nifc = 0;
+	TAILQ_INIT(&ifc_head);
 	nindex2ifc = 0;	/*initial guess*/
 	index2ifc = NULL;
 	snprintf(port, sizeof(port), "%u", RIP6_PORT);
@@ -735,13 +769,8 @@ init()
 /*
  * ripflush flushes the rip datagram stored in the rip buffer
  */
-static int nrt;
-static struct netinfo6 *np;
-
 void
-ripflush(ifcp, sin6)
-	struct ifc *ifcp;
-	struct sockaddr_in6 *sin6;
+ripflush(struct ifc *ifcp, struct sockaddr_in6 *sin6, int nrt, struct netinfo6 *np)
 {
 	int i;
 	int error;
@@ -783,21 +812,19 @@ ripflush(ifcp, sin6)
 			ifcp->ifc_name, inet6_n2p(&ifcp->ifc_ripsin.sin6_addr));
 		ifcp->ifc_flags &= ~IFF_UP;	/* As if down for AF_INET6 */
 	}
-	nrt = 0; np = ripbuf->rip6_nets;
 }
 
 /*
  * Generate RIP6_RESPONSE packets and send them.
  */
 void
-ripsend(ifcp, sin6, flag)
-	struct	ifc *ifcp;
-	struct	sockaddr_in6 *sin6;
-	int flag;
+ripsend(struct	ifc *ifcp, struct sockaddr_in6 *sin6, int flag)
 {
 	struct	riprt *rrt;
 	struct	in6_addr *nh;	/* next hop */
+	struct netinfo6 *np;
 	int	maxrte;
+	int nrt;
 
 	if (qflag)
 		return;
@@ -811,20 +838,24 @@ ripsend(ifcp, sin6, flag)
 				sizeof(struct udphdr) - 
 				sizeof(struct rip6) + sizeof(struct netinfo6)) /
 				sizeof(struct netinfo6);
-		nrt = 0; np = ripbuf->rip6_nets; nh = NULL;
-		for (rrt = riprt; rrt; rrt = rrt->rrt_next) {
+		nh = NULL;
+		nrt = 0;
+		np = ripbuf->rip6_nets;
+		TAILQ_FOREACH(rrt, &riprt_head, rrt_next) {
 			if (rrt->rrt_rflags & RRTF_NOADVERTISE)
 				continue;
 			/* Put the route to the buffer */
 			*np = rrt->rrt_info;
 			np++; nrt++;
 			if (nrt == maxrte) {
-				ripflush(NULL, sin6);
+				ripflush(NULL, sin6, nrt, np);
 				nh = NULL;
+				nrt = 0;
+				np = ripbuf->rip6_nets;
 			}
 		}
 		if (nrt)	/* Send last packet */
-			ripflush(NULL, sin6);
+			ripflush(NULL, sin6, nrt, np);
 		return;
 	}
 
@@ -833,11 +864,11 @@ ripsend(ifcp, sin6, flag)
 		return;
 
 	/* -N: no use */
-	if (iff_find(ifcp, 'N') != NULL)
+	if (iff_find(ifcp, IFIL_TYPE_N) != NULL)
 		return;
 
 	/* -T: generate default route only */
-	if (iff_find(ifcp, 'T') != NULL) {
+	if (iff_find(ifcp, IFIL_TYPE_T) != NULL) {
 		struct netinfo6 rrt_info;
 		memset(&rrt_info, 0, sizeof(struct netinfo6));
 		rrt_info.rip6_dest = in6addr_any;
@@ -848,7 +879,7 @@ ripsend(ifcp, sin6, flag)
 		np = ripbuf->rip6_nets;
 		*np = rrt_info;
 		nrt = 1;
-		ripflush(ifcp, sin6);
+		ripflush(ifcp, sin6, nrt, np);
 		return;
 	}
 
@@ -858,7 +889,7 @@ ripsend(ifcp, sin6, flag)
 			sizeof(struct netinfo6);
 
 	nrt = 0; np = ripbuf->rip6_nets; nh = NULL;
-	for (rrt = riprt; rrt; rrt = rrt->rrt_next) {
+	TAILQ_FOREACH(rrt, &riprt_head, rrt_next) {
 		if (rrt->rrt_rflags & RRTF_NOADVERTISE)
 			continue;
 
@@ -880,8 +911,13 @@ ripsend(ifcp, sin6, flag)
 		    !IN6_IS_ADDR_UNSPECIFIED(&rrt->rrt_gw) &&
 		    (rrt->rrt_rflags & RRTF_NH_NOT_LLADDR) == 0) {
 			if (nh == NULL || !IN6_ARE_ADDR_EQUAL(nh, &rrt->rrt_gw)) {
-				if (nrt == maxrte - 2)
-					ripflush(ifcp, sin6);
+				if (nrt == maxrte - 2) {
+					ripflush(ifcp, sin6, nrt, np);
+					nh = NULL;
+					nrt = 0;
+					np = ripbuf->rip6_nets;
+				}
+
 				np->rip6_dest = rrt->rrt_gw;
 				if (IN6_IS_ADDR_LINKLOCAL(&np->rip6_dest))
 					SET_IN6_LINKLOCAL_IFINDEX(np->rip6_dest, 0);
@@ -895,8 +931,12 @@ ripsend(ifcp, sin6, flag)
 			          !IN6_ARE_ADDR_EQUAL(nh, &rrt->rrt_gw) ||
 				  rrt->rrt_rflags & RRTF_NH_NOT_LLADDR)) {
 			/* Reset nexthop */
-			if (nrt == maxrte - 2)
-				ripflush(ifcp, sin6);
+			if (nrt == maxrte - 2) {
+				ripflush(ifcp, sin6, nrt, np);
+				nh = NULL;
+				nrt = 0;
+				np = ripbuf->rip6_nets;
+			}
 			memset(np, 0, sizeof(struct netinfo6));
 			np->rip6_metric = NEXTHOP_METRIC;
 			nh = NULL;
@@ -907,21 +947,21 @@ ripsend(ifcp, sin6, flag)
 		*np = rrt->rrt_info;
 		np++; nrt++;
 		if (nrt == maxrte) {
-			ripflush(ifcp, sin6);
+			ripflush(ifcp, sin6, nrt, np);
 			nh = NULL;
+			nrt = 0;
+			np = ripbuf->rip6_nets;
 		}
 	}
 	if (nrt)	/* Send last packet */
-		ripflush(ifcp, sin6);
+		ripflush(ifcp, sin6, nrt, np);
 }
 
 /*
  * outbound filter logic, per-route/interface.
  */
 int
-out_filter(rrt, ifcp)
-	struct riprt *rrt;
-	struct ifc *ifcp;
+out_filter(struct riprt *rrt, struct ifc *ifcp)
 {
 	struct iff *iffp;
 	struct in6_addr ia;
@@ -931,7 +971,7 @@ out_filter(rrt, ifcp)
 	 * -A: filter out less specific routes, if we have aggregated
 	 * route configured.
 	 */ 
-	for (iffp = ifcp->ifc_filter; iffp; iffp = iffp->iff_next) {
+	TAILQ_FOREACH(iffp, &ifcp->ifc_iff_head, iff_next) {
 		if (iffp->iff_type != 'A')
 			continue;
 		if (rrt->rrt_info.rip6_plen <= iffp->iff_plen)
@@ -948,7 +988,7 @@ out_filter(rrt, ifcp)
 	 */
 	if ((rrt->rrt_rflags & RRTF_AGGREGATE) != 0) {
 		ok = 0;
-		for (iffp = ifcp->ifc_filter; iffp; iffp = iffp->iff_next) {
+		TAILQ_FOREACH(iffp, &ifcp->ifc_iff_head, iff_next) {
 			if (iffp->iff_type != 'A')
 				continue;
 			if (rrt->rrt_info.rip6_plen == iffp->iff_plen &&
@@ -965,9 +1005,9 @@ out_filter(rrt, ifcp)
 	/*
 	 * -O: advertise only if prefix matches the configured prefix.
 	 */
-	if (iff_find(ifcp, 'O')) {
+	if (iff_find(ifcp, IFIL_TYPE_O) != NULL) {
 		ok = 0;
-		for (iffp = ifcp->ifc_filter; iffp; iffp = iffp->iff_next) {
+		TAILQ_FOREACH(iffp, &ifcp->ifc_iff_head, iff_next) {
 			if (iffp->iff_type != 'O')
 				continue;
 			if (rrt->rrt_info.rip6_plen < iffp->iff_plen)
@@ -992,9 +1032,7 @@ out_filter(rrt, ifcp)
  * It checks options specified in the arguments and the split horizon rule.
  */
 int
-tobeadv(rrt, ifcp)
-	struct riprt *rrt;
-	struct ifc *ifcp;
+tobeadv(struct riprt *rrt, struct ifc *ifcp)
 {
 
 	/* Special care for static routes */
@@ -1019,9 +1057,7 @@ tobeadv(rrt, ifcp)
  * Send a rip packet actually.
  */
 int
-sendpacket(sin6, len)
-	struct	sockaddr_in6 *sin6;
-	int	len;
+sendpacket(struct sockaddr_in6 *sin6, int len)
 {
 	struct msghdr m;
 	struct cmsghdr *cm;
@@ -1080,7 +1116,7 @@ sendpacket(sin6, len)
  * table if necessary.
  */
 void
-riprecv()
+riprecv(void)
 {
 	struct	ifc *ifcp, *ic;
 	struct	sockaddr_in6 fsock;
@@ -1147,7 +1183,7 @@ riprecv()
 	if (idx && IN6_IS_ADDR_LINKLOCAL(&fsock.sin6_addr))
 		SET_IN6_LINKLOCAL_IFINDEX(fsock.sin6_addr, idx);
 
-	if (len < sizeof(struct rip6)) {
+	if ((size_t)len < sizeof(struct rip6)) {
 		trace(1, "Packet too short\n");
 		return;
 	}
@@ -1235,7 +1271,7 @@ riprecv()
 	}
 
 	/* -N: no use */
-	if (iff_find(ifcp, 'N') != NULL)
+	if (iff_find(ifcp, IFIL_TYPE_N) != NULL)
 		return;
 
 	tracet(1, "Recv(%s): from %s.%d info(%zd)\n",
@@ -1300,23 +1336,23 @@ riprecv()
 		/*
 		 * -L: listen only if the prefix matches the configuration
 		 */
-		ok = 1;		/* if there's no L filter, it is ok */
-		for (iffp = ifcp->ifc_filter; iffp; iffp = iffp->iff_next) {
-			if (iffp->iff_type != 'L')
-				continue;
-			ok = 0;
-			if (np->rip6_plen < iffp->iff_plen)
-				continue;
-			/* special rule: ::/0 means default, not "in /0" */
-			if (iffp->iff_plen == 0 && np->rip6_plen > 0)
-				continue;
-			ia = np->rip6_dest; 
-			applyplen(&ia, iffp->iff_plen);
-			if (IN6_ARE_ADDR_EQUAL(&ia, &iffp->iff_addr)) {
-				ok = 1;
-				break;
-			}
-		}
+                ok = 1;	/* if there's no L filter, it is ok */
+                TAILQ_FOREACH(iffp, &ifcp->ifc_iff_head, iff_next) {
+                        if (iffp->iff_type != IFIL_TYPE_L)
+                                continue;
+                        ok = 0;
+                        if (np->rip6_plen < iffp->iff_plen)
+                                continue;
+                        /* special rule: ::/0 means default, not "in /0" */
+                        if (iffp->iff_plen == 0 && np->rip6_plen > 0)
+                                continue;
+                        ia = np->rip6_dest; 
+                        applyplen(&ia, iffp->iff_plen);
+                        if (IN6_ARE_ADDR_EQUAL(&ia, &iffp->iff_addr)) {
+                                ok = 1;
+                                break;
+                        }
+                }
 		if (!ok) {
 			trace(2, "  (filtered)\n");
 			continue;
@@ -1329,7 +1365,7 @@ riprecv()
 			np->rip6_metric = HOPCNT_INFINITY6;
 
 		applyplen(&np->rip6_dest, np->rip6_plen);
-		if ((rrt = rtsearch(np, NULL)) != NULL) {
+		if ((rrt = rtsearch(np)) != NULL) {
 			if (rrt->rrt_t == 0)
 				continue;	/* Intf route has priority */
 			nq = &rrt->rrt_info;
@@ -1398,20 +1434,20 @@ riprecv()
 			if (nq->rip6_plen == sizeof(struct in6_addr) * 8)
 				rrt->rrt_flags |= RTF_HOST;
 
-			/* Put the route to the list */
-			rrt->rrt_next = riprt;
-			riprt = rrt;
 			/* Update routing table */
 			addroute(rrt, &nh, ifcp);
 			rrt->rrt_rflags |= RRTF_CHANGED;
 			need_trigger = 1;
 			rrt->rrt_t = t;
+
+			/* Put the route to the list */
+			TAILQ_INSERT_HEAD(&riprt_head, rrt, rrt_next);
 		}
 	}
 	/* XXX need to care the interval between triggered updates */
 	if (need_trigger) {
 		if (nextalarm > time(NULL) + RIP_TRIG_INT6_MAX) {
-			for (ic = ifc; ic; ic = ic->ifc_next) {
+			TAILQ_FOREACH(ic, &ifc_head, ifc_next) {
 				if (ifcp->ifc_index == ic->ifc_index)
 					continue;
 				if (ic->ifc_flags & IFF_UP)
@@ -1420,8 +1456,9 @@ riprecv()
 			}
 		}
 		/* Reset the flag */
-		for (rrt = riprt; rrt; rrt = rrt->rrt_next)
+		TAILQ_FOREACH(rrt, &riprt_head, rrt_next) {
 			rrt->rrt_rflags &= ~RRTF_CHANGED;
+		}
 	}
 }
 
@@ -1429,8 +1466,7 @@ riprecv()
  * Send all routes request packet to the specified interface.
  */
 void
-sendrequest(ifcp)
-	struct ifc *ifcp;
+sendrequest(struct ifc *ifcp)
 {
 	struct netinfo6 *np;
 	int error;
@@ -1458,11 +1494,10 @@ sendrequest(ifcp)
  * Process a RIP6_REQUEST packet.
  */
 void
-riprequest(ifcp, np, nn, sin6)
-	struct ifc *ifcp;
-	struct netinfo6 *np;
-	int nn;
-	struct sockaddr_in6 *sin6;
+riprequest(struct ifc *ifcp,
+	struct netinfo6 *np,
+	int nn,
+	struct sockaddr_in6 *sin6)
 {
 	int i;
 	struct riprt *rrt;
@@ -1472,7 +1507,7 @@ riprequest(ifcp, np, nn, sin6)
 		/* Specific response, don't split-horizon */
 		trace(1, "\tRIP Request\n");
 		for (i = 0; i < nn; i++, np++) {
-			rrt = rtsearch(np, NULL);
+			rrt = rtsearch(np);
 			if (rrt)
 				np->rip6_metric = rrt->rrt_info.rip6_metric;
 			else
@@ -1490,7 +1525,7 @@ riprequest(ifcp, np, nn, sin6)
  * Get information of each interface.
  */
 void
-ifconfig()
+ifconfig(void)
 {
 	struct ifaddrs *ifap, *ifa;
 	struct ifc *ifcp;
@@ -1521,14 +1556,14 @@ ifconfig()
 				/*NOTREACHED*/
 			}
 			memset(ifcp, 0, sizeof(*ifcp));
+
 			ifcp->ifc_index = -1;
-			ifcp->ifc_next = ifc;
-			ifc = ifcp;
-			nifc++;
-			ifcp->ifc_name = allocopy(ifa->ifa_name);
-			ifcp->ifc_addr = 0;
-			ifcp->ifc_filter = 0;
+			strlcpy(ifcp->ifc_name, ifa->ifa_name,
+			    sizeof(ifcp->ifc_name));
+			TAILQ_INIT(&ifcp->ifc_ifac_head);
+			TAILQ_INIT(&ifcp->ifc_iff_head);
 			ifcp->ifc_flags = ifa->ifa_flags;
+			TAILQ_INSERT_HEAD(&ifc_head, ifcp, ifc_next);
 			trace(1, "newif %s <%s>\n", ifcp->ifc_name,
 				ifflags(ifcp->ifc_flags));
 			if (!strcmp(ifcp->ifc_name, LOOPBACK_IF))
@@ -1543,7 +1578,10 @@ ifconfig()
 			}
 			ifcp->ifc_flags = ifa->ifa_flags;
 		}
-		ifconfig1(ifa->ifa_name, ifa->ifa_addr, ifcp, s);
+		if (ifconfig1(ifa->ifa_name, ifa->ifa_addr, ifcp, s) < 0) {
+			/* maybe temporary failure */
+			continue;
+		}
 		if ((ifcp->ifc_flags & (IFF_LOOPBACK | IFF_UP)) == IFF_UP
 		 && 0 < ifcp->ifc_index && !ifcp->ifc_joined) {
 			mreq.ipv6mr_multiaddr = ifcp->ifc_ripsin.sin6_addr;
@@ -1561,65 +1599,65 @@ ifconfig()
 	freeifaddrs(ifap);
 }
 
-void
-ifconfig1(name, sa, ifcp, s)
-	const char *name;
-	const struct sockaddr *sa;
-	struct	ifc *ifcp;
-	int	s;
+int
+ifconfig1(const char *name,
+	const struct sockaddr *sa,
+	struct ifc *ifcp,
+	int s)
 {
 	struct	in6_ifreq ifr;
 	const struct sockaddr_in6 *sin6;
-	struct	ifac *ifa;
+	struct	ifac *ifac;
 	int	plen;
 	char	buf[BUFSIZ];
 
 	sin6 = (const struct sockaddr_in6 *)sa;
 	if (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr) && !lflag)
-		return;
+		return (-1);
 	ifr.ifr_addr = *sin6;
 	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 	if (ioctl(s, SIOCGIFNETMASK_IN6, (char *)&ifr) < 0) {
-		fatal("ioctl: SIOCGIFNETMASK_IN6");
-		/*NOTREACHED*/
+		syslog(LOG_INFO, "ioctl: SIOCGIFNETMASK_IN6");
+		return (-1);
 	}
 	plen = sin6mask2len(&ifr.ifr_addr);
-	if ((ifa = ifa_match(ifcp, &sin6->sin6_addr, plen)) != NULL) {
+	if ((ifac = ifa_match(ifcp, &sin6->sin6_addr, plen)) != NULL) {
 		/* same interface found */
 		/* need check if something changed */
 		/* XXX not yet implemented */
-		return;
+		return (-1);
 	}
 	/*
 	 * New address is found
 	 */
-	if ((ifa = MALLOC(struct ifac)) == NULL) {
+	if ((ifac = MALLOC(struct ifac)) == NULL) {
 		fatal("malloc: struct ifac");
 		/*NOTREACHED*/
 	}
-	memset(ifa, 0, sizeof(*ifa));
-	ifa->ifa_conf = ifcp;
-	ifa->ifa_next = ifcp->ifc_addr;
-	ifcp->ifc_addr = ifa;
-	ifa->ifa_addr = sin6->sin6_addr;
-	ifa->ifa_plen = plen;
+	memset(ifac, 0, sizeof(*ifac));
+
+	ifac->ifac_ifc = ifcp;
+	ifac->ifac_addr = sin6->sin6_addr;
+	ifac->ifac_plen = plen;
+	ifac->ifac_scope_id = sin6->sin6_scope_id;
 	if (ifcp->ifc_flags & IFF_POINTOPOINT) {
 		ifr.ifr_addr = *sin6;
 		if (ioctl(s, SIOCGIFDSTADDR_IN6, (char *)&ifr) < 0) {
 			fatal("ioctl: SIOCGIFDSTADDR_IN6");
 			/*NOTREACHED*/
 		}
-		ifa->ifa_raddr = ifr.ifr_dstaddr.sin6_addr;
-		inet_ntop(AF_INET6, (void *)&ifa->ifa_raddr, buf, sizeof(buf));
+		ifac->ifac_raddr = ifr.ifr_dstaddr.sin6_addr;
+		inet_ntop(AF_INET6, (void *)&ifac->ifac_raddr, buf,
+		    sizeof(buf));
 		trace(1, "found address %s/%d -- %s\n",
-			inet6_n2p(&ifa->ifa_addr), ifa->ifa_plen, buf);
+			inet6_n2p(&ifac->ifac_addr), ifac->ifac_plen, buf);
 	} else {
 		trace(1, "found address %s/%d\n",
-			inet6_n2p(&ifa->ifa_addr), ifa->ifa_plen);
+			inet6_n2p(&ifac->ifac_addr), ifac->ifac_plen);
 	}
-	if (ifcp->ifc_index < 0 && IN6_IS_ADDR_LINKLOCAL(&ifa->ifa_addr)) {
-		ifcp->ifc_mylladdr = ifa->ifa_addr;
-		ifcp->ifc_index = IN6_LINKLOCAL_IFINDEX(ifa->ifa_addr);
+	if (ifcp->ifc_index < 0 && IN6_IS_ADDR_LINKLOCAL(&ifac->ifac_addr)) {
+		ifcp->ifc_mylladdr = ifac->ifac_addr;
+		ifcp->ifc_index = IN6_LINKLOCAL_IFINDEX(ifac->ifac_addr);
 		memcpy(&ifcp->ifc_ripsin, &ripsin, ripsin.ss_len);
 		SET_IN6_LINKLOCAL_IFINDEX(ifcp->ifc_ripsin.sin6_addr,
 			ifcp->ifc_index);
@@ -1636,6 +1674,34 @@ ifconfig1(name, sa, ifcp, s)
 			ifcp->ifc_index, ifcp->ifc_mtu, ifcp->ifc_metric);
 	} else
 		ifcp->ifc_cflags |= IFC_CHANGED;
+
+	TAILQ_INSERT_HEAD(&ifcp->ifc_ifac_head, ifac, ifac_next);
+
+	return 0;
+}
+
+void
+ifremove(int ifindex)
+{
+	struct ifc *ifcp;
+	struct riprt *rrt;
+
+	TAILQ_FOREACH(ifcp, &ifc_head, ifc_next) {
+		if (ifcp->ifc_index == ifindex)
+			break;
+	}
+	if (ifcp == NULL)
+		return; 
+
+	tracet(1, "ifremove: %s is departed.\n", ifcp->ifc_name);
+	TAILQ_REMOVE(&ifc_head, ifcp, ifc_next);
+
+	TAILQ_FOREACH(rrt, &riprt_head, rrt_next) {
+		if (rrt->rrt_index == ifcp->ifc_index &&
+		    rrt->rrt_rflags & RRTF_AGGREGATE)
+			delroute(&rrt->rrt_info, &rrt->rrt_gw);
+	}
+	free(ifcp);
 }
 
 /*
@@ -1643,30 +1709,35 @@ ifconfig1(name, sa, ifcp, s)
  * Update interface information as necesssary.
  */
 void
-rtrecv()
+rtrecv(void)
 {
 	char buf[BUFSIZ];
-	char *p, *q;
+	char *p, *q = NULL;
 	struct rt_msghdr *rtm;
 	struct ifa_msghdr *ifam;
 	struct if_msghdr *ifm;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 02:25:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 66298380;
 Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5746818E6;
 Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E2Pffg016490;
 Fri, 14 Jun 2013 02:25:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E2Pfhw016489;
 Fri, 14 Jun 2013 02:25:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306140225.r5E2Pfhw016489@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251725 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 02:25:41 -0000

Author: lstewart
Date: Fri Jun 14 02:25:40 2013
New Revision: 251725
URL: http://svnweb.freebsd.org/changeset/base/251725

Log:
  Fix a potential NULL-pointer dereference that would trigger if the hhook
  registration site did not provide storage for a copy of the hhook_head struct.
  
  MFC after:	3 days

Modified:
  head/sys/kern/kern_hhook.c

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Fri Jun 14 02:21:32 2013	(r251724)
+++ head/sys/kern/kern_hhook.c	Fri Jun 14 02:25:40 2013	(r251725)
@@ -264,9 +264,10 @@ hhook_head_register(int32_t hhook_type, 
 	STAILQ_INIT(&tmphhh->hhh_hooks);
 	HHH_LOCK_INIT(tmphhh);
 
-	if (hhh != NULL)
+	if (hhh != NULL) {
 		refcount_init(&tmphhh->hhh_refcount, 1);
-	else
+		*hhh = tmphhh;
+	} else
 		refcount_init(&tmphhh->hhh_refcount, 0);
 
 	if (flags & HHOOK_HEADISINVNET) {
@@ -278,8 +279,6 @@ hhook_head_register(int32_t hhook_type, 
 		/* XXXLAS: Add tmphhh to the non-virtualised list. */
 	}
 
-	*hhh = tmphhh;
-
 	return (0);
 }
 

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 02:51:04 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 237DC812;
 Fri, 14 Jun 2013 02:51:04 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 147401996;
 Fri, 14 Jun 2013 02:51:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E2p3nt024917;
 Fri, 14 Jun 2013 02:51:03 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E2p3eF024916;
 Fri, 14 Jun 2013 02:51:03 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306140251.r5E2p3eF024916@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Fri, 14 Jun 2013 02:51:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251726 - stable/9/lib/libstand
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 02:51:04 -0000

Author: pfg
Date: Fri Jun 14 02:51:03 2013
New Revision: 251726
URL: http://svnweb.freebsd.org/changeset/base/251726

Log:
  MFC	r251561:
  
  libstand: Reset the seek pointer in ext2fs as done in UFS.
  
  Reset the seek pointer to 0 when a file is successfully opened,
  since otherwise the initial seek offset will contain the directory
  offset of the filesystem block that contained its directory entry.
  This bug was mostly harmless because typically the directory is
  less than one filesystem block in size so the offset would be zero.
  It did however generally break loading a kernel from the (large)
  kernel compile directory.
  
  Also reset the seek pointer when a new inode is opened in read_inode(),
  though this is not actually necessary now because all callers set
  it afterwards.
  
  PR:		177328
  Submitted by:	Eric van Gyzen
  Reviewed by:	iedowse

Modified:
  stable/9/lib/libstand/ext2fs.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libstand/   (props changed)

Modified: stable/9/lib/libstand/ext2fs.c
==============================================================================
--- stable/9/lib/libstand/ext2fs.c	Fri Jun 14 02:25:40 2013	(r251725)
+++ stable/9/lib/libstand/ext2fs.c	Fri Jun 14 02:51:03 2013	(r251726)
@@ -536,6 +536,7 @@ ext2fs_open(const char *upath, struct op
 	 * Found terminal component.
 	 */
 	error = 0;
+	fp->f_seekp = 0;
 out:
 	if (buf)
 		free(buf);
@@ -584,6 +585,7 @@ read_inode(ino_t inumber, struct open_fi
 	for (level = 0; level < NIADDR; level++)
 		fp->f_blkno[level] = -1;
 	fp->f_buf_blkno = -1;
+	fp->f_seekp = 0;
 
 out:
 	free(buf);

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 03:21:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 46330178;
 Fri, 14 Jun 2013 03:21:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 376E41BDB;
 Fri, 14 Jun 2013 03:21:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E3LswY036321;
 Fri, 14 Jun 2013 03:21:54 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E3LsRY036320;
 Fri, 14 Jun 2013 03:21:54 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306140321.r5E3LsRY036320@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Fri, 14 Jun 2013 03:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251727 - stable/8/lib/libstand
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 03:21:54 -0000

Author: pfg
Date: Fri Jun 14 03:21:53 2013
New Revision: 251727
URL: http://svnweb.freebsd.org/changeset/base/251727

Log:
  MFC	r251561:
  
  libstand: Reset the seek pointer in ext2fs as done in UFS.
  
  PR:		177328
  Submitted by:	Eric van Gyzen
  Reviewed by:	iedowse

Modified:
  stable/8/lib/libstand/ext2fs.c
Directory Properties:
  stable/8/   (props changed)
  stable/8/lib/   (props changed)
  stable/8/lib/libstand/   (props changed)

Modified: stable/8/lib/libstand/ext2fs.c
==============================================================================
--- stable/8/lib/libstand/ext2fs.c	Fri Jun 14 02:51:03 2013	(r251726)
+++ stable/8/lib/libstand/ext2fs.c	Fri Jun 14 03:21:53 2013	(r251727)
@@ -536,6 +536,7 @@ ext2fs_open(const char *upath, struct op
 	 * Found terminal component.
 	 */
 	error = 0;
+	fp->f_seekp = 0;
 out:
 	if (buf)
 		free(buf);
@@ -584,6 +585,7 @@ read_inode(ino_t inumber, struct open_fi
 	for (level = 0; level < NIADDR; level++)
 		fp->f_blkno[level] = -1;
 	fp->f_buf_blkno = -1;
+	fp->f_seekp = 0;
 
 out:
 	free(buf);

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 03:28:30 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 21CC8613;
 Fri, 14 Jun 2013 03:28:30 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 139DC1C25;
 Fri, 14 Jun 2013 03:28:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E3STCb037521;
 Fri, 14 Jun 2013 03:28:29 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E3STvD037517;
 Fri, 14 Jun 2013 03:28:29 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306140328.r5E3STvD037517@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Fri, 14 Jun 2013 03:28:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251728 - stable/8/contrib/gcc
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 03:28:30 -0000

Author: pfg
Date: Fri Jun 14 03:28:29 2013
New Revision: 251728
URL: http://svnweb.freebsd.org/changeset/base/251728

Log:
  MFC	r250550, r250566;
  
  Update the gcc43 ChangeLog.
  
  Add support for "d" floating-point suffix, as defined by draft N1312
  of TR 24732.

Modified:
  stable/8/contrib/gcc/ChangeLog.gcc43
  stable/8/contrib/gcc/c-lex.c
Directory Properties:
  stable/8/   (props changed)
  stable/8/contrib/   (props changed)
  stable/8/contrib/gcc/   (props changed)
  stable/8/contrib/gcclibs/   (props changed)

Modified: stable/8/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- stable/8/contrib/gcc/ChangeLog.gcc43	Fri Jun 14 03:21:53 2013	(r251727)
+++ stable/8/contrib/gcc/ChangeLog.gcc43	Fri Jun 14 03:28:29 2013	(r251728)
@@ -182,6 +182,10 @@
 
 	* doc/invoke.texi: Document -mssse3/-mno-ssse3 switches.
 
+2006-10-22  H.J. Lu  
+  	 
+	* config/i386/tmmintrin.h: Remove the duplicated content.
+
 2006-10-21  Richard Guenther   (r117932)
 
 	PR tree-optimization/3511

Modified: stable/8/contrib/gcc/c-lex.c
==============================================================================
--- stable/8/contrib/gcc/c-lex.c	Fri Jun 14 03:21:53 2013	(r251727)
+++ stable/8/contrib/gcc/c-lex.c	Fri Jun 14 03:28:29 2013	(r251728)
@@ -640,6 +640,13 @@ interpret_float (const cpp_token *token,
   char *copy;
   size_t copylen;
 
+  /* Default (no suffix) is double.  */
+  if (flags & CPP_N_DEFAULT)
+    {
+      flags ^= CPP_N_DEFAULT;
+      flags |= CPP_N_MEDIUM;
+    }
+
   /* Decode type based on width and properties. */
   if (flags & CPP_N_DFLOAT)
     if ((flags & CPP_N_WIDTH) == CPP_N_LARGE)

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 03:31:11 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8A71E7A9;
 Fri, 14 Jun 2013 03:31:11 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CF701C41;
 Fri, 14 Jun 2013 03:31:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E3VBAf039559;
 Fri, 14 Jun 2013 03:31:11 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E3VBAO039558;
 Fri, 14 Jun 2013 03:31:11 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201306140331.r5E3VBAO039558@svn.freebsd.org>
From: "Justin T. Gibbs" 
Date: Fri, 14 Jun 2013 03:31:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251729 - head/sys/dev/xen/netfront
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 03:31:11 -0000

Author: gibbs
Date: Fri Jun 14 03:31:11 2013
New Revision: 251729
URL: http://svnweb.freebsd.org/changeset/base/251729

Log:
  sys/dev/xen/netfront/netfront.c:
  	In netif_free(), call ifmedia_removeall() after ether_ifdetach()
  	so that bpf listeners are detached, any link state processing
  	is completed, and there is no chance for external reference to media
  	information.
  
  Suggested by:	yongari
  MFC after:	1 week

Modified:
  head/sys/dev/xen/netfront/netfront.c

Modified: head/sys/dev/xen/netfront/netfront.c
==============================================================================
--- head/sys/dev/xen/netfront/netfront.c	Fri Jun 14 03:28:29 2013	(r251728)
+++ head/sys/dev/xen/netfront/netfront.c	Fri Jun 14 03:31:11 2013	(r251729)
@@ -2178,12 +2178,12 @@ netif_free(struct netfront_info *info)
 	XN_UNLOCK(info);
 	callout_drain(&info->xn_stat_ch);
 	netif_disconnect_backend(info);
-	ifmedia_removeall(&info->sc_media);
 	if (info->xn_ifp != NULL) {
 		ether_ifdetach(info->xn_ifp);
 		if_free(info->xn_ifp);
 		info->xn_ifp = NULL;
 	}
+	ifmedia_removeall(&info->sc_media);
 }
 
 static void

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 03:42:11 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5DC6CADA;
 Fri, 14 Jun 2013 03:42:11 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4054F1CEF;
 Fri, 14 Jun 2013 03:42:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E3gBs4042678;
 Fri, 14 Jun 2013 03:42:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E3gAGK042676;
 Fri, 14 Jun 2013 03:42:10 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140342.r5E3gAGK042676@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 03:42:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251730 - head/sys/dev/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 03:42:11 -0000

Author: adrian
Date: Fri Jun 14 03:42:10 2013
New Revision: 251730
URL: http://svnweb.freebsd.org/changeset/base/251730

Log:
  Initial AR9485/AR933x 1x1 LNA diversity work.
  
  * Add the LNA configuration table entries for AR933x/AR9485
  * Add a chip-dependent LNA signal level delta in the startup path
  * Add a TODO list for the stuff I haven't yet ported over but
    I haven't.
  
  Tested:
  
  * AR9462 with LNA diversity enabled

Modified:
  head/sys/dev/ath/if_ath_lna_div.c
  head/sys/dev/ath/if_ath_lna_div.h

Modified: head/sys/dev/ath/if_ath_lna_div.c
==============================================================================
--- head/sys/dev/ath/if_ath_lna_div.c	Fri Jun 14 03:31:11 2013	(r251729)
+++ head/sys/dev/ath/if_ath_lna_div.c	Fri Jun 14 03:42:10 2013	(r251730)
@@ -88,6 +88,7 @@ int
 ath_lna_div_attach(struct ath_softc *sc)
 {
 	struct if_ath_ant_comb_state *ss;
+	HAL_ANT_COMB_CONFIG div_ant_conf;
 
 	/* Only do this if diversity is enabled */
 	if (! ath_hal_hasdivantcomb(sc->sc_ah))
@@ -102,6 +103,18 @@ ath_lna_div_attach(struct ath_softc *sc)
 		return (0);
 	}
 
+	/* Fetch the hardware configuration */
+	OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf));
+	ath_hal_div_comb_conf_get(sc->sc_ah, &div_ant_conf);
+
+	/* Figure out what the hardware specific bits should be */
+	if ((div_ant_conf.antdiv_configgroup == HAL_ANTDIV_CONFIG_GROUP_1) ||
+	    (div_ant_conf.antdiv_configgroup == HAL_ANTDIV_CONFIG_GROUP_2)) {
+		ss->lna1_lna2_delta = -9;
+	} else {
+		ss->lna1_lna2_delta = -3;
+	}
+
 	/* Let's flip this on */
 	sc->sc_lna_div = ss;
 	sc->sc_dolnadiv = 1;
@@ -458,51 +471,235 @@ ath_select_ant_div_from_quick_scan(struc
 }
 
 static void
-ath_ant_div_conf_fast_divbias(HAL_ANT_COMB_CONFIG *ant_conf)
+ath_ant_adjust_fast_divbias(struct if_ath_ant_comb_state *antcomb,
+    int alt_ratio, int alt_ant_ratio_th, u_int config_group,
+    HAL_ANT_COMB_CONFIG *pdiv_ant_conf)
 {
-	/* Adjust the fast_div_bias based on main and alt lna conf */
-	switch ((ant_conf->main_lna_conf << 4) | ant_conf->alt_lna_conf) {
-	case (0x01): /* A-B LNA2 */
-		ant_conf->fast_div_bias = 0x3b;
-		break;
-	case (0x02): /* A-B LNA1 */
-		ant_conf->fast_div_bias = 0x3d;
-		break;
-	case (0x03): /* A-B A+B */
-		ant_conf->fast_div_bias = 0x1;
-		break;
-	case (0x10): /* LNA2 A-B */
-		ant_conf->fast_div_bias = 0x7;
-		break;
-	case (0x12): /* LNA2 LNA1 */
-		ant_conf->fast_div_bias = 0x2;
-		break;
-	case (0x13): /* LNA2 A+B */
-		ant_conf->fast_div_bias = 0x7;
-		break;
-	case (0x20): /* LNA1 A-B */
-		ant_conf->fast_div_bias = 0x6;
-		break;
-	case (0x21): /* LNA1 LNA2 */
-		ant_conf->fast_div_bias = 0x0;
-		break;
-	case (0x23): /* LNA1 A+B */
-		ant_conf->fast_div_bias = 0x6;
-		break;
-	case (0x30): /* A+B A-B */
-		ant_conf->fast_div_bias = 0x1;
-		break;
-	case (0x31): /* A+B LNA2 */
-		ant_conf->fast_div_bias = 0x3b;
-		break;
-	case (0x32): /* A+B LNA1 */
-		ant_conf->fast_div_bias = 0x3d;
-		break;
-	default:
-		break;
+
+	if (config_group == HAL_ANTDIV_CONFIG_GROUP_1) {
+		switch ((pdiv_ant_conf->main_lna_conf << 4)
+		    | pdiv_ant_conf->alt_lna_conf) {
+		case (0x01): //A-B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x02): //A-B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x03): //A-B A+B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x10): //LNA2 A-B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) {
+				pdiv_ant_conf->fast_div_bias = 0x3f;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x12): //LNA2 LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+			case (0x13): //LNA2 A+B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) {
+				pdiv_ant_conf->fast_div_bias = 0x3f;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x20): //LNA1 A-B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) {
+				pdiv_ant_conf->fast_div_bias = 0x3f;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x21): //LNA1 LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x23): //LNA1 A+B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) {
+				pdiv_ant_conf->fast_div_bias = 0x3f;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x30): //A+B A-B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x31): //A+B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x32): //A+B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		default:
+			break;
+		}
+	} else if (config_group == HAL_ANTDIV_CONFIG_GROUP_2) {
+		switch ((pdiv_ant_conf->main_lna_conf << 4)
+		    | pdiv_ant_conf->alt_lna_conf) {
+		case (0x01): //A-B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x02): //A-B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x03): //A-B A+B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x10): //LNA2 A-B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > alt_ant_ratio_th)) {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x2;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x12): //LNA2 LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x13): //LNA2 A+B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > alt_ant_ratio_th)) {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x2;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x20): //LNA1 A-B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > alt_ant_ratio_th)) {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x2;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x21): //LNA1 LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x23): //LNA1 A+B
+			if ((antcomb->scan == 0)
+			    && (alt_ratio > alt_ant_ratio_th)) {
+				pdiv_ant_conf->fast_div_bias = 0x1;
+			} else {
+				pdiv_ant_conf->fast_div_bias = 0x2;
+			}
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x30): //A+B A-B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x31): //A+B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		case (0x32): //A+B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			pdiv_ant_conf->main_gaintb   = 0;
+			pdiv_ant_conf->alt_gaintb    = 0;
+			break;
+		default:
+			break;
+		}
+	} else { /* DEFAULT_ANTDIV_CONFIG_GROUP */
+		switch ((pdiv_ant_conf->main_lna_conf << 4) | pdiv_ant_conf->alt_lna_conf) {
+		case (0x01): //A-B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x3b;
+			break;
+		case (0x02): //A-B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x3d;
+			break;
+		case (0x03): //A-B A+B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			break;
+		case (0x10): //LNA2 A-B
+			pdiv_ant_conf->fast_div_bias = 0x7;
+			break;
+		case (0x12): //LNA2 LNA1
+			pdiv_ant_conf->fast_div_bias = 0x2;
+			break;
+		case (0x13): //LNA2 A+B
+			pdiv_ant_conf->fast_div_bias = 0x7;
+			break;
+		case (0x20): //LNA1 A-B
+			pdiv_ant_conf->fast_div_bias = 0x6;
+			break;
+		case (0x21): //LNA1 LNA2
+			pdiv_ant_conf->fast_div_bias = 0x0;
+			break;
+		case (0x23): //LNA1 A+B
+			pdiv_ant_conf->fast_div_bias = 0x6;
+			break;
+		case (0x30): //A+B A-B
+			pdiv_ant_conf->fast_div_bias = 0x1;
+			break;
+		case (0x31): //A+B LNA2
+			pdiv_ant_conf->fast_div_bias = 0x3b;
+			break;
+		case (0x32): //A+B LNA1
+			pdiv_ant_conf->fast_div_bias = 0x3d;
+			break;
+		default:
+			break;
+		}
 	}
 }
 
+/*
+ * AR9485/AR933x TODO:
+ * + Select a ratio based on whether RSSI is low or not; but I need
+ *   to figure out what "low_rssi_th" is sourced from.
+ * + What's ath_ant_div_comb_alt_check() in the reference driver do?
+ * + .. and there's likely a bunch of other things to include in this.
+ */
+
 /* Antenna diversity and combining */
 void
 ath_lna_rx_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs,
@@ -576,6 +773,15 @@ ath_lna_rx_comb_scan(struct ath_softc *s
 			}
 	}
 
+#if 0
+	DPRINTF(sc, ATH_DEBUG_DIVERSITY,
+	    "%s: total pkt=%d, aggr=%d, short_scan=%d\n",
+	    __func__,
+	    antcomb->total_pkt_count,
+	    !! (rs->rs_moreaggr),
+	    !! (short_scan));
+#endif
+
 	if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
 	    rs->rs_moreaggr) && !short_scan)
 		return;
@@ -642,7 +848,7 @@ ath_lna_rx_comb_scan(struct ath_softc *s
 		}
 
 		if ((alt_rssi_avg < (main_rssi_avg +
-		    ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA)))
+		    antcomb->lna1_lna2_delta)))
 			goto div_comb_done;
 	}
 
@@ -756,7 +962,15 @@ ath_lna_rx_comb_scan(struct ath_softc *s
 	antcomb->quick_scan_cnt++;
 
 div_comb_done:
+#if 0
 	ath_ant_div_conf_fast_divbias(&div_ant_conf);
+#endif
+
+	ath_ant_adjust_fast_divbias(antcomb,
+	    alt_ratio,
+	    ATH_ANT_DIV_COMB_ALT_ANT_RATIO,
+	    div_ant_conf.antdiv_configgroup,
+	    &div_ant_conf);
 
 	ath_hal_div_comb_conf_set(sc->sc_ah, &div_ant_conf);
 

Modified: head/sys/dev/ath/if_ath_lna_div.h
==============================================================================
--- head/sys/dev/ath/if_ath_lna_div.h	Fri Jun 14 03:31:11 2013	(r251729)
+++ head/sys/dev/ath/if_ath_lna_div.h	Fri Jun 14 03:42:10 2013	(r251730)
@@ -43,7 +43,6 @@
 #define	ATH_ANT_DIV_COMB_ALT_ANT_RATIO		30
 #define	ATH_ANT_DIV_COMB_ALT_ANT_RATIO2		20
 
-#define	ATH_ANT_DIV_COMB_LNA1_LNA2_DELTA	-3
 #define	ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA	-1
 #define	ATH_ANT_DIV_COMB_LNA1_DELTA_HI		-4
 #define	ATH_ANT_DIV_COMB_LNA1_DELTA_MID		-2
@@ -75,6 +74,7 @@ struct if_ath_ant_comb_state {
 	HAL_BOOL first_ratio;
 	HAL_BOOL second_ratio;
 	unsigned long scan_start_time;
+	int lna1_lna2_delta;
 };
 
 extern	int ath_lna_div_attach(struct ath_softc *sc);

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 03:58:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 19D7EFC5;
 Fri, 14 Jun 2013 03:58:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0BA9B1DDC;
 Fri, 14 Jun 2013 03:58:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E3wrTS046594;
 Fri, 14 Jun 2013 03:58:53 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E3wrYi046590;
 Fri, 14 Jun 2013 03:58:53 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306140358.r5E3wrYi046590@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Fri, 14 Jun 2013 03:58:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251731 - stable/9/sys/fs/ext2fs
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 03:58:54 -0000

Author: pfg
Date: Fri Jun 14 03:58:52 2013
New Revision: 251731
URL: http://svnweb.freebsd.org/changeset/base/251731

Log:
  MFC	r251562, r251612:
  
  Miscellaneous cleanups for ext2fs:
  
  - e2fs_bpg and e2fs_isize are always unsigned.
  
  - s/file system/filesystem/g (from ffs r96755)

Modified:
  stable/9/sys/fs/ext2fs/ext2_alloc.c
  stable/9/sys/fs/ext2fs/ext2_balloc.c
  stable/9/sys/fs/ext2fs/ext2_vfsops.c
  stable/9/sys/fs/ext2fs/ext2fs.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_alloc.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_alloc.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -63,7 +63,7 @@ static daddr_t	ext2_nodealloccg(struct i
 static daddr_t  ext2_mapsearch(struct m_ext2fs *, char *, daddr_t);
 
 /*
- * Allocate a block in the file system.
+ * Allocate a block in the filesystem.
  *
  * A preference may be optionally specified. If a preference is given
  * the following hierarchy is used to allocate a block:
@@ -125,8 +125,8 @@ ext2_alloc(struct inode *ip, int32_t lbn
         }
 nospace:
 	EXT2_UNLOCK(ump);
-	ext2_fserr(fs, cred->cr_uid, "file system full");
-	uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt);
+	ext2_fserr(fs, cred->cr_uid, "filesystem full");
+	uprintf("\n%s: write failed, filesystem is full\n", fs->e2fs_fsmnt);
 	return (ENOSPC);
 }
 
@@ -338,7 +338,7 @@ fail:
 }
 
 /*
- * Allocate an inode in the file system.
+ * Allocate an inode in the filesystem.
  * 
  */
 int
@@ -1096,7 +1096,7 @@ ext2_mapsearch(struct m_ext2fs *fs, char
 }
 
 /*
- * Fserr prints the name of a file system with an error diagnostic.
+ * Fserr prints the name of a filesystem with an error diagnostic.
  * 
  * The form of the error message is:
  *	fs: error message

Modified: stable/9/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_balloc.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_balloc.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -50,7 +50,7 @@
 #include 
 #include 
 /*
- * Balloc defines the structure of file system storage
+ * Balloc defines the structure of filesystem storage
  * by allocating the physical blocks on a device given
  * the inode and the logical block number in a file.
  */

Modified: stable/9/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_vfsops.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_vfsops.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -748,7 +748,7 @@ ext2_flushfiles(struct mount *mp, int fl
 	return (error);
 }
 /*
- * Get file system statistics.
+ * Get filesystem statistics.
  */
 int
 ext2_statfs(struct mount *mp, struct statfs *sbp)
@@ -853,7 +853,7 @@ loop:
 	}
 
 	/*
-	 * Force stale file system control information to be flushed.
+	 * Force stale filesystem control information to be flushed.
 	 */
 	if (waitfor != MNT_LAZY) {
 		vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);

Modified: stable/9/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2fs.h	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2fs.h	Fri Jun 14 03:58:52 2013	(r251731)
@@ -153,7 +153,7 @@ struct m_ext2fs {
 	char     e2fs_fmod;       /* super block modified flag */
 	uint32_t e2fs_bsize;      /* Block size */
 	uint32_t e2fs_bshift;     /* calc of logical block no */
-	int32_t  e2fs_bpg;	  /* Number of blocks per group */
+	uint32_t e2fs_bpg;	  /* Number of blocks per group */
 	int64_t  e2fs_qbmask;     /* = s_blocksize -1 */
 	uint32_t e2fs_fsbtodb;    /* Shift to get disk block */
 	uint32_t e2fs_ipg;	  /* Number of inodes per group */
@@ -164,7 +164,7 @@ struct m_ext2fs {
 	uint32_t e2fs_fpg;	  /* Number of fragments per group */
 	uint32_t e2fs_gdbcount;   /* Number of group descriptors */
 	uint32_t e2fs_gcount;     /* Number of groups */
-	int32_t  e2fs_isize;      /* Size of inode */
+	uint32_t e2fs_isize;	  /* Size of inode */
 	uint32_t e2fs_total_dir;  /* Total number of directories */
 	uint8_t	*e2fs_contigdirs; /* (u) # of contig. allocated dirs */
 	char     e2fs_wasvalid;   /* valid at mount time */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 04:10:35 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 40EDB365;
 Fri, 14 Jun 2013 04:10:35 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 232901E92;
 Fri, 14 Jun 2013 04:10:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E4AZPC052034;
 Fri, 14 Jun 2013 04:10:35 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E4AYnn052031;
 Fri, 14 Jun 2013 04:10:34 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306140410.r5E4AYnn052031@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 14 Jun 2013 04:10:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251732 - in head/sys: kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 04:10:35 -0000

Author: lstewart
Date: Fri Jun 14 04:10:34 2013
New Revision: 251732
URL: http://svnweb.freebsd.org/changeset/base/251732

Log:
  Add support for non-virtualised hhook points, which are uniquely identified by
  type and id, as compared to virtualised hook points which are now uniquely
  identified by type, id and a vid (which for vimage is the pointer to the vnet
  that the hhook resides in).
  
  All hhook_head structs for both virtualised and non-virtualised hook points
  coexist in hhook_head_list, and a separate list is maintained for hhook points
  within each vnet to simplify some vimage-related housekeeping.
  
  Reviewed by:	scottl
  MFC after:	1 week

Modified:
  head/sys/kern/kern_hhook.c
  head/sys/sys/hhook.h

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Fri Jun 14 03:58:52 2013	(r251731)
+++ head/sys/kern/kern_hhook.c	Fri Jun 14 04:10:34 2013	(r251732)
@@ -61,8 +61,9 @@ struct hhook {
 static MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hhook_head lists");
 
 LIST_HEAD(hhookheadhead, hhook_head);
-VNET_DEFINE(struct hhookheadhead, hhook_head_list);
-#define	V_hhook_head_list VNET(hhook_head_list)
+struct hhookheadhead hhook_head_list;
+VNET_DEFINE(struct hhookheadhead, hhook_vhead_list);
+#define	V_hhook_vhead_list VNET(hhook_vhead_list)
 
 static struct mtx hhook_head_list_lock;
 MTX_SYSINIT(hhookheadlistlock, &hhook_head_list_lock, "hhook_head list lock",
@@ -245,13 +246,6 @@ hhook_head_register(int32_t hhook_type, 
 		return (EEXIST);
 	}
 
-	/* XXXLAS: Need to implement support for non-virtualised hooks. */
-	if ((flags & HHOOK_HEADISINVNET) == 0) {
-		printf("%s: only vnet-style virtualised hooks can be used\n",
-		    __func__);
-		return (EINVAL);
-	}
-
 	tmphhh = malloc(sizeof(struct hhook_head), M_HHOOK,
 	    M_ZERO | ((flags & HHOOK_WAITOK) ? M_WAITOK : M_NOWAIT));
 
@@ -270,14 +264,15 @@ hhook_head_register(int32_t hhook_type, 
 	} else
 		refcount_init(&tmphhh->hhh_refcount, 0);
 
+	HHHLIST_LOCK();
 	if (flags & HHOOK_HEADISINVNET) {
 		tmphhh->hhh_flags |= HHH_ISINVNET;
-		HHHLIST_LOCK();
-		LIST_INSERT_HEAD(&V_hhook_head_list, tmphhh, hhh_next);
-		HHHLIST_UNLOCK();
-	} else {
-		/* XXXLAS: Add tmphhh to the non-virtualised list. */
+		KASSERT(curvnet != NULL, ("curvnet is NULL"));
+		tmphhh->hhh_vid = (uintptr_t)curvnet;
+		LIST_INSERT_HEAD(&V_hhook_vhead_list, tmphhh, hhh_vnext);
 	}
+	LIST_INSERT_HEAD(&hhook_head_list, tmphhh, hhh_next);
+	HHHLIST_UNLOCK();
 
 	return (0);
 }
@@ -290,6 +285,8 @@ hhook_head_destroy(struct hhook_head *hh
 	HHHLIST_LOCK_ASSERT();
 
 	LIST_REMOVE(hhh, hhh_next);
+	if (hhook_head_is_virtualised(hhh) == HHOOK_HEADISINVNET)
+		LIST_REMOVE(hhh, hhh_vnext);
 	HHH_WLOCK(hhh);
 	STAILQ_FOREACH_SAFE(tmp, &hhh->hhh_hooks, hhk_next, tmp2)
 		free(tmp, M_HHOOK);
@@ -347,10 +344,15 @@ hhook_head_get(int32_t hhook_type, int32
 {
 	struct hhook_head *hhh;
 
-	/* XXXLAS: Pick hhook_head_list based on hhook_head flags. */
 	HHHLIST_LOCK();
-	LIST_FOREACH(hhh, &V_hhook_head_list, hhh_next) {
+	LIST_FOREACH(hhh, &hhook_head_list, hhh_next) {
 		if (hhh->hhh_type == hhook_type && hhh->hhh_id == hhook_id) {
+			if (hhook_head_is_virtualised(hhh) ==
+			    HHOOK_HEADISINVNET) {
+				KASSERT(curvnet != NULL, ("curvnet is NULL"));
+				if (hhh->hhh_vid != (uintptr_t)curvnet)
+					continue;
+			}
 			refcount_acquire(&hhh->hhh_refcount);
 			break;
 		}
@@ -412,7 +414,7 @@ static void
 hhook_vnet_init(const void *unused __unused)
 {
 
-	LIST_INIT(&V_hhook_head_list);
+	LIST_INIT(&V_hhook_vhead_list);
 }
 
 /*
@@ -429,7 +431,7 @@ hhook_vnet_uninit(const void *unused __u
 	 * subsystem should have already called hhook_head_deregister().
 	 */
 	HHHLIST_LOCK();
-	LIST_FOREACH_SAFE(hhh, &V_hhook_head_list, hhh_next, tmphhh) {
+	LIST_FOREACH_SAFE(hhh, &V_hhook_vhead_list, hhh_vnext, tmphhh) {
 		printf("%s: hhook_head type=%d, id=%d cleanup required\n",
 		    __func__, hhh->hhh_type, hhh->hhh_id);
 		hhook_head_destroy(hhh);
@@ -439,7 +441,7 @@ hhook_vnet_uninit(const void *unused __u
 
 
 /*
- * When a vnet is created and being initialised, init the V_hhook_head_list.
+ * When a vnet is created and being initialised, init the V_hhook_vhead_list.
  */
 VNET_SYSINIT(hhook_vnet_init, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST,
     hhook_vnet_init, NULL);

Modified: head/sys/sys/hhook.h
==============================================================================
--- head/sys/sys/hhook.h	Fri Jun 14 03:58:52 2013	(r251731)
+++ head/sys/sys/hhook.h	Fri Jun 14 04:10:34 2013	(r251732)
@@ -91,12 +91,14 @@ struct hookinfo {
 struct hhook_head {
 	STAILQ_HEAD(hhook_list, hhook)	hhh_hooks;
 	struct rmlock			hhh_lock;
+	uintptr_t			hhh_vid;
 	int32_t				hhh_id;
 	int32_t				hhh_nhooks;
 	int32_t				hhh_type;
 	uint32_t			hhh_flags;
 	volatile uint32_t		hhh_refcount;
 	LIST_ENTRY(hhook_head)		hhh_next;
+	LIST_ENTRY(hhook_head)		hhh_vnext;
 };
 
 /* Public KPI functions. */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 05:16:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8079F41E;
 Fri, 14 Jun 2013 05:16:52 +0000 (UTC)
 (envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 739E8111A;
 Fri, 14 Jun 2013 05:16:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E5GqS4071731;
 Fri, 14 Jun 2013 05:16:52 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E5GqsO071729;
 Fri, 14 Jun 2013 05:16:52 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201306140516.r5E5GqsO071729@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Fri, 14 Jun 2013 05:16:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251733 - head/sys/dev/bge
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 05:16:52 -0000

Author: yongari
Date: Fri Jun 14 05:16:51 2013
New Revision: 251733
URL: http://svnweb.freebsd.org/changeset/base/251733

Log:
  Fix a typo introduced in r213280. IFM_OPTIONS macro should see
  current media word.

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Fri Jun 14 04:10:34 2013	(r251732)
+++ head/sys/dev/bge/if_bge.c	Fri Jun 14 05:16:51 2013	(r251733)
@@ -1284,7 +1284,7 @@ bge_miibus_statchg(device_t dev)
 	/* Set MAC flow control behavior to match link flow control settings. */
 	tx_mode &= ~BGE_TXMODE_FLOWCTL_ENABLE;
 	rx_mode &= ~BGE_RXMODE_FLOWCTL_ENABLE;
-	if (IFM_OPTIONS(mii->mii_media_active & IFM_FDX) != 0) {
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
 			tx_mode |= BGE_TXMODE_FLOWCTL_ENABLE;
 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 05:36:49 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 70893951;
 Fri, 14 Jun 2013 05:36:49 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 51ADE11C6;
 Fri, 14 Jun 2013 05:36:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E5an1B077747;
 Fri, 14 Jun 2013 05:36:49 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E5amvN077738;
 Fri, 14 Jun 2013 05:36:48 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201306140536.r5E5amvN077738@svn.freebsd.org>
From: Kevin Lo 
Date: Fri, 14 Jun 2013 05:36:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251734 - in head/sys/dev: rt usb/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 05:36:49 -0000

Author: kevlo
Date: Fri Jun 14 05:36:47 2013
New Revision: 251734
URL: http://svnweb.freebsd.org/changeset/base/251734

Log:
  - Use the consistenly PHY-specific reset routine PHY_RESET() rather than
    generic mii_phy_reset().
  - Return the result of mii_mediachg() rather than blindly returning 0.
  - on smsc(4), driver lock should be held to get current
    mii_media_active/mii_media_status value.
  
  Reviewed by:	yongari

Modified:
  head/sys/dev/rt/if_rt.c
  head/sys/dev/usb/net/if_aue.c
  head/sys/dev/usb/net/if_mos.c
  head/sys/dev/usb/net/if_rue.c
  head/sys/dev/usb/net/if_smsc.c
  head/sys/dev/usb/net/if_udav.c

Modified: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/rt/if_rt.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -475,20 +475,16 @@ rt_ifmedia_upd(struct ifnet *ifp)
 	struct rt_softc *sc;
 #ifdef IF_RT_PHY_SUPPORT
 	struct mii_data *mii;
+	struct mii_softc *miisc;
 	int error = 0;
 
 	sc = ifp->if_softc;
 	RT_SOFTC_LOCK(sc);
 
 	mii = device_get_softc(sc->rt_miibus);
-	if (mii->mii_instance) {
-		struct mii_softc *miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-				miisc = LIST_NEXT(miisc, mii_list))
-			mii_phy_reset(miisc);
-	}
-	if (mii)
-		error = mii_mediachg(mii);
+	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
+		PHY_RESET(miisc);
+	error = mii_mediachg(mii);
 	RT_SOFTC_UNLOCK(sc);
 
 	return (error);

Modified: head/sys/dev/usb/net/if_aue.c
==============================================================================
--- head/sys/dev/usb/net/if_aue.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/usb/net/if_aue.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -1008,14 +1008,15 @@ aue_ifmedia_upd(struct ifnet *ifp)
 	struct aue_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 	struct mii_softc *miisc;
+	int error;
 
 	AUE_LOCK_ASSERT(sc, MA_OWNED);
 
         sc->sc_flags &= ~AUE_FLAG_LINK;
 	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 		PHY_RESET(miisc);
-	mii_mediachg(mii);
-	return (0);
+	error = mii_mediachg(mii);
+	return (error);
 }
 
 /*

Modified: head/sys/dev/usb/net/if_mos.c
==============================================================================
--- head/sys/dev/usb/net/if_mos.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/usb/net/if_mos.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -526,16 +526,15 @@ mos_ifmedia_upd(struct ifnet *ifp)
 	struct mos_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 	struct mii_softc *miisc;
+	int error;
 
 	MOS_LOCK_ASSERT(sc, MA_OWNED);
 
 	sc->mos_link = 0;
-	if (mii->mii_instance) {
-		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
-		    mii_phy_reset(miisc);
-	}
-	mii_mediachg(mii);
-	return (0);
+	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
+		PHY_RESET(miisc);
+	error = mii_mediachg(mii);
+	return (error);
 }
 
 /*

Modified: head/sys/dev/usb/net/if_rue.c
==============================================================================
--- head/sys/dev/usb/net/if_rue.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/usb/net/if_rue.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -866,14 +866,15 @@ rue_ifmedia_upd(struct ifnet *ifp)
 	struct rue_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 	struct mii_softc *miisc;
+	int error;
 
 	RUE_LOCK_ASSERT(sc, MA_OWNED);
 
         sc->sc_flags &= ~RUE_FLAG_LINK;
 	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 		PHY_RESET(miisc);
-	mii_mediachg(mii);
-	return (0);
+	error = mii_mediachg(mii);
+	return (error);
 }
 
 /*

Modified: head/sys/dev/usb/net/if_smsc.c
==============================================================================
--- head/sys/dev/usb/net/if_smsc.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/usb/net/if_smsc.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -606,16 +606,13 @@ smsc_ifmedia_upd(struct ifnet *ifp)
 {
 	struct smsc_softc *sc = ifp->if_softc;
 	struct mii_data *mii = uether_getmii(&sc->sc_ue);
+	struct mii_softc *miisc;
 	int err;
 
 	SMSC_LOCK_ASSERT(sc, MA_OWNED);
 
-	if (mii->mii_instance) {
-		struct mii_softc *miisc;
-
-		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
-			mii_phy_reset(miisc);
-	}
+	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
+		PHY_RESET(miisc);
 	err = mii_mediachg(mii);
 	return (err);
 }
@@ -638,13 +635,10 @@ smsc_ifmedia_sts(struct ifnet *ifp, stru
 	struct mii_data *mii = uether_getmii(&sc->sc_ue);
 
 	SMSC_LOCK(sc);
-	
 	mii_pollstat(mii);
-	
-	SMSC_UNLOCK(sc);
-	
 	ifmr->ifm_active = mii->mii_media_active;
 	ifmr->ifm_status = mii->mii_media_status;
+	SMSC_UNLOCK(sc);
 }
 
 /**

Modified: head/sys/dev/usb/net/if_udav.c
==============================================================================
--- head/sys/dev/usb/net/if_udav.c	Fri Jun 14 05:16:51 2013	(r251733)
+++ head/sys/dev/usb/net/if_udav.c	Fri Jun 14 05:36:47 2013	(r251734)
@@ -750,14 +750,15 @@ udav_ifmedia_upd(struct ifnet *ifp)
 	struct udav_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 	struct mii_softc *miisc;
+	int error;
 
 	UDAV_LOCK_ASSERT(sc, MA_OWNED);
 
         sc->sc_flags &= ~UDAV_FLAG_LINK;
 	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 		PHY_RESET(miisc);
-	mii_mediachg(mii);
-	return (0);
+	error = mii_mediachg(mii);
+	return (error);
 }
 
 static void

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 06:14:50 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1513DDD3;
 Fri, 14 Jun 2013 06:14:50 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 07C591312;
 Fri, 14 Jun 2013 06:14:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E6En1e090255;
 Fri, 14 Jun 2013 06:14:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E6EnIs090254;
 Fri, 14 Jun 2013 06:14:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140614.r5E6EnIs090254@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 06:14:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251735 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 06:14:50 -0000

Author: adrian
Date: Fri Jun 14 06:14:49 2013
New Revision: 251735
URL: http://svnweb.freebsd.org/changeset/base/251735

Log:
  If chan is NULL, don't derefrence it.
  
  The bluetooth setup code actually does a channel lookup during setup,
  even though we haven't yet programmed in a channel. Sigh.
  
  Tested:
  
  * WB225 (AR9485) + bluetooth

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c	Fri Jun 14 05:36:47 2013	(r251734)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c	Fri Jun 14 06:14:49 2013	(r251735)
@@ -778,6 +778,11 @@ ar9300_set_delta_slope(struct ath_hal *a
 HAL_CHANNEL_INTERNAL *
 ar9300_check_chan(struct ath_hal *ah, const struct ieee80211_channel *chan)
 {
+
+    if (chan == NULL) {
+        return AH_NULL;
+    }
+
     if ((IS(chan, CHAN_2GHZ) ^ IS(chan, CHAN_5GHZ)) == 0) {
         HALDEBUG(ah, HAL_DEBUG_CHANNEL,
             "%s: invalid channel %u/0x%x; not marked as 2GHz or 5GHz\n",

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 06:15:23 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A3623F52;
 Fri, 14 Jun 2013 06:15:23 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 966681321;
 Fri, 14 Jun 2013 06:15:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E6FNRl090422;
 Fri, 14 Jun 2013 06:15:23 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E6FNf8090421;
 Fri, 14 Jun 2013 06:15:23 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140615.r5E6FNf8090421@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 06:15:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251736 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 06:15:23 -0000

Author: adrian
Date: Fri Jun 14 06:15:23 2013
New Revision: 251736
URL: http://svnweb.freebsd.org/changeset/base/251736

Log:
  Add bluetooth setup method functions to the HAL.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Fri Jun 14 06:14:49 2013	(r251735)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Fri Jun 14 06:15:23 2013	(r251736)
@@ -237,6 +237,14 @@ ar9300_attach_freebsd_ops(struct ath_hal
 	/* ah_set11nRxClear */
 
 	/* bluetooth coexistence functions */
+	ah->ah_btCoexSetInfo		= ar9300_set_bt_coex_info;
+	ah->ah_btCoexSetConfig		= ar9300_bt_coex_config;
+	ah->ah_btCoexSetQcuThresh	= ar9300_bt_coex_set_qcu_thresh;
+	ah->ah_btCoexSetWeights		= ar9300_bt_coex_set_weights;
+	ah->ah_btCoexSetBmissThresh	= ar9300_bt_coex_setup_bmiss_thresh;
+	ah->ah_btCoexSetParameter	= ar9300_bt_coex_set_parameter;
+	ah->ah_btCoexDisable		= ar9300_bt_coex_disable;
+	ah->ah_btCoexEnable		= ar9300_bt_coex_enable;
 
 	/* LNA diversity functions */
 	ah->ah_divLnaConfGet = ar9300_ant_div_comb_get_config;

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:11:46 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 520754CF;
 Fri, 14 Jun 2013 08:11:46 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2AC411AD9;
 Fri, 14 Jun 2013 08:11:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8BkFL028564;
 Fri, 14 Jun 2013 08:11:46 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8Bk95028563;
 Fri, 14 Jun 2013 08:11:46 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140811.r5E8Bk95028563@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:11:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251737 - head/tools/tools/ath/athspectral
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:11:46 -0000

Author: adrian
Date: Fri Jun 14 08:11:45 2013
New Revision: 251737
URL: http://svnweb.freebsd.org/changeset/base/251737

Log:
  Add missing formatting strings.
  
  Thanks to: clang

Modified:
  head/tools/tools/ath/athspectral/athspectral.c

Modified: head/tools/tools/ath/athspectral/athspectral.c
==============================================================================
--- head/tools/tools/ath/athspectral/athspectral.c	Fri Jun 14 06:15:23 2013	(r251736)
+++ head/tools/tools/ath/athspectral/athspectral.c	Fri Jun 14 08:11:45 2013	(r251737)
@@ -67,7 +67,7 @@ spectral_opendev(struct spectralhandler 
 	spectral->atd.ad_out_data = (caddr_t) &revs;
 	spectral->atd.ad_out_size = sizeof(revs);
 	if (ioctl(spectral->s, SIOCGATHDIAG, &spectral->atd) < 0) {
-		warn(spectral->atd.ad_name);
+		warn("%s", spectral->atd.ad_name);
 		return 0;
 	}
 	spectral->ah_devid = revs.ah_devid;
@@ -116,7 +116,7 @@ spectralset(struct spectralhandler *spec
 	spectral->atd.ad_in_data = (caddr_t) &pe;
 	spectral->atd.ad_in_size = sizeof(HAL_SPECTRAL_PARAM);
 	if (ioctl(spectral->s, SIOCGATHSPECTRAL, &spectral->atd) < 0)
-		err(1, spectral->atd.ad_name);
+		err(1, "%s", spectral->atd.ad_name);
 }
 
 static void
@@ -133,7 +133,7 @@ spectral_get(struct spectralhandler *spe
 	spectral->atd.ad_out_size = sizeof(pe);
 
 	if (ioctl(spectral->s, SIOCGATHSPECTRAL, &spectral->atd) < 0)
-		err(1, spectral->atd.ad_name);
+		err(1, "%s", spectral->atd.ad_name);
 
 	printf("Spectral parameters (raw):\n");
 	printf("   ss_enabled: %d\n", pe.ss_enabled);
@@ -163,7 +163,7 @@ spectral_start(struct spectralhandler *s
 	spectral->atd.ad_out_size = sizeof(pe);
 
 	if (ioctl(spectral->s, SIOCGATHSPECTRAL, &spectral->atd) < 0)
-		err(1, spectral->atd.ad_name);
+		err(1, "%s", spectral->atd.ad_name);
 }
 
 static void
@@ -184,7 +184,7 @@ spectral_stop(struct spectralhandler *sp
 	spectral->atd.ad_out_size = sizeof(pe);
 
 	if (ioctl(spectral->s, SIOCGATHSPECTRAL, &spectral->atd) < 0)
-		err(1, spectral->atd.ad_name);
+		err(1, "%s", spectral->atd.ad_name);
 }
 
 static void
@@ -207,7 +207,7 @@ spectral_enable_at_reset(struct spectral
 	printf("%s: val=%d\n", __func__, v);
 
 	if (ioctl(spectral->s, SIOCGATHSPECTRAL, &spectral->atd) < 0)
-		err(1, spectral->atd.ad_name);
+		err(1, "%s", spectral->atd.ad_name);
 }
 
 static int

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:12:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7C76B648;
 Fri, 14 Jun 2013 08:12:41 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5C50E1AE3;
 Fri, 14 Jun 2013 08:12:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8CfRd028791;
 Fri, 14 Jun 2013 08:12:41 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8Cfn4028789;
 Fri, 14 Jun 2013 08:12:41 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140812.r5E8Cfn4028789@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:12:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251738 - head/tools/tools/ath/ath_ee_9300_print
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:12:41 -0000

Author: adrian
Date: Fri Jun 14 08:12:40 2013
New Revision: 251738
URL: http://svnweb.freebsd.org/changeset/base/251738

Log:
  Begin fleshing out an AR9300 EEPROM dump helper utility.

Added:
  head/tools/tools/ath/ath_ee_9300_print/
  head/tools/tools/ath/ath_ee_9300_print/Makefile   (contents, props changed)
  head/tools/tools/ath/ath_ee_9300_print/main.c   (contents, props changed)

Added: head/tools/tools/ath/ath_ee_9300_print/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/ath/ath_ee_9300_print/Makefile	Fri Jun 14 08:12:40 2013	(r251738)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../../sys/dev/ath/ath_hal
+
+PROG=	ath_ee_9300_print
+NOMAN=	yes
+NO_MAN=	yes
+SRCS=	main.c
+SRCS+=	opt_ah.h
+CLEANFILES+=	opt_ah.h
+
+opt_ah.h:
+	echo "#define AH_DEBUG 1" > opt_ah.h
+	echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
+	echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
+
+.include <../Makefile.inc>
+
+.include 

Added: head/tools/tools/ath/ath_ee_9300_print/main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/ath/ath_ee_9300_print/main.c	Fri Jun 14 08:12:40 2013	(r251738)
@@ -0,0 +1,229 @@
+
+/*
+ * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+struct ath_hal;
+
+#include "ar9300/ar9300eep.h"
+
+static void
+eeprom_9300_hdr_print(const uint16_t *buf)
+{
+	const ar9300_eeprom_t *ee = (ar9300_eeprom_t *) buf;
+
+	printf("| Version: %d, Template: %d, MAC: %02x:%02x:%02x:%02x:%02x:%02x |\n",
+	    ee->eeprom_version,
+	    ee->template_version,
+	    ee->mac_addr[0],
+	    ee->mac_addr[1],
+	    ee->mac_addr[2],
+	    ee->mac_addr[3],
+	    ee->mac_addr[4],
+	    ee->mac_addr[5]);
+}
+
+static void
+eeprom_9300_base_print(const uint16_t *buf)
+{
+	const ar9300_eeprom_t *ee = (ar9300_eeprom_t *) buf;
+	const OSPREY_BASE_EEP_HEADER *ee_base = &ee->base_eep_header;
+
+	printf("| RegDomain: 0x%02x 0x%02x TxRxMask: 0x%02x OpFlags: 0x%02x OpMisc: 0x%02x |\n",
+	    ee_base->reg_dmn[0],
+	    ee_base->reg_dmn[1],
+	    ee_base->txrx_mask,
+	    ee_base->op_cap_flags.op_flags,
+	    ee_base->op_cap_flags.eepMisc);
+
+	printf("| RfSilent: 0x%02x BtOptions: 0x%02x DeviceCap: 0x%02x DeviceType: 0x%02x |\n",
+	    ee_base->rf_silent,
+	    ee_base->blue_tooth_options,
+	    ee_base->device_cap,
+	    ee_base->device_type);
+
+	printf("| pwrTableOffset: %d dB, feature_enable: 0x%02x MiscConfig: 0x%02x |\n",
+	    ee_base->pwrTableOffset,
+	    ee_base->feature_enable,
+	    ee_base->misc_configuration);
+
+	printf("| EepromWriteGpio: %d, WlanDisableGpio: %d, WlanLedGpio: %d RxBandSelectGpio: %d |\n",
+	    ee_base->eeprom_write_enable_gpio,
+	    ee_base->wlan_disable_gpio,
+	    ee_base->wlan_led_gpio,
+	    ee_base->rx_band_select_gpio);
+
+	printf("| TxRxGain: %d, SwReg: %d |\n",
+	    ee_base->txrxgain,
+	    ee_base->swreg);
+}
+
+static void
+eeprom_9300_modal_print(const OSPREY_MODAL_EEP_HEADER *m)
+{
+	int i;
+
+	printf("| AntCtrl: 0x%08x AntCtrl2: 0x%08x |\n",
+	    m->ant_ctrl_common,
+	    m->ant_ctrl_common2);
+
+	for (i = 0; i < OSPREY_MAX_CHAINS; i++) {
+		printf("| Ch %d: AntCtrl: 0x%08x Atten1: %d, atten1_margin: %d, NfThresh: %d |\n",
+		    i,
+		    m->ant_ctrl_chain[i],
+		    m->xatten1_db[i],
+		    m->xatten1_margin[i],
+		    m->noise_floor_thresh_ch[i]);
+	}
+
+	printf("| Spur: ");
+	for (i = 0; i < OSPREY_EEPROM_MODAL_SPURS; i++) {
+		printf("(%d: %d) ", i, m->spur_chans[i]);
+	}
+	printf("|\n");
+
+	printf("| TempSlope: %d, VoltSlope: %d, QuickDrop: %d, XpaBiasLvl %d |\n",
+	    m->temp_slope,
+	    m->voltSlope,
+	    m->quick_drop,
+	    m->xpa_bias_lvl);
+
+	printf("| txFrameToDataStart: %d, TxFrameToPaOn: %d, TxEndToXpaOff: %d, TxEndToRxOn: %d, TxFrameToXpaOn: %d |\n",
+	    m->tx_frame_to_data_start,
+	    m->tx_frame_to_pa_on,
+	    m->tx_end_to_xpa_off,
+	    m->txEndToRxOn,
+	    m->tx_frame_to_xpa_on);
+
+	printf("| txClip: %d, AntGain: %d, SwitchSettling: %d, adcDesiredSize: %d |\n",
+	    m->txClip,
+	    m->antenna_gain,
+	    m->switchSettling,
+	    m->adcDesiredSize);
+
+	printf("| Thresh62: %d, PaprdMaskHt20: 0x%08x, PaPrdMaskHt40: 0x%08x |\n",
+	    m->thresh62,
+	    m->paprd_rate_mask_ht20,
+	    m->paprd_rate_mask_ht40);
+
+	printf("| SwitchComSpdt: %02x, XlnaBiasStrength: %d, RfGainCap: %d, TxGainCap: %x\n",
+	    m->switchcomspdt,
+	    m->xLNA_bias_strength,
+	    m->rf_gain_cap,
+	    m->tx_gain_cap);
+
+#if 0
+    u_int8_t   reserved[MAX_MODAL_RESERVED];
+    u_int16_t  switchcomspdt;
+    u_int8_t   xLNA_bias_strength;                      // bit: 0,1:chain0, 2,3:chain1, 4,5:chain2
+    u_int8_t   rf_gain_cap;
+    u_int8_t   tx_gain_cap;                             // bit0:4 txgain cap, txgain index for max_txgain + 20 (10dBm higher than max txgain)
+    u_int8_t   futureModal[MAX_MODAL_FUTURE];
+    // last 12 bytes stolen and moved to newly created base extension structure
+#endif
+}
+
+static void
+load_eeprom_dump(const char *file, uint16_t *buf)
+{
+	unsigned int r[8];
+	FILE *fp;
+	char b[1024];
+	int i;
+
+	fp = fopen(file, "r");
+	if (!fp)
+		err(1, "fopen");
+
+	while (!feof(fp)) {
+		if (fgets(b, 1024, fp) == NULL)
+			break;
+		if (feof(fp))
+			break;
+		if (strlen(b) > 0)
+			b[strlen(b)-1] = '\0';
+		if (strlen(b) == 0)
+			break;
+		sscanf(b, "%x: %x %x %x %x %x %x %x %x\n",
+		    &i, &r[0], &r[1], &r[2], &r[3], &r[4],
+		    &r[5], &r[6], &r[7]);
+		buf[i++] = r[0];
+		buf[i++] = r[1];
+		buf[i++] = r[2];
+		buf[i++] = r[3];
+		buf[i++] = r[4];
+		buf[i++] = r[5];
+		buf[i++] = r[6];
+		buf[i++] = r[7];
+	}
+	fclose(fp);
+}
+
+void
+usage(char *argv[])
+{
+	printf("Usage: %s \n", argv[0]);
+	printf("\n");
+	printf("  The eeprom dump file is a text hexdump of an EEPROM.\n");
+	printf("  The lines must be formatted as follows:\n");
+	printf("  0xAAAA: 0xDD 0xDD 0xDD 0xDD 0xDD 0xDD 0xDD 0xDD\n");
+	printf("  where each line must have exactly eight data bytes.\n");
+	exit(127);
+}
+
+int
+main(int argc, char *argv[])
+{
+	uint16_t *eep = NULL;
+	const ar9300_eeprom_t *ee;
+
+	eep = calloc(4096, sizeof(int16_t));
+
+	if (argc < 2)
+		usage(argv);
+
+	load_eeprom_dump(argv[1], eep);
+	ee = (ar9300_eeprom_t *) eep;
+
+	eeprom_9300_hdr_print(eep);
+	eeprom_9300_base_print(eep);
+
+	printf("\n2GHz modal:\n");
+	eeprom_9300_modal_print(&ee->modal_header_2g);
+
+	printf("\n5GHz modal:\n");
+	eeprom_9300_modal_print(&ee->modal_header_5g);
+
+	free(eep);
+	exit(0);
+}

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:12:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BD5CE7AB;
 Fri, 14 Jun 2013 08:12:54 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B13121AE4;
 Fri, 14 Jun 2013 08:12:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8Cs3o028877;
 Fri, 14 Jun 2013 08:12:54 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8CsZY028876;
 Fri, 14 Jun 2013 08:12:54 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140812.r5E8CsZY028876@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:12:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251739 - head/tools/tools/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:12:54 -0000

Author: adrian
Date: Fri Jun 14 08:12:54 2013
New Revision: 251739
URL: http://svnweb.freebsd.org/changeset/base/251739

Log:
  Link the AR9300 EEPROM dump tool into the build.

Modified:
  head/tools/tools/ath/Makefile

Modified: head/tools/tools/ath/Makefile
==============================================================================
--- head/tools/tools/ath/Makefile	Fri Jun 14 08:12:40 2013	(r251738)
+++ head/tools/tools/ath/Makefile	Fri Jun 14 08:12:54 2013	(r251739)
@@ -2,7 +2,7 @@
 
 SUBDIR=	arcode athdebug athdecode athkey athpoke athprom athrd athregs
 SUBDIR+=	athstats ath_prom_read athradar athaggrstats
-SUBDIR+=	ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print
+SUBDIR+=	ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print ath_ee_9300_print
 SUBDIR+=	athsurvey athratestats athspectral
 
 .include 

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:13:21 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C588C92A;
 Fri, 14 Jun 2013 08:13:21 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B8A8B1AEE;
 Fri, 14 Jun 2013 08:13:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8DLgt029015;
 Fri, 14 Jun 2013 08:13:21 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8DL5M029014;
 Fri, 14 Jun 2013 08:13:21 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140813.r5E8DL5M029014@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:13:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251740 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:13:21 -0000

Author: adrian
Date: Fri Jun 14 08:13:21 2013
New Revision: 251740
URL: http://svnweb.freebsd.org/changeset/base/251740

Log:
  Flip on AH_PRIVATE_DIAG by default; this will include the AR9300 EEPROM
  dump code that is worth having around.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h	Fri Jun 14 08:12:54 2013	(r251739)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h	Fri Jun 14 08:13:21 2013	(r251740)
@@ -34,6 +34,7 @@
 #define ATH_SUPPORT_WIFIPOS     0
 #define ATH_SUPPORT_PAPRD       1
 #define ATH_SUPPORT_TxBF        0
+#define AH_PRIVATE_DIAG         1
 
 /* XXX need to reverify these; they came in with qcamain */
 #define ATH_SUPPORT_FAST_CC 0

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:15:29 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 12D1AB65;
 Fri, 14 Jun 2013 08:15:29 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 054241B0F;
 Fri, 14 Jun 2013 08:15:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8FS3R029489;
 Fri, 14 Jun 2013 08:15:28 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8FSPn029488;
 Fri, 14 Jun 2013 08:15:28 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140815.r5E8FSPn029488@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251741 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:15:29 -0000

Author: adrian
Date: Fri Jun 14 08:15:28 2013
New Revision: 251741
URL: http://svnweb.freebsd.org/changeset/base/251741

Log:
  The AR9300 HAL uses this config to program AR_PHY_SWITCH_COM_2 on AR9485
  NICs which have bluetooth coexistence enabled.
  
  The WB225 NIC has the common antenna switch configuration set to 0x0 which
  disables all external switch bit setting. This obviously won't work when
  doing coexistence.
  
  This value is a magic value from the windows .inf files. It _looks_ right
  but I haven't yet verified it - unfortunately my AR9285+AR3012 BT combo
  has an earlier BT device which doesn't actually _have_ firmware on it.
  So I have to fix ath3kfw to handle loading in firmware into the newer
  NICs before I can finish testing this.
  
  This may not hold true for CUS198, which is another custom AR9485 board.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Fri Jun 14 08:13:21 2013	(r251740)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Fri Jun 14 08:15:28 2013	(r251741)
@@ -249,6 +249,9 @@ ar9300_attach_freebsd_ops(struct ath_hal
 	/* LNA diversity functions */
 	ah->ah_divLnaConfGet = ar9300_ant_div_comb_get_config;
 	ah->ah_divLnaConfSet = ar9300_ant_div_comb_set_config;
+
+	/* Setup HAL configuration defaults */
+	ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable = 0x000bbb88;
 }
 
 HAL_BOOL

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:18:18 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 30E2FDD4;
 Fri, 14 Jun 2013 08:18:18 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0A0CD1B27;
 Fri, 14 Jun 2013 08:18:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8IHNd030018;
 Fri, 14 Jun 2013 08:18:17 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8IHdm030017;
 Fri, 14 Jun 2013 08:18:17 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140818.r5E8IHdm030017@svn.freebsd.org>
From: Adrian Chadd 
Date: Fri, 14 Jun 2013 08:18:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251742 - head/sys/dev/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:18:18 -0000

Author: adrian
Date: Fri Jun 14 08:18:17 2013
New Revision: 251742
URL: http://svnweb.freebsd.org/changeset/base/251742

Log:
  Add in an initial WB225 (AR9485 + AR3012 BT) combo profile.
  
  This hasn't yet been tested as unfortunately the AR3012 I have doesn't
  have the "real" firmware on it; it shipped with the cut down HCI firmware
  that only understands enough to accept a new firmware image.
  
  * Linux ath9k (GPIO constants)

Modified:
  head/sys/dev/ath/if_ath_btcoex.c

Modified: head/sys/dev/ath/if_ath_btcoex.c
==============================================================================
--- head/sys/dev/ath/if_ath_btcoex.c	Fri Jun 14 08:15:28 2013	(r251741)
+++ head/sys/dev/ath/if_ath_btcoex.c	Fri Jun 14 08:18:17 2013	(r251742)
@@ -129,6 +129,64 @@ ath_btcoex_cfg_wb195(struct ath_softc *s
 	return (0);
 }
 
+/*
+ * Initial AR9485 / (WB225) bluetooth coexistence settings,
+ * just for experimentation.
+ *
+ * Return 0 for OK; errno for error.
+ */
+static int
+ath_btcoex_cfg_wb225(struct ath_softc *sc)
+{
+	HAL_BT_COEX_INFO btinfo;
+	HAL_BT_COEX_CONFIG btconfig;
+	struct ath_hal *ah = sc->sc_ah;
+
+	if (! ath_hal_btcoex_supported(ah))
+		return (EINVAL);
+
+	bzero(&btinfo, sizeof(btinfo));
+	bzero(&btconfig, sizeof(btconfig));
+
+	device_printf(sc->sc_dev, "Enabling WB225 BTCOEX\n");
+
+	btinfo.bt_module = HAL_BT_MODULE_JANUS;	/* XXX not used? */
+	btinfo.bt_coex_config = HAL_BT_COEX_CFG_3WIRE;
+	/*
+	 * These are the three GPIO pins hooked up between the AR9485 and
+	 * the bluetooth module.
+	 */
+	btinfo.bt_gpio_bt_active = 4;
+	btinfo.bt_gpio_bt_priority = 8;
+	btinfo.bt_gpio_wlan_active = 5;
+
+	btinfo.bt_active_polarity = 1;	/* XXX not used */
+	btinfo.bt_single_ant = 1;	/* 1 antenna on ar9285 ? */
+	btinfo.bt_isolation = 0;	/* in dB, not used */
+
+	ath_hal_btcoex_set_info(ah, &btinfo);
+
+	btconfig.bt_time_extend = 0;
+	btconfig.bt_txstate_extend = 1;	/* true */
+	btconfig.bt_txframe_extend = 1;	/* true */
+	btconfig.bt_mode = HAL_BT_COEX_MODE_SLOTTED;
+	btconfig.bt_quiet_collision = 1;	/* true */
+	btconfig.bt_rxclear_polarity = 1;	/* true */
+	btconfig.bt_priority_time = 2;
+	btconfig.bt_first_slot_time = 5;
+	btconfig.bt_hold_rxclear = 1;	/* true */
+
+	ath_hal_btcoex_set_config(ah, &btconfig);
+
+	/*
+	 * Enable antenna diversity.
+	 */
+	ath_hal_btcoex_set_parameter(ah, HAL_BT_COEX_ANTENNA_DIVERSITY, 1);
+
+	return (0);
+}
+
+
 #if 0
 /*
  * When using bluetooth coexistence, ASPM needs to be disabled
@@ -183,6 +241,8 @@ ath_btcoex_attach(struct ath_softc *sc)
 
 	if (strncmp(profname, "wb195", 5) == 0) {
 		ret = ath_btcoex_cfg_wb195(sc);
+	} else if (strncmp(profname, "wb225", 5) == 0) {
+		ret = ath_btcoex_cfg_wb225(sc);
 	} else {
 		return (0);
 	}

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:26:58 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 855B636E;
 Fri, 14 Jun 2013 08:26:58 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 785541BBB;
 Fri, 14 Jun 2013 08:26:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8QwtK032939;
 Fri, 14 Jun 2013 08:26:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8Qwdu032938;
 Fri, 14 Jun 2013 08:26:58 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306140826.r5E8Qwdu032938@svn.freebsd.org>
From: Alexander Motin 
Date: Fri, 14 Jun 2013 08:26:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251743 - head/sbin/camcontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:26:58 -0000

Author: mav
Date: Fri Jun 14 08:26:58 2013
New Revision: 251743
URL: http://svnweb.freebsd.org/changeset/base/251743

Log:
  Improve firmware download status check.  Previous check was insufficient for
  ATA since it ignored transport errors like command timeouts, while for SCSI
  it was just wrong.

Modified:
  head/sbin/camcontrol/fwdownload.c

Modified: head/sbin/camcontrol/fwdownload.c
==============================================================================
--- head/sbin/camcontrol/fwdownload.c	Fri Jun 14 08:18:17 2013	(r251742)
+++ head/sbin/camcontrol/fwdownload.c	Fri Jun 14 08:26:58 2013	(r251743)
@@ -370,17 +370,15 @@ fw_download_img(struct cam_device *cam_d
 		}
 		if (!sim_mode) {
 			/* Execute the command. */
-			if (cam_send_ccb(cam_dev, ccb) < 0) {
+			if (cam_send_ccb(cam_dev, ccb) < 0 ||
+			    (ccb->ccb_h.status & CAM_STATUS_MASK) !=
+			    CAM_REQ_CMP) {
 				warnx("Error writing image to device");
 				if (printerrors)
 					cam_error_print(cam_dev, ccb, CAM_ESF_ALL,
 						   CAM_EPF_ALL, stderr);
 				goto bailout;
 			}
-			if (ccb->ataio.res.status != 0 /*&& !last_pkt*/) {
-				cam_error_print(cam_dev, ccb, CAM_ESF_ALL,
-					   CAM_EPF_ALL, stderr);
-			}
 		}
 		/* Prepare next round. */
 		pkt_count++;

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:28:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D05DE4EE;
 Fri, 14 Jun 2013 08:28:08 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C1D701BC8;
 Fri, 14 Jun 2013 08:28:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E8S8Kt033145;
 Fri, 14 Jun 2013 08:28:08 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E8S8sC033144;
 Fri, 14 Jun 2013 08:28:08 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201306140828.r5E8S8sC033144@svn.freebsd.org>
From: Sergey Kandaurov 
Date: Fri, 14 Jun 2013 08:28:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251744 - head/share/man/man4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:28:08 -0000

Author: pluknet
Date: Fri Jun 14 08:28:08 2013
New Revision: 251744
URL: http://svnweb.freebsd.org/changeset/base/251744

Log:
  Fix and improve filemon(4) example:
  - remove return statements from void function [1]
  - include missing header
  - use O_CLOEXEC instead of separate fcntl() calls
  
  PR:		docs/179459 [1]
  MFC after:	1 week

Modified:
  head/share/man/man4/filemon.4

Modified: head/share/man/man4/filemon.4
==============================================================================
--- head/share/man/man4/filemon.4	Fri Jun 14 08:26:58 2013	(r251743)
+++ head/share/man/man4/filemon.4	Fri Jun 14 08:28:08 2013	(r251744)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2012
+.Dd June 14, 2013
 .Dt FILEMON 4
 .Os
 .Sh NAME
@@ -126,6 +126,7 @@ is set to indicate the error.
 #include 
 #include 
 #include 
+#include 
 
 static void
 open_filemon(void)
@@ -133,29 +134,24 @@ open_filemon(void)
 	pid_t child;
 	int fm_fd, fm_log;
 
-	if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1)
+	if ((fm_fd = open("/dev/filemon", O_RDWR | O_CLOEXEC)) == -1)
 		err(1, "open(\e"/dev/filemon\e", O_RDWR)");
 	if ((fm_log = open("filemon.out",
-	    O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1)
+	    O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC, DEFFILEMODE)) == -1)
 		err(1, "open(filemon.out)");
 
 	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1)
 		err(1, "Cannot set filemon log file descriptor");
-	/* Set up these two fd's to close on exec. */
-	(void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC);
-	(void)fcntl(fm_log, F_SETFD, FD_CLOEXEC);
 
 	if ((child = fork()) == 0) {
 		child = getpid();
 		if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1)
 			err(1, "Cannot set filemon PID");
 		/* Do something here. */
-		return 0;
 	} else {
 		wait(&child);
 		close(fm_fd);
 	}
-	return 0;
 }
 .Ed
 .Pp

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 08:46:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E63A7861;
 Fri, 14 Jun 2013 08:46:10 +0000 (UTC)
 (envelope-from dimitry@andric.com)
Received: from tensor.andric.com (tensor.andric.com
 [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26])
 by mx1.freebsd.org (Postfix) with ESMTP id AFC061C62;
 Fri, 14 Jun 2013 08:46:10 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7::bcda:4d69:e011:5322] (unknown
 [IPv6:2001:7b8:3a7:0:bcda:4d69:e011:5322])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id BAD995C44;
 Fri, 14 Jun 2013 10:46:08 +0200 (CEST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r251728 - stable/8/contrib/gcc
From: Dimitry Andric 
In-Reply-To: <201306140328.r5E3STvD037517@svn.freebsd.org>
Date: Fri, 14 Jun 2013 10:46:06 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <38497015-A08E-4062-9B3A-F1836448FBF6@andric.com>
References: <201306140328.r5E3STvD037517@svn.freebsd.org>
To: Pedro F. Giffuni 
X-Mailer: Apple Mail (2.1508)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-8@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 08:46:11 -0000

On Jun 14, 2013, at 05:28, Pedro F. Giffuni  wrote:
> Author: pfg
> Date: Fri Jun 14 03:28:29 2013
> New Revision: 251728
> URL: http://svnweb.freebsd.org/changeset/base/251728
>=20
> Log:
>  MFC	r250550, r250566;
>=20
>  Update the gcc43 ChangeLog.
>=20
>  Add support for "d" floating-point suffix, as defined by draft N1312
>  of TR 24732.

Hi Pedro,

Unfortunately this breaks tinderbox:

/src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c: In function =
'interpret_float':
/src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: =
'CPP_N_DEFAULT' undeclared (first use in this function)
/src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: =
(Each undeclared identifier is reported only once
/src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: =
for each function it appears in.)
*** [c-lex.o] Error code 1

So apparently you need to also MFC the change that introduced the
CPP_N_DEFAULT identifier?

-Dimitry


From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 11:07:42 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 43FF9EA2;
 Fri, 14 Jun 2013 11:07:42 +0000 (UTC)
 (envelope-from pluknet@gmail.com)
Received: from mail-we0-x22a.google.com (mail-we0-x22a.google.com
 [IPv6:2a00:1450:400c:c03::22a])
 by mx1.freebsd.org (Postfix) with ESMTP id 30E1611E9;
 Fri, 14 Jun 2013 11:07:41 +0000 (UTC)
Received: by mail-we0-f170.google.com with SMTP id w57so374672wes.1
 for ; Fri, 14 Jun 2013 04:07:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=XuWxw2Gg/x7j1dgS9aNd/aiYQ08s0t6HTiycZyt8i0M=;
 b=H+28Uqoc5VXcaTeQGy3kIy4yrDWgdCHVNrt9LqC8XS9+Qk05EWNHixdgzcaHLegZkV
 H0qVWqYcQJ+OXFNOiJdU5xxC5o5zXMQ29gMiMxbfXx75guBVUyPjjmahjUHMrjkIbvaL
 ZviTWJVufxTpH9vtup8VHRSMqukssX1guvQA78In3AgQQppGopsT3O/c5yGUwbDUQ+n2
 +b7EJg62ytcpugcxt752/XHQlbI0Yu7kEP5/c7fj2bGtx+uP9Mm7nI5y71p4MA5X/AG/
 ebB75hWsRc6skFhSulTPswuOnatPuRB8fl04vG9GeoL1PcRXzx+ThuVIDVF0pBQK5fo/
 Tlsw==
MIME-Version: 1.0
X-Received: by 10.194.172.66 with SMTP id ba2mr1059052wjc.22.1371208060405;
 Fri, 14 Jun 2013 04:07:40 -0700 (PDT)
Sender: pluknet@gmail.com
Received: by 10.194.172.133 with HTTP; Fri, 14 Jun 2013 04:07:40 -0700 (PDT)
In-Reply-To: <51BA4CD0.30601@FreeBSD.org>
References: <201306132046.r5DKk3xd006430@svn.freebsd.org>
 <51BA4CD0.30601@FreeBSD.org>
Date: Fri, 14 Jun 2013 15:07:40 +0400
X-Google-Sender-Auth: tYX8wl-jqDRGmT5aHgPwKzXDPo8
Message-ID: 
Subject: Re: svn commit: r251703 - in head/sys: amd64/amd64 i386/i386 i386/xen
 kern mips/mips sparc64/sparc64 sys
From: Sergey Kandaurov 
To: Bryan Drewery 
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-head@freebsd.org, Jeff Roberson ,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 11:07:42 -0000

On 14 June 2013 02:50, Bryan Drewery  wrote:
[..]
>
> Looks like cpusetobj_ffs() -> CPU_FFS() was missed in
> sys/amd64/vmm/io/vlapic.c:
>
>> --- vlapic.o ---
>> /usr/src/sys/modules/vmm/../../amd64/vmm/io/vlapic.c:468:15: error: implicit declaration of function 'cpusetobj_ffs' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
>>                 while ((i = cpusetobj_ffs(&dmask)) != 0) {
>

It should be fixed in r251745.

-- 
wbr,
pluknet

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 11:16:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C0D9B5F7;
 Fri, 14 Jun 2013 11:16:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 98D441365;
 Fri, 14 Jun 2013 11:16:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EAjWI7076383;
 Fri, 14 Jun 2013 10:45:32 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EAjV2T076381;
 Fri, 14 Jun 2013 10:45:31 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201306141045.r5EAjV2T076381@svn.freebsd.org>
From: "Pedro F. Giffuni" 
Date: Fri, 14 Jun 2013 10:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251746 - in stable/8/contrib/gcclibs/libcpp: . include
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 11:16:52 -0000

Author: pfg
Date: Fri Jun 14 10:45:31 2013
New Revision: 251746
URL: http://svnweb.freebsd.org/changeset/base/251746

Log:
  MFC	r250550:
  
  (Missing libcpp merge)
  
  Add support for "d" floating-point suffix, as defined by draft N1312
  of TR 24732.
  
  Reported by:	dim
  Pointy hat:	pfg

Modified:
  stable/8/contrib/gcclibs/libcpp/expr.c
  stable/8/contrib/gcclibs/libcpp/include/cpplib.h
Directory Properties:
  stable/8/contrib/gcclibs/   (props changed)

Modified: stable/8/contrib/gcclibs/libcpp/expr.c
==============================================================================
--- stable/8/contrib/gcclibs/libcpp/expr.c	Fri Jun 14 10:26:38 2013	(r251745)
+++ stable/8/contrib/gcclibs/libcpp/expr.c	Fri Jun 14 10:45:31 2013	(r251746)
@@ -82,7 +82,7 @@ static void check_promotion (cpp_reader 
 static unsigned int
 interpret_float_suffix (const uchar *s, size_t len)
 {
-  size_t f = 0, l = 0, i = 0, d = 0;
+  size_t f = 0, l = 0, i = 0, d = 0, d0 = 0;
 
   while (len--)
     switch (s[len])
@@ -101,7 +101,12 @@ interpret_float_suffix (const uchar *s, 
 	return 0;
       }
 
-  if (f + l > 1 || i > 1)
+  if (d == 1 && !f && !l) {
+    d = 0;
+    d0 = 1;
+  }
+
+  if (f + d0 + l > 1 || i > 1)
     return 0;
 
   /* Allow dd, df, dl suffixes for decimal float constants.  */
@@ -110,7 +115,8 @@ interpret_float_suffix (const uchar *s, 
 
   return ((i ? CPP_N_IMAGINARY : 0)
 	  | (f ? CPP_N_SMALL :
-	     l ? CPP_N_LARGE : CPP_N_MEDIUM)
+	     d0 ? CPP_N_MEDIUM :
+	     l ? CPP_N_LARGE : CPP_N_DEFAULT)
 	  | (d ? CPP_N_DFLOAT : 0));
 }
 
@@ -261,6 +267,13 @@ cpp_classify_number (cpp_reader *pfile, 
 		   "traditional C rejects the \"%.*s\" suffix",
 		   (int) (limit - str), str);
 
+      /* A suffix for double is a GCC extension via decimal float support.
+	 If the suffix also specifies an imaginary value we'll catch that
+	 later.  */
+      if ((result == CPP_N_MEDIUM) && CPP_PEDANTIC (pfile))
+	cpp_error (pfile, CPP_DL_PEDWARN,
+		   "suffix for double constant is a GCC extension");
+
       /* Radix must be 10 for decimal floats.  */
       if ((result & CPP_N_DFLOAT) && radix != 10)
         {

Modified: stable/8/contrib/gcclibs/libcpp/include/cpplib.h
==============================================================================
--- stable/8/contrib/gcclibs/libcpp/include/cpplib.h	Fri Jun 14 10:26:38 2013	(r251745)
+++ stable/8/contrib/gcclibs/libcpp/include/cpplib.h	Fri Jun 14 10:45:31 2013	(r251746)
@@ -748,6 +748,7 @@ struct cpp_num
 #define CPP_N_UNSIGNED	0x1000	/* Properties.  */
 #define CPP_N_IMAGINARY	0x2000
 #define CPP_N_DFLOAT	0x4000
+#define CPP_N_DEFAULT	0x8000
 
 /* Classify a CPP_NUMBER token.  The return value is a combination of
    the flags from the above sets.  */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 11:32:04 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EB5CB2A8
 for ; Fri, 14 Jun 2013 11:32:04 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id B4B4D16FE
 for ; Fri, 14 Jun 2013 11:32:04 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EBW43X067735
 for ; Fri, 14 Jun 2013 11:32:04 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5EBW49m067729
 for svn-src-all@freebsd.org; Fri, 14 Jun 2013 11:32:04 GMT
 (envelope-from bdrewery)
Received: (qmail 56378 invoked from network); 14 Jun 2013 06:32:03 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 14 Jun 2013 06:32:03 -0500
Message-ID: <51BAFF25.5090909@FreeBSD.org>
Date: Fri, 14 Jun 2013 06:31:49 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Sergey Kandaurov 
Subject: Re: svn commit: r251703 - in head/sys: amd64/amd64 i386/i386 i386/xen
 kern mips/mips sparc64/sparc64 sys
References: <201306132046.r5DKk3xd006430@svn.freebsd.org>
 <51BA4CD0.30601@FreeBSD.org>
 
In-Reply-To: 
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2KVGEADGSDLINCBFELHSH"
Cc: svn-src-head@freebsd.org, Jeff Roberson ,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 11:32:05 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2KVGEADGSDLINCBFELHSH
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/14/2013 6:07 AM, Sergey Kandaurov wrote:
> On 14 June 2013 02:50, Bryan Drewery  wrote:
> [..]
>>
>> Looks like cpusetobj_ffs() -> CPU_FFS() was missed in
>> sys/amd64/vmm/io/vlapic.c:
>>
>>> --- vlapic.o ---
>>> /usr/src/sys/modules/vmm/../../amd64/vmm/io/vlapic.c:468:15: error: i=
mplicit declaration of function 'cpusetobj_ffs' is invalid in C99 [-Werro=
r,-Wimplicit-function-declaration]
>>>                 while ((i =3D cpusetobj_ffs(&dmask)) !=3D 0) {
>>
>=20
> It should be fixed in r251745.
>=20

Thanks!

--=20
Regards,
Bryan Drewery


------enig2KVGEADGSDLINCBFELHSH
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRuv8lAAoJEG54KsA8mwz5nE0QALL4gatcPeUCz3ZDY3+d8wni
82wiLWleBmC0Cria6i+RTebR7Px1iggNpmlDm5xg2X6zdcYqWOsgBzXKpWaAnGeE
BHNR57SMpJaUJ5xKrxAwjrY5YWbD2sgrO9w42tzBSpiHxDT/eD2yV7v7U9Uk/dQS
ahAol++eB87cjTAzRCnRuP/EOBfbdg4hc03330ICqObm8usAq7MLutai8iAxXpp+
ZSJoUmQImATosg7BO/347P01OHmvvVQKsk43xL0xryOf8pthu+8g6//mZBGss4TU
SFMmlcs5MeJ9fsQipLlKQP80Jw+ZQmvBei2GJDbxYdeIdMPFAmCPzntRdLofcgJe
Ka0BYDIhTCxzrcdL46G/5Rch0xS52iNK0P1FfNwmMSqDyH+WT3CjgbcK9fEOSY+W
hIx671JPIRvvjwX7w6TcGDNbweuT4XofxwQLhis9+GxlnttvC0Ac7+AfxcD6sshj
jzD6xziggcQDiaGvxzsCrm0+VN5dCoqbzBMHLO2qVK8cIR9KyWxkJy5s+uX42pAh
EE0uqZ4IhzyAANnR7J/JNnEseMmbzKWBrtNi2tccKZC9tyCU08jn8nggsHlN4nQV
dYo30f5h8CHUuAgDdYtGHuf6bpl53E1Q2PHeirLkK1bSrBW4XsbLHAl1qgrvMgtZ
8CbZwU2C+hF8f19baAHC
=KtfM
-----END PGP SIGNATURE-----

------enig2KVGEADGSDLINCBFELHSH--

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 11:46:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A5411BE4;
 Fri, 14 Jun 2013 11:46:52 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 967A31861;
 Fri, 14 Jun 2013 11:46:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EAQc6W070464;
 Fri, 14 Jun 2013 10:26:38 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EAQc9Q070463;
 Fri, 14 Jun 2013 10:26:38 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201306141026.r5EAQc9Q070463@svn.freebsd.org>
From: Sergey Kandaurov 
Date: Fri, 14 Jun 2013 10:26:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251745 - head/sys/amd64/vmm/io
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 11:46:52 -0000

Author: pluknet
Date: Fri Jun 14 10:26:38 2013
New Revision: 251745
URL: http://svnweb.freebsd.org/changeset/base/251745

Log:
  Replace cpusetffs_obj with CPU_FFS, missed in r251703.
  
  Reported by:	bdrewery, O. Hartmann

Modified:
  head/sys/amd64/vmm/io/vlapic.c

Modified: head/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- head/sys/amd64/vmm/io/vlapic.c	Fri Jun 14 08:28:08 2013	(r251744)
+++ head/sys/amd64/vmm/io/vlapic.c	Fri Jun 14 10:26:38 2013	(r251745)
@@ -465,7 +465,7 @@ lapic_process_icr(struct vlapic *vlapic,
 			break;
 		}
 
-		while ((i = cpusetobj_ffs(&dmask)) != 0) {
+		while ((i = CPU_FFS(&dmask)) != 0) {
 			i--;
 			CPU_CLR(i, &dmask);
 			if (mode == APIC_DELMODE_FIXED) {

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 11:49:25 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A7EB6EDB
 for ; Fri, 14 Jun 2013 11:49:25 +0000 (UTC)
 (envelope-from pfg@FreeBSD.org)
Received: from nm12.bullet.mail.gq1.yahoo.com (nm12.bullet.mail.gq1.yahoo.com
 [98.136.218.45]) by mx1.freebsd.org (Postfix) with ESMTP id 4ED1C18BD
 for ; Fri, 14 Jun 2013 11:49:25 +0000 (UTC)
Received: from [98.137.12.62] by nm12.bullet.mail.gq1.yahoo.com with NNFMP;
 14 Jun 2013 10:49:02 -0000
Received: from [208.71.42.204] by tm7.bullet.mail.gq1.yahoo.com with NNFMP;
 14 Jun 2013 10:49:01 -0000
Received: from [127.0.0.1] by smtp215.mail.gq1.yahoo.com with NNFMP;
 14 Jun 2013 10:49:01 -0000
X-Yahoo-Newman-Id: 973127.68860.bm@smtp215.mail.gq1.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: TbwGMf0VM1npJgaKS7dxOFxojERifVioeMNQa8Q43IghTLl
 M.2KEZnHyJ_bdy1n6SimoWAZ652_IN7LV3SaTk9bFe8ggAvawG4KNZc58vbT
 LiUef0KuOo9jAPyfDdMEdpSchNObh9I9idiTHqLhUs1NNG9YaHrPCYVr9eFz
 zXf75ISlIhb1woHNJuPR4TDL9zfesjAaF1Zntwy.afU70517Qnc4xRWY1zKx
 gYzxdQ.5M0AFcg7eKjxIGmlC0bbi2dtRtL726cY7EnHuQkYoubJ_7Ia6ZflR
 XzyTqwHLZvSxOeVmBE1.vR7XX_bJT2sYSVJGnAKYzbF2G4rO0QWmNzQO_MMl
 z.HoZtguL2.dDuyTHhPo8pkojwYBF_UYvrT3TdXxuVvxszfKwn.Xg8gY9VSb
 vc1T6yq8f310YnG9OKJWOiPb_LzleT2jIUOjjK_9KXWbks5SfdY14gmXjK3s
 LjhJzGxsmLEP3lmYsjZuNS0PhMuegZL3FkX9kSNwjmqnfRmDnKaNGOgpsAs_ ndQ--
X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf
X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with )
 by smtp215.mail.gq1.yahoo.com with SMTP; 14 Jun 2013 03:49:01 -0700 PDT
Message-ID: <51BAF515.3040806@FreeBSD.org>
Date: Fri, 14 Jun 2013 05:48:53 -0500
From: Pedro Giffuni 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130407 Thunderbird/17.0.5
MIME-Version: 1.0
To: Dimitry Andric 
Subject: Re: svn commit: r251728 - stable/8/contrib/gcc
References: <201306140328.r5E3STvD037517@svn.freebsd.org>
 <38497015-A08E-4062-9B3A-F1836448FBF6@andric.com>
In-Reply-To: <38497015-A08E-4062-9B3A-F1836448FBF6@andric.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-8@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 11:49:25 -0000

On 14.06.2013 03:46, Dimitry Andric wrote:
> On Jun 14, 2013, at 05:28, Pedro F. Giffuni  wrote:
>> Author: pfg
>> Date: Fri Jun 14 03:28:29 2013
>> New Revision: 251728
>> URL: http://svnweb.freebsd.org/changeset/base/251728
>>
>> Log:
>>   MFC	r250550, r250566;
>>
>>   Update the gcc43 ChangeLog.
>>
>>   Add support for "d" floating-point suffix, as defined by draft N1312
>>   of TR 24732.
> Hi Pedro,
>
> Unfortunately this breaks tinderbox:
>
> /src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c: In function 'interpret_float':
> /src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: 'CPP_N_DEFAULT' undeclared (first use in this function)
> /src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: (Each undeclared identifier is reported only once
> /src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/c-lex.c:644: error: for each function it appears in.)
> *** [c-lex.o] Error code 1
>
> So apparently you need to also MFC the change that introduced the
> CPP_N_DEFAULT identifier?

Sorry! It was indeed an incomplete merge.

Fixed in r251746.

Thank you for the notice, and for waiting for me to wake up ;) !

Pedro.


From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 12:28:50 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A15632ED
 for ; Fri, 14 Jun 2013 12:28:50 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 81D341C45
 for ; Fri, 14 Jun 2013 12:28:50 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ECSoeY077768
 for ; Fri, 14 Jun 2013 12:28:50 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5ECSo8l077762
 for svn-src-all@freebsd.org; Fri, 14 Jun 2013 12:28:50 GMT
 (envelope-from bdrewery)
Received: (qmail 96646 invoked from network); 14 Jun 2013 07:28:48 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 14 Jun 2013 07:28:48 -0500
Message-ID: <51BB0C6F.7090507@FreeBSD.org>
Date: Fri, 14 Jun 2013 07:28:31 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Dimitry Andric 
Subject: Re: svn commit: r251662 - in head: contrib/llvm/include/llvm
 contrib/llvm/include/llvm-c
 contrib/llvm/include/llvm-c/Transforms contrib/llvm/include/llvm/ADT
 contrib/llvm/include/llvm/Analysis contrib/...
References: <201306121848.r5CImsAQ007439@svn.freebsd.org>
 <51B900A8.4010502@FreeBSD.org>
 <462BF646-FB74-4510-B09D-8132BBCB17EB@FreeBSD.org>
In-Reply-To: <462BF646-FB74-4510-B09D-8132BBCB17EB@FreeBSD.org>
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2RANAIVHLMQWCLEUTFAJX"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 12:28:50 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2RANAIVHLMQWCLEUTFAJX
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/13/2013 12:58 AM, Dimitry Andric wrote:
> On Jun 13, 2013, at 01:13, Bryan Drewery  wrote:
>> On 6/12/2013 1:48 PM, Dimitry Andric wrote:
>>> Author: dim
>>> Date: Wed Jun 12 18:48:53 2013
>>> New Revision: 251662
>>> URL: http://svnweb.freebsd.org/changeset/base/251662
>>>
>>> Log:
>>>  Upgrade our copy of llvm/clang to 3.3 release.
>>>
>>>  Release notes are still in the works, these will follow soon.
>>>
>>>  MFC after:	1 month
>>
>> With make -j16 -DNO_CLEAN buildworld:
>>
>>> --- ExprConstant.o ---
>>> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/=
AST/ExprConstant.cpp:2173:26: error: no member named 'note_constexpr_modi=
fy_const_type' in namespace 'clang::diag'
>>>      Info.Diag(E, diag::note_constexpr_modify_const_type) << QT;
>>>                   ~~~~~~^
>>> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/=
AST/ExprConstant.cpp:2781:42: error: no member named 'note_constexpr_no_r=
eturn' in namespace 'clang::diag'; did you mean 'note_constexpr_nonlitera=
l'?
>>>    Info.Diag(Callee->getLocEnd(), diag::note_constexpr_no_return);
>>>                                   ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
>>>                                         note_constexpr_nonliteral
>>> ./DiagnosticASTKinds.inc.h:51:6: note: 'note_constexpr_nonliteral' de=
clared here
>>> DIAG(note_constexpr_nonliteral, CLASS_NOTE, diag::MAP_FATAL, "non-lit=
eral type %0 cannot be used in a constant expression", 0, true, false, fa=
lse, false, 0)
>>>     ^
>>> /usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/clang/incl=
ude/clang/AST/ASTDiagnostic.h:19:63: note: expanded from macro 'DIAG'
>>>             SFINAE,ACCESS,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,
>>>                                                              ^
>>> --- RecordLayout.o ---
>>> c++  -O2 -pipe -I/usr/src/lib/clang/libclangast/../../../contrib/llvm=
/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/cla=
ng/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/c=
lang/lib/AST -I. -I/us
>>> r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/inc=
lude -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONS=
TANT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-=
unknown-freebsd10.0\" -D
>>> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -DDEFAULT_SYSROOT=3D=
\"/usr/obj/usr/src/tmp\" -g -I/usr/obj/usr/src/tmp/legacy/usr/include -fn=
o-exceptions -fno-rtti -c /usr/src/lib/clang/libclangast/../../../contrib=
/llvm/tools/clang/lib/AST
>>> /RecordLayout.cpp -o RecordLayout.o
>>> --- Stmt.o ---
>>> c++  -O2 -pipe -I/usr/src/lib/clang/libclangast/../../../contrib/llvm=
/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/cla=
ng/include -I/usr/src/lib/clang/libclangast/../../../contrib/llvm/tools/c=
lang/lib/AST -I. -I/us
>>> r/src/lib/clang/libclangast/../../../contrib/llvm/../../lib/clang/inc=
lude -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONS=
TANT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-=
unknown-freebsd10.0\" -D
>>> LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd10.0\" -DDEFAULT_SYSROOT=3D=
\"/usr/obj/usr/src/tmp\" -g -I/usr/obj/usr/src/tmp/legacy/usr/include -fn=
o-exceptions -fno-rtti -c /usr/src/lib/clang/libclangast/../../../contrib=
/llvm/tools/clang/lib/AST
>>> /Stmt.cpp -o Stmt.o
>>> --- ExprConstant.o ---
>>> 14 errors generated.
>>> *** [ExprConstant.o] Error code 1
>=20
> Can you please try a clean build?
>=20

Worked

--=20
Regards,
Bryan Drewery


------enig2RANAIVHLMQWCLEUTFAJX
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRuwxzAAoJEG54KsA8mwz5AWIQALgDJBegwd9LmLzWXUMLYw2O
EobJca4ShPRZQksFV5yKSnIi5a4oJb6yGC40CnHTbaS3SaGNuNjZPnIjOC5E7fJn
0mZomGMJySWWMGBsFWB0FJoTiChcKlfDDbRgYabVkIbBYE5RplCWrRHE6mc46E4U
r7pXZDM3j0UQJjikAKcVlmmsBEyOQz+TXAjxSVgkTeBO2zfHE1bqSq1R6OSjiemh
jTM/7gWfEIi3slleFfCX2NJdGDCEuGHzzTjr+YJgIxV5v8br4pFnVyQiDZ0p1TPL
p0izdsbNfRdtwAvP0axHrSekhESbFCVdTcj+q0sVWRRHGT8cAW9KH4oALYBCyzvG
OhMQnFXKTRf9NIQAWpKmnsHqMQdyjdhJ416AGAPCCB9yx9tqCFptsDgWbbqtwH5B
6jBSZ0L1XPpf8YP9JwCxoQd62vZOVT9UU8ySrg4qi1aRR78/bg4lKZDtLDTqT5ZJ
deLWIvYCT0kPMg32V5gEbsGaxdGrNM/uV8zOFK0rggcFzVPB3gKA3oUnYMAt+hvh
ji88UDNxWdDJ+W2MqWLITNANVG5fPADouRc1o/9Pg6YfM4Fbo8OwqmpHDb6EwQK4
KAAeXUy7ENvhTDyXq3tIQiTOqpLtGD3TkZHb3tG2iPeu3d9YXRrIz/I/z7F5j4hd
aKcRur7zeKZiwEAl3DSY
=FUBM
-----END PGP SIGNATURE-----

------enig2RANAIVHLMQWCLEUTFAJX--

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 12:47:02 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EDF55932
 for ; Fri, 14 Jun 2013 12:47:02 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id CF7841D09
 for ; Fri, 14 Jun 2013 12:47:02 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ECl2tE081207
 for ; Fri, 14 Jun 2013 12:47:02 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5ECl2W9081200
 for svn-src-all@freebsd.org; Fri, 14 Jun 2013 12:47:02 GMT
 (envelope-from bdrewery)
Received: (qmail 75836 invoked from network); 14 Jun 2013 07:47:01 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 14 Jun 2013 07:47:01 -0500
Message-ID: <51BB10B7.5090306@FreeBSD.org>
Date: Fri, 14 Jun 2013 07:46:47 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Lawrence Stewart 
Subject: Re: svn commit: r251732 - in head/sys: kern sys
References: <201306140410.r5E4AYnn052031@svn.freebsd.org>
In-Reply-To: <201306140410.r5E4AYnn052031@svn.freebsd.org>
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2CASTGUDNGQECKRDDTUXL"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 12:47:03 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2CASTGUDNGQECKRDDTUXL
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/13/2013 11:10 PM, Lawrence Stewart wrote:
> Author: lstewart
> Date: Fri Jun 14 04:10:34 2013
> New Revision: 251732
> URL: http://svnweb.freebsd.org/changeset/base/251732
>=20
> Log:
>   Add support for non-virtualised hhook points, which are uniquely iden=
tified by
>   type and id, as compared to virtualised hook points which are now uni=
quely
>   identified by type, id and a vid (which for vimage is the pointer to =
the vnet
>   that the hhook resides in).
>  =20
>   All hhook_head structs for both virtualised and non-virtualised hook =
points
>   coexist in hhook_head_list, and a separate list is maintained for hho=
ok points
>   within each vnet to simplify some vimage-related housekeeping.
>  =20
>   Reviewed by:	scottl
>   MFC after:	1 week
>=20
> Modified:
>   head/sys/kern/kern_hhook.c
>   head/sys/sys/hhook.h
>=20
> Modified: head/sys/kern/kern_hhook.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/kern/kern_hhook.c	Fri Jun 14 03:58:52 2013	(r251731)
> +++ head/sys/kern/kern_hhook.c	Fri Jun 14 04:10:34 2013	(r251732)
> @@ -61,8 +61,9 @@ struct hhook {
>  static MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hh=
ook_head lists");
> =20
>  LIST_HEAD(hhookheadhead, hhook_head);
> -VNET_DEFINE(struct hhookheadhead, hhook_head_list);
> -#define	V_hhook_head_list VNET(hhook_head_list)
> +struct hhookheadhead hhook_head_list;
> +VNET_DEFINE(struct hhookheadhead, hhook_vhead_list);
> +#define	V_hhook_vhead_list VNET(hhook_vhead_list)
> =20
>  static struct mtx hhook_head_list_lock;
>  MTX_SYSINIT(hhookheadlistlock, &hhook_head_list_lock, "hhook_head list=
 lock",
> @@ -245,13 +246,6 @@ hhook_head_register(int32_t hhook_type,=20
>  		return (EEXIST);
>  	}
> =20
> -	/* XXXLAS: Need to implement support for non-virtualised hooks. */
> -	if ((flags & HHOOK_HEADISINVNET) =3D=3D 0) {
> -		printf("%s: only vnet-style virtualised hooks can be used\n",
> -		    __func__);
> -		return (EINVAL);
> -	}
> -
>  	tmphhh =3D malloc(sizeof(struct hhook_head), M_HHOOK,
>  	    M_ZERO | ((flags & HHOOK_WAITOK) ? M_WAITOK : M_NOWAIT));
> =20
> @@ -270,14 +264,15 @@ hhook_head_register(int32_t hhook_type,=20
>  	} else
>  		refcount_init(&tmphhh->hhh_refcount, 0);
> =20
> +	HHHLIST_LOCK();
>  	if (flags & HHOOK_HEADISINVNET) {
>  		tmphhh->hhh_flags |=3D HHH_ISINVNET;
> -		HHHLIST_LOCK();
> -		LIST_INSERT_HEAD(&V_hhook_head_list, tmphhh, hhh_next);
> -		HHHLIST_UNLOCK();
> -	} else {
> -		/* XXXLAS: Add tmphhh to the non-virtualised list. */
> +		KASSERT(curvnet !=3D NULL, ("curvnet is NULL"));

I am hitting this on boot now. I'm having unrelated trouble with console
so am unable to get much more information from the panic.

https://dl.dropboxusercontent.com/u/8732004/curvnet.jpg

--=20
Regards,
Bryan Drewery


------enig2CASTGUDNGQECKRDDTUXL
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRuxC3AAoJEG54KsA8mwz5JbIP/36NmMtZ8xFYHYeRlP4/CYtP
ThTz6JWdqIiAllDL29TmJ+ZYF3G8LbinTAVIC4mz2TqtOoJmb4H/EPAflw53GLYd
YHnodia3wmHre85OXm9rDadBS7lLgJENVAR6w64AixOAW2LJejfKyT4kXLXEgsmM
dP73aQjNXLhWGCfakqAow9D2SDuKo/8gJW7EblvMCw8CI/SrRui3TfZ1xCCrTCvJ
1QAuWoiz2omdXx2bt31iUP/Oqa/wspk6/bYDHwrRPiBYmOPAnWOem7JXa2vraCxM
Bl/wo+VDlN9x7xTU5Byj2KSjy9g1sLW/vOLwyBOrkyVTVV5v7+o8RGqNYmrzYruk
JoEkm/m9yOKVTf7QJDvE5fxz/YJtSkuZlXKqLzpy2sV4ZTogW28/yjgd0kjl4uie
cgasWOatu4bDAfvxDf9FJv6Vlh+w4dNAJkPzhtRXK6YZSlHegWvPYF4+i2m1qrRM
osoqCWtssJLKThKVDKf9NxNy8JEPpRCDUgDfDuDAIh0N1ygYX/nfJlnT3nN/kI6Y
SHai8XgTKFIupiC4ud5fvmLVXRc2OE211rbq/lT/6Koo0jQyTpDpAjjElKpNfpU7
VC+Pu1GGk+O967xTTp/CHZMdqIzvgAWgOd2NYs55r19luBMVpP9ffUNCAbiPE+ne
R9mta0xO+n3Qikz7q2U4
=DdXk
-----END PGP SIGNATURE-----

------enig2CASTGUDNGQECKRDDTUXL--

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 15:58:25 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BB116646;
 Fri, 14 Jun 2013 15:58:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AD45817E6;
 Fri, 14 Jun 2013 15:58:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EFwPFM076792;
 Fri, 14 Jun 2013 15:58:25 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EFwPdp076791;
 Fri, 14 Jun 2013 15:58:25 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306141558.r5EFwPdp076791@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 15:58:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251747 - stable/9/etc/mtree
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 15:58:25 -0000

Author: jhb
Date: Fri Jun 14 15:58:24 2013
New Revision: 251747
URL: http://svnweb.freebsd.org/changeset/base/251747

Log:
  Merge a missing part of 235613 to add the new dirs to mtree.

Modified:
  stable/9/etc/mtree/BSD.usr.dist
Directory Properties:
  stable/9/etc/mtree/   (props changed)

Modified: stable/9/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/9/etc/mtree/BSD.usr.dist	Fri Jun 14 10:45:31 2013	(r251746)
+++ stable/9/etc/mtree/BSD.usr.dist	Fri Jun 14 15:58:24 2013	(r251747)
@@ -200,6 +200,10 @@
                 ..
             ..
         ..
+        dtrace
+            toolkit
+            ..
+        ..  
         examples
             BSD_daemon
             ..

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 16:24:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0ED47938;
 Fri, 14 Jun 2013 16:24:08 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 00FBC19BF;
 Fri, 14 Jun 2013 16:24:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EGO7K4086153;
 Fri, 14 Jun 2013 16:24:07 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EGO74W086152;
 Fri, 14 Jun 2013 16:24:07 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201306141624.r5EGO74W086152@svn.freebsd.org>
From: "Simon J. Gerraty" 
Date: Fri, 14 Jun 2013 16:24:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251748 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 16:24:08 -0000

Author: sjg
Date: Fri Jun 14 16:24:07 2013
New Revision: 251748
URL: http://svnweb.freebsd.org/changeset/base/251748

Log:
  We cannot remove the _+_ trick, until old make is completely deprecated.
  But we don't want to set it to + for bmake since it breaks make -N
  which is used to supress the normal handling of targets marked with .MAKE
  (which seems broken in fmake and might be why _+_ was introduced).
  Add some comments to explain what's gong on.
  
  Reviewed by:	obrien

Modified:
  head/share/mk/sys.mk

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Fri Jun 14 15:58:24 2013	(r251747)
+++ head/share/mk/sys.mk	Fri Jun 14 16:24:07 2013	(r251748)
@@ -95,7 +95,13 @@ ECHODIR		?=	true
 .endif
 .endif
 
-.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
+.if defined(.PARSEDIR)
+# _+_ appears to be a workaround for the special src .MAKE not working.
+# setting it to + interferes with -N
+_+_		?=
+.elif !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
+# the check above matches only a single -n, so -n -n will result
+# in _+_ = +
 _+_		?=
 .else
 _+_		?=	+

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 16:25:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C7E79AC3;
 Fri, 14 Jun 2013 16:25:41 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BA58119CF;
 Fri, 14 Jun 2013 16:25:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EGPfbP086409;
 Fri, 14 Jun 2013 16:25:41 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EGPfdC086408;
 Fri, 14 Jun 2013 16:25:41 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201306141625.r5EGPfdC086408@svn.freebsd.org>
From: "Simon J. Gerraty" 
Date: Fri, 14 Jun 2013 16:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251749 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 16:25:41 -0000

Author: sjg
Date: Fri Jun 14 16:25:41 2013
New Revision: 251749
URL: http://svnweb.freebsd.org/changeset/base/251749

Log:
  Flag recursive make targets with .MAKE (has no effect on fmake)
  make -n will still exectute such targets
  make -N will not.
  
  Reviewed by:	obrien

Modified:
  head/share/mk/bsd.subdir.mk

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Fri Jun 14 16:24:07 2013	(r251748)
+++ head/share/mk/bsd.subdir.mk	Fri Jun 14 16:25:41 2013	(r251749)
@@ -36,14 +36,14 @@ ____:
 
 DISTRIBUTION?=	base
 .if !target(distribute)
-distribute:
+distribute: .MAKE
 .for dist in ${DISTRIBUTION}
 	${_+_}cd ${.CURDIR}; \
 	    ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
 .endfor
 .endif
 
-_SUBDIR: .USE
+_SUBDIR: .USE .MAKE
 .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
 	@${_+_}set -e; for entry in ${SUBDIR}; do \
 		if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
@@ -60,7 +60,7 @@ _SUBDIR: .USE
 	done
 .endif
 
-${SUBDIR}: .PHONY
+${SUBDIR}: .PHONY .MAKE
 	${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
 		cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
 	else \
@@ -81,7 +81,7 @@ ${__stage}${__target}:
 ${__stage}${__target}: _SUBDIR
 .endif
 .endfor
-${__target}:
+${__target}: .MAKE
 	${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target}
 .endfor
 

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 16:30:12 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F994D59;
 Fri, 14 Jun 2013 16:30:12 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 01BCA19F2;
 Fri, 14 Jun 2013 16:30:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EGUBq6087261;
 Fri, 14 Jun 2013 16:30:11 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EGUBmL087259;
 Fri, 14 Jun 2013 16:30:11 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201306141630.r5EGUBmL087259@svn.freebsd.org>
From: "Simon J. Gerraty" 
Date: Fri, 14 Jun 2013 16:30:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251750 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 16:30:12 -0000

Author: sjg
Date: Fri Jun 14 16:30:11 2013
New Revision: 251750
URL: http://svnweb.freebsd.org/changeset/base/251750

Log:
  Flag recursive make targets with .MAKE
  so that job token pipe is passed to them.
  To avoid surprising anyone, only add .MAKE to ${TGTS} when -n
  has not been specified (at least for Makefile).
  
  Reviewed by:	obrien

Modified:
  head/Makefile
  head/Makefile.inc1

Modified: head/Makefile
==============================================================================
--- head/Makefile	Fri Jun 14 16:25:41 2013	(r251749)
+++ head/Makefile	Fri Jun 14 16:30:11 2013	(r251750)
@@ -209,6 +209,12 @@ cleanworld:
 # Handle the user-driven targets, using the source relative mk files.
 #
 
+.if empty(.MAKEFLAGS:M-n)
+# skip this for -n to avoid changing previous behavior of 
+# 'make -n buildworld' etc.
+${TGTS}: .MAKE
+.endif
+
 ${TGTS}:
 	${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
 

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 14 16:25:41 2013	(r251749)
+++ head/Makefile.inc1	Fri Jun 14 16:30:11 2013	(r251750)
@@ -1890,3 +1890,5 @@ _xi-links:
 xdev xdev-build xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
+
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 17:00:59 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2F9D59E3;
 Fri, 14 Jun 2013 17:00:59 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 114E41BFF;
 Fri, 14 Jun 2013 17:00:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EH0xIn098196;
 Fri, 14 Jun 2013 17:00:59 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EH0wZt098192;
 Fri, 14 Jun 2013 17:00:58 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201306141700.r5EH0wZt098192@svn.freebsd.org>
From: "Justin T. Gibbs" 
Date: Fri, 14 Jun 2013 17:00:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251751 - head/sys/dev/xen/blkfront
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 17:00:59 -0000

Author: gibbs
Date: Fri Jun 14 17:00:58 2013
New Revision: 251751
URL: http://svnweb.freebsd.org/changeset/base/251751

Log:
  Improve debugger visibility into queuing functions by removing the macro
  scheme for defining inline command queuing functions.
  
  Prefer enums to #defines.
  
  sys/dev/xen/blkfront/block.h
  	Replace inline function generation performed by the
  	XBDQ_COMMAND_QUEUE() macro with single instances of each
  	inline function (init, enqueue, dequeue, remove).  This was
  	made possible by using queue indexes instead of bit flags
  	in the command structure, and passing the index enum as
  	an argument to the functions.
  
  	Improve panic/assert messages in the queue functions.
  
  	Combine queue data and stats into a single data structure
  	and declare an array of them instead of each queue individually.
  
  	Convert command flags, softc state, and softc flags to enums.
  
  sys/dev/xen/blkfront/blkfront.c
  	Mechanical adjustments for new queue api.
  
  Sponsored by:	Spectra Logic Corporation
  MFC after:	1 week

Modified:
  head/sys/dev/xen/blkfront/blkfront.c
  head/sys/dev/xen/blkfront/block.h

Modified: head/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- head/sys/dev/xen/blkfront/blkfront.c	Fri Jun 14 16:30:11 2013	(r251750)
+++ head/sys/dev/xen/blkfront/blkfront.c	Fri Jun 14 17:00:58 2013	(r251751)
@@ -83,10 +83,6 @@ static void xbd_startio(struct xbd_softc
 
 #define XBD_SECTOR_SHFT		9
 
-#define XBD_STATE_DISCONNECTED 0
-#define XBD_STATE_CONNECTED    1
-#define XBD_STATE_SUSPENDED    2
-
 /*---------------------------- Global Static Data ----------------------------*/
 static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
 
@@ -106,13 +102,14 @@ static void
 xbd_free_command(struct xbd_command *cm)
 {
 
-	KASSERT((cm->cm_flags & XBD_ON_XBDQ_MASK) == 0,
-	    ("Freeing command that is still on a queue\n"));
+	KASSERT((cm->cm_flags & XBDCF_Q_MASK) == XBD_Q_NONE,
+	    ("Freeing command that is still on queue %d.",
+	    cm->cm_flags & XBDCF_Q_MASK));
 
-	cm->cm_flags = 0;
+	cm->cm_flags = XBDCF_INITIALIZER;
 	cm->cm_bp = NULL;
 	cm->cm_complete = NULL;
-	xbd_enqueue_free(cm);
+	xbd_enqueue_cm(cm, XBD_Q_FREE);
 }
 
 static void
@@ -212,13 +209,13 @@ xbd_queue_cb(void *arg, bus_dma_segment_
 
 	gnttab_free_grant_references(cm->cm_gref_head);
 
-	xbd_enqueue_busy(cm);
+	xbd_enqueue_cm(cm, XBD_Q_BUSY);
 
 	/*
 	 * This flag means that we're probably executing in the busdma swi
 	 * instead of in the startio context, so an explicit flush is needed.
 	 */
-	if (cm->cm_flags & XBD_CMD_FROZEN)
+	if (cm->cm_flags & XBDCF_FROZEN)
 		xbd_flush_requests(sc);
 
 	return;
@@ -233,8 +230,8 @@ xbd_queue_request(struct xbd_softc *sc, 
 	    cm->cm_datalen, xbd_queue_cb, cm, 0);
 	if (error == EINPROGRESS) {
 		printf("EINPROGRESS\n");
-		sc->xbd_flags |= XBD_FROZEN;
-		cm->cm_flags |= XBD_CMD_FROZEN;
+		sc->xbd_flags |= XBDF_FROZEN;
+		cm->cm_flags |= XBDCF_FROZEN;
 		return (0);
 	}
 
@@ -259,14 +256,14 @@ xbd_bio_command(struct xbd_softc *sc)
 	struct xbd_command *cm;
 	struct bio *bp;
 
-	if (unlikely(sc->xbd_connected != XBD_STATE_CONNECTED))
+	if (unlikely(sc->xbd_state != XBD_STATE_CONNECTED))
 		return (NULL);
 
 	bp = xbd_dequeue_bio(sc);
 	if (bp == NULL)
 		return (NULL);
 
-	if ((cm = xbd_dequeue_free(sc)) == NULL) {
+	if ((cm = xbd_dequeue_cm(sc, XBD_Q_FREE)) == NULL) {
 		xbd_requeue_bio(sc, bp);
 		return (NULL);
 	}
@@ -277,8 +274,8 @@ xbd_bio_command(struct xbd_softc *sc)
 		    xbd_restart_queue_callback, sc,
 		    sc->xbd_max_request_segments);
 		xbd_requeue_bio(sc, bp);
-		xbd_enqueue_free(cm);
-		sc->xbd_flags |= XBD_FROZEN;
+		xbd_enqueue_cm(cm, XBD_Q_FREE);
+		sc->xbd_flags |= XBDF_FROZEN;
 		return (NULL);
 	}
 
@@ -307,15 +304,15 @@ xbd_startio(struct xbd_softc *sc)
 
 	mtx_assert(&sc->xbd_io_lock, MA_OWNED);
 
-	if (sc->xbd_connected != XBD_STATE_CONNECTED)
+	if (sc->xbd_state != XBD_STATE_CONNECTED)
 		return;
 
 	while (RING_FREE_REQUESTS(&sc->xbd_ring) >=
 	    sc->xbd_max_request_blocks) {
-		if (sc->xbd_flags & XBD_FROZEN)
+		if (sc->xbd_flags & XBDF_FROZEN)
 			break;
 
-		cm = xbd_dequeue_ready(sc);
+		cm = xbd_dequeue_cm(sc, XBD_Q_READY);
 
 		if (cm == NULL)
 		    cm = xbd_bio_command(sc);
@@ -374,7 +371,7 @@ xbd_int(void *xsc)
 
 	mtx_lock(&sc->xbd_io_lock);
 
-	if (unlikely(sc->xbd_connected == XBD_STATE_DISCONNECTED)) {
+	if (unlikely(sc->xbd_state == XBD_STATE_DISCONNECTED)) {
 		mtx_unlock(&sc->xbd_io_lock);
 		return;
 	}
@@ -387,7 +384,7 @@ xbd_int(void *xsc)
 		bret = RING_GET_RESPONSE(&sc->xbd_ring, i);
 		cm   = &sc->xbd_shadow[bret->id];
 
-		xbd_remove_busy(cm);
+		xbd_remove_cm(cm, XBD_Q_BUSY);
 		i += xbd_completion(cm);
 
 		if (cm->cm_operation == BLKIF_OP_READ)
@@ -404,7 +401,7 @@ xbd_int(void *xsc)
 		 * being freed as well.  It's a cheap assumption even when
 		 * wrong.
 		 */
-		sc->xbd_flags &= ~XBD_FROZEN;
+		sc->xbd_flags &= ~XBDF_FROZEN;
 
 		/*
 		 * Directly call the i/o complete routine to save an
@@ -432,8 +429,8 @@ xbd_int(void *xsc)
 
 	xbd_startio(sc);
 
-	if (unlikely(sc->xbd_connected == XBD_STATE_SUSPENDED))
-		wakeup(&sc->xbd_cm_busy);
+	if (unlikely(sc->xbd_state == XBD_STATE_SUSPENDED))
+		wakeup(&sc->xbd_cm_q[XBD_Q_BUSY]);
 
 	mtx_unlock(&sc->xbd_io_lock);
 }
@@ -448,13 +445,13 @@ xbd_quiesce(struct xbd_softc *sc)
 	int mtd;
 
 	// While there are outstanding requests
-	while (!TAILQ_EMPTY(&sc->xbd_cm_busy)) {
+	while (!TAILQ_EMPTY(&sc->xbd_cm_q[XBD_Q_BUSY].q_tailq)) {
 		RING_FINAL_CHECK_FOR_RESPONSES(&sc->xbd_ring, mtd);
 		if (mtd) {
 			/* Recieved request completions, update queue. */
 			xbd_int(sc);
 		}
-		if (!TAILQ_EMPTY(&sc->xbd_cm_busy)) {
+		if (!TAILQ_EMPTY(&sc->xbd_cm_q[XBD_Q_BUSY].q_tailq)) {
 			/*
 			 * Still pending requests, wait for the disk i/o
 			 * to complete.
@@ -469,7 +466,7 @@ static void
 xbd_dump_complete(struct xbd_command *cm)
 {
 
-	xbd_enqueue_complete(cm);
+	xbd_enqueue_cm(cm, XBD_Q_COMPLETE);
 }
 
 static int
@@ -496,7 +493,7 @@ xbd_dump(void *arg, void *virtual, vm_of
 
 	/* Split the 64KB block as needed */
 	for (sbp=0; length > 0; sbp++) {
-		cm = xbd_dequeue_free(sc);
+		cm = xbd_dequeue_cm(sc, XBD_Q_FREE);
 		if (cm == NULL) {
 			mtx_unlock(&sc->xbd_io_lock);
 			device_printf(sc->xbd_dev, "dump: no more commands?\n");
@@ -519,7 +516,7 @@ xbd_dump(void *arg, void *virtual, vm_of
 		cm->cm_sector_number = offset / dp->d_sectorsize;
 		cm->cm_complete = xbd_dump_complete;
 
-		xbd_enqueue_ready(cm);
+		xbd_enqueue_cm(cm, XBD_Q_READY);
 
 		length -= chunk;
 		offset += chunk;
@@ -534,7 +531,7 @@ xbd_dump(void *arg, void *virtual, vm_of
 	xbd_quiesce(sc);	/* All quite on the eastern front */
 
 	/* If there were any errors, bail out... */
-	while ((cm = xbd_dequeue_complete(sc)) != NULL) {
+	while ((cm = xbd_dequeue_cm(sc, XBD_Q_COMPLETE)) != NULL) {
 		if (cm->cm_status != BLKIF_RSP_OKAY) {
 			device_printf(sc->xbd_dev,
 			    "Dump I/O failed at sector %jd\n",
@@ -558,7 +555,7 @@ xbd_open(struct disk *dp)
 		return (ENXIO);
 	}
 
-	sc->xbd_flags |= XBD_OPEN;
+	sc->xbd_flags |= XBDF_OPEN;
 	sc->xbd_users++;
 	return (0);
 }
@@ -570,7 +567,7 @@ xbd_close(struct disk *dp)
 
 	if (sc == NULL)
 		return (ENXIO);
-	sc->xbd_flags &= ~XBD_OPEN;
+	sc->xbd_flags &= ~XBDF_OPEN;
 	if (--(sc->xbd_users) == 0) {
 		/*
 		 * Check whether we have been instructed to close.  We will
@@ -855,7 +852,7 @@ xbd_free(struct xbd_softc *sc)
 	
 	/* Prevent new requests being issued until we fix things up. */
 	mtx_lock(&sc->xbd_io_lock);
-	sc->xbd_connected = XBD_STATE_DISCONNECTED; 
+	sc->xbd_state = XBD_STATE_DISCONNECTED; 
 	mtx_unlock(&sc->xbd_io_lock);
 
 	/* Free resources associated with old device channel. */
@@ -878,9 +875,9 @@ xbd_free(struct xbd_softc *sc)
 
 		bus_dma_tag_destroy(sc->xbd_io_dmat);
 		
-		xbd_initq_free(sc);
-		xbd_initq_ready(sc);
-		xbd_initq_complete(sc);
+		xbd_initq_cm(sc, XBD_Q_FREE);
+		xbd_initq_cm(sc, XBD_Q_READY);
+		xbd_initq_cm(sc, XBD_Q_COMPLETE);
 	}
 		
 	if (sc->xbd_irq) {
@@ -1054,6 +1051,7 @@ xbd_initialize(struct xbd_softc *sc)
 		if (cm->cm_sg_refs == NULL)
 			break;
 		cm->cm_id = i;
+		cm->cm_flags = XBDCF_INITIALIZER;
 		cm->cm_sc = sc;
 		if (bus_dmamap_create(sc->xbd_io_dmat, 0, &cm->cm_map) != 0)
 			break;
@@ -1149,8 +1147,8 @@ xbd_connect(struct xbd_softc *sc)
 	unsigned int binfo;
 	int err, feature_barrier;
 
-	if ((sc->xbd_connected == XBD_STATE_CONNECTED) || 
-	    (sc->xbd_connected == XBD_STATE_SUSPENDED))
+	if (sc->xbd_state == XBD_STATE_CONNECTED || 
+	    sc->xbd_state == XBD_STATE_SUSPENDED)
 		return;
 
 	DPRINTK("blkfront.c:connect:%s.\n", xenbus_get_otherend_path(dev));
@@ -1170,7 +1168,7 @@ xbd_connect(struct xbd_softc *sc)
 	     "feature-barrier", "%lu", &feature_barrier,
 	     NULL);
 	if (!err || feature_barrier)
-		sc->xbd_flags |= XBD_BARRIER;
+		sc->xbd_flags |= XBDF_BARRIER;
 
 	if (sc->xbd_disk == NULL) {
 		device_printf(dev, "%juMB <%s> at %s",
@@ -1187,9 +1185,9 @@ xbd_connect(struct xbd_softc *sc)
 
 	/* Kick pending requests. */
 	mtx_lock(&sc->xbd_io_lock);
-	sc->xbd_connected = XBD_STATE_CONNECTED;
+	sc->xbd_state = XBD_STATE_CONNECTED;
 	xbd_startio(sc);
-	sc->xbd_flags |= XBD_READY;
+	sc->xbd_flags |= XBDF_READY;
 	mtx_unlock(&sc->xbd_io_lock);
 }
 
@@ -1260,17 +1258,13 @@ xbd_attach(device_t dev)
 
 	sc = device_get_softc(dev);
 	mtx_init(&sc->xbd_io_lock, "blkfront i/o lock", NULL, MTX_DEF);
-	xbd_initq_free(sc);
-	xbd_initq_busy(sc);
-	xbd_initq_ready(sc);
-	xbd_initq_complete(sc);
-	xbd_initq_bio(sc);
+	xbd_initqs(sc);
 	for (i = 0; i < XBD_MAX_RING_PAGES; i++)
 		sc->xbd_ring_ref[i] = GRANT_REF_INVALID;
 
 	sc->xbd_dev = dev;
 	sc->xbd_vdevice = vdevice;
-	sc->xbd_connected = XBD_STATE_DISCONNECTED;
+	sc->xbd_state = XBD_STATE_DISCONNECTED;
 
 	xbd_setup_sysctl(sc);
 
@@ -1285,7 +1279,7 @@ xbd_detach(device_t dev)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 
-	DPRINTK("xbd_remove: %s removed\n", xenbus_get_node(dev));
+	DPRINTK("%s: %s removed\n", __func__, xenbus_get_node(dev));
 
 	xbd_free(sc);
 	mtx_destroy(&sc->xbd_io_lock);
@@ -1302,13 +1296,13 @@ xbd_suspend(device_t dev)
 
 	/* Prevent new requests being issued until we fix things up. */
 	mtx_lock(&sc->xbd_io_lock);
-	saved_state = sc->xbd_connected;
-	sc->xbd_connected = XBD_STATE_SUSPENDED;
+	saved_state = sc->xbd_state;
+	sc->xbd_state = XBD_STATE_SUSPENDED;
 
 	/* Wait for outstanding I/O to drain. */
 	retval = 0;
-	while (TAILQ_EMPTY(&sc->xbd_cm_busy) == 0) {
-		if (msleep(&sc->xbd_cm_busy, &sc->xbd_io_lock,
+	while (TAILQ_EMPTY(&sc->xbd_cm_q[XBD_Q_BUSY].q_tailq) == 0) {
+		if (msleep(&sc->xbd_cm_q[XBD_Q_BUSY], &sc->xbd_io_lock,
 		    PRIBIO, "blkf_susp", 30 * hz) == EWOULDBLOCK) {
 			retval = EBUSY;
 			break;
@@ -1317,7 +1311,7 @@ xbd_suspend(device_t dev)
 	mtx_unlock(&sc->xbd_io_lock);
 
 	if (retval != 0)
-		sc->xbd_connected = saved_state;
+		sc->xbd_state = saved_state;
 
 	return (retval);
 }

Modified: head/sys/dev/xen/blkfront/block.h
==============================================================================
--- head/sys/dev/xen/blkfront/block.h	Fri Jun 14 16:30:11 2013	(r251750)
+++ head/sys/dev/xen/blkfront/block.h	Fri Jun 14 17:00:58 2013	(r251751)
@@ -30,7 +30,6 @@
  * $FreeBSD$
  */
 
-
 #ifndef __XEN_BLKFRONT_BLOCK_H__
 #define __XEN_BLKFRONT_BLOCK_H__
 #include 
@@ -93,20 +92,20 @@
 	BLKIF_RING_PAGES(BLKIF_SEGS_TO_BLOCKS(XBD_MAX_SEGMENTS_PER_REQUEST) \
 		       * XBD_MAX_REQUESTS)
 
+typedef enum {
+	XBDCF_Q_MASK		= 0xFF,
+	XBDCF_FROZEN		= 1<<8,
+	XBDCF_POLLED		= 1<<9,
+	XBDCF_INITIALIZER	= XBDCF_Q_MASK
+} xbdc_flag_t;
+
 struct xbd_command;
 typedef void xbd_cbcf_t(struct xbd_command *);
 
 struct xbd_command {
 	TAILQ_ENTRY(xbd_command) cm_link;
 	struct xbd_softc	*cm_sc;
-	u_int			 cm_flags;
-#define XBD_CMD_FROZEN		(1<<0)
-#define XBD_CMD_POLLED		(1<<1)
-#define XBD_ON_XBDQ_FREE	(1<<2)
-#define XBD_ON_XBDQ_READY	(1<<3)
-#define XBD_ON_XBDQ_BUSY	(1<<4)
-#define XBD_ON_XBDQ_COMPLETE	(1<<5)
-#define XBD_ON_XBDQ_MASK	((1<<2)|(1<<3)|(1<<4)|(1<<5))
+	xbdc_flag_t		 cm_flags;
 	bus_dmamap_t		 cm_map;
 	uint64_t		 cm_id;
 	grant_ref_t		*cm_sg_refs;
@@ -121,22 +120,34 @@ struct xbd_command {
 	xbd_cbcf_t		*cm_complete;
 };
 
-#define XBDQ_FREE	0
-#define XBDQ_BIO	1
-#define XBDQ_READY	2
-#define XBDQ_BUSY	3
-#define XBDQ_COMPLETE	4
-#define XBDQ_COUNT	5
-
-struct xbd_qstat {
-	uint32_t	q_length;
-	uint32_t	q_max;
-};
-
-union xbd_statrequest {
-	uint32_t		ms_item;
-	struct xbd_qstat	ms_qstat;
-};
+typedef enum {
+	XBD_Q_FREE,
+	XBD_Q_READY,
+	XBD_Q_BUSY,
+	XBD_Q_COMPLETE,
+	XBD_Q_BIO,
+	XBD_Q_COUNT,
+	XBD_Q_NONE = XBDCF_Q_MASK
+} xbd_q_index_t;
+
+typedef struct xbd_cm_q {
+	TAILQ_HEAD(, xbd_command) q_tailq;
+	uint32_t		  q_length;
+	uint32_t		  q_max;
+} xbd_cm_q_t;
+
+typedef enum {
+	XBD_STATE_DISCONNECTED,
+	XBD_STATE_CONNECTED,
+	XBD_STATE_SUSPENDED
+} xbd_state_t;
+
+typedef enum {
+	XBDF_OPEN	= 1 << 0,	/* drive is open (can't shut down) */
+	XBDF_BARRIER	= 1 << 1,	/* backend supports barriers */
+	XBDF_READY	= 1 << 2,	/* Is ready */
+	XBDF_FROZEN	= 1 << 3	/* Waiting for resources */
+} xbd_flag_t;
 
 /*
  * We have one of these per vbd, whether ide, scsi or 'other'.
@@ -146,13 +157,9 @@ struct xbd_softc {
 	struct disk			*xbd_disk;	/* disk params */
 	struct bio_queue_head 		 xbd_bioq;	/* sort queue */
 	int				 xbd_unit;
-	int				 xbd_flags;
-#define XBD_OPEN	(1<<0)		/* drive is open (can't shut down) */
-#define XBD_BARRIER	(1 << 1)	/* backend supports barriers */
-#define XBD_READY	(1 << 2)	/* Is ready */
-#define XBD_FROZEN	(1 << 3)	/* Waiting for resources */
+	xbd_flag_t			 xbd_flags;
 	int				 xbd_vdevice;
-	int				 xbd_connected;
+	xbd_state_t			 xbd_state;
 	u_int				 xbd_ring_pages;
 	uint32_t			 xbd_max_requests;
 	uint32_t			 xbd_max_request_segments;
@@ -162,11 +169,7 @@ struct xbd_softc {
 	blkif_front_ring_t		 xbd_ring;
 	unsigned int			 xbd_irq;
 	struct gnttab_free_callback	 xbd_callback;
-	TAILQ_HEAD(,xbd_command)	 xbd_cm_free;
-	TAILQ_HEAD(,xbd_command)	 xbd_cm_ready;
-	TAILQ_HEAD(,xbd_command)	 xbd_cm_busy;
-	TAILQ_HEAD(,xbd_command)	 xbd_cm_complete;
-	struct xbd_qstat		 xbd_qstat[XBDQ_COUNT];
+	xbd_cm_q_t			 xbd_cm_q[XBD_Q_COUNT];
 	bus_dma_tag_t			 xbd_io_dmat;
 
 	/**
@@ -182,113 +185,124 @@ struct xbd_softc {
 int xbd_instance_create(struct xbd_softc *, blkif_sector_t sectors, int device,
 			uint16_t vdisk_info, unsigned long sector_size);
 
-#define XBDQ_ADD(sc, qname)					\
-	do {							\
-		struct xbd_qstat *qs;				\
-								\
-		qs = &(sc)->xbd_qstat[qname];			\
-		qs->q_length++;					\
-		if (qs->q_length > qs->q_max)			\
-			qs->q_max = qs->q_length;		\
-	} while (0)
-
-#define XBDQ_REMOVE(sc, qname)	(sc)->xbd_qstat[qname].q_length--
-
-#define XBDQ_INIT(sc, qname)					\
-	do {							\
-		sc->xbd_qstat[qname].q_length = 0;		\
-		sc->xbd_qstat[qname].q_max = 0;			\
-	} while (0)
-
-#define XBDQ_COMMAND_QUEUE(name, index)					\
-	static __inline void						\
-	xbd_initq_ ## name (struct xbd_softc *sc)			\
-	{								\
-		TAILQ_INIT(&sc->xbd_cm_ ## name);			\
-		XBDQ_INIT(sc, index);					\
-	}								\
-	static __inline void						\
-	xbd_enqueue_ ## name (struct xbd_command *cm)			\
-	{								\
-		if ((cm->cm_flags & XBD_ON_XBDQ_MASK) != 0) {		\
-			printf("command %p is on another queue, "	\
-			    "flags = %#x\n", cm, cm->cm_flags);		\
-			panic("command is on another queue");		\
-		}							\
-		TAILQ_INSERT_TAIL(&cm->cm_sc->xbd_cm_ ## name, cm, cm_link); \
-		cm->cm_flags |= XBD_ON_ ## index;			\
-		XBDQ_ADD(cm->cm_sc, index);				\
-	}								\
-	static __inline void						\
-	xbd_requeue_ ## name (struct xbd_command *cm)			\
-	{								\
-		if ((cm->cm_flags & XBD_ON_XBDQ_MASK) != 0) {		\
-			printf("command %p is on another queue, "	\
-			    "flags = %#x\n", cm, cm->cm_flags);		\
-			panic("command is on another queue");		\
-		}							\
-		TAILQ_INSERT_HEAD(&cm->cm_sc->xbd_cm_ ## name, cm, cm_link); \
-		cm->cm_flags |= XBD_ON_ ## index;			\
-		XBDQ_ADD(cm->cm_sc, index);				\
-	}								\
-	static __inline struct xbd_command *				\
-	xbd_dequeue_ ## name (struct xbd_softc *sc)			\
-	{								\
-		struct xbd_command *cm;					\
-									\
-		if ((cm = TAILQ_FIRST(&sc->xbd_cm_ ## name)) != NULL) {	\
-			if ((cm->cm_flags & XBD_ON_XBDQ_MASK) !=		\
-			     XBD_ON_ ## index) {				\
-				printf("command %p not in queue, "	\
-				    "flags = %#x, bit = %#x\n", cm,	\
-				    cm->cm_flags, XBD_ON_ ## index);	\
-				panic("command not in queue");		\
-			}						\
-			TAILQ_REMOVE(&sc->xbd_cm_ ## name, cm, cm_link);\
-			cm->cm_flags &= ~XBD_ON_ ## index;		\
-			XBDQ_REMOVE(sc, index);				\
-		}							\
-		return (cm);						\
-	}								\
-	static __inline void						\
-	xbd_remove_ ## name (struct xbd_command *cm)			\
-	{								\
-		if ((cm->cm_flags & XBD_ON_XBDQ_MASK) != XBD_ON_ ## index){\
-			printf("command %p not in queue, flags = %#x, " \
-			    "bit = %#x\n", cm, cm->cm_flags,		\
-			    XBD_ON_ ## index);				\
-			panic("command not in queue");			\
-		}							\
-		TAILQ_REMOVE(&cm->cm_sc->xbd_cm_ ## name, cm, cm_link);	\
-		cm->cm_flags &= ~XBD_ON_ ## index;			\
-		XBDQ_REMOVE(cm->cm_sc, index);				\
-	}								\
-struct hack
-
-XBDQ_COMMAND_QUEUE(free, XBDQ_FREE);
-XBDQ_COMMAND_QUEUE(ready, XBDQ_READY);
-XBDQ_COMMAND_QUEUE(busy, XBDQ_BUSY);
-XBDQ_COMMAND_QUEUE(complete, XBDQ_COMPLETE);
+static inline void
+xbd_added_qentry(struct xbd_softc *sc, xbd_q_index_t index)
+{
+	struct xbd_cm_q *cmq;
+
+	cmq = &sc->xbd_cm_q[index];
+	cmq->q_length++;
+	if (cmq->q_length > cmq->q_max)
+		cmq->q_max = cmq->q_length;
+}
+
+static inline void
+xbd_removed_qentry(struct xbd_softc *sc, xbd_q_index_t index)
+{
+	sc->xbd_cm_q[index].q_length--;
+}
+
+static inline void
+xbd_initq_cm(struct xbd_softc *sc, xbd_q_index_t index)
+{
+	struct xbd_cm_q *cmq;
+
+	cmq = &sc->xbd_cm_q[index];
+	TAILQ_INIT(&cmq->q_tailq);
+	cmq->q_length = 0;
+	cmq->q_max = 0;
+}
+
+static inline void
+xbd_enqueue_cm(struct xbd_command *cm, xbd_q_index_t index)
+{
+	KASSERT(index != XBD_Q_BIO,
+	    ("%s: Commands cannot access the bio queue.", __func__));
+	if ((cm->cm_flags & XBDCF_Q_MASK) != XBD_Q_NONE)
+		panic("%s: command %p is already on queue %d.",
+		    __func__, cm, cm->cm_flags & XBDCF_Q_MASK);
+	TAILQ_INSERT_TAIL(&cm->cm_sc->xbd_cm_q[index].q_tailq, cm, cm_link);
+	cm->cm_flags &= ~XBDCF_Q_MASK;
+	cm->cm_flags |= index;
+	xbd_added_qentry(cm->cm_sc, index);
+}
+
+static inline void
+xbd_requeue_cm(struct xbd_command *cm, xbd_q_index_t index)
+{
+	KASSERT(index != XBD_Q_BIO,
+	    ("%s: Commands cannot access the bio queue.", __func__));
+	if ((cm->cm_flags & XBDCF_Q_MASK) != XBD_Q_NONE)
+		panic("%s: command %p is already on queue %d.",
+		    __func__, cm, cm->cm_flags & XBDCF_Q_MASK);
+	TAILQ_INSERT_HEAD(&cm->cm_sc->xbd_cm_q[index].q_tailq, cm, cm_link);
+	cm->cm_flags &= ~XBDCF_Q_MASK;
+	cm->cm_flags |= index;
+	xbd_added_qentry(cm->cm_sc, index);
+}
+
+static inline struct xbd_command *
+xbd_dequeue_cm(struct xbd_softc *sc, xbd_q_index_t index)
+{
+	struct xbd_command *cm;
+
+	KASSERT(index != XBD_Q_BIO,
+	    ("%s: Commands cannot access the bio queue.", __func__));
+
+	if ((cm = TAILQ_FIRST(&sc->xbd_cm_q[index].q_tailq)) != NULL) {
+		if ((cm->cm_flags & XBDCF_Q_MASK) != index) {
+			panic("%s: command %p is on queue %d, "
+			    "not specified queue %d",
+			    __func__, cm,
+			    cm->cm_flags & XBDCF_Q_MASK,
+			    index);
+		}
+		TAILQ_REMOVE(&sc->xbd_cm_q[index].q_tailq, cm, cm_link);
+		cm->cm_flags &= ~XBDCF_Q_MASK;
+		cm->cm_flags |= XBD_Q_NONE;
+		xbd_removed_qentry(cm->cm_sc, index);
+	}
+	return (cm);
+}
+
+static inline void
+xbd_remove_cm(struct xbd_command *cm, xbd_q_index_t expected_index)
+{
+	xbd_q_index_t index;
+
+	index = cm->cm_flags & XBDCF_Q_MASK;
+
+	KASSERT(index != XBD_Q_BIO,
+	    ("%s: Commands cannot access the bio queue.", __func__));
+
+	if (index != expected_index) {
+		panic("%s: command %p is on queue %d, not specified queue %d",
+		    __func__, cm, index, expected_index);
+	}
+	TAILQ_REMOVE(&cm->cm_sc->xbd_cm_q[index].q_tailq, cm, cm_link);
+	cm->cm_flags &= ~XBDCF_Q_MASK;
+	cm->cm_flags |= XBD_Q_NONE;
+	xbd_removed_qentry(cm->cm_sc, index);
+}
 
 static __inline void
 xbd_initq_bio(struct xbd_softc *sc)
 {
 	bioq_init(&sc->xbd_bioq);
-	XBDQ_INIT(sc, XBDQ_BIO);
 }
 
 static __inline void
 xbd_enqueue_bio(struct xbd_softc *sc, struct bio *bp)
 {
 	bioq_insert_tail(&sc->xbd_bioq, bp);
-	XBDQ_ADD(sc, XBDQ_BIO);
+	xbd_added_qentry(sc, XBD_Q_BIO);
 }
 
 static __inline void
 xbd_requeue_bio(struct xbd_softc *sc, struct bio *bp)
 {
 	bioq_insert_head(&sc->xbd_bioq, bp);
-	XBDQ_ADD(sc, XBDQ_BIO);
+	xbd_added_qentry(sc, XBD_Q_BIO);
 }
 
 static __inline struct bio *
@@ -298,9 +312,20 @@ xbd_dequeue_bio(struct xbd_softc *sc)
 
 	if ((bp = bioq_first(&sc->xbd_bioq)) != NULL) {
 		bioq_remove(&sc->xbd_bioq, bp);
-		XBDQ_REMOVE(sc, XBDQ_BIO);
+		xbd_removed_qentry(sc, XBD_Q_BIO);
 	}
 	return (bp);
 }
 
+static inline void
+xbd_initqs(struct xbd_softc *sc)
+{
+	u_int index;
+
+	for (index = 0; index < XBD_Q_COUNT; index++)
+		xbd_initq_cm(sc, index);
+
+	xbd_initq_bio(sc);
+}
+
 #endif /* __XEN_BLKFRONT_BLOCK_H__ */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 18:11:21 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EF148E20;
 Fri, 14 Jun 2013 18:11:21 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E0F0410A6;
 Fri, 14 Jun 2013 18:11:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EIBLjD020523;
 Fri, 14 Jun 2013 18:11:21 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EIBLUh020522;
 Fri, 14 Jun 2013 18:11:21 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306141811.r5EIBLUh020522@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 14 Jun 2013 18:11:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251752 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 18:11:22 -0000

Author: lstewart
Date: Fri Jun 14 18:11:21 2013
New Revision: 251752
URL: http://svnweb.freebsd.org/changeset/base/251752

Log:
  Fix a major oversight in r251732 which causes non-VIMAGE kernels to trigger a
  KASSERT during TCP hhook registration at boot. Virtualised hook points only
  require extra housekeeping and sanity checking when "options VIMAGE" is present.
  
  Reported by:	bdrewery,jh,dhw
  Tested by:	dhw
  MFC after:	1 week
  X-MFC with:	251732

Modified:
  head/sys/kern/kern_hhook.c

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Fri Jun 14 17:00:58 2013	(r251751)
+++ head/sys/kern/kern_hhook.c	Fri Jun 14 18:11:21 2013	(r251752)
@@ -267,9 +267,11 @@ hhook_head_register(int32_t hhook_type, 
 	HHHLIST_LOCK();
 	if (flags & HHOOK_HEADISINVNET) {
 		tmphhh->hhh_flags |= HHH_ISINVNET;
+#ifdef VIMAGE
 		KASSERT(curvnet != NULL, ("curvnet is NULL"));
 		tmphhh->hhh_vid = (uintptr_t)curvnet;
 		LIST_INSERT_HEAD(&V_hhook_vhead_list, tmphhh, hhh_vnext);
+#endif
 	}
 	LIST_INSERT_HEAD(&hhook_head_list, tmphhh, hhh_next);
 	HHHLIST_UNLOCK();
@@ -285,8 +287,10 @@ hhook_head_destroy(struct hhook_head *hh
 	HHHLIST_LOCK_ASSERT();
 
 	LIST_REMOVE(hhh, hhh_next);
+#ifdef VIMAGE
 	if (hhook_head_is_virtualised(hhh) == HHOOK_HEADISINVNET)
 		LIST_REMOVE(hhh, hhh_vnext);
+#endif
 	HHH_WLOCK(hhh);
 	STAILQ_FOREACH_SAFE(tmp, &hhh->hhh_hooks, hhk_next, tmp2)
 		free(tmp, M_HHOOK);
@@ -347,12 +351,14 @@ hhook_head_get(int32_t hhook_type, int32
 	HHHLIST_LOCK();
 	LIST_FOREACH(hhh, &hhook_head_list, hhh_next) {
 		if (hhh->hhh_type == hhook_type && hhh->hhh_id == hhook_id) {
+#ifdef VIMAGE
 			if (hhook_head_is_virtualised(hhh) ==
 			    HHOOK_HEADISINVNET) {
 				KASSERT(curvnet != NULL, ("curvnet is NULL"));
 				if (hhh->hhh_vid != (uintptr_t)curvnet)
 					continue;
 			}
+#endif
 			refcount_acquire(&hhh->hhh_refcount);
 			break;
 		}

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 18:30:44 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F133363A;
 Fri, 14 Jun 2013 18:30:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8A2C117C;
 Fri, 14 Jun 2013 18:30:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EIUhQJ025394;
 Fri, 14 Jun 2013 18:30:43 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EIUhcw025390;
 Fri, 14 Jun 2013 18:30:43 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306141830.r5EIUhcw025390@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 18:30:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251754 - stable/9/sys/dev/acpica
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 18:30:44 -0000

Author: jhb
Date: Fri Jun 14 18:30:43 2013
New Revision: 251754
URL: http://svnweb.freebsd.org/changeset/base/251754

Log:
  MFC 249767:
  - Some BIOSes use an Extended IRQ resource descriptor in _PRS for a link
    that uses non-ISA IRQs but use a plain IRQ resource in _CRS.  However,
    a non-ISA IRQ can't fit into a plain IRQ resource.  If we encounter a
    link like this, build the resource buffer from _PRS instead of _CRS.
  - Set the correct size of the end tag in a resource buffer.

Modified:
  stable/9/sys/dev/acpica/acpi.c
  stable/9/sys/dev/acpica/acpi_pci_link.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/acpica/acpi.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi.c	Fri Jun 14 18:26:57 2013	(r251753)
+++ stable/9/sys/dev/acpica/acpi.c	Fri Jun 14 18:30:43 2013	(r251754)
@@ -2332,7 +2332,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *b
 	    return (AE_NO_MEMORY);
 	rp = (ACPI_RESOURCE *)buf->Pointer;
 	rp->Type = ACPI_RESOURCE_TYPE_END_TAG;
-	rp->Length = 0;
+	rp->Length = ACPI_RS_SIZE_MIN;
     }
     if (res == NULL)
 	return (AE_OK);
@@ -2382,7 +2382,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *b
     /* And add the terminator. */
     rp = ACPI_NEXT_RESOURCE(rp);
     rp->Type = ACPI_RESOURCE_TYPE_END_TAG;
-    rp->Length = 0;
+    rp->Length = ACPI_RS_SIZE_MIN;
 
     return (AE_OK);
 }

Modified: stable/9/sys/dev/acpica/acpi_pci_link.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_pci_link.c	Fri Jun 14 18:26:57 2013	(r251753)
+++ stable/9/sys/dev/acpica/acpi_pci_link.c	Fri Jun 14 18:30:43 2013	(r251754)
@@ -99,6 +99,7 @@ struct link {
 	uint8_t	l_bios_irq;
 	uint8_t	l_irq;
 	uint8_t	l_initial_irq;
+	UINT32	l_crs_type;
 	int	l_res_index;
 	int	l_num_irqs;
 	int	*l_irqs;
@@ -236,6 +237,7 @@ link_add_crs(ACPI_RESOURCE *res, void *c
 		    ("%s: array boundary violation", __func__));
 		link = &req->sc->pl_links[req->link_index];
 		link->l_res_index = req->res_index;
+		link->l_crs_type = res->Type;
 		req->link_index++;
 		req->res_index++;
 
@@ -364,6 +366,14 @@ link_add_prs(ACPI_RESOURCE *res, void *c
 					link->l_isa_irq = FALSE;
 			}
 		}
+
+		/*
+		 * If this is not an ISA IRQ but _CRS used a non-extended
+		 * IRQ descriptor, don't use _CRS as a template for _SRS.
+		 */
+		if (!req->sc->pl_crs_bad && !link->l_isa_irq &&
+		    link->l_crs_type == ACPI_RESOURCE_TYPE_IRQ)
+			req->sc->pl_crs_bad = TRUE;
 		break;
 	default:
 		if (req->in_dpf == DPF_IGNORE)

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 18:42:09 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C60E4913;
 Fri, 14 Jun 2013 18:42:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9FDD911F5;
 Fri, 14 Jun 2013 18:42:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EIg9cE030123;
 Fri, 14 Jun 2013 18:42:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EIg9KV030121;
 Fri, 14 Jun 2013 18:42:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306141842.r5EIg9KV030121@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 18:42:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251755 - stable/8/sys/dev/acpica
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 18:42:09 -0000

Author: jhb
Date: Fri Jun 14 18:42:08 2013
New Revision: 251755
URL: http://svnweb.freebsd.org/changeset/base/251755

Log:
  MFC 249767:
  - Some BIOSes use an Extended IRQ resource descriptor in _PRS for a link
    that uses non-ISA IRQs but use a plain IRQ resource in _CRS.  However,
    a non-ISA IRQ can't fit into a plain IRQ resource.  If we encounter a
    link like this, build the resource buffer from _PRS instead of _CRS.
  - Set the correct size of the end tag in a resource buffer.

Modified:
  stable/8/sys/dev/acpica/acpi.c
  stable/8/sys/dev/acpica/acpi_pci_link.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/acpica/   (props changed)

Modified: stable/8/sys/dev/acpica/acpi.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi.c	Fri Jun 14 18:30:43 2013	(r251754)
+++ stable/8/sys/dev/acpica/acpi.c	Fri Jun 14 18:42:08 2013	(r251755)
@@ -2198,7 +2198,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *b
 	    return (AE_NO_MEMORY);
 	rp = (ACPI_RESOURCE *)buf->Pointer;
 	rp->Type = ACPI_RESOURCE_TYPE_END_TAG;
-	rp->Length = 0;
+	rp->Length = ACPI_RS_SIZE_MIN;
     }
     if (res == NULL)
 	return (AE_OK);
@@ -2248,7 +2248,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *b
     /* And add the terminator. */
     rp = ACPI_NEXT_RESOURCE(rp);
     rp->Type = ACPI_RESOURCE_TYPE_END_TAG;
-    rp->Length = 0;
+    rp->Length = ACPI_RS_SIZE_MIN;
 
     return (AE_OK);
 }

Modified: stable/8/sys/dev/acpica/acpi_pci_link.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi_pci_link.c	Fri Jun 14 18:30:43 2013	(r251754)
+++ stable/8/sys/dev/acpica/acpi_pci_link.c	Fri Jun 14 18:42:08 2013	(r251755)
@@ -99,6 +99,7 @@ struct link {
 	uint8_t	l_bios_irq;
 	uint8_t	l_irq;
 	uint8_t	l_initial_irq;
+	UINT32	l_crs_type;
 	int	l_res_index;
 	int	l_num_irqs;
 	int	*l_irqs;
@@ -236,6 +237,7 @@ link_add_crs(ACPI_RESOURCE *res, void *c
 		    ("%s: array boundary violation", __func__));
 		link = &req->sc->pl_links[req->link_index];
 		link->l_res_index = req->res_index;
+		link->l_crs_type = res->Type;
 		req->link_index++;
 		req->res_index++;
 
@@ -364,6 +366,14 @@ link_add_prs(ACPI_RESOURCE *res, void *c
 					link->l_isa_irq = FALSE;
 			}
 		}
+
+		/*
+		 * If this is not an ISA IRQ but _CRS used a non-extended
+		 * IRQ descriptor, don't use _CRS as a template for _SRS.
+		 */
+		if (!req->sc->pl_crs_bad && !link->l_isa_irq &&
+		    link->l_crs_type == ACPI_RESOURCE_TYPE_IRQ)
+			req->sc->pl_crs_bad = TRUE;
 		break;
 	default:
 		if (req->in_dpf == DPF_IGNORE)

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 18:56:39 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 19408C28;
 Fri, 14 Jun 2013 18:56:39 +0000 (UTC)
 (envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0A4EE1276;
 Fri, 14 Jun 2013 18:56:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EIuc5I033872;
 Fri, 14 Jun 2013 18:56:38 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EIuc71033867;
 Fri, 14 Jun 2013 18:56:38 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201306141856.r5EIuc71033867@svn.freebsd.org>
From: Guy Helmer 
Date: Fri, 14 Jun 2013 18:56:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251756 - stable/9/sys/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 18:56:39 -0000

Author: ghelmer
Date: Fri Jun 14 18:56:37 2013
New Revision: 251756
URL: http://svnweb.freebsd.org/changeset/base/251756

Log:
  MFC	r244090, r250945
  
  Changes to resolve races in bpfread() and catchpacket() that, at worst,
  cause kernel panics.
  
  Add a flag to the bpf descriptor to indicate whether the hold buffer
  is in use. In bpfread(), set the "hold buffer in use" flag before
  dropping the descriptor lock during the call to bpf_uiomove().
  Everywhere else the hold buffer is used or changed, wait while
  the hold buffer is in use by bpfread(). Add a KASSERT in bpfread()
  after re-acquiring the descriptor lock to assist uncovering any
  additional hold buffer races.
  
  While waiting for the bpf hold buffer to become idle, check
  the return value from mtx_sleep() and exit bpfread() on
  errors such as EINTR.

Modified:
  stable/9/sys/net/bpf.c
  stable/9/sys/net/bpf.h
  stable/9/sys/net/bpf_buffer.c
  stable/9/sys/net/bpfdesc.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/net/   (props changed)

Modified: stable/9/sys/net/bpf.c
==============================================================================
--- stable/9/sys/net/bpf.c	Fri Jun 14 18:42:08 2013	(r251755)
+++ stable/9/sys/net/bpf.c	Fri Jun 14 18:56:37 2013	(r251756)
@@ -819,6 +819,7 @@ bpfopen(struct cdev *dev, int flags, int
 	 * particular buffer method.
 	 */
 	bpf_buffer_init(d);
+	d->bd_hbuf_in_use = 0;
 	d->bd_bufmode = BPF_BUFMODE_BUFFER;
 	d->bd_sig = SIGIO;
 	d->bd_direction = BPF_D_INOUT;
@@ -872,6 +873,14 @@ bpfread(struct cdev *dev, struct uio *ui
 		callout_stop(&d->bd_callout);
 	timed_out = (d->bd_state == BPF_TIMED_OUT);
 	d->bd_state = BPF_IDLE;
+	while (d->bd_hbuf_in_use) {
+		error = mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+		    PRINET|PCATCH, "bd_hbuf", 0);
+		if (error != 0) {
+			BPFD_UNLOCK(d);
+			return (error);
+		}
+	}
 	/*
 	 * If the hold buffer is empty, then do a timed sleep, which
 	 * ends when the timeout expires or when enough packets
@@ -940,24 +949,27 @@ bpfread(struct cdev *dev, struct uio *ui
 	/*
 	 * At this point, we know we have something in the hold slot.
 	 */
+	d->bd_hbuf_in_use = 1;
 	BPFD_UNLOCK(d);
 
 	/*
 	 * Move data from hold buffer into user space.
 	 * We know the entire buffer is transferred since
 	 * we checked above that the read buffer is bpf_bufsize bytes.
-	 *
-	 * XXXRW: More synchronization needed here: what if a second thread
-	 * issues a read on the same fd at the same time?  Don't want this
-	 * getting invalidated.
+  	 *
+	 * We do not have to worry about simultaneous reads because
+	 * we waited for sole access to the hold buffer above.
 	 */
 	error = bpf_uiomove(d, d->bd_hbuf, d->bd_hlen, uio);
 
 	BPFD_LOCK(d);
+	KASSERT(d->bd_hbuf != NULL, ("bpfread: lost bd_hbuf"));
 	d->bd_fbuf = d->bd_hbuf;
 	d->bd_hbuf = NULL;
 	d->bd_hlen = 0;
 	bpf_buf_reclaimed(d);
+	d->bd_hbuf_in_use = 0;
+	wakeup(&d->bd_hbuf_in_use);
 	BPFD_UNLOCK(d);
 
 	return (error);
@@ -1111,6 +1123,9 @@ reset_d(struct bpf_d *d)
 
 	BPFD_LOCK_ASSERT(d);
 
+	while (d->bd_hbuf_in_use)
+		mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock, PRINET,
+		    "bd_hbuf", 0);
 	if ((d->bd_hbuf != NULL) &&
 	    (d->bd_bufmode != BPF_BUFMODE_ZBUF || bpf_canfreebuf(d))) {
 		/* Free the hold buffer. */
@@ -1251,6 +1266,9 @@ bpfioctl(struct cdev *dev, u_long cmd, c
 
 			BPFD_LOCK(d);
 			n = d->bd_slen;
+			while (d->bd_hbuf_in_use)
+				mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+				    PRINET, "bd_hbuf", 0);
 			if (d->bd_hbuf)
 				n += d->bd_hlen;
 			BPFD_UNLOCK(d);
@@ -1964,6 +1982,9 @@ filt_bpfread(struct knote *kn, long hint
 	ready = bpf_ready(d);
 	if (ready) {
 		kn->kn_data = d->bd_slen;
+		while (d->bd_hbuf_in_use)
+			mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+			    PRINET, "bd_hbuf", 0);
 		if (d->bd_hbuf)
 			kn->kn_data += d->bd_hlen;
 	} else if (d->bd_rtout > 0 && d->bd_state == BPF_IDLE) {
@@ -2296,6 +2317,9 @@ catchpacket(struct bpf_d *d, u_char *pkt
 	 * spot to do it.
 	 */
 	if (d->bd_fbuf == NULL && bpf_canfreebuf(d)) {
+		while (d->bd_hbuf_in_use)
+			mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+			    PRINET, "bd_hbuf", 0);
 		d->bd_fbuf = d->bd_hbuf;
 		d->bd_hbuf = NULL;
 		d->bd_hlen = 0;
@@ -2338,6 +2362,9 @@ catchpacket(struct bpf_d *d, u_char *pkt
 			++d->bd_dcount;
 			return;
 		}
+		while (d->bd_hbuf_in_use)
+			mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+			    PRINET, "bd_hbuf", 0);
 		ROTATE_BUFFERS(d);
 		do_wakeup = 1;
 		curlen = 0;

Modified: stable/9/sys/net/bpf.h
==============================================================================
--- stable/9/sys/net/bpf.h	Fri Jun 14 18:42:08 2013	(r251755)
+++ stable/9/sys/net/bpf.h	Fri Jun 14 18:56:37 2013	(r251756)
@@ -1235,7 +1235,8 @@ SYSCTL_DECL(_net_bpf);
 /*
  * Rotate the packet buffers in descriptor d.  Move the store buffer into the
  * hold slot, and the free buffer ino the store slot.  Zero the length of the
- * new store buffer.  Descriptor lock should be held.
+ * new store buffer.  Descriptor lock should be held. Hold buffer must
+ * not be marked "in use".
  */
 #define	ROTATE_BUFFERS(d)	do {					\
 	(d)->bd_hbuf = (d)->bd_sbuf;					\

Modified: stable/9/sys/net/bpf_buffer.c
==============================================================================
--- stable/9/sys/net/bpf_buffer.c	Fri Jun 14 18:42:08 2013	(r251755)
+++ stable/9/sys/net/bpf_buffer.c	Fri Jun 14 18:56:37 2013	(r251756)
@@ -79,6 +79,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#define PRINET  26			/* interruptible */
+
 /*
  * Implement historical kernel memory buffering model for BPF: two malloc(9)
  * kernel buffers are hung off of the descriptor.  The size is fixed prior to
@@ -189,6 +191,9 @@ bpf_buffer_ioctl_sblen(struct bpf_d *d, 
 		return (EINVAL);
 	}
 
+	while (d->bd_hbuf_in_use)
+		mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
+		    PRINET, "bd_hbuf", 0);
 	/* Free old buffers if set */
 	if (d->bd_fbuf != NULL)
 		free(d->bd_fbuf, M_BPF);

Modified: stable/9/sys/net/bpfdesc.h
==============================================================================
--- stable/9/sys/net/bpfdesc.h	Fri Jun 14 18:42:08 2013	(r251755)
+++ stable/9/sys/net/bpfdesc.h	Fri Jun 14 18:56:37 2013	(r251756)
@@ -63,6 +63,7 @@ struct bpf_d {
 	caddr_t		bd_sbuf;	/* store slot */
 	caddr_t		bd_hbuf;	/* hold slot */
 	caddr_t		bd_fbuf;	/* free slot */
+	int		bd_hbuf_in_use;	/* don't rotate buffers */
 	int 		bd_slen;	/* current length of store buffer */
 	int 		bd_hlen;	/* current length of hold buffer */
 

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 19:26:34 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 130A246E;
 Fri, 14 Jun 2013 19:26:34 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 01A1813A4;
 Fri, 14 Jun 2013 19:26:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EJQXVq043657;
 Fri, 14 Jun 2013 19:26:33 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EJQXBs043651;
 Fri, 14 Jun 2013 19:26:33 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201306141926.r5EJQXBs043651@svn.freebsd.org>
From: Martin Matuska 
Date: Fri, 14 Jun 2013 19:26:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251757 - in stable/8: . cddl/contrib/opensolaris/cmd/zdb
 cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack
 cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris...
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 19:26:34 -0000

Author: mm
Date: Fri Jun 14 19:26:32 2013
New Revision: 251757
URL: http://svnweb.freebsd.org/changeset/base/251757

Log:
  MFC 246619,247187,247265,247348,247398,247540,247585,248265,248267,248571,
      248976,249004,249042,249047,249188,249195,249196,249206,249207,249319,
      249326,249356,249357,249787,249883,249858
  
  Merge libzfs_core, zfs deadman thread and other ZFS bugfixes and improvements.
  
  MFC r246619:
    Correct spelling of "daemon".  No .Dd bump.
    Noticed by:	Nathan Rich 
  
  MFC r247187:
    Import vendor change to avoid "unitialized variable" warnings.
  
    Illumos ZFS issues:
    3522 zfs module should not allow uninitialized variables
  
  MFC r247265:
    Merge the ZFS I/O deadman thread from vendor (illumos).
    This feature panics the system on hanging ZFS I/O, helps debugging
    and resumes failed service.
  
    The panic behavior can be controlled with the loader-only tunables:
    vfs.zfs.deadman_enabled (enable or disable panic on stalled ZFS I/O)
    vfs.zfs.deadman_synctime (expiration time for stalled ZFS I/O)
  
    By default, ZFS I/O deadman is enabled by default on amd64 and i386
    excluding virtual guest machines.
  
  MFC r247348:
    Be more verbose on ZFS deadman I/O panic
    Patch suggested upstream.
  
  MFC r247398:
    Import metaslab_sync() speedup from vendor (illumos).
  
    Illumos ZFS issues:
    3552 condensing one space map burns 3 seconds of CPU in spa_sync() thread
    3564 spa_sync() spends 5-10% of its time in metaslab_sync() (when not
  	condensing)
    3578 transferring the freed map to the defer map should be constant time
    3579 ztest trips assertion in metaslab_weight()
  
  MFC r247540:
    Fix the zfs_ioctl compat layer to support zfs_cmd size change introduced
    in r247265 (ZFS deadman thread). Both new utilities now support the old
    kernel and new kernel properly detects old utilities.
  
    For future backwards compatibility, the vfs.zfs.version.ioctl read-only
    sysctl has been introduced. With this sysctl zfs utilities will be able
    to detect the ioctl interface version of the currently loaded zfs module.
  
  MFC r247585:
    Merge new read-only zfs properties from vendor (illumos)
  
    Illumos ZFS issues:
    3588 provide zfs properties for logical (uncompressed) space used and
         referenced
  
  MFC r248265:
    Update zfs.8 manpage date (missing in r247585)
  
  MFC r248267:
    Import minor ZFS changes from vendor
  
    Illumos ZFS issues:
    3604 zdb should print bpobjs more verbosely (fix zdb hang)
    3606 zpool status -x shouldn't warn about old on-disk format
  
  MFC r248571:
    MFV 238590, 238592:
    In the first zfs ioctl restructuring phase, the libzfs_core library was
    introduced. It is a new thin library that wraps around kernel ioctl's.
    The idea is to provide a forward-compatible way of dealing with new
    features. Arguments are passed in nvlists and not random zfs_cmd fields,
    new-style ioctls are logged to pool history using a new method of
    history logging.
  
    http://blog.delphix.com/matt/2012/01/17/the-future-of-libzfs/
  
    MFV 247580 [1]:
    To address issues of several deadlocks and race conditions the locking
    code around dsl_dataset was rewritten and the interface to synctasks
    was changed.
  
    User-Visible Changes:
    "zfs snapshot" can create more arbitrary snapshots at once (atomically)
    "zfs destroy" destroys multiple snapshots at once
    "zfs recv" has improved performance
  
    Backward Compatibility:
    I have extended the compatibility layer to support full backward
    compatibility by remapping or rewriting the responsible ioctl arguments.
    Old utilities are fully supported by the new kernel module.
  
    Forward Compatibility:
    New utilities work with old kernels with the following restrictions:
      - creating, destroying, holding and releasing of multiple snapshots
        at once is not supported, this includes recursive (-r) commands
  
    Illumos ZFS issues:
      2882 implement libzfs_core
      2900 "zfs snapshot" should be able to create multiple,
           arbitrary snapshots at once
      3464 zfs synctask code needs restructuring
  
  MFC r248976:
    Call dmu_snapshot_list_next() in zvol.c with dsl_pool_config lock held
  
  MFC r249004:
    Do not check against uninitialized rc and comment out vendor code
  
  MFC r249042:
    Fix possible pool hold leak in dmu_send_impl()
  
    Illumos ZFS issues:
      3645 dmu_send_impl: possibilty of pool hold leak
  
  MFC r249047 (avg):
    spa_open_common: fix argument to zvol_create_minors
  
    Prior to r248571 spa_open was always called with a bare pool name,
    but now it is called with a dataset name instead (spa_lookup handles
    that).
    So, when a ZFS root is mounted spa_open is called with a name of a root
    dataset, which can very well be different from the pool name.
    But zvol_create_minors should be called with the pool name, because it
    performs a recursive traversal of all datasets under the name to find
    all those that are volumes.
  
  MFC r249188:
    Import vendor change to reduce diff, no effect on FreeBSD.
  
    Illumos ZFS issues:
      3517 importing pool with autoreplace=on and "hole" vdevs crashes
  	 syseventd
  
  MFC r249195:
    Merge change from vendor to reduce diff only.
    ZFS dtrace probes are not supported on FreeBSD yet.
  
    Illumos ZFS issues:
      3598 want to dtrace when errors are generated in zfs
  
  MFC r249196:
    Provide a fix for kernel panic if receiving recursive deduplicated
    streams. Problem reported to vendor.
  
    Illumos ZFS issues:
      3692 Panic on zfs receive of a recursive deduplicated stream
  
  MFC r249206:
    Merge vendor change - modify time processing in deadman thread.
  
    Illumos ZFS issues:
      3618 ::zio dcmd does not show timestamp data
  
  MFC r249207:
    Allow zdb to output a histogram of compressed block sizes.
  
    Illumos ZFS issues:
      3641 want a histogram of compressed block sizes
  
  MFC r249319:
    ZFS expects a copyout of zfs_cmd_t on an ioctl error. Our sys_ioctl()
    doesn't copyout in this case.
  
    To solve this a new struct zfs_iocparm_t is introduced consisting of:
    - zfs_ioctl_version (future backwards compatibility purposes)
    - user space pointer to zfs_cmd_t (copyin and copyout)
    - size of zfs_cmd_t (verification purposes)
  
    The copyin and copyout of zfs_cmd_t is now done the illumos (vendor) way
    what makes porting of new changes easier and ensures correct behavior if
    returning an error.
  
  MFC r249326:
    Cast (void *)(uintptr_t) on copyout and copyin of zfs_iocparm_t.zfs_cmd
  
  MFC r249356:
    Merge bugfixes accepted and integrated by vendor. Underlying problems
    have been reported by us and fixed in r240942 and r249196.
  
    Illumos ZFS issues:
      3645 dmu_send_impl: possibilty of pool hold leak
      3692 Panic on zfs receive of a recursive deduplicated stream
  
  MFC r249357:
    Fix libzfs to report error instead of returning zero if trying to hold or
    release a non-existing snapshot of a existing dataset. In recursive case
    error is reported if no snapshots with the requested name have been found.
  
    Illumos ZFS issues:
      3699 zfs hold or release of a non-existent snapshot does not output
  	 error
  
  MFC r249787:
    The zfs synctask code restructuring introduced a new bug that makes it
    impossible to set quota and reservation on pools lower than version 22.
    Problem has been reported and a solution discussed with vendor.
  
    Illumos ZFS issues:
      3739 cannot set zfs quota or reservation on pool version < 22
  
  MFC r249883:
    Respect the enoent_ok flag if reporting error for holding an non-existing
    snapshot.
  
    Related illumos ZFS issue:
      3699 zfs hold or release of a non-existent snapshot does not output error
  
  MFC r249858:
    Merge vendor bugfix for a possible deadlock related to async destroy
    and improve write performance by introducing a new lock protecting
    tx_open_txg.
  
    Illumos ZFS issues:
      3642 dsl_scan_active() should not issue I/O to determine if async
           destroying is active
      3643 txg_delay should not hold the tc_lock

Added:
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
     - copied, changed from r248571, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h
     - copied unchanged from r248571, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h
  stable/8/cddl/contrib/opensolaris/lib/libzfs_core/
     - copied from r248571, head/cddl/contrib/opensolaris/lib/libzfs_core/
  stable/8/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d
     - copied unchanged from r249195, head/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d
  stable/8/cddl/lib/libzfs_core/
     - copied from r248571, head/cddl/lib/libzfs_core/
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
     - copied, changed from r248571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
     - copied, changed from r248571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
     - copied unchanged from r248571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
     - copied unchanged from r248571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h
     - copied unchanged from r248571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h
Modified:
  stable/8/Makefile.inc1   (contents, props changed)
  stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/8/cddl/contrib/opensolaris/cmd/zhack/zhack.c
  stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  stable/8/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  stable/8/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  stable/8/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  stable/8/cddl/lib/Makefile
  stable/8/cddl/lib/libzfs/Makefile
  stable/8/cddl/sbin/zfs/Makefile
  stable/8/cddl/sbin/zpool/Makefile
  stable/8/cddl/usr.bin/zinject/Makefile
  stable/8/cddl/usr.bin/ztest/Makefile
  stable/8/cddl/usr.sbin/zdb/Makefile
  stable/8/cddl/usr.sbin/zhack/Makefile
  stable/8/rescue/rescue/Makefile
  stable/8/share/mk/bsd.libnames.mk
  stable/8/sys/cddl/compat/opensolaris/sys/cred.h
  stable/8/sys/cddl/compat/opensolaris/sys/sdt.h
  stable/8/sys/cddl/compat/opensolaris/sys/time.h
  stable/8/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  stable/8/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
Directory Properties:
  stable/8/cddl/   (props changed)
  stable/8/cddl/contrib/opensolaris/   (props changed)
  stable/8/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  stable/8/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  stable/8/cddl/lib/   (props changed)
  stable/8/cddl/sbin/   (props changed)
  stable/8/cddl/usr.bin/   (props changed)
  stable/8/cddl/usr.sbin/   (props changed)
  stable/8/rescue/rescue/   (props changed)
  stable/8/share/mk/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/Makefile.inc1
==============================================================================
--- stable/8/Makefile.inc1	Fri Jun 14 18:56:37 2013	(r251756)
+++ stable/8/Makefile.inc1	Fri Jun 14 19:26:32 2013	(r251757)
@@ -1140,6 +1140,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+		${_cddl_lib_libzfs_core} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
@@ -1155,7 +1156,9 @@ lib/libopie__L lib/libtacplus__L: lib/li
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
+_cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib= cddl/lib
+cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
 .endif
 
 .if ${MK_CRYPT} != "no"

Modified: stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Jun 14 18:56:37 2013	(r251756)
+++ stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Jun 14 19:26:32 2013	(r251757)
@@ -21,10 +21,11 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -57,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #undef ZFS_MAXNAMELEN
 #undef verify
 #include 
@@ -206,6 +208,27 @@ dump_packed_nvlist(objset_t *os, uint64_
 	nvlist_free(nv);
 }
 
+/* ARGSUSED */
+static void
+dump_history_offsets(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	spa_history_phys_t *shp = data;
+
+	if (shp == NULL)
+		return;
+
+	(void) printf("\t\tpool_create_len = %llu\n",
+	    (u_longlong_t)shp->sh_pool_create_len);
+	(void) printf("\t\tphys_max_off = %llu\n",
+	    (u_longlong_t)shp->sh_phys_max_off);
+	(void) printf("\t\tbof = %llu\n",
+	    (u_longlong_t)shp->sh_bof);
+	(void) printf("\t\teof = %llu\n",
+	    (u_longlong_t)shp->sh_eof);
+	(void) printf("\t\trecords_lost = %llu\n",
+	    (u_longlong_t)shp->sh_records_lost);
+}
+
 static void
 zdb_nicenum(uint64_t num, char *buf)
 {
@@ -215,18 +238,18 @@ zdb_nicenum(uint64_t num, char *buf)
 		nicenum(num, buf);
 }
 
-const char dump_zap_stars[] = "****************************************";
-const int dump_zap_width = sizeof (dump_zap_stars) - 1;
+const char histo_stars[] = "****************************************";
+const int histo_width = sizeof (histo_stars) - 1;
 
 static void
-dump_zap_histogram(uint64_t histo[ZAP_HISTOGRAM_SIZE])
+dump_histogram(const uint64_t *histo, int size)
 {
 	int i;
-	int minidx = ZAP_HISTOGRAM_SIZE - 1;
+	int minidx = size - 1;
 	int maxidx = 0;
 	uint64_t max = 0;
 
-	for (i = 0; i < ZAP_HISTOGRAM_SIZE; i++) {
+	for (i = 0; i < size; i++) {
 		if (histo[i] > max)
 			max = histo[i];
 		if (histo[i] > 0 && i > maxidx)
@@ -235,12 +258,14 @@ dump_zap_histogram(uint64_t histo[ZAP_HI
 			minidx = i;
 	}
 
-	if (max < dump_zap_width)
-		max = dump_zap_width;
+	if (max < histo_width)
+		max = histo_width;
 
-	for (i = minidx; i <= maxidx; i++)
-		(void) printf("\t\t\t%u: %6llu %s\n", i, (u_longlong_t)histo[i],
-		    &dump_zap_stars[(max - histo[i]) * dump_zap_width / max]);
+	for (i = minidx; i <= maxidx; i++) {
+		(void) printf("\t\t\t%3u: %6llu %s\n",
+		    i, (u_longlong_t)histo[i],
+		    &histo_stars[(max - histo[i]) * histo_width / max]);
+	}
 }
 
 static void
@@ -291,19 +316,19 @@ dump_zap_stats(objset_t *os, uint64_t ob
 	    (u_longlong_t)zs.zs_salt);
 
 	(void) printf("\t\tLeafs with 2^n pointers:\n");
-	dump_zap_histogram(zs.zs_leafs_with_2n_pointers);
+	dump_histogram(zs.zs_leafs_with_2n_pointers, ZAP_HISTOGRAM_SIZE);
 
 	(void) printf("\t\tBlocks with n*5 entries:\n");
-	dump_zap_histogram(zs.zs_blocks_with_n5_entries);
+	dump_histogram(zs.zs_blocks_with_n5_entries, ZAP_HISTOGRAM_SIZE);
 
 	(void) printf("\t\tBlocks n/10 full:\n");
-	dump_zap_histogram(zs.zs_blocks_n_tenths_full);
+	dump_histogram(zs.zs_blocks_n_tenths_full, ZAP_HISTOGRAM_SIZE);
 
 	(void) printf("\t\tEntries with n chunks:\n");
-	dump_zap_histogram(zs.zs_entries_using_n_chunks);
+	dump_histogram(zs.zs_entries_using_n_chunks, ZAP_HISTOGRAM_SIZE);
 
 	(void) printf("\t\tBuckets with n entries:\n");
-	dump_zap_histogram(zs.zs_buckets_with_n_entries);
+	dump_histogram(zs.zs_buckets_with_n_entries, ZAP_HISTOGRAM_SIZE);
 }
 
 /*ARGSUSED*/
@@ -545,7 +570,7 @@ static void
 dump_metaslab_stats(metaslab_t *msp)
 {
 	char maxbuf[32];
-	space_map_t *sm = &msp->ms_map;
+	space_map_t *sm = msp->ms_map;
 	avl_tree_t *t = sm->sm_pp_root;
 	int free_pct = sm->sm_space * 100 / sm->sm_size;
 
@@ -561,7 +586,7 @@ dump_metaslab(metaslab_t *msp)
 {
 	vdev_t *vd = msp->ms_group->mg_vd;
 	spa_t *spa = vd->vdev_spa;
-	space_map_t *sm = &msp->ms_map;
+	space_map_t *sm = msp->ms_map;
 	space_map_obj_t *smo = &msp->ms_smo;
 	char freebuf[32];
 
@@ -857,21 +882,22 @@ dump_history(spa_t *spa)
 	for (int i = 0; i < num; i++) {
 		uint64_t time, txg, ievent;
 		char *cmd, *intstr;
+		boolean_t printed = B_FALSE;
 
 		if (nvlist_lookup_uint64(events[i], ZPOOL_HIST_TIME,
 		    &time) != 0)
-			continue;
+			goto next;
 		if (nvlist_lookup_string(events[i], ZPOOL_HIST_CMD,
 		    &cmd) != 0) {
 			if (nvlist_lookup_uint64(events[i],
 			    ZPOOL_HIST_INT_EVENT, &ievent) != 0)
-				continue;
+				goto next;
 			verify(nvlist_lookup_uint64(events[i],
 			    ZPOOL_HIST_TXG, &txg) == 0);
 			verify(nvlist_lookup_string(events[i],
 			    ZPOOL_HIST_INT_STR, &intstr) == 0);
-			if (ievent >= LOG_END)
-				continue;
+			if (ievent >= ZFS_NUM_LEGACY_HISTORY_EVENTS)
+				goto next;
 
 			(void) snprintf(internalstr,
 			    sizeof (internalstr),
@@ -884,6 +910,14 @@ dump_history(spa_t *spa)
 		(void) localtime_r(&tsec, &t);
 		(void) strftime(tbuf, sizeof (tbuf), "%F.%T", &t);
 		(void) printf("%s %s\n", tbuf, cmd);
+		printed = B_TRUE;
+
+next:
+		if (dump_opt['h'] > 1) {
+			if (!printed)
+				(void) printf("unrecognized record:\n");
+			dump_nvlist(events[i], 2);
+		}
 	}
 }
 
@@ -916,7 +950,7 @@ sprintf_blkptr_compact(char *blkbuf, con
 	const dva_t *dva = bp->blk_dva;
 	int ndvas = dump_opt['d'] > 5 ? BP_GET_NDVAS(bp) : 1;
 
-	if (dump_opt['b'] >= 5) {
+	if (dump_opt['b'] >= 6) {
 		sprintf_blkptr(blkbuf, bp);
 		return;
 	}
@@ -1496,7 +1530,7 @@ static object_viewer_t *object_viewer[DM
 	dump_zap,		/* other ZAP			*/
 	dump_zap,		/* persistent error log		*/
 	dump_uint8,		/* SPA history			*/
-	dump_uint64,		/* SPA history offsets		*/
+	dump_history_offsets,	/* SPA history offsets		*/
 	dump_zap,		/* Pool properties		*/
 	dump_zap,		/* DSL permissions		*/
 	dump_acl,		/* ZFS ACL			*/
@@ -1661,7 +1695,9 @@ dump_dir(objset_t *os)
 	int print_header = 1;
 	int i, error;
 
+	dsl_pool_config_enter(dmu_objset_pool(os), FTAG);
 	dmu_objset_fast_stat(os, &dds);
+	dsl_pool_config_exit(dmu_objset_pool(os), FTAG);
 
 	if (dds.dds_type < DMU_OST_NUMTYPES)
 		type = objset_types[dds.dds_type];
@@ -1953,11 +1989,13 @@ dump_one_dir(const char *dsname, void *a
 /*
  * Block statistics.
  */
+#define	PSIZE_HISTO_SIZE (SPA_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1)
 typedef struct zdb_blkstats {
-	uint64_t	zb_asize;
-	uint64_t	zb_lsize;
-	uint64_t	zb_psize;
-	uint64_t	zb_count;
+	uint64_t zb_asize;
+	uint64_t zb_lsize;
+	uint64_t zb_psize;
+	uint64_t zb_count;
+	uint64_t zb_psize_histogram[PSIZE_HISTO_SIZE];
 } zdb_blkstats_t;
 
 /*
@@ -1981,6 +2019,9 @@ typedef struct zdb_cb {
 	zdb_blkstats_t	zcb_type[ZB_TOTAL + 1][ZDB_OT_TOTAL + 1];
 	uint64_t	zcb_dedup_asize;
 	uint64_t	zcb_dedup_blocks;
+	uint64_t	zcb_start;
+	uint64_t	zcb_lastprint;
+	uint64_t	zcb_totalasize;
 	uint64_t	zcb_errors[256];
 	int		zcb_readfails;
 	int		zcb_haderrors;
@@ -2007,6 +2048,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *
 		zb->zb_lsize += BP_GET_LSIZE(bp);
 		zb->zb_psize += BP_GET_PSIZE(bp);
 		zb->zb_count++;
+		zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++;
 	}
 
 	if (dump_opt['L'])
@@ -2070,7 +2112,6 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 		    NULL, NULL, ZIO_PRIORITY_ASYNC_READ, flags, zb));
 
 		free(data);
-
 		if (ioerr && !(flags & ZIO_FLAG_SPECULATIVE)) {
 			zcb->zcb_haderrors = 1;
 			zcb->zcb_errors[ioerr]++;
@@ -2094,7 +2135,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 
 	zcb->zcb_readfails = 0;
 
-	if (dump_opt['b'] >= 4) {
+	if (dump_opt['b'] >= 5) {
 		sprintf_blkptr(blkbuf, bp);
 		(void) printf("objset %llu object %llu "
 		    "level %lld offset 0x%llx %s\n",
@@ -2105,6 +2146,28 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 		    blkbuf);
 	}
 
+	if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+	    gethrtime() > zcb->zcb_lastprint + NANOSEC) {
+		uint64_t now = gethrtime();
+		char buf[10];
+		uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize;
+		int kb_per_sec =
+		    1 + bytes / (1 + ((now - zcb->zcb_start) / 1000 / 1000));
+		int sec_remaining =
+		    (zcb->zcb_totalasize - bytes) / 1024 / kb_per_sec;
+
+		zfs_nicenum(bytes, buf, sizeof (buf));
+		(void) fprintf(stderr,
+		    "\r%5s completed (%4dMB/s) "
+		    "estimated time remaining: %uhr %02umin %02usec        ",
+		    buf, kb_per_sec / 1024,
+		    sec_remaining / 60 / 60,
+		    sec_remaining / 60 % 60,
+		    sec_remaining % 60);
+
+		zcb->zcb_lastprint = now;
+	}
+
 	return (0);
 }
 
@@ -2196,11 +2259,11 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 			for (int m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				mutex_enter(&msp->ms_lock);
-				space_map_unload(&msp->ms_map);
-				VERIFY(space_map_load(&msp->ms_map,
+				space_map_unload(msp->ms_map);
+				VERIFY(space_map_load(msp->ms_map,
 				    &zdb_space_map_ops, SM_ALLOC, &msp->ms_smo,
 				    spa->spa_meta_objset) == 0);
-				msp->ms_map.sm_ppd = vd;
+				msp->ms_map->sm_ppd = vd;
 				mutex_exit(&msp->ms_lock);
 			}
 		}
@@ -2223,7 +2286,7 @@ zdb_leak_fini(spa_t *spa)
 			for (int m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				mutex_enter(&msp->ms_lock);
-				space_map_unload(&msp->ms_map);
+				space_map_unload(msp->ms_map);
 				mutex_exit(&msp->ms_lock);
 			}
 		}
@@ -2236,7 +2299,7 @@ count_block_cb(void *arg, const blkptr_t
 {
 	zdb_cb_t *zcb = arg;
 
-	if (dump_opt['b'] >= 4) {
+	if (dump_opt['b'] >= 5) {
 		char blkbuf[BP_SPRINTF_LEN];
 		sprintf_blkptr(blkbuf, bp);
 		(void) printf("[%s] %s\n",
@@ -2255,7 +2318,7 @@ dump_block_stats(spa_t *spa)
 	int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD;
 	int leaks = 0;
 
-	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n",
+	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n",
 	    (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
 	    (dump_opt['c'] == 1) ? "metadata " : "",
 	    dump_opt['c'] ? "checksums " : "",
@@ -2291,6 +2354,8 @@ dump_block_stats(spa_t *spa)
 	if (dump_opt['c'] > 1)
 		flags |= TRAVERSE_PREFETCH_DATA;
 
+	zcb.zcb_totalasize = metaslab_class_get_alloc(spa_normal_class(spa));
+	zcb.zcb_start = zcb.zcb_lastprint = gethrtime();
 	zcb.zcb_haderrors |= traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb);
 
 	if (zcb.zcb_haderrors) {
@@ -2418,6 +2483,14 @@ dump_block_stats(spa_t *spa)
 				else
 					(void) printf("    L%d %s\n",
 					    level, typename);
+
+				if (dump_opt['b'] >= 4) {
+					(void) printf("psize "
+					    "(in 512-byte sectors): "
+					    "number of blocks\n");
+					dump_histogram(zb->zb_psize_histogram,
+					    PSIZE_HISTO_SIZE);
+				}
 			}
 		}
 	}

Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Jun 14 18:56:37 2013	(r251756)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Jun 14 19:26:32 2013	(r251757)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 10, 2013
+.Dd March 21, 2013
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -64,6 +64,7 @@
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem@snapname Ns | Ns Ar volume@snapname
+.Ar filesystem@snapname Ns | Ns Ar volume@snapname Ns ...
 .Nm
 .Cm rollback
 .Op Fl rRf
@@ -519,6 +520,39 @@ if the snapshot has been marked for defe
 .Qq Nm Cm destroy -d
 command. Otherwise, the property is
 .Cm off .
+.It Sy logicalreferenced
+The amount of space that is
+.Qq logically
+accessible by this dataset.
+See the
+.Sy referenced
+property.
+The logical space ignores the effect of the
+.Sy compression
+and
+.Sy copies
+properties, giving a quantity closer to the amount of data that applications
+see.
+However, it does include space consumed by metadata.
+.Pp
+This property can also be referred to by its shortened column name,
+.Sy lrefer .
+.It Sy logicalused
+The amount of space that is
+.Qq logically
+consumed by this dataset and all its descendents.
+See the
+.Sy used
+property.
+The logical space ignores the effect of the
+.Sy compression
+and
+.Sy copies
+properties, giving a quantity closer to the amount of data that applications
+see.
+.Pp
+This property can also be referred to by its shortened column name,
+.Sy lused .
 .It Sy mounted
 For file systems, indicates whether the file system is currently mounted. This
 property can be either
@@ -1158,7 +1192,7 @@ When the
 .Sy sharenfs
 property is changed for a dataset, the
 .Xr mountd 8
-dameon is reloaded.
+daemon is reloaded.
 .It Sy logbias Ns = Ns Cm latency | throughput
 Provide a hint to
 .Tn ZFS
@@ -1575,7 +1609,11 @@ multiple snapshots.
 Destroy (or mark for deferred deletion) all snapshots with this name in
 descendent file systems.
 .It Fl R
-Recursively destroy all dependents.
+Recursively destroy all clones of these snapshots, including the clones,
+snapshots, and children.
+If this flag is specified, the
+.Op fl d
+flag will have no effect.
 .It Fl n
 Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in
 conjunction with the
@@ -1603,17 +1641,18 @@ behavior for mounted file systems in use
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem@snapname Ns | Ns volume@snapname
+.Ar filesystem@snapname Ns | Ns volume@snapname Ns ...
 .Xc
 .Pp
-Creates a snapshot with the given name. All previous modifications by
-successful system calls to the file system are part of the snapshot. See the
+Creates snapshots with the given names. All previous modifications by
+successful system calls to the file system are part of the snapshots.
+Snapshots are taken atomically, so that all snapshots correspond to the same
+moment in time. See the
 .Qq Sx Snapshots
 section for details.
 .Bl -tag -width indent
 .It Fl r
-Recursively create snapshots of all descendent datasets. Snapshots are taken
-atomically, so that all recursive snapshots correspond to the same moment in
-time.
+Recursively create snapshots of all descendent datasets
 .It Fl o Ar property Ns = Ns Ar value
 Sets the specified property; see
 .Qq Nm Cm create

Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Jun 14 18:56:37 2013	(r251756)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Jun 14 19:26:32 2013	(r251757)
@@ -58,6 +58,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -74,6 +75,7 @@ libzfs_handle_t *g_zfs;
 
 static FILE *mnttab_file;
 static char history_str[HIS_MAX_RECORD_LEN];
+static boolean_t log_history = B_TRUE;
 
 static int zfs_do_clone(int argc, char **argv);
 static int zfs_do_create(int argc, char **argv);
@@ -276,7 +278,7 @@ get_usage(zfs_help_t idx)
 		return (gettext("\tshare <-a | filesystem>\n"));
 	case HELP_SNAPSHOT:
 		return (gettext("\tsnapshot [-r] [-o property=value] ... "
-		    "\n"));
+		    " ...\n"));
 	case HELP_UNMOUNT:
 		return (gettext("\tunmount [-f] "
 		    "<-a | filesystem|mountpoint>\n"));
@@ -903,11 +905,12 @@ typedef struct destroy_cbdata {
 	boolean_t	cb_parsable;
 	boolean_t	cb_dryrun;
 	nvlist_t	*cb_nvl;
+	nvlist_t	*cb_batchedsnaps;
 
 	/* first snap in contiguous run */
-	zfs_handle_t	*cb_firstsnap;
+	char		*cb_firstsnap;
 	/* previous snap in contiguous run */
-	zfs_handle_t	*cb_prevsnap;
+	char		*cb_prevsnap;
 	int64_t		cb_snapused;
 	char		*cb_snapspec;
 } destroy_cbdata_t;
@@ -999,9 +1002,27 @@ destroy_callback(zfs_handle_t *zhp, void
 		zfs_close(zhp);
 		return (0);
 	}
+	if (cb->cb_dryrun) {
+		zfs_close(zhp);
+		return (0);
+	}
+
+	/*
+	 * We batch up all contiguous snapshots (even of different
+	 * filesystems) and destroy them with one ioctl.  We can't
+	 * simply do all snap deletions and then all fs deletions,
+	 * because we must delete a clone before its origin.
+	 */
+	if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) {
+		fnvlist_add_boolean(cb->cb_batchedsnaps, name);
+	} else {
+		int error = zfs_destroy_snaps_nvl(g_zfs,
+		    cb->cb_batchedsnaps, B_FALSE);
+		fnvlist_free(cb->cb_batchedsnaps);
+		cb->cb_batchedsnaps = fnvlist_alloc();
 
-	if (!cb->cb_dryrun) {
-		if (zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 ||
+		if (error != 0 ||
+		    zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 ||
 		    zfs_destroy(zhp, cb->cb_defer_destroy) != 0) {
 			zfs_close(zhp);
 			return (-1);
@@ -1021,11 +1042,13 @@ destroy_print_cb(zfs_handle_t *zhp, void
 
 	if (nvlist_exists(cb->cb_nvl, name)) {
 		if (cb->cb_firstsnap == NULL)
-			cb->cb_firstsnap = zfs_handle_dup(zhp);
+			cb->cb_firstsnap = strdup(name);
 		if (cb->cb_prevsnap != NULL)
-			zfs_close(cb->cb_prevsnap);
+			free(cb->cb_prevsnap);
 		/* this snap continues the current range */
-		cb->cb_prevsnap = zfs_handle_dup(zhp);
+		cb->cb_prevsnap = strdup(name);
+		if (cb->cb_firstsnap == NULL || cb->cb_prevsnap == NULL)
+			nomem();
 		if (cb->cb_verbose) {
 			if (cb->cb_parsable) {
 				(void) printf("destroy\t%s\n", name);
@@ -1040,12 +1063,12 @@ destroy_print_cb(zfs_handle_t *zhp, void
 	} else if (cb->cb_firstsnap != NULL) {
 		/* end of this range */
 		uint64_t used = 0;
-		err = zfs_get_snapused_int(cb->cb_firstsnap,
+		err = lzc_snaprange_space(cb->cb_firstsnap,
 		    cb->cb_prevsnap, &used);
 		cb->cb_snapused += used;
-		zfs_close(cb->cb_firstsnap);
+		free(cb->cb_firstsnap);
 		cb->cb_firstsnap = NULL;
-		zfs_close(cb->cb_prevsnap);
+		free(cb->cb_prevsnap);
 		cb->cb_prevsnap = NULL;
 	}
 	zfs_close(zhp);
@@ -1062,13 +1085,13 @@ destroy_print_snapshots(zfs_handle_t *fs
 	if (cb->cb_firstsnap != NULL) {
 		uint64_t used = 0;
 		if (err == 0) {
-			err = zfs_get_snapused_int(cb->cb_firstsnap,
+			err = lzc_snaprange_space(cb->cb_firstsnap,
 			    cb->cb_prevsnap, &used);
 		}
 		cb->cb_snapused += used;
-		zfs_close(cb->cb_firstsnap);
+		free(cb->cb_firstsnap);
 		cb->cb_firstsnap = NULL;
-		zfs_close(cb->cb_prevsnap);
+		free(cb->cb_prevsnap);
 		cb->cb_prevsnap = NULL;
 	}
 	return (err);
@@ -1155,8 +1178,10 @@ static int
 zfs_do_destroy(int argc, char **argv)
 {
 	destroy_cbdata_t cb = { 0 };
+	int rv = 0;
+	int err = 0;
 	int c;
-	zfs_handle_t *zhp;
+	zfs_handle_t *zhp = NULL;
 	char *at;
 	zfs_type_t type = ZFS_TYPE_DATASET;
 
@@ -1210,11 +1235,9 @@ zfs_do_destroy(int argc, char **argv)
 
 	at = strchr(argv[0], '@');
 	if (at != NULL) {
-		int err = 0;
 
 		/* Build the list of snaps to destroy in cb_nvl. */
-		if (nvlist_alloc(&cb.cb_nvl, NV_UNIQUE_NAME, 0) != 0)
-			nomem();
+		cb.cb_nvl = fnvlist_alloc();
 
 		*at = '\0';
 		zhp = zfs_open(g_zfs, argv[0],
@@ -1225,17 +1248,15 @@ zfs_do_destroy(int argc, char **argv)
 		cb.cb_snapspec = at + 1;
 		if (gather_snapshots(zfs_handle_dup(zhp), &cb) != 0 ||
 		    cb.cb_error) {
-			zfs_close(zhp);
-			nvlist_free(cb.cb_nvl);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
 		if (nvlist_empty(cb.cb_nvl)) {
 			(void) fprintf(stderr, gettext("could not find any "
 			    "snapshots to destroy; check snapshot names.\n"));
-			zfs_close(zhp);
-			nvlist_free(cb.cb_nvl);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
 		if (cb.cb_verbose) {
@@ -1254,18 +1275,26 @@ zfs_do_destroy(int argc, char **argv)
 		}
 
 		if (!cb.cb_dryrun) {
-			if (cb.cb_doclones)
+			if (cb.cb_doclones) {
+				cb.cb_batchedsnaps = fnvlist_alloc();
 				err = destroy_clones(&cb);
+				if (err == 0) {
+					err = zfs_destroy_snaps_nvl(g_zfs,
+					    cb.cb_batchedsnaps, B_FALSE);
+				}
+				if (err != 0) {
+					rv = 1;
+					goto out;
+				}
+			}
 			if (err == 0) {
-				err = zfs_destroy_snaps_nvl(zhp, cb.cb_nvl,
+				err = zfs_destroy_snaps_nvl(g_zfs, cb.cb_nvl,
 				    cb.cb_defer_destroy);
 			}
 		}
 
-		zfs_close(zhp);
-		nvlist_free(cb.cb_nvl);
 		if (err != 0)
-			return (1);
+			rv = 1;
 	} else {
 		/* Open the given dataset */
 		if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL)
@@ -1286,8 +1315,8 @@ zfs_do_destroy(int argc, char **argv)
 			    zfs_get_name(zhp));
 			(void) fprintf(stderr, gettext("use 'zpool destroy %s' "
 			    "to destroy the pool itself\n"), zfs_get_name(zhp));
-			zfs_close(zhp);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
 		/*
@@ -1297,30 +1326,42 @@ zfs_do_destroy(int argc, char **argv)
 		if (!cb.cb_doclones &&
 		    zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent,
 		    &cb) != 0) {
-			zfs_close(zhp);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
 		if (cb.cb_error) {
-			zfs_close(zhp);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
+		cb.cb_batchedsnaps = fnvlist_alloc();
 		if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback,
 		    &cb) != 0) {
-			zfs_close(zhp);
-			return (1);
+			rv = 1;
+			goto out;
 		}
 
 		/*
 		 * Do the real thing.  The callback will close the
 		 * handle regardless of whether it succeeds or not.
 		 */
-		if (destroy_callback(zhp, &cb) != 0)
-			return (1);
+		err = destroy_callback(zhp, &cb);
+		zhp = NULL;
+		if (err == 0) {
+			err = zfs_destroy_snaps_nvl(g_zfs,
+			    cb.cb_batchedsnaps, cb.cb_defer_destroy);
+		}
+		if (err != 0)
+			rv = 1;
 	}
 
-	return (0);
+out:
+	fnvlist_free(cb.cb_batchedsnaps);
+	fnvlist_free(cb.cb_nvl);
+	if (zhp != NULL)
+		zfs_close(zhp);
+	return (rv);
 }
 
 static boolean_t
@@ -1921,9 +1962,11 @@ upgrade_set_callback(zfs_handle_t *zhp, 
 			/*
 			 * If they did "zfs upgrade -a", then we could
 			 * be doing ioctls to different pools.  We need
-			 * to log this history once to each pool.
+			 * to log this history once to each pool, and bypass
+			 * the normal history logging that happens in main().
 			 */
-			verify(zpool_stage_history(g_zfs, history_str) == 0);
+			(void) zpool_log_history(g_zfs, history_str);
+			log_history = B_FALSE;
 		}
 		if (zfs_prop_set(zhp, "version", verstr) == 0)
 			cb->cb_numupgraded++;
@@ -3461,6 +3504,32 @@ zfs_do_set(int argc, char **argv)
 	return (ret);
 }
 
+typedef struct snap_cbdata {
+	nvlist_t *sd_nvl;
+	boolean_t sd_recursive;
+	const char *sd_snapname;
+} snap_cbdata_t;
+
+static int
+zfs_snapshot_cb(zfs_handle_t *zhp, void *arg)
+{
+	snap_cbdata_t *sd = arg;
+	char *name;
+	int rv = 0;
+	int error;
+
+	error = asprintf(&name, "%s@%s", zfs_get_name(zhp), sd->sd_snapname);
+	if (error == -1)
+		nomem();
+	fnvlist_add_boolean(sd->sd_nvl, name);
+	free(name);
+
+	if (sd->sd_recursive)
+		rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd);
+	zfs_close(zhp);
+	return (rv);
+}
+
 /*
  * zfs snapshot [-r] [-o prop=value] ... 
  *
@@ -3470,13 +3539,16 @@ zfs_do_set(int argc, char **argv)
 static int
 zfs_do_snapshot(int argc, char **argv)
 {
-	boolean_t recursive = B_FALSE;
 	int ret = 0;
 	char c;
 	nvlist_t *props;
+	snap_cbdata_t sd = { 0 };
+	boolean_t multiple_snaps = B_FALSE;
 
 	if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
 		nomem();
+	if (nvlist_alloc(&sd.sd_nvl, NV_UNIQUE_NAME, 0) != 0)
+		nomem();
 
 	/* check options */
 	while ((c = getopt(argc, argv, "ro:")) != -1) {
@@ -3486,7 +3558,8 @@ zfs_do_snapshot(int argc, char **argv)
 				return (1);
 			break;
 		case 'r':
-			recursive = B_TRUE;
+			sd.sd_recursive = B_TRUE;
+			multiple_snaps = B_TRUE;
 			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
@@ -3503,18 +3576,35 @@ zfs_do_snapshot(int argc, char **argv)
 		(void) fprintf(stderr, gettext("missing snapshot argument\n"));
 		goto usage;
 	}
-	if (argc > 1) {
-		(void) fprintf(stderr, gettext("too many arguments\n"));
-		goto usage;
+
+	if (argc > 1)
+		multiple_snaps = B_TRUE;
+	for (; argc > 0; argc--, argv++) {
+		char *atp;
+		zfs_handle_t *zhp;
+
+		atp = strchr(argv[0], '@');
+		if (atp == NULL)
+			goto usage;
+		*atp = '\0';
+		sd.sd_snapname = atp + 1;
+		zhp = zfs_open(g_zfs, argv[0],
+		    ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+		if (zhp == NULL)
+			goto usage;
+		if (zfs_snapshot_cb(zhp, &sd) != 0)
+			goto usage;
 	}
 
-	ret = zfs_snapshot(g_zfs, argv[0], recursive, props);
+	ret = zfs_snapshot_nvl(g_zfs, sd.sd_nvl, props);
+	nvlist_free(sd.sd_nvl);
 	nvlist_free(props);
-	if (ret && recursive)
+	if (ret != 0 && multiple_snaps)
 		(void) fprintf(stderr, gettext("no snapshots were created\n"));
 	return (ret != 0);
 
 usage:
+	nvlist_free(sd.sd_nvl);
 	nvlist_free(props);
 	usage(B_FALSE);
 	return (-1);
@@ -5057,28 +5147,12 @@ cleanup2:
 	return (error);
 }
 
-/*
- * zfs allow [-r] [-t]   ...
- *
- *	-r	Recursively hold
- *	-t	Temporary hold (hidden option)
- *
- * Apply a user-hold with the given tag to the list of snapshots.
- */
 static int
 zfs_do_allow(int argc, char **argv)
 {
 	return (zfs_do_allow_unallow_impl(argc, argv, B_FALSE));
 }
 
-/*
- * zfs unallow [-r] [-t]   ...
- *
- *	-r	Recursively hold
- *	-t	Temporary hold (hidden option)
- *
- * Apply a user-hold with the given tag to the list of snapshots.
- */
 static int
 zfs_do_unallow(int argc, char **argv)
 {
@@ -5092,7 +5166,6 @@ zfs_do_hold_rele_impl(int argc, char **a
 	int i;
 	const char *tag;
 	boolean_t recursive = B_FALSE;
-	boolean_t temphold = B_FALSE;
 	const char *opts = holding ? "rt" : "r";
 	int c;
 
@@ -5102,9 +5175,6 @@ zfs_do_hold_rele_impl(int argc, char **a
 		case 'r':
 			recursive = B_TRUE;
 			break;
-		case 't':
-			temphold = B_TRUE;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@@ -5153,7 +5223,7 @@ zfs_do_hold_rele_impl(int argc, char **a
 		}
 		if (holding) {
 			if (zfs_hold(zhp, delim+1, tag, recursive,
-			    temphold, B_FALSE, -1, 0, 0) != 0)
+			    B_FALSE, -1) != 0)
 				++errors;
 		} else {
 			if (zfs_release(zhp, delim+1, tag, recursive) != 0)
@@ -5169,7 +5239,6 @@ zfs_do_hold_rele_impl(int argc, char **a
  * zfs hold [-r] [-t]   ...
  *
  *	-r	Recursively hold
- *	-t	Temporary hold (hidden option)
  *
  * Apply a user-hold with the given tag to the list of snapshots.
  */
@@ -6591,8 +6660,7 @@ main(int argc, char **argv)
 		return (1);
 	}
 
-	zpool_set_history_str("zfs", argc, argv, history_str);
-	verify(zpool_stage_history(g_zfs, history_str) == 0);
+	zfs_save_arguments(argc, argv, history_str, sizeof (history_str));
 
 	libzfs_print_on_error(g_zfs, B_TRUE);
 
@@ -6661,6 +6729,9 @@ main(int argc, char **argv)
 
 	(void) fclose(mnttab_file);
 
+	if (ret == 0 && log_history)
+		(void) zpool_log_history(g_zfs, history_str);
+
 	libzfs_fini(g_zfs);
 
 	/*

Modified: stable/8/cddl/contrib/opensolaris/cmd/zhack/zhack.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Fri Jun 14 18:56:37 2013	(r251756)
+++ stable/8/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Fri Jun 14 19:26:32 2013	(r251757)
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 #undef ZFS_MAXNAMELEN
 #undef verify
 #include 
@@ -273,12 +274,15 @@ zhack_do_feature_stat(int argc, char **a
 }
 
 static void
-feature_enable_sync(void *arg1, void *arg2, dmu_tx_t *tx)
+feature_enable_sync(void *arg, dmu_tx_t *tx)
 {
-	spa_t *spa = arg1;
-	zfeature_info_t *feature = arg2;
+	spa_t *spa = dmu_tx_pool(tx)->dp_spa;
+	zfeature_info_t *feature = arg;
 
 	spa_feature_enable(spa, feature, tx);
+	spa_history_log_internal(spa, "zhack enable feature", tx,
+	    "name=%s can_readonly=%u",
+	    feature->fi_guid, feature->fi_can_readonly);
 }
 
 static void
@@ -341,8 +345,8 @@ zhack_do_feature_enable(int argc, char *
 	if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid))
 		fatal("feature already enabled: %s", feature.fi_guid);
 
-	VERIFY3U(0, ==, dsl_sync_task_do(spa->spa_dsl_pool, NULL,
-	    feature_enable_sync, spa, &feature, 5));
+	VERIFY0(dsl_sync_task(spa_name(spa), NULL,
+	    feature_enable_sync, &feature, 5));
 
 	spa_close(spa, FTAG);
 
@@ -350,21 +354,25 @@ zhack_do_feature_enable(int argc, char *
 }
 
 static void
-feature_incr_sync(void *arg1, void *arg2, dmu_tx_t *tx)
+feature_incr_sync(void *arg, dmu_tx_t *tx)
 {
-	spa_t *spa = arg1;
-	zfeature_info_t *feature = arg2;
+	spa_t *spa = dmu_tx_pool(tx)->dp_spa;
+	zfeature_info_t *feature = arg;
 
 	spa_feature_incr(spa, feature, tx);
+	spa_history_log_internal(spa, "zhack feature incr", tx,
+	    "name=%s", feature->fi_guid);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 19:35:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A6F61753;
 Fri, 14 Jun 2013 19:35:31 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 806571476;
 Fri, 14 Jun 2013 19:35:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EJZVn0046601;
 Fri, 14 Jun 2013 19:35:31 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EJZUYx046600;
 Fri, 14 Jun 2013 19:35:30 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306141935.r5EJZUYx046600@svn.freebsd.org>
From: Devin Teske 
Date: Fri, 14 Jun 2013 19:35:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251758 - head/usr.sbin/bsdconfig/share/packages
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 19:35:31 -0000

Author: dteske
Date: Fri Jun 14 19:35:30 2013
New Revision: 251758
URL: http://svnweb.freebsd.org/changeset/base/251758

Log:
  Add skeleton processing of selected packages in the order in which they
  should be processed. De-select each package as we "process" (actual
  processing still pending) each package so that if we get an error, we can
  return to an accurate state of selected packages.

Modified:
  head/usr.sbin/bsdconfig/share/packages/packages.subr

Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr	Fri Jun 14 19:26:32 2013	(r251757)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr	Fri Jun 14 19:35:30 2013	(r251758)
@@ -603,18 +603,53 @@ f_package_review()
 		--menu \"\$prompt\"                \
 		$height $width $rows               \
 		$menu_list                         \
-		2> /dev/null
-	local retval=$?
+		2> /dev/null || return $?
+			# Return if the user pressed ESC or chose Cancel/No
 
 	#
-	# XXX
-	#
-	f_show_msg "Coming soon..."
+	# Process each of the selected packages:
+	# + First, process dependencies.
+	# + Second, process packages marked for Install.
+	# + Third, process packages marked for Re-install.
+	# + Finally, process packages marked for Uninstall.
 	#
+	for package in $SELECTED_PACKAGES; do
+		mark=
+		f_str2varname "$package" varpkg
+		f_getvar _mark_$varpkg mark
+		[ "$mark" = "D" ] || continue
+		# XXX Install dependency
+		f_package_deselect "$package"
+	done
+	for package in $SELECTED_PACKAGES; do
+		mark=
+		f_str2varname "$package" varpkg
+		f_getvar _mark_$varpkg mark
+		[ "$mark" = "I" ] || continue
+		# XXX Install package
+		f_package_deselect "$package"
+	done
+	for package in $SELECTED_PACKAGES; do
+		mark=
+		f_str2varname "$package" varpkg
+		f_getvar _mark_$varpkg mark
+		[ "$mark" = "R" ] || continue
+		# XXX Re-install package
+		f_package_deselect "$package"
+	done
+	for package in $SELECTED_PACKAGES; do
+		mark=
+		f_str2varname "$package" varpkg
+		f_getvar _mark_$varpkg mark
+		[ "$mark" = "U" ] || continue
+		# XXX Uninstall package
+		f_package_deselect "$package"
+	done
+
 	# XXX
-	#
+	f_show_msg "Coming soon..."
 
-	return $retval
+	return $SUCCESS
 }
 
 # f_package_config

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 20:32:33 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A22C1357;
 Fri, 14 Jun 2013 20:32:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 93835179A;
 Fri, 14 Jun 2013 20:32:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EKWXus065054;
 Fri, 14 Jun 2013 20:32:33 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EKWXFi065053;
 Fri, 14 Jun 2013 20:32:33 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306142032.r5EKWXFi065053@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 20:32:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251759 - stable/9/sys/dev/acpi_support
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 20:32:33 -0000

Author: jhb
Date: Fri Jun 14 20:32:33 2013
New Revision: 251759
URL: http://svnweb.freebsd.org/changeset/base/251759

Log:
  MFC 250053:
  Only cleanup CMI-related state on detach if the system supports CMI.

Modified:
  stable/9/sys/dev/acpi_support/acpi_hp.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_hp.c	Fri Jun 14 19:35:30 2013	(r251758)
+++ stable/9/sys/dev/acpi_support/acpi_hp.c	Fri Jun 14 20:32:33 2013	(r251759)
@@ -573,28 +573,26 @@ acpi_hp_attach(device_t dev)
 static int
 acpi_hp_detach(device_t dev)
 {
-	int	ret;
+	struct acpi_hp_softc *sc;
 	
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
-	struct acpi_hp_softc *sc = device_get_softc(dev);
-	if (sc->has_cmi && sc->hpcmi_open_pid != 0) {
-		ret = EBUSY;
-	}
-	else {
-		if (sc->has_notify) {
-			ACPI_WMI_REMOVE_EVENT_HANDLER(dev,
-			    ACPI_HP_WMI_EVENT_GUID);
-		}
+	sc = device_get_softc(dev);
+	if (sc->has_cmi && sc->hpcmi_open_pid != 0)
+		return (EBUSY);
+
+	if (sc->has_notify)
+		ACPI_WMI_REMOVE_EVENT_HANDLER(dev, ACPI_HP_WMI_EVENT_GUID);
+
+	if (sc->has_cmi) {
 		if (sc->hpcmi_bufptr != -1) {
 			sbuf_delete(&sc->hpcmi_sbuf);
 			sc->hpcmi_bufptr = -1;
 		}
 		sc->hpcmi_open_pid = 0;
 		destroy_dev(sc->hpcmi_dev_t);
-		ret = 0;
 	}
 
-	return (ret);
+	return (0);
 }
 
 static int

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 20:44:24 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3BDBE6C6;
 Fri, 14 Jun 2013 20:44:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2D8241820;
 Fri, 14 Jun 2013 20:44:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EKiOO5068472;
 Fri, 14 Jun 2013 20:44:24 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EKiOPD068471;
 Fri, 14 Jun 2013 20:44:24 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306142044.r5EKiOPD068471@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 20:44:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251760 - stable/8/sys/dev/acpi_support
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 20:44:24 -0000

Author: jhb
Date: Fri Jun 14 20:44:23 2013
New Revision: 251760
URL: http://svnweb.freebsd.org/changeset/base/251760

Log:
  MFC 250053:
  Only cleanup CMI-related state on detach if the system supports CMI.

Modified:
  stable/8/sys/dev/acpi_support/acpi_hp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/acpi_support/   (props changed)

Modified: stable/8/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- stable/8/sys/dev/acpi_support/acpi_hp.c	Fri Jun 14 20:32:33 2013	(r251759)
+++ stable/8/sys/dev/acpi_support/acpi_hp.c	Fri Jun 14 20:44:23 2013	(r251760)
@@ -573,28 +573,26 @@ acpi_hp_attach(device_t dev)
 static int
 acpi_hp_detach(device_t dev)
 {
-	int	ret;
+	struct acpi_hp_softc *sc;
 	
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
-	struct acpi_hp_softc *sc = device_get_softc(dev);
-	if (sc->has_cmi && sc->hpcmi_open_pid != 0) {
-		ret = EBUSY;
-	}
-	else {
-		if (sc->has_notify) {
-			ACPI_WMI_REMOVE_EVENT_HANDLER(dev,
-			    ACPI_HP_WMI_EVENT_GUID);
-		}
+	sc = device_get_softc(dev);
+	if (sc->has_cmi && sc->hpcmi_open_pid != 0)
+		return (EBUSY);
+
+	if (sc->has_notify)
+		ACPI_WMI_REMOVE_EVENT_HANDLER(dev, ACPI_HP_WMI_EVENT_GUID);
+
+	if (sc->has_cmi) {
 		if (sc->hpcmi_bufptr != -1) {
 			sbuf_delete(&sc->hpcmi_sbuf);
 			sc->hpcmi_bufptr = -1;
 		}
 		sc->hpcmi_open_pid = 0;
 		destroy_dev(sc->hpcmi_dev_t);
-		ret = 0;
 	}
 
-	return (ret);
+	return (0);
 }
 
 static int

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 21:14:37 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 48A9D93;
 Fri, 14 Jun 2013 21:14:37 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2AA7B1957;
 Fri, 14 Jun 2013 21:14:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ELEbLR078405;
 Fri, 14 Jun 2013 21:14:37 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ELEaPx078403;
 Fri, 14 Jun 2013 21:14:36 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201306142114.r5ELEaPx078403@svn.freebsd.org>
From: Dimitry Andric 
Date: Fri, 14 Jun 2013 21:14:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251761 - in head/contrib/llvm/lib/Target/X86: . AsmParser
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 21:14:37 -0000

Author: dim
Date: Fri Jun 14 21:14:36 2013
New Revision: 251761
URL: http://svnweb.freebsd.org/changeset/base/251761

Log:
  Pull in r181620 from llvm trunk:
  
    [ms-inline asm] Fix a crasher when we fail on a direct match.
  
    The issue was that the MatchingInlineAsm and VariantID args to the
    MatchInstructionImpl function weren't being set properly.  Specifically, when
    parsing intel syntax, the parser thought it was parsing inline assembly in the
    at&t dialect; that will never be the case.
  
    The crash was caused when the emitter tried to emit the instruction, but the
    operands weren't set.  When parsing inline assembly we only set the opcode, not
    the operands, which is used to lookup the instruction descriptor.
    rdar://13854391 and PR15945
  
    Also, this commit reverts r176036.  Now that we're correctly parsing the intel
    syntax the pushad/popad don't match properly.  I've reimplemented that fix using
    a MnemonicAlias.
  
  Pull in r183907 from llvm trunk:
  
    X86: Make the cmov aliases work with intel syntax too.
  
  These commits make a number of Intel-style inline assembly mnemonics
  aliases (occurring in several ports) work properly, which could cause
  assertions otherwise.
  
  Reported by:	kwm, bapt

Modified:
  head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
  head/contrib/llvm/lib/Target/X86/X86InstrInfo.td

Modified: head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp	Fri Jun 14 20:44:23 2013	(r251760)
+++ head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp	Fri Jun 14 21:14:36 2013	(r251761)
@@ -2306,25 +2306,25 @@ MatchAndEmitInstruction(SMLoc IDLoc, uns
   unsigned Match1, Match2, Match3, Match4;
 
   Match1 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore,
-                                isParsingIntelSyntax());
+                                MatchingInlineAsm, isParsingIntelSyntax());
   // If this returned as a missing feature failure, remember that.
   if (Match1 == Match_MissingFeature)
     ErrorInfoMissingFeature = ErrorInfoIgnore;
   Tmp[Base.size()] = Suffixes[1];
   Match2 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore,
-                                isParsingIntelSyntax());
+                                MatchingInlineAsm, isParsingIntelSyntax());
   // If this returned as a missing feature failure, remember that.
   if (Match2 == Match_MissingFeature)
     ErrorInfoMissingFeature = ErrorInfoIgnore;
   Tmp[Base.size()] = Suffixes[2];
   Match3 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore,
-                                isParsingIntelSyntax());
+                                MatchingInlineAsm, isParsingIntelSyntax());
   // If this returned as a missing feature failure, remember that.
   if (Match3 == Match_MissingFeature)
     ErrorInfoMissingFeature = ErrorInfoIgnore;
   Tmp[Base.size()] = Suffixes[3];
   Match4 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore,
-                                isParsingIntelSyntax());
+                                MatchingInlineAsm, isParsingIntelSyntax());
   // If this returned as a missing feature failure, remember that.
   if (Match4 == Match_MissingFeature)
     ErrorInfoMissingFeature = ErrorInfoIgnore;

Modified: head/contrib/llvm/lib/Target/X86/X86InstrInfo.td
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86InstrInfo.td	Fri Jun 14 20:44:23 2013	(r251760)
+++ head/contrib/llvm/lib/Target/X86/X86InstrInfo.td	Fri Jun 14 21:14:36 2013	(r251761)
@@ -884,12 +884,12 @@ def PUSHF64    : I<0x9C, RawFrm, (outs),
 
 let Defs = [EDI, ESI, EBP, EBX, EDX, ECX, EAX, ESP], Uses = [ESP],
     mayLoad = 1, neverHasSideEffects = 1, SchedRW = [WriteLoad] in {
-def POPA32   : I<0x61, RawFrm, (outs), (ins), "popa{l|d}", [], IIC_POP_A>,
+def POPA32   : I<0x61, RawFrm, (outs), (ins), "popa{l}", [], IIC_POP_A>,
                Requires<[In32BitMode]>;
 }
 let Defs = [ESP], Uses = [EDI, ESI, EBP, EBX, EDX, ECX, EAX, ESP],
     mayStore = 1, neverHasSideEffects = 1, SchedRW = [WriteStore] in {
-def PUSHA32  : I<0x60, RawFrm, (outs), (ins), "pusha{l|d}", [], IIC_PUSH_A>,
+def PUSHA32  : I<0x60, RawFrm, (outs), (ins), "pusha{l}", [], IIC_PUSH_A>,
                Requires<[In32BitMode]>;
 }
 
@@ -1867,6 +1867,9 @@ def : MnemonicAlias<"pushf",  "pushfl", 
 def : MnemonicAlias<"pushf",  "pushfq", "att">, Requires<[In64BitMode]>;
 def : MnemonicAlias<"pushfd", "pushfl", "att">;
 
+def : MnemonicAlias<"popad",   "popa", "intel">, Requires<[In32BitMode]>;
+def : MnemonicAlias<"pushad",  "pusha", "intel">, Requires<[In32BitMode]>;
+
 def : MnemonicAlias<"repe",  "rep",   "att">;
 def : MnemonicAlias<"repz",  "rep",   "att">;
 def : MnemonicAlias<"repnz", "repne", "att">;
@@ -1919,29 +1922,31 @@ def : MnemonicAlias<"fucomip",  "fucompi
 def : MnemonicAlias<"fwait",    "wait",     "att">;
 
 
-class CondCodeAlias
+class CondCodeAlias
   : MnemonicAlias;
+                  !strconcat(Prefix, NewCond, Suffix), VariantName>;
 
 /// IntegerCondCodeMnemonicAlias - This multiclass defines a bunch of
 /// MnemonicAlias's that canonicalize the condition code in a mnemonic, for
 /// example "setz" -> "sete".
-multiclass IntegerCondCodeMnemonicAlias {
-  def C   : CondCodeAlias;   // setc   -> setb
-  def Z   : CondCodeAlias;   // setz   -> sete
-  def NA  : CondCodeAlias;  // setna  -> setbe
-  def NB  : CondCodeAlias;  // setnb  -> setae
-  def NC  : CondCodeAlias;  // setnc  -> setae
-  def NG  : CondCodeAlias;  // setng  -> setle
-  def NL  : CondCodeAlias;  // setnl  -> setge
-  def NZ  : CondCodeAlias;  // setnz  -> setne
-  def PE  : CondCodeAlias;   // setpe  -> setp
-  def PO  : CondCodeAlias;  // setpo  -> setnp
-
-  def NAE : CondCodeAlias;   // setnae -> setb
-  def NBE : CondCodeAlias;   // setnbe -> seta
-  def NGE : CondCodeAlias;   // setnge -> setl
-  def NLE : CondCodeAlias;   // setnle -> setg
+multiclass IntegerCondCodeMnemonicAlias {
+  def C   : CondCodeAlias; // setc   -> setb
+  def Z   : CondCodeAlias; // setz   -> sete
+  def NA  : CondCodeAlias; // setna  -> setbe
+  def NB  : CondCodeAlias; // setnb  -> setae
+  def NC  : CondCodeAlias; // setnc  -> setae
+  def NG  : CondCodeAlias; // setng  -> setle
+  def NL  : CondCodeAlias; // setnl  -> setge
+  def NZ  : CondCodeAlias; // setnz  -> setne
+  def PE  : CondCodeAlias; // setpe  -> setp
+  def PO  : CondCodeAlias; // setpo  -> setnp
+
+  def NAE : CondCodeAlias; // setnae -> setb
+  def NBE : CondCodeAlias; // setnbe -> seta
+  def NGE : CondCodeAlias; // setnge -> setl
+  def NLE : CondCodeAlias; // setnle -> setg
 }
 
 // Aliases for set
@@ -1949,9 +1954,11 @@ defm : IntegerCondCodeMnemonicAlias<"set
 // Aliases for j
 defm : IntegerCondCodeMnemonicAlias<"j", "">;
 // Aliases for cmov{w,l,q}
-defm : IntegerCondCodeMnemonicAlias<"cmov", "w">;
-defm : IntegerCondCodeMnemonicAlias<"cmov", "l">;
-defm : IntegerCondCodeMnemonicAlias<"cmov", "q">;
+defm : IntegerCondCodeMnemonicAlias<"cmov", "w", "att">;
+defm : IntegerCondCodeMnemonicAlias<"cmov", "l", "att">;
+defm : IntegerCondCodeMnemonicAlias<"cmov", "q", "att">;
+// No size suffix for intel-style asm.
+defm : IntegerCondCodeMnemonicAlias<"cmov", "", "intel">;
 
 
 //===----------------------------------------------------------------------===//

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 21:56:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9723B898;
 Fri, 14 Jun 2013 21:56:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 894211AB1;
 Fri, 14 Jun 2013 21:56:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ELuAme090774;
 Fri, 14 Jun 2013 21:56:10 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ELuAbm090773;
 Fri, 14 Jun 2013 21:56:10 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306142156.r5ELuAbm090773@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 21:56:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251762 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 21:56:10 -0000

Author: jhb
Date: Fri Jun 14 21:56:10 2013
New Revision: 251762
URL: http://svnweb.freebsd.org/changeset/base/251762

Log:
  MFC 250220:
  Fix FIONREAD on regular files.  The computed result was being ignored and
  it was being passed down to VOP_IOCTL() where it promptly resulted in
  ENOTTY due to a missing else for the past 8 years.  While here, use a
  shared vnode lock while fetching the current file's size.

Modified:
  stable/9/sys/kern/vfs_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_vnops.c
==============================================================================
--- stable/9/sys/kern/vfs_vnops.c	Fri Jun 14 21:14:36 2013	(r251761)
+++ stable/9/sys/kern/vfs_vnops.c	Fri Jun 14 21:56:10 2013	(r251762)
@@ -1333,13 +1333,12 @@ vn_ioctl(fp, com, data, active_cred, td)
 	case VREG:
 	case VDIR:
 		if (com == FIONREAD) {
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+			vn_lock(vp, LK_SHARED | LK_RETRY);
 			error = VOP_GETATTR(vp, &vattr, active_cred);
 			VOP_UNLOCK(vp, 0);
 			if (!error)
 				*(int *)data = vattr.va_size - fp->f_offset;
-		}
-		if (com == FIONBIO || com == FIOASYNC)	/* XXX */
+		} else if (com == FIONBIO || com == FIOASYNC)	/* XXX */
 			error = 0;
 		else
 			error = VOP_IOCTL(vp, com, data, fp->f_flag,

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 22:06:19 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 67AD0BBB;
 Fri, 14 Jun 2013 22:06:19 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A1011B0A;
 Fri, 14 Jun 2013 22:06:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EM6JId094126;
 Fri, 14 Jun 2013 22:06:19 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EM6Jqp094125;
 Fri, 14 Jun 2013 22:06:19 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201306142206.r5EM6Jqp094125@svn.freebsd.org>
From: Jilles Tjoelker 
Date: Fri, 14 Jun 2013 22:06:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251763 - head/bin/sh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 22:06:19 -0000

Author: jilles
Date: Fri Jun 14 22:06:18 2013
New Revision: 251763
URL: http://svnweb.freebsd.org/changeset/base/251763

Log:
  sh(1): A subshell environment has its own rlimits (ulimit).
  
  This has always been the case and is intended (just like cd).
  
  This matches Austin group issue #706.

Modified:
  head/bin/sh/sh.1

Modified: head/bin/sh/sh.1
==============================================================================
--- head/bin/sh/sh.1	Fri Jun 14 21:56:10 2013	(r251762)
+++ head/bin/sh/sh.1	Fri Jun 14 22:06:18 2013	(r251763)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd June 5, 2013
+.Dd June 14, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1036,6 +1036,9 @@ The current working directory as set by
 The file creation mask as set by
 .Ic umask .
 .It
+Resource limits as set by
+.Ic ulimit .
+.It
 References to open files.
 .It
 Traps as set by

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 22:06:45 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CDFF4D2D;
 Fri, 14 Jun 2013 22:06:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C04C31B11;
 Fri, 14 Jun 2013 22:06:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EM6j0T094235;
 Fri, 14 Jun 2013 22:06:45 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EM6jYc094234;
 Fri, 14 Jun 2013 22:06:45 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306142206.r5EM6jYc094234@svn.freebsd.org>
From: John Baldwin 
Date: Fri, 14 Jun 2013 22:06:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251764 - stable/8/sys/kern
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 22:06:45 -0000

Author: jhb
Date: Fri Jun 14 22:06:45 2013
New Revision: 251764
URL: http://svnweb.freebsd.org/changeset/base/251764

Log:
  MFC 250220:
  Fix FIONREAD on regular files.  The computed result was being ignored and
  it was being passed down to VOP_IOCTL() where it promptly resulted in
  ENOTTY due to a missing else for the past 8 years.  While here, use a
  shared vnode lock while fetching the current file's size.

Modified:
  stable/8/sys/kern/vfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/kern/   (props changed)

Modified: stable/8/sys/kern/vfs_vnops.c
==============================================================================
--- stable/8/sys/kern/vfs_vnops.c	Fri Jun 14 22:06:18 2013	(r251763)
+++ stable/8/sys/kern/vfs_vnops.c	Fri Jun 14 22:06:45 2013	(r251764)
@@ -952,13 +952,12 @@ vn_ioctl(fp, com, data, active_cred, td)
 	case VREG:
 	case VDIR:
 		if (com == FIONREAD) {
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+			vn_lock(vp, LK_SHARED | LK_RETRY);
 			error = VOP_GETATTR(vp, &vattr, active_cred);
 			VOP_UNLOCK(vp, 0);
 			if (!error)
 				*(int *)data = vattr.va_size - fp->f_offset;
-		}
-		if (com == FIONBIO || com == FIOASYNC)	/* XXX */
+		} else if (com == FIONBIO || com == FIOASYNC)	/* XXX */
 			error = 0;
 		else
 			error = VOP_IOCTL(vp, com, data, fp->f_flag,

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 22:32:48 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F405C8C7;
 Fri, 14 Jun 2013 22:32:47 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E6C921C1E;
 Fri, 14 Jun 2013 22:32:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EMWl30003670;
 Fri, 14 Jun 2013 22:32:47 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EMWlDg003669;
 Fri, 14 Jun 2013 22:32:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306142232.r5EMWlDg003669@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 14 Jun 2013 22:32:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251765 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 22:32:48 -0000

Author: brooks
Date: Fri Jun 14 22:32:47 2013
New Revision: 251765
URL: http://svnweb.freebsd.org/changeset/base/251765

Log:
  Simplify the hierarchy target's logic. [0]
  
  Run hierarchy with WORLDTMP in the path so it works when it is invoked
  directly.  Such use is nearly alwasy wrong but appears to be common.[1]
  
  PR:		conf/178209 [0], conf/178547 [1]
  Submitted by:	Garrett Cooper  [0]
  MFC after:	5 days

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 14 22:06:45 2013	(r251764)
+++ head/Makefile.inc1	Fri Jun 14 22:32:47 2013	(r251765)
@@ -263,6 +263,13 @@ WMAKEENV=	${CROSSENV} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
+
+# make hierarchy
+HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE}
+.if defined(NO_ROOT)
+HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
+.endif
+
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
 .endif
@@ -1367,12 +1374,7 @@ cross-tools:
 # hierarchy - ensure that all the needed directories are present
 #
 hierarchy hier:
-.if defined(NO_ROOT)
-	cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} \
-	    -DNO_ROOT METALOG=${METALOG} distrib-dirs
-.else
-	cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
-.endif
+	cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 23:04:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AF2221E1;
 Fri, 14 Jun 2013 23:04:31 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A21441D46;
 Fri, 14 Jun 2013 23:04:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EN4VTf013379;
 Fri, 14 Jun 2013 23:04:31 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EN4VO0013378;
 Fri, 14 Jun 2013 23:04:31 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306142304.r5EN4VO0013378@svn.freebsd.org>
From: Eitan Adler 
Date: Fri, 14 Jun 2013 23:04:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251766 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 23:04:31 -0000

Author: eadler
Date: Fri Jun 14 23:04:31 2013
New Revision: 251766
URL: http://svnweb.freebsd.org/changeset/base/251766

Log:
  Fix typo (dbM -> dBm)
  
  Submitted by:	Daan@vitsch.nl
  Reviewed by:	adrian

Modified:
  head/sys/net80211/ieee80211_var.h

Modified: head/sys/net80211/ieee80211_var.h
==============================================================================
--- head/sys/net80211/ieee80211_var.h	Fri Jun 14 22:32:47 2013	(r251765)
+++ head/sys/net80211/ieee80211_var.h	Fri Jun 14 23:04:31 2013	(r251766)
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-#define	IEEE80211_TXPOWER_MAX	100	/* .5 dbM (XXX units?) */
+#define	IEEE80211_TXPOWER_MAX	100	/* .5 dBm (XXX units?) */
 #define	IEEE80211_TXPOWER_MIN	0	/* kill radio */
 
 #define	IEEE80211_DTIM_DEFAULT	1	/* default DTIM period */

From owner-svn-src-all@FreeBSD.ORG  Fri Jun 14 23:43:47 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 86B7656F;
 Fri, 14 Jun 2013 23:43:47 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 75DF91E28;
 Fri, 14 Jun 2013 23:43:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ENhlhx025620;
 Fri, 14 Jun 2013 23:43:47 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ENhjC0025604;
 Fri, 14 Jun 2013 23:43:45 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201306142343.r5ENhjC0025604@svn.freebsd.org>
From: "Justin T. Gibbs" 
Date: Fri, 14 Jun 2013 23:43:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251767 - in head/sys: amd64/include/xen i386/include/xen
 xen xen/interface xen/interface/arch-arm/hvm xen/interface/arch-ia64
 xen/interface/arch-ia64/hvm xen/interface/arch-x86 xen/int...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 14 Jun 2013 23:43:47 -0000

Author: gibbs
Date: Fri Jun 14 23:43:44 2013
New Revision: 251767
URL: http://svnweb.freebsd.org/changeset/base/251767

Log:
  Upgrade Xen interface headers to Xen 4.2.1.
  
  Move FreeBSD from interface version 0x00030204 to 0x00030208.
  Updates are required to our grant table implementation before we
  can bump this further.
  
  sys/xen/hvm.h:
  	Replace the implementation of hvm_get_parameter(), formerly located
  	in sys/xen/interface/hvm/params.h.  Linux has a similar file which
  	primarily stores this function.
  
  sys/xen/xenstore/xenstore.c:
  	Include new xen/hvm.h header file to get hvm_get_parameter().
  
  sys/amd64/include/xen/xen-os.h:
  sys/i386/include/xen/xen-os.h:
  	Correctly protect function definition and variables from being
  	included into assembly files in xen-os.h
  
  	Xen memory barriers are now prefixed with "xen_" to avoid conflicts
  	with OS native primatives.  Define Xen memory barriers in terms of
  	the native FreeBSD primatives.
  
  Sponsored by:	Spectra Logic Corporation
  Reviewed by:	Roger Pau Monné
  Tested by:	Roger Pau Monné
  Obtained from:	Roger Pau Monné (bug fixes)

Added:
  head/sys/xen/hvm.h   (contents, props changed)
  head/sys/xen/interface/arch-arm.h   (contents, props changed)
  head/sys/xen/interface/arch-arm/hvm/save.h   (contents, props changed)
  head/sys/xen/interface/arch-ia64/debug_op.h   (contents, props changed)
  head/sys/xen/interface/arch-ia64/hvm/memmap.h   (contents, props changed)
  head/sys/xen/interface/arch-ia64/hvm/save.h   (contents, props changed)
  head/sys/xen/interface/arch-ia64/sioemu.h   (contents, props changed)
  head/sys/xen/interface/io/fsif.h   (contents, props changed)
  head/sys/xen/interface/io/libxenvchan.h   (contents, props changed)
  head/sys/xen/interface/io/usbif.h   (contents, props changed)
  head/sys/xen/interface/io/vscsiif.h   (contents, props changed)
  head/sys/xen/interface/mem_event.h   (contents, props changed)
  head/sys/xen/interface/tmem.h   (contents, props changed)
  head/sys/xen/interface/xsm/flask_op.h   (contents, props changed)
Directory Properties:
  head/sys/xen/interface/arch-arm/   (props changed)
  head/sys/xen/interface/arch-arm/hvm/   (props changed)
  head/sys/xen/interface/arch-ia64/   (props changed)
  head/sys/xen/interface/arch-ia64/hvm/   (props changed)
  head/sys/xen/interface/xsm/   (props changed)
Deleted:
  head/sys/xen/interface/hvm/vmx_assist.h
Modified:
  head/sys/amd64/include/xen/xen-os.h
  head/sys/i386/include/xen/xen-os.h
  head/sys/xen/interface/arch-ia64.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/cpuid.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/hvm/save.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/xen-mca.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/xen-x86_32.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/xen-x86_64.h   (contents, props changed)
  head/sys/xen/interface/arch-x86/xen.h   (contents, props changed)
  head/sys/xen/interface/arch-x86_32.h   (contents, props changed)
  head/sys/xen/interface/arch-x86_64.h   (contents, props changed)
  head/sys/xen/interface/domctl.h   (contents, props changed)
  head/sys/xen/interface/elfnote.h   (contents, props changed)
  head/sys/xen/interface/event_channel.h   (contents, props changed)
  head/sys/xen/interface/features.h   (contents, props changed)
  head/sys/xen/interface/grant_table.h   (contents, props changed)
  head/sys/xen/interface/hvm/hvm_info_table.h   (contents, props changed)
  head/sys/xen/interface/hvm/hvm_op.h   (contents, props changed)
  head/sys/xen/interface/hvm/ioreq.h   (contents, props changed)
  head/sys/xen/interface/hvm/params.h   (contents, props changed)
  head/sys/xen/interface/hvm/save.h   (contents, props changed)
  head/sys/xen/interface/io/blkif.h   (contents, props changed)
  head/sys/xen/interface/io/netif.h   (contents, props changed)
  head/sys/xen/interface/io/pciif.h   (contents, props changed)
  head/sys/xen/interface/io/protocols.h   (contents, props changed)
  head/sys/xen/interface/io/ring.h   (contents, props changed)
  head/sys/xen/interface/io/xs_wire.h   (contents, props changed)
  head/sys/xen/interface/kexec.h   (contents, props changed)
  head/sys/xen/interface/memory.h   (contents, props changed)
  head/sys/xen/interface/nmi.h   (contents, props changed)
  head/sys/xen/interface/physdev.h   (contents, props changed)
  head/sys/xen/interface/platform.h   (contents, props changed)
  head/sys/xen/interface/sched.h   (contents, props changed)
  head/sys/xen/interface/sysctl.h   (contents, props changed)
  head/sys/xen/interface/trace.h   (contents, props changed)
  head/sys/xen/interface/vcpu.h   (contents, props changed)
  head/sys/xen/interface/version.h   (contents, props changed)
  head/sys/xen/interface/xen-compat.h   (contents, props changed)
  head/sys/xen/interface/xen.h   (contents, props changed)
  head/sys/xen/interface/xenoprof.h   (contents, props changed)
  head/sys/xen/xenstore/xenstore.c
Directory Properties:
  head/sys/xen/interface/   (props changed)
  head/sys/xen/interface/COPYING   (props changed)
  head/sys/xen/interface/acm.h   (props changed)
  head/sys/xen/interface/acm_ops.h   (props changed)
  head/sys/xen/interface/arch-powerpc.h   (props changed)
  head/sys/xen/interface/arch-x86/   (props changed)
  head/sys/xen/interface/arch-x86/hvm/   (props changed)
  head/sys/xen/interface/callback.h   (props changed)
  head/sys/xen/interface/dom0_ops.h   (props changed)
  head/sys/xen/interface/elfstructs.h   (props changed)
  head/sys/xen/interface/foreign/   (props changed)
  head/sys/xen/interface/foreign/Makefile   (props changed)
  head/sys/xen/interface/foreign/mkchecker.py   (props changed)
  head/sys/xen/interface/foreign/mkheader.py   (props changed)
  head/sys/xen/interface/foreign/reference.size   (props changed)
  head/sys/xen/interface/foreign/structs.py   (props changed)
  head/sys/xen/interface/hvm/   (props changed)
  head/sys/xen/interface/hvm/e820.h   (props changed)
  head/sys/xen/interface/io/   (props changed)
  head/sys/xen/interface/io/console.h   (props changed)
  head/sys/xen/interface/io/fbif.h   (props changed)
  head/sys/xen/interface/io/kbdif.h   (props changed)
  head/sys/xen/interface/io/tpmif.h   (props changed)
  head/sys/xen/interface/io/xenbus.h   (props changed)
  head/sys/xen/interface/libelf.h   (props changed)
  head/sys/xen/interface/xencomm.h   (props changed)

Modified: head/sys/amd64/include/xen/xen-os.h
==============================================================================
--- head/sys/amd64/include/xen/xen-os.h	Fri Jun 14 23:04:31 2013	(r251766)
+++ head/sys/amd64/include/xen/xen-os.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -13,16 +13,21 @@
 #define CONFIG_X86_PAE
 #endif
 
+#ifdef LOCORE
+#define __ASSEMBLY__
+#endif
+
 #if !defined(__XEN_INTERFACE_VERSION__)  
-/*  
- * Can update to a more recent version when we implement  
- * the hypercall page  
- */  
-#define  __XEN_INTERFACE_VERSION__ 0x00030204  
+#define  __XEN_INTERFACE_VERSION__ 0x00030208
 #endif  
 
+#define GRANT_REF_INVALID   0xffffffff
+
 #include 
 
+/* Everything below this point is not included by assembler (.S) files. */
+#ifndef __ASSEMBLY__
+
 /* Force a proper event-channel callback from Xen. */
 void force_evtchn_callback(void);
 
@@ -43,10 +48,6 @@ static inline void rep_nop(void)
 void *bootmem_alloc(unsigned int size);
 void bootmem_free(void *ptr, unsigned int size);
 
-
-/* Everything below this point is not included by assembler (.S) files. */
-#ifndef __ASSEMBLY__
-
 void printk(const char *fmt, ...);
 
 /* some function prototypes */
@@ -128,14 +129,14 @@ do {                                    
 #else
 #endif
 
-#ifndef mb
-#define mb() __asm__ __volatile__("mfence":::"memory")
+#ifndef xen_mb
+#define xen_mb() mb()
 #endif
-#ifndef rmb
-#define rmb() __asm__ __volatile__("lfence":::"memory");
+#ifndef xen_rmb
+#define xen_rmb() rmb()
 #endif
-#ifndef wmb
-#define wmb() barrier()
+#ifndef xen_wmb
+#define xen_wmb() wmb()
 #endif
 #ifdef SMP
 #define smp_mb() mb() 

Modified: head/sys/i386/include/xen/xen-os.h
==============================================================================
--- head/sys/i386/include/xen/xen-os.h	Fri Jun 14 23:04:31 2013	(r251766)
+++ head/sys/i386/include/xen/xen-os.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -12,16 +12,21 @@
 #define CONFIG_X86_PAE
 #endif
 
+#ifdef LOCORE
+#define __ASSEMBLY__
+#endif
+
 #if !defined(__XEN_INTERFACE_VERSION__) 
-/* 
- * Can update to a more recent version when we implement 
- * the hypercall page 
- */ 
-#define  __XEN_INTERFACE_VERSION__ 0x00030204 
+#define  __XEN_INTERFACE_VERSION__ 0x00030208
 #endif 
 
+#define GRANT_REF_INVALID   0xffffffff
+
 #include 
 
+/* Everything below this point is not included by assembler (.S) files. */
+#ifndef __ASSEMBLY__
+
 /* Force a proper event-channel callback from Xen. */
 void force_evtchn_callback(void);
 
@@ -85,9 +90,6 @@ static inline void rep_nop(void)
 void *bootmem_alloc(unsigned int size);
 void bootmem_free(void *ptr, unsigned int size);
 
-
-/* Everything below this point is not included by assembler (.S) files. */
-#ifndef __ASSEMBLY__
 #include 
 
 void printk(const char *fmt, ...);
@@ -168,6 +170,15 @@ do {                                    
 
 #endif
 
+#ifndef xen_mb
+#define xen_mb() mb()
+#endif
+#ifndef xen_rmb
+#define xen_rmb() rmb()
+#endif
+#ifndef xen_wmb
+#define xen_wmb() wmb()
+#endif
 #ifdef SMP
 #define smp_mb() mb() 
 #define smp_rmb() rmb()

Added: head/sys/xen/hvm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/hvm.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,94 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	__XEN_HVM_H__
+#define	__XEN_HVM_H__
+
+#include 
+
+/**
+ * \brief Wrapper function to obtain a HVM parameter value.
+ *
+ * \param index	HVM parameter index; see .
+ * 
+ * \returns	0 on failure; the value of the parameter otherwise.
+ */
+static inline unsigned long
+hvm_get_parameter(int index)
+{
+	struct xen_hvm_param xhv;
+	int error;
+
+	xhv.domid = DOMID_SELF;
+	xhv.index = index;
+	error = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
+	if (error) {
+		printf("%s: error %d trying to get %d\n", __func__,
+		    error, index);
+		return (0);
+	}
+	return (xhv.value);
+}
+
+/** The callback method types for Hypervisor event delivery to our domain. */
+enum {
+	HVM_CB_TYPE_GSI,
+	HVM_CB_TYPE_PCI_INTX,
+	HVM_CB_TYPE_VECTOR,
+	HVM_CB_TYPE_MASK  = 0xFF,
+	HVM_CB_TYPE_SHIFT = 56
+};
+
+/** Format for specifying a GSI type callback. */
+enum {
+	HVM_CB_GSI_GSI_MASK  = 0xFFFFFFFF,
+	HVM_CB_GSI_GSI_SHIFT = 0
+};
+#define HVM_CALLBACK_GSI(gsi) \
+    (((uint64_t)HVM_CB_TYPE_GSI << HVM_CB_TYPE_SHIFT) \
+   | ((gsi) & HVM_CB_GSI_GSI_MASK) << HVM_CB_GSI_GSI_SHIFT)
+
+/** Format for specifying a virtual PCI interrupt line GSI style callback. */
+enum {
+	HVM_CB_PCI_INTX_INTPIN_MASK  = 0x3,
+	HVM_CB_PCI_INTX_INTPIN_SHIFT = 0,
+	HVM_CB_PCI_INTX_SLOT_MASK    = 0x1F,
+	HVM_CB_PCI_INTX_SLOT_SHIFT   = 11,
+};
+#define HVM_CALLBACK_PCI_INTX(slot, pin) \
+    (((uint64_t)HVM_CB_TYPE_PCI_INTX << HVM_CB_TYPE_SHIFT) \
+   | (((slot) & HVM_CB_PCI_INTX_SLOT_MASK) << HVM_CB_PCI_INTX_SLOT_SHIFT) \
+   | (((pin) & HVM_CB_PCI_INTX_INTPIN_MASK) << HVM_CB_PCI_INTX_INTPIN_SHIFT))
+
+/** Format for specifying a direct IDT vector injection style callback. */
+enum {
+	HVM_CB_VECTOR_VECTOR_MASK  = 0xFFFFFFFF,
+	HVM_CB_VECTOR_VECTOR_SHIFT = 0
+};
+#define HVM_CALLBACK_VECTOR(vector) \
+    (((uint64_t)HVM_CB_TYPE_VECTOR << HVM_CB_TYPE_SHIFT) \
+   | (((vector) & HVM_CB_GSI_GSI_MASK) << HVM_CB_GSI_GSI_SHIFT))
+
+void xen_hvm_set_callback(device_t);
+void xen_hvm_suspend(void);
+void xen_hvm_resume(void);
+#endif	/* __XEN_HVM_H__ */

Added: head/sys/xen/interface/arch-arm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-arm.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,176 @@
+/******************************************************************************
+ * arch-arm.h
+ *
+ * Guest OS interface to ARM Xen.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Copyright 2011 (C) Citrix Systems
+ */
+
+#ifndef __XEN_PUBLIC_ARCH_ARM_H__
+#define __XEN_PUBLIC_ARCH_ARM_H__
+
+/* hypercall calling convention
+ * ----------------------------
+ *
+ * A hypercall is issued using the ARM HVC instruction.
+ *
+ * A hypercall can take up to 5 arguments. These are passed in
+ * registers, the first argument in r0, the second argument in r1, the
+ * third in r2, the forth in r3 and the fifth in r4.
+ *
+ * The hypercall number is passed in r12.
+ *
+ * The HVC ISS must contain a Xen specific TAG: XEN_HYPERCALL_TAG.
+ *
+ * The return value is in r0.
+ *
+ * The hypercall will clobber r12 and the argument registers used by
+ * that hypercall (except r0 which is the return value) i.e. a 2
+ * argument hypercall will clobber r1 and a 4 argument hypercall will
+ * clobber r1, r2 and r3.
+ *
+ */
+
+#define XEN_HYPERCALL_TAG   0XEA1
+
+
+#ifndef __ASSEMBLY__
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+    typedef struct { type *p; } __guest_handle_ ## name
+
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+    ___DEFINE_XEN_GUEST_HANDLE(name, type);   \
+    ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)
+#define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
+#define __XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
+#define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)
+#define set_xen_guest_handle_raw(hnd, val)  do { (hnd).p = val; } while (0)
+#ifdef __XEN_TOOLS__
+#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
+#endif
+#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
+
+struct cpu_user_regs
+{
+    uint32_t r0;
+    uint32_t r1;
+    uint32_t r2;
+    uint32_t r3;
+    uint32_t r4;
+    uint32_t r5;
+    uint32_t r6;
+    uint32_t r7;
+    uint32_t r8;
+    uint32_t r9;
+    uint32_t r10;
+    union {
+        uint32_t r11;
+        uint32_t fp;
+    };
+    uint32_t r12;
+
+    uint32_t sp; /* r13 - SP: Valid for Hyp. frames only, o/w banked (see below) */
+
+    /* r14 - LR: is the same physical register as LR_usr */
+    union {
+        uint32_t lr; /* r14 - LR: Valid for Hyp. Same physical register as lr_usr. */
+        uint32_t lr_usr;
+    };
+
+    uint32_t pc; /* Return IP */
+    uint32_t cpsr; /* Return mode */
+    uint32_t pad0; /* Doubleword-align the kernel half of the frame */
+
+    /* Outer guest frame only from here on... */
+
+    uint32_t r8_fiq, r9_fiq, r10_fiq, r11_fiq, r12_fiq;
+
+    uint32_t sp_usr; /* LR_usr is the same register as LR, see above */
+
+    uint32_t sp_svc, sp_abt, sp_und, sp_irq, sp_fiq;
+    uint32_t lr_svc, lr_abt, lr_und, lr_irq, lr_fiq;
+
+    uint32_t spsr_svc, spsr_abt, spsr_und, spsr_irq, spsr_fiq;
+
+    uint32_t pad1; /* Doubleword-align the user half of the frame */
+};
+typedef struct cpu_user_regs cpu_user_regs_t;
+DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t);
+
+typedef uint64_t xen_pfn_t;
+#define PRI_xen_pfn PRIx64
+
+/* Maximum number of virtual CPUs in legacy multi-processor guests. */
+/* Only one. All other VCPUS must use VCPUOP_register_vcpu_info */
+#define XEN_LEGACY_MAX_VCPUS 1
+
+typedef uint32_t xen_ulong_t;
+
+struct vcpu_guest_context {
+    struct cpu_user_regs user_regs;         /* User-level CPU registers     */
+
+    uint32_t sctlr;
+    uint32_t ttbr0, ttbr1, ttbcr;
+};
+typedef struct vcpu_guest_context vcpu_guest_context_t;
+DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
+
+struct arch_vcpu_info { };
+typedef struct arch_vcpu_info arch_vcpu_info_t;
+
+struct arch_shared_info { };
+typedef struct arch_shared_info arch_shared_info_t;
+typedef uint64_t xen_callback_t;
+
+#endif /* ifndef __ASSEMBLY __ */
+
+/* PSR bits (CPSR, SPSR)*/
+
+/* 0-4: Mode */
+#define PSR_MODE_MASK 0x1f
+#define PSR_MODE_USR 0x10
+#define PSR_MODE_FIQ 0x11
+#define PSR_MODE_IRQ 0x12
+#define PSR_MODE_SVC 0x13
+#define PSR_MODE_MON 0x16
+#define PSR_MODE_ABT 0x17
+#define PSR_MODE_HYP 0x1a
+#define PSR_MODE_UND 0x1b
+#define PSR_MODE_SYS 0x1f
+
+#define PSR_THUMB       (1<<5)        /* Thumb Mode enable */
+#define PSR_FIQ_MASK    (1<<6)        /* Fast Interrupt mask */
+#define PSR_IRQ_MASK    (1<<7)        /* Interrupt mask */
+#define PSR_ABT_MASK    (1<<8)        /* Asynchronous Abort mask */
+#define PSR_BIG_ENDIAN  (1<<9)        /* Big Endian Mode */
+#define PSR_JAZELLE     (1<<24)       /* Jazelle Mode */
+
+#endif /*  __XEN_PUBLIC_ARCH_ARM_H__ */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Added: head/sys/xen/interface/arch-arm/hvm/save.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-arm/hvm/save.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,39 @@
+/*
+ * Structure definitions for HVM state that is held by Xen and must
+ * be saved along with the domain's memory and device-model state.
+ *
+ * Copyright (c) 2012 Citrix Systems Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_PUBLIC_HVM_SAVE_ARM_H__
+#define __XEN_PUBLIC_HVM_SAVE_ARM_H__
+
+#endif
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: head/sys/xen/interface/arch-ia64.h
==============================================================================
--- head/sys/xen/interface/arch-ia64.h	Fri Jun 14 23:04:31 2013	(r251766)
+++ head/sys/xen/interface/arch-ia64.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -49,10 +49,11 @@
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
 #define XEN_GUEST_HANDLE_64(name)       XEN_GUEST_HANDLE(name)
 #define uint64_aligned_t                uint64_t
-#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
+#define set_xen_guest_handle_raw(hnd, val)  do { (hnd).p = val; } while (0)
 #ifdef __XEN_TOOLS__
 #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
 #endif
+#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
 
 #ifndef __ASSEMBLY__
 typedef unsigned long xen_pfn_t;
@@ -66,7 +67,7 @@ typedef unsigned long xen_pfn_t;
 
 /* Maximum number of virtual CPUs in multi-processor guests. */
 /* WARNING: before changing this, check that shared_info fits on a page */
-#define MAX_VIRT_CPUS 64
+#define XEN_LEGACY_MAX_VCPUS 64
 
 /* IO ports location for PV.  */
 #define IO_PORTS_PADDR          0x00000ffffc000000UL
@@ -198,6 +199,15 @@ struct mapped_regs {
             unsigned long rrs[8]; // region registers
             unsigned long krs[8]; // kernel registers
             unsigned long tmp[16]; // temp registers (e.g. for hyperprivops)
+
+            /* itc paravirtualization
+             * vAR.ITC = mAR.ITC + itc_offset
+             * itc_last is one which was lastly passed to
+             * the guest OS in order to prevent it from
+             * going backwords.
+             */
+            unsigned long itc_offset;
+            unsigned long itc_last;
         };
     };
 };
@@ -392,6 +402,7 @@ struct vcpu_guest_context {
 #define VGCF_EXTRA_REGS (1UL << 1)	/* Set extra regs.  */
 #define VGCF_SET_CR_IRR (1UL << 2)	/* Set cr_irr[0:3]. */
 #define VGCF_online     (1UL << 3)  /* make this vcpu online */
+#define VGCF_SET_AR_ITC (1UL << 4)  /* set pv ar.itc. itc_offset, itc_last */
     unsigned long flags;       /* VGCF_* flags */
 
     struct vcpu_guest_context_regs regs;
@@ -453,6 +464,11 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_guest_conte
 /* unexpose the foreign domain's p2m table into privileged domain */
 #define IA64_DOM0VP_unexpose_foreign_p2m        13
 
+/* get memmap_info and memmap. It is possible to map the page directly
+   by foreign page mapping, but there is a race between writer.
+   This hypercall avoids such race. */
+#define IA64_DOM0VP_get_memmap          14
+
 // flags for page assignement to pseudo physical address space
 #define _ASSIGN_readonly                0
 #define ASSIGN_readonly                 (1UL << _ASSIGN_readonly)

Added: head/sys/xen/interface/arch-ia64/debug_op.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-ia64/debug_op.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,99 @@
+/******************************************************************************
+ * debug_op.h
+ *
+ * Copyright (c) 2007 Tristan Gingold 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_PUBLIC_IA64_DEBUG_OP_H__
+#define __XEN_PUBLIC_IA64_DEBUG_OP_H__
+
+/* Set/Get extra conditions to break.  */
+#define XEN_IA64_DEBUG_OP_SET_FLAGS 1
+#define XEN_IA64_DEBUG_OP_GET_FLAGS 2
+
+/* Break on kernel single step.  */
+#define XEN_IA64_DEBUG_ON_KERN_SSTEP   (1 << 0)
+
+/* Break on kernel debug (breakpoint or watch point).  */
+#define XEN_IA64_DEBUG_ON_KERN_DEBUG   (1 << 1)
+
+/* Break on kernel taken branch.  */
+#define XEN_IA64_DEBUG_ON_KERN_TBRANCH (1 << 2)
+
+/* Break on interrupt injection.  */
+#define XEN_IA64_DEBUG_ON_EXTINT       (1 << 3)
+
+/* Break on interrupt injection.  */
+#define XEN_IA64_DEBUG_ON_EXCEPT       (1 << 4)
+
+/* Break on event injection.  */
+#define XEN_IA64_DEBUG_ON_EVENT        (1 << 5)
+
+/* Break on privop/virtualized instruction (slow path only).  */
+#define XEN_IA64_DEBUG_ON_PRIVOP       (1 << 6)
+
+/* Break on emulated PAL call (at entry).  */
+#define XEN_IA64_DEBUG_ON_PAL          (1 << 7)
+
+/* Break on emulated SAL call (at entry).  */
+#define XEN_IA64_DEBUG_ON_SAL          (1 << 8)
+
+/* Break on emulated EFI call (at entry).  */
+#define XEN_IA64_DEBUG_ON_EFI          (1 << 9)
+
+/* Break on rfi emulation (slow path only, before exec).  */
+#define XEN_IA64_DEBUG_ON_RFI          (1 << 10)
+
+/* Break on address translation switch.  */
+#define XEN_IA64_DEBUG_ON_MMU          (1 << 11)
+
+/* Break on bad guest physical address.  */
+#define XEN_IA64_DEBUG_ON_BAD_MPA      (1 << 12)
+
+/* Force psr.ss bit.  */
+#define XEN_IA64_DEBUG_FORCE_SS        (1 << 13)
+
+/* Force psr.db bit.  */
+#define XEN_IA64_DEBUG_FORCE_DB        (1 << 14)
+
+/* Break on ITR/PTR.  */
+#define XEN_IA64_DEBUG_ON_TR           (1 << 15)
+
+/* Break on ITC/PTC.L/PTC.G/PTC.GA.  */
+#define XEN_IA64_DEBUG_ON_TC           (1 << 16)
+
+/* Get translation cache.  */
+#define XEN_IA64_DEBUG_OP_GET_TC   3
+
+/* Translate virtual address to guest physical address.  */
+#define XEN_IA64_DEBUG_OP_TRANSLATE 4
+
+union xen_ia64_debug_op {
+    uint64_t flags;
+    struct xen_ia64_debug_vtlb {
+        uint64_t nbr;                             /* IN/OUT */
+        XEN_GUEST_HANDLE_64(ia64_tr_entry_t) tr;  /* IN/OUT */
+    } vtlb;
+};
+typedef union xen_ia64_debug_op xen_ia64_debug_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_ia64_debug_op_t);
+
+#endif /* __XEN_PUBLIC_IA64_DEBUG_OP_H__ */

Added: head/sys/xen/interface/arch-ia64/hvm/memmap.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-ia64/hvm/memmap.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,91 @@
+/******************************************************************************
+ * memmap.h
+ *
+ * Copyright (c) 2008 Tristan Gingold 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_PUBLIC_HVM_MEMMAP_IA64_H__
+#define __XEN_PUBLIC_HVM_MEMMAP_IA64_H__
+
+#define MEM_G  (1UL << 30)
+#define MEM_M  (1UL << 20)
+#define MEM_K  (1UL << 10)
+
+/* Guest physical address of IO ports space.  */
+#define MMIO_START  (3 * MEM_G)
+#define MMIO_SIZE   (512 * MEM_M)
+
+#define VGA_IO_START  0xA0000UL
+#define VGA_IO_SIZE   0x20000
+
+#define LEGACY_IO_START  (MMIO_START + MMIO_SIZE)
+#define LEGACY_IO_SIZE   (64 * MEM_M)
+
+#define IO_PAGE_START  (LEGACY_IO_START + LEGACY_IO_SIZE)
+#define IO_PAGE_SIZE   XEN_PAGE_SIZE
+
+#define STORE_PAGE_START  (IO_PAGE_START + IO_PAGE_SIZE)
+#define STORE_PAGE_SIZE   XEN_PAGE_SIZE
+
+#define BUFFER_IO_PAGE_START  (STORE_PAGE_START + STORE_PAGE_SIZE)
+#define BUFFER_IO_PAGE_SIZE   XEN_PAGE_SIZE
+
+#define BUFFER_PIO_PAGE_START  (BUFFER_IO_PAGE_START + BUFFER_IO_PAGE_SIZE)
+#define BUFFER_PIO_PAGE_SIZE   XEN_PAGE_SIZE
+
+#define IO_SAPIC_START  0xfec00000UL
+#define IO_SAPIC_SIZE   0x100000
+
+#define PIB_START  0xfee00000UL
+#define PIB_SIZE   0x200000
+
+#define GFW_START  (4 * MEM_G - 16 * MEM_M)
+#define GFW_SIZE   (16 * MEM_M)
+
+/* domVTI */
+#define GPFN_FRAME_BUFFER  0x1 /* VGA framebuffer */
+#define GPFN_LOW_MMIO      0x2 /* Low MMIO range */
+#define GPFN_PIB           0x3 /* PIB base */
+#define GPFN_IOSAPIC       0x4 /* IOSAPIC base */
+#define GPFN_LEGACY_IO     0x5 /* Legacy I/O base */
+#define GPFN_HIGH_MMIO     0x6 /* High MMIO range */
+
+/* Nvram belongs to GFW memory space  */
+#define NVRAM_SIZE   (MEM_K * 64)
+#define NVRAM_START  (GFW_START + 10 * MEM_M)
+
+#define NVRAM_VALID_SIG  0x4650494e45584948 /* "HIXENIPF" */
+struct nvram_save_addr {
+    unsigned long addr;
+    unsigned long signature;
+};
+
+#endif /* __XEN_PUBLIC_HVM_MEMMAP_IA64_H__ */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Added: head/sys/xen/interface/arch-ia64/hvm/save.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-ia64/hvm/save.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,208 @@
+/******************************************************************************
+ * save_types.h
+ *
+ * Copyright (c) 2007 Isaku Yamahata 
+ *                    VA Linux Systems Japan K.K.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_PUBLIC_HVM_SAVE_IA64_H__
+#define __XEN_PUBLIC_HVM_SAVE_IA64_H__
+
+#include "../../hvm/save.h"
+#include "../../arch-ia64.h"
+
+/* 
+ * Save/restore header: general info about the save file. 
+ */
+
+/* x86 uses 0x54381286 */
+#define HVM_FILE_MAGIC   0x343641492f6e6558UL   /* "Xen/IA64" */
+#define HVM_FILE_VERSION 0x0000000000000001UL
+
+struct hvm_save_header {
+    uint64_t magic;             /* Must be HVM_FILE_MAGIC */
+    uint64_t version;           /* File format version */
+    uint64_t changeset;         /* Version of Xen that saved this file */
+    uint64_t cpuid[5];          /* CPUID[0x01][%eax] on the saving machine */
+};
+
+DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header);
+
+/*
+ * CPU
+ */
+struct hvm_hw_ia64_cpu {
+    uint64_t    ipsr;
+};
+DECLARE_HVM_SAVE_TYPE(CPU, 2, struct hvm_hw_ia64_cpu);
+
+/*
+ * CPU
+ */
+struct hvm_hw_ia64_vpd {
+    struct vpd      vpd;
+};
+DECLARE_HVM_SAVE_TYPE(VPD, 3, struct hvm_hw_ia64_vpd);
+
+/*
+ * device dependency
+ * vacpi => viosapic => vlsapic
+ */
+/*
+ * vlsapic
+ */
+struct hvm_hw_ia64_vlsapic {
+    uint64_t insvc[4];
+    uint64_t vhpi; // ??? should this be saved in vpd
+    uint8_t xtp;
+    uint8_t pal_init_pending;
+    uint8_t pad[2];
+};
+DECLARE_HVM_SAVE_TYPE(VLSAPIC, 4, struct hvm_hw_ia64_vlsapic);
+/* set
+ * unconditionaly set v->arch.irq_new_peding = 1 
+ * unconditionaly set v->arch.irq_new_condition = 0
+ */
+
+/*
+ * vtime
+ */
+/* itc, itm, itv are saved by arch vcpu context */
+struct hvm_hw_ia64_vtime {
+    uint64_t itc;
+    uint64_t itm;
+
+    uint64_t last_itc;
+    uint64_t pending;
+};
+DECLARE_HVM_SAVE_TYPE(VTIME, 5, struct hvm_hw_ia64_vtime);
+/*
+ * calculate v->vtm.vtm_offset
+ * ??? Or should vtm_offset be set by leave_hypervisor_tail()?
+ * start vtm_timer if necessary by vtm_set_itm().
+ * ??? Or should vtm_timer be set by leave_hypervisor_tail()?
+ *
+ * ??? or should be done by schedule_tail()
+ *        => schedule_tail() should do.
+ */
+
+/*
+ * viosapic
+ */
+#define VIOSAPIC_NUM_PINS     48
+
+/* To share VT-d code which uses vioapic_redir_entry.
+ * Although on ia64 this is for vsapic, but we have to vioapic_redir_entry
+ * instead of viosapic_redir_entry.
+ */
+union vioapic_redir_entry
+{
+    uint64_t bits;
+    struct {
+        uint8_t vector;
+
+        uint8_t delivery_mode  : 3;
+        uint8_t reserve1       : 1;
+        uint8_t delivery_status: 1;
+        uint8_t polarity       : 1;
+        uint8_t reserve2       : 1;
+        uint8_t trig_mode      : 1;
+
+        uint8_t mask           : 1;
+        uint8_t reserve3       : 7;
+
+        uint8_t reserved[3];
+        uint16_t dest_id;
+    } fields;
+};
+
+struct hvm_hw_ia64_viosapic {
+    uint64_t    irr;
+    uint64_t    isr;
+    uint32_t    ioregsel;
+    uint32_t    pad;
+    uint64_t    lowest_vcpu_id;
+    uint64_t    base_address;
+    union vioapic_redir_entry  redirtbl[VIOSAPIC_NUM_PINS];
+};
+DECLARE_HVM_SAVE_TYPE(VIOSAPIC, 6, struct hvm_hw_ia64_viosapic);
+  
+/*
+ * vacpi
+ * PM timer
+ */
+struct vacpi_regs {
+    union {
+        struct {
+            uint32_t pm1a_sts:16;/* PM1a_EVT_BLK.PM1a_STS: status register */
+            uint32_t pm1a_en:16; /* PM1a_EVT_BLK.PM1a_EN: enable register */
+        };
+        uint32_t evt_blk;
+    };
+    uint32_t tmr_val;   /* PM_TMR_BLK.TMR_VAL: 32bit free-running counter */
+};
+
+struct hvm_hw_ia64_vacpi {
+    struct vacpi_regs   regs;
+};
+DECLARE_HVM_SAVE_TYPE(VACPI, 7, struct hvm_hw_ia64_vacpi);
+/* update last_gtime and setup timer of struct vacpi */
+
+/*
+ * opt_feature: identity mapping of region 4, 5 and 7.
+ * With the c/s 16396:d2935f9c217f of xen-ia64-devel.hg,
+ * opt_feature hypercall supports only region 4,5,7 identity mappings.
+ * structure hvm_hw_ia64_identity_mappings only supports them.
+ * The new structure, struct hvm_hw_ia64_identity_mappings, is created to
+ * avoid to keep up with change of the xen/ia64 internal structure, struct
+ * opt_feature.
+ *
+ * If it is enhanced in the future, new structure will be created.
+ */
+struct hvm_hw_ia64_identity_mapping {
+    uint64_t on;        /* on/off */
+    uint64_t pgprot;    /* The page protection bit mask of the pte. */
+    uint64_t key;       /* A protection key. */
+};
+
+struct hvm_hw_ia64_identity_mappings {
+    struct hvm_hw_ia64_identity_mapping im_reg4;/* Region 4 identity mapping */
+    struct hvm_hw_ia64_identity_mapping im_reg5;/* Region 5 identity mapping */
+    struct hvm_hw_ia64_identity_mapping im_reg7;/* Region 7 identity mapping */
+};
+DECLARE_HVM_SAVE_TYPE(OPT_FEATURE_IDENTITY_MAPPINGS, 8, struct hvm_hw_ia64_identity_mappings);
+
+/* 
+ * Largest type-code in use
+ */
+#define HVM_SAVE_CODE_MAX       8
+
+#endif /* __XEN_PUBLIC_HVM_SAVE_IA64_H__ */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Added: head/sys/xen/interface/arch-ia64/sioemu.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/xen/interface/arch-ia64/sioemu.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -0,0 +1,92 @@
+/******************************************************************************
+ * sioemu.h
+ *
+ * Copyright (c) 2008 Tristan Gingold 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_PUBLIC_IA64_SIOEMU_H__
+#define __XEN_PUBLIC_IA64_SIOEMU_H__
+
+/* SIOEMU specific hypercalls.
+   The numbers are the minor part of FW_HYPERCALL_SIOEMU.  */
+
+/* Defines the callback entry point.  r8=ip, r9=data.
+   Must be called per-vcpu.  */
+#define SIOEMU_HYPERCALL_SET_CALLBACK 0x01
+
+/* Finish sioemu fw initialization and start firmware.  r8=ip.  */
+#define SIOEMU_HYPERCALL_START_FW 0x02
+
+/* Add IO pages in physmap.  */
+#define SIOEMU_HYPERCALL_ADD_IO_PHYSMAP 0x03
+
+/* Get wallclock time.  */
+#define SIOEMU_HYPERCALL_GET_TIME 0x04
+
+/* Flush cache.  */
+#define SIOEMU_HYPERCALL_FLUSH_CACHE 0x07
+
+/* Get freq base.  */
+#define SIOEMU_HYPERCALL_FREQ_BASE 0x08
+
+/* Return from callback.  */
+#define SIOEMU_HYPERCALL_CALLBACK_RETURN 0x09
+
+/* Deliver an interrupt.  */
+#define SIOEMU_HYPERCALL_DELIVER_INT 0x0a
+
+/* SIOEMU callback reason.  */
+
+/* An event (from event channel) has to be delivered.  */
+#define SIOEMU_CB_EVENT       0x00
+
+/* Emulate an IO access.  */
+#define SIOEMU_CB_IO_EMULATE  0x01
+
+/* An IPI is sent to a dead vcpu.  */
+#define SIOEMU_CB_WAKEUP_VCPU 0x02
+
+/* A SAL hypercall is executed.  */
+#define SIOEMU_CB_SAL_ASSIST  0x03
+
+#ifndef __ASSEMBLY__
+struct sioemu_callback_info {
+    /* Saved registers.  */
+    unsigned long ip;
+    unsigned long psr;
+    unsigned long ifs;
+    unsigned long nats;
+    unsigned long r8;
+    unsigned long r9;
+    unsigned long r10;
+    unsigned long r11;
+
+    /* Callback parameters.  */
+    unsigned long cause;
+    unsigned long arg0;
+    unsigned long arg1;
+    unsigned long arg2;
+    unsigned long arg3;
+    unsigned long _pad2[2];
+    unsigned long r2;
+};
+#endif /* __ASSEMBLY__ */
+#endif /* __XEN_PUBLIC_IA64_SIOEMU_H__ */

Modified: head/sys/xen/interface/arch-x86/cpuid.h
==============================================================================
--- head/sys/xen/interface/arch-x86/cpuid.h	Fri Jun 14 23:04:31 2013	(r251766)
+++ head/sys/xen/interface/arch-x86/cpuid.h	Fri Jun 14 23:43:44 2013	(r251767)
@@ -24,7 +24,7 @@
  * Copyright (c) 2007 Citrix Systems, Inc.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 01:35:52 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D382FE6C;
 Sat, 15 Jun 2013 01:35:52 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C42521142;
 Sat, 15 Jun 2013 01:35:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F1Zqa9060661;
 Sat, 15 Jun 2013 01:35:52 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F1Zqpw060659;
 Sat, 15 Jun 2013 01:35:52 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306150135.r5F1Zqpw060659@svn.freebsd.org>
From: Rick Macklem 
Date: Sat, 15 Jun 2013 01:35:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251768 - in stable/8/sys: fs/nfsclient nfsclient
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 01:35:52 -0000

Author: rmacklem
Date: Sat Jun 15 01:35:52 2013
New Revision: 251768
URL: http://svnweb.freebsd.org/changeset/base/251768

Log:
  MFC: r249623
  Both NFS clients can deadlock when using the "rdirplus" mount
  option. This can occur when an nfsiod thread that already holds
  a buffer lock attempts to acquire a vnode lock on an entry in
  the directory (a LOR) when another thread holding the vnode lock
  is waiting on an nfsiod thread. This patch avoids the deadlock by disabling
  readahead for this case, so the nfsiod threads never do readdirplus.
  Since readaheads for directories need the directory offset cookie
  from the previous read, they cannot normally happen in parallel.
  As such, testing by jhb@ and myself didn't find any performance
  degredation when this patch is applied. If there is a case where
  this results in a significant performance degradation, mounting
  without the "rdirplus" option can be done to re-enable readahead
  for directories.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clbio.c
  stable/8/sys/nfsclient/nfs_bio.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/fs/   (props changed)
  stable/8/sys/nfsclient/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clbio.c	Fri Jun 14 23:43:44 2013	(r251767)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c	Sat Jun 15 01:35:52 2013	(r251768)
@@ -1368,10 +1368,18 @@ ncl_asyncio(struct nfsmount *nmp, struct
 	 * Commits are usually short and sweet so lets save some cpu and
 	 * leave the async daemons for more important rpc's (such as reads
 	 * and writes).
+	 *
+	 * Readdirplus RPCs do vget()s to acquire the vnodes for entries
+	 * in the directory in order to update attributes. This can deadlock
+	 * with another thread that is waiting for async I/O to be done by
+	 * an nfsiod thread while holding a lock on one of these vnodes.
+	 * To avoid this deadlock, don't allow the async nfsiod threads to
+	 * perform Readdirplus RPCs.
 	 */
 	mtx_lock(&ncl_iod_mutex);
-	if (bp->b_iocmd == BIO_WRITE && (bp->b_flags & B_NEEDCOMMIT) &&
-	    (nmp->nm_bufqiods > ncl_numasync / 2)) {
+	if ((bp->b_iocmd == BIO_WRITE && (bp->b_flags & B_NEEDCOMMIT) &&
+	     (nmp->nm_bufqiods > ncl_numasync / 2)) ||
+	    (bp->b_vp->v_type == VDIR && (nmp->nm_flag & NFSMNT_RDIRPLUS))) {
 		mtx_unlock(&ncl_iod_mutex);
 		return(EIO);
 	}

Modified: stable/8/sys/nfsclient/nfs_bio.c
==============================================================================
--- stable/8/sys/nfsclient/nfs_bio.c	Fri Jun 14 23:43:44 2013	(r251767)
+++ stable/8/sys/nfsclient/nfs_bio.c	Sat Jun 15 01:35:52 2013	(r251768)
@@ -1360,10 +1360,18 @@ nfs_asyncio(struct nfsmount *nmp, struct
 	 * Commits are usually short and sweet so lets save some cpu and
 	 * leave the async daemons for more important rpc's (such as reads
 	 * and writes).
+	 *
+	 * Readdirplus RPCs do vget()s to acquire the vnodes for entries
+	 * in the directory in order to update attributes. This can deadlock
+	 * with another thread that is waiting for async I/O to be done by
+	 * an nfsiod thread while holding a lock on one of these vnodes.
+	 * To avoid this deadlock, don't allow the async nfsiod threads to
+	 * perform Readdirplus RPCs.
 	 */
 	mtx_lock(&nfs_iod_mtx);
-	if (bp->b_iocmd == BIO_WRITE && (bp->b_flags & B_NEEDCOMMIT) &&
-	    (nmp->nm_bufqiods > nfs_numasync / 2)) {
+	if ((bp->b_iocmd == BIO_WRITE && (bp->b_flags & B_NEEDCOMMIT) &&
+	     (nmp->nm_bufqiods > nfs_numasync / 2)) ||
+	    (bp->b_vp->v_type == VDIR && (nmp->nm_flag & NFSMNT_RDIRPLUS))) {
 		mtx_unlock(&nfs_iod_mtx);
 		return(EIO);
 	}

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 03:55:04 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BDADA8E0;
 Sat, 15 Jun 2013 03:55:04 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B0927171E;
 Sat, 15 Jun 2013 03:55:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F3t4B1005038;
 Sat, 15 Jun 2013 03:55:04 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F3t4NK005036;
 Sat, 15 Jun 2013 03:55:04 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201306150355.r5F3t4NK005036@svn.freebsd.org>
From: Bryan Venteicher 
Date: Sat, 15 Jun 2013 03:55:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251769 - head/sys/dev/virtio/network
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 03:55:04 -0000

Author: bryanv
Date: Sat Jun 15 03:55:04 2013
New Revision: 251769
URL: http://svnweb.freebsd.org/changeset/base/251769

Log:
  Merge r250802 from bryanv/vtnetmq - Fix setting of the Rx filters
  
  QEMU 1.4 made the descriptor requirement stricter - the size of buffer
  descriptor must exactly match the number of MAC addresses provided.
  
  PR:		kern/178955
  MFC after:	5 days

Modified:
  head/sys/dev/virtio/network/if_vtnet.c

Modified: head/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- head/sys/dev/virtio/network/if_vtnet.c	Sat Jun 15 01:35:52 2013	(r251768)
+++ head/sys/dev/virtio/network/if_vtnet.c	Sat Jun 15 03:55:04 2013	(r251769)
@@ -2470,9 +2470,9 @@ vtnet_rx_filter_mac(struct vtnet_softc *
 	sglist_init(&sg, 4, segs);
 	error |= sglist_append(&sg, &hdr, sizeof(struct virtio_net_ctrl_hdr));
 	error |= sglist_append(&sg, &filter->vmf_unicast,
-	    sizeof(struct vtnet_mac_table));
+	    sizeof(uint32_t) + filter->vmf_unicast.nentries * ETHER_ADDR_LEN);
 	error |= sglist_append(&sg, &filter->vmf_multicast,
-	    sizeof(struct vtnet_mac_table));
+	    sizeof(uint32_t) + filter->vmf_multicast.nentries * ETHER_ADDR_LEN);
 	error |= sglist_append(&sg, &ack, sizeof(uint8_t));
 	KASSERT(error == 0 && sg.sg_nseg == 4,
 	    ("error adding MAC filtering message to sglist"));

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 04:03:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DA123B2D;
 Sat, 15 Jun 2013 04:03:41 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CCB2A1758;
 Sat, 15 Jun 2013 04:03:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F43faV008146;
 Sat, 15 Jun 2013 04:03:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F43esv008143;
 Sat, 15 Jun 2013 04:03:40 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306150403.r5F43esv008143@svn.freebsd.org>
From: Lawrence Stewart 
Date: Sat, 15 Jun 2013 04:03:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251770 - in head/sys: kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 04:03:41 -0000

Author: lstewart
Date: Sat Jun 15 04:03:40 2013
New Revision: 251770
URL: http://svnweb.freebsd.org/changeset/base/251770

Log:
  Internalise handling of virtualised hook points inside
  hhook_{add|remove}_hook_lookup() so that khelp (and other potential API
  consumers) do not have to care when they attempt to (un)hook a particular hook
  point identified by id and type.
  
  Reviewed by:	scottl
  MFC after:	1 week

Modified:
  head/sys/kern/kern_hhook.c
  head/sys/kern/kern_khelp.c
  head/sys/sys/hhook.h

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Sat Jun 15 03:55:04 2013	(r251769)
+++ head/sys/kern/kern_hhook.c	Sat Jun 15 04:03:40 2013	(r251770)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2010 Lawrence Stewart 
+ * Copyright (c) 2010,2013 Lawrence Stewart 
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -69,6 +69,9 @@ static struct mtx hhook_head_list_lock;
 MTX_SYSINIT(hhookheadlistlock, &hhook_head_list_lock, "hhook_head list lock",
     MTX_DEF);
 
+/* Protected by hhook_head_list_lock. */
+static uint32_t n_hhookheads;
+
 /* Private function prototypes. */
 static void hhook_head_destroy(struct hhook_head *hhh);
 
@@ -165,21 +168,71 @@ hhook_add_hook(struct hhook_head *hhh, s
 }
 
 /*
- * Lookup a helper hook point and register a new helper hook function with it.
+ * Register a helper hook function with a helper hook point (including all
+ * virtual instances of the hook point if it is virtualised).
+ *
+ * The logic is unfortunately far more complex than for
+ * hhook_remove_hook_lookup() because hhook_add_hook() can call malloc() with
+ * M_WAITOK and thus we cannot call hhook_add_hook() with the
+ * hhook_head_list_lock held.
+ *
+ * The logic assembles an array of hhook_head structs that correspond to the
+ * helper hook point being hooked and bumps the refcount on each (all done with
+ * the hhook_head_list_lock held). The hhook_head_list_lock is then dropped, and
+ * hhook_add_hook() is called and the refcount dropped for each hhook_head
+ * struct in the array.
  */
 int
 hhook_add_hook_lookup(struct hookinfo *hki, uint32_t flags)
 {
-	struct hhook_head *hhh;
-	int error;
+	struct hhook_head **heads_to_hook, *hhh;
+	int error, i, n_heads_to_hook;
 
-	hhh = hhook_head_get(hki->hook_type, hki->hook_id);
+tryagain:
+	error = i = 0;
+	/*
+	 * Accessing n_hhookheads without hhook_head_list_lock held opens up a
+	 * race with hhook_head_register() which we are unlikely to lose, but
+	 * nonetheless have to cope with - hence the complex goto logic.
+	 */
+	n_heads_to_hook = n_hhookheads;
+	heads_to_hook = malloc(n_heads_to_hook * sizeof(struct hhook_head *),
+	    M_HHOOK, flags & HHOOK_WAITOK ? M_WAITOK : M_NOWAIT);
+	if (heads_to_hook == NULL)
+		return (ENOMEM);
 
-	if (hhh == NULL)
-		return (ENOENT);
+	HHHLIST_LOCK();
+	LIST_FOREACH(hhh, &hhook_head_list, hhh_next) {
+		if (hhh->hhh_type == hki->hook_type &&
+		    hhh->hhh_id == hki->hook_id) {
+			if (i < n_heads_to_hook) {
+				heads_to_hook[i] = hhh;
+				refcount_acquire(&heads_to_hook[i]->hhh_refcount);
+				i++;
+			} else {
+				/*
+				 * We raced with hhook_head_register() which
+				 * inserted a hhook_head that we need to hook
+				 * but did not malloc space for. Abort this run
+				 * and try again.
+				 */
+				for (i--; i >= 0; i--)
+					refcount_release(&heads_to_hook[i]->hhh_refcount);
+				free(heads_to_hook, M_HHOOK);
+				HHHLIST_UNLOCK();
+				goto tryagain;
+			}
+		}
+	}
+	HHHLIST_UNLOCK();
 
-	error = hhook_add_hook(hhh, hki, flags);
-	hhook_head_release(hhh);
+	for (i--; i >= 0; i--) {
+		if (!error)
+			error = hhook_add_hook(heads_to_hook[i], hki, flags);
+		refcount_release(&heads_to_hook[i]->hhh_refcount);
+	}
+
+	free(heads_to_hook, M_HHOOK);
 
 	return (error);
 }
@@ -211,20 +264,21 @@ hhook_remove_hook(struct hhook_head *hhh
 }
 
 /*
- * Lookup a helper hook point and remove a helper hook function from it.
+ * Remove a helper hook function from a helper hook point (including all
+ * virtual instances of the hook point if it is virtualised).
  */
 int
 hhook_remove_hook_lookup(struct hookinfo *hki)
 {
 	struct hhook_head *hhh;
 
-	hhh = hhook_head_get(hki->hook_type, hki->hook_id);
-
-	if (hhh == NULL)
-		return (ENOENT);
-
-	hhook_remove_hook(hhh, hki);
-	hhook_head_release(hhh);
+	HHHLIST_LOCK();
+	LIST_FOREACH(hhh, &hhook_head_list, hhh_next) {
+		if (hhh->hhh_type == hki->hook_type &&
+		    hhh->hhh_id == hki->hook_id)
+			hhook_remove_hook(hhh, hki);
+	}
+	HHHLIST_UNLOCK();
 
 	return (0);
 }
@@ -274,6 +328,7 @@ hhook_head_register(int32_t hhook_type, 
 #endif
 	}
 	LIST_INSERT_HEAD(&hhook_head_list, tmphhh, hhh_next);
+	n_hhookheads++;
 	HHHLIST_UNLOCK();
 
 	return (0);
@@ -285,6 +340,7 @@ hhook_head_destroy(struct hhook_head *hh
 	struct hhook *tmp, *tmp2;
 
 	HHHLIST_LOCK_ASSERT();
+	KASSERT(n_hhookheads > 0, ("n_hhookheads should be > 0"));
 
 	LIST_REMOVE(hhh, hhh_next);
 #ifdef VIMAGE
@@ -297,6 +353,7 @@ hhook_head_destroy(struct hhook_head *hh
 	HHH_WUNLOCK(hhh);
 	HHH_LOCK_DESTROY(hhh);
 	free(hhh, M_HHOOK);
+	n_hhookheads--;
 }
 
 /*

Modified: head/sys/kern/kern_khelp.c
==============================================================================
--- head/sys/kern/kern_khelp.c	Sat Jun 15 03:55:04 2013	(r251769)
+++ head/sys/kern/kern_khelp.c	Sat Jun 15 04:03:40 2013	(r251770)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2010 Lawrence Stewart 
+ * Copyright (c) 2010,2013 Lawrence Stewart 
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -84,12 +84,13 @@ khelp_register_helper(struct helper *h)
 		for (i = 0; i < h->h_nhooks && !error; i++) {
 			/* We don't require the module to assign hook_helper. */
 			h->h_hooks[i].hook_helper = h;
-			error = khelp_add_hhook(&h->h_hooks[i], HHOOK_NOWAIT);
+			error = hhook_add_hook_lookup(&h->h_hooks[i],
+			    HHOOK_WAITOK);
 		}
 
 		if (error) {
 			for (i--; i >= 0; i--)
-				khelp_remove_hhook(&h->h_hooks[i]);
+				hhook_remove_hook_lookup(&h->h_hooks[i]);
 
 			osd_deregister(OSD_KHELP, h->h_id);
 		}
@@ -144,7 +145,7 @@ khelp_deregister_helper(struct helper *h
 	if (!error) {
 		if (h->h_nhooks > 0) {
 			for (i = 0; i < h->h_nhooks; i++)
-				khelp_remove_hhook(&h->h_hooks[i]);
+				hhook_remove_hook_lookup(&h->h_hooks[i]);
 		}
 		osd_deregister(OSD_KHELP, h->h_id);
 	}
@@ -263,28 +264,13 @@ khelp_get_id(char *hname)
 int
 khelp_add_hhook(struct hookinfo *hki, uint32_t flags)
 {
-	VNET_ITERATOR_DECL(vnet_iter);
 	int error;
 
-	error = 0;
-
 	/*
-	 * XXXLAS: If a helper is dynamically adding a helper hook function at
-	 * runtime using this function, we should update the helper's h_hooks
-	 * struct member to include the additional hookinfo struct.
+	 * XXXLAS: Should probably include the functionality to update the
+	 * helper's h_hooks struct member.
 	 */
-
-	VNET_LIST_RLOCK_NOSLEEP();
-	VNET_FOREACH(vnet_iter) {
-		CURVNET_SET(vnet_iter);
-		error = hhook_add_hook_lookup(hki, flags);
-		CURVNET_RESTORE();
-#ifdef VIMAGE
-		if (error)
-			break;
-#endif
-	}
-	VNET_LIST_RUNLOCK_NOSLEEP();
+	error = hhook_add_hook_lookup(hki, flags);
 
 	return (error);
 }
@@ -292,28 +278,13 @@ khelp_add_hhook(struct hookinfo *hki, ui
 int
 khelp_remove_hhook(struct hookinfo *hki)
 {
-	VNET_ITERATOR_DECL(vnet_iter);
 	int error;
 
-	error = 0;
-
 	/*
-	 * XXXLAS: If a helper is dynamically removing a helper hook function at
-	 * runtime using this function, we should update the helper's h_hooks
-	 * struct member to remove the defunct hookinfo struct.
+	 * XXXLAS: Should probably include the functionality to update the
+	 * helper's h_hooks struct member.
 	 */
-
-	VNET_LIST_RLOCK_NOSLEEP();
-	VNET_FOREACH(vnet_iter) {
-		CURVNET_SET(vnet_iter);
-		error = hhook_remove_hook_lookup(hki);
-		CURVNET_RESTORE();
-#ifdef VIMAGE
-		if (error)
-			break;
-#endif
-	}
-	VNET_LIST_RUNLOCK_NOSLEEP();
+	error = hhook_remove_hook_lookup(hki);
 
 	return (error);
 }

Modified: head/sys/sys/hhook.h
==============================================================================
--- head/sys/sys/hhook.h	Sat Jun 15 03:55:04 2013	(r251769)
+++ head/sys/sys/hhook.h	Sat Jun 15 04:03:40 2013	(r251770)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2010 Lawrence Stewart 
+ * Copyright (c) 2010,2013 Lawrence Stewart 
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 04:51:32 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7ED362DB;
 Sat, 15 Jun 2013 04:51:32 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6F1181921;
 Sat, 15 Jun 2013 04:51:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F4pWJK023494;
 Sat, 15 Jun 2013 04:51:32 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F4pWJm023492;
 Sat, 15 Jun 2013 04:51:32 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201306150451.r5F4pWJm023492@svn.freebsd.org>
From: "Justin T. Gibbs" 
Date: Sat, 15 Jun 2013 04:51:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251772 - head/sys/dev/xen/blkfront
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 04:51:32 -0000

Author: gibbs
Date: Sat Jun 15 04:51:31 2013
New Revision: 251772
URL: http://svnweb.freebsd.org/changeset/base/251772

Log:
  Properly track the different reasons new I/O is temporarily disabled, and
  only re-enable I/O when all reasons have cleared.
  
  sys/dev/xen/blkfront/block.h:
  	In the block front driver softc, replace the boolean
  	XBDF_FROZEN flag with a count of commands and driver global
  	issues that freeze the I/O queue.  So long xbd_qfrozen_cnt
  	is non-zero, I/O is halted.
  
  	Add flags to xbd_flags for tracking grant table entry and
  	free command resource shortages.  Each of these classes can
  	increment xbd_qfrozen_cnt at most once.
  
  	Add a command flag (XBDCF_ASYNC_MAPPING) that is set whenever
  	the initial mapping attempt of a command fails with EINPROGRESS.
  
  sys/dev/xen/blkfront/blkfront.c:
  	In xbd_queue_cb(), use new XBDCF_ASYNC_MAPPING flag to definitively
  	know if an async bus dmamap load has occurred.
  
  	Add xbd_freeze() and xbd_thaw() helper methods for managing
  	xbd_qfrozen_cnt and use them to implement all queue freezing logic.
  
  	Add missing "thaw" to restart I/O processing once grant references
  	become available.
  
  Sponsored by:	Spectra Logic Corporation

Modified:
  head/sys/dev/xen/blkfront/blkfront.c
  head/sys/dev/xen/blkfront/block.h

Modified: head/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- head/sys/dev/xen/blkfront/blkfront.c	Sat Jun 15 04:45:33 2013	(r251771)
+++ head/sys/dev/xen/blkfront/blkfront.c	Sat Jun 15 04:51:31 2013	(r251772)
@@ -87,6 +87,30 @@ static void xbd_startio(struct xbd_softc
 static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
 
 /*---------------------------- Command Processing ----------------------------*/
+static void
+xbd_freeze(struct xbd_softc *sc, xbd_flag_t xbd_flag)
+{
+	if (xbd_flag != XBDF_NONE && (sc->xbd_flags & xbd_flag) != 0)
+		return;
+
+	sc->xbd_flags |= xbd_flag;
+	sc->xbd_qfrozen_cnt++;
+}
+
+static void
+xbd_thaw(struct xbd_softc *sc, xbd_flag_t xbd_flag)
+{
+	if (xbd_flag != XBDF_NONE && (sc->xbd_flags & xbd_flag) == 0)
+		return;
+
+	if (sc->xbd_qfrozen_cnt != 0)
+		panic("%s: Thaw with flag 0x%x while not frozen.",
+		    __func__, xbd_flag);
+
+	sc->xbd_flags &= ~xbd_flag;
+	sc->xbd_qfrozen_cnt--;
+}
+
 static inline void 
 xbd_flush_requests(struct xbd_softc *sc)
 {
@@ -110,6 +134,7 @@ xbd_free_command(struct xbd_command *cm)
 	cm->cm_bp = NULL;
 	cm->cm_complete = NULL;
 	xbd_enqueue_cm(cm, XBD_Q_FREE);
+	xbd_thaw(cm->cm_sc, XBDF_CM_SHORTAGE);
 }
 
 static void
@@ -212,10 +237,13 @@ xbd_queue_cb(void *arg, bus_dma_segment_
 	xbd_enqueue_cm(cm, XBD_Q_BUSY);
 
 	/*
-	 * This flag means that we're probably executing in the busdma swi
-	 * instead of in the startio context, so an explicit flush is needed.
+	 * If bus dma had to asynchronously call us back to dispatch
+	 * this command, we are no longer executing in the context of 
+	 * xbd_startio().  Thus we cannot rely on xbd_startio()'s call to
+	 * xbd_flush_requests() to publish this command to the backend
+	 * along with any other commands that it could batch.
 	 */
-	if (cm->cm_flags & XBDCF_FROZEN)
+	if ((cm->cm_flags & XBDCF_ASYNC_MAPPING) != 0)
 		xbd_flush_requests(sc);
 
 	return;
@@ -229,9 +257,14 @@ xbd_queue_request(struct xbd_softc *sc, 
 	error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map, cm->cm_data,
 	    cm->cm_datalen, xbd_queue_cb, cm, 0);
 	if (error == EINPROGRESS) {
-		printf("EINPROGRESS\n");
-		sc->xbd_flags |= XBDF_FROZEN;
-		cm->cm_flags |= XBDCF_FROZEN;
+		/*
+		 * Maintain queuing order by freezing the queue.  The next
+		 * command may not require as many resources as the command
+		 * we just attempted to map, so we can't rely on bus dma
+		 * blocking for it too.
+		 */
+		xbd_freeze(sc, XBDF_NONE);
+		cm->cm_flags |= XBDCF_FROZEN|XBDCF_ASYNC_MAPPING;
 		return (0);
 	}
 
@@ -245,6 +278,8 @@ xbd_restart_queue_callback(void *arg)
 
 	mtx_lock(&sc->xbd_io_lock);
 
+	xbd_thaw(sc, XBDF_GNT_SHORTAGE);
+
 	xbd_startio(sc);
 
 	mtx_unlock(&sc->xbd_io_lock);
@@ -264,6 +299,7 @@ xbd_bio_command(struct xbd_softc *sc)
 		return (NULL);
 
 	if ((cm = xbd_dequeue_cm(sc, XBD_Q_FREE)) == NULL) {
+		xbd_freeze(sc, XBDF_CM_SHORTAGE);
 		xbd_requeue_bio(sc, bp);
 		return (NULL);
 	}
@@ -273,9 +309,9 @@ xbd_bio_command(struct xbd_softc *sc)
 		gnttab_request_free_callback(&sc->xbd_callback,
 		    xbd_restart_queue_callback, sc,
 		    sc->xbd_max_request_segments);
+		xbd_freeze(sc, XBDF_GNT_SHORTAGE);
 		xbd_requeue_bio(sc, bp);
 		xbd_enqueue_cm(cm, XBD_Q_FREE);
-		sc->xbd_flags |= XBDF_FROZEN;
 		return (NULL);
 	}
 
@@ -309,7 +345,7 @@ xbd_startio(struct xbd_softc *sc)
 
 	while (RING_FREE_REQUESTS(&sc->xbd_ring) >=
 	    sc->xbd_max_request_blocks) {
-		if (sc->xbd_flags & XBDF_FROZEN)
+		if (sc->xbd_qfrozen_cnt != 0)
 			break;
 
 		cm = xbd_dequeue_cm(sc, XBD_Q_READY);
@@ -397,11 +433,13 @@ xbd_int(void *xsc)
 		bus_dmamap_unload(sc->xbd_io_dmat, cm->cm_map);
 
 		/*
-		 * If commands are completing then resources are probably
-		 * being freed as well.  It's a cheap assumption even when
-		 * wrong.
+		 * Release any hold this command has on future command
+		 * dispatch. 
 		 */
-		sc->xbd_flags &= ~XBDF_FROZEN;
+		if ((cm->cm_flags & XBDCF_FROZEN) != 0) {
+			xbd_thaw(sc, XBDF_NONE);
+			cm->cm_flags &= ~XBDCF_FROZEN;
+		}
 
 		/*
 		 * Directly call the i/o complete routine to save an

Modified: head/sys/dev/xen/blkfront/block.h
==============================================================================
--- head/sys/dev/xen/blkfront/block.h	Sat Jun 15 04:45:33 2013	(r251771)
+++ head/sys/dev/xen/blkfront/block.h	Sat Jun 15 04:51:31 2013	(r251772)
@@ -96,6 +96,7 @@ typedef enum {
 	XBDCF_Q_MASK		= 0xFF,
 	XBDCF_FROZEN		= 1<<8,
 	XBDCF_POLLED		= 1<<9,
+	XBDCF_ASYNC_MAPPING	= 1<<10,
 	XBDCF_INITIALIZER	= XBDCF_Q_MASK
 } xbdc_flag_t;
 
@@ -143,10 +144,12 @@ typedef enum {
 } xbd_state_t;
 
 typedef enum {
-	XBDF_OPEN	= 1 << 0,	/* drive is open (can't shut down) */
-	XBDF_BARRIER	= 1 << 1,	/* backend supports barriers */
-	XBDF_READY	= 1 << 2,	/* Is ready */
-	XBDF_FROZEN	= 1 << 3	/* Waiting for resources */
+	XBDF_NONE	  = 0,
+	XBDF_OPEN	  = 1 << 0, /* drive is open (can't shut down) */
+	XBDF_BARRIER	  = 1 << 1, /* backend supports barriers */
+	XBDF_READY	  = 1 << 2, /* Is ready */
+	XBDF_CM_SHORTAGE  = 1 << 3, /* Free cm resource shortage active. */
+	XBDF_GNT_SHORTAGE = 1 << 4  /* Grant ref resource shortage active */
 } xbd_flag_t;
 
 /*
@@ -158,6 +161,7 @@ struct xbd_softc {
 	struct bio_queue_head 		 xbd_bioq;	/* sort queue */
 	int				 xbd_unit;
 	xbd_flag_t			 xbd_flags;
+	int				 xbd_qfrozen_cnt;
 	int				 xbd_vdevice;
 	xbd_state_t			 xbd_state;
 	u_int				 xbd_ring_pages;

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 05:57:30 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 81C5BB48;
 Sat, 15 Jun 2013 05:57:30 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 749521AAA;
 Sat, 15 Jun 2013 05:57:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F5vUpb042856;
 Sat, 15 Jun 2013 05:57:30 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F5vTmj042854;
 Sat, 15 Jun 2013 05:57:29 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306150557.r5F5vTmj042854@svn.freebsd.org>
From: Lawrence Stewart 
Date: Sat, 15 Jun 2013 05:57:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251774 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 05:57:30 -0000

Author: lstewart
Date: Sat Jun 15 05:57:29 2013
New Revision: 251774
URL: http://svnweb.freebsd.org/changeset/base/251774

Log:
  Add a private KPI between hhook and khelp that allows khelp modules to insert
  hook functions into hhook points which register after the modules were loaded -
  potentially useful during boot or if hhook points are dynamically registered.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_hhook.c
  head/sys/kern/kern_khelp.c

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Sat Jun 15 05:04:14 2013	(r251773)
+++ head/sys/kern/kern_hhook.c	Sat Jun 15 05:57:29 2013	(r251774)
@@ -74,6 +74,7 @@ static uint32_t n_hhookheads;
 
 /* Private function prototypes. */
 static void hhook_head_destroy(struct hhook_head *hhh);
+void khelp_new_hhook_registered(struct hhook_head *hhh, uint32_t flags);
 
 #define	HHHLIST_LOCK() mtx_lock(&hhook_head_list_lock)
 #define	HHHLIST_UNLOCK() mtx_unlock(&hhook_head_list_lock)
@@ -311,12 +312,7 @@ hhook_head_register(int32_t hhook_type, 
 	tmphhh->hhh_nhooks = 0;
 	STAILQ_INIT(&tmphhh->hhh_hooks);
 	HHH_LOCK_INIT(tmphhh);
-
-	if (hhh != NULL) {
-		refcount_init(&tmphhh->hhh_refcount, 1);
-		*hhh = tmphhh;
-	} else
-		refcount_init(&tmphhh->hhh_refcount, 0);
+	refcount_init(&tmphhh->hhh_refcount, 1);
 
 	HHHLIST_LOCK();
 	if (flags & HHOOK_HEADISINVNET) {
@@ -331,6 +327,13 @@ hhook_head_register(int32_t hhook_type, 
 	n_hhookheads++;
 	HHHLIST_UNLOCK();
 
+	khelp_new_hhook_registered(tmphhh, flags);
+
+	if (hhh != NULL)
+		*hhh = tmphhh;
+	else
+		refcount_release(&tmphhh->hhh_refcount);
+
 	return (0);
 }
 

Modified: head/sys/kern/kern_khelp.c
==============================================================================
--- head/sys/kern/kern_khelp.c	Sat Jun 15 05:04:14 2013	(r251773)
+++ head/sys/kern/kern_khelp.c	Sat Jun 15 05:57:29 2013	(r251774)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -52,8 +51,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
-
 static struct rwlock khelp_list_lock;
 RW_SYSINIT(khelplistlock, &khelp_list_lock, "helper list lock");
 
@@ -61,6 +58,7 @@ static TAILQ_HEAD(helper_head, helper) h
 
 /* Private function prototypes. */
 static inline void khelp_remove_osd(struct helper *h, struct osd *hosd);
+void khelp_new_hhook_registered(struct hhook_head *hhh, uint32_t flags);
 
 #define	KHELP_LIST_WLOCK() rw_wlock(&khelp_list_lock)
 #define	KHELP_LIST_WUNLOCK() rw_wunlock(&khelp_list_lock)
@@ -289,6 +287,36 @@ khelp_remove_hhook(struct hookinfo *hki)
 	return (error);
 }
 
+/*
+ * Private KPI between hhook and khelp that allows khelp modules to insert hook
+ * functions into hhook points which register after the modules were loaded.
+ */
+void
+khelp_new_hhook_registered(struct hhook_head *hhh, uint32_t flags)
+{
+	struct helper *h;
+	int error, i;
+
+	KHELP_LIST_RLOCK();
+	TAILQ_FOREACH(h, &helpers, h_next) {
+		for (i = 0; i < h->h_nhooks; i++) {
+			if (hhh->hhh_type != h->h_hooks[i].hook_type ||
+			    hhh->hhh_id != h->h_hooks[i].hook_id)
+				continue;
+			error = hhook_add_hook(hhh, &h->h_hooks[i], flags);
+			if (error) {
+				printf("%s: \"%s\" khelp module unable to "
+				    "hook type %d id %d due to error %d\n",
+				    __func__, h->h_name,
+				    h->h_hooks[i].hook_type,
+				    h->h_hooks[i].hook_id, error);
+				error = 0;
+			}
+		}
+	}
+	KHELP_LIST_RUNLOCK();
+}
+
 int
 khelp_modevent(module_t mod, int event_type, void *data)
 {
@@ -348,95 +376,3 @@ khelp_modevent(module_t mod, int event_t
 
 	return (error);
 }
-
-/*
- * This function is called in two separate situations:
- *
- * - When the kernel is booting, it is called directly by the SYSINIT framework
- * to allow Khelp modules which were compiled into the kernel or loaded by the
- * boot loader to insert their non-virtualised hook functions into the kernel.
- *
- * - When the kernel is booting or a vnet is created, this function is also
- * called indirectly through khelp_vnet_init() by the vnet initialisation code.
- * In this situation, Khelp modules are able to insert their virtualised hook
- * functions into the virtualised hook points in the vnet which is being
- * initialised. In the case where the kernel is not compiled with "options
- * VIMAGE", this step is still run once at boot, but the hook functions get
- * transparently inserted into the standard unvirtualised network stack.
- */
-static void
-khelp_init(const void *vnet)
-{
-	struct helper *h;
-	int error, i, vinit;
-	int32_t htype, hid;
-
-	error = 0;
-	vinit = vnet != NULL;
-
-	KHELP_LIST_RLOCK();
-	TAILQ_FOREACH(h, &helpers, h_next) {
-		for (i = 0; i < h->h_nhooks && !error; i++) {
-			htype = h->h_hooks[i].hook_type;
-			hid = h->h_hooks[i].hook_id;
-
-			/*
-			 * If we're doing a virtualised init (vinit != 0) and
-			 * the hook point is virtualised, or we're doing a plain
-			 * sysinit at boot and the hook point is not
-			 * virtualised, insert the hook.
-			 */
-			if ((hhook_head_is_virtualised_lookup(htype, hid) ==
-			    HHOOK_HEADISINVNET && vinit) ||
-			    (!hhook_head_is_virtualised_lookup(htype, hid) &&
-			    !vinit)) {
-				error = hhook_add_hook_lookup(&h->h_hooks[i],
-				    HHOOK_NOWAIT);
-			}
-		}
-
-		if (error) {
-			 /* Remove any helper's hooks we successfully added. */
-			for (i--; i >= 0; i--)
-				hhook_remove_hook_lookup(&h->h_hooks[i]);
-
-			printf("%s: Failed to add hooks for helper \"%s\" (%p)",
-				__func__, h->h_name, h);
-			if (vinit)
-				    printf(" to vnet %p.\n", vnet);
-			else
-				printf(".\n");
-
-			error = 0;
-		}
-	}
-	KHELP_LIST_RUNLOCK();
-}
-
-/*
- * Vnet created and being initialised.
- */
-static void
-khelp_vnet_init(const void *unused __unused)
-{
-
-	khelp_init(TD_TO_VNET(curthread));
-}
-
-
-/*
- * As the kernel boots, allow Khelp modules which were compiled into the kernel
- * or loaded by the boot loader to insert their non-virtualised hook functions
- * into the kernel.
- */
-SYSINIT(khelp_init, SI_SUB_PROTO_END, SI_ORDER_FIRST, khelp_init, NULL);
-
-/*
- * When a vnet is created and being initialised, we need to insert the helper
- * hook functions for all currently registered Khelp modules into the vnet's
- * helper hook points.  The hhook KPI provides a mechanism for subsystems which
- * export helper hook points to clean up on vnet shutdown, so we don't need a
- * VNET_SYSUNINIT for Khelp.
- */
-VNET_SYSINIT(khelp_vnet_init, SI_SUB_PROTO_END, SI_ORDER_FIRST,
-    khelp_vnet_init, NULL);

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 06:45:17 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C4ECC31D;
 Sat, 15 Jun 2013 06:45:17 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9DE1A1BD5;
 Sat, 15 Jun 2013 06:45:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F6jHQS058293;
 Sat, 15 Jun 2013 06:45:17 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F6jHwl058292;
 Sat, 15 Jun 2013 06:45:17 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306150645.r5F6jHwl058292@svn.freebsd.org>
From: Lawrence Stewart 
Date: Sat, 15 Jun 2013 06:45:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251778 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 06:45:17 -0000

Author: lstewart
Date: Sat Jun 15 06:45:17 2013
New Revision: 251778
URL: http://svnweb.freebsd.org/changeset/base/251778

Log:
  Cleanup and simplification in khelp_{register|deregister}_helper(). No
  functional changes.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_khelp.c

Modified: head/sys/kern/kern_khelp.c
==============================================================================
--- head/sys/kern/kern_khelp.c	Sat Jun 15 06:21:17 2013	(r251777)
+++ head/sys/kern/kern_khelp.c	Sat Jun 15 06:45:17 2013	(r251778)
@@ -72,34 +72,32 @@ khelp_register_helper(struct helper *h)
 	struct helper *tmph;
 	int error, i, inserted;
 
-	error = 0;
-	inserted = 0;
+	error = inserted = 0;
 	refcount_init(&h->h_refcount, 0);
 	h->h_id = osd_register(OSD_KHELP, NULL, NULL);
 
 	/* It's only safe to add the hooks after osd_register(). */
-	if (h->h_nhooks > 0) {
-		for (i = 0; i < h->h_nhooks && !error; i++) {
-			/* We don't require the module to assign hook_helper. */
-			h->h_hooks[i].hook_helper = h;
-			error = hhook_add_hook_lookup(&h->h_hooks[i],
-			    HHOOK_WAITOK);
-		}
-
-		if (error) {
-			for (i--; i >= 0; i--)
-				hhook_remove_hook_lookup(&h->h_hooks[i]);
-
-			osd_deregister(OSD_KHELP, h->h_id);
-		}
+	for (i = 0; i < h->h_nhooks && !error; i++) {
+		/* We don't require the module to assign hook_helper. */
+		h->h_hooks[i].hook_helper = h;
+		error = hhook_add_hook_lookup(&h->h_hooks[i], HHOOK_WAITOK);
+		if (error)
+			printf("%s: \"%s\" khelp module unable to "
+			    "hook type %d id %d due to error %d\n", __func__,
+			    h->h_name, h->h_hooks[i].hook_type,
+			    h->h_hooks[i].hook_id, error);
 	}
 
-	if (!error) {
+	if (error) {
+		for (i--; i >= 0; i--)
+			hhook_remove_hook_lookup(&h->h_hooks[i]);
+		osd_deregister(OSD_KHELP, h->h_id);
+	} else {
 		KHELP_LIST_WLOCK();
 		/*
 		 * Keep list of helpers sorted in descending h_id order. Due to
 		 * the way osd_set() works, a sorted list ensures
-		 * init_helper_osd() will operate with improved efficiency.
+		 * khelp_init_osd() will operate with improved efficiency.
 		 */
 		TAILQ_FOREACH(tmph, &helpers, h_next) {
 			if (tmph->h_id < h->h_id) {
@@ -123,8 +121,6 @@ khelp_deregister_helper(struct helper *h
 	struct helper *tmph;
 	int error, i;
 
-	error = 0;
-
 	KHELP_LIST_WLOCK();
 	if (h->h_refcount > 0)
 		error = EBUSY;
@@ -141,10 +137,8 @@ khelp_deregister_helper(struct helper *h
 	KHELP_LIST_WUNLOCK();
 
 	if (!error) {
-		if (h->h_nhooks > 0) {
-			for (i = 0; i < h->h_nhooks; i++)
-				hhook_remove_hook_lookup(&h->h_hooks[i]);
-		}
+		for (i = 0; i < h->h_nhooks; i++)
+			hhook_remove_hook_lookup(&h->h_hooks[i]);
 		osd_deregister(OSD_KHELP, h->h_id);
 	}
 

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 08:06:23 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 15AED9EB;
 Sat, 15 Jun 2013 08:06:23 +0000 (UTC)
 (envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 076741D78;
 Sat, 15 Jun 2013 08:06:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F86MCo083428;
 Sat, 15 Jun 2013 08:06:22 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F86MGJ083427;
 Sat, 15 Jun 2013 08:06:22 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201306150806.r5F86MGJ083427@svn.freebsd.org>
From: Mikolaj Golub 
Date: Sat, 15 Jun 2013 08:06:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251779 - stable/9/sys/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 08:06:23 -0000

Author: trociny
Date: Sat Jun 15 08:06:22 2013
New Revision: 251779
URL: http://svnweb.freebsd.org/changeset/base/251779

Log:
  MFC r251490:
  
  Properly set curvnet context in lagg_port_setlladdr() task handler.
  
  Reported by:	Nikos Vassiliadis 
  Submitted by:	zec
  Tested by:	Nikos Vassiliadis 

Modified:
  stable/9/sys/net/if_lagg.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/net/   (props changed)

Modified: stable/9/sys/net/if_lagg.c
==============================================================================
--- stable/9/sys/net/if_lagg.c	Sat Jun 15 06:45:17 2013	(r251778)
+++ stable/9/sys/net/if_lagg.c	Sat Jun 15 08:06:22 2013	(r251779)
@@ -494,7 +494,9 @@ lagg_port_setlladdr(void *arg, int pendi
 		ifp = llq->llq_ifp;
 
 		/* Set the link layer address */
+		CURVNET_SET(ifp->if_vnet);
 		error = if_setlladdr(ifp, llq->llq_lladdr, ETHER_ADDR_LEN);
+		CURVNET_RESTORE();
 		if (error)
 			printf("%s: setlladdr failed on %s\n", __func__,
 			    ifp->if_xname);

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 08:07:48 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 56F2FB6D;
 Sat, 15 Jun 2013 08:07:48 +0000 (UTC)
 (envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48DAD1D83;
 Sat, 15 Jun 2013 08:07:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F87mhL083730;
 Sat, 15 Jun 2013 08:07:48 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F87mwk083729;
 Sat, 15 Jun 2013 08:07:48 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201306150807.r5F87mwk083729@svn.freebsd.org>
From: Mikolaj Golub 
Date: Sat, 15 Jun 2013 08:07:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251780 - stable/8/sys/net
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 08:07:48 -0000

Author: trociny
Date: Sat Jun 15 08:07:47 2013
New Revision: 251780
URL: http://svnweb.freebsd.org/changeset/base/251780

Log:
  MFC r251490:
  
  Properly set curvnet context in lagg_port_setlladdr() task handler.
  
  Reported by:	Nikos Vassiliadis 
  Submitted by:	zec
  Tested by:	Nikos Vassiliadis 

Modified:
  stable/8/sys/net/if_lagg.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/net/   (props changed)

Modified: stable/8/sys/net/if_lagg.c
==============================================================================
--- stable/8/sys/net/if_lagg.c	Sat Jun 15 08:06:22 2013	(r251779)
+++ stable/8/sys/net/if_lagg.c	Sat Jun 15 08:07:47 2013	(r251780)
@@ -487,7 +487,9 @@ lagg_port_setlladdr(void *arg, int pendi
 		ifp = llq->llq_ifp;
 
 		/* Set the link layer address */
+		CURVNET_SET(ifp->if_vnet);
 		error = if_setlladdr(ifp, llq->llq_lladdr, ETHER_ADDR_LEN);
+		CURVNET_RESTORE();
 		if (error)
 			printf("%s: setlladdr failed on %s\n", __func__,
 			    ifp->if_xname);

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 08:15:22 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E49ADD1B;
 Sat, 15 Jun 2013 08:15:22 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C65D81DAD;
 Sat, 15 Jun 2013 08:15:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F8FM5S086695;
 Sat, 15 Jun 2013 08:15:22 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F8FMah086693;
 Sat, 15 Jun 2013 08:15:22 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150815.r5F8FMah086693@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 08:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251781 - in head/sys: arm/arm mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 08:15:23 -0000

Author: ed
Date: Sat Jun 15 08:15:22 2013
New Revision: 251781
URL: http://svnweb.freebsd.org/changeset/base/251781

Log:
  Make support for atomics on ARM complete.
  
  Provide both __sync_*-style and __atomic_*-style functions that perform
  the atomic operations on ARMv5 by using Restartable Atomic Sequences.
  
  While there, clean up some pieces of code where it's sufficient to use
  regular uint32_t to store register contents and don't need full reg_t's.
  Also sync this back to the MIPS code.

Modified:
  head/sys/arm/arm/stdatomic.c
  head/sys/mips/mips/stdatomic.c

Modified: head/sys/arm/arm/stdatomic.c
==============================================================================
--- head/sys/arm/arm/stdatomic.c	Sat Jun 15 08:07:47 2013	(r251780)
+++ head/sys/arm/arm/stdatomic.c	Sat Jun 15 08:15:22 2013	(r251781)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
+#include 
 
 #ifdef _KERNEL
 #include "opt_global.h"
@@ -41,7 +42,7 @@ __FBSDID("$FreeBSD$");
  * Executing statements with interrupts disabled.
  */
 
-#ifndef SMP
+#if defined(_KERNEL) && !defined(SMP)
 #define	WITHOUT_INTERRUPTS(s) do {					\
 	register_t regs;						\
 									\
@@ -49,7 +50,7 @@ __FBSDID("$FreeBSD$");
 	do s while (0);							\
 	intr_restore(regs);						\
 } while (0)
-#endif /* !SMP */
+#endif /* _KERNEL && !SMP */
 
 /*
  * Memory barriers.
@@ -62,18 +63,30 @@ __FBSDID("$FreeBSD$");
  * should make 's atomic_exchange_explicit() work reliably.
  */
 
+#if defined(_KERNEL) && !defined(SMP)
 static inline void
 do_sync(void)
 {
 
-#if defined(_KERNEL) && !defined(SMP)
 	__asm volatile ("" : : : "memory");
+}
 #elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+static inline void
+do_sync(void)
+{
+
 	__asm volatile ("dmb" : : : "memory");
-#else /* __ARM_ARCH_6__ */
+}
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
+    defined(__ARM_ARCH_6ZK__)
+static inline void
+do_sync(void)
+{
+
 	__asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory");
-#endif
 }
+#endif
 
 #if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS)
 
@@ -88,11 +101,7 @@ do_sync(void)
 
 /* These systems should be supported by the compiler. */
 
-#elif defined(_KERNEL)
-
-#ifdef SMP
-#error "On SMP systems we should have proper atomic operations."
-#endif
+#else /* __ARM_ARCH_5__ */
 
 /* Clang doesn't allow us to reimplement builtins without this. */
 #ifdef __clang__
@@ -103,10 +112,14 @@ do_sync(void)
 void
 __sync_synchronize(void)
 {
-
-	do_sync();
 }
 
+#ifdef _KERNEL
+
+#ifdef SMP
+#error "On SMP systems we should have proper atomic operations."
+#endif
+
 /*
  * On uniprocessor systems, we can perform the atomic operations by
  * disabling interrupts.
@@ -182,20 +195,154 @@ EMIT_ALL_OPS_N(2, uint16_t)
 EMIT_ALL_OPS_N(4, uint32_t)
 EMIT_ALL_OPS_N(8, uint64_t)
 
-#else /* !__ARM_ARCH_6__ && !__ARM_ARCH_7__ && !_KERNEL */
+#else /* !_KERNEL */
+
+/*
+ * For userspace on uniprocessor systems, we can implement the atomic
+ * operations by using a Restartable Atomic Sequence. This makes the
+ * kernel restart the code from the beginning when interrupted.
+ */
+
+#define	EMIT_LOAD_N(N, uintN_t)						\
+uintN_t									\
+__atomic_load_##N(uintN_t *mem, int model __unused)			\
+{									\
+									\
+	return (*mem);							\
+}
+
+#define	EMIT_STORE_N(N, uintN_t)					\
+void									\
+__atomic_store_##N(uintN_t *mem, uintN_t val, int model __unused)	\
+{									\
+									\
+	*mem = val;							\
+}
+
+#define	EMIT_EXCHANGE_N(N, uintN_t, ldr, str)				\
+uintN_t									\
+__atomic_exchange_##N(uintN_t *mem, uintN_t val, int model __unused)	\
+{									\
+	uint32_t old, temp, ras_start;					\
+									\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%5]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%5, #4]\n"				\
+									\
+		"\t"ldr" %0, %4\n"	/* Load old value. */		\
+		"\t"str" %3, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%5]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%5, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (val), "m" (*mem), "r" (ras_start));		\
+	return (old);							\
+}
+
+#define	EMIT_COMPARE_EXCHANGE_N(N, uintN_t, ldr, streq)			\
+_Bool									\
+__atomic_compare_exchange_##N(uintN_t *mem, uintN_t *pexpected,		\
+    uintN_t desired, int success __unused, int failure __unused)	\
+{									\
+	uint32_t expected, old, temp, ras_start;			\
+									\
+	expected = *pexpected;						\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%6]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%6, #4]\n"				\
+									\
+		"\t"ldr" %0, %5\n"	/* Load old value. */		\
+		"\tcmp   %0, %3\n"	/* Compare to expected value. */\
+		"\t"streq" %4, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%6]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%6, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (expected), "r" (desired), "m" (*mem),		\
+		  "r" (ras_start));					\
+	if (old == expected) {						\
+		return (1);						\
+	} else {							\
+		*pexpected = old;					\
+		return (0);						\
+	}								\
+}
+
+#define	EMIT_FETCH_OP_N(N, uintN_t, ldr, str, name, op)			\
+uintN_t									\
+__atomic_##name##_##N(uintN_t *mem, uintN_t val, int model __unused)	\
+{									\
+	uint32_t old, temp, ras_start;					\
+									\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%5]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%5, #4]\n"				\
+									\
+		"\t"ldr" %0, %4\n"	/* Load old value. */		\
+		"\t"op"  %2, %0, %3\n"	/* Calculate new value. */	\
+		"\t"str" %2, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%5]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%5, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (val), "m" (*mem), "r" (ras_start));		\
+	return (old);							\
+}
+
+#define	EMIT_ALL_OPS_N(N, uintN_t, ldr, str, streq)			\
+EMIT_LOAD_N(N, uintN_t)							\
+EMIT_STORE_N(N, uintN_t)						\
+EMIT_EXCHANGE_N(N, uintN_t, ldr, str)					\
+EMIT_COMPARE_EXCHANGE_N(N, uintN_t, ldr, streq)				\
+EMIT_FETCH_OP_N(N, uintN_t, ldr, str, fetch_add, "add")			\
+EMIT_FETCH_OP_N(N, uintN_t, ldr, str, fetch_and, "and")			\
+EMIT_FETCH_OP_N(N, uintN_t, ldr, str, fetch_or, "orr")			\
+EMIT_FETCH_OP_N(N, uintN_t, ldr, str, fetch_sub, "sub")			\
+EMIT_FETCH_OP_N(N, uintN_t, ldr, str, fetch_xor, "eor")
+
+EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "strbeq")
+EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "strheq")
+EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq")
 
-/* XXX: Implement intrinsics for ARMv5 userspace. */
+#endif /* _KERNEL */
 
 #endif
 
 #endif /* __CLANG_ATOMICS || __GNUC_ATOMICS */
 
+#if defined(__SYNC_ATOMICS)
+
 /*
  * Old __sync_* API.
  */
 
-#if defined(__SYNC_ATOMICS)
-
 #if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
     defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
     defined(__ARM_ARCH_6ZK__) || \
@@ -319,8 +466,8 @@ __sync_val_compare_and_swap_##N(uintN_t 
     uintN_t desired)							\
 {									\
 	uint32_t *mem32;						\
-	reg_t expected32, desired32, posmask, negmask, old;		\
-	uint32_t temp1, temp2;						\
+	reg_t expected32, desired32, posmask, old;			\
+	uint32_t negmask, temp1, temp2;					\
 									\
 	mem32 = round_to_word(mem);					\
 	expected32.v32 = 0x00000000;					\
@@ -329,7 +476,7 @@ __sync_val_compare_and_swap_##N(uintN_t 
 	put_##N(&desired32, mem, desired);				\
 	posmask.v32 = 0x00000000;					\
 	put_##N(&posmask, mem, ~0);					\
-	negmask.v32 = ~posmask.v32;					\
+	negmask = ~posmask.v32;						\
 									\
 	do_sync();							\
 	__asm volatile (						\
@@ -347,7 +494,7 @@ __sync_val_compare_and_swap_##N(uintN_t 
 		: "=&r" (old), "=m" (*mem32), "=&r" (temp1),		\
 		  "=&r" (temp2)						\
 		: "r" (expected32.v32), "r" (desired32.v32),		\
-		  "r" (posmask.v32), "r" (negmask.v32), "m" (*mem32));	\
+		  "r" (posmask.v32), "r" (negmask), "m" (*mem32));	\
 	return (get_##N(&old, mem));					\
 }
 
@@ -359,15 +506,15 @@ uintN_t									\
 __sync_##name##_##N(uintN_t *mem, uintN_t val)				\
 {									\
 	uint32_t *mem32;						\
-	reg_t val32, posmask, negmask, old;				\
-	uint32_t temp1, temp2;						\
+	reg_t val32, posmask, old;					\
+	uint32_t negmask, temp1, temp2;					\
 									\
 	mem32 = round_to_word(mem);					\
 	val32.v32 = 0x00000000;						\
 	put_##N(&val32, mem, val);					\
 	posmask.v32 = 0x00000000;					\
 	put_##N(&posmask, mem, ~0);					\
-	negmask.v32 = ~posmask.v32;					\
+	negmask = ~posmask.v32;						\
 									\
 	do_sync();							\
 	__asm volatile (						\
@@ -382,8 +529,8 @@ __sync_##name##_##N(uintN_t *mem, uintN_
 		"\tbne   1b\n"		/* Spin if failed. */		\
 		: "=&r" (old.v32), "=m" (*mem32), "=&r" (temp1),	\
 		  "=&r" (temp2)						\
-		: "r" (val32.v32), "r" (posmask.v32),			\
-		  "r" (negmask.v32), "m" (*mem32));			\
+		: "r" (val32.v32), "r" (posmask.v32), "r" (negmask),	\
+		  "m" (*mem32));					\
 	return (get_##N(&old, mem));					\
 }
 
@@ -430,23 +577,39 @@ EMIT_BITWISE_FETCH_AND_OP_N(2, uint16_t,
  */
 
 uint32_t
+__sync_lock_test_and_set_4(uint32_t *mem, uint32_t val)
+{
+	uint32_t old, temp;
+
+	do_sync();
+	__asm volatile (
+		"1:"
+		"\tldrex %0, %4\n"	/* Load old value. */
+		"\tstrex %2, %3, %1\n"	/* Attempt to store. */
+		"\tcmp   %2, #0\n"	/* Did it succeed? */
+		"\tbne   1b\n"		/* Spin if failed. */
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)
+		: "r" (val), "m" (*mem));
+	return (old);
+}
+
+uint32_t
 __sync_val_compare_and_swap_4(uint32_t *mem, uint32_t expected,
     uint32_t desired)
 {
-	uint32_t old, temp1, temp2;
+	uint32_t old, temp;
 
 	do_sync();
 	__asm volatile (
 		"1:"
-		"\tldrex %0, %6\n"	/* Load old value. */
-		"\tcmp   %0, %4\n"	/* Compare to expected value. */
+		"\tldrex %0, %5\n"	/* Load old value. */
+		"\tcmp   %0, %3\n"	/* Compare to expected value. */
 		"\tbne   2f\n"		/* Values are unequal. */
-		"\tmov   %2, %5\n"	/* Value to store. */
-		"\tstrex %3, %2, %1\n"	/* Attempt to store. */
-		"\tcmp   %3, #0\n"	/* Did it succeed? */
+		"\tstrex %2, %4, %1\n"	/* Attempt to store. */
+		"\tcmp   %2, #0\n"	/* Did it succeed? */
 		"\tbne   1b\n"		/* Spin if failed. */
 		"2:"
-		: "=&r" (old), "=m" (*mem), "=&r" (temp1), "=&r" (temp2)
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)
 		: "r" (expected), "r" (desired), "m" (*mem));
 	return (old);
 }
@@ -461,7 +624,7 @@ __sync_##name##_4(uint32_t *mem, uint32_
 	__asm volatile (						\
 		"1:"							\
 		"\tldrex %0, %5\n"	/* Load old value. */		\
-		"\t"op"\n"		/* Calculate new value. */	\
+		"\t"op"  %2, %0, %4\n"	/* Calculate new value. */	\
 		"\tstrex %3, %2, %1\n"	/* Attempt to store. */		\
 		"\tcmp   %3, #0\n"	/* Did it succeed? */		\
 		"\tbne   1b\n"		/* Spin if failed. */		\
@@ -471,14 +634,15 @@ __sync_##name##_4(uint32_t *mem, uint32_
 	return (old);							\
 }
 
-EMIT_FETCH_AND_OP_4(lock_test_and_set, "mov %2, %4")
-EMIT_FETCH_AND_OP_4(fetch_and_add, "add %2, %0, %4")
-EMIT_FETCH_AND_OP_4(fetch_and_and, "and %2, %0, %4")
-EMIT_FETCH_AND_OP_4(fetch_and_or, "orr %2, %0, %4")
-EMIT_FETCH_AND_OP_4(fetch_and_sub, "sub %2, %0, %4")
-EMIT_FETCH_AND_OP_4(fetch_and_xor, "eor %2, %0, %4")
+EMIT_FETCH_AND_OP_4(fetch_and_add, "add")
+EMIT_FETCH_AND_OP_4(fetch_and_and, "and")
+EMIT_FETCH_AND_OP_4(fetch_and_or, "orr")
+EMIT_FETCH_AND_OP_4(fetch_and_sub, "sub")
+EMIT_FETCH_AND_OP_4(fetch_and_xor, "eor")
+
+#else /* __ARM_ARCH_5__ */
 
-#elif defined(_KERNEL)
+#ifdef _KERNEL
 
 #ifdef SMP
 #error "On SMP systems we should have proper atomic operations."
@@ -531,9 +695,119 @@ EMIT_ALL_OPS_N(2, uint16_t)
 EMIT_ALL_OPS_N(4, uint32_t)
 EMIT_ALL_OPS_N(8, uint64_t)
 
-#else /* !__ARM_ARCH_6__ && !__ARM_ARCH_7__ && !_KERNEL */
+#else /* !_KERNEL */
+
+/*
+ * For userspace on uniprocessor systems, we can implement the atomic
+ * operations by using a Restartable Atomic Sequence. This makes the
+ * kernel restart the code from the beginning when interrupted.
+ */
+
+#define	EMIT_LOCK_TEST_AND_SET_N(N, uintN_t, ldr, str)			\
+uintN_t									\
+__sync_lock_test_and_set_##N(uintN_t *mem, uintN_t val)			\
+{									\
+	uint32_t old, temp, ras_start;					\
+									\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%5]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%5, #4]\n"				\
+									\
+		"\t"ldr" %0, %4\n"	/* Load old value. */		\
+		"\t"str" %3, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%5]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%5, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (val), "m" (*mem), "r" (ras_start));		\
+	return (old);							\
+}
+
+#define	EMIT_VAL_COMPARE_AND_SWAP_N(N, uintN_t, ldr, streq)		\
+uintN_t									\
+__sync_val_compare_and_swap_##N(uintN_t *mem, uintN_t expected,		\
+    uintN_t desired)							\
+{									\
+	uint32_t old, temp, ras_start;					\
+									\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%6]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%6, #4]\n"				\
+									\
+		"\t"ldr" %0, %5\n"	/* Load old value. */		\
+		"\tcmp   %0, %3\n"	/* Compare to expected value. */\
+		"\t"streq" %4, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%6]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%6, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (expected), "r" (desired), "m" (*mem),		\
+		  "r" (ras_start));					\
+	return (old);							\
+}
+
+#define	EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, name, op)		\
+uintN_t									\
+__sync_##name##_##N(uintN_t *mem, uintN_t val)				\
+{									\
+	uint32_t old, temp, ras_start;					\
+									\
+	ras_start = ARM_RAS_START;					\
+	__asm volatile (						\
+		/* Set up Restartable Atomic Sequence. */		\
+		"1:"							\
+		"\tadr   %2, 1b\n"					\
+		"\tstr   %2, [%5]\n"					\
+		"\tadr   %2, 2f\n"					\
+		"\tstr   %2, [%5, #4]\n"				\
+									\
+		"\t"ldr" %0, %4\n"	/* Load old value. */		\
+		"\t"op"  %2, %0, %3\n"	/* Calculate new value. */	\
+		"\t"str" %2, %1\n"	/* Store new value. */		\
+									\
+		/* Tear down Restartable Atomic Sequence. */		\
+		"2:"							\
+		"\tmov   %2, #0x00000000\n"				\
+		"\tstr   %2, [%5]\n"					\
+		"\tmov   %2, #0xffffffff\n"				\
+		"\tstr   %2, [%5, #4]\n"				\
+		: "=&r" (old), "=m" (*mem), "=&r" (temp)		\
+		: "r" (val), "m" (*mem), "r" (ras_start));		\
+	return (old);							\
+}
+
+#define	EMIT_ALL_OPS_N(N, uintN_t, ldr, str, streq)			\
+EMIT_LOCK_TEST_AND_SET_N(N, uintN_t, ldr, str)				\
+EMIT_VAL_COMPARE_AND_SWAP_N(N, uintN_t, ldr, streq)			\
+EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_add, "add")		\
+EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_and, "and")		\
+EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_or, "orr")		\
+EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_sub, "sub")		\
+EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_xor, "eor")
+
+EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "streqb")
+EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh")
+EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq")
 
-/* XXX: Implement intrinsics for ARMv5 userspace. */
+#endif /* _KERNEL */
 
 #endif
 

Modified: head/sys/mips/mips/stdatomic.c
==============================================================================
--- head/sys/mips/mips/stdatomic.c	Sat Jun 15 08:07:47 2013	(r251780)
+++ head/sys/mips/mips/stdatomic.c	Sat Jun 15 08:15:22 2013	(r251781)
@@ -187,8 +187,8 @@ __sync_val_compare_and_swap_##N(uintN_t 
     uintN_t desired)							\
 {									\
 	uint32_t *mem32;						\
-	reg_t expected32, desired32, posmask, negmask, old;		\
-	uint32_t temp;							\
+	reg_t expected32, desired32, posmask, old;			\
+	uint32_t negmask, temp;						\
 									\
 	mem32 = round_to_word(mem);					\
 	expected32.v32 = 0x00000000;					\
@@ -197,7 +197,7 @@ __sync_val_compare_and_swap_##N(uintN_t 
 	put_##N(&desired32, mem, desired);				\
 	posmask.v32 = 0x00000000;					\
 	put_##N(&posmask, mem, ~0);					\
-	negmask.v32 = ~posmask.v32;					\
+	negmask = ~posmask.v32;						\
 									\
 	do_sync();							\
 	__asm volatile (						\
@@ -212,7 +212,7 @@ __sync_val_compare_and_swap_##N(uintN_t 
 		"2:"							\
 		: "=&r" (old), "=m" (*mem32), "=&r" (temp)		\
 		: "r" (expected32.v32), "r" (desired32.v32),		\
-		  "r" (posmask.v32), "r" (negmask.v32), "m" (*mem32));	\
+		  "r" (posmask.v32), "r" (negmask), "m" (*mem32));	\
 	return (get_##N(&old, mem));					\
 }
 
@@ -224,15 +224,15 @@ uintN_t									\
 __sync_##name##_##N(uintN_t *mem, uintN_t val)				\
 {									\
 	uint32_t *mem32;						\
-	reg_t val32, posmask, negmask, old;				\
-	uint32_t temp1, temp2;						\
+	reg_t val32, posmask, old;					\
+	uint32_t negmask, temp1, temp2;					\
 									\
 	mem32 = round_to_word(mem);					\
 	val32.v32 = 0x00000000;						\
 	put_##N(&val32, mem, val);					\
 	posmask.v32 = 0x00000000;					\
 	put_##N(&posmask, mem, ~0);					\
-	negmask.v32 = ~posmask.v32;					\
+	negmask = ~posmask.v32;						\
 									\
 	do_sync();							\
 	__asm volatile (						\
@@ -246,8 +246,8 @@ __sync_##name##_##N(uintN_t *mem, uintN_
 		"\tbeqz	%2, 1b\n"	/* Spin if failed. */		\
 		: "=&r" (old.v32), "=m" (*mem32), "=&r" (temp1),	\
 		  "=&r" (temp2)						\
-		: "r" (val32.v32), "r" (posmask.v32),			\
-		  "r" (negmask.v32), "m" (*mem32));			\
+		: "r" (val32.v32), "r" (posmask.v32), "r" (negmask),	\
+		  "m" (*mem32));					\
 	return (get_##N(&old, mem));					\
 }
 

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 08:21:54 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A1331157;
 Sat, 15 Jun 2013 08:21:54 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 935061DE0;
 Sat, 15 Jun 2013 08:21:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F8LsPu089232;
 Sat, 15 Jun 2013 08:21:54 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F8Lst5089231;
 Sat, 15 Jun 2013 08:21:54 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150821.r5F8Lst5089231@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 08:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251782 - head/sys/sparc64/sparc64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 08:21:54 -0000

Author: ed
Date: Sat Jun 15 08:21:54 2013
New Revision: 251782
URL: http://svnweb.freebsd.org/changeset/base/251782

Log:
  Stick to using the documented atomic(9) API.
  
  The atomic_store_ptr() function is not part of the atomic(9) API. We
  only provide a version with a release barrier.

Modified:
  head/sys/sparc64/sparc64/pmap.c

Modified: head/sys/sparc64/sparc64/pmap.c
==============================================================================
--- head/sys/sparc64/sparc64/pmap.c	Sat Jun 15 08:15:22 2013	(r251781)
+++ head/sys/sparc64/sparc64/pmap.c	Sat Jun 15 08:21:54 2013	(r251782)
@@ -2246,7 +2246,7 @@ pmap_activate(struct thread *td)
 	pm->pm_context[curcpu] = context;
 #ifdef SMP
 	CPU_SET_ATOMIC(PCPU_GET(cpuid), &pm->pm_active);
-	atomic_store_ptr((uintptr_t *)PCPU_PTR(pmap), (uintptr_t)pm);
+	atomic_store_rel_ptr((uintptr_t *)PCPU_PTR(pmap), (uintptr_t)pm);
 #else
 	CPU_SET(PCPU_GET(cpuid), &pm->pm_active);
 	PCPU_SET(pmap, pm);

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 08:23:53 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B5B792D8;
 Sat, 15 Jun 2013 08:23:53 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A6C481DEA;
 Sat, 15 Jun 2013 08:23:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F8Nr4w089580;
 Sat, 15 Jun 2013 08:23:53 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F8NrRW089579;
 Sat, 15 Jun 2013 08:23:53 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150823.r5F8NrRW089579@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 08:23:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251783 - head/sys/sparc64/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 08:23:53 -0000

Author: ed
Date: Sat Jun 15 08:23:53 2013
New Revision: 251783
URL: http://svnweb.freebsd.org/changeset/base/251783

Log:
  Remove conflicting macros from SPARC64's atomic(9) header.
  
  The atomic_load() and atomic_store() macros conflict with the equally
  named macros from . Remove them, as they are only used to
  implement functions that are not present on any of the other
  architectures.

Modified:
  head/sys/sparc64/include/atomic.h

Modified: head/sys/sparc64/include/atomic.h
==============================================================================
--- head/sys/sparc64/include/atomic.h	Sat Jun 15 08:21:54 2013	(r251782)
+++ head/sys/sparc64/include/atomic.h	Sat Jun 15 08:23:53 2013	(r251783)
@@ -133,12 +133,9 @@
 	t;								\
 })
 
-#define	atomic_load(p, sz)						\
-	atomic_cas((p), 0, 0, sz)
-
 #define	atomic_load_acq(p, sz) ({					\
 	itype(sz) v;							\
-	v = atomic_load((p), sz);					\
+	v = atomic_cas((p), 0, 0, sz);					\
 	__compiler_membar();						\
 	v;								\
 })
@@ -153,8 +150,9 @@
 	e;								\
 })
 
-#define	atomic_store(p, v, sz) do {					\
+#define	atomic_store_rel(p, v, sz) do {					\
 	itype(sz) e, r;							\
+	membar(LoadStore | StoreStore);					\
 	for (e = *(volatile itype(sz) *)(p);; e = r) {			\
 		r = atomic_cas((p), e, (v), sz);			\
 		if (r == e)						\
@@ -162,11 +160,6 @@
 	}								\
 } while (0)
 
-#define	atomic_store_rel(p, v, sz) do {					\
-	membar(LoadStore | StoreStore);					\
-	atomic_store((p), (v), sz);					\
-} while (0)
-
 #define	ATOMIC_GEN(name, ptype, vtype, atype, sz)			\
 									\
 static __inline vtype							\
@@ -267,11 +260,6 @@ atomic_subtract_rel_ ## name(volatile pt
 }									\
 									\
 static __inline void							\
-atomic_store_ ## name(volatile ptype p, vtype v)			\
-{									\
-	atomic_store((p), (v), sz);					\
-}									\
-static __inline void							\
 atomic_store_rel_ ## name(volatile ptype p, vtype v)			\
 {									\
 	atomic_store_rel((p), (v), sz);					\

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 09:04:11 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 16C09693;
 Sat, 15 Jun 2013 09:04:11 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 08D9F1E98;
 Sat, 15 Jun 2013 09:04:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F94AX1002123;
 Sat, 15 Jun 2013 09:04:10 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F94AHa002122;
 Sat, 15 Jun 2013 09:04:10 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150904.r5F94AHa002122@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 09:04:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251784 - head/lib/libcompiler_rt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 09:04:11 -0000

Author: ed
Date: Sat Jun 15 09:04:10 2013
New Revision: 251784
URL: http://svnweb.freebsd.org/changeset/base/251784

Log:
  Let ARM use the custom tailored atomic intrinsics.

Deleted:
  head/lib/libcompiler_rt/__sync_fetch_and_add_4.c
  head/lib/libcompiler_rt/__sync_fetch_and_and_4.c
  head/lib/libcompiler_rt/__sync_fetch_and_op_n.h
  head/lib/libcompiler_rt/__sync_fetch_and_or_4.c
  head/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
  head/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
  head/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
  head/lib/libcompiler_rt/__sync_synchronize.c
  head/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
  head/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
Modified:
  head/lib/libcompiler_rt/Makefile

Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile	Sat Jun 15 08:23:53 2013	(r251783)
+++ head/lib/libcompiler_rt/Makefile	Sat Jun 15 09:04:10 2013	(r251784)
@@ -158,14 +158,9 @@ SRCF+=	divsi3 \
 
 # FreeBSD-specific atomic intrinsics.
 .if ${MACHINE_CPUARCH} == "arm"
-SRCF+=	__sync_fetch_and_add_4 \
-	__sync_fetch_and_and_4 \
-	__sync_fetch_and_or_4 \
-	__sync_fetch_and_sub_4 \
-	__sync_fetch_and_xor_4 \
-	__sync_lock_test_and_set_4 \
-	__sync_synchronize \
-	__sync_val_compare_and_swap_4
+.PATH: ${.CURDIR}/../../sys/arm/arm
+
+SRCF+=	stdatomic
 .elif ${MACHINE_CPUARCH} == "mips"
 .PATH: ${.CURDIR}/../../sys/mips/mips
 

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 09:42:43 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9794EE1;
 Sat, 15 Jun 2013 09:42:43 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DAB651F79;
 Sat, 15 Jun 2013 09:42:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F9gh1K014417;
 Sat, 15 Jun 2013 09:42:43 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F9ghnc014415;
 Sat, 15 Jun 2013 09:42:43 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150942.r5F9ghnc014415@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 09:42:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251785 - head/contrib/llvm/tools/clang/lib/Basic
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 09:42:44 -0000

Author: ed
Date: Sat Jun 15 09:42:43 2013
New Revision: 251785
URL: http://svnweb.freebsd.org/changeset/base/251785

Log:
  Pull in r184040 from upstream clang trunk:
  
    Emit native implementations of atomic operations on FreeBSD/armv6.
  
    Just like on Linux, FreeBSD/armv6 assumes the system supports
    ldrex/strex unconditionally. It is also used by the kernel. We can
    therefore enable support for it, like we do on Linux.
  
    While there, change one of the unit tests to explicitly test against
    armv5 instead of armv7, as it actually tests whether libcalls are
    emitted.

Modified:
  head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp

Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sat Jun 15 09:04:10 2013	(r251784)
+++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sat Jun 15 09:42:43 2013	(r251785)
@@ -3533,8 +3533,8 @@ class ARMTargetInfo : public TargetInfo 
     // the kernel which on armv6 and newer uses ldrex and strex. The net result
     // is that if we assume the kernel is at least as recent as the hardware,
     // it is safe to use atomic instructions on armv6 and newer.
-    if (T.getOS() != llvm::Triple::Linux)
-     return false;
+    if (T.getOS() != llvm::Triple::Linux && T.getOS() != llvm::Triple::FreeBSD)
+      return false;
     StringRef ArchName = T.getArchName();
     if (T.getArch() == llvm::Triple::arm) {
       if (!ArchName.startswith("armv"))

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 10:08:35 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D450E348;
 Sat, 15 Jun 2013 10:08:35 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ABF95103B;
 Sat, 15 Jun 2013 10:08:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FA8ZG6021834;
 Sat, 15 Jun 2013 10:08:35 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FA8ZER021833;
 Sat, 15 Jun 2013 10:08:35 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306151008.r5FA8ZER021833@svn.freebsd.org>
From: Lawrence Stewart 
Date: Sat, 15 Jun 2013 10:08:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251787 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 10:08:35 -0000

Author: lstewart
Date: Sat Jun 15 10:08:34 2013
New Revision: 251787
URL: http://svnweb.freebsd.org/changeset/base/251787

Log:
  Move hhook's per-vnet initialisation to an earlier SYSINIT SI_SUB stage to
  ensure all per-vnet related hhook initialisation is completed prior to any
  virtualised hhook points attempting registration.
  
  vnet_register_sysinit() requires that a stage later than SI_SUB_VNET be chosen.
  There are no per-vnet initialisors in the source tree at this time which run
  earlier than SI_SUB_INIT_IF. A quick audit of non-virtualised SYSINITs indicates
  there are no subsystems pre SI_SUB_MBUF that would likely be interested in
  registering a virtualised hhook point.
  
  Settle on SI_SUB_MBUF as hhook's per-vnet initialisation stage as it's the first
  overtly network-related initilisation stage to run after SI_SUB_VNET. If a
  subsystem that initialises earlier than SI_SUB_MBUF ends up wanting to register
  virtualised hhook points in future, hhook's use of SI_SUB_MBUF will need to be
  revisited and would probably warrant creating a dedicated SI_SUB_HHOOK which
  runs immediately after SI_SUB_VNET.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_hhook.c

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Sat Jun 15 09:57:43 2013	(r251786)
+++ head/sys/kern/kern_hhook.c	Sat Jun 15 10:08:34 2013	(r251787)
@@ -509,7 +509,7 @@ hhook_vnet_uninit(const void *unused __u
 /*
  * When a vnet is created and being initialised, init the V_hhook_vhead_list.
  */
-VNET_SYSINIT(hhook_vnet_init, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST,
+VNET_SYSINIT(hhook_vnet_init, SI_SUB_MBUF, SI_ORDER_FIRST,
     hhook_vnet_init, NULL);
 
 /*
@@ -517,5 +517,5 @@ VNET_SYSINIT(hhook_vnet_init, SI_SUB_PRO
  * points to clean up on vnet tear down, but in case the KPI is misused,
  * provide a function to clean up and free memory for a vnet being destroyed.
  */
-VNET_SYSUNINIT(hhook_vnet_uninit, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST,
+VNET_SYSUNINIT(hhook_vnet_uninit, SI_SUB_MBUF, SI_ORDER_ANY,
     hhook_vnet_uninit, NULL);

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 10:35:19 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D3A4099E;
 Sat, 15 Jun 2013 10:35:19 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from nibbler.fubar.geek.nz (nibbler.fubar.geek.nz [199.48.134.198])
 by mx1.freebsd.org (Postfix) with ESMTP id B79A110FD;
 Sat, 15 Jun 2013 10:35:19 +0000 (UTC)
Received: from bender.Home (unknown [176.252.103.78])
 by nibbler.fubar.geek.nz (Postfix) with ESMTPSA id 359025E1D5;
 Sat, 15 Jun 2013 10:35:12 +0000 (UTC)
Date: Sat, 15 Jun 2013 11:35:03 +0100
From: Andrew Turner 
To: Jeff Roberson 
Subject: Re: svn commit: r251709 - head/sys/vm
Message-ID: <20130615113503.4f5509dd@bender.Home>
In-Reply-To: <201306132105.r5DL5c4F013089@svn.freebsd.org>
References: <201306132105.r5DL5c4F013089@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 10:35:19 -0000

On Thu, 13 Jun 2013 21:05:38 +0000 (UTC)
Jeff Roberson  wrote:

> Author: jeff
> Date: Thu Jun 13 21:05:38 2013
> New Revision: 251709
> URL: http://svnweb.freebsd.org/changeset/base/251709
> 
> Log:
>    - Convert the slab free item list from a linked array of indices
> to a bitmap using sys/bitset.  This is much simpler, has lower space
>      overhead and is cheaper in most cases.
>    - Use a second bitmap for invariants asserts and improve the
> quality of the asserts as well as the number of erroneous conditions
> that we will catch.
>    - Drastically simplify sizing code.  Special case refcnt zones
> since they will be going away.
>    - Update stale comments.

This broke booting for my on the Raspberry Pi for me. If I revert just
this change the board boots as expected. Kernel output from the boot
failure follows.

Andrew


KDB: debugger backends: ddb
KDB: current backend: ddb
Copyright (c) 1992-2013 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
	The Regents of the University of California. All rights
reserved. FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 10.0-CURRENT #40 r251712:251749M: Fri Jun 14 17:33:49 BST 2013
    andrew@bender:/usr/obj/arm.armv6/usr/home/andrew/freebsd/repo/head/sys/RPI-B
arm FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502) 20130610
panic: lock "vm map (user)" 0xc05c1050 already initialized
KDB: enter: panic
[ thread pid 0 tid 0 ]
Stopped at      0xc0261894:     ldrb    r15, [r15, r15, ror r15]!
db>

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 10:38:31 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C3366B27;
 Sat, 15 Jun 2013 10:38:31 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B55381110;
 Sat, 15 Jun 2013 10:38:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FAcVVg031118;
 Sat, 15 Jun 2013 10:38:31 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FAcV5M031117;
 Sat, 15 Jun 2013 10:38:31 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306151038.r5FAcV5M031117@svn.freebsd.org>
From: Lawrence Stewart 
Date: Sat, 15 Jun 2013 10:38:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251789 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 10:38:31 -0000

Author: lstewart
Date: Sat Jun 15 10:38:31 2013
New Revision: 251789
URL: http://svnweb.freebsd.org/changeset/base/251789

Log:
  Now that the necessary infrastructure is in place to ensure hhook points which
  register after a khelp module will get hooked, move khelp module initialisation
  to the earlier SI_SUB_KLD stage.
  
  MFC after:	1 week

Modified:
  head/sys/sys/module_khelp.h

Modified: head/sys/sys/module_khelp.h
==============================================================================
--- head/sys/sys/module_khelp.h	Sat Jun 15 10:09:20 2013	(r251788)
+++ head/sys/sys/module_khelp.h	Sat Jun 15 10:38:31 2013	(r251789)
@@ -85,8 +85,7 @@ struct khelp_modevent_data {
 		.evhand = khelp_modevent,				\
 		.priv = &kmd_##hname					\
 	};								\
-	DECLARE_MODULE(hname, h_##hname, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-	    SI_ORDER_ANY);						\
+	DECLARE_MODULE(hname, h_##hname, SI_SUB_KLD, SI_ORDER_ANY);	\
 	MODULE_VERSION(hname, version)
 
 #define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 10:43:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 49D06DBC;
 Sat, 15 Jun 2013 10:43:10 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 by mx1.freebsd.org (Postfix) with ESMTP id B246B1139;
 Sat, 15 Jun 2013 10:43:09 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r5FAh3rv090307;
 Sat, 15 Jun 2013 13:43:03 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r5FAh3rv090307
Received: (from kostik@localhost)
 by tom.home (8.14.7/8.14.7/Submit) id r5FAh1Mk090306;
 Sat, 15 Jun 2013 13:43:01 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Sat, 15 Jun 2013 13:43:01 +0300
From: Konstantin Belousov 
To: Bruce Evans 
Subject: Re: svn commit: r251282 - head/sys/kern
Message-ID: <20130615104301.GL91021@kib.kiev.ua>
References: <201306030416.r534GmCA001872@svn.freebsd.org>
 <51AC1B49.9090001@mu.org> <20130603075539.GK3047@kib.kiev.ua>
 <51AC60CA.6050105@mu.org> <20130604052219.GP3047@kib.kiev.ua>
 <20130604170410.M1018@besplex.bde.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="Swj79WlilW4BQYVz"
Content-Disposition: inline
In-Reply-To: <20130604170410.M1018@besplex.bde.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 10:43:10 -0000


--Swj79WlilW4BQYVz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jun 04, 2013 at 06:14:49PM +1000, Bruce Evans wrote:
> On Tue, 4 Jun 2013, Konstantin Belousov wrote:
>=20
> > On Mon, Jun 03, 2013 at 02:24:26AM -0700, Alfred Perlstein wrote:
> >> On 6/3/13 12:55 AM, Konstantin Belousov wrote:
> >>> On Sun, Jun 02, 2013 at 09:27:53PM -0700, Alfred Perlstein wrote:
> >>>> Hey Konstaintin, shouldn't this be scaled against the actual amount =
of
> >>>> KVA we have instead of an arbitrary limit?
> >>> The commit changes the buffer cache to scale according to the availab=
le
> >>> KVA, making the scaling less dumb.
> >>>
> >>> I do not understand what exactly do you want to do, please describe t=
he
> >>> algorithm you propose to implement instead of my change.
> >>
> >> Sure, how about deriving the hardcoded "32" from the maxkva a machine
> >> can have?
> >>
> >> Is that possible?
> > I do not see why this would be useful. Initially I thought about simply
> > capping nbuf at 100000 without referencing any "memory". Then I realized
> > that this would somewhat conflict with (unlikely) changes to the value
> > of BKVASIZE due to "factor".
>=20
> The presence of BKVASIZE in 'factor' is a bug.  My version never had this
> bug (see below for a patch).  The scaling should be to maximize nbuf,
> subject to non-arbitrary limits on physical memory and kva, and now an
> arbirary limit of about 100000 / (BKVASIZE / 16384) on nbuf.  Your new
> limit is arbitrary so it shouldn't affect nbuf depending on BKVASIZE.
I disagree with the statement that the goal is to maximize nbuf. The
buffer cache currently is nothing more then a header and i/o record for
the set of the wired pages. For non-metadata on UFS, buffers doenot map
the pages into KVA, so it becomes purely an array of pointers to page
and some additional bookkeeping.

I want to eventually break the coupling between size of the buffer map
and the nbuf. Right now, typical population of the buffer map is around
20%, which means that we waste >=3D 100MB of KVA on 32bit machines, where
the KVA is precious. I would also consider shrinking the nbufs much
lower, but the cost of wiring and unwiring the pages for the buffer
creation and reuse is the blocking point.

>=20
> Expanding BKVASIZE should expand kva use, but on i386 this will soon
> hit a non-arbitary kva limit so nbuf will not be as high as preferred.
> nbuf needs to be very large mainly to support file systems with small
> buffers.  Even 100000 only gives 50MB of buffering if the fs block
> size is 512.  This would shrink to only 12.5MB if BKVASIZE is expanded
> by a factor of 4 and the bug is not fixed.  If 25000 buffers after
> expanding BKVASIZE is enough, then that should be the arbitary limit
> (independent of BKVASIZE) so as to save physical memory.
Yes, this is another reason to decouple the nbuf and buffer map.

>=20
> On i386 systems with 1GB RAM, nbuf defaults to about 7000.  With an
> fs block size of 512, that can buffer 3.5MB.  Expanding BKVASIZE by a
> factor of 4 shrinks this to 0.875MB in -current.  That is ridiculously
> small.  VMIO limits the lossage from this.
>=20
> BKVASIZE was originally 8KB.  I forget if nbuf was halved by not modifying
> the scale factor when it was expanded to 16KB.  Probably not.  I used to
> modify the scale factor to get twice as many as the default nbuf, but
> once the default nbuf expanded to a few thousand it became large enough
> for most purposes so I no longer do this.
Now, with the default UFS block size being 32KB, it is effectively halved
once more.


--Swj79WlilW4BQYVz
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQIcBAEBAgAGBQJRvEU0AAoJEJDCuSvBvK1BoC0P/itzCFp3T4/ytFNeBhp+OcIS
Q1JUd+N9nc+Hni5pIoGwg/XP/BP/EEwABGgCm086uloRzIyeS+4vl1GJfbIvJ3CK
9AfWlEhBFTtlN+7H/WfxrrtAqpsJ8dU9bZG0mdOTYeoDgCE05dJBUCloNug8JPEh
vfaXNWhMJRFBCBl1lHTcVnkuVOYLlkMlMbTdbwq4/kAhJt6ym9Pk1Px69hRTGbnQ
4Y76qOK0jYqpaO9Tjjnbk39SfOqqBO7imhXD6conq9E0RfOruXVKuFLAffaz04jX
WT+G4kgKPY7rDSNoCy7UgX9myQu6LdpYIj3+dw9RrhoZHN68dk4VbFE0JDMPaVRx
c7B5gWNAXOCXngy8vM+2nwD9MlTHd1d0u2OuP9gHPYFvgVEaY//YmiWNMs6yg+j7
pU9WGFgnS+d+dWq2SJo+uSAh4+5UrBK6pTYlCY0BH2u7mF4zcZZGqT1ruUt/XXJ3
ClrZDKwRYPF1f4bmdPSdv92mit92nvSHaXMZhgvUyTod7Og/HQzloz0tjWDE/Aq0
CS1+saGW8Thhplaz7+s94VkZLyuRxfSfcPKq1avxMj2RUT4wPEKRJLh6znWNxVBA
XM97xNqrF3LF80Su1kRg1M2s79fxRJtLcj+EfIQFUUYD+wZMtAOR0f9ncDfK45aK
a9HTJF1PzYfrxcUxhLW2
=K/Kw
-----END PGP SIGNATURE-----

--Swj79WlilW4BQYVz--

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 12:13:24 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 34C5194D;
 Sat, 15 Jun 2013 12:13:24 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 26CC415DA;
 Sat, 15 Jun 2013 12:13:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FCDN9u062862;
 Sat, 15 Jun 2013 12:13:23 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FCDMkl062856;
 Sat, 15 Jun 2013 12:13:22 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201306151213.r5FCDMkl062856@svn.freebsd.org>
From: Andrew Turner 
Date: Sat, 15 Jun 2013 12:13:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251790 - in head/contrib/llvm/tools/clang:
 include/clang/Basic lib/Sema
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 12:13:24 -0000

Author: andrew
Date: Sat Jun 15 12:13:22 2013
New Revision: 251790
URL: http://svnweb.freebsd.org/changeset/base/251790

Log:
  Pull in r183926 from LLVM trunk:
  
    Allow clang to build __clear_cache on ARM.
  
    __clear_cache is special. It needs no signature, but is a real function in
    compiler_rt or libgcc.
  
    Patch by Andrew Turner.
  
  This allows us to build the __clear_cache function in compiler-rt.

Modified:
  head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
  head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h
  head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def
  head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def
  head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp

Modified: head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sat Jun 15 10:38:31 2013	(r251789)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sat Jun 15 12:13:22 2013	(r251790)
@@ -70,6 +70,8 @@
 //  f -> this is a libc/libm function without the '__builtin_' prefix. It can
 //       be followed by ':headername:' to state which header this function
 //       comes from.
+//  i -> this is a runtime library implemented function without the
+//       '__builtin_' prefix. It will be implemented in compiter-rt or libgcc.
 //  p:N: -> this is a printf-like function whose Nth argument is the format
 //          string.
 //  P:N: -> similar to the p:N: attribute, but the function is like vprintf

Modified: head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h	Sat Jun 15 10:38:31 2013	(r251789)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h	Sat Jun 15 12:13:22 2013	(r251790)
@@ -128,6 +128,13 @@ public:
     return strchr(GetRecord(ID).Attributes, 'f') != 0;
   }
 
+  /// \brief Determines whether this builtin is a predefined compiler-rt/libgcc
+  /// function, such as "__clear_cache", where we know the signature a
+  /// priori.
+  bool isPredefinedRuntimeFunction(unsigned ID) const {
+    return strchr(GetRecord(ID).Attributes, 'i') != 0;
+  }
+
   /// \brief Determines whether this builtin has custom typechecking.
   bool hasCustomTypechecking(unsigned ID) const {
     return strchr(GetRecord(ID).Attributes, 't') != 0;

Modified: head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def	Sat Jun 15 10:38:31 2013	(r251789)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def	Sat Jun 15 12:13:22 2013	(r251790)
@@ -15,4 +15,4 @@
 // The format of this database matches clang/Basic/Builtins.def.
 
 // In libgcc
-BUILTIN(__clear_cache, "vv*v*", "")
+BUILTIN(__clear_cache, "vv*v*", "i")

Modified: head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def	Sat Jun 15 10:38:31 2013	(r251789)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def	Sat Jun 15 12:13:22 2013	(r251790)
@@ -15,7 +15,7 @@
 // The format of this database matches clang/Basic/Builtins.def.
 
 // In libgcc
-BUILTIN(__clear_cache, "v.", "")
+BUILTIN(__clear_cache, "v.", "i")
 BUILTIN(__builtin_thread_pointer, "v*", "")
 
 // Saturating arithmetic

Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sat Jun 15 10:38:31 2013	(r251789)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sat Jun 15 12:13:22 2013	(r251790)
@@ -8671,7 +8671,8 @@ Decl *Sema::ActOnStartOfFunctionDef(Scop
 
   // Builtin functions cannot be defined.
   if (unsigned BuiltinID = FD->getBuiltinID()) {
-    if (!Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID)) {
+    if (!Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID) &&
+        !Context.BuiltinInfo.isPredefinedRuntimeFunction(BuiltinID)) {
       Diag(FD->getLocation(), diag::err_builtin_definition) << FD;
       FD->setInvalidDecl();
     }

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 12:16:27 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C7178BC6;
 Sat, 15 Jun 2013 12:16:27 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B9FE615F7;
 Sat, 15 Jun 2013 12:16:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FCGRNg063528;
 Sat, 15 Jun 2013 12:16:27 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FCGR0T063527;
 Sat, 15 Jun 2013 12:16:27 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201306151216.r5FCGR0T063527@svn.freebsd.org>
From: Andrew Turner 
Date: Sat, 15 Jun 2013 12:16:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251791 - head/lib/libcompiler_rt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 12:16:27 -0000

Author: andrew
Date: Sat Jun 15 12:16:27 2013
New Revision: 251791
URL: http://svnweb.freebsd.org/changeset/base/251791

Log:
  Build __clear_cache on ARM with clang now it supports it.

Modified:
  head/lib/libcompiler_rt/Makefile

Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile	Sat Jun 15 12:13:22 2013	(r251790)
+++ head/lib/libcompiler_rt/Makefile	Sat Jun 15 12:16:27 2013	(r251791)
@@ -28,6 +28,7 @@ SRCF=	absvdi2 \
 	ashlti3 \
 	ashrdi3 \
 	ashrti3 \
+	clear_cache \
 	clzdi2 \
 	clzsi2 \
 	clzti2 \
@@ -125,11 +126,6 @@ SRCF=	absvdi2 \
 	umoddi3 \
 	umodti3
 
-# Don't build clear_cache on ARM with clang as it is a builtin there.
-.if ${MACHINE_CPUARCH} != "arm" || ${COMPILER_TYPE} != "clang"
-SRCF+=	clear_cache
-.endif
-
 # These are already shipped by libc.a on arm and mips
 .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 SRCF+=	adddf3 \

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 12:46:39 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BB5BC680;
 Sat, 15 Jun 2013 12:46:39 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 93E8F16F0;
 Sat, 15 Jun 2013 12:46:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FCkda3072721;
 Sat, 15 Jun 2013 12:46:39 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FCkdFb072719;
 Sat, 15 Jun 2013 12:46:39 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306151246.r5FCkdFb072719@svn.freebsd.org>
From: Alexander Motin 
Date: Sat, 15 Jun 2013 12:46:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251792 - in head/sys/cam: ata scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 12:46:39 -0000

Author: mav
Date: Sat Jun 15 12:46:38 2013
New Revision: 251792
URL: http://svnweb.freebsd.org/changeset/base/251792

Log:
  Restore use of polling mode for disk cache flush in case of kernel panic.
  While I am not sure that any extra hardware access is a good idea after
  panic, that is an existing behaviour that should better work correctly.

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Sat Jun 15 12:16:27 2013	(r251791)
+++ head/sys/cam/ata/ata_da.c	Sat Jun 15 12:46:38 2013	(r251792)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #endif /* _KERNEL */
@@ -1907,11 +1908,16 @@ adaflush(void)
 	int error;
 
 	CAM_PERIPH_FOREACH(periph, &adadriver) {
-		/* If we paniced with lock held - not recurse here. */
-		if (cam_periph_owned(periph))
+		softc = (struct ada_softc *)periph->softc;
+		if (SCHEDULER_STOPPED()) {
+			/* If we paniced with the lock held, do not recurse. */
+			if (!cam_periph_owned(periph) &&
+			    (softc->flags & ADA_FLAG_OPEN)) {
+				adadump(softc->disk, NULL, 0, 0, 0);
+			}
 			continue;
+		}
 		cam_periph_lock(periph);
-		softc = (struct ada_softc *)periph->softc;
 		/*
 		 * We only sync the cache if the drive is still open, and
 		 * if the drive is capable of it..

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Sat Jun 15 12:16:27 2013	(r251791)
+++ head/sys/cam/scsi/scsi_da.c	Sat Jun 15 12:46:38 2013	(r251792)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #endif /* _KERNEL */
@@ -3671,8 +3672,16 @@ dashutdown(void * arg, int howto)
 	int error;
 
 	CAM_PERIPH_FOREACH(periph, &dadriver) {
-		cam_periph_lock(periph);
 		softc = (struct da_softc *)periph->softc;
+		if (SCHEDULER_STOPPED()) {
+			/* If we paniced with the lock held, do not recurse. */
+			if (!cam_periph_owned(periph) &&
+			    (softc->flags & DA_FLAG_OPEN)) {
+				dadump(softc->disk, NULL, 0, 0, 0);
+			}
+			continue;
+		}
+		cam_periph_lock(periph);
 
 		/*
 		 * We only sync the cache if the drive is still open, and

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 12:56:59 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6E29B85D;
 Sat, 15 Jun 2013 12:56:59 +0000 (UTC)
 (envelope-from marius@alchemy.franken.de)
Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214])
 by mx1.freebsd.org (Postfix) with ESMTP id 086111725;
 Sat, 15 Jun 2013 12:56:58 +0000 (UTC)
Received: from alchemy.franken.de (localhost [127.0.0.1])
 by alchemy.franken.de (8.14.6/8.14.6/ALCHEMY.FRANKEN.DE) with ESMTP id
 r5FCupKB022489; Sat, 15 Jun 2013 14:56:51 +0200 (CEST)
 (envelope-from marius@alchemy.franken.de)
Received: (from marius@localhost)
 by alchemy.franken.de (8.14.6/8.14.6/Submit) id r5FCupNP022488;
 Sat, 15 Jun 2013 14:56:51 +0200 (CEST) (envelope-from marius)
Date: Sat, 15 Jun 2013 14:56:51 +0200
From: Marius Strobl 
To: Ed Schouten 
Subject: Re: svn commit: r251782 - head/sys/sparc64/sparc64
Message-ID: <20130615125651.GH91573@alchemy.franken.de>
References: <201306150821.r5F8Lst5089231@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201306150821.r5F8Lst5089231@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 12:56:59 -0000

On Sat, Jun 15, 2013 at 08:21:54AM +0000, Ed Schouten wrote:
> Author: ed
> Date: Sat Jun 15 08:21:54 2013
> New Revision: 251782
> URL: http://svnweb.freebsd.org/changeset/base/251782
> 
> Log:
>   Stick to using the documented atomic(9) API.
>   
>   The atomic_store_ptr() function is not part of the atomic(9) API. We
>   only provide a version with a release barrier.
> 
> Modified:
>   head/sys/sparc64/sparc64/pmap.c
> 
> Modified: head/sys/sparc64/sparc64/pmap.c
> ==============================================================================
> --- head/sys/sparc64/sparc64/pmap.c	Sat Jun 15 08:15:22 2013	(r251781)
> +++ head/sys/sparc64/sparc64/pmap.c	Sat Jun 15 08:21:54 2013	(r251782)
> @@ -2246,7 +2246,7 @@ pmap_activate(struct thread *td)
>  	pm->pm_context[curcpu] = context;
>  #ifdef SMP
>  	CPU_SET_ATOMIC(PCPU_GET(cpuid), &pm->pm_active);
> -	atomic_store_ptr((uintptr_t *)PCPU_PTR(pmap), (uintptr_t)pm);
> +	atomic_store_rel_ptr((uintptr_t *)PCPU_PTR(pmap), (uintptr_t)pm);
>  #else
>  	CPU_SET(PCPU_GET(cpuid), &pm->pm_active);
>  	PCPU_SET(pmap, pm);

Semantically, this change is wrong; what we really need here is an
acquire variant. Using the release variant instead happens to also
work - albeit additionally wastes CPU cycles for the write memory
barrier - because in total store order, atomic operations implicitly
include the read memory barrier necessary for acquire semantics. In
other words, atomic(9) is in dare need of atomic_store_acq_().

Marius


From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 13:38:22 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 01C3DE0F;
 Sat, 15 Jun 2013 13:38:22 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E95E71831;
 Sat, 15 Jun 2013 13:38:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FDcLmr088894;
 Sat, 15 Jun 2013 13:38:21 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FDcLaG088893;
 Sat, 15 Jun 2013 13:38:21 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306151338.r5FDcLaG088893@svn.freebsd.org>
From: Devin Teske 
Date: Sat, 15 Jun 2013 13:38:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251793 - head/usr.sbin/bsdconfig
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 13:38:22 -0000

Author: dteske
Date: Sat Jun 15 13:38:21 2013
New Revision: 251793
URL: http://svnweb.freebsd.org/changeset/base/251793

Log:
  Style/comments.

Modified:
  head/usr.sbin/bsdconfig/bsdconfig

Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig	Sat Jun 15 12:46:38 2013	(r251792)
+++ head/usr.sbin/bsdconfig/bsdconfig	Sat Jun 15 13:38:21 2013	(r251793)
@@ -290,8 +290,9 @@ if [ "$1" ]; then
 	#
 	# ...unless it's a long-option for usage.
 	#
-	case "$1" in
-	-help|--help|-\?) usage;;
+	case "$1" in -help|--help|-\?)
+		usage
+		# Not reached
 	esac
 
 	#
@@ -304,10 +305,12 @@ if [ "$1" ]; then
 		# no matches, display usage (which shows valid keywords)
 		f_err "%s: %s: $msg_not_found\n" "$pgm" "$1"
 		usage
+		# Not reached
 	fi
 
 	shift
 	exec $cmd ${USE_XDIALOG:+-X} "$@" || exit 1
+	# Not reached
 fi
 
 #

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 19:56:05 2013
Return-Path: 
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 78FC2724;
 Sat, 15 Jun 2013 19:56:05 +0000 (UTC)
 (envelope-from brde@optusnet.com.au)
Received: from mail106.syd.optusnet.com.au (mail106.syd.optusnet.com.au
 [211.29.132.42])
 by mx1.freebsd.org (Postfix) with ESMTP id 26F8B1777;
 Sat, 15 Jun 2013 19:56:04 +0000 (UTC)
Received: from c122-106-156-23.carlnfd1.nsw.optusnet.com.au
 (c122-106-156-23.carlnfd1.nsw.optusnet.com.au [122.106.156.23])
 by mail106.syd.optusnet.com.au (Postfix) with ESMTPS id 1C3573C1A1D;
 Sun, 16 Jun 2013 05:55:57 +1000 (EST)
Date: Sun, 16 Jun 2013 05:55:56 +1000 (EST)
From: Bruce Evans 
X-X-Sender: bde@besplex.bde.org
To: Konstantin Belousov 
Subject: Re: svn commit: r251282 - head/sys/kern
In-Reply-To: <20130615104301.GL91021@kib.kiev.ua>
Message-ID: <20130616034707.A899@besplex.bde.org>
References: <201306030416.r534GmCA001872@svn.freebsd.org>
 <51AC1B49.9090001@mu.org>
 <20130603075539.GK3047@kib.kiev.ua> <51AC60CA.6050105@mu.org>
 <20130604052219.GP3047@kib.kiev.ua> <20130604170410.M1018@besplex.bde.org>
 <20130615104301.GL91021@kib.kiev.ua>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.0 cv=K8x6hFqI c=1 sm=1 a=kj_ttALqKtUA:10
 a=kj9zAlcOel0A:10 a=PO7r1zJSAAAA:8 a=JzwRw_2MAAAA:8 a=M4roAWbnUW4A:10
 a=LvEFDjEoGOWfYtT-BE0A:9 a=CjuIK1q_8ugA:10 a=UTapKURaPes6iDck:21
 a=8NcMTnSIyR3zUjTN:21 a=ebeQFi2P/qHVC0Yw9JDJ4g==:117
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org, Bruce Evans 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 19:56:05 -0000

On Sat, 15 Jun 2013, Konstantin Belousov wrote:

> On Tue, Jun 04, 2013 at 06:14:49PM +1000, Bruce Evans wrote:
>> On Tue, 4 Jun 2013, Konstantin Belousov wrote:
>>
>>> On Mon, Jun 03, 2013 at 02:24:26AM -0700, Alfred Perlstein wrote:
>>>> On 6/3/13 12:55 AM, Konstantin Belousov wrote:
>>>>> On Sun, Jun 02, 2013 at 09:27:53PM -0700, Alfred Perlstein wrote:
>>>>>> Hey Konstaintin, shouldn't this be scaled against the actual amount of
>>>>>> KVA we have instead of an arbitrary limit?
>>>>> The commit changes the buffer cache to scale according to the available
>>>>> KVA, making the scaling less dumb.
>>>>>
>>>>> I do not understand what exactly do you want to do, please describe the
>>>>> algorithm you propose to implement instead of my change.
>>>>
>>>> Sure, how about deriving the hardcoded "32" from the maxkva a machine
>>>> can have?
>>>>
>>>> Is that possible?
>>> I do not see why this would be useful. Initially I thought about simply
>>> capping nbuf at 100000 without referencing any "memory". Then I realized
>>> that this would somewhat conflict with (unlikely) changes to the value
>>> of BKVASIZE due to "factor".
>>
>> The presence of BKVASIZE in 'factor' is a bug.  My version never had this
>> bug (see below for a patch).  The scaling should be to maximize nbuf,
>> subject to non-arbitrary limits on physical memory and kva, and now an
>> arbirary limit of about 100000 / (BKVASIZE / 16384) on nbuf.  Your new
>> limit is arbitrary so it shouldn't affect nbuf depending on BKVASIZE.
>
> I disagree with the statement that the goal is to maximize nbuf. The
> buffer cache currently is nothing more then a header and i/o record for
> the set of the wired pages. For non-metadata on UFS, buffers doenot map
> the pages into KVA, so it becomes purely an array of pointers to page
> and some additional bookkeeping.

Er, since dyson and I designed BKVASIZE with that goal, I know what its
goal is.

> I want to eventually break the coupling between size of the buffer map
> and the nbuf. Right now, typical population of the buffer map is around
> 20%, which means that we waste >= 100MB of KVA on 32bit machines, where
> the KVA is precious. I would also consider shrinking the nbufs much
> lower, but the cost of wiring and unwiring the pages for the buffer
> creation and reuse is the blocking point.

Yes, "some additional bookkeeping" is "a lot of additional bookkeeping"
when nbufs is low relative to the number of active disk blocks.  Small
block sizes expand the number of active disk blocks by a large factor.
E.g., 64 for ffs's default block size of 32K relative to msdosfs's
smallest block size of 512.

This reminds me that I tied to get dyson to implement a better kva
allocation scheme.  At a cost of dividing the nominal number of
buffers by a factor of about 5, but with a gain of avoiding all
fragmentation and all kva allocation overheads, small block sizes
down to size PAGE_SIZE can have as much space allocated for them
(space = number of buffers of this size times block size) as large
blocks.  Use a power of 2 method.  Start with a desired value of nbuf
and sacrifice a large fraction of it: numbers with NOMBSIZE = 16K and
PAGE_SIZE = 4K:

     statically allocate kva for  nbuf/4 buffers of kvasize 64K each
     statically allocate kva for  nbuf/2 buffers of kvasize 32K
     statically allocate kva for  nbuf/1 buffers of kvasize 16K
     statically allocate kva for  2*nbuf buffers of kvasize 8K
     statically allocate kva for  4*nbuf buffers of kvasize 4K

Total allocations: 7.75*nbuf buffers of kvasize 5*nbuf*16K.  To
avoid expanding total kvasize, reduce nbuf by a factor of 5.  This
doesn't work so well for fs block sizes of < 4K.  Allocate many more
than 4*nbuf buffers of size 4K to support them.  Expanding nbuf would
waste kva, but currently, expanding nbuf wastes 4 times as much kva
and also messes up secondary variables like the dirty buffer watermarks.

There is still the cost of mapping buffers into the allocated kva, but
with more buffers of smaller sizes there is less thrashing of the buffers
so less remappings.

When dyson implemented BKVASIZE in 1996, the whole i386 kernel only had
256MB, so fitting enough buffers into it was even harder than.  The i386
kernel kva size wasn't increased to its current 1GB until surprisingly
recently (1999).

> ...
>> BKVASIZE was originally 8KB.  I forget if nbuf was halved by not modifying
>> the scale factor when it was expanded to 16KB.  Probably not.  I used to
>> modify the scale factor to get twice as many as the default nbuf, but
>> once the default nbuf expanded to a few thousand it became large enough
>> for most purposes so I no longer do this.
> Now, with the default UFS block size being 32KB, it is effectively halved
> once more.

Yes, in a bad way for ffs.  When most block sizes are 32K, it is only
possible to use half of nbuf.  Fragmentation occurs if there are mixtures
of 32K-blocks and other block sizes.  Fragmentation wastes time (also
space, but no more than is already wasted statically).  BKVASIZE
should have been doubled to match the doubling of the default block size
   (its comment still hasn't caught up with the previous doublinf of the
   default ffs block size, and still says that BKVASIZE is "2x the block
   size used ny a normal UFS [sic] file system", and warns about the danger
   of making it too small),
but then file systems with smaller block sizes would be penalized.  The
result is similar to that given by my power of 2 method with 2 buffer
sizes:
     statically allocate kva for  nbuf/2 buffers of kvasize 32K
     statically allocate kva for  nbuf/1 buffers of kvasize 16K
except it uses 2/3 as many buffers and 1/2 as much kva as my method, at
a cost of complexity and fragmentation.

Also note that with BKVASIZE = 32K, it is only a factor of 2 away from
MAXBSIZE = 64K (until that is increased), so you could increase BKVASIZE
by another factor of 2 and only halve nbuf by another factor of 2.  The
complexity and fragmentation goes away.

Increasing MAXBSIZE would cause interesting problems.  Fragmentation would
be severe if some block sizes are many more factors of 2 larger than
BKVASIZE.  If MAXBSIZE is really large (say 1MB), then you can't increase
BKVASIZE to it without wasting a really large amount of kva or reducing
nbuf really signficantly, so dynamic sizing becomes necessary again, perhaps
even on 64-bit arches.   Neither MAXBSIZE nor BKVASIZE are kernel options.
BKVASIZE should have been one from the beginning.  An optional MAXBSIZE
hae much wider scope.  For example, systems with a larger MAXBSIZE can
create ffs file systems that cannot be mounted on systems with the
historical MAXBSIZE.

Bruce

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 20:29:10 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B4B46C48;
 Sat, 15 Jun 2013 20:29:10 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9640018A2;
 Sat, 15 Jun 2013 20:29:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FKTA2U012958;
 Sat, 15 Jun 2013 20:29:10 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FKT8S3012945;
 Sat, 15 Jun 2013 20:29:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306152029.r5FKT8S3012945@svn.freebsd.org>
From: Eitan Adler 
Date: Sat, 15 Jun 2013 20:29:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk
 tools/build/mk tools/build/options tools/tools/nanobsd/gateworks
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 20:29:10 -0000

Author: eadler
Date: Sat Jun 15 20:29:07 2013
New Revision: 251794
URL: http://svnweb.freebsd.org/changeset/base/251794

Log:
  Remove CVS from the base system.
  
  Discussed with:	many
  Reviewed by:	peter, zi
  Approved by:	core

Deleted:
  head/contrib/cvs/
  head/gnu/usr.bin/cvs/
  head/share/doc/psd/28.cvs/
Modified:
  head/ObsoleteFiles.inc
  head/UPDATING
  head/etc/inetd.conf
  head/etc/mtree/BSD.usr.dist
  head/gnu/usr.bin/Makefile
  head/share/doc/psd/Makefile
  head/share/mk/bsd.own.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/build/options/WITHOUT_KERBEROS_SUPPORT
  head/tools/tools/nanobsd/gateworks/common

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/ObsoleteFiles.inc	Sat Jun 15 20:29:07 2013	(r251794)
@@ -38,6 +38,33 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130614: remove CVS from base
+OLD_FILES+=usr/bin/cvs
+OLD_FILES+=usr/bin/cvsbug
+OLD_FILES+=usr/share/examples/cvs/contrib/README
+OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
+OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
+OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
+OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
+OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
+OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
+OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
+OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
+OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
+OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
+OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
+OLD_FILES+=usr/share/examples/cvs/contrib/log
+OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
+OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
+OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
+OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
+OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
+OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
+OLD_FILES+=usr/share/info/cvs.info.gz
+OLD_FILES+=usr/share/info/cvsclient.info.gz
+OLD_FILES+=usr/share/man/man1/cvs.1.gz
+OLD_FILES+=usr/share/man/man5/cvs.5.gz
+OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/UPDATING	Sat Jun 15 20:29:07 2013	(r251794)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130615:
+	CVS has been removed from the base system.  An exact copy
+	of the code is available from the devel/cvs port.
+
 20130613:
 	Some people report the following error after the switch to bmake:
 

Modified: head/etc/inetd.conf
==============================================================================
--- head/etc/inetd.conf	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/etc/inetd.conf	Sat Jun 15 20:29:07 2013	(r251794)
@@ -58,8 +58,8 @@
 # --allow-root path correctly or you open a trivial to exploit but
 # deadly security hole.
 #
-#cvspserver	stream	tcp	nowait	root	/usr/bin/cvs	cvs --allow-root=/your/cvsroot/here pserver
-#cvspserver	stream	tcp	nowait	root	/usr/bin/cvs	cvs --allow-root=/your/cvsroot/here kserver
+#cvspserver	stream	tcp	nowait	root	/usr/local/bin/cvs	cvs --allow-root=/your/cvsroot/here pserver
+#cvspserver	stream	tcp	nowait	root	/usr/local/bin/cvs	cvs --allow-root=/your/cvsroot/here kserver
 #
 # RPC based services (you MUST have rpcbind running to use these)
 #

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/etc/mtree/BSD.usr.dist	Sat Jun 15 20:29:07 2013	(r251794)
@@ -148,8 +148,6 @@
                 ..
                 27.nfsrfc
                 ..
-                28.cvs
-                ..
             ..
             smm
                 01.setup
@@ -223,10 +221,6 @@
             ..
             csh
             ..
-            cvs
-                contrib
-                ..
-            ..
             cvsup
             ..
             diskless

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/gnu/usr.bin/Makefile	Sat Jun 15 20:29:07 2013	(r251794)
@@ -4,7 +4,6 @@
 
 SUBDIR= ${_binutils} \
 	${_cc} \
-	${_cvs} \
 	dialog \
 	diff \
 	diff3 \
@@ -26,10 +25,6 @@ _groff=		groff
 .endif
 .endif
 
-.if ${MK_CVS} != "no"
-_cvs=		cvs
-.endif
-
 .if ${MK_GPL_DTC} != "no"
 _dtc=		dtc
 .endif

Modified: head/share/doc/psd/Makefile
==============================================================================
--- head/share/doc/psd/Makefile	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/share/doc/psd/Makefile	Sat Jun 15 20:29:07 2013	(r251794)
@@ -35,7 +35,6 @@ SUBDIR+=22.rpcgen \
 	24.xdr \
 	25.xdrrfc \
 	26.rpcrfc \
-	27.nfsrpc \
-	28.cvs
+	27.nfsrpc
 
 .include 

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/share/mk/bsd.own.mk	Sat Jun 15 20:29:07 2013	(r251794)
@@ -272,7 +272,6 @@ __DEFAULT_YES_OPTIONS = \
     CROSS_COMPILER \
     CRYPT \
     CTM \
-    CVS \
     CXX \
     DICT \
     DYNAMICROOT \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Jun 15 20:29:07 2013	(r251794)
@@ -889,35 +889,6 @@ OLD_FILES+=usr/share/man/man1/ctm_smail.
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 .endif
 
-.if ${MK_CVS} == no
-OLD_FILES+=usr/bin/cvs
-OLD_FILES+=usr/bin/cvsbug
-OLD_FILES+=usr/share/examples/cvs/contrib/README
-OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
-OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
-OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
-OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
-OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
-OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
-OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
-OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
-OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
-OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
-OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
-OLD_FILES+=usr/share/examples/cvs/contrib/log
-OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
-OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
-OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
-OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
-OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
-OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
-OLD_FILES+=usr/share/info/cvs.info.gz
-OLD_FILES+=usr/share/info/cvsclient.info.gz
-OLD_FILES+=usr/share/man/man1/cvs.1.gz
-OLD_FILES+=usr/share/man/man5/cvs.5.gz
-OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
-.endif
-
 # devd(8) and gperf(1) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC

Modified: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT
==============================================================================
--- head/tools/build/options/WITHOUT_KERBEROS_SUPPORT	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/build/options/WITHOUT_KERBEROS_SUPPORT	Sat Jun 15 20:29:07 2013	(r251794)
@@ -1,6 +1,5 @@
 .\" $FreeBSD$
 Set to build some programs without Kerberos support, like
-.Xr cvs 1 ,
 .Xr ssh 1 ,
 .Xr telnet 1 ,
 .Xr sshd 8 ,

Modified: head/tools/tools/nanobsd/gateworks/common
==============================================================================
--- head/tools/tools/nanobsd/gateworks/common	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/tools/nanobsd/gateworks/common	Sat Jun 15 20:29:07 2013	(r251794)
@@ -113,7 +113,6 @@ WITHOUT_BSNMP=true
 WITHOUT_CALENDAR=true
 WITHOUT_CDDL=true
 WITHOUT_CTM=true
-WITHOUT_CVS=true
 WITHOUT_DICT=true
 WITHOUT_EXAMPLES=true
 WITHOUT_FLOPPY=true

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 20:30:41 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D9486DE2
 for ; Sat, 15 Jun 2013 20:30:41 +0000 (UTC)
 (envelope-from peter@wemm.org)
Received: from mail-vb0-x235.google.com (mail-vb0-x235.google.com
 [IPv6:2607:f8b0:400c:c02::235])
 by mx1.freebsd.org (Postfix) with ESMTP id 998A118AF
 for ; Sat, 15 Jun 2013 20:30:41 +0000 (UTC)
Received: by mail-vb0-f53.google.com with SMTP id p12so1160581vbe.40
 for ; Sat, 15 Jun 2013 13:30:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=google;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=SAT/dK++5odot4ad+SlRNrQy2dXjD88uDIvBhCaDSAE=;
 b=V+vOlLcfVwb/pwUV1Hnr5C74QSFyak4OEjOXR9mbYE9P5Pa2u/W+qS75bRXHrohdjP
 3Cvhl8bst/MY2ACau1UJCCt9XNaZtyRFTRw9xVuuEnFNvfEsW4ClCOUlXIc+UcnA3Iwi
 ZjHPMR/K0bb9qeot8kCHlzPT5oqega+8/8YDk=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type:x-gm-message-state;
 bh=SAT/dK++5odot4ad+SlRNrQy2dXjD88uDIvBhCaDSAE=;
 b=UpoNc/OVZ4YcdSG2VvKJ31pckkX6Icv03DreNuMXV91yjejRiGnXosI0PIE6Z9gwNU
 D09SVi+IyD6CMKjlJ7lALY/jb7hozxb+rbkN4KB94JyC6qjLcnCeigh13XpCzcEo6exV
 /pwDjDuk+uKxUA3IjzHJXL47s9nVy3ge68aQJb/R4WiT78/XDGog1joMJLKAkevVvJ0K
 /N5z0PoXlrJ5N7wXjW/0DHEPCupPPAAn+CgHkY2AKiuJWhrER3YqHdQjd1rHrxM9IXLD
 BADSJbs29JuzhIwcPcfCumCxvyy3hA+yw7FoNkmY6jiciTg2UATFtQXvPQCGSdZwLHj3
 MHTw==
MIME-Version: 1.0
X-Received: by 10.221.31.130 with SMTP id sg2mr1547660vcb.86.1371328241157;
 Sat, 15 Jun 2013 13:30:41 -0700 (PDT)
Received: by 10.220.20.133 with HTTP; Sat, 15 Jun 2013 13:30:41 -0700 (PDT)
In-Reply-To: <201306152029.r5FKT8S3012945@svn.freebsd.org>
References: <201306152029.r5FKT8S3012945@svn.freebsd.org>
Date: Sat, 15 Jun 2013 13:30:41 -0700
Message-ID: 
Subject: Re: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk
 tools/build/mk tools/build/options tools/tools/nanobsd/gateworks
From: Peter Wemm 
To: Eitan Adler 
Content-Type: text/plain; charset=ISO-8859-1
X-Gm-Message-State: ALoCoQkgYsVL59OKDJDjuMSneqx5dcJEFp4dxp+OB+HQEHI+/xZMO1fgObuCMpz2zI2xbv5FRh7l
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 20:30:41 -0000

On Sat, Jun 15, 2013 at 1:29 PM, Eitan Adler  wrote:
> Log:
>   Remove CVS from the base system.

I'm loading up on SPF-one-million sunscreen...

-- 
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6FJV
On IRC, talking about C++:
 I think that it is a good thing I will never meet Bjarne on a street
 cause really, I don't want to end up in prison or anything

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 21:15:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 783D85F5;
 Sat, 15 Jun 2013 21:15:08 +0000 (UTC)
 (envelope-from mack@macktronics.com)
Received: from coco.macktronics.com (coco.macktronics.com [209.181.253.65])
 by mx1.freebsd.org (Postfix) with ESMTP id 186C619AE;
 Sat, 15 Jun 2013 21:15:08 +0000 (UTC)
Received: from coco.macktronics.com (coco.macktronics.com [209.181.253.65])
 by coco.macktronics.com (Postfix) with ESMTP id 5F9C34AC40;
 Sat, 15 Jun 2013 16:15:07 -0500 (CDT)
Date: Sat, 15 Jun 2013 16:15:06 -0500 (CDT)
From: Dan Mack 
To: Peter Wemm 
Subject: Re: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk
 tools/build/mk tools/build/options tools/tools/nanobsd/gateworks
In-Reply-To: 
Message-ID: <20130615161344.C45045@coco.macktronics.com>
References: <201306152029.r5FKT8S3012945@svn.freebsd.org>
 
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Eitan Adler 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 21:15:08 -0000

On Sat, 15 Jun 2013, Peter Wemm wrote:

> On Sat, Jun 15, 2013 at 1:29 PM, Eitan Adler  wrote:
>> Log:
>>   Remove CVS from the base system.
>
> I'm loading up on SPF-one-million sunscreen...

Yeah, wow!  Don't forget the asbestos underwear as well.

As for me, good riddins CVS :-)


From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 21:29:48 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2FD15845;
 Sat, 15 Jun 2013 21:29:48 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 08A231A01;
 Sat, 15 Jun 2013 21:29:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FLTlps031626;
 Sat, 15 Jun 2013 21:29:47 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FLTl0T031625;
 Sat, 15 Jun 2013 21:29:47 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306152129.r5FLTl0T031625@svn.freebsd.org>
From: Eitan Adler 
Date: Sat, 15 Jun 2013 21:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251795 - head/share/man/man5
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 21:29:48 -0000

Author: eadler
Date: Sat Jun 15 21:29:47 2013
New Revision: 251795
URL: http://svnweb.freebsd.org/changeset/base/251795

Log:
  Regenerate after CVS removal (and it seems other missed changes)

Modified:
  head/share/man/man5/src.conf.5

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Sat Jun 15 20:29:07 2013	(r251794)
+++ head/share/man/man5/src.conf.5	Sat Jun 15 21:29:47 2013	(r251795)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb
+.\" from FreeBSD: head/tools/build/options/makeman 251685 2013-06-13 13:05:08Z emaste
 .\" $FreeBSD$
-.Dd June 7, 2013
+.Dd June 15, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -387,9 +387,6 @@ similar to DWARF and the venerable stabs
 Set to not build
 .Xr ctm 1
 and related utilities.
-.It Va WITHOUT_CVS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru
-Set to not build CVS.
 .It Va WITHOUT_CXX
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220402 2011-04-06 20:19:07Z uqs
 Set to not build
@@ -637,9 +634,8 @@ When set, the following options are also
 is set explicitly)
 .El
 .It Va WITHOUT_KERBEROS_SUPPORT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT 251794 2013-06-15 20:29:07Z eadler
 Set to build some programs without Kerberos support, like
-.Xr cvs 1 ,
 .Xr ssh 1 ,
 .Xr telnet 1 ,
 .Xr sshd 8 ,
@@ -685,10 +681,11 @@ Setting this variable will enable the LD
 .Xr dig 1
 and
 .Xr host 1 .
-When set, the following options are also in effect:
+When set, it also enforces the following options:
 .Pp
-.Bl -inset -compact
-.It Va WITHOUT_BIND_UTILS
+.Bl -item -compact
+.It
+.Va WITHOUT_BIND_UTILS
 .El
 .It Va WITHOUT_LEGACY_CONSOLE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 249966 2013-04-27 04:09:09Z eadler
@@ -701,9 +698,9 @@ and
 On amd64, set to not build 32-bit library set and a
 .Nm ld-elf32.so.1
 runtime linker.
-.It Va WITHOUT_LIBCPLUSPLUS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim
-Set to avoid building libcxxrt and libc++.
+.It Va WITH_LIBCPLUSPLUS
+.\" from FreeBSD: head/tools/build/options/WITH_LIBCPLUSPLUS 228082 2011-11-28 17:56:46Z dim
+Set to build libcxxrt and libc++.
 .It Va WITHOUT_LIBPTHREAD
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm
 Set to not build the

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 22:18:00 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9C05DD40;
 Sat, 15 Jun 2013 22:18:00 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8CB7C1AF3;
 Sat, 15 Jun 2013 22:18:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FMI0m6047136;
 Sat, 15 Jun 2013 22:18:00 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FMI0uT047135;
 Sat, 15 Jun 2013 22:18:00 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306152218.r5FMI0uT047135@svn.freebsd.org>
From: Ed Schouten 
Date: Sat, 15 Jun 2013 22:18:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251796 - head/sbin/hastd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 22:18:00 -0000

Author: ed
Date: Sat Jun 15 22:17:59 2013
New Revision: 251796
URL: http://svnweb.freebsd.org/changeset/base/251796

Log:
  Let hastd use C11 atomics.
  
  C11 atomics now work on all the architectures. Have at least a single
  piece of software in our base system that uses C11 atomics. This
  somewhat makes it less likely that we break it because of LLVM imports,
  etc.

Modified:
  head/sbin/hastd/refcnt.h

Modified: head/sbin/hastd/refcnt.h
==============================================================================
--- head/sbin/hastd/refcnt.h	Sat Jun 15 21:29:47 2013	(r251795)
+++ head/sbin/hastd/refcnt.h	Sat Jun 15 22:17:59 2013	(r251796)
@@ -32,24 +32,24 @@
 #ifndef __REFCNT_H__
 #define __REFCNT_H__
 
-#include 
+#include 
 
 #include "pjdlog.h"
 
-typedef unsigned int refcnt_t;
+typedef atomic_uint refcnt_t;
 
 static __inline void
 refcnt_init(refcnt_t *count, unsigned int v)
 {
 
-	*count = v;
+	atomic_init(count, v);
 }
 
 static __inline void
 refcnt_acquire(refcnt_t *count)
 {
 
-	atomic_add_acq_int(count, 1);
+	atomic_fetch_add_explicit(count, 1, memory_order_acquire);
 }
 
 static __inline unsigned int
@@ -58,7 +58,7 @@ refcnt_release(refcnt_t *count)
 	unsigned int old;
 
 	/* XXX: Should this have a rel membar? */
-	old = atomic_fetchadd_int(count, -1);
+	old = atomic_fetch_sub(count, 1);
 	PJDLOG_ASSERT(old > 0);
 	return (old - 1);
 }

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 22:22:04 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8D2FEF10;
 Sat, 15 Jun 2013 22:22:04 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 801D51B2A;
 Sat, 15 Jun 2013 22:22:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FMM4vc049368;
 Sat, 15 Jun 2013 22:22:04 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FMM3p8049365;
 Sat, 15 Jun 2013 22:22:03 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201306152222.r5FMM3p8049365@svn.freebsd.org>
From: Jilles Tjoelker 
Date: Sat, 15 Jun 2013 22:22:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251797 - head/tools/regression/bin/sh/builtins
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 22:22:04 -0000

Author: jilles
Date: Sat Jun 15 22:22:03 2013
New Revision: 251797
URL: http://svnweb.freebsd.org/changeset/base/251797

Log:
  sh: Add tests for 'local -' (save shell options).

Added:
  head/tools/regression/bin/sh/builtins/local2.0   (contents, props changed)
  head/tools/regression/bin/sh/builtins/local3.0   (contents, props changed)

Added: head/tools/regression/bin/sh/builtins/local2.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/local2.0	Sat Jun 15 22:22:03 2013	(r251797)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+f() {
+	local -
+	set -a
+	case $- in
+	*a*) : ;;
+	*) echo In-function \$- bad
+	esac
+}
+case $- in
+*a*) echo Initial \$- bad
+esac
+f
+case $- in
+*a*) echo Final \$- bad
+esac

Added: head/tools/regression/bin/sh/builtins/local3.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/local3.0	Sat Jun 15 22:22:03 2013	(r251797)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+f() {
+	local "$@"
+	set -a
+	x=7
+	case $- in
+	*a*) : ;;
+	*) echo In-function \$- bad
+	esac
+	[ "$x" = 7 ] || echo In-function \$x bad
+}
+x=1
+case $- in
+*a*) echo Initial \$- bad
+esac
+f x -
+case $- in
+*a*) echo Intermediate \$- bad
+esac
+[ "$x" = 1 ] || echo Intermediate \$x bad
+f - x
+case $- in
+*a*) echo Final \$- bad
+esac
+[ "$x" = 1 ] || echo Final \$x bad

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 22:34:47 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0867728D
 for ; Sat, 15 Jun 2013 22:34:47 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id C975A1BD8
 for ; Sat, 15 Jun 2013 22:34:46 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FMYk9g040460
 for ; Sat, 15 Jun 2013 22:34:46 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5FMYk07040454
 for svn-src-all@freebsd.org; Sat, 15 Jun 2013 22:34:46 GMT
 (envelope-from bdrewery)
Received: (qmail 70908 invoked from network); 15 Jun 2013 17:34:44 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 15 Jun 2013 17:34:44 -0500
Message-ID: <51BCEBED.9060101@FreeBSD.org>
Date: Sat, 15 Jun 2013 17:34:21 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Eitan Adler 
Subject: Re: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin
 gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk tools/build/mk
 tools/build/options tools/tools/nanobsd/gateworks
References: <201306152029.r5FKT8S3012945@svn.freebsd.org>
In-Reply-To: <201306152029.r5FKT8S3012945@svn.freebsd.org>
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2PVIEWNIJFVBLRVMQUWUW"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 22:34:47 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2PVIEWNIJFVBLRVMQUWUW
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 6/15/2013 3:29 PM, Eitan Adler wrote:
> Author: eadler
> Date: Sat Jun 15 20:29:07 2013
> New Revision: 251794
> URL: http://svnweb.freebsd.org/changeset/base/251794
>=20
> Log:
>   Remove CVS from the base system.

Were you going to submit an exp-run request for this too?

>  =20
>   Discussed with:	many
>   Reviewed by:	peter, zi
>   Approved by:	core

--=20
Regards,
Bryan Drewery


------enig2PVIEWNIJFVBLRVMQUWUW
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRvOvzAAoJEG54KsA8mwz54oAQAKBM8848kzybx6XgndE6+wTs
KVn7O5T3KQDeDJnJ02LNeBbz1WdQaU/6rIBdXgokHrcBbM0i/HmBoPv7QkqW2Gym
p8tlCf6W9i421EAGVAZVYUuzxqc09XGdHXWgDJY/rEz2TWwxWnys1jrqGTieCHf9
Yjh0TvTr8kp7SonAiqfyX3oNEoI5Fuk5nPcKHY+YvjDLfWsL6sgU1CF+Slmo51Nu
oOhUGjHLlPnXqUJtDFX7+kWZnvneR7FVz7DToAX+J1dxLOgJgnSWk8ntF3Hpgc0l
O/j2VyVEJLiGmfqSLqI5DPtdO6Fu74Cf/4oEiltl/mmQVU3WAzR4m9P8IkdOwxrZ
0rEybZ4Mua05wUHd8ym50+nUXStl7z39C+lJJuvwHavXdZgL24bcUiCBa9hmF4oR
8LFad2YCTb9Su8fcDr8hL8D8I9BnhAVHqcq+k+o1pICYnzjzd5KWI2VfNrbDpj2V
UFMckZvdkjE/qzBWzY7gUYT0mjJ5iTu2T0jn/M18xn/20Iq5nKoKEHiVa1Mo7PJC
Lq/uLvHC4daWccqQVFU0NZu0CyvTdhzhcJqN8RSmQ1L3vhRVsgOJcCUCgHfqyCyw
aJrK53GTA7MVAe15A9/gL6H0wwkE0C2W9RSWRjJzWrs/7UDSMn0ggBr5s8Ajnv4e
C7H4m7C3fpUw8wR3ilna
=byKv
-----END PGP SIGNATURE-----

------enig2PVIEWNIJFVBLRVMQUWUW--

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 23:16:53 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 858DD6A5
 for ; Sat, 15 Jun 2013 23:16:53 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com
 [209.85.192.174])
 by mx1.freebsd.org (Postfix) with ESMTP id 5F2851CEF
 for ; Sat, 15 Jun 2013 23:16:53 +0000 (UTC)
Received: by mail-pd0-f174.google.com with SMTP id 10so1624259pdc.5
 for ; Sat, 15 Jun 2013 16:16:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=9Wa25rgUHhL7Xh3WFYXhmnXzHgyP1nV+c49OCOlD0mA=;
 b=X1dL41KWLRxpmbSkmQKH5a4yYbBbphR+LZvncSG5BRf446wUMXsuZEFzvKYFupAyM+
 JNw5IV+pocNE/nLhm+pu8Bd5e99qZwvy69nNcp/beZWw3rcppYOdjRi0Sc5zUy9GJ+NX
 I0nR/yj+HkeWBk5x+YPFPePDOGnNxUFCtABUk=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=9Wa25rgUHhL7Xh3WFYXhmnXzHgyP1nV+c49OCOlD0mA=;
 b=DOhv//M7X4JRZV1kMDndTVUA9SuzhI+gSzmplaJJXF27oJQx4qN8pM4iRZDsiZQ3T8
 6MB0V1pLSRLHaPG7m1KXtvIuifLxIWjxOVixxeGknjaYqVqFRtNhi/gPV+PU8iU6rg+U
 IH3fpOhVFC0gjMzN6xfbm0Ypgu5WarW/iY+mYjiXgFWs0aA6KiC3QQpaKWuFuY8wj3Q7
 37r8TSRISc/L5bPtHRlo2Q/694JCNVEpS0+uVlTS5h6UWExY7RRg+U8NIct0VRHPH8lb
 Kw4HibP8Hf3L/Cf8xrpUS4H7F4gXCufjI1qi0ztWV6OU78AIKNYjOtyNQBzGbDp9U/Ov
 gY2w==
X-Received: by 10.66.155.230 with SMTP id vz6mr7589042pab.30.1371338212671;
 Sat, 15 Jun 2013 16:16:52 -0700 (PDT)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.70.45.33 with HTTP; Sat, 15 Jun 2013 16:16:22 -0700 (PDT)
In-Reply-To: <51BCEBED.9060101@FreeBSD.org>
References: <201306152029.r5FKT8S3012945@svn.freebsd.org>
 <51BCEBED.9060101@FreeBSD.org>
From: Eitan Adler 
Date: Sun, 16 Jun 2013 01:16:22 +0200
X-Google-Sender-Auth: 8gGrNpZ2wtdb0MD5ym4ekibwjvY
Message-ID: 
Subject: Re: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk
 tools/build/mk tools/build/options tools/tools/nanobsd/gateworks
To: Bryan Drewery 
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQk4UbohWH6kQvkycmQn6DRi44jBZBSaCwr2Tz9qAovldrG1hbnOKUEzBBGAc470WewOwShK
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 23:16:53 -0000

On Sun, Jun 16, 2013 at 12:34 AM, Bryan Drewery  wrote:
> On 6/15/2013 3:29 PM, Eitan Adler wrote:
>> Author: eadler
>> Date: Sat Jun 15 20:29:07 2013
>> New Revision: 251794
>> URL: http://svnweb.freebsd.org/changeset/base/251794
>>
>> Log:
>>   Remove CVS from the base system.
>
> Were you going to submit an exp-run request for this too?

It was considered at one point but the types of problems which are
possible to show up as a result of this are unlikely to show up at
build time.

-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 23:23:08 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8102E9C5;
 Sat, 15 Jun 2013 23:23:08 +0000 (UTC)
 (envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se
 [IPv6:2001:6b0:17:f0a0::3])
 by mx1.freebsd.org (Postfix) with ESMTP id 37BCC1D45;
 Sat, 15 Jun 2013 23:23:08 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
 by mail.lysator.liu.se (Postfix) with ESMTP id 34B2540004;
 Sun, 16 Jun 2013 01:23:06 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
 id 22ED940008; Sun, 16 Jun 2013 01:23:06 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 bernadotte.lysator.liu.se
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled
 version=3.3.1
X-Spam-Score: 0.0
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mail.lysator.liu.se (Postfix) with ESMTPSA id A22B340004;
 Sun, 16 Jun 2013 01:23:05 +0200 (CEST)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se
 [IPv6:2001:470:dca9:0:1::6])
 by mx.daemonic.se (Postfix) with ESMTPS id 3bXvqr6vcCz8hVn;
 Sun, 16 Jun 2013 01:23:04 +0200 (CEST)
X-Virus-Scanned: amavisd-new at daemonic.se
Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with
 cipher CAMELLIA256-SHA)
 by mailscanner.daemonic.se (mailscanner.daemonic.se
 [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025)
 with ESMTPS id dLbvfkMz5dCY; Sun, 16 Jun 2013 01:23:02 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
 by mx.daemonic.se (Postfix) with ESMTPS id 3bXvqp4r6Cz8hVm;
 Sun, 16 Jun 2013 01:23:02 +0200 (CEST)
Received: from [IPv6:::1] (celes.daemonic.se [IPv6:2001:470:dca9:1::3])
 by mail.daemonic.se (Postfix) with ESMTPSA id 3bXvqp3brkz9Ctq;
 Sun, 16 Jun 2013 01:23:02 +0200 (CEST)
Message-ID: <51BCF756.9010204@daemonic.se>
Date: Sun, 16 Jun 2013 01:23:02 +0200
From: Niclas Zeising 
User-Agent: Mutt/1.5.21
MIME-Version: 1.0
To: Eitan Adler 
Subject: Re: svn commit: r251795 - head/share/man/man5
References: <201306152129.r5FLTl0T031625@svn.freebsd.org>
In-Reply-To: <201306152129.r5FLTl0T031625@svn.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Antivirus: avast! (VPS 130615-1, 2013-06-15), Outbound message
X-Antivirus-Status: Clean
X-Virus-Scanned: ClamAV using ClamSMTP
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 23:23:08 -0000

On 2013-06-15 23:29, Eitan Adler wrote:
> Author: eadler
> Date: Sat Jun 15 21:29:47 2013
> New Revision: 251795
> URL: http://svnweb.freebsd.org/changeset/base/251795
> 
> Log:
>   Regenerate after CVS removal (and it seems other missed changes)
>
> @@ -701,9 +698,9 @@ and
>  On amd64, set to not build 32-bit library set and a
>  .Nm ld-elf32.so.1
>  runtime linker.
> -.It Va WITHOUT_LIBCPLUSPLUS
> -.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim
> -Set to avoid building libcxxrt and libc++.
> +.It Va WITH_LIBCPLUSPLUS
> +.\" from FreeBSD: head/tools/build/options/WITH_LIBCPLUSPLUS 228082 2011-11-28 17:56:46Z dim
> +Set to build libcxxrt and libc++.
>  .It Va WITHOUT_LIBPTHREAD
>  .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm
>  Set to not build the

This part seems really strange.  Can you please double check that it is
as intended?
Regards!
-- 

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 23:23:13 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AE6149C8;
 Sat, 15 Jun 2013 23:23:13 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 79EFF1D46;
 Sat, 15 Jun 2013 23:23:12 +0000 (UTC)
Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149])
 by mail.dawidek.net (Postfix) with ESMTPSA id C94DA18A;
 Sun, 16 Jun 2013 01:18:38 +0200 (CEST)
Date: Sun, 16 Jun 2013 01:23:14 +0200
From: Pawel Jakub Dawidek 
To: Ed Schouten 
Subject: Re: svn commit: r251796 - head/sbin/hastd
Message-ID: <20130615232314.GB1403@garage.freebsd.pl>
References: <201306152218.r5FMI0uT047135@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="ZoaI/ZTpAVc4A5k6"
Content-Disposition: inline
In-Reply-To: <201306152218.r5FMI0uT047135@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 23:23:13 -0000


--ZoaI/ZTpAVc4A5k6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, Jun 15, 2013 at 10:18:00PM +0000, Ed Schouten wrote:
> Author: ed
> Date: Sat Jun 15 22:17:59 2013
> New Revision: 251796
> URL: http://svnweb.freebsd.org/changeset/base/251796
>=20
> Log:
>   Let hastd use C11 atomics.
>  =20
>   C11 atomics now work on all the architectures. Have at least a single
>   piece of software in our base system that uses C11 atomics. This
>   somewhat makes it less likely that we break it because of LLVM imports,
>   etc.

Hmm, I don't like HAST to be a victim of bad LLVM import. This is not
the kind of software you run on HEAD (so it might go unnoticed
initially)  and this is the kind of software that when breaks can have
serious consequences.

What kind of breaks are we talking about? That HAST will stop compiling
or HAST can start corrupting data?

> Modified:
>   head/sbin/hastd/refcnt.h
>=20
> Modified: head/sbin/hastd/refcnt.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sbin/hastd/refcnt.h	Sat Jun 15 21:29:47 2013	(r251795)
> +++ head/sbin/hastd/refcnt.h	Sat Jun 15 22:17:59 2013	(r251796)
> @@ -32,24 +32,24 @@
>  #ifndef __REFCNT_H__
>  #define __REFCNT_H__
> =20
> -#include 
> +#include 
> =20
>  #include "pjdlog.h"
> =20
> -typedef unsigned int refcnt_t;
> +typedef atomic_uint refcnt_t;
> =20
>  static __inline void
>  refcnt_init(refcnt_t *count, unsigned int v)
>  {
> =20
> -	*count =3D v;
> +	atomic_init(count, v);
>  }
> =20
>  static __inline void
>  refcnt_acquire(refcnt_t *count)
>  {
> =20
> -	atomic_add_acq_int(count, 1);
> +	atomic_fetch_add_explicit(count, 1, memory_order_acquire);
>  }
> =20
>  static __inline unsigned int
> @@ -58,7 +58,7 @@ refcnt_release(refcnt_t *count)
>  	unsigned int old;
> =20
>  	/* XXX: Should this have a rel membar? */
> -	old =3D atomic_fetchadd_int(count, -1);
> +	old =3D atomic_fetch_sub(count, 1);
>  	PJDLOG_ASSERT(old > 0);
>  	return (old - 1);
>  }

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://mobter.com

--ZoaI/ZTpAVc4A5k6
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iEYEARECAAYFAlG892IACgkQForvXbEpPzRVFwCgoCrmJ5/fMDqmpfV7gUQ1SByP
TvkAnjJlmiAjQ9d+y7hUxr+R6678dbS6
=XzNh
-----END PGP SIGNATURE-----

--ZoaI/ZTpAVc4A5k6--

From owner-svn-src-all@FreeBSD.ORG  Sat Jun 15 23:35:11 2013
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E78C8134
 for ; Sat, 15 Jun 2013 23:35:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id C813A1DDB
 for ; Sat, 15 Jun 2013 23:35:11 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FNZBCS052116
 for ; Sat, 15 Jun 2013 23:35:11 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5FNZB0Y052109
 for svn-src-all@freebsd.org; Sat, 15 Jun 2013 23:35:11 GMT
 (envelope-from bdrewery)
Received: (qmail 4470 invoked from network); 15 Jun 2013 18:35:09 -0500
Received: from unknown (HELO ?10.10.1.133?) (freebsd@shatow.net@10.10.1.133)
 by sweb.xzibition.com with ESMTPA; 15 Jun 2013 18:35:09 -0500
Message-ID: <51BCFA1C.4030100@FreeBSD.org>
Date: Sat, 15 Jun 2013 18:34:52 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: Eitan Adler 
Subject: Re: svn commit: r251794 - in head: . contrib/cvs etc etc/mtree
 gnu/usr.bin
 gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk tools/build/mk
 tools/build/options tools/tools/nanobsd/gateworks
References: <201306152029.r5FKT8S3012945@svn.freebsd.org>
 <51BCEBED.9060101@FreeBSD.org>
 
In-Reply-To: 
X-Enigmail-Version: 1.5.1
OpenPGP: id=3C9B0CF9;
	url=http://www.shatow.net/bryan/bryan.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="----enig2SCSCSODUNRXSFPDWKRXL"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 15 Jun 2013 23:35:12 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2SCSCSODUNRXSFPDWKRXL
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On 6/15/2013 6:16 PM, Eitan Adler wrote:
> On Sun, Jun 16, 2013 at 12:34 AM, Bryan Drewery  =
wrote:
>> On 6/15/2013 3:29 PM, Eitan Adler wrote:
>>> Author: eadler
>>> Date: Sat Jun 15 20:29:07 2013
>>> New Revision: 251794
>>> URL: http://svnweb.freebsd.org/changeset/base/251794
>>>
>>> Log:
>>>   Remove CVS from the base system.
>>
>> Were you going to submit an exp-run request for this too?
>=20
> It was considered at one point but the types of problems which are
> possible to show up as a result of this are unlikely to show up at
> build time.
>=20

bz@ and I both specifically asked to have an exp-run done. You agreed
with bz on arch@, and told me in May you had submitted a PR. I can find
no PR for this assigned to portmgr though.

There are build-time dependencies on cvs. This is just grepping my last
(partial) exp-run logs for '/usr/bin/n?cvs'


> logs/cvswrap-0.2.log:checking for specified path to real cvs(1)... defa=
ult: '/usr/bin/ncvs'
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/en-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/libwww-5.4.0_4.log:checking for cvs... /usr/bin/cvs
> logs/rancid-2.3.8.log:checking for cvs... /usr/bin/cvs
> logs/cvsd-1.0.18.log:checking for cvs... /usr/bin/cvs
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/zh_tw-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream =
tcp nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/rpm-5.2.1_3.log:checking for cvs... /usr/bin/cvs
> logs/rssh-2.3.4.log:checking for cvs... /usr/bin/cvs
> logs/tex-omegaware-old-2.0.2_5.log:checking for cvs... /usr/bin/cvs
> logs/rancid-devel-2.3.2a10_1.log:checking for cvs... /usr/bin/cvs
> logs/gtkdiff-1.8.0_9.log:checking for cvs... /usr/bin/cvs
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T
> logs/pt-freebsd-doc-41380_1,1.log:[]\T1/pcr/m/n/9 cvspserver stream tcp=
 nowait root /usr/bin/cvs cvs -f -l -R -T



--=20
Regards,
Bryan Drewery


------enig2SCSCSODUNRXSFPDWKRXL
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRvPocAAoJEG54KsA8mwz5AWEQAKQ8AA/mkc7ub4d9BJRY4o8r
vLvnY51TQdH8N2yBh07MKYlY4DP9eoNNzO7UD8eaElduFAfw5fmoykfGZ1uyAF1O
0yi/nkMRtUB5I4ISZIvJqXCI5j2VvHZdTyL+Vee/OE7wNZF29HxEvW1PfhzB2lqS
8IALHSBhD+tWvB+giuxKBITTw4tUZ6sJpHs7wvussVFhgt92eYwqQyDgbU3oAIPk
csNzkHk+lIjmY25g8SQLOB4N3b2G8MI7a5rBHlurPi551OpHHDlBRwbUUSAY4J7z
QV2iX+SLaIwDkNsSPAeG3kp/4pPebMzeIIF91lu4GACww5E1eJmL+r/SfYs0Ho7g
85cZrU2LVjUfGAJtbaBy9148aYORRZq9c84TEIfYzq/myCN9odJIc8smVmnE92Pr
hkk9W8Cxw/lWI+w00obUR7qgDgdnSrZnpwH34qL/qdPRUOxIGyomVqVLfUJG/Jd/
KdI0HEE71vRruspY7NLQVnUsdi6u3wipVZpBxCuD7Kwjf/mBTlP4XpuNQDl5nCXU
y3tRu8jWUKtv70FSu3r3k+jkOI4gA9ncFJLHssfG0UjlNno/FCHH6NgdEzzi/Wfz
5Am82jUXewUceTm0Dih1SGXhXIdBEnszWFSc6+T7tQ+GmzcIvmiCfaAw225zUQQR
2X2gsBWktDHqq5tdN4Pp
=eGTc
-----END PGP SIGNATURE-----

------enig2SCSCSODUNRXSFPDWKRXL--