From owner-svn-src-projects@FreeBSD.ORG Sun May 31 09:22:26 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 739FE1065673; Sun, 31 May 2009 09:22:26 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 573728FC12; Sun, 31 May 2009 09:22:26 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V9MQt4036902; Sun, 31 May 2009 09:22:26 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4V9MQbM036901; Sun, 31 May 2009 09:22:26 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905310922.n4V9MQbM036901@svn.freebsd.org> From: Robert Watson Date: Sun, 31 May 2009 09:22:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193158 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 09:22:26 -0000 Author: rwatson Date: Sun May 31 09:22:26 2009 New Revision: 193158 URL: http://svn.freebsd.org/changeset/base/193158 Log: Rename net.isr.direct_enable to net.isr.direct to match the name in use in the existing netisr framework. Add missing tunables for net.isr.direct and net.isr.direct_force. Add read-only net.isr.numthreads sysctl to easily query the number of threads in use on the current kernel. Fix a bug in which we used the registering protocol's version of the qlimit even if we've adjusted it due to defaults or limits. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Sun May 31 09:03:14 2009 (r193157) +++ projects/pnet/sys/net/netisr.c Sun May 31 09:22:26 2009 (r193158) @@ -122,27 +122,29 @@ SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG * Three direct dispatch policies are supported: * * - Always defer: all work is scheduled for a netisr, regardless of context. - * (!direct_enable) + * (!direct) * * - Hybrid: if the executing context allows direct dispatch, and we're * running on the CPU the work would be done on, then direct dispatch if it * wouldn't violate ordering constraints on the workstream. - * (direct_enable && !direct_force) + * (direct && !direct_force) * * - Always direct: if the executing context allows direct dispatch, always - * direct dispatch. (direct_enable && direct_force) + * direct dispatch. (direct && direct_force) * * Notice that changing the global policy could lead to short periods of * misordered processing, but this is considered acceptable as compared to * the complexity of enforcing ordering during policy changes. */ static int netisr_direct_force = 1; /* Always direct dispatch. */ +TUNABLE_INT("net.isr.direct_force", &netisr_direct_force); SYSCTL_INT(_net_isr, OID_AUTO, direct_force, CTLFLAG_RW, &netisr_direct_force, 0, "Force direct dispatch"); -static int netisr_direct_enable = 1; /* Enable direct dispatch. */ -SYSCTL_INT(_net_isr, OID_AUTO, direct_enable, CTLFLAG_RW, - &netisr_direct_enable, 0, "Enable direct dispatch"); +static int netisr_direct = 1; /* Enable direct dispatch. */ +TUNABLE_INT("net.isr.direct", &netisr_direct); +SYSCTL_INT(_net_isr, OID_AUTO, direct, CTLFLAG_RW, + &netisr_direct, 0, "Enable direct dispatch"); /* * Allow the administrator to limit the number of threads (CPUs) to use for @@ -270,6 +272,8 @@ static u_int nws_array[MAXCPU]; * CPUs once fully started. */ static u_int nws_count; +SYSCTL_INT(_net_isr, OID_AUTO, numthreads, CTLFLAG_RD, + &nws_count, 0, "Number of extant netisr threads."); /* * Per-workstream flags. @@ -388,7 +392,7 @@ netisr_register(const struct netisr_hand for (i = 0; i < MAXCPU; i++) { npwp = &nws[i].nws_work[proto]; bzero(npwp, sizeof(*npwp)); - npwp->nw_qlimit = nhp->nh_qlimit; + npwp->nw_qlimit = np[proto].np_qlimit; } NETISR_WUNLOCK(); } @@ -862,7 +866,7 @@ netisr_dispatch_src(u_int proto, uintptr /* * If direct dispatch is entirely disabled, fall back on queueing. */ - if (!netisr_direct_enable) + if (!netisr_direct) return (netisr_queue_src(proto, source, m)); KASSERT(proto < NETISR_MAXPROT, From owner-svn-src-projects@FreeBSD.ORG Sun May 31 10:13:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 503721065673; Sun, 31 May 2009 10:13:11 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 24A278FC18; Sun, 31 May 2009 10:13:11 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VADAB4038035; Sun, 31 May 2009 10:13:10 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VADAmJ038034; Sun, 31 May 2009 10:13:10 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905311013.n4VADAmJ038034@svn.freebsd.org> From: Robert Watson Date: Sun, 31 May 2009 10:13:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193160 - projects/pnet/sys/netipx X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 10:13:11 -0000 Author: rwatson Date: Sun May 31 10:13:10 2009 New Revision: 193160 URL: http://svn.freebsd.org/changeset/base/193160 Log: Revert whitespace addition from head. Modified: projects/pnet/sys/netipx/ipx_input.c Modified: projects/pnet/sys/netipx/ipx_input.c ============================================================================== --- projects/pnet/sys/netipx/ipx_input.c Sun May 31 10:02:20 2009 (r193159) +++ projects/pnet/sys/netipx/ipx_input.c Sun May 31 10:13:10 2009 (r193160) @@ -62,7 +62,6 @@ * @(#)ipx_input.c */ - #include __FBSDID("$FreeBSD$"); From owner-svn-src-projects@FreeBSD.ORG Sun May 31 13:52:18 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3FEF106564A; Sun, 31 May 2009 13:52:17 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C858D8FC12; Sun, 31 May 2009 13:52:17 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VDqH5i044974; Sun, 31 May 2009 13:52:17 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VDqH8V044973; Sun, 31 May 2009 13:52:17 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905311352.n4VDqH8V044973@svn.freebsd.org> From: Robert Watson Date: Sun, 31 May 2009 13:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193170 - projects/pnet/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 13:52:18 -0000 Author: rwatson Date: Sun May 31 13:52:17 2009 New Revision: 193170 URL: http://svn.freebsd.org/changeset/base/193170 Log: Add a shutdown handler for device polling -- don't issue wakeups to the netisr once file systems are done syncing, otherwise the scheduler may generate IPIs to CPUs that have already been shutdown, leading to a panic. As similar panics (spin lock 0xc0d8e500 (sched lock 1) held by 0xc4d546c0 (tid 100005) too long) have been reported on both 7.x and 8.x in other code, we might want to think about whether there's some missing scheduler shutdown logic to handle this case for unpinned/unbound threads by migrating them to the CPU managing the shutdown and allowing them to preempt. Modified: projects/pnet/sys/kern/kern_poll.c Modified: projects/pnet/sys/kern/kern_poll.c ============================================================================== --- projects/pnet/sys/kern/kern_poll.c Sun May 31 12:36:14 2009 (r193169) +++ projects/pnet/sys/kern/kern_poll.c Sun May 31 13:52:17 2009 (r193170) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include /* needed by net/if.h */ #include @@ -110,6 +111,7 @@ SYSCTL_UINT(_kern_polling, OID_AUTO, bur static int netisr_poll_scheduled; static int netisr_pollmore_scheduled; +static int poll_shutting_down; static int poll_burst_max_sysctl(SYSCTL_HANDLER_ARGS) { @@ -261,10 +263,19 @@ struct pollrec { static struct pollrec pr[POLL_LIST_LEN]; static void +poll_shutdown(void *arg, int howto) +{ + + poll_shutting_down = 1; +} + +static void init_device_poll(void) { mtx_init(&poll_mtx, "polling", NULL, MTX_DEF); + EVENTHANDLER_REGISTER(shutdown_post_sync, poll_shutdown, NULL, + SHUTDOWN_PRI_LAST); } SYSINIT(device_poll, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, init_device_poll, NULL); @@ -288,7 +299,7 @@ hardclock_device_poll(void) static struct timeval prev_t, t; int delta; - if (poll_handlers == 0) + if (poll_handlers == 0 || poll_shutting_down) return; microuptime(&t); From owner-svn-src-projects@FreeBSD.ORG Sun May 31 18:03:07 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 370DD1065674; Sun, 31 May 2009 18:03:07 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 25B138FC1A; Sun, 31 May 2009 18:03:07 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VI37qu050830; Sun, 31 May 2009 18:03:07 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VI37Nh050829; Sun, 31 May 2009 18:03:07 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905311803.n4VI37Nh050829@svn.freebsd.org> From: Robert Watson Date: Sun, 31 May 2009 18:03:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193179 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 18:03:07 -0000 Author: rwatson Date: Sun May 31 18:03:06 2009 New Revision: 193179 URL: http://svn.freebsd.org/changeset/base/193179 Log: Mysteriously, ipfilter includes netisr.h in a userland compiled program. Defer fixing this the easy way for now. Modified: projects/pnet/sys/net/netisr.h Modified: projects/pnet/sys/net/netisr.h ============================================================================== --- projects/pnet/sys/net/netisr.h Sun May 31 17:23:27 2009 (r193178) +++ projects/pnet/sys/net/netisr.h Sun May 31 18:03:06 2009 (r193179) @@ -26,10 +26,7 @@ #ifndef _NET_NETISR_H_ #define _NET_NETISR_H_ - -#ifndef _KERNEL -#error "no user-serviceable parts inside" -#endif +#ifdef _KERNEL /* * The netisr (network interrupt service routine) provides a deferred @@ -152,4 +149,5 @@ void netisr_sched_poll(void); void netisr_poll(void); void netisr_pollmore(void); +#endif /* !_KERNEL */ #endif /* !_NET_NETISR_H_ */ From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 07:54:27 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DE28106566C; Mon, 1 Jun 2009 07:54:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8CE2A8FC0A; Mon, 1 Jun 2009 07:54:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n517sRi2068453; Mon, 1 Jun 2009 07:54:27 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n517sRo4068452; Mon, 1 Jun 2009 07:54:27 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010754.n517sRo4068452@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 07:54:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193207 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 07:54:27 -0000 Author: rwatson Date: Mon Jun 1 07:54:27 2009 New Revision: 193207 URL: http://svn.freebsd.org/changeset/base/193207 Log: When queueing a packet to a netisr thread and it's already being direct dispatched, suppress a wakeup -- the direct dispatching thread will generate it later. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 07:48:27 2009 (r193206) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 07:54:27 2009 (r193207) @@ -776,7 +776,8 @@ netisr_queue_workstream(struct netisr_wo if (npwp->nw_len > npwp->nw_watermark) npwp->nw_watermark = npwp->nw_len; nwsp->nws_pendingbits |= (1 << proto); - if (!(nwsp->nws_flags & (NWS_SCHEDULED | NWS_RUNNING))) { + if (!(nwsp->nws_flags & + (NWS_RUNNING | NWS_DISPATCHING | NWS_SCHEDULED))) { nwsp->nws_flags |= NWS_SCHEDULED; *dosignalp = 1; /* Defer until unlocked. */ } From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 08:17:01 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 060A71065677; Mon, 1 Jun 2009 08:17:01 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8A4C8FC27; Mon, 1 Jun 2009 08:17:00 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n518H0u0069026; Mon, 1 Jun 2009 08:17:00 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n518H0Li069025; Mon, 1 Jun 2009 08:17:00 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010817.n518H0Li069025@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 08:17:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193208 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 08:17:01 -0000 Author: rwatson Date: Mon Jun 1 08:17:00 2009 New Revision: 193208 URL: http://svn.freebsd.org/changeset/base/193208 Log: For consistency, make 'error' an int as it generally is throughout the kernel. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 07:54:27 2009 (r193207) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 08:17:00 2009 (r193208) @@ -820,7 +820,8 @@ netisr_queue_src(u_int proto, uintptr_t #ifdef NETISR_LOCKING struct rm_priotracker tracker; #endif - u_int cpuid, error; + u_int cpuid; + int error; KASSERT(proto < NETISR_MAXPROT, ("%s: invalid proto %u", __func__, proto)); From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 08:32:25 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AAA2106566C; Mon, 1 Jun 2009 08:32:24 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 48F728FC21; Mon, 1 Jun 2009 08:32:24 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n518WOG7069901; Mon, 1 Jun 2009 08:32:24 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n518WOG4069900; Mon, 1 Jun 2009 08:32:24 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010832.n518WOG4069900@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 08:32:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193209 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 08:32:26 -0000 Author: rwatson Date: Mon Jun 1 08:32:24 2009 New Revision: 193209 URL: http://svn.freebsd.org/changeset/base/193209 Log: Count wakeups sent and wakeups processed for netisr workstreams. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:17:00 2009 (r193208) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 08:32:24 2009 (r193209) @@ -248,6 +248,8 @@ struct netisr_workstream { u_int nws_cpu; /* CPU pinning. */ u_int nws_flags; /* Wakeup flags. */ u_int nws_pendingbits; /* Scheduled protocols. */ + u_int64_t nws_wakeupssent; /* How many times scheduled. */ + u_int64_t nws_wakeups; /* How many times woken up. */ /* * Each protocol has per-workstream data. @@ -290,7 +292,11 @@ SYSCTL_INT(_net_isr, OID_AUTO, numthread #define NWS_LOCK(s) mtx_lock(&(s)->nws_mtx) #define NWS_LOCK_ASSERT(s) mtx_assert(&(s)->nws_mtx, MA_OWNED) #define NWS_UNLOCK(s) mtx_unlock(&(s)->nws_mtx) -#define NWS_SIGNAL(s) swi_sched((s)->nws_swi_cookie, 0) +#define NWS_SIGNAL(s) do { \ + (s)->nws_wakeupssent++; \ + swi_sched((s)->nws_swi_cookie, 0); \ +} while (0) + /* * Utility routines for protocols that implement their own mapping of flows @@ -732,6 +738,7 @@ swi_net(void *arg) NETISR_RLOCK(&tracker); #endif NWS_LOCK(nwsp); + nwsp->nws_wakeups++; KASSERT(!(nwsp->nws_flags & NWS_RUNNING), ("swi_net: running")); if (nwsp->nws_flags & NWS_DISPATCHING) goto out; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 08:34:35 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 011BE1065670; Mon, 1 Jun 2009 08:34:35 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E41468FC45; Mon, 1 Jun 2009 08:34:34 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n518YYHB069991; Mon, 1 Jun 2009 08:34:34 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n518YYCS069990; Mon, 1 Jun 2009 08:34:34 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010834.n518YYCS069990@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 08:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193210 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 08:34:35 -0000 Author: rwatson Date: Mon Jun 1 08:34:34 2009 New Revision: 193210 URL: http://svn.freebsd.org/changeset/base/193210 Log: Use the current workstream in swi_net, rather than the first workstream. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:32:24 2009 (r193209) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 08:34:34 2009 (r193210) @@ -744,7 +744,7 @@ swi_net(void *arg) goto out; nwsp->nws_flags |= NWS_RUNNING; nwsp->nws_flags &= ~NWS_SCHEDULED; - while ((bits = nws->nws_pendingbits) != 0) { + while ((bits = nwsp->nws_pendingbits) != 0) { while ((prot = ffs(bits)) != 0) { prot--; bits &= ~(1 << prot); From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 08:50:56 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A911106564A; Mon, 1 Jun 2009 08:50:56 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 87BC18FC13; Mon, 1 Jun 2009 08:50:56 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n518ou3W070382; Mon, 1 Jun 2009 08:50:56 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n518ou3g070381; Mon, 1 Jun 2009 08:50:56 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010850.n518ou3g070381@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 08:50:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193211 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 08:50:56 -0000 Author: rwatson Date: Mon Jun 1 08:50:56 2009 New Revision: 193211 URL: http://svn.freebsd.org/changeset/base/193211 Log: Re-remove swi wakeup debugging counters. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:34:34 2009 (r193210) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 08:50:56 2009 (r193211) @@ -248,8 +248,6 @@ struct netisr_workstream { u_int nws_cpu; /* CPU pinning. */ u_int nws_flags; /* Wakeup flags. */ u_int nws_pendingbits; /* Scheduled protocols. */ - u_int64_t nws_wakeupssent; /* How many times scheduled. */ - u_int64_t nws_wakeups; /* How many times woken up. */ /* * Each protocol has per-workstream data. @@ -292,11 +290,7 @@ SYSCTL_INT(_net_isr, OID_AUTO, numthread #define NWS_LOCK(s) mtx_lock(&(s)->nws_mtx) #define NWS_LOCK_ASSERT(s) mtx_assert(&(s)->nws_mtx, MA_OWNED) #define NWS_UNLOCK(s) mtx_unlock(&(s)->nws_mtx) -#define NWS_SIGNAL(s) do { \ - (s)->nws_wakeupssent++; \ - swi_sched((s)->nws_swi_cookie, 0); \ -} while (0) - +#define NWS_SIGNAL(s) swi_sched((s)->nws_swi_cookie, 0) /* * Utility routines for protocols that implement their own mapping of flows @@ -738,7 +732,6 @@ swi_net(void *arg) NETISR_RLOCK(&tracker); #endif NWS_LOCK(nwsp); - nwsp->nws_wakeups++; KASSERT(!(nwsp->nws_flags & NWS_RUNNING), ("swi_net: running")); if (nwsp->nws_flags & NWS_DISPATCHING) goto out; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 09:03:56 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 001881065670; Mon, 1 Jun 2009 09:03:55 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E2B0B8FC0C; Mon, 1 Jun 2009 09:03:55 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5193txg070680; Mon, 1 Jun 2009 09:03:55 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5193tai070679; Mon, 1 Jun 2009 09:03:55 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010903.n5193tai070679@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 09:03:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193212 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 09:03:56 -0000 Author: rwatson Date: Mon Jun 1 09:03:55 2009 New Revision: 193212 URL: http://svn.freebsd.org/changeset/base/193212 Log: Add missing VNET setup in the deferred dispatch case. Lock around stats updates in forced direct dispatch mode. Modified: projects/pnet/sys/net/netisr.c Modified: projects/pnet/sys/net/netisr.c ============================================================================== --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:50:56 2009 (r193211) +++ projects/pnet/sys/net/netisr.c Mon Jun 1 09:03:55 2009 (r193212) @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DDB #include @@ -697,7 +698,10 @@ netisr_process_workstream_proto(struct n if (local_npw.nw_head == NULL) local_npw.nw_tail = NULL; local_npw.nw_len--; + VNET_ASSERT(m->m_pkthdr.rcvif != NULL); + CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); np[proto].np_handler(m); + CURVNET_RESTORE(); } KASSERT(local_npw.nw_len == 0, ("%s(%u): len %u", __func__, proto, local_npw.nw_len)); @@ -882,13 +886,17 @@ netisr_dispatch_src(u_int proto, uintptr /* * If direct dispatch is forced, then unconditionally dispatch * without a formal CPU selection. Borrow the current CPU's stats, - * even if there's no worker on it. + * even if there's no worker on it. In this case we don't update + * nws_flags because all netisr processing will be source ordered due + * to always being forced to directly dispatch. */ if (netisr_direct_force) { nwsp = &nws[curcpu]; npwp = &nwsp->nws_work[proto]; + NWS_LOCK(nwsp); npwp->nw_dispatched++; npwp->nw_handled++; + NWS_UNLOCK(nwsp); np[proto].np_handler(m); error = 0; goto out_unlock; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 09:43:58 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF11B106566C; Mon, 1 Jun 2009 09:43:58 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DD7148FC17; Mon, 1 Jun 2009 09:43:58 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n519hwNN071610; Mon, 1 Jun 2009 09:43:58 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n519hwH8071609; Mon, 1 Jun 2009 09:43:58 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906010943.n519hwH8071609@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 09:43:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193215 - projects/pnet/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 09:43:59 -0000 Author: rwatson Date: Mon Jun 1 09:43:58 2009 New Revision: 193215 URL: http://svn.freebsd.org/changeset/base/193215 Log: When cheaply calculating flow identifiers for packets coming in from network device drivers without hardware flow calculation, or for loopback traffic, use a different cheap hash that puts all interesting entropy into the bottom 8 bits of the flow ID, which works well with our default flow ID -> CPU mapping. Modified: projects/pnet/sys/netinet/ip_input.c Modified: projects/pnet/sys/netinet/ip_input.c ============================================================================== --- projects/pnet/sys/netinet/ip_input.c Mon Jun 1 09:32:12 2009 (r193214) +++ projects/pnet/sys/netinet/ip_input.c Mon Jun 1 09:43:58 2009 (r193215) @@ -442,7 +442,10 @@ ip_input_m2flow(struct mbuf *m, uintptr_ goto bad; } m->m_flags |= M_FLOWID; - m->m_pkthdr.flowid = ip->ip_src.s_addr ^ ip->ip_dst.s_addr; + m->m_pkthdr.flowid = ((ip->ip_src.s_addr & 0xff000000) >> 24) ^ + ((ip->ip_src.s_addr & 0xff0000) >> 16) ^ + ((ip->ip_src.s_addr & 0xff00) >> 8) ^ + (ip->ip_src.s_addr & 0xff) ^ ip->ip_p; return (m); bad: From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 10:04:37 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66115106567B; Mon, 1 Jun 2009 10:04:37 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 547F38FC42; Mon, 1 Jun 2009 10:04:37 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51A4bK5072151; Mon, 1 Jun 2009 10:04:37 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51A4b8b072150; Mon, 1 Jun 2009 10:04:37 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906011004.n51A4b8b072150@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 10:04:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193216 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 10:04:37 -0000 Author: rwatson Date: Mon Jun 1 10:04:37 2009 New Revision: 193216 URL: http://svn.freebsd.org/changeset/base/193216 Log: Add missing $FreeBSD$. Modified: projects/pnet/sys/net/netisr.h Modified: projects/pnet/sys/net/netisr.h ============================================================================== --- projects/pnet/sys/net/netisr.h Mon Jun 1 09:43:58 2009 (r193215) +++ projects/pnet/sys/net/netisr.h Mon Jun 1 10:04:37 2009 (r193216) @@ -22,6 +22,8 @@ * 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 _NET_NETISR_H_ From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 11:15:58 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43E9E10657D7; Mon, 1 Jun 2009 11:15:58 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D85F8FC12; Mon, 1 Jun 2009 11:15:54 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51BFslf077285; Mon, 1 Jun 2009 11:15:54 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51BFs6w077284; Mon, 1 Jun 2009 11:15:54 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906011115.n51BFs6w077284@svn.freebsd.org> From: Rui Paulo Date: Mon, 1 Jun 2009 11:15:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193224 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 11:16:05 -0000 Author: rpaulo Date: Mon Jun 1 11:15:54 2009 New Revision: 193224 URL: http://svn.freebsd.org/changeset/base/193224 Log: Add _KERNEL protection. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Jun 1 11:11:46 2009 (r193223) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Jun 1 11:15:54 2009 (r193224) @@ -346,6 +346,7 @@ struct ieee80211_meshcntl { /* more mesh addresses follow */ } __packed; +#ifdef _KERNEL void ieee80211_mesh_attach(struct ieee80211com *); void ieee80211_mesh_detach(struct ieee80211com *); void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); @@ -358,4 +359,5 @@ uint8_t * ieee80211_add_meshlmetric(uint void ieee80211_create_mbss(struct ieee80211vap *, struct ieee80211_channel *); uint32_t ieee80211_mesh_getseq(void); +#endif /* _KERNEL */ #endif /* !_NET80211_IEEE80211_MESH_H_ */ From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 12:18:51 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB7291065672; Mon, 1 Jun 2009 12:18:51 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9872E8FC1D; Mon, 1 Jun 2009 12:18:51 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51CIpld078517; Mon, 1 Jun 2009 12:18:51 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51CIp60078512; Mon, 1 Jun 2009 12:18:51 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906011218.n51CIp60078512@svn.freebsd.org> From: Rui Paulo Date: Mon, 1 Jun 2009 12:18:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193226 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:18:51 -0000 Author: rpaulo Date: Mon Jun 1 12:18:51 2009 New Revision: 193226 URL: http://svn.freebsd.org/changeset/base/193226 Log: * add hwmp_add_meshpreq(), hwmp_add_meshprep(), hwmp_add_meshperr() hwmp_add_meshrann() functions that construct the respective IE. * add HWMP state struct containing the head of the forwarding information table, the next sequence number to be used and the lock for the table; * implement vattach and vdetach routines in HWMP. These alloc/setup and destroy an HWMP state struct respectively; * lock/unlock when doing table lookups (inserts not yet implemented) * use the seq number now that we have it * remove ie/len code setup from send functions. * add _KERNEL protection in ieee80211_hwmp.h * add hwmp state pointer to ieee80211_vap Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_hwmp.h projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_var.h Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 11:38:38 2009 (r193225) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 12:18:51 2009 (r193226) @@ -63,29 +63,35 @@ __FBSDID("$FreeBSD$"); #include #include -TAILQ_HEAD(, ieee80211_hwmp_fi) ieee80211_hwmp_ft; - static int ieee80211_hwmp_send_action(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], const uint8_t *, size_t); +static uint8_t *hwmp_add_meshpreq(uint8_t *, + const struct ieee80211_meshpreq_ie *); +static uint8_t *hwmp_add_meshprep(uint8_t *, + const struct ieee80211_meshprep_ie *); +static uint8_t *hwmp_add_meshperr(uint8_t *, + const struct ieee80211_meshperr_ie *); +static uint8_t *hwmp_add_meshrann(uint8_t *, + const struct ieee80211_meshrann_ie *); static void hwmp_recv_preq(struct ieee80211vap *, struct ieee80211_node *, const struct ieee80211_meshpreq_ie *); -static int hwmp_send_preq(struct ieee80211_node *, +static inline int hwmp_send_preq(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], struct ieee80211_meshpreq_ie *); static void hwmp_recv_prep(struct ieee80211vap *, struct ieee80211_node *, const struct ieee80211_meshprep_ie *); -static int hwmp_send_prep(struct ieee80211_node *, +static inline int hwmp_send_prep(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], struct ieee80211_meshprep_ie *); static void hwmp_recv_perr(struct ieee80211vap *, struct ieee80211_node *, const struct ieee80211_meshperr_ie *); -static int hwmp_send_perr(struct ieee80211_node *, +static inline int hwmp_send_perr(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], struct ieee80211_meshperr_ie *); static void hwmp_recv_rann(struct ieee80211vap *, struct ieee80211_node *, const struct ieee80211_meshrann_ie *); -static int hwmp_send_rann(struct ieee80211_node *, +static inline int hwmp_send_rann(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], struct ieee80211_meshrann_ie *); @@ -138,6 +144,34 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo extern int ieee80211_mesh_ttl; extern int ieee80211_mesh_forwarding; +void +ieee80211_hwmp_vattach(struct ieee80211vap *vap) +{ + struct ieee80211_hwmp_state *hs; + + KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, + ("not a mesh vap, opmode %d", vap->iv_opmode)); + + hs = malloc(sizeof(struct ieee80211_hwmp_state), M_80211_VAP, + M_NOWAIT | M_ZERO); + if (hs == NULL) { + printf("%s: couldn't alloc HWMP state\n", __func__); + return; + } + TAILQ_INIT(&hs->hs_head); + mtx_init(&hs->hs_lock, "HWMP", "802.11s HWMP", MTX_DEF); + vap->iv_hwmp = hs; +} + +void +ieee80211_hwmp_vdetach(struct ieee80211vap *vap) +{ + struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + + /* XXX missing flush table */ + mtx_destroy(&hs->hs_lock); + free(vap->iv_hwmp, M_80211_VAP); +} void ieee80211_hwmp_recv_action(struct ieee80211vap *vap, struct ieee80211_node *ni, @@ -290,17 +324,23 @@ ieee80211_hwmp_send_action(struct ieee80 switch (*ie) { case IEEE80211_ELEMID_MESHPREQ: *frm++ = IEEE80211_ACTION_MESHPATH_REQ; + frm = hwmp_add_meshpreq(frm, + (struct ieee80211_meshpreq_ie *)&ie); break; case IEEE80211_ELEMID_MESHPREP: *frm++ = IEEE80211_ACTION_MESHPATH_REP; - frm = ieee80211_add_meshprep(frm, + frm = hwmp_add_meshprep(frm, (struct ieee80211_meshprep_ie *)&ie); break; case IEEE80211_ELEMID_MESHPERR: *frm++ = IEEE80211_ACTION_MESHPATH_ERR; + frm = hwmp_add_meshperr(frm, + (struct ieee80211_meshperr_ie *)&ie); break; case IEEE80211_ELEMID_MESHRANN: *frm++ = IEEE80211_ACTION_MESHPATH_RANN; + frm = hwmp_add_meshrann(frm, + (struct ieee80211_meshrann_ie *)&ie); break; } @@ -336,29 +376,96 @@ ieee80211_hwmp_send_action(struct ieee80 frm += 4; \ } while (0) /* - * Add a Mesh Path Reply IE to a frame. + * Add a Mesh Path Request IE to a frame. */ -uint8_t * -ieee80211_add_meshprep(uint8_t *frm, const struct ieee80211_meshprep_ie *prep) +static uint8_t * +hwmp_add_meshpreq(uint8_t *frm, const struct ieee80211_meshpreq_ie *preq) { + int i; + + *frm++ = IEEE80211_ELEMID_MESHPREQ; + *frm++ = sizeof(struct ieee80211_meshpreq_ie) - 2 + + (preq->preq_tcount - 1) * sizeof(*preq->preq_targets); + *frm++ = preq->preq_flags; + *frm++ = preq->preq_hopcount; + *frm++ = preq->preq_ttl; + ADDWORD(frm, preq->preq_id); + IEEE80211_ADDR_COPY(frm, preq->preq_origaddr); frm += 6; + ADDWORD(frm, preq->preq_origseq); + ADDWORD(frm, preq->preq_lifetime); + ADDWORD(frm, preq->preq_metric); + *frm++ = preq->preq_tcount; + for (i = 0; i < preq->preq_tcount; i++) { + *frm++ = preq->preq_targets[i].target_flags; + IEEE80211_ADDR_COPY(frm, preq->preq_targets[i].target_addr); + frm += 6; + ADDWORD(frm, preq->preq_targets[i].target_seq); + } + + return frm; +} +/* + * Add a Mesh Path Reply IE to a frame. + */ +static uint8_t * +hwmp_add_meshprep(uint8_t *frm, const struct ieee80211_meshprep_ie *prep) +{ *frm++ = IEEE80211_ELEMID_MESHPREP; *frm++ = sizeof(struct ieee80211_meshprep_ie) - 2; *frm++ = prep->prep_flags; *frm++ = prep->prep_hopcount; *frm++ = prep->prep_ttl; - IEEE80211_ADDR_COPY(frm, prep->prep_targetaddr); - frm += 6; + IEEE80211_ADDR_COPY(frm, prep->prep_targetaddr); frm += 6; ADDWORD(frm, prep->prep_targetseq); ADDWORD(frm, prep->prep_lifetime); ADDWORD(frm, prep->prep_metric); - IEEE80211_ADDR_COPY(frm, prep->prep_origaddr); - frm += 6; + IEEE80211_ADDR_COPY(frm, prep->prep_origaddr); frm += 6; ADDWORD(frm, prep->prep_origseq); return frm; } +/* + * Add a Mesh Path Error IE to a frame. + */ +static uint8_t * +hwmp_add_meshperr(uint8_t *frm, const struct ieee80211_meshperr_ie *perr) +{ + int i; + + *frm++ = IEEE80211_ELEMID_MESHPERR; + *frm++ = sizeof(struct ieee80211_meshperr_ie) - 2 + + (perr->perr_ndests - 1) * sizeof(*perr->perr_dests); + *frm++ = perr->perr_mode; + *frm++ = perr->perr_ndests; + for (i = 0; i < perr->perr_ndests; i++) { + IEEE80211_ADDR_COPY(frm, perr->perr_dests[i].dest_addr); + frm += 6; + ADDWORD(frm, perr->perr_dests[i].dest_seq); + } + + return frm; +} + +/* + * Add a Root Annoucement IE to a frame. + */ +static uint8_t * +hwmp_add_meshrann(uint8_t *frm, const struct ieee80211_meshrann_ie *rann) +{ + *frm++ = IEEE80211_ELEMID_MESHRANN; + *frm++ = sizeof(struct ieee80211_meshrann_ie) - 2; + *frm++ = rann->rann_flags; + *frm++ = rann->rann_hopcount; + *frm++ = rann->rann_ttl; + IEEE80211_ADDR_COPY(frm, rann->rann_addr); frm += 6; + ADDWORD(frm, rann->rann_seq); + ADDWORD(frm, rann->rann_metric); + + return frm; +} + #define PREQ_TFLAGS(n) preq->preq_targets[n].target_flags #define PREQ_TADDR(n) preq->preq_targets[n].target_addr #define PREQ_TSEQ(n) preq->preq_targets[n].target_seq @@ -366,7 +473,8 @@ static void hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni, const struct ieee80211_meshpreq_ie *preq) { - struct ieee80211_hwmp_fi *fi; + struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + struct ieee80211_hwmp_fi *fi = NULL; /* * Acceptance criteria: if the PREQ is not for us and @@ -376,13 +484,12 @@ hwmp_recv_preq(struct ieee80211vap *vap, !ieee80211_mesh_forwarding) return; - fi = NULL; - /*HWMP_LOCK();*/ - TAILQ_FOREACH(fi, &ieee80211_hwmp_ft, fi_next) { + mtx_lock(&hs->hs_lock); + TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { if (IEEE80211_ADDR_EQ(PREQ_TADDR(0), fi->fi_dest)) break; } - /*HWMP_UNLOCK();*/ + mtx_unlock(&hs->hs_lock); /* * Step 1. Record the PREQ ID and the originator MAC address. @@ -410,8 +517,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, prep.prep_lifetime = preq->preq_lifetime; prep.prep_metric = IEEE80211_MESHLMETRIC_INITIALVAL; IEEE80211_ADDR_COPY(prep.prep_origaddr, vap->iv_myaddr); - /* XXX */ - prep.prep_origseq = 1; + prep.prep_origseq = hs->hs_seq++; /* XXX addr1 = next hop */ hwmp_send_prep(ni, preq->preq_origaddr, vap->iv_myaddr, &prep); return; @@ -463,8 +569,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, prep.prep_metric = fi->fi_metric; IEEE80211_ADDR_COPY(&prep.prep_origaddr, vap->iv_myaddr); - /* XXX */ - prep.prep_origseq = 1; + prep.prep_origseq = hs->hs_seq++; hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &prep); } else { @@ -520,10 +625,6 @@ hwmp_send_preq(struct ieee80211_node *ni * [1] category * [tlv] mesh path request */ - /* XXX target count > 1 */ - preq->preq_ie = IEEE80211_ELEMID_MESHPREQ; - preq->preq_len = sizeof(struct ieee80211_meshpreq_ie) - 2; - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&preq, sizeof(*preq)); } @@ -559,7 +660,6 @@ hwmp_recv_prep(struct ieee80211vap *vap, pprep.prep_ttl -= 1; pprep.prep_metric += ieee80211_airtime_calc(ni); IEEE80211_ADDR_COPY(pprep.prep_origaddr, vap->iv_myaddr); - pprep.prep_origseq = 1; /* XXX */ hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &pprep); /* @@ -596,9 +696,6 @@ hwmp_send_prep(struct ieee80211_node *ni * [1] category * [tlv] mesh path reply */ - prep->prep_ie = IEEE80211_ELEMID_MESHPREP; - prep->prep_len = sizeof(struct ieee80211_meshprep_ie) - 2; - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&prep, sizeof(*prep)); } @@ -609,7 +706,8 @@ static void hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni, const struct ieee80211_meshperr_ie *perr) { - struct ieee80211_hwmp_fi *fi; + struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + struct ieee80211_hwmp_fi *fi = NULL; /* struct ieee80211_meshperr_ie pperr;*/ /* @@ -621,12 +719,12 @@ hwmp_recv_perr(struct ieee80211vap *vap, !ieee80211_mesh_forwarding) return; - fi = NULL; - /*HWMP_LOCK();*/ - TAILQ_FOREACH(fi, &ieee80211_hwmp_ft, fi_next) { + mtx_lock(&hs->hs_lock); + TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { if (IEEE80211_ADDR_EQ(PERR_DADDR(0), fi->fi_dest)) break; } + mtx_unlock(&hs->hs_lock); if (fi == NULL) return; @@ -652,9 +750,6 @@ hwmp_send_perr(struct ieee80211_node *ni * [1] category * [tlv] mesh path error */ - perr->perr_ie = IEEE80211_ELEMID_MESHPERR; - perr->perr_len = sizeof(struct ieee80211_meshperr_ie) - 2; - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&perr, sizeof(*perr)); } @@ -663,19 +758,19 @@ static void hwmp_recv_rann(struct ieee80211vap *vap, struct ieee80211_node *ni, const struct ieee80211_meshrann_ie *rann) { - struct ieee80211_hwmp_fi *fi; + struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + struct ieee80211_hwmp_fi *fi = NULL; /* * Acceptance criteria: check the HWMP sequence number * and the path metric is better than what we have. */ - fi = NULL; - /*HWMP_LOCK();*/ - TAILQ_FOREACH(fi, &ieee80211_hwmp_ft, fi_next) { + mtx_lock(&hs->hs_lock); + TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { if (IEEE80211_ADDR_EQ(rann->rann_addr, fi->fi_dest)) break; } - /*HWMP_UNLOCK();*/ + mtx_unlock(&hs->hs_lock); if (fi == NULL) { struct ieee80211_meshpreq_ie preq; @@ -688,7 +783,7 @@ hwmp_recv_rann(struct ieee80211vap *vap, preq.preq_ttl = ieee80211_mesh_ttl; IEEE80211_ADDR_COPY(&preq.preq_origaddr, vap->iv_myaddr); - preq.preq_origseq = 0; /* XXX */ + preq.preq_origseq = hs->hs_seq++; preq.preq_targets[0].target_flags |= IEEE80211_MESHPREQ_TFLAGS_TO; IEEE80211_ADDR_COPY(preq.preq_targets[0].target_addr, @@ -713,7 +808,7 @@ hwmp_recv_rann(struct ieee80211vap *vap, } } -static int +static inline int hwmp_send_rann(struct ieee80211_node *ni, const uint8_t addr1[IEEE80211_ADDR_LEN], const uint8_t addr2[IEEE80211_ADDR_LEN], @@ -728,9 +823,6 @@ hwmp_send_rann(struct ieee80211_node *ni * [1] category * [tlv] root annoucement */ - rann->rann_ie = IEEE80211_ELEMID_MESHRANN; - rann->rann_len = sizeof(struct ieee80211_meshrann_ie) - 2; - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&rann, sizeof(*rann)); } Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 11:38:38 2009 (r193225) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 12:18:51 2009 (r193226) @@ -45,15 +45,17 @@ struct ieee80211_hwmp_fi { uint32_t fi_lifetime; }; +#ifdef _KERNEL +struct ieee80211_hwmp_state { + TAILQ_HEAD(, ieee80211_hwmp_fi) hs_head; + ieee80211_seq hs_seq; /* next seq to be used */ + struct mtx hs_lock; /* lock for the fi table */ +}; + +void ieee80211_hwmp_vattach(struct ieee80211vap *); +void ieee80211_hwmp_vdetach(struct ieee80211vap *); void ieee80211_hwmp_recv_action(struct ieee80211vap *, struct ieee80211_node *, struct mbuf *); -uint8_t * ieee80211_add_meshprep(uint8_t *, - const struct ieee80211_meshprep_ie *); -#if 0 -uint8_t * ieee80211_add_meshpreq(uint8_t *, - struct ieee80211_meshpreq_ie *); -uint8_t * ieee80211_add_meshperr(uint8_t *, - struct ieee80211_meshperr_ie *); -#endif +#endif /* _KERNEL */ #endif /* _NET80211_IEEE80211_HWMP_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Jun 1 11:38:38 2009 (r193225) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Jun 1 12:18:51 2009 (r193226) @@ -119,6 +119,7 @@ ieee80211_mesh_detach(struct ieee80211co static void mesh_vdetach(struct ieee80211vap *vap) { + ieee80211_hwmp_vdetach(vap); } static void @@ -128,6 +129,7 @@ mesh_vattach(struct ieee80211vap *vap) vap->iv_input = mesh_input; vap->iv_opdetach = mesh_vdetach; vap->iv_recv_mgmt = mesh_recv_mgmt; + ieee80211_hwmp_vattach(vap); } /* Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Jun 1 11:38:38 2009 (r193225) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Jun 1 12:18:51 2009 (r193226) @@ -272,7 +272,7 @@ struct ieee80211_meshprep_ie { struct ieee80211_meshperr_ie { uint8_t perr_ie; /* IEEE80211_ELEMID_MESHPERR */ uint8_t perr_len; - uint8_t perr_mode; + uint8_t perr_mode; /* NB: reserved */ uint8_t perr_ndests; /* Number of Destinations */ struct { uint8_t dest_addr[IEEE80211_ADDR_LEN]; Modified: projects/mesh11s/sys/net80211/ieee80211_var.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_var.h Mon Jun 1 11:38:38 2009 (r193225) +++ projects/mesh11s/sys/net80211/ieee80211_var.h Mon Jun 1 12:18:51 2009 (r193226) @@ -427,6 +427,7 @@ struct ieee80211vap { void *iv_as; /* private aclator state */ struct ieee80211_tdma_state *iv_tdma; /* tdma state */ + struct ieee80211_hwmp_state *iv_hwmp; /* HWMP state */ /* operate-mode detach hook */ void (*iv_opdetach)(struct ieee80211vap *); From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 12:29:29 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ECBF106568F; Mon, 1 Jun 2009 12:29:29 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 885B58FC0A; Mon, 1 Jun 2009 12:29:29 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51CTTKY078793; Mon, 1 Jun 2009 12:29:29 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51CTSDT078764; Mon, 1 Jun 2009 12:29:28 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906011229.n51CTSDT078764@svn.freebsd.org> From: Robert Watson Date: Mon, 1 Jun 2009 12:29:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193227 - in projects/pnet/sys: . amd64/amd64 arm/arm arm/xscale/ixp425 boot/common boot/uboot/lib cddl/compat/opensolaris/kern cddl/contrib/opensolaris/uts/common/fs cddl/contrib/opens... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:29:30 -0000 Author: rwatson Date: Mon Jun 1 12:29:27 2009 New Revision: 193227 URL: http://svn.freebsd.org/changeset/base/193227 Log: Merge r193031-r193225 from head to projects/pnet following netisr2 merge. Added: projects/pnet/sys/i386/include/xen/xen_clock_util.h - copied unchanged from r193225, head/sys/i386/include/xen/xen_clock_util.h projects/pnet/sys/i386/xen/xen_clock_util.c - copied unchanged from r193225, head/sys/i386/xen/xen_clock_util.c projects/pnet/sys/powerpc/cpufreq/ - copied from r193225, head/sys/powerpc/cpufreq/ projects/pnet/sys/powerpc/ofw/ofw_cpu.c - copied unchanged from r193225, head/sys/powerpc/ofw/ofw_cpu.c projects/pnet/sys/powerpc/powermac/vcoregpio.c - copied unchanged from r193225, head/sys/powerpc/powermac/vcoregpio.c Modified: projects/pnet/sys/ (props changed) projects/pnet/sys/amd64/amd64/dump_machdep.c projects/pnet/sys/amd64/amd64/minidump_machdep.c projects/pnet/sys/arm/arm/dump_machdep.c projects/pnet/sys/arm/xscale/ixp425/if_npe.c projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.c projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.h projects/pnet/sys/boot/common/boot.c projects/pnet/sys/boot/uboot/lib/net.c projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris.c projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/pnet/sys/compat/linux/linux_misc.c projects/pnet/sys/compat/linux/linux_socket.c projects/pnet/sys/compat/ndis/subr_usbd.c projects/pnet/sys/compat/svr4/svr4_stat.c projects/pnet/sys/conf/NOTES projects/pnet/sys/conf/files.i386 projects/pnet/sys/conf/files.powerpc projects/pnet/sys/conf/options projects/pnet/sys/ddb/db_textdump.c projects/pnet/sys/dev/ata/ (props changed) projects/pnet/sys/dev/ata/ata-usb.c projects/pnet/sys/dev/ata/chipsets/ata-intel.c projects/pnet/sys/dev/bge/if_bge.c projects/pnet/sys/dev/bwi/if_bwi.c projects/pnet/sys/dev/dc/if_dc.c projects/pnet/sys/dev/e1000/if_em.c projects/pnet/sys/dev/firewire/firewire.c projects/pnet/sys/dev/firewire/if_fwe.c projects/pnet/sys/dev/firewire/if_fwip.c projects/pnet/sys/dev/fxp/if_fxp.c projects/pnet/sys/dev/if_ndis/if_ndisvar.h projects/pnet/sys/dev/iwn/if_iwn.c projects/pnet/sys/dev/ixgb/if_ixgb.c projects/pnet/sys/dev/lmc/if_lmc.c projects/pnet/sys/dev/lmc/if_lmc.h projects/pnet/sys/dev/mge/if_mge.c projects/pnet/sys/dev/nfe/if_nfe.c projects/pnet/sys/dev/nge/if_nge.c projects/pnet/sys/dev/ral/rt2560.c projects/pnet/sys/dev/re/if_re.c projects/pnet/sys/dev/sf/if_sf.c projects/pnet/sys/dev/sis/if_sis.c projects/pnet/sys/dev/smc/if_smc.c projects/pnet/sys/dev/sound/usb/uaudio.c projects/pnet/sys/dev/ste/if_ste.c projects/pnet/sys/dev/stge/if_stge.c projects/pnet/sys/dev/syscons/daemon/daemon_saver.c projects/pnet/sys/dev/syscons/scterm-teken.c projects/pnet/sys/dev/syscons/teken/sequences projects/pnet/sys/dev/syscons/teken/teken.c projects/pnet/sys/dev/syscons/teken/teken.h projects/pnet/sys/dev/syscons/teken/teken_subr_compat.h projects/pnet/sys/dev/tsec/if_tsec.c projects/pnet/sys/dev/usb/controller/at91dci.c projects/pnet/sys/dev/usb/controller/at91dci.h projects/pnet/sys/dev/usb/controller/atmegadci.c projects/pnet/sys/dev/usb/controller/atmegadci.h projects/pnet/sys/dev/usb/controller/avr32dci.c projects/pnet/sys/dev/usb/controller/avr32dci.h projects/pnet/sys/dev/usb/controller/ehci.c projects/pnet/sys/dev/usb/controller/ehci.h projects/pnet/sys/dev/usb/controller/musb_otg.c projects/pnet/sys/dev/usb/controller/musb_otg.h projects/pnet/sys/dev/usb/controller/ohci.c projects/pnet/sys/dev/usb/controller/ohci.h projects/pnet/sys/dev/usb/controller/uhci.c projects/pnet/sys/dev/usb/controller/uhci.h projects/pnet/sys/dev/usb/controller/usb_controller.c projects/pnet/sys/dev/usb/controller/uss820dci.c projects/pnet/sys/dev/usb/controller/uss820dci.h projects/pnet/sys/dev/usb/input/uhid.c projects/pnet/sys/dev/usb/input/ukbd.c projects/pnet/sys/dev/usb/input/ums.c projects/pnet/sys/dev/usb/misc/udbp.c projects/pnet/sys/dev/usb/misc/ufm.c projects/pnet/sys/dev/usb/net/if_aue.c projects/pnet/sys/dev/usb/net/if_axe.c projects/pnet/sys/dev/usb/net/if_cdce.c projects/pnet/sys/dev/usb/net/if_cue.c projects/pnet/sys/dev/usb/net/if_kue.c projects/pnet/sys/dev/usb/net/if_rue.c projects/pnet/sys/dev/usb/net/if_udav.c projects/pnet/sys/dev/usb/net/usb_ethernet.c projects/pnet/sys/dev/usb/net/usb_ethernet.h projects/pnet/sys/dev/usb/serial/u3g.c projects/pnet/sys/dev/usb/serial/uark.c projects/pnet/sys/dev/usb/serial/ubsa.c projects/pnet/sys/dev/usb/serial/ubser.c projects/pnet/sys/dev/usb/serial/uchcom.c projects/pnet/sys/dev/usb/serial/ucycom.c projects/pnet/sys/dev/usb/serial/ufoma.c projects/pnet/sys/dev/usb/serial/uftdi.c projects/pnet/sys/dev/usb/serial/ugensa.c projects/pnet/sys/dev/usb/serial/uipaq.c projects/pnet/sys/dev/usb/serial/ulpt.c projects/pnet/sys/dev/usb/serial/umct.c projects/pnet/sys/dev/usb/serial/umodem.c projects/pnet/sys/dev/usb/serial/umoscom.c projects/pnet/sys/dev/usb/serial/uplcom.c projects/pnet/sys/dev/usb/serial/usb_serial.c projects/pnet/sys/dev/usb/serial/uslcom.c projects/pnet/sys/dev/usb/serial/uvisor.c projects/pnet/sys/dev/usb/serial/uvscom.c projects/pnet/sys/dev/usb/storage/umass.c projects/pnet/sys/dev/usb/storage/urio.c projects/pnet/sys/dev/usb/storage/ustorage_fs.c projects/pnet/sys/dev/usb/template/usb_template.c projects/pnet/sys/dev/usb/usb_bus.h projects/pnet/sys/dev/usb/usb_busdma.c projects/pnet/sys/dev/usb/usb_busdma.h projects/pnet/sys/dev/usb/usb_compat_linux.c projects/pnet/sys/dev/usb/usb_compat_linux.h projects/pnet/sys/dev/usb/usb_controller.h projects/pnet/sys/dev/usb/usb_core.h projects/pnet/sys/dev/usb/usb_dev.c projects/pnet/sys/dev/usb/usb_dev.h projects/pnet/sys/dev/usb/usb_device.c projects/pnet/sys/dev/usb/usb_device.h projects/pnet/sys/dev/usb/usb_dynamic.c projects/pnet/sys/dev/usb/usb_dynamic.h projects/pnet/sys/dev/usb/usb_error.c projects/pnet/sys/dev/usb/usb_generic.c projects/pnet/sys/dev/usb/usb_handle_request.c projects/pnet/sys/dev/usb/usb_hid.c projects/pnet/sys/dev/usb/usb_hid.h projects/pnet/sys/dev/usb/usb_hub.c projects/pnet/sys/dev/usb/usb_hub.h projects/pnet/sys/dev/usb/usb_lookup.c projects/pnet/sys/dev/usb/usb_lookup.h projects/pnet/sys/dev/usb/usb_mbuf.c projects/pnet/sys/dev/usb/usb_mbuf.h projects/pnet/sys/dev/usb/usb_msctest.c projects/pnet/sys/dev/usb/usb_msctest.h projects/pnet/sys/dev/usb/usb_process.c projects/pnet/sys/dev/usb/usb_process.h projects/pnet/sys/dev/usb/usb_request.c projects/pnet/sys/dev/usb/usb_request.h projects/pnet/sys/dev/usb/usb_transfer.c projects/pnet/sys/dev/usb/usb_transfer.h projects/pnet/sys/dev/usb/usb_util.c projects/pnet/sys/dev/usb/usbdevs projects/pnet/sys/dev/usb/wlan/if_rum.c projects/pnet/sys/dev/usb/wlan/if_uath.c projects/pnet/sys/dev/usb/wlan/if_upgt.c projects/pnet/sys/dev/usb/wlan/if_ural.c projects/pnet/sys/dev/usb/wlan/if_urtw.c projects/pnet/sys/dev/usb/wlan/if_urtwvar.h projects/pnet/sys/dev/usb/wlan/if_zyd.c projects/pnet/sys/dev/vge/if_vge.c projects/pnet/sys/dev/vr/if_vr.c projects/pnet/sys/dev/xen/netfront/ (props changed) projects/pnet/sys/dev/xen/xenpci/ (props changed) projects/pnet/sys/dev/xl/if_xl.c projects/pnet/sys/fs/cd9660/cd9660_rrip.c projects/pnet/sys/fs/nfs/nfsport.h projects/pnet/sys/fs/nfsclient/nfs_clbio.c projects/pnet/sys/fs/nfsclient/nfs_clnode.c projects/pnet/sys/fs/nfsclient/nfs_clstate.c projects/pnet/sys/fs/nfsclient/nfs_clvfsops.c projects/pnet/sys/fs/nfsclient/nfs_clvnops.c projects/pnet/sys/fs/nfsserver/nfs_nfsdport.c projects/pnet/sys/fs/nullfs/null_subr.c projects/pnet/sys/fs/nullfs/null_vnops.c projects/pnet/sys/fs/pseudofs/pseudofs_vnops.c projects/pnet/sys/geom/label/g_label.c projects/pnet/sys/geom/vinum/geom_vinum_create.c projects/pnet/sys/geom/vinum/geom_vinum_drive.c projects/pnet/sys/i386/i386/dump_machdep.c projects/pnet/sys/i386/i386/minidump_machdep.c projects/pnet/sys/i386/ibcs2/ibcs2_socksys.c projects/pnet/sys/i386/include/apicvar.h projects/pnet/sys/i386/xen/clock.c projects/pnet/sys/i386/xen/mp_machdep.c projects/pnet/sys/i386/xen/xen_rtc.c projects/pnet/sys/ia64/ia64/dump_machdep.c projects/pnet/sys/kern/kern_cpu.c projects/pnet/sys/kern/kern_jail.c projects/pnet/sys/kern/kern_mib.c projects/pnet/sys/kern/kern_mutex.c projects/pnet/sys/kern/kern_prot.c projects/pnet/sys/kern/kern_rmlock.c projects/pnet/sys/kern/kern_rwlock.c projects/pnet/sys/kern/kern_shutdown.c projects/pnet/sys/kern/kern_vimage.c projects/pnet/sys/kern/kern_xxx.c projects/pnet/sys/kern/uipc_syscalls.c projects/pnet/sys/kern/vfs_bio.c projects/pnet/sys/kern/vfs_cache.c projects/pnet/sys/kern/vfs_default.c projects/pnet/sys/kern/vfs_mount.c projects/pnet/sys/kern/vfs_subr.c projects/pnet/sys/kern/vnode_if.src projects/pnet/sys/kgssapi/gsstest.c projects/pnet/sys/modules/Makefile projects/pnet/sys/modules/cpufreq/Makefile projects/pnet/sys/modules/dtrace/dtnfsclient/ (props changed) projects/pnet/sys/modules/geom/geom_part/geom_part_ebr/Makefile projects/pnet/sys/modules/ip6_mroute_mod/ (props changed) projects/pnet/sys/modules/ipmi/ipmi_linux/ (props changed) projects/pnet/sys/modules/usb/Makefile projects/pnet/sys/modules/zfs/Makefile projects/pnet/sys/net/if.c projects/pnet/sys/net/if.h projects/pnet/sys/net/if_var.h projects/pnet/sys/net80211/ieee80211_dfs.c projects/pnet/sys/net80211/ieee80211_freebsd.c projects/pnet/sys/net80211/ieee80211_ht.c projects/pnet/sys/net80211/ieee80211_phy.h projects/pnet/sys/net80211/ieee80211_superg.c projects/pnet/sys/net80211/ieee80211_tdma.c projects/pnet/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/pnet/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c projects/pnet/sys/netinet/in.h projects/pnet/sys/netinet/in_pcb.c projects/pnet/sys/netinet/in_pcb.h projects/pnet/sys/netinet/ip_output.c projects/pnet/sys/netinet/raw_ip.c projects/pnet/sys/netinet/sctp_pcb.c projects/pnet/sys/netinet/sctp_sysctl.c projects/pnet/sys/netinet/sctp_sysctl.h projects/pnet/sys/netinet/sctp_uio.h projects/pnet/sys/netinet/sctputil.c projects/pnet/sys/netinet6/icmp6.c projects/pnet/sys/netinet6/in6.h projects/pnet/sys/netinet6/in6_ifattach.c projects/pnet/sys/netinet6/in6_pcb.c projects/pnet/sys/netinet6/ip6_output.c projects/pnet/sys/nfsclient/bootp_subr.c projects/pnet/sys/nfsclient/nfs_bio.c projects/pnet/sys/nfsclient/nfs_vfsops.c projects/pnet/sys/nfsserver/nfs_srvkrpc.c projects/pnet/sys/nlm/nlm_advlock.c projects/pnet/sys/pci/if_rl.c projects/pnet/sys/powerpc/aim/machdep.c projects/pnet/sys/powerpc/booke/machdep.c projects/pnet/sys/powerpc/conf/GENERIC projects/pnet/sys/powerpc/conf/NOTES projects/pnet/sys/powerpc/mpc85xx/atpic.c projects/pnet/sys/powerpc/powermac/pmu.c projects/pnet/sys/powerpc/powerpc/cpu.c projects/pnet/sys/rpc/authunix_prot.c projects/pnet/sys/rpc/xdr.h projects/pnet/sys/sparc64/sparc64/dump_machdep.c projects/pnet/sys/sun4v/sun4v/dump_machdep.c projects/pnet/sys/sys/buf.h projects/pnet/sys/sys/cpu.h projects/pnet/sys/sys/jail.h projects/pnet/sys/sys/kernel.h projects/pnet/sys/sys/mount.h projects/pnet/sys/sys/param.h projects/pnet/sys/sys/priv.h projects/pnet/sys/sys/sockio.h projects/pnet/sys/sys/syscallsubr.h projects/pnet/sys/sys/vimage.h projects/pnet/sys/sys/vnode.h projects/pnet/sys/vm/vm_page.c projects/pnet/sys/vm/vm_page.h projects/pnet/sys/xen/evtchn/evtchn.c Modified: projects/pnet/sys/amd64/amd64/dump_machdep.c ============================================================================== --- projects/pnet/sys/amd64/amd64/dump_machdep.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/amd64/amd64/dump_machdep.c Mon Jun 1 12:29:27 2009 (r193227) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: projects/pnet/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- projects/pnet/sys/amd64/amd64/minidump_machdep.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/amd64/amd64/minidump_machdep.c Mon Jun 1 12:29:27 2009 (r193227) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: projects/pnet/sys/arm/arm/dump_machdep.c ============================================================================== --- projects/pnet/sys/arm/arm/dump_machdep.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/arm/arm/dump_machdep.c Mon Jun 1 12:29:27 2009 (r193227) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: projects/pnet/sys/arm/xscale/ixp425/if_npe.c ============================================================================== --- projects/pnet/sys/arm/xscale/ixp425/if_npe.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/arm/xscale/ixp425/if_npe.c Mon Jun 1 12:29:27 2009 (r193227) @@ -229,7 +229,7 @@ static void npe_getmac(struct npe_softc static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ npe_activate(device_t dev) */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ npe_rxbuf_init(struct npe_softc *sc, str * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ npe_rxdone(int qid, void *arg) struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ npe_rxdone(int qid, void *arg) ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ npe_rxdone(int qid, void *arg) /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ Modified: projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.c ============================================================================== --- projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.c Mon Jun 1 12:29:27 2009 (r193227) @@ -338,7 +338,7 @@ ixpqmgr_detach(device_t dev) int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; Modified: projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.h ============================================================================== --- projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.h Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/arm/xscale/ixp425/ixp425_qmgr.h Mon Jun 1 12:29:27 2009 (r193227) @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); Modified: projects/pnet/sys/boot/common/boot.c ============================================================================== --- projects/pnet/sys/boot/common/boot.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/boot/common/boot.c Mon Jun 1 12:29:27 2009 (r193227) @@ -287,7 +287,7 @@ getbootfile(int try) int getrootmount(char *rootdev) { - char lbuf[128], *cp, *ep, *dev, *fstyp; + char lbuf[128], *cp, *ep, *dev, *fstyp, *options; int fd, error; if (getenv("vfs.root.mountfrom") != NULL) @@ -331,11 +331,30 @@ getrootmount(char *rootdev) *cp = 0; fstyp = strdup(ep); - /* build the final result and save it */ + /* skip whitespace up to mount options */ + cp += 1; + while ((*cp != 0) && isspace(*cp)) + cp++; + if (*cp == 0) /* misformatted */ + continue; + /* skip text to end of mount options and delimit */ + ep = cp; + while ((*cp != 0) && !isspace(*cp)) + cp++; + *cp = 0; + options = strdup(ep); + /* Build the : and save it in vfs.root.mountfrom */ sprintf(lbuf, "%s:%s", fstyp, dev); free(dev); free(fstyp); setenv("vfs.root.mountfrom", lbuf, 0); + + /* Don't override vfs.root.mountfrom.options if it is already set */ + if (getenv("vfs.root.mountfrom.options") == NULL) { + /* save mount options */ + setenv("vfs.root.mountfrom.options", options, 0); + } + free(options); error = 0; break; } Modified: projects/pnet/sys/boot/uboot/lib/net.c ============================================================================== --- projects/pnet/sys/boot/uboot/lib/net.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/boot/uboot/lib/net.c Mon Jun 1 12:29:27 2009 (r193227) @@ -46,12 +46,6 @@ __FBSDID("$FreeBSD$"); #include "glue.h" #include "libuboot.h" -#define NETIF_DEBUG -#define NETIF_VERBOSE_DEBUG -#undef NETIF_DEBUG -#undef NETIF_VERBOSE_DEBUG - - static int net_probe(struct netif *, void *); static int net_match(struct netif *, void *); static void net_init(struct iodesc *, void *); @@ -138,7 +132,7 @@ net_put(struct iodesc *desc, void *pkt, #if defined(NETIF_DEBUG) struct ether_header *eh; - printf("net_put: desc 0x%x, pkt 0x%x, len %d\n", desc, pkt, len); + printf("net_put: desc %p, pkt %p, len %d\n", desc, pkt, len); eh = pkt; printf("dst: %s ", ether_sprintf(eh->ether_dhost)); printf("src: %s ", ether_sprintf(eh->ether_shost)); @@ -175,7 +169,7 @@ net_get(struct iodesc *desc, void *pkt, int err, rlen; #if defined(NETIF_DEBUG) - printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); + printf("net_get: pkt %p, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { Modified: projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris.c ============================================================================== --- projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris.c Mon Jun 1 12:29:27 2009 (r193227) @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ opensolaris_modevent(module_t mod __unus switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: Modified: projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c ============================================================================== --- projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Mon Jun 1 12:29:27 2009 (r193227) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -57,7 +58,7 @@ ddi_strtoul(const char *str, char **nptr { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } Modified: projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c ============================================================================== --- projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Mon Jun 1 12:29:27 2009 (r193227) @@ -564,8 +564,13 @@ gfs_file_inactive(vnode_t *vp) if (fp->gfs_parent == NULL || (vp->v_flag & V_XATTRDIR)) goto found; - dp = fp->gfs_parent->v_data; - + /* + * XXX cope with a FreeBSD-specific race wherein the parent's + * snapshot data can be freed before the parent is + */ + if ((dp = fp->gfs_parent->v_data) == NULL) + return (NULL); + /* * First, see if this vnode is cached in the parent. */ Modified: projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c ============================================================================== --- projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Mon Jun 1 12:29:27 2009 (r193227) @@ -2392,13 +2392,23 @@ vdev_set_state(vdev_t *vd, boolean_t iso /* * Check the vdev configuration to ensure that it's capable of supporting - * a root pool. Currently, we do not support RAID-Z or partial configuration. - * In addition, only a single top-level vdev is allowed and none of the leaves - * can be wholedisks. + * a root pool. + * + * On Solaris, we do not support RAID-Z or partial configuration. In + * addition, only a single top-level vdev is allowed and none of the + * leaves can be wholedisks. + * + * For FreeBSD, we can boot from any configuration. There is a + * limitation that the boot filesystem must be either uncompressed or + * compresses with lzjb compression but I'm not sure how to enforce + * that here. */ boolean_t vdev_is_bootable(vdev_t *vd) { +#ifdef __FreeBSD_version + return (B_TRUE); +#else int c; if (!vd->vdev_ops->vdev_op_leaf) { @@ -2420,4 +2430,5 @@ vdev_is_bootable(vdev_t *vd) return (B_FALSE); } return (B_TRUE); +#endif } Modified: projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon Jun 1 12:29:27 2009 (r193227) @@ -3121,3 +3121,4 @@ static moduledata_t zfs_mod = { }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); +MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); Modified: projects/pnet/sys/compat/linux/linux_misc.c ============================================================================== --- projects/pnet/sys/compat/linux/linux_misc.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/compat/linux/linux_misc.c Mon Jun 1 12:29:27 2009 (r193227) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -715,10 +714,10 @@ linux_times(struct thread *td, struct li int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ linux_newuname(struct thread *td, struct } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } Modified: projects/pnet/sys/compat/linux/linux_socket.c ============================================================================== --- projects/pnet/sys/compat/linux/linux_socket.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/compat/linux/linux_socket.c Mon Jun 1 12:29:27 2009 (r193227) @@ -445,8 +445,6 @@ bsd_to_linux_cmsg_type(int cmsg_type) return (-1); } - - static int linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr) { @@ -477,6 +475,24 @@ bsd_to_linux_msghdr(const struct msghdr } static int +linux_set_socket_flags(struct thread *td, int s, int flags) +{ + int error; + + if (flags & LINUX_SOCK_NONBLOCK) { + error = kern_fcntl(td, s, F_SETFL, O_NONBLOCK); + if (error) + return (error); + } + if (flags & LINUX_SOCK_CLOEXEC) { + error = kern_fcntl(td, s, F_SETFD, FD_CLOEXEC); + if (error) + return (error); + } + return (0); +} + +static int linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg) { @@ -610,21 +626,11 @@ linux_socket(struct thread *td, struct l if (retval_socket) return (retval_socket); - if (socket_flags & LINUX_SOCK_NONBLOCK) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFL, O_NONBLOCK); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } - } - if (socket_flags & LINUX_SOCK_CLOEXEC) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFD, FD_CLOEXEC); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } + retval_socket = linux_set_socket_flags(td, td->td_retval[0], + socket_flags); + if (retval_socket) { + (void)kern_close(td, td->td_retval[0]); + goto out; } if (bsd_args.type == SOCK_RAW @@ -878,12 +884,20 @@ linux_socketpair(struct thread *td, stru int protocol; int *rsv; } */ bsd_args; + int error, socket_flags; + int sv[2]; bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain != PF_LOCAL) return (EAFNOSUPPORT); - bsd_args.type = args->type; + socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK; + if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK)) + return (EINVAL); + bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK; + if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX) + return (EINVAL); + if (args->protocol != 0 && args->protocol != PF_UNIX) /* @@ -896,7 +910,25 @@ linux_socketpair(struct thread *td, stru else bsd_args.protocol = 0; bsd_args.rsv = (int *)PTRIN(args->rsv); - return (socketpair(td, &bsd_args)); + error = kern_socketpair(td, bsd_args.domain, bsd_args.type, + bsd_args.protocol, sv); + if (error) + return (error); + error = linux_set_socket_flags(td, sv[0], socket_flags); + if (error) + goto out; + error = linux_set_socket_flags(td, sv[1], socket_flags); + if (error) + goto out; + + error = copyout(sv, bsd_args.rsv, 2 * sizeof(int)); + +out: + if (error) { + (void)kern_close(td, sv[0]); + (void)kern_close(td, sv[1]); + } + return (error); } struct linux_send_args { Modified: projects/pnet/sys/compat/ndis/subr_usbd.c ============================================================================== --- projects/pnet/sys/compat/ndis/subr_usbd.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/compat/ndis/subr_usbd.c Mon Jun 1 12:29:27 2009 (r193227) @@ -76,8 +76,8 @@ __FBSDID("$FreeBSD$"); #include static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 @@ -114,10 +114,10 @@ static int32_t usbd_func_bulkintr(irp static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, struct usb_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); @@ -353,7 +353,7 @@ usbd_urb2nt(status) return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ usbd_func_getdesc(ip) uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -527,7 +527,7 @@ usbd_func_selconf(ip) union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,7 +592,7 @@ usbd_func_selconf(ip) return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; @@ -602,7 +602,7 @@ usbd_setup_endpoint_one(ip, ifidx, ne, e device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ usbd_setup_endpoint_one(ip, ifidx, ne, e return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_default(ip, ifidx) irp *ip; uint8_t ifidx; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - usb2_error_t status; + usb_error_t status; if (ifidx > 0) device_printf(dev, "warning: ifidx > 0 isn't supported.\n"); @@ -643,7 +643,7 @@ usbd_setup_endpoint_default(ip, ifidx) return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint(ip, ifidx, ep) irp *ip; uint8_t ifidx; @@ -654,7 +654,7 @@ usbd_setup_endpoint(ip, ifidx, ep) struct ndisusb_ep *ne; struct usb_config cfg; struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; /* check for non-supported transfer types */ if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL || @@ -810,7 +810,7 @@ usbd_irpcancel(dobj, ip) static void usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne, - struct ndisusb_xfer *nx, usb2_error_t status) + struct ndisusb_xfer *nx, usb_error_t status) { struct ndisusb_xferdone *nd; uint8_t irql; @@ -1122,7 +1122,7 @@ usbd_xfertask(dobj, arg) struct usbd_urb_bulk_or_intr_transfer *ubi; struct usbd_urb_vendor_or_class_request *vcreq; union usbd_urb *urb; - usb2_error_t status; + usb_error_t status; void *priv; dev = sc->ndis_dev; Modified: projects/pnet/sys/compat/svr4/svr4_stat.c ============================================================================== --- projects/pnet/sys/compat/svr4/svr4_stat.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/compat/svr4/svr4_stat.c Mon Jun 1 12:29:27 2009 (r193227) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -386,7 +385,7 @@ svr4_ustat(td, uap) return 0; } -/*extern char ostype[], hostname[], osrelease[], version[], machine[];*/ +/*extern char ostype[], osrelease[], version[], machine[];*/ int svr4_sys_uname(td, uap) @@ -412,15 +411,12 @@ svr4_sys_systeminfo(td, uap) struct thread *td; struct svr4_sys_systeminfo_args *uap; { - INIT_VPROCG(TD_TO_VPROCG(td)); + struct prison *pr; char *str = NULL; int error = 0; register_t *retval = td->td_retval; size_t len = 0; - char buf[11]; /* XXX NetBSD uses 256, but we use 11 - here as that seems like awfully - excessive kstack usage for hostid - string... */ + char buf[MAXHOSTNAMELEN]; u_int rlen = uap->len; switch (uap->what) { @@ -429,7 +425,8 @@ svr4_sys_systeminfo(td, uap) break; case SVR4_SI_HOSTNAME: - str = V_hostname; + getcredhostname(td->td_ucred, buf, sizeof(buf)); + str = buf; break; case SVR4_SI_RELEASE: @@ -461,7 +458,10 @@ svr4_sys_systeminfo(td, uap) break; case SVR4_SI_HW_SERIAL: - snprintf(buf, sizeof(buf), "%lu", hostid); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + snprintf(buf, sizeof(buf), "%lu", pr->pr_hostid); + mtx_unlock(&pr->pr_mtx); str = buf; break; @@ -470,8 +470,11 @@ svr4_sys_systeminfo(td, uap) break; case SVR4_SI_SRPC_DOMAIN: - /* XXXRW: locking? */ - str = V_domainname; + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(buf, pr->pr_domain, sizeof(buf)); + mtx_unlock(&pr->pr_mtx); + str = buf; break; case SVR4_SI_PLATFORM: Modified: projects/pnet/sys/conf/NOTES ============================================================================== --- projects/pnet/sys/conf/NOTES Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/conf/NOTES Mon Jun 1 12:29:27 2009 (r193227) @@ -639,14 +639,6 @@ options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required if the TSC is unusable options ALTQ_DEBUG -# IP optional behaviour. -# IP_NONLOCALBIND disables the check that bind() usually makes that the -# address is one that is assigned to an interface on this machine. -# It allows transparent proxies to pretend to be other machines. -# How the packet GET to that machine is a problem solved elsewhere, -# smart routers, ipfw fwd, etc. -options IP_NONLOCALBIND # Allow impersonation for proxies. - # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option # listed below; however, this is not strictly necessary as netgraph Modified: projects/pnet/sys/conf/files.i386 ============================================================================== --- projects/pnet/sys/conf/files.i386 Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/conf/files.i386 Mon Jun 1 12:29:27 2009 (r193227) @@ -327,6 +327,7 @@ i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen +i386/xen/xen_clock_util.c optional xen i386/xen/xen_rtc.c optional xen i386/isa/dpms.c optional dpms i386/isa/elcr.c standard Modified: projects/pnet/sys/conf/files.powerpc ============================================================================== --- projects/pnet/sys/conf/files.powerpc Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/conf/files.powerpc Mon Jun 1 12:29:27 2009 (r193227) @@ -97,6 +97,7 @@ powerpc/booke/pmap.c optional e500 powerpc/booke/swtch.S optional e500 powerpc/booke/trap.c optional e500 powerpc/booke/vm_machdep.c optional e500 +powerpc/cpufreq/dfs.c optional cpufreq powerpc/fpu/fpu_add.c optional fpu_emu powerpc/fpu/fpu_compare.c optional fpu_emu powerpc/fpu/fpu_div.c optional fpu_emu @@ -114,6 +115,7 @@ powerpc/mpc85xx/nexus.c optional mpc85x powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx +powerpc/ofw/ofw_cpu.c optional aim powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim powerpc/ofw/ofw_real.c optional aim @@ -133,6 +135,7 @@ powerpc/powermac/cuda.c optional powerm powerpc/powermac/pmu.c optional powermac pmu powerpc/powermac/macgpio.c optional powermac pci powerpc/powermac/cpcht.c optional powermac pci +powerpc/powermac/vcoregpio.c optional powermac powerpc/powerpc/altivec.c optional aim powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard Modified: projects/pnet/sys/conf/options ============================================================================== --- projects/pnet/sys/conf/options Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/conf/options Mon Jun 1 12:29:27 2009 (r193227) @@ -400,7 +400,6 @@ IPFIREWALL_VERBOSE opt_ipfw.h IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPSEC opt_ipsec.h IPSEC_DEBUG opt_ipsec.h -IP_NONLOCALBIND opt_inet.h IPSEC_FILTERTUNNEL opt_ipsec.h IPSTEALTH IPX Modified: projects/pnet/sys/ddb/db_textdump.c ============================================================================== --- projects/pnet/sys/ddb/db_textdump.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/ddb/db_textdump.c Mon Jun 1 12:29:27 2009 (r193227) @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: projects/pnet/sys/dev/ata/ata-usb.c ============================================================================== --- projects/pnet/sys/dev/ata/ata-usb.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/dev/ata/ata-usb.c Mon Jun 1 12:29:27 2009 (r193227) @@ -132,16 +132,16 @@ static device_probe_t atausb2_probe; static device_attach_t atausb2_attach; static device_detach_t atausb2_detach; -static usb2_callback_t atausb2_t_bbb_reset1_callback; -static usb2_callback_t atausb2_t_bbb_reset2_callback; -static usb2_callback_t atausb2_t_bbb_reset3_callback; -static usb2_callback_t atausb2_t_bbb_command_callback; -static usb2_callback_t atausb2_t_bbb_data_read_callback; -static usb2_callback_t atausb2_t_bbb_data_rd_cs_callback; -static usb2_callback_t atausb2_t_bbb_data_write_callback; -static usb2_callback_t atausb2_t_bbb_data_wr_cs_callback; -static usb2_callback_t atausb2_t_bbb_status_callback; -static usb2_callback_t atausb2_tr_error; +static usb_callback_t atausb2_t_bbb_reset1_callback; +static usb_callback_t atausb2_t_bbb_reset2_callback; +static usb_callback_t atausb2_t_bbb_reset3_callback; +static usb_callback_t atausb2_t_bbb_command_callback; +static usb_callback_t atausb2_t_bbb_data_read_callback; +static usb_callback_t atausb2_t_bbb_data_rd_cs_callback; +static usb_callback_t atausb2_t_bbb_data_write_callback; +static usb_callback_t atausb2_t_bbb_data_wr_cs_callback; +static usb_callback_t atausb2_t_bbb_status_callback; +static usb_callback_t atausb2_tr_error; static void atausb2_cancel_request(struct atausb2_softc *sc); static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no); Modified: projects/pnet/sys/dev/ata/chipsets/ata-intel.c ============================================================================== --- projects/pnet/sys/dev/ata/chipsets/ata-intel.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/dev/ata/chipsets/ata-intel.c Mon Jun 1 12:29:27 2009 (r193227) @@ -104,9 +104,9 @@ ata_intel_probe(device_t dev) { ATA_I82801GB_S1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, { ATA_I82801GB_R1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, { ATA_I82801GB_AH, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, + { ATA_I82801GBM_S1, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, + { ATA_I82801GBM_R1, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, + { ATA_I82801GBM_AH, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, { ATA_I63XXESB2, 0, 0, 1, ATA_UDMA5, "63XXESB2" }, { ATA_I63XXESB2_S1, 0, INTEL_AHCI, 0, ATA_SA300, "63XXESB2" }, { ATA_I63XXESB2_S2, 0, INTEL_AHCI, 0, ATA_SA300, "63XXESB2" }, Modified: projects/pnet/sys/dev/bge/if_bge.c ============================================================================== --- projects/pnet/sys/dev/bge/if_bge.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/dev/bge/if_bge.c Mon Jun 1 12:29:27 2009 (r193227) @@ -332,7 +332,7 @@ static int bge_get_eaddr_eeprom(struct b static int bge_get_eaddr(struct bge_softc *, uint8_t[]); static void bge_txeof(struct bge_softc *); -static void bge_rxeof(struct bge_softc *); +static int bge_rxeof(struct bge_softc *); static void bge_asf_driver_up (struct bge_softc *); static void bge_tick(void *); @@ -390,7 +390,7 @@ static int bge_miibus_readreg(device_t, static int bge_miibus_writereg(device_t, int, int, int); static void bge_miibus_statchg(device_t); #ifdef DEVICE_POLLING -static void bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); +static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); #endif #define BGE_RESET_START 1 @@ -3050,18 +3050,18 @@ bge_reset(struct bge_softc *sc) * 2) the frame is from the standard receive ring */ -static void +static int bge_rxeof(struct bge_softc *sc) { struct ifnet *ifp; - int stdcnt = 0, jumbocnt = 0; + int rx_npkts = 0, stdcnt = 0, jumbocnt = 0; BGE_LOCK_ASSERT(sc); /* Nothing to do. */ if (sc->bge_rx_saved_considx == sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx) - return; + return (rx_npkts); ifp = sc->bge_ifp; @@ -3193,9 +3193,10 @@ bge_rxeof(struct bge_softc *sc) BGE_UNLOCK(sc); (*ifp->if_input)(ifp, m); BGE_LOCK(sc); + rx_npkts++; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + return (rx_npkts); } if (stdcnt > 0) @@ -3219,6 +3220,7 @@ bge_rxeof(struct bge_softc *sc) if (BGE_IS_5705_PLUS(sc)) ifp->if_ierrors += CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS); #endif + return (rx_npkts); } static void @@ -3271,16 +3273,17 @@ bge_txeof(struct bge_softc *sc) } #ifdef DEVICE_POLLING -static void +static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct bge_softc *sc = ifp->if_softc; uint32_t statusword; - + int rx_npkts = 0; + BGE_LOCK(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { BGE_UNLOCK(sc); - return; + return (rx_npkts); } bus_dmamap_sync(sc->bge_cdata.bge_status_tag, @@ -3303,16 +3306,17 @@ bge_poll(struct ifnet *ifp, enum poll_cm bge_link_upd(sc); sc->rxcycles = count; - bge_rxeof(sc); + rx_npkts = bge_rxeof(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { BGE_UNLOCK(sc); - return; + return (rx_npkts); } bge_txeof(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) bge_start_locked(ifp); BGE_UNLOCK(sc); + return (rx_npkts); } #endif /* DEVICE_POLLING */ Modified: projects/pnet/sys/dev/bwi/if_bwi.c ============================================================================== --- projects/pnet/sys/dev/bwi/if_bwi.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/dev/bwi/if_bwi.c Mon Jun 1 12:29:27 2009 (r193227) @@ -3126,6 +3126,7 @@ bwi_encap_raw(struct bwi_softc *sc, int { struct ifnet *ifp = sc->sc_ifp; struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; struct bwi_ring_data *rd = &sc->sc_tx_rdata[BWI_TX_DATA_RING]; struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; struct bwi_txbuf *tb = &tbd->tbd_buf[idx]; @@ -3152,8 +3153,20 @@ bwi_encap_raw(struct bwi_softc *sc, int * Find TX rate */ rate = params->ibp_rate0; - rate_fb = (params->ibp_try1 != 0) ? - params->ibp_rate1 : params->ibp_rate0; + if (!ieee80211_isratevalid(ic->ic_rt, rate)) { + /* XXX fall back to mcast/mgmt rate? */ + m_freem(m); + return EINVAL; + } + if (params->ibp_try1 != 0) { + rate_fb = params->ibp_rate1; + if (!ieee80211_isratevalid(ic->ic_rt, rate_fb)) { + /* XXX fall back to rate0? */ + m_freem(m); + return EINVAL; + } + } else + rate_fb = rate; tb->tb_rate[0] = rate; tb->tb_rate[1] = rate_fb; sc->sc_tx_rate = rate; Modified: projects/pnet/sys/dev/dc/if_dc.c ============================================================================== --- projects/pnet/sys/dev/dc/if_dc.c Mon Jun 1 12:18:51 2009 (r193226) +++ projects/pnet/sys/dev/dc/if_dc.c Mon Jun 1 12:29:27 2009 (r193227) @@ -236,7 +236,7 @@ static int dc_newbuf(struct dc_softc *, static int dc_encap(struct dc_softc *, struct mbuf **); static void dc_pnic_rx_bug_war(struct dc_softc *, int); static int dc_rx_resync(struct dc_softc *); -static void dc_rxeof(struct dc_softc *); +static int dc_rxeof(struct dc_softc *); static void dc_txeof(struct dc_softc *); static void dc_tick(void *); static void dc_tx_underrun(struct dc_softc *); @@ -2640,19 +2640,21 @@ dc_rx_resync(struct dc_softc *sc) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void +static int dc_rxeof(struct dc_softc *sc) { struct mbuf *m, *m0; struct ifnet *ifp; struct dc_desc *cur_rx; - int i, total_len = 0; + int i, total_len, rx_npkts; u_int32_t rxstat; DC_LOCK_ASSERT(sc); ifp = sc->dc_ifp; i = sc->dc_cdata.dc_rx_prod; + total_len = 0; + rx_npkts = 0; bus_dmamap_sync(sc->dc_ltag, sc->dc_lmap, BUS_DMASYNC_POSTREAD); while (!(le32toh(sc->dc_ldata->dc_rx_list[i].dc_status) & @@ -2706,7 +2708,7 @@ dc_rxeof(struct dc_softc *sc) continue; } else { dc_init_locked(sc); - return; + return (rx_npkts); } } } @@ -2745,9 +2747,11 @@ dc_rxeof(struct dc_softc *sc) DC_UNLOCK(sc); (*ifp->if_input)(ifp, m); DC_LOCK(sc); + rx_npkts++; } sc->dc_cdata.dc_rx_prod = i; + return (rx_npkts); } /* @@ -2989,20 +2993,21 @@ dc_tx_underrun(struct dc_softc *sc) #ifdef DEVICE_POLLING static poll_handler_t dc_poll; -static void +static int dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct dc_softc *sc = ifp->if_softc; + int rx_npkts = 0; DC_LOCK(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { DC_UNLOCK(sc); - return; + return (rx_npkts); } sc->rxcycles = count; - dc_rxeof(sc); + rx_npkts = dc_rxeof(sc); dc_txeof(sc); if (!IFQ_IS_EMPTY(&ifp->if_snd) && !(ifp->if_drv_flags & IFF_DRV_OACTIVE)) @@ -3017,7 +3022,7 @@ dc_poll(struct ifnet *ifp, enum poll_cmd DC_ISR_BUS_ERR); if (!status) { DC_UNLOCK(sc); - return; + return (rx_npkts); } /* ack what we have */ CSR_WRITE_4(sc, DC_ISR, status); @@ -3043,6 +3048,7 @@ dc_poll(struct ifnet *ifp, enum poll_cmd } } DC_UNLOCK(sc); + return (rx_npkts); } #endif /* DEVICE_POLLING */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 17:16:06 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECB501065674 for ; Mon, 1 Jun 2009 17:16:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outO.internet-mail-service.net (outo.internet-mail-service.net [216.240.47.238]) by mx1.freebsd.org (Postfix) with ESMTP id D07B28FC13 for ; Mon, 1 Jun 2009 17:16:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 791BAB647; Mon, 1 Jun 2009 10:01:18 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 272BC2D6017; Mon, 1 Jun 2009 10:01:18 -0700 (PDT) Message-ID: <4A24095D.1020209@elischer.org> Date: Mon, 01 Jun 2009 10:01:17 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Robert Watson References: <200906010903.n5193tai070679@svn.freebsd.org> In-Reply-To: <200906010903.n5193tai070679@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r193212 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 17:16:07 -0000 Robert Watson wrote: > Author: rwatson > Date: Mon Jun 1 09:03:55 2009 > New Revision: 193212 > URL: http://svn.freebsd.org/changeset/base/193212 > > Log: > Add missing VNET setup in the deferred dispatch case. "oooh" goody > > Lock around stats updates in forced direct dispatch mode. > > Modified: > projects/pnet/sys/net/netisr.c > > Modified: projects/pnet/sys/net/netisr.c > ============================================================================== > --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:50:56 2009 (r193211) > +++ projects/pnet/sys/net/netisr.c Mon Jun 1 09:03:55 2009 (r193212) > @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > > #ifdef DDB > #include > @@ -697,7 +698,10 @@ netisr_process_workstream_proto(struct n > if (local_npw.nw_head == NULL) > local_npw.nw_tail = NULL; > local_npw.nw_len--; > + VNET_ASSERT(m->m_pkthdr.rcvif != NULL); > + CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); > np[proto].np_handler(m); > + CURVNET_RESTORE(); > } > KASSERT(local_npw.nw_len == 0, > ("%s(%u): len %u", __func__, proto, local_npw.nw_len)); > @@ -882,13 +886,17 @@ netisr_dispatch_src(u_int proto, uintptr > /* > * If direct dispatch is forced, then unconditionally dispatch > * without a formal CPU selection. Borrow the current CPU's stats, > - * even if there's no worker on it. > + * even if there's no worker on it. In this case we don't update > + * nws_flags because all netisr processing will be source ordered due > + * to always being forced to directly dispatch. > */ > if (netisr_direct_force) { > nwsp = &nws[curcpu]; > npwp = &nwsp->nws_work[proto]; > + NWS_LOCK(nwsp); > npwp->nw_dispatched++; > npwp->nw_handled++; > + NWS_UNLOCK(nwsp); > np[proto].np_handler(m); > error = 0; > goto out_unlock; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 20:41:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C176B1065675; Mon, 1 Jun 2009 20:41:33 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AFF818FC20; Mon, 1 Jun 2009 20:41:33 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51KfXrU091197; Mon, 1 Jun 2009 20:41:33 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51KfXE3091194; Mon, 1 Jun 2009 20:41:33 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906012041.n51KfXE3091194@svn.freebsd.org> From: Rui Paulo Date: Mon, 1 Jun 2009 20:41:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193261 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 20:41:34 -0000 Author: rpaulo Date: Mon Jun 1 20:41:33 2009 New Revision: 193261 URL: http://svn.freebsd.org/changeset/base/193261 Log: Initial try at implementing path discovery from our node. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_hwmp.h projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 20:35:39 2009 (r193260) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 20:41:33 2009 (r193261) @@ -103,15 +103,15 @@ static int ieee80211_hwmp_prepminint = 1 static int ieee80211_hwmp_perrminint = 100; #endif static int ieee80211_hwmp_roottimeout = 5000; -#ifdef notyet static int ieee80211_hwmp_pathtimeout = 5000; +#ifdef notyet static int ieee80211_hwmp_rootmode = 0; /* XXX move to vap */ static int ieee80211_hwmp_pathtoroottimeout = 5000; static int ieee80211_hmwp_rootint = 2000; static int ieee80211_hwmp_rannint = 1000; #endif -static int ieee80211_hwmp_targetonly = 1;/* reply to PREQs automatically */ -static int ieee80211_hwmp_replyforward = 1; /* propagate PREQs */ +static int ieee80211_hwmp_targetonly = 1; +static int ieee80211_hwmp_replyforward = 1; #ifdef notyet static int ieee80211_hwmp_pathmaintenance = 2000; static int ieee80211_hwmp_confirmint = 2000; @@ -131,9 +131,9 @@ SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, C SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, maxhops, CTLTYPE_INT | CTLFLAG_RW, &ieee80211_hwmp_maxhops, 0, "Maximum number of hops for paths"); SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, targetonly, CTLTYPE_INT | CTLFLAG_RW, - &ieee80211_hwmp_targetonly, 0, "TBD"); + &ieee80211_hwmp_targetonly, 0, "Set TO bit on generated PREQs"); SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, replyforward, CTLTYPE_INT | CTLFLAG_RW, - &ieee80211_hwmp_replyforward, 0, "TBD"); + &ieee80211_hwmp_replyforward, 0, "Set RF bit on generated PREQs"); #ifdef notyet SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, rootmode, CTLTYPE_INT | CTLFLAG_RW, &ieee80211_hwmp_rootmode, 0, "0 = Not a Root, " @@ -827,6 +827,73 @@ hwmp_send_rann(struct ieee80211_node *ni sizeof(*rann)); } +#define PREQ_TFLAGS(n) preq.preq_targets[n].target_flags +#define PREQ_TADDR(n) preq.preq_targets[n].target_addr +#define PREQ_TSEQ(n) preq.preq_targets[n].target_seq +struct ieee80211_node * +ieee80211_hwmp_discover_dest(struct ieee80211vap *vap, + uint8_t dest[IEEE80211_ADDR_LEN]) +{ + struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + struct ieee80211_hwmp_fi *fi = NULL; + static const uint8_t invalidaddr[] = { 0, 0, 0, 0, 0, 0 }; + struct ieee80211_meshpreq_ie preq; + int sendpreq = 0, unknowndst = 0; + + KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, + ("not a mesh vap, opmode %d", vap->iv_opmode)); + + mtx_lock(&hs->hs_lock); + TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { + if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) { + if (IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { + /* XXX check preq retries */ + sendpreq = 1; + unknowndst = 1; + break; + } + } + } + mtx_unlock(&hs->hs_lock); + + if (sendpreq) { + /* + * Try to discover the path for this + * node. + */ + preq.preq_hopcount = 0; + preq.preq_ttl = ieee80211_mesh_ttl; + preq.preq_id = ++hs->hs_preqid; + IEEE80211_ADDR_COPY(preq.preq_origaddr, + vap->iv_myaddr); + preq.preq_origseq = ++hs->hs_seq; + preq.preq_lifetime = + ieee80211_hwmp_pathtimeout; + preq.preq_metric = + IEEE80211_MESHLMETRIC_INITIALVAL; + preq.preq_tcount = 1; + IEEE80211_ADDR_COPY(PREQ_TADDR(0), dest); + if (ieee80211_hwmp_targetonly) + PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_TO; + if (ieee80211_hwmp_replyforward) + PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_RF; + if (unknowndst) + PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_USN; + else + PREQ_TSEQ(0) = fi->fi_seq; + hwmp_send_preq(vap->iv_bss, vap->iv_myaddr, broadcastaddr, + &preq); + } else + return ieee80211_find_txnode(vap, fi->fi_nexthop); + + /* XXX */ + return vap->iv_bss; +} +#undef PREQ_TFLAGS +#undef PREQ_TADDR +#undef PREQ_TSEQ + + static int hwmp_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 20:35:39 2009 (r193260) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 20:41:33 2009 (r193261) @@ -48,14 +48,18 @@ struct ieee80211_hwmp_fi { #ifdef _KERNEL struct ieee80211_hwmp_state { TAILQ_HEAD(, ieee80211_hwmp_fi) hs_head; - ieee80211_seq hs_seq; /* next seq to be used */ - struct mtx hs_lock; /* lock for the fi table */ + ieee80211_seq hs_seq; /* next seq to be used */ + ieee80211_seq hs_preqid; /* next PREQ ID to be used */ + struct mtx hs_lock; /* lock for the fi table */ }; void ieee80211_hwmp_vattach(struct ieee80211vap *); void ieee80211_hwmp_vdetach(struct ieee80211vap *); void ieee80211_hwmp_recv_action(struct ieee80211vap *, struct ieee80211_node *, struct mbuf *); +struct ieee80211_node * + ieee80211_hwmp_discover_dest(struct ieee80211vap *, + uint8_t [IEEE80211_ADDR_LEN]); #endif /* _KERNEL */ #endif /* _NET80211_IEEE80211_HWMP_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Mon Jun 1 20:35:39 2009 (r193260) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Mon Jun 1 20:41:33 2009 (r193261) @@ -207,7 +207,10 @@ ieee80211_start(struct ifnet *ifp) } } - ni = ieee80211_find_txnode(vap, eh->ether_dhost); + if (vap->iv_opmode == IEEE80211_M_MBSS) + ni = ieee80211_hwmp_discover_dest(vap, eh->ether_dhost); + else + ni = ieee80211_find_txnode(vap, eh->ether_dhost); if (ni == NULL) { /* NB: ieee80211_find_txnode does stat+msg */ ifp->if_oerrors++; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 21:10:19 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90EC9106573B; Mon, 1 Jun 2009 21:10:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65AE98FC1D; Mon, 1 Jun 2009 21:10:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51LAJEj092176; Mon, 1 Jun 2009 21:10:19 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51LAJUK092172; Mon, 1 Jun 2009 21:10:19 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906012110.n51LAJUK092172@svn.freebsd.org> From: Rui Paulo Date: Mon, 1 Jun 2009 21:10:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193269 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:10:19 -0000 Author: rpaulo Date: Mon Jun 1 21:10:19 2009 New Revision: 193269 URL: http://svn.freebsd.org/changeset/base/193269 Log: Rename discover function. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_hwmp.h projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 21:07:54 2009 (r193268) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Mon Jun 1 21:10:19 2009 (r193269) @@ -831,7 +831,7 @@ hwmp_send_rann(struct ieee80211_node *ni #define PREQ_TADDR(n) preq.preq_targets[n].target_addr #define PREQ_TSEQ(n) preq.preq_targets[n].target_seq struct ieee80211_node * -ieee80211_hwmp_discover_dest(struct ieee80211vap *vap, +ieee80211_hwmp_discover(struct ieee80211vap *vap, uint8_t dest[IEEE80211_ADDR_LEN]) { struct ieee80211_hwmp_state *hs = vap->iv_hwmp; Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 21:07:54 2009 (r193268) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h Mon Jun 1 21:10:19 2009 (r193269) @@ -58,7 +58,7 @@ void ieee80211_hwmp_vdetach(struct ieee void ieee80211_hwmp_recv_action(struct ieee80211vap *, struct ieee80211_node *, struct mbuf *); struct ieee80211_node * - ieee80211_hwmp_discover_dest(struct ieee80211vap *, + ieee80211_hwmp_discover(struct ieee80211vap *, uint8_t [IEEE80211_ADDR_LEN]); #endif /* _KERNEL */ Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Mon Jun 1 21:07:54 2009 (r193268) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Mon Jun 1 21:10:19 2009 (r193269) @@ -208,7 +208,7 @@ ieee80211_start(struct ifnet *ifp) } } if (vap->iv_opmode == IEEE80211_M_MBSS) - ni = ieee80211_hwmp_discover_dest(vap, eh->ether_dhost); + ni = ieee80211_hwmp_discover(vap, eh->ether_dhost); else ni = ieee80211_find_txnode(vap, eh->ether_dhost); if (ni == NULL) { From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 21:38:44 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71A1610656DF; Mon, 1 Jun 2009 21:38:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 46BB38FC1B; Mon, 1 Jun 2009 21:38:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51LciVV093109; Mon, 1 Jun 2009 21:38:44 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51Lcitr093108; Mon, 1 Jun 2009 21:38:44 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906012138.n51Lcitr093108@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 1 Jun 2009 21:38:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193276 - projects/acpica_20090521 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:38:44 -0000 Author: jkim Date: Mon Jun 1 21:38:44 2009 New Revision: 193276 URL: http://svn.freebsd.org/changeset/base/193276 Log: Create a project tree for ACPICA 20090521 merge. Added: projects/acpica_20090521/ (props changed) - copied from r193275, head/ From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 22:34:09 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64171106566B; Mon, 1 Jun 2009 22:34:09 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 539328FC1E; Mon, 1 Jun 2009 22:34:09 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51MY9sF094775; Mon, 1 Jun 2009 22:34:09 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51MY9p4094774; Mon, 1 Jun 2009 22:34:09 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <200906012234.n51MY9p4094774@svn.freebsd.org> From: Brooks Davis Date: Mon, 1 Jun 2009 22:34:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193284 - projects/ngroups/sys/sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 22:34:09 -0000 Author: brooks Date: Mon Jun 1 22:34:09 2009 New Revision: 193284 URL: http://svn.freebsd.org/changeset/base/193284 Log: Increase NGROUPS_MAX to 32767. Modified: projects/ngroups/sys/sys/syslimits.h Modified: projects/ngroups/sys/sys/syslimits.h ============================================================================== --- projects/ngroups/sys/sys/syslimits.h Mon Jun 1 22:14:45 2009 (r193283) +++ projects/ngroups/sys/sys/syslimits.h Mon Jun 1 22:34:09 2009 (r193284) @@ -54,7 +54,7 @@ #define MAX_CANON 255 /* max bytes in term canon input line */ #define MAX_INPUT 255 /* max bytes in terminal input */ #define NAME_MAX 255 /* max bytes in a file name */ -#define NGROUPS_MAX 16 /* max supplemental group id's */ +#define NGROUPS_MAX 32767 /* max supplemental group id's */ #ifndef OPEN_MAX #define OPEN_MAX 64 /* max open files per process */ #endif From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 18:03:38 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9464A106566B; Tue, 2 Jun 2009 18:03:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6976C8FC18; Tue, 2 Jun 2009 18:03:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52I3cCD023690; Tue, 2 Jun 2009 18:03:38 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52I3cs9023689; Tue, 2 Jun 2009 18:03:38 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906021803.n52I3cs9023689@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 18:03:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193328 - projects/clangbsd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 18:03:38 -0000 Author: ed Date: Tue Jun 2 18:03:38 2009 New Revision: 193328 URL: http://svn.freebsd.org/changeset/base/193328 Log: Create the ClangBSD branch. Added: projects/clangbsd/ (props changed) - copied from r193327, head/ From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 18:05:51 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DFAB106566C; Tue, 2 Jun 2009 18:05:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 62E038FC18; Tue, 2 Jun 2009 18:05:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52I5pGW023848; Tue, 2 Jun 2009 18:05:51 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52I5ptf023847; Tue, 2 Jun 2009 18:05:51 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906021805.n52I5ptf023847@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 18:05:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193329 - projects/clangbsd/contrib/llvm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 18:05:51 -0000 Author: ed Date: Tue Jun 2 18:05:51 2009 New Revision: 193329 URL: http://svn.freebsd.org/changeset/base/193329 Log: Give us LLVM. Added: projects/clangbsd/contrib/llvm/ - copied from r193328, vendor/llvm/dist/ From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 18:06:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6CEA1065670; Tue, 2 Jun 2009 18:06:41 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B8048FC13; Tue, 2 Jun 2009 18:06:41 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52I6fir023903; Tue, 2 Jun 2009 18:06:41 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52I6fMX023902; Tue, 2 Jun 2009 18:06:41 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906021806.n52I6fMX023902@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 18:06:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193330 - projects/clangbsd/contrib/llvm/tools/clang X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 18:06:42 -0000 Author: ed Date: Tue Jun 2 18:06:41 2009 New Revision: 193330 URL: http://svn.freebsd.org/changeset/base/193330 Log: Give us Clang! Added: projects/clangbsd/contrib/llvm/tools/clang/ - copied from r193329, vendor/clang/dist/ From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 18:53:22 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0273A106564A; Tue, 2 Jun 2009 18:53:22 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E07F18FC17; Tue, 2 Jun 2009 18:53:21 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52IrLmb025132; Tue, 2 Jun 2009 18:53:21 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52IrLT1025123; Tue, 2 Jun 2009 18:53:21 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906021853.n52IrLT1025123@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 18:53:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193335 - in projects/acpica_20090521/sys/contrib/dev/acpica: . common compiler debugger disassembler dispatcher events executer hardware include namespace parser resources tables tools... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 18:53:22 -0000 Author: jkim Date: Tue Jun 2 18:53:21 2009 New Revision: 193335 URL: http://svn.freebsd.org/changeset/base/193335 Log: MFV: ACPICA 20090521 Added: projects/acpica_20090521/sys/contrib/dev/acpica/changes.txt - copied unchanged from r193331, vendor-sys/acpica/dist/changes.txt projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstartup.c - copied unchanged from r193331, vendor-sys/acpica/dist/compiler/aslstartup.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/ - copied from r193331, vendor-sys/acpica/dist/debugger/ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/ - copied from r193331, vendor-sys/acpica/dist/disassembler/ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/ - copied from r193331, vendor-sys/acpica/dist/dispatcher/ projects/acpica_20090521/sys/contrib/dev/acpica/events/ - copied from r193331, vendor-sys/acpica/dist/events/ projects/acpica_20090521/sys/contrib/dev/acpica/executer/ - copied from r193331, vendor-sys/acpica/dist/executer/ projects/acpica_20090521/sys/contrib/dev/acpica/hardware/ - copied from r193331, vendor-sys/acpica/dist/hardware/ projects/acpica_20090521/sys/contrib/dev/acpica/include/ - copied from r193331, vendor-sys/acpica/dist/include/ projects/acpica_20090521/sys/contrib/dev/acpica/namespace/ - copied from r193331, vendor-sys/acpica/dist/namespace/ projects/acpica_20090521/sys/contrib/dev/acpica/parser/ - copied from r193331, vendor-sys/acpica/dist/parser/ projects/acpica_20090521/sys/contrib/dev/acpica/resources/ - copied from r193331, vendor-sys/acpica/dist/resources/ projects/acpica_20090521/sys/contrib/dev/acpica/tables/ - copied from r193331, vendor-sys/acpica/dist/tables/ projects/acpica_20090521/sys/contrib/dev/acpica/tools/ - copied from r193331, vendor-sys/acpica/dist/tools/ projects/acpica_20090521/sys/contrib/dev/acpica/utilities/ - copied from r193331, vendor-sys/acpica/dist/utilities/ Deleted: projects/acpica_20090521/sys/contrib/dev/acpica/CHANGES.txt projects/acpica_20090521/sys/contrib/dev/acpica/acapps.h projects/acpica_20090521/sys/contrib/dev/acpica/acconfig.h projects/acpica_20090521/sys/contrib/dev/acpica/acdebug.h projects/acpica_20090521/sys/contrib/dev/acpica/acdisasm.h projects/acpica_20090521/sys/contrib/dev/acpica/acdispat.h projects/acpica_20090521/sys/contrib/dev/acpica/acefi.h projects/acpica_20090521/sys/contrib/dev/acpica/acenv.h projects/acpica_20090521/sys/contrib/dev/acpica/acevents.h projects/acpica_20090521/sys/contrib/dev/acpica/acexcep.h projects/acpica_20090521/sys/contrib/dev/acpica/acfreebsd.h projects/acpica_20090521/sys/contrib/dev/acpica/acgcc.h projects/acpica_20090521/sys/contrib/dev/acpica/acglobal.h projects/acpica_20090521/sys/contrib/dev/acpica/achware.h projects/acpica_20090521/sys/contrib/dev/acpica/acinterp.h projects/acpica_20090521/sys/contrib/dev/acpica/aclocal.h projects/acpica_20090521/sys/contrib/dev/acpica/acmacros.h projects/acpica_20090521/sys/contrib/dev/acpica/acnames.h projects/acpica_20090521/sys/contrib/dev/acpica/acnamesp.h projects/acpica_20090521/sys/contrib/dev/acpica/acobject.h projects/acpica_20090521/sys/contrib/dev/acpica/acopcode.h projects/acpica_20090521/sys/contrib/dev/acpica/acoutput.h projects/acpica_20090521/sys/contrib/dev/acpica/acparser.h projects/acpica_20090521/sys/contrib/dev/acpica/acpi.h projects/acpica_20090521/sys/contrib/dev/acpica/acpiosxf.h projects/acpica_20090521/sys/contrib/dev/acpica/acpixf.h projects/acpica_20090521/sys/contrib/dev/acpica/acresrc.h projects/acpica_20090521/sys/contrib/dev/acpica/acstruct.h projects/acpica_20090521/sys/contrib/dev/acpica/actables.h projects/acpica_20090521/sys/contrib/dev/acpica/actbl.h projects/acpica_20090521/sys/contrib/dev/acpica/actbl1.h projects/acpica_20090521/sys/contrib/dev/acpica/actbl2.h projects/acpica_20090521/sys/contrib/dev/acpica/actypes.h projects/acpica_20090521/sys/contrib/dev/acpica/acutils.h projects/acpica_20090521/sys/contrib/dev/acpica/aecommon.h projects/acpica_20090521/sys/contrib/dev/acpica/amlcode.h projects/acpica_20090521/sys/contrib/dev/acpica/amlresrc.h projects/acpica_20090521/sys/contrib/dev/acpica/dbcmds.c projects/acpica_20090521/sys/contrib/dev/acpica/dbdisply.c projects/acpica_20090521/sys/contrib/dev/acpica/dbexec.c projects/acpica_20090521/sys/contrib/dev/acpica/dbfileio.c projects/acpica_20090521/sys/contrib/dev/acpica/dbhistry.c projects/acpica_20090521/sys/contrib/dev/acpica/dbinput.c projects/acpica_20090521/sys/contrib/dev/acpica/dbstats.c projects/acpica_20090521/sys/contrib/dev/acpica/dbutils.c projects/acpica_20090521/sys/contrib/dev/acpica/dbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/dmbuffer.c projects/acpica_20090521/sys/contrib/dev/acpica/dmnames.c projects/acpica_20090521/sys/contrib/dev/acpica/dmobject.c projects/acpica_20090521/sys/contrib/dev/acpica/dmopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/dmresrc.c projects/acpica_20090521/sys/contrib/dev/acpica/dmresrcl.c projects/acpica_20090521/sys/contrib/dev/acpica/dmresrcs.c projects/acpica_20090521/sys/contrib/dev/acpica/dmutils.c projects/acpica_20090521/sys/contrib/dev/acpica/dmwalk.c projects/acpica_20090521/sys/contrib/dev/acpica/dsfield.c projects/acpica_20090521/sys/contrib/dev/acpica/dsinit.c projects/acpica_20090521/sys/contrib/dev/acpica/dsmethod.c projects/acpica_20090521/sys/contrib/dev/acpica/dsmthdat.c projects/acpica_20090521/sys/contrib/dev/acpica/dsobject.c projects/acpica_20090521/sys/contrib/dev/acpica/dsopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/dsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/dswexec.c projects/acpica_20090521/sys/contrib/dev/acpica/dswload.c projects/acpica_20090521/sys/contrib/dev/acpica/dswscope.c projects/acpica_20090521/sys/contrib/dev/acpica/dswstate.c projects/acpica_20090521/sys/contrib/dev/acpica/evevent.c projects/acpica_20090521/sys/contrib/dev/acpica/evgpe.c projects/acpica_20090521/sys/contrib/dev/acpica/evgpeblk.c projects/acpica_20090521/sys/contrib/dev/acpica/evmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/evregion.c projects/acpica_20090521/sys/contrib/dev/acpica/evrgnini.c projects/acpica_20090521/sys/contrib/dev/acpica/evsci.c projects/acpica_20090521/sys/contrib/dev/acpica/evxface.c projects/acpica_20090521/sys/contrib/dev/acpica/evxfevnt.c projects/acpica_20090521/sys/contrib/dev/acpica/evxfregn.c projects/acpica_20090521/sys/contrib/dev/acpica/exconfig.c projects/acpica_20090521/sys/contrib/dev/acpica/exconvrt.c projects/acpica_20090521/sys/contrib/dev/acpica/excreate.c projects/acpica_20090521/sys/contrib/dev/acpica/exdump.c projects/acpica_20090521/sys/contrib/dev/acpica/exfield.c projects/acpica_20090521/sys/contrib/dev/acpica/exfldio.c projects/acpica_20090521/sys/contrib/dev/acpica/exmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/exmutex.c projects/acpica_20090521/sys/contrib/dev/acpica/exnames.c projects/acpica_20090521/sys/contrib/dev/acpica/exoparg1.c projects/acpica_20090521/sys/contrib/dev/acpica/exoparg2.c projects/acpica_20090521/sys/contrib/dev/acpica/exoparg3.c projects/acpica_20090521/sys/contrib/dev/acpica/exoparg6.c projects/acpica_20090521/sys/contrib/dev/acpica/exprep.c projects/acpica_20090521/sys/contrib/dev/acpica/exregion.c projects/acpica_20090521/sys/contrib/dev/acpica/exresnte.c projects/acpica_20090521/sys/contrib/dev/acpica/exresolv.c projects/acpica_20090521/sys/contrib/dev/acpica/exresop.c projects/acpica_20090521/sys/contrib/dev/acpica/exstore.c projects/acpica_20090521/sys/contrib/dev/acpica/exstoren.c projects/acpica_20090521/sys/contrib/dev/acpica/exstorob.c projects/acpica_20090521/sys/contrib/dev/acpica/exsystem.c projects/acpica_20090521/sys/contrib/dev/acpica/exutils.c projects/acpica_20090521/sys/contrib/dev/acpica/hwacpi.c projects/acpica_20090521/sys/contrib/dev/acpica/hwgpe.c projects/acpica_20090521/sys/contrib/dev/acpica/hwregs.c projects/acpica_20090521/sys/contrib/dev/acpica/hwsleep.c projects/acpica_20090521/sys/contrib/dev/acpica/hwtimer.c projects/acpica_20090521/sys/contrib/dev/acpica/nsaccess.c projects/acpica_20090521/sys/contrib/dev/acpica/nsalloc.c projects/acpica_20090521/sys/contrib/dev/acpica/nsdump.c projects/acpica_20090521/sys/contrib/dev/acpica/nsdumpdv.c projects/acpica_20090521/sys/contrib/dev/acpica/nseval.c projects/acpica_20090521/sys/contrib/dev/acpica/nsinit.c projects/acpica_20090521/sys/contrib/dev/acpica/nsload.c projects/acpica_20090521/sys/contrib/dev/acpica/nsnames.c projects/acpica_20090521/sys/contrib/dev/acpica/nsobject.c projects/acpica_20090521/sys/contrib/dev/acpica/nsparse.c projects/acpica_20090521/sys/contrib/dev/acpica/nssearch.c projects/acpica_20090521/sys/contrib/dev/acpica/nsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/nswalk.c projects/acpica_20090521/sys/contrib/dev/acpica/nsxfeval.c projects/acpica_20090521/sys/contrib/dev/acpica/nsxfname.c projects/acpica_20090521/sys/contrib/dev/acpica/nsxfobj.c projects/acpica_20090521/sys/contrib/dev/acpica/psargs.c projects/acpica_20090521/sys/contrib/dev/acpica/psloop.c projects/acpica_20090521/sys/contrib/dev/acpica/psopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/psparse.c projects/acpica_20090521/sys/contrib/dev/acpica/psscope.c projects/acpica_20090521/sys/contrib/dev/acpica/pstree.c projects/acpica_20090521/sys/contrib/dev/acpica/psutils.c projects/acpica_20090521/sys/contrib/dev/acpica/pswalk.c projects/acpica_20090521/sys/contrib/dev/acpica/psxface.c projects/acpica_20090521/sys/contrib/dev/acpica/rsaddr.c projects/acpica_20090521/sys/contrib/dev/acpica/rscalc.c projects/acpica_20090521/sys/contrib/dev/acpica/rscreate.c projects/acpica_20090521/sys/contrib/dev/acpica/rsdump.c projects/acpica_20090521/sys/contrib/dev/acpica/rsinfo.c projects/acpica_20090521/sys/contrib/dev/acpica/rsio.c projects/acpica_20090521/sys/contrib/dev/acpica/rsirq.c projects/acpica_20090521/sys/contrib/dev/acpica/rslist.c projects/acpica_20090521/sys/contrib/dev/acpica/rsmemory.c projects/acpica_20090521/sys/contrib/dev/acpica/rsmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/rsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/rsxface.c projects/acpica_20090521/sys/contrib/dev/acpica/tbfadt.c projects/acpica_20090521/sys/contrib/dev/acpica/tbfind.c projects/acpica_20090521/sys/contrib/dev/acpica/tbinstal.c projects/acpica_20090521/sys/contrib/dev/acpica/tbutils.c projects/acpica_20090521/sys/contrib/dev/acpica/tbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/tbxfroot.c projects/acpica_20090521/sys/contrib/dev/acpica/utalloc.c projects/acpica_20090521/sys/contrib/dev/acpica/utcache.c projects/acpica_20090521/sys/contrib/dev/acpica/utclib.c projects/acpica_20090521/sys/contrib/dev/acpica/utcopy.c projects/acpica_20090521/sys/contrib/dev/acpica/utdebug.c projects/acpica_20090521/sys/contrib/dev/acpica/utdelete.c projects/acpica_20090521/sys/contrib/dev/acpica/uteval.c projects/acpica_20090521/sys/contrib/dev/acpica/utglobal.c projects/acpica_20090521/sys/contrib/dev/acpica/utinit.c projects/acpica_20090521/sys/contrib/dev/acpica/utmath.c projects/acpica_20090521/sys/contrib/dev/acpica/utmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/utmutex.c projects/acpica_20090521/sys/contrib/dev/acpica/utobject.c projects/acpica_20090521/sys/contrib/dev/acpica/utresrc.c projects/acpica_20090521/sys/contrib/dev/acpica/utstate.c projects/acpica_20090521/sys/contrib/dev/acpica/uttrack.c projects/acpica_20090521/sys/contrib/dev/acpica/utxface.c Modified: projects/acpica_20090521/sys/contrib/dev/acpica/ (props changed) projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh projects/acpica_20090521/sys/contrib/dev/acpica/common/adfile.c projects/acpica_20090521/sys/contrib/dev/acpica/common/adisasm.c projects/acpica_20090521/sys/contrib/dev/acpica/common/adwalk.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmrestag.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtable.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbdump.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbinfo.c projects/acpica_20090521/sys/contrib/dev/acpica/common/getopt.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompile.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asldefine.h projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslerror.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfiles.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfold.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslglobal.h projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllength.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllisting.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslload.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllookup.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmain.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmap.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asloperands.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopt.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslresource.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstubs.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltransform.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltree.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltypes.h projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslutils.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbcmds.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwsleep.c projects/acpica_20090521/sys/contrib/dev/acpica/osunixxf.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utmisc.c Modified: projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh Tue Jun 2 18:31:08 2009 (r193334) +++ projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh Tue Jun 2 18:53:21 2009 (r193335) @@ -10,33 +10,34 @@ if [ ! $# -eq 1 ]; then fi src=$1 -wrk=./_acpi_ca_unpack -dst=./acpi_ca_destination +wrk=`realpath ./_acpi_ca_unpack` +dst=`realpath ./acpi_ca_destination` # files that should keep their full directory path -fulldirs="common compiler" +fulldirs="common compiler debugger disassembler dispatcher events \ + executer hardware include namespace parser resources tables \ + tools utilities" + # files to remove -stripdirs="generate acpisrc" -stripfiles="16bit.h Makefile README a16find.c a16utils.asm a16utils.obj \ - acdos16.h acintel.h aclinux.h acmsvc.h acnetbsd.h acpixtract.c \ - acwin.h acwin64.h aeexec.c aemain.c osdosxf.c osunixdir.c \ - oswindir.c oswinxf.c readme.txt" +stripdirs="acpisrc generate os_specific" +stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \ + acos2.h acpixtract.c accygwin.h acefi.h acwin.h acwin64.h \ + aeexec.c aehandlers.c aemain.c aetables.c examples.c \ + osunixdir.c oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c" + # include files to canonify -src_headers="acapps.h acconfig.h acdebug.h acdisasm.h acdispat.h \ - acenv.h acevents.h acexcep.h acfreebsd.h acgcc.h acglobal.h \ - achware.h acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h \ - acobject.h acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h \ - acpixf.h acresrc.h acstruct.h actables.h actbl.h actbl1.h \ - actbl2.h actypes.h acutils.h aecommon.h amlcode.h amlresrc.h" +src_headers="acapps.h accommon.h acconfig.h acdebug.h acdisasm.h \ + acdispat.h acevents.h acexcep.h acglobal.h achware.h acinterp.h \ + aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h \ + acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h \ + acresrc.h acrestyp.h acstruct.h actables.h actbl.h actbl1.h \ + actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h \ + platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h" - -# files to update paths in -src_update_files="acpi.h acpiosxf.h" # pre-clean echo pre-clean -rm -rf ${wrk} -rm -rf ${dst} +rm -rf ${wrk} ${dst} mkdir -p ${wrk} mkdir -p ${dst} @@ -53,27 +54,18 @@ for i in ${stripfiles}; do find ${wrk} -name ${i} -type f -delete done +# copy files echo copying full dirs for i in ${fulldirs}; do find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst} done - -# move files to destination -echo copying flat dirs +echo copying remaining files find ${wrk} -type f | xargs -J % mv % ${dst} -mv ${dst}/changes.txt ${dst}/CHANGES.txt - -# update src/headers for appropriate paths -echo updating paths -for i in ${src_update_files}; do - i=${dst}/$i - sed -e 's/platform\///' $i > $i.new && mv $i.new $i -done # canonify include paths for H in ${src_headers}; do find ${dst} -name "*.[chy]" -type f | \ - xargs sed -i "" -e "s|[\"<]$H[\">]|\|g" + xargs sed -i "" -e "s|[\"<]$H[\">]|\|g" done for H in ${comp_headers}; do find ${dst}/compiler -name "*.[chly]" -type f | \ Copied: projects/acpica_20090521/sys/contrib/dev/acpica/changes.txt (from r193331, vendor-sys/acpica/dist/changes.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/acpica_20090521/sys/contrib/dev/acpica/changes.txt Tue Jun 2 18:53:21 2009 (r193335, copy of r193331, vendor-sys/acpica/dist/changes.txt) @@ -0,0 +1,9235 @@ +---------------------------------------- +21 May 2009. Summary of changes for version 20090521: + +This release is available at www.acpica.org/downloads + +1) ACPI CA Core Subsystem: + +Disabled the preservation of the SCI enable bit in the PM1 control register. +The SCI enable bit (bit 0, SCI_EN) is defined by the ACPI specification to be +a "preserved" bit - "OSPM always preserves this bit position", section +4.7.3.2.1. However, some machines fail if this bit is in fact preserved +because the bit needs to be explicitly set by the OS as a workaround. No +machines fail if the bit is not preserved. Therefore, ACPICA no longer +attempts to preserve this bit. + +Fixed a problem in AcpiRsGetPciRoutingTableLength where an invalid or +incorrectly formed _PRT package could cause a fault. Added validation to +ensure that each package element is actually a sub-package. + +Implemented a new interface to install or override a single control method, +AcpiInstallMethod. This interface is useful when debugging in order to repair +an existing method or to install a missing method without having to override +the entire ACPI table. See the ACPICA Programmer Reference for use and +examples. Lin Ming, Bob Moore. + +Fixed several reference count issues with the DdbHandle object that is +created from a Load or LoadTable operator. Prevent premature deletion of the +object. Also, mark the object as invalid once the table has been unloaded. +This is needed because the handle itself may not be deleted after the table +unload, depending on whether it has been stored in a named object by the +caller. Lin Ming. + +Fixed a problem with Mutex Sync Levels. Fixed a problem where if multiple +mutexes of the same sync level are acquired but then not released in strict +opposite order, the internally maintained Current Sync Level becomes confused +and can cause subsequent execution errors. ACPICA BZ 471. + +Changed the allowable release order for ASL mutex objects. The ACPI 4.0 +specification has been changed to make the SyncLevel for mutex objects more +useful. When releasing a mutex, the SyncLevel of the mutex must now be the +same as the current sync level. This makes more sense than the previous rule +(SyncLevel less than or equal). This change updates the code to match the +specification. + +Fixed a problem with the local version of the AcpiOsPurgeCache function. The +(local) cache must be locked during all cache object deletions. Andrew +Baumann. + +Updated the Load operator to use operation region interfaces. This replaces +direct memory mapping with region access calls. Now, all region accesses go +through the installed region handler as they should. + +Simplified and optimized the NsGetNextNode function. Reduced parameter count +and reduced code for this frequently used function. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 82.8K Code, 17.5K Data, 100.3K Total + Debug Version: 158.0K Code, 49.9K Data, 207.9K Total + Current Release: + Non-Debug Version: 83.4K Code, 17.5K Data, 100.9K Total + Debug Version: 158.9K Code, 50.0K Data, 208.9K Total + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: Fixed some issues with DMAR, HEST, MADT tables. Some problems +with sub-table disassembly and handling invalid sub-tables. Attempt recovery +after an invalid sub-table ID. + +---------------------------------------- +22 April 2009. Summary of changes for version 20090422: + +This release is available at www.acpica.org/downloads + +1) ACPI CA Core Subsystem: + +Fixed a compatibility issue with the recently released I/O port protection +mechanism. For windows compatibility, 1) On a port protection violation, +simply ignore the request and do not return an exception (allow the control +method to continue execution.) 2) If only part of the request overlaps a +protected port, read/write the individual ports that are not protected. Linux +BZ 13036. Lin Ming + +Enhanced the execution of the ASL/AML BreakPoint operator so that it actually +breaks into the AML debugger if the debugger is present. This matches the +ACPI-defined behavior. + +Fixed several possible warnings related to the use of the configurable +ACPI_THREAD_ID. This type can now be configured as either an integer or a +pointer with no warnings. Also fixes several warnings in printf-like +statements for the 64-bit build when the type is configured as a pointer. +ACPICA BZ 766, 767. + +Fixed a number of possible warnings when compiling with gcc 4+ (depending on +warning options.) Examples include printf formats, aliasing, unused globals, +missing prototypes, missing switch default statements, use of non-ANSI +library functions, use of non-ANSI constructs. See generate/unix/Makefile for +a list of warning options used with gcc 3 and 4. ACPICA BZ 735. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 82.6K Code, 17.6K Data, 100.2K Total + Debug Version: 157.7K Code, 49.9K Data, 207.6K Total + Current Release: + Non-Debug Version: 82.8K Code, 17.5K Data, 100.3K Total + Debug Version: 158.0K Code, 49.9K Data, 207.9K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Fixed a generation warning from Bison 2.3 and fixed several warnings on +the 64-bit build. + +iASL: Fixed a problem where the Unix/Linux versions of the compiler could not +correctly digest Windows/DOS formatted files (with CR/LF). + +iASL: Added a new option for "quiet mode" (-va) that produces only the +compilation summary, not individual errors and warnings. Useful for large +batch compilations. + +AcpiExec: Implemented a new option (-z) to enable a forced semaphore/mutex +timeout that can be used to detect hang conditions during execution of AML +code (includes both internal semaphores and AML-defined mutexes and events.) + +Added new makefiles for the generation of acpica in a generic unix-like +environment. These makefiles are intended to generate the acpica tools and +utilities from the original acpica git source tree structure. + +Test Suites: Updated and cleaned up the documentation files. Updated the +copyrights to 2009, affecting all source files. Use the new version of iASL +with quiet mode. Increased the number of available semaphores in the Windows +OSL, allowing the aslts to execute fully on Windows. For the Unix OSL, added +an alternate implementation of the semaphore timeout to allow aslts to +execute fully on Cygwin. + +---------------------------------------- +20 March 2009. Summary of changes for version 20090320: + +1) ACPI CA Core Subsystem: + +Fixed a possible race condition between AcpiWalkNamespace and dynamic table +unloads. Added a reader/writer locking mechanism to allow multiple concurrent +namespace walks (readers), but block a dynamic table unload until it can gain +exclusive write access to the namespace. This fixes a problem where a table +unload could (possibly catastrophically) delete the portion of the namespace +that is currently being examined by a walk. Adds a new file, utlock.c, that +implements the reader/writer lock mechanism. ACPICA BZ 749. + +Fixed a regression introduced in version 20090220 where a change to the FADT +handling could cause the ACPICA subsystem to access non-existent I/O ports. + +Modified the handling of FADT register and table (FACS/DSDT) addresses. The +FADT can contain both 32-bit and 64-bit versions of these addresses. +Previously, the 64-bit versions were favored, meaning that if both 32 and 64 +versions were valid, but not equal, the 64-bit version was used. This was +found to cause some machines to fail. Now, in this case, the 32-bit version +is used instead. This now matches the Windows behavior. + +Implemented a new mechanism to protect certain I/O ports. Provides Microsoft +compatibility and protects the standard PC I/O ports from access via AML +code. Adds a new file, hwvalid.c + +Fixed a possible extraneous warning message from the FADT support. The +message warns of a 32/64 length mismatch between the legacy and GAS +definitions for a register. + +Removed the obsolete AcpiOsValidateAddress OSL interface. This interface is +made obsolete by the port protection mechanism above. It was previously used +to validate the entire address range of an operation region, which could be +incorrect if the range included illegal ports, but fields within the +operation region did not actually access those ports. Validation is now +performed on a per-field basis instead of the entire region. + +Modified the handling of the PM1 Status Register ignored bit (bit 11.) +Ignored bits must be "preserved" according to the ACPI spec. Usually, this +means a read/modify/write when writing to the register. However, for status +registers, writing a one means clear the event. Writing a zero means preserve +the event (do not clear.) This behavior is clarified in the ACPI 4.0 spec, +and the ACPICA code now simply always writes a zero to the ignored bit. + +Modified the handling of ignored bits for the PM1 A/B Control Registers. As +per the ACPI specification, for the control registers, preserve +(read/modify/write) all bits that are defined as either reserved or ignored. + +Updated the handling of write-only bits in the PM1 A/B Control Registers. +When reading the register, zero the write-only bits as per the ACPI spec. +ACPICA BZ 443. Lin Ming. + +Removed "Linux" from the list of supported _OSI strings. Linux no longer +wants to reply true to this request. The Windows strings are the only paths +through the AML that are tested and known to work properly. + + Previous Release: + Non-Debug Version: 82.0K Code, 17.5K Data, 99.5K Total + Debug Version: 156.9K Code, 49.8K Data, 206.7K Total + Current Release: + Non-Debug Version: 82.6K Code, 17.6K Data, 100.2K Total + Debug Version: 157.7K Code, 49.9K Data, 207.6K Total + +2) iASL Compiler/Disassembler and Tools: + +Acpiexec: Split the large aeexec.c file into two new files, aehandlers.c and +aetables.c + +---------------------------------------- +20 February 2009. Summary of changes for version 20090220: + +1) ACPI CA Core Subsystem: + +Optimized the ACPI register locking. Removed locking for reads from the ACPI +bit registers in PM1 Status, Enable, Control, and PM2 Control. The lock is +not required when reading the single-bit registers. The +AcpiGetRegisterUnlocked function is no longer needed and has been removed. +This will improve performance for reads on these registers. ACPICA BZ 760. + +Fixed the parameter validation for AcpiRead/Write. Now return +AE_BAD_PARAMETER if the input register pointer is null, and AE_BAD_ADDRESS if +the register has an address of zero. Previously, these cases simply returned +AE_OK. For optional registers such as PM1B status/enable/control, the caller +should check for a valid register address before calling. ACPICA BZ 748. + +Renamed the external ACPI bit register access functions. Renamed +AcpiGetRegister and AcpiSetRegister to clarify the purpose of these +functions. The new names are AcpiReadBitRegister and AcpiWriteBitRegister. +Also, restructured the code for these functions by simplifying the code path +and condensing duplicate code to reduce code size. + +Added new functions to transparently handle the possibly split PM1 A/B +registers. AcpiHwReadMultiple and AcpiHwWriteMultiple. These two functions +now handle the split registers for PM1 Status, Enable, and Control. ACPICA BZ +746. + +Added a function to handle the PM1 control registers, AcpiHwWritePm1Control. +This function writes both of the PM1 control registers (A/B). These registers +are different than the PM1 A/B status and enable registers in that different +values can be written to the A/B registers. Most notably, the SLP_TYP bits +can be different, as per the values returned from the _Sx predefined methods. + +Removed an extra register write within AcpiHwClearAcpiStatus. This function +was writing an optional PM1B status register twice. The existing call to the +low-level AcpiHwRegisterWrite automatically handles a possibly split PM1 A/B +register. ACPICA BZ 751. + +Split out the PM1 Status registers from the FADT. Added new globals for these +registers (A/B), similar to the way the PM1 Enable registers are handled. +Instead of overloading the FADT Event Register blocks. This makes the code +clearer and less prone to error. + +Fixed the warning message for when the platform contains too many ACPI tables +for the default size of the global root table data structure. The calculation +for the truncation value was incorrect. + +Removed the ACPI_GET_OBJECT_TYPE macro. Removed all instances of this +obsolete macro, since it is now a simple reference to ->common.type. There +were about 150 invocations of the macro across 41 files. ACPICA BZ 755. + +Removed the redundant ACPI_BITREG_SLEEP_TYPE_B. This type is the same as +TYPE_A. Removed this and all related instances. Renamed SLEEP_TYPE_A to +simply SLEEP_TYPE. ACPICA BZ 754. + +Conditionally compile the AcpiSetFirmwareWakingVector64 function. This +function is only needed on 64-bit host operating systems and is thus not +included for 32-bit hosts. + +Debug output: print the input and result for invocations of the _OSI reserved +control method via the ACPI_LV_INFO debug level. Also, reduced some of the +verbosity of this debug level. Len Brown. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 82.3K Code, 17.5K Data, 99.8K Total + Debug Version: 157.3K Code, 49.8K Data, 207.1K Total + Current Release: + Non-Debug Version: 82.0K Code, 17.5K Data, 99.5K Total + Debug Version: 156.9K Code, 49.8K Data, 206.7K Total + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: Decode the FADT PM_Profile field. Emit ascii names for the +various legal performance profiles. + +---------------------------------------- +23 January 2009. Summary of changes for version 20090123: + +1) ACPI CA Core Subsystem: + +Added the 2009 copyright to all module headers and signons. This affects +virtually every file in the ACPICA core subsystem, the iASL compiler, and +the tools/utilities. + +Implemented a change to allow the host to override any ACPI table, including +dynamically loaded tables. Previously, only the DSDT could be replaced by the +host. With this change, the AcpiOsTableOverride interface is called for each +table found in the RSDT/XSDT during ACPICA initialization, and also whenever +a table is dynamically loaded via the AML Load operator. + +Updated FADT flag definitions, especially the Boot Architecture flags. + +Debugger: For the Find command, automatically pad the input ACPI name with +underscores if the name is shorter than 4 characters. This enables a match +with the actual namespace entry which is itself padded with underscores. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 82.3K Code, 17.4K Data, 99.7K Total + Debug Version: 157.1K Code, 49.7K Data, 206.8K Total + Current Release: + Non-Debug Version: 82.3K Code, 17.5K Data, 99.8K Total + Debug Version: 157.3K Code, 49.8K Data, 207.1K Total + +2) iASL Compiler/Disassembler and Tools: + +Fix build error under Bison-2.4. + +Dissasembler: Enhanced FADT support. Added decoding of the Boot Architecture +flags. Now decode all flags, regardless of the FADT version. Flag output +includes the FADT version which first defined each flag. + +The iASL -g option now dumps the RSDT to a file (in addition to the FADT and +DSDT). Windows only. + +---------------------------------------- +04 December 2008. Summary of changes for version 20081204: + +1) ACPI CA Core Subsystem: + +The ACPICA Programmer Reference has been completely updated and revamped for +this release. This includes updates to the external interfaces, OSL +interfaces, the overview sections, and the debugger reference. + +Several new ACPICA interfaces have been implemented and documented in the +programmer reference: +AcpiReset - Writes the reset value to the FADT-defined reset register. +AcpiDisableAllGpes - Disable all available GPEs. +AcpiEnableAllRuntimeGpes - Enable all available runtime GPEs. +AcpiGetGpeDevice - Get the GPE block device associated with a GPE. +AcpiGbl_CurrentGpeCount - Tracks the current number of available GPEs. +AcpiRead - Low-level read ACPI register (was HwLowLevelRead.) +AcpiWrite - Low-level write ACPI register (was HwLowLevelWrite.) + +Most of the public ACPI hardware-related interfaces have been moved to a new +file, components/hardware/hwxface.c + +Enhanced the FADT parsing and low-level ACPI register access: The ACPI +register lengths within the FADT are now used, and the low level ACPI +register access no longer hardcodes the ACPI register lengths. Given that +there may be some risk in actually trusting the FADT register lengths, a run- +time option was added to fall back to the default hardcoded lengths if the +FADT proves to contain incorrect values - UseDefaultRegisterWidths. This +option is set to true for now, and a warning is issued if a suspicious FADT +register length is overridden with the default value. + +Fixed a reference count issue in NsRepairObject. This problem was introduced +in version 20081031 as part of a fix to repair Buffer objects within +Packages. Lin Ming. + +Added semaphore support to the Linux/Unix application OS-services layer +(OSL). ACPICA BZ 448. Lin Ming. + +Added the ACPI_MUTEX_TYPE configuration option to select whether mutexes will +be implemented in the OSL, or will binary semaphores be used instead. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 81.7K Code, 17.3K Data, 99.0K Total + Debug Version: 156.4K Code, 49.4K Data, 205.8K Total + Current Release: + Non-Debug Version: 82.3K Code, 17.4K Data, 99.7K Total + Debug Version: 157.1K Code, 49.7K Data, 206.8K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Completed the '-e' option to include additional ACPI tables in order to +aid with disassembly and External statement generation. ACPICA BZ 742. Lin +Ming. + +iASL: Removed the "named object in while loop" error. The compiler cannot +determine how many times a loop will execute. ACPICA BZ 730. + +Disassembler: Implemented support for FADT revision 2 (MS extension). ACPICA +BZ 743. + +Disassembler: Updates for several ACPI data tables (HEST, EINJ, and MCFG). + +---------------------------------------- +31 October 2008. Summary of changes for version 20081031: + +1) ACPI CA Core Subsystem: + +Restructured the ACPICA header files into public/private. acpi.h now includes +only the "public" acpica headers. All other acpica headers are "private" and +should not be included by acpica users. One new file, accommon.h is used to +include the commonly used private headers for acpica code generation. Future +plans include moving all private headers to a new subdirectory. + +Implemented an automatic Buffer->String return value conversion for +predefined ACPI methods. For these methods (such as _BIF), added automatic +conversion for return objects that are required to be a String, but a Buffer +was found instead. This can happen when reading string battery data from an +operation region, because it used to be difficult to convert the data from +buffer to string from within the ASL. Ensures that the host OS is provided +with a valid null-terminated string. Linux BZ 11822. + +Updated the FACS waking vector interfaces. Split AcpiSetFirmwareWakingVector +into two: one for the 32-bit vector, another for the 64-bit vector. This is +required because the host OS must setup the wake much differently for each +vector (real vs. protected mode, etc.) and the interface itself should not be +deciding which vector to use. Also, eliminated the GetFirmwareWakingVector +interface, as it served no purpose (only the firmware reads the vector, OS +only writes the vector.) ACPICA BZ 731. + +Implemented a mechanism to escape infinite AML While() loops. Added a loop +counter to force exit from AML While loops if the count becomes too large. +This can occur in poorly written AML when the hardware does not respond +within a while loop and the loop does not implement a timeout. The maximum +loop count is configurable. A new exception code is returned when a loop is +broken, AE_AML_INFINITE_LOOP. Alexey Starikovskiy, Bob Moore. + +Optimized the execution of AML While loops. Previously, a control state +object was allocated and freed for each execution of the loop. The +optimization is to simply reuse the control state for each iteration. This +speeds up the raw loop execution time by about 5%. + +Enhanced the implicit return mechanism. For Windows compatibility, return an +implicit integer of value zero for methods that contain no executable code. +Such methods are seen in the field as stubs (presumably), and can cause +drivers to fail if they expect a return value. Lin Ming. + +Allow multiple backslashes as root prefixes in namepaths. In a fully +qualified namepath, allow multiple backslash prefixes. This can happen (and +is seen in the field) because of the use of a double-backslash in strings +(since backslash is the escape character) causing confusion. ACPICA BZ 739 +Lin Ming. + +Emit a warning if two different FACS or DSDT tables are discovered in the +FADT. Checks if there are two valid but different addresses for the FACS and +DSDT within the FADT (mismatch between the 32-bit and 64-bit fields.) + +Consolidated the method argument count validation code. Merged the code that +validates control method argument counts into the predefined validation +module. Eliminates possible multiple warnings for incorrect argument counts. + +Implemented ACPICA example code. Includes code for ACPICA initialization, +handler installation, and calling a control method. Available at +source/tools/examples. + +Added a global pointer for FACS table to simplify internal FACS access. Use +the global pointer instead of using AcpiGetTableByIndex for each FACS access. +This simplifies the code for the Global Lock and the Firmware Waking +Vector(s). + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 81.2K Code, 17.0K Data, 98.2K Total + Debug Version: 155.8K Code, 49.1K Data, 204.9K Total + Current Release: + Non-Debug Version: 81.7K Code, 17.3K Data, 99.0K Total + Debug Version: 156.4K Code, 49.4K Data, 205.8K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Improved disassembly of external method calls. Added the -e option to +allow the inclusion of additional ACPI tables to help with the disassembly of +method invocations and the generation of external declarations during the +disassembly. Certain external method invocations cannot be disassembled +properly without the actual declaration of the method. Use the -e option to +include the table where the external method(s) are actually declared. Most +useful for disassembling SSDTs that make method calls back to the master +DSDT. Lin Ming. Example: To disassemble an SSDT with calls to DSDT: iasl -d +-e dsdt.aml ssdt1.aml + +iASL: Fix to allow references to aliases within ASL namepaths. Fixes a +problem where the use of an alias within a namepath would result in a not +found error or cause the compiler to fault. Also now allows forward +references from the Alias operator itself. ACPICA BZ 738. + +---------------------------------------- +26 September 2008. Summary of changes for version 20080926: + +1) ACPI CA Core Subsystem: + +Designed and implemented a mechanism to validate predefined ACPI methods and +objects. This code validates the predefined ACPI objects (objects whose names +start with underscore) that appear in the namespace, at the time they are +evaluated. The argument count and the type of the returned object are +validated against the ACPI specification. The purpose of this validation is +to detect problems with the BIOS-implemented predefined ACPI objects before +the results are returned to the ACPI-related drivers. Future enhancements may +include actual repair of incorrect return objects where possible. Two new +files are nspredef.c and acpredef.h. + +Fixed a fault in the AML parser if a memory allocation fails during the Op +completion routine AcpiPsCompleteThisOp. Lin Ming. ACPICA BZ 492. + +Fixed an issue with implicit return compatibility. This change improves the +implicit return mechanism to be more compatible with the MS interpreter. Lin +Ming, ACPICA BZ 349. + +Implemented support for zero-length buffer-to-string conversions. Allow zero +length strings during interpreter buffer-to-string conversions. For example, +during the ToDecimalString and ToHexString operators, as well as implicit +conversions. Fiodor Suietov, ACPICA BZ 585. + +Fixed two possible memory leaks in the error exit paths of +AcpiUtUpdateObjectReference and AcpiUtWalkPackageTree. These functions are +similar in that they use a stack of state objects in order to eliminate +recursion. The stack must be fully unwound and deallocated if an error +occurs. Lin Ming. ACPICA BZ 383. + +Removed the unused ACPI_BITREG_WAKE_ENABLE definition and entry in the global +ACPI register table. This bit does not exist and is unused. Lin Ming, Bob +Moore ACPICA BZ 442. + +Removed the obsolete version number in module headers. Removed the +"$Revision" number that appeared in each module header. This version number +was useful under SourceSafe and CVS, but has no meaning under git. It is not +only incorrect, it could also be misleading. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 79.7K Code, 16.4K Data, 96.1K Total + Debug Version: 153.7K Code, 48.2K Data, 201.9K Total + Current Release: + Non-Debug Version: 81.2K Code, 17.0K Data, 98.2K Total + Debug Version: 155.8K Code, 49.1K Data, 204.9K Total + +---------------------------------------- +29 August 2008. Summary of changes for version 20080829: + +1) ACPI CA Core Subsystem: + +Completed a major cleanup of the internal ACPI_OPERAND_OBJECT of type +Reference. Changes include the elimination of cheating on the Object field +for the DdbHandle subtype, addition of a reference class field to +differentiate the various reference types (instead of an AML opcode), and the +cleanup of debug output for this object. Lin Ming, Bob Moore. BZ 723 + +Reduce an error to a warning for an incorrect method argument count. +Previously aborted with an error if too few arguments were passed to a +control method via the external ACPICA interface. Now issue a warning instead +and continue. Handles the case where the method inadvertently declares too +many arguments, but does not actually use the extra ones. Applies mainly to +the predefined methods. Lin Ming. Linux BZ 11032. + +Disallow the evaluation of named object types with no intrinsic value. Return +AE_TYPE for objects that have no value and therefore evaluation is undefined: +Device, Event, Mutex, Region, Thermal, and Scope. Previously, evaluation of +these types were allowed, but an exception would be generated at some point +during the evaluation. Now, the error is generated up front. + +Fixed a possible memory leak in the AcpiNsGetExternalPathname function +(nsnames.c). Fixes a leak in the error exit path. + +Removed the obsolete debug levels ACPI_DB_WARN and ACPI_DB_ERROR. These debug +levels were made obsolete by the ACPI_WARNING, ACPI_ERROR, and ACPI_EXCEPTION +interfaces. Also added ACPI_DB_EVENTS to correspond with the existing +ACPI_LV_EVENTS. + +Removed obsolete and/or unused exception codes from the acexcep.h header. +There is the possibility that certain device drivers may be affected if they +use any of these exceptions. + +The ACPICA documentation has been added to the public git source tree, under +acpica/documents. Included are the ACPICA programmer reference, the iASL +compiler reference, and the changes.txt release logfile. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 79.7K Code, 16.4K Data, 96.1K Total + Debug Version: 153.9K Code, 48.4K Data, 202.3K Total + Current Release: + Non-Debug Version: 79.7K Code, 16.4K Data, 96.1K Total + Debug Version: 153.7K Code, 48.2K Data, 201.9K Total + +2) iASL Compiler/Disassembler and Tools: + +Allow multiple argument counts for the predefined _SCP method. ACPI 3.0 +defines _SCP with 3 arguments. Previous versions defined it with only 1 +argument. iASL now allows both definitions. + +iASL/disassembler: avoid infinite loop on bad ACPI tables. Check for zero- +length subtables when disassembling ACPI tables. Also fixed a couple of +errors where a full 16-bit table type field was not extracted from the input +properly. + +acpisrc: Improve comment counting mechanism for generating source code +statistics. Count first and last lines of multi-line comments as whitespace, +not comment lines. Handle Linux legal header in addition to standard acpica +header. + +---------------------------------------- + +29 July 2008. Summary of changes for version 20080729: + +This release is available at http://acpica.org/downloads +Direct git access via http://www.acpica.org/repos/acpica.git + +1) ACPI CA Core Subsystem: + +Fix a possible deadlock in the GPE dispatch. Remove call to +AcpiHwDisableAllGpes during wake in AcpiEvGpeDispatch. This call will attempt +to acquire the GPE lock but can deadlock since the GPE lock is already held +at dispatch time. This code was introduced in version 20060831 as a response +to Linux BZ 6881 and has since been removed from Linux. + +Add a function to dereference returned reference objects. Examines the return +object from a call to AcpiEvaluateObject. Any Index or RefOf references are +automatically dereferenced in an attempt to return something useful (these +reference types cannot be converted into an external ACPI_OBJECT.) Provides +MS compatibility. Lin Ming, Bob Moore. Linux BZ 11105 + +x2APIC support: changes for MADT and SRAT ACPI tables. There are 2 new +subtables for the MADT and one new subtable for the SRAT. Includes +disassembler and AcpiSrc support. Data from the Intel 64 Architecture x2APIC +Specification, June 2008. + +Additional error checking for pathname utilities. Add error check after all +calls to AcpiNsGetPathnameLength. Add status return from +AcpiNsBuildExternalPath and check after all calls. Add parameter validation +to AcpiUtInitializeBuffer. Reported by and initial patch by Ingo Molnar. + +Return status from the global init function AcpiUtGlobalInitialize. This is +used by both the kernel subsystem and the utilities such as iASL compiler. +The function could possibly fail when the caches are initialized. Yang Yi. + +Add a function to decode reference object types to strings. Created for +improved error messages. + +Improve object conversion error messages. Better error messages during object +conversion from internal to the external ACPI_OBJECT. Used for external calls +to AcpiEvaluateObject. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 79.6K Code, 16.2K Data, 95.8K Total + Debug Version: 153.5K Code, 48.2K Data, 201.7K Total + Current Release: + Non-Debug Version: 79.7K Code, 16.4K Data, 96.1K Total + Debug Version: 153.9K Code, 48.4K Data, 202.3K Total + +2) iASL Compiler/Disassembler and Tools: + +Debugger: fix a possible hang when evaluating non-methods. Fixes a problem +introduced in version 20080701. If the object being evaluated (via execute +command) is not a method, the debugger can hang while trying to obtain non- +existent parameters. + +iASL: relax error for using reserved "_T_x" identifiers. These names can +appear in a disassembled ASL file if they were emitted by the original +compiler. Instead of issuing an error or warning and forcing the user to +manually change these names, issue a remark instead. + +iASL: error if named object created in while loop. Emit an error if any named +object is created within a While loop. If allowed, this code will generate a +run-time error on the second iteration of the loop when an attempt is made to +create the same named object twice. ACPICA bugzilla 730. + +iASL: Support absolute pathnames for include files. Add support for absolute +pathnames within the Include operator. previously, only relative pathnames +were supported. + +iASL: Enforce minimum 1 interrupt in interrupt macro and Resource Descriptor. +The ACPI spec requires one interrupt minimum. BZ 423 + +iASL: Handle a missing ResourceSource arg, with a present SourceIndex. +Handles the case for the Interrupt Resource Descriptor where +the ResourceSource argument is omitted but ResourceSourceIndex +is present. Now leave room for the Index. BZ 426 + +iASL: Prevent error message if CondRefOf target does not exist. Fixes cases +where an error message is emitted if the target does not exist. BZ 516 + +iASL: Fix broken -g option (get Windows ACPI tables). Fixes the -g option +(get ACPI tables on Windows). This was apparently broken in version 20070919. + +AcpiXtract: Handle EOF while extracting data. Correctly handle the case where +the EOF happens immediately after the last table in the input file. Print +completion message. Previously, no message was displayed in this case. + +---------------------------------------- +01 July 2008. Summary of changes for version 20080701: + +This release is available at http://acpica.org/downloads +Direct git access via http://www.acpica.org/repos/acpica.git + +0) Git source tree / acpica.org + +Fixed a problem where a git-clone from http would not transfer the entire +source tree. + +1) ACPI CA Core Subsystem: + +Implemented a "careful" GPE disable in AcpiEvDisableGpe, only modify one +enable bit. Now performs a read-change-write of the enable register instead +of simply writing out the cached enable mask. This will prevent inadvertent +enabling of GPEs if a rogue GPE is received during initialization (before GPE +handlers are installed.) + +Implemented a copy for dynamically loaded tables. Previously, dynamically +loaded tables were simply mapped - but on some machines this memory is +corrupted after suspend. Now copy the table to a local buffer. For the +OpRegion case, added checksum verify. Use the table length from the table +header, not the region length. For the Buffer case, use the table length +also. Dennis Noordsij, Bob Moore. BZ 10734 + +Fixed a problem where the same ACPI table could not be dynamically loaded and +unloaded more than once. Without this change, a table cannot be loaded again +once it has been loaded/unloaded one time. The current mechanism does not +unregister a table upon an unload. During a load, if the same table is found, +this no longer returns an exception. BZ 722 + +Fixed a problem where the wrong descriptor length was calculated for the +EndTag descriptor in 64-bit mode. The "minimal" descriptors such as EndTag +are calculated as 12 bytes long, but the actual length in the internal +descriptor is 16 because of the round-up to 8 on the 64-bit build. Reported +by Linn Crosetto. BZ 728 + +Fixed a possible memory leak in the Unload operator. The DdbHandle returned +by Load() did not have its reference count decremented during unload, leading +to a memory leak. Lin Ming. BZ 727 + +Fixed a possible memory leak when deleting thermal/processor objects. Any +associated notify handlers (and objects) were not being deleted. Fiodor +Suietov. BZ 506 + +Fixed the ordering of the ASCII names in the global mutex table to match the +actual mutex IDs. Used by AcpiUtGetMutexName, a function used for debug only. +Vegard Nossum. BZ 726 + +Enhanced the AcpiGetObjectInfo interface to return the number of required +arguments if the object is a control method. Added this call to the debugger +so the proper number of default arguments are passed to a method. This +prevents a warning when executing methods from AcpiExec. + +Added a check for an invalid handle in AcpiGetObjectInfo. Return +AE_BAD_PARAMETER if input handle is invalid. BZ 474 + +Fixed an extraneous warning from exconfig.c on the 64-bit build. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 79.3K Code, 16.2K Data, 95.5K Total + Debug Version: 153.0K Code, 48.2K Data, 201.2K Total + Current Release: + Non-Debug Version: 79.6K Code, 16.2K Data, 95.8K Total + Debug Version: 153.5K Code, 48.2K Data, 201.7K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Added two missing ACPI reserved names. Added _MTP and _ASZ, both +resource descriptor names. + +iASL: Detect invalid ASCII characters in input (windows version). Removed the +"-CF" flag from the flex compile, enables correct detection of non-ASCII +characters in the input. BZ 441 + +iASL: Eliminate warning when result of LoadTable is not used. Eliminate the +"result of operation not used" warning when the DDB handle returned from +LoadTable is not used. The warning is not needed. BZ 590 + +AcpiExec: Add support for dynamic table load/unload. Now calls _CFG method to +pass address of table to the AML. Added option to disable OpRegion simulation +to allow creation of an OpRegion with a real address that was passed to _CFG. +All of this allows testing of the Load and Unload operators from AcpiExec. + +Debugger: update tables command for unloaded tables. Handle unloaded tables +and use the standard table header output routine. + +---------------------------------------- +09 June 2008. Summary of changes for version 20080609: + +1) ACPI CA Core Subsystem: + +Implemented a workaround for reversed _PRT entries. A significant number of +BIOSs erroneously reverse the _PRT SourceName and the SourceIndex. This +change dynamically detects and repairs this problem. Provides compatibility +with MS ACPI. BZ 6859 + +Simplified the internal ACPI hardware interfaces to eliminate the locking +flag parameter from Register Read/Write. Added a new external interface, +AcpiGetRegisterUnlocked. + +Fixed a problem where the invocation of a GPE control method could hang. This +was a regression introduced in 20080514. The new method argument count +validation mechanism can enter an infinite loop when a GPE method is +dispatched. Problem fixed by removing the obsolete code that passed GPE block +information to the notify handler via the control method parameter pointer. + +Fixed a problem where the _SST execution status was incorrectly returned to +the caller of AcpiEnterSleepStatePrep. This was a regression introduced in +20080514. _SST is optional and a NOT_FOUND exception should never be +returned. BZ 716 + +Fixed a problem where a deleted object could be accessed from within the AML +parser. This was a regression introduced in version 20080123 as a fix for the +Unload operator. Lin Ming. BZ 10669 + +Cleaned up the debug operand dump mechanism. Eliminated unnecessary operands +and eliminated the use of a negative index in a loop. Operands are now +displayed in the correct order, not backwards. This also fixes a regression +introduced in 20080514 on 64-bit systems where the elimination of +ACPI_NATIVE_UINT caused the negative index to go large and positive. BZ 715 + +Fixed a possible memory leak in EvPciConfigRegionSetup where the error exit +path did not delete a locally allocated structure. + +Updated definitions for the DMAR and SRAT tables to synchronize with the +current specifications. Includes disassembler support. + +Fixed a problem in the mutex debug code (in utmutex.c) where an incorrect +loop termination value was used. Loop terminated on iteration early, missing +one mutex. Linn Crosetto + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 79.5K Code, 16.2K Data, 95.7K Total + Debug Version: 153.3K Code, 48.3K Data, 201.6K Total + Current Release: + Non-Debug Version: 79.3K Code, 16.2K Data, 95.5K Total + Debug Version: 153.0K Code, 48.2K Data, 201.2K Total + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: Implemented support for EisaId() within _CID objects. Now +disassemble integer _CID objects back to EisaId invocations, including +multiple integers within _CID packages. Includes single-step support for +debugger also. + +Disassembler: Added support for DMAR and SRAT table definition changes. + +---------------------------------------- +14 May 2008. Summary of changes for version 20080514: + +1) ACPI CA Core Subsystem: + +Fixed a problem where GPEs were enabled too early during the ACPICA +initialization. This could lead to "handler not installed" errors on some +machines. Moved GPE enable until after _REG/_STA/_INI methods are run. This +ensures that all operation regions and devices throughout the namespace have +been initialized before GPEs are enabled. Alexey Starikovskiy, BZ 9916. + +Implemented a change to the enter sleep code. Moved execution of the _GTS +method to just before setting sleep enable bit. The execution was moved from +AcpiEnterSleepStatePrep to AcpiEnterSleepState. _GTS is now executed +immediately before the SLP_EN bit is set, as per the ACPI specification. +Luming Yu, BZ 1653. + +Implemented a fix to disable unknown GPEs (2nd version). Now always disable +the GPE, even if ACPICA thinks that that it is already disabled. It is +possible that the AML or some other code has enabled the GPE unbeknownst to +the ACPICA code. + +Fixed a problem with the Field operator where zero-length fields would return +an AE_AML_NO_OPERAND exception during table load. Fix enables zero-length ASL +field declarations in Field(), BankField(), and IndexField(). BZ 10606. + +Implemented a fix for the Load operator, now load the table at the namespace +root. This reverts a change introduced in version 20071019. The table is now +loaded at the namespace root even though this goes against the ACPI +specification. This provides compatibility with other ACPI implementations. +The ACPI specification will be updated to reflect this in ACPI 4.0. Lin Ming. + +Fixed a problem where ACPICA would not Load() tables with unusual signatures. +Now ignore ACPI table signature for Load() operator. Only "SSDT" is +acceptable to the ACPI spec, but tables are seen with OEMx and null sigs. +Therefore, signature validation is worthless. Apparently MS ACPI accepts such +signatures, ACPICA must be compatible. BZ 10454. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:00:32 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C38E710656B0; Tue, 2 Jun 2009 20:00:32 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B13FA8FC08; Tue, 2 Jun 2009 20:00:32 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52K0WBp026543; Tue, 2 Jun 2009 20:00:32 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52K0Wpv026542; Tue, 2 Jun 2009 20:00:32 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906022000.n52K0Wpv026542@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 20:00:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193339 - projects/acpica_20090521/sys/contrib/dev/acpica X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:00:34 -0000 Author: jkim Date: Tue Jun 2 20:00:32 2009 New Revision: 193339 URL: http://svn.freebsd.org/changeset/base/193339 Log: Fix include path fixup for contrib/dev/acpica/include/platform/*.h. Modified: projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh Modified: projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh Tue Jun 2 19:28:26 2009 (r193338) +++ projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh Tue Jun 2 20:00:32 2009 (r193339) @@ -34,6 +34,7 @@ src_headers="acapps.h accommon.h acconfi actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h \ platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h" +platform_headers="acfreebsd.h acgcc.h" # pre-clean echo pre-clean @@ -71,6 +72,10 @@ for H in ${comp_headers}; do find ${dst}/compiler -name "*.[chly]" -type f | \ xargs sed -i "" -e "s|[\"<]$H[\">]|\|g" done +for H in ${platform_headers}; do + find ${dst}/include/platform -name "*.h" -type f | \ + xargs sed -i "" -e "s|[\"<]$H[\">]|\|g" +done # post-clean echo post-clean From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:03:01 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8F1E10656B8; Tue, 2 Jun 2009 20:03:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A1ACC8FC0C; Tue, 2 Jun 2009 20:03:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52K31YL026720; Tue, 2 Jun 2009 20:03:01 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52K2xST026659; Tue, 2 Jun 2009 20:02:59 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906022002.n52K2xST026659@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 20:02:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193341 - in projects/acpica_20090521/sys/contrib/dev/acpica: . common compiler debugger disassembler dispatcher events executer hardware include include/platform namespace parser resou... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:03:02 -0000 Author: jkim Date: Tue Jun 2 20:02:58 2009 New Revision: 193341 URL: http://svn.freebsd.org/changeset/base/193341 Log: Canonify include paths again. Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/adfile.c projects/acpica_20090521/sys/contrib/dev/acpica/common/adisasm.c projects/acpica_20090521/sys/contrib/dev/acpica/common/adwalk.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmrestag.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtable.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbdump.c projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbinfo.c projects/acpica_20090521/sys/contrib/dev/acpica/common/getopt.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompile.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslerror.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfiles.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfold.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllength.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllisting.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslload.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllookup.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmain.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmap.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asloperands.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopt.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslresource.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstartup.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstubs.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltransform.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltree.c projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslutils.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbcmds.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbdisply.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbexec.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbfileio.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbhistry.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbinput.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbstats.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbutils.c projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmbuffer.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmnames.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmobject.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrc.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcl.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcs.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmutils.c projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmwalk.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsfield.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsinit.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmethod.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmthdat.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsobject.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dswexec.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dswload.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dswscope.c projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dswstate.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evevent.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evgpe.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evgpeblk.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evregion.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evrgnini.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evsci.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evxface.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evxfevnt.c projects/acpica_20090521/sys/contrib/dev/acpica/events/evxfregn.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exconfig.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exconvrt.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/excreate.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exdump.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exfield.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exfldio.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exmutex.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exnames.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exoparg1.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exoparg2.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exoparg3.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exoparg6.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exprep.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exregion.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exresnte.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exresolv.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exresop.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exstore.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exstoren.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exstorob.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exsystem.c projects/acpica_20090521/sys/contrib/dev/acpica/executer/exutils.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwacpi.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwgpe.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwregs.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwsleep.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwtimer.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwvalid.c projects/acpica_20090521/sys/contrib/dev/acpica/hardware/hwxface.c projects/acpica_20090521/sys/contrib/dev/acpica/include/accommon.h projects/acpica_20090521/sys/contrib/dev/acpica/include/acdisasm.h projects/acpica_20090521/sys/contrib/dev/acpica/include/acpi.h projects/acpica_20090521/sys/contrib/dev/acpica/include/acpiosxf.h projects/acpica_20090521/sys/contrib/dev/acpica/include/acpixf.h projects/acpica_20090521/sys/contrib/dev/acpica/include/acresrc.h projects/acpica_20090521/sys/contrib/dev/acpica/include/actbl.h projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acenv.h projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsaccess.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsalloc.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsdump.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsdumpdv.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nseval.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsinit.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsload.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsnames.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsobject.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsparse.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nspredef.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nssearch.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nswalk.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsxfeval.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsxfname.c projects/acpica_20090521/sys/contrib/dev/acpica/namespace/nsxfobj.c projects/acpica_20090521/sys/contrib/dev/acpica/osunixxf.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psargs.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psloop.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psopcode.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psparse.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psscope.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/pstree.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psutils.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/pswalk.c projects/acpica_20090521/sys/contrib/dev/acpica/parser/psxface.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsaddr.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rscalc.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rscreate.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsdump.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsinfo.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsio.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsirq.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rslist.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsmemory.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsutils.c projects/acpica_20090521/sys/contrib/dev/acpica/resources/rsxface.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbfadt.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbfind.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbinstal.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbxface.c projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbxfroot.c projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utalloc.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utcache.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utcopy.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utdebug.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utdelete.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/uteval.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utglobal.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utinit.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utlock.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utmath.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utmisc.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utmutex.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utobject.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utresrc.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utstate.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/uttrack.c projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utxface.c Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/adfile.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/adfile.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/adfile.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,9 +114,9 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acapps.h" +#include +#include +#include #include #include Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/adisasm.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/adisasm.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,16 +114,16 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdebug.h" -#include "acdisasm.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "actables.h" -#include "acapps.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/adwalk.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/adwalk.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/adwalk.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,15 +114,15 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdebug.h" -#include "acdisasm.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acapps.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define _COMPONENT ACPI_TOOLS Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/dmrestag.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/dmrestag.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/dmrestag.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,12 +114,12 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "acdisasm.h" -#include "acnamesp.h" -#include "amlcode.h" +#include +#include +#include +#include +#include +#include /* This module used for application-level code only */ Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtable.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtable.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtable.c Tue Jun 2 20:02:58 2009 (r193341) @@ -113,10 +113,10 @@ * *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" -#include "actables.h" +#include +#include +#include +#include /* This module used for application-level code only */ Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbdump.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbdump.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbdump.c Tue Jun 2 20:02:58 2009 (r193341) @@ -113,10 +113,10 @@ * *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" -#include "actables.h" +#include +#include +#include +#include /* This module used for application-level code only */ Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbinfo.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbinfo.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/dmtbinfo.c Tue Jun 2 20:02:58 2009 (r193341) @@ -113,9 +113,9 @@ * *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" +#include +#include +#include /* This module used for application-level code only */ Modified: projects/acpica_20090521/sys/contrib/dev/acpica/common/getopt.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/common/getopt.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/common/getopt.c Tue Jun 2 20:02:58 2009 (r193341) @@ -117,9 +117,9 @@ #include #include -#include "acpi.h" -#include "accommon.h" -#include "acapps.h" +#include +#include +#include #define ERR(szz,czz) if(AcpiGbl_Opterr){fprintf(stderr,"%s%s%c\n",argv[0],szz,czz);} Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslanalyze.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslanalyze.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslanalyze.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,10 +115,10 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "acparser.h" -#include "amlcode.h" +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslanalyze") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcodegen.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcodegen.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcodegen.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcodegen") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompile.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompile.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompile.c Tue Jun 2 20:02:58 2009 (r193341) @@ -116,7 +116,7 @@ #include #include -#include "aslcompiler.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcompile") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.h ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.h Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.h Tue Jun 2 20:02:58 2009 (r193341) @@ -138,16 +138,16 @@ #include -#include "acpi.h" -#include "accommon.h" -#include "amlresrc.h" -#include "acdebug.h" +#include +#include +#include +#include /* Compiler headers */ -#include "asldefine.h" -#include "asltypes.h" -#include "aslglobal.h" +#include +#include +#include /******************************************************************************* Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.l ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.l Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.l Tue Jun 2 20:02:58 2009 (r193341) @@ -118,7 +118,7 @@ #include #include -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" YYSTYPE AslCompilerlval; Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.y ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.y Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslcompiler.y Tue Jun 2 20:02:58 2009 (r193341) @@ -123,12 +123,12 @@ */ #define YYINITDEPTH 600 -#include "aslcompiler.h" +#include #include #include #include -#include "acpi.h" -#include "accommon.h" +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslparse") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslerror.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslerror.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslerror.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,7 +115,7 @@ *****************************************************************************/ #define ASL_EXCEPTIONS -#include "aslcompiler.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslerror") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfiles.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfiles.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfiles.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,8 +114,8 @@ * *****************************************************************************/ -#include "aslcompiler.h" -#include "acapps.h" +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfiles") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfold.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfold.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslfold.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,12 +115,12 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include -#include "acdispat.h" -#include "acparser.h" +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfold") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllength.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllength.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllength.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllisting.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllisting.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllisting.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,11 +115,11 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" -#include "acparser.h" -#include "acnamesp.h" +#include +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslisting") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslload.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslload.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslload.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,10 +115,10 @@ #define __ASLLOAD_C__ -#include "aslcompiler.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acnamesp.h" +#include +#include +#include +#include #include "aslcompiler.y.h" Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllookup.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllookup.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asllookup.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,13 +114,13 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "acparser.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acdispat.h" +#include +#include +#include +#include #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmain.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmain.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmain.c Tue Jun 2 20:02:58 2009 (r193341) @@ -117,8 +117,8 @@ #define _DECLARE_GLOBALS -#include "aslcompiler.h" -#include "acapps.h" +#include +#include #ifdef _DEBUG #include Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmap.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmap.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslmap.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" -#include "amlcode.h" -#include "acparser.h" +#include +#include +#include #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopcodes.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopcodes.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopcodes.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslopcodes") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asloperands.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asloperands.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asloperands.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("asloperands") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopt.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopt.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslopt.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,12 +114,12 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "acparser.h" -#include "amlcode.h" -#include "acnamesp.h" +#include +#include +#include #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslresource.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslresource.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslresource.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "amlcode.h" +#include #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype1.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype1.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype1.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,7 +115,7 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype2.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype2.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslrestype2.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,7 +115,7 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstartup.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstartup.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstartup.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,9 +115,9 @@ *****************************************************************************/ -#include "aslcompiler.h" -#include "actables.h" -#include "acapps.h" +#include +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslstartup") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstubs.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstubs.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslstubs.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,11 +114,11 @@ * *****************************************************************************/ -#include "aslcompiler.h" -#include "acdispat.h" -#include "actables.h" -#include "acevents.h" -#include "acinterp.h" +#include +#include +#include +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslstubs") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltransform.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltransform.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltransform.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,7 +115,7 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltree.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltree.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/asltree.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,7 +115,7 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslutils.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslutils.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/compiler/aslutils.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,10 +115,10 @@ *****************************************************************************/ -#include "aslcompiler.h" +#include #include "aslcompiler.y.h" -#include "acnamesp.h" -#include "amlcode.h" +#include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslutils") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbcmds.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbcmds.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbcmds.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,16 +114,16 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acevents.h" -#include "acdebug.h" -#include "acresrc.h" -#include "acdisasm.h" -#include "actables.h" -#include "acparser.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbdisply.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbdisply.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbdisply.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,15 +114,15 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acparser.h" -#include "acinterp.h" -#include "acdebug.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbexec.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbexec.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbexec.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,10 +114,10 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdebug.h" -#include "acnamesp.h" +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbfileio.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbfileio.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbfileio.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,12 +115,12 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdebug.h" +#include +#include +#include #ifdef ACPI_APPLICATION -#include "actables.h" +#include #endif #if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER) Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbhistry.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbhistry.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbhistry.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,9 +114,9 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdebug.h" +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbinput.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbinput.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbinput.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,9 +114,9 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdebug.h" +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbstats.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbstats.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbstats.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,10 +114,10 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdebug.h" -#include "acnamesp.h" +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbutils.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbutils.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbutils.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,11 +114,11 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acnamesp.h" -#include "acdebug.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbxface.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbxface.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/debugger/dbxface.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,11 +114,11 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdebug.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include #ifdef ACPI_DEBUGGER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmbuffer.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmbuffer.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmbuffer.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,11 +114,11 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" -#include "acparser.h" -#include "amlcode.h" +#include +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmnames.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmnames.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmnames.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,12 +114,12 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmobject.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmobject.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmobject.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,10 +114,10 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acnamesp.h" -#include "acdisasm.h" +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmopcode.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmopcode.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmopcode.c Tue Jun 2 20:02:58 2009 (r193341) @@ -113,11 +113,11 @@ * *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrc.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrc.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrc.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,10 +114,10 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdisasm.h" +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcl.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcl.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcl.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,9 +114,9 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcs.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcs.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmresrcs.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,9 +114,9 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acdisasm.h" +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmutils.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmutils.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmutils.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,13 +114,13 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdisasm.h" +#include +#include +#include +#include #ifdef ACPI_ASL_COMPILER -#include +#include #endif #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmwalk.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmwalk.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/disassembler/dmwalk.c Tue Jun 2 20:02:58 2009 (r193341) @@ -114,12 +114,12 @@ *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdisasm.h" -#include "acdebug.h" +#include +#include +#include +#include +#include +#include #ifdef ACPI_DISASSEMBLER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsfield.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsfield.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsfield.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,13 +115,13 @@ #define __DSFIELD_C__ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acparser.h" +#include +#include +#include +#include +#include +#include +#include #define _COMPONENT ACPI_DISPATCHER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsinit.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsinit.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsinit.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,11 +115,11 @@ #define __DSINIT_C__ -#include "acpi.h" -#include "accommon.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "actables.h" +#include +#include +#include +#include +#include #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsinit") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmethod.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmethod.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmethod.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,13 +115,13 @@ #define __DSMETHOD_C__ -#include "acpi.h" -#include "accommon.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acdisasm.h" +#include +#include +#include +#include +#include +#include +#include #define _COMPONENT ACPI_DISPATCHER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmthdat.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmthdat.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsmthdat.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,11 +115,11 @@ #define __DSMTHDAT_C__ -#include "acpi.h" -#include "accommon.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acinterp.h" +#include +#include +#include +#include +#include #define _COMPONENT ACPI_DISPATCHER Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsobject.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsobject.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsobject.c Tue Jun 2 20:02:58 2009 (r193341) @@ -115,13 +115,13 @@ #define __DSOBJECT_C__ -#include "acpi.h" -#include "accommon.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acinterp.h" +#include +#include +#include +#include +#include +#include +#include #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsobject") Modified: projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsopcode.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsopcode.c Tue Jun 2 20:00:43 2009 (r193340) +++ projects/acpica_20090521/sys/contrib/dev/acpica/dispatcher/dsopcode.c Tue Jun 2 20:02:58 2009 (r193341) @@ -116,15 +116,15 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:35:19 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EEEF1065690; Tue, 2 Jun 2009 20:35:19 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA9968FC14; Tue, 2 Jun 2009 20:35:18 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KZIxp027533; Tue, 2 Jun 2009 20:35:18 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52KZFYr027452; Tue, 2 Jun 2009 20:35:15 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906022035.n52KZFYr027452@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 20:35:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193343 - in projects/clangbsd: . etc/mtree share/mk usr.bin usr.bin/clang usr.bin/clang/bin usr.bin/clang/bin/bugpoint usr.bin/clang/bin/clang usr.bin/clang/bin/clang-cc usr.bin/clang/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:35:19 -0000 Author: ed Date: Tue Jun 2 20:35:15 2009 New Revision: 193343 URL: http://svn.freebsd.org/changeset/base/193343 Log: Add Makefiles to build Clang. Right now it just builds an unpatched Clang. It doesn't use Clang to build anything yet. Not all applications in bin/ are actually built and installed. They are there to make it a little easier to debug some issues once in a while. Added: projects/clangbsd/usr.bin/clang/ projects/clangbsd/usr.bin/clang/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/ projects/clangbsd/usr.bin/clang/bin/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/bugpoint/ projects/clangbsd/usr.bin/clang/bin/bugpoint/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/clang/ projects/clangbsd/usr.bin/clang/bin/clang-cc/ projects/clangbsd/usr.bin/clang/bin/clang-cc/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/clang/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/llc/ projects/clangbsd/usr.bin/clang/bin/llc/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/llvm-as/ projects/clangbsd/usr.bin/clang/bin/llvm-as/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/llvm-dis/ projects/clangbsd/usr.bin/clang/bin/llvm-dis/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/opt/ projects/clangbsd/usr.bin/clang/bin/opt/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/bin/tblgen/ projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/clang.build.mk (contents, props changed) projects/clangbsd/usr.bin/clang/clang.lib.mk (contents, props changed) projects/clangbsd/usr.bin/clang/clang.prog.mk (contents, props changed) projects/clangbsd/usr.bin/clang/include/ projects/clangbsd/usr.bin/clang/include/ARMGenAsmWriter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenCallingConv.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenCodeEmitter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenDAGISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenInstrInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenInstrNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.h.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenRegisterNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/ARMGenSubtarget.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenAsmWriter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenDAGISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenInstrInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenInstrNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.h.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/IA64GenRegisterNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenAsmWriter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenCallingConv.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenDAGISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenInstrInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenInstrNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.h.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenRegisterNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/MipsGenSubtarget.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenAsmWriter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenCallingConv.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenCodeEmitter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenDAGISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenInstrInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenInstrNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.h.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenRegisterNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/PPCGenSubtarget.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter1.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenCallingConv.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenDAGISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenFastISel.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenInstrInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenInstrNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.h.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenRegisterNames.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/X86GenSubtarget.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/ projects/clangbsd/usr.bin/clang/include/clang/Basic/ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticASTKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticCommonKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticDriverKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticFrontendKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticGroups.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticLexKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticParseKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticSemaKinds.inc (contents, props changed) projects/clangbsd/usr.bin/clang/include/llvm/ projects/clangbsd/usr.bin/clang/include/llvm/ADT/ projects/clangbsd/usr.bin/clang/include/llvm/ADT/iterator.h (contents, props changed) projects/clangbsd/usr.bin/clang/include/llvm/Config/ projects/clangbsd/usr.bin/clang/include/llvm/Config/config.h (contents, props changed) projects/clangbsd/usr.bin/clang/include/llvm/Intrinsics.gen (contents, props changed) projects/clangbsd/usr.bin/clang/include/llvm/Support/ projects/clangbsd/usr.bin/clang/include/llvm/Support/DataTypes.h (contents, props changed) projects/clangbsd/usr.bin/clang/lib/ projects/clangbsd/usr.bin/clang/lib/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclanganalysis/ projects/clangbsd/usr.bin/clang/lib/libclanganalysis/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangast/ projects/clangbsd/usr.bin/clang/lib/libclangast/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangbasic/ projects/clangbsd/usr.bin/clang/lib/libclangbasic/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangcodegen/ projects/clangbsd/usr.bin/clang/lib/libclangcodegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangdriver/ projects/clangbsd/usr.bin/clang/lib/libclangdriver/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangfrontend/ projects/clangbsd/usr.bin/clang/lib/libclangfrontend/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclanglex/ projects/clangbsd/usr.bin/clang/lib/libclanglex/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangparse/ projects/clangbsd/usr.bin/clang/lib/libclangparse/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangrewrite/ projects/clangbsd/usr.bin/clang/lib/libclangrewrite/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libclangsema/ projects/clangbsd/usr.bin/clang/lib/libclangsema/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmanalysis/ projects/clangbsd/usr.bin/clang/lib/libllvmanalysis/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmarmasmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmarmasmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmarmcodegen/ projects/clangbsd/usr.bin/clang/lib/libllvmarmcodegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmasmparser/ projects/clangbsd/usr.bin/clang/lib/libllvmasmparser/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmasmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmasmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmbitreader/ projects/clangbsd/usr.bin/clang/lib/libllvmbitreader/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmbitwriter/ projects/clangbsd/usr.bin/clang/lib/libllvmbitwriter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmcbackend/ projects/clangbsd/usr.bin/clang/lib/libllvmcbackend/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmcodegen/ projects/clangbsd/usr.bin/clang/lib/libllvmcodegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmcore/ projects/clangbsd/usr.bin/clang/lib/libllvmcore/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmia64asmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmia64asmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmia64codegen/ projects/clangbsd/usr.bin/clang/lib/libllvmia64codegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvminstrumentation/ projects/clangbsd/usr.bin/clang/lib/libllvminstrumentation/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmipa/ projects/clangbsd/usr.bin/clang/lib/libllvmipa/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmipo/ projects/clangbsd/usr.bin/clang/lib/libllvmipo/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmlinker/ projects/clangbsd/usr.bin/clang/lib/libllvmlinker/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmmipsasmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmmipsasmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmmipscodegen/ projects/clangbsd/usr.bin/clang/lib/libllvmmipscodegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmpowerpcasmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmpowerpcasmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmpowerpccodegen/ projects/clangbsd/usr.bin/clang/lib/libllvmpowerpccodegen/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmscalaropts/ projects/clangbsd/usr.bin/clang/lib/libllvmscalaropts/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmselectiondag/ projects/clangbsd/usr.bin/clang/lib/libllvmselectiondag/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmsupport/ projects/clangbsd/usr.bin/clang/lib/libllvmsupport/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmsystem/ projects/clangbsd/usr.bin/clang/lib/libllvmsystem/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmtarget/ projects/clangbsd/usr.bin/clang/lib/libllvmtarget/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmtransformutils/ projects/clangbsd/usr.bin/clang/lib/libllvmtransformutils/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmx86asmprinter/ projects/clangbsd/usr.bin/clang/lib/libllvmx86asmprinter/Makefile (contents, props changed) projects/clangbsd/usr.bin/clang/lib/libllvmx86codegen/ projects/clangbsd/usr.bin/clang/lib/libllvmx86codegen/Makefile (contents, props changed) Modified: projects/clangbsd/Makefile.inc1 projects/clangbsd/etc/mtree/BSD.include.dist projects/clangbsd/share/mk/bsd.own.mk projects/clangbsd/usr.bin/Makefile Modified: projects/clangbsd/Makefile.inc1 ============================================================================== --- projects/clangbsd/Makefile.inc1 Tue Jun 2 20:32:13 2009 (r193342) +++ projects/clangbsd/Makefile.inc1 Tue Jun 2 20:35:15 2009 (r193343) @@ -922,6 +922,13 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${MK_CLANG} != "no" +_clang_tblgen= \ + usr.bin/clang/lib/libllvmsupport \ + usr.bin/clang/lib/libllvmsystem \ + usr.bin/clang/bin/tblgen +.endif + .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge @@ -929,6 +936,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/ bootstrap-tools: .for _tool in \ + ${_clang_tblgen} \ ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ Modified: projects/clangbsd/etc/mtree/BSD.include.dist ============================================================================== --- projects/clangbsd/etc/mtree/BSD.include.dist Tue Jun 2 20:32:13 2009 (r193342) +++ projects/clangbsd/etc/mtree/BSD.include.dist Tue Jun 2 20:35:15 2009 (r193343) @@ -81,6 +81,10 @@ scsi .. .. + clang + 1.0 + .. + .. crypto .. dev Modified: projects/clangbsd/share/mk/bsd.own.mk ============================================================================== --- projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:32:13 2009 (r193342) +++ projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:35:15 2009 (r193343) @@ -407,6 +407,7 @@ MK_${var}:= yes BIND_LIBS \ BIND_SIGCHASE \ BIND_XML \ + CLANG \ GNU_CPIO \ HESIOD \ IDEA Modified: projects/clangbsd/usr.bin/Makefile ============================================================================== --- projects/clangbsd/usr.bin/Makefile Tue Jun 2 20:32:13 2009 (r193342) +++ projects/clangbsd/usr.bin/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -34,6 +34,7 @@ SUBDIR= alias \ ${_chkey} \ chpass \ cksum \ + ${_clang} \ cmp \ col \ ${_colcrt} \ @@ -270,6 +271,10 @@ _cpio= cpio _calendar= calendar .endif +.if ${MK_CLANG} != "no" +_clang= clang +.endif + .if ${MK_HESIOD} != "no" _hesinfo= hesinfo .endif Added: projects/clangbsd/usr.bin/clang/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +SUBDIR= lib \ + bin \ + include + +.include Added: projects/clangbsd/usr.bin/clang/bin/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +SUBDIR= clang \ + clang-cc + +.include Added: projects/clangbsd/usr.bin/clang/bin/bugpoint/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/bugpoint/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PROG_CXX=bugpoint + +SRCDIR= tools/bugpoint +SRCS= BugDriver.cpp CrashDebugger.cpp ExecutionDriver.cpp \ + ExtractFunction.cpp FindBugs.cpp Miscompilation.cpp \ + OptimizerDriver.cpp TestPasses.cpp ToolRunner.cpp bugpoint.cpp +MAN= + +LIBDEPS=llvmasmparser llvmscalaropts llvmlinker llvmipo llvmipa \ + llvmtransformutils llvminstrumentation llvmanalysis \ + llvmbitreader llvmbitwriter llvmtarget llvmcore llvmsupport \ + llvmsystem +TGHDRS= Intrinsics + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/clang-cc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/clang-cc/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PROG_CXX=clang-cc +BINDIR= /usr/libexec + +SRCDIR= tools/clang/tools/clang-cc +SRCS= clang-cc.cpp +MAN= + +TGHDRS= DiagnosticCommonKinds DiagnosticFrontendKinds \ + DiagnosticLexKinds DiagnosticSemaKinds +LIBDEPS=clangfrontend clangrewrite clanglex clangparse clanganalysis \ + clangsema clangcodegen clangast clangbasic \ + llvmselectiondag llvmasmprinter llvmcodegen llvmscalaropts \ + llvmbitreader llvmbitwriter llvmtarget llvmipo llvmipa \ + llvmtransformutils llvmanalysis llvmcore llvmsupport \ + llvmsystem +OBJDEPS=llvmarmasmprinter llvmarmcodegen \ + llvmia64asmprinter llvmia64codegen \ + llvmmipsasmprinter llvmmipscodegen \ + llvmpowerpcasmprinter llvmpowerpccodegen \ + llvmx86asmprinter llvmx86codegen + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/clang/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +.include + +PROG_CXX=clang + +SRCDIR= tools/clang/tools/driver +SRCS= driver.cpp +MAN= + +TGHDRS= DiagnosticCommonKinds +LIBDEPS=clangdriver clangfrontend clanglex clangbasic \ + llvmbitreader llvmbitwriter llvmsupport llvmsystem + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/llc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/llc/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PROG_CXX=llc + +SRCDIR= tools/llc +SRCS= llc.cpp +MAN= + +LIBDEPS=llvmselectiondag llvmasmprinter llvmcodegen llvmscalaropts \ + llvmipa llvmtransformutils llvmanalysis llvmbitreader \ + llvmtarget llvmcore llvmsupport llvmsystem +TGHDRS= Intrinsics +OBJDEPS=llvmcbackend + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/llvm-as/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/llvm-as/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PROG_CXX=llvm-as + +SRCDIR= tools/llvm-as +SRCS= llvm-as.cpp +MAN= + +LIBDEPS=llvmasmparser llvmbitwriter llvmcore llvmsupport llvmsystem + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/llvm-dis/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/llvm-dis/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PROG_CXX=llvm-dis + +SRCDIR= tools/llvm-dis +SRCS= llvm-dis.cpp +MAN= + +LIBDEPS=llvmbitreader llvmcore llvmsupport llvmsystem + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/opt/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/opt/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PROG_CXX=opt + +SRCDIR= tools/opt +SRCS= AnalysisWrappers.cpp GraphPrinters.cpp PrintSCC.cpp opt.cpp +MAN= + +TGHDRS= Intrinsics +LIBDEPS=llvminstrumentation llvmscalaropts llvmbitreader llvmbitwriter \ + llvmtarget llvmipo llvmipa llvmtransformutils llvmanalysis \ + llvmcore llvmsupport llvmsystem + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PROG_CXX=tblgen + +SRCDIR= utils/TableGen +SRCS= AsmWriterEmitter.cpp CallingConvEmitter.cpp \ + ClangDiagnosticsEmitter.cpp CodeEmitterGen.cpp \ + CodeGenDAGPatterns.cpp CodeGenInstruction.cpp \ + CodeGenTarget.cpp DAGISelEmitter.cpp FastISelEmitter.cpp \ + InstrEnumEmitter.cpp InstrInfoEmitter.cpp IntrinsicEmitter.cpp \ + LLVMCConfigurationEmitter.cpp Record.cpp \ + RegisterInfoEmitter.cpp SubtargetEmitter.cpp TGLexer.cpp \ + TGParser.cpp TGSourceMgr.cpp TGValueTypes.cpp TableGen.cpp \ + TableGenBackend.cpp + +NO_MAN= +LIBDEPS=llvmsupport llvmsystem + +.include "../../clang.prog.mk" Added: projects/clangbsd/usr.bin/clang/clang.build.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/clang.build.mk Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,55 @@ +# $FreeBSD$ + +LLVM_SRCS=${.CURDIR}/../../../../contrib/llvm +CLANG_SRCS=${LLVM_SRCS}/tools/clang + +CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \ + -I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \ + -I${.CURDIR}/../../include \ + -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \ + -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS +TARGET_ARCH?= ${MACHINE_ARCH} +# XXX: 8.0, to keep __FreeBSD_cc_version happy +CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd8.0\" + +.PATH: ${LLVM_SRCS}/${SRCDIR} + +TBLGEN=tblgen ${CFLAGS:M-I*} + +Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/Intrinsics.td + ${TBLGEN} -gen-intrinsic \ + ${LLVM_SRCS}/include/llvm/Intrinsics.td > ${.TARGET} +.for arch in \ + ARM:ARM IA64:IA64 Mips:Mips PowerPC:PPC X86:X86 +. for hdr in \ + AsmWriter1:-gen-asm-writer,-asmwriternum=1 \ + AsmWriter:-gen-asm-writer \ + CallingConv:-gen-callingconv \ + CodeEmitter:-gen-emitter \ + DAGISel:-gen-dag-isel \ + FastISel:-gen-fast-isel \ + InstrInfo:-gen-instr-desc \ + InstrNames:-gen-instr-enums \ + RegisterInfo.h:-gen-register-desc-header \ + RegisterInfo:-gen-register-desc \ + RegisterNames:-gen-register-enums \ + Subtarget:-gen-subtarget +${arch:C/.*://}Gen${hdr:C/:.*/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:C/:.*//}/${arch:C/.*://}.td + ${TBLGEN} ${hdr:C/.*://:C/,/ /g} \ + ${LLVM_SRCS}/lib/Target/${arch:C/:.*//}/${arch:C/.*://}.td > ${.TARGET} +. endfor +.endfor +DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \ + -gen-clang-diag-groups \ + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td > ${.TARGET} +.for hdr in AST Analysis Common Driver Frontend Lex Parse Sema +Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \ + -gen-clang-diags-defs -clang-component=${hdr} \ + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td > ${.TARGET} +.endfor + +SRCS+= ${TGHDRS:C/$/.inc.h/} +DPADD+= ${TGHDRS:C/$/.inc.h/} +CLEANFILES+= ${TGHDRS:C/$/.inc.h/} Added: projects/clangbsd/usr.bin/clang/clang.lib.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/clang.lib.mk Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +.include "clang.build.mk" + +.if defined(MAKEOBJ) +# XXX: In some cases we cannot use archives, such as the targets. +INTERNALPROG= +PROG= lib${LIB}.o +LDADD= -Wl,-r -nodefaultlibs -nostdlib -nostartfiles +NO_MAN= +.include +.else +INTERNALLIB= +.include +.endif Added: projects/clangbsd/usr.bin/clang/clang.prog.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/clang.prog.mk Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include "clang.build.mk" + +.for lib in ${OBJDEPS:C/$/.o/} ${LIBDEPS:C/$/.a/} +DPADD+= ${.OBJDIR}/../../lib/lib${lib:C/\..$//}/lib${lib} +LDADD+= ${.OBJDIR}/../../lib/lib${lib:C/\..$//}/lib${lib} +.endfor + +BINDIR?=/usr/bin + +.include Added: projects/clangbsd/usr.bin/clang/include/ARMGenAsmWriter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenAsmWriter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenAsmWriter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenCallingConv.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenCallingConv.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenCallingConv.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenCodeEmitter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenCodeEmitter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenCodeEmitter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenDAGISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenDAGISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenDAGISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenInstrInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenInstrInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenInstrInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenInstrNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenInstrNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenInstrNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.h.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.h.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenRegisterInfo.h.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenRegisterInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenRegisterInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenRegisterNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenRegisterNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenRegisterNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/ARMGenSubtarget.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/ARMGenSubtarget.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "ARMGenSubtarget.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenAsmWriter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenAsmWriter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenAsmWriter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenDAGISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenDAGISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenDAGISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenInstrInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenInstrInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenInstrInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenInstrNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenInstrNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenInstrNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.h.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.h.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenRegisterInfo.h.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenRegisterInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenRegisterInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/IA64GenRegisterNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/IA64GenRegisterNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "IA64GenRegisterNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/Makefile Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../contrib/llvm/tools/clang/lib/Headers + +INCSDIR=${INCLUDEDIR}/clang/1.0 + +INCS= emmintrin.h mm_malloc.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h + +.include +.include +.include Added: projects/clangbsd/usr.bin/clang/include/MipsGenAsmWriter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenAsmWriter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenAsmWriter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenCallingConv.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenCallingConv.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenCallingConv.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenDAGISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenDAGISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenDAGISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenInstrInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenInstrInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenInstrInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenInstrNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenInstrNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenInstrNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.h.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.h.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenRegisterInfo.h.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenRegisterInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenRegisterInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenRegisterNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenRegisterNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenRegisterNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/MipsGenSubtarget.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/MipsGenSubtarget.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenSubtarget.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenAsmWriter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenAsmWriter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenAsmWriter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenCallingConv.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenCallingConv.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenCallingConv.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenCodeEmitter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenCodeEmitter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenCodeEmitter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenDAGISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenDAGISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenDAGISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenInstrInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenInstrInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenInstrInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenInstrNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenInstrNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenInstrNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.h.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.h.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenRegisterInfo.h.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenRegisterInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenRegisterInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenRegisterNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenRegisterNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenRegisterNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/PPCGenSubtarget.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/PPCGenSubtarget.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenSubtarget.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenAsmWriter.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter1.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenAsmWriter1.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenAsmWriter1.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenCallingConv.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenCallingConv.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenCallingConv.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenDAGISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenDAGISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenDAGISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenFastISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenFastISel.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenFastISel.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenInstrInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenInstrInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenInstrInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenInstrNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenInstrNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenInstrNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.h.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.h.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenRegisterInfo.h.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenRegisterInfo.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenRegisterInfo.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenRegisterNames.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenRegisterNames.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenRegisterNames.inc.h" Added: projects/clangbsd/usr.bin/clang/include/X86GenSubtarget.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/X86GenSubtarget.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "X86GenSubtarget.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticASTKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticASTKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticASTKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticAnalysisKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticCommonKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticCommonKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticCommonKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticDriverKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticDriverKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticDriverKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticFrontendKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticFrontendKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticFrontendKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticGroups.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticGroups.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticGroups.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticLexKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticLexKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticLexKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticParseKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticParseKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticParseKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticSemaKinds.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/clang/Basic/DiagnosticSemaKinds.inc Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "DiagnosticSemaKinds.inc.h" Added: projects/clangbsd/usr.bin/clang/include/llvm/ADT/iterator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/llvm/ADT/iterator.h Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,78 @@ +/* include/llvm/ADT/iterator.h. Generated from iterator.h.in by configure. */ +//==-- llvm/ADT/iterator.h - Portable wrapper around --*- C++ -*-==// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file provides a wrapper around the mysterious header file. +// In GCC 2.95.3, the file defines a bidirectional_iterator class (and other +// friends), instead of the standard iterator class. In GCC 3.1, the +// bidirectional_iterator class got moved out and the new, standards compliant, +// iterator<> class was added. Because there is nothing that we can do to get +// correct behavior on both compilers, we have this header with #ifdef's. Gross +// huh? +// +// By #includ'ing this file, you get the contents of plus the +// following classes in the global namespace: +// +// 1. bidirectional_iterator +// 2. forward_iterator +// +// The #if directives' expressions are filled in by Autoconf. +// +// $FreeBSD$ +//===----------------------------------------------------------------------===// + +#ifndef LLVM_ADT_ITERATOR_H +#define LLVM_ADT_ITERATOR_H + +#include + +#define HAVE_BI_ITERATOR 0 +#define HAVE_STD_ITERATOR 1 +#define HAVE_FWD_ITERATOR 0 + +#ifdef _MSC_VER +# define HAVE_BI_ITERATOR 0 +# define HAVE_STD_ITERATOR 1 +# define HAVE_FWD_ITERATOR 0 +#endif + +#if !HAVE_BI_ITERATOR +# if HAVE_STD_ITERATOR +/// If the bidirectional iterator is not defined, we attempt to define it in +/// terms of the C++ standard iterator. Otherwise, we import it with a "using" +/// statement. +/// +template +struct bidirectional_iterator + : public std::iterator { +}; +# else +# error "Need to have standard iterator to define bidirectional iterator!" +# endif +#else +using std::bidirectional_iterator; +#endif + +#if !HAVE_FWD_ITERATOR +# if HAVE_STD_ITERATOR +/// If the forward iterator is not defined, attempt to define it in terms of +/// the C++ standard iterator. Otherwise, we import it with a "using" statement. +/// +template +struct forward_iterator + : public std::iterator { +}; +# else +# error "Need to have standard iterator to define forward iterator!" +# endif +#else +using std::forward_iterator; +#endif + +#endif // LLVM_ADT_ITERATOR_H Added: projects/clangbsd/usr.bin/clang/include/llvm/Config/config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clangbsd/usr.bin/clang/include/llvm/Config/config.h Tue Jun 2 20:35:15 2009 (r193343) @@ -0,0 +1,532 @@ +/* $FreeBSD$ */ +/* include/llvm/Config/config.h. Generated from config.h.in by configure. */ +/* include/llvm/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */ + +/* Define if dlopen(0) will open the symbols of the program */ +#define CAN_DLOPEN_SELF 1 + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define if CBE is enabled for printf %a output */ +#define ENABLE_CBE_PRINTF_A 1 + +/* Define if position independent code is enabled */ +#define ENABLE_PIC 1 + +/* Define if threads enabled */ +#define ENABLE_THREADS 1 + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the `argz_append' function. */ +/* #undef HAVE_ARGZ_APPEND */ + +/* Define to 1 if you have the `argz_create_sep' function. */ +/* #undef HAVE_ARGZ_CREATE_SEP */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the `argz_insert' function. */ +/* #undef HAVE_ARGZ_INSERT */ + +/* Define to 1 if you have the `argz_next' function. */ +/* #undef HAVE_ARGZ_NEXT */ + +/* Define to 1 if you have the `argz_stringify' function. */ +/* #undef HAVE_ARGZ_STRINGIFY */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the `backtrace' function. */ +/* #undef HAVE_BACKTRACE */ + +/* Define to 1 if you have the `bcopy' function. */ +/* #undef HAVE_BCOPY */ + +/* Does not have bi-directional iterator */ +#define HAVE_BI_ITERATOR 0 + +/* Define to 1 if you have the `ceilf' function. */ +#define HAVE_CEILF 1 + +/* Define to 1 if you have the `closedir' function. */ +#define HAVE_CLOSEDIR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define if you have the GNU dld library. */ +/* #undef HAVE_DLD */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLD_H */ + +/* Define to 1 if you have the `dlerror' function. */ +#define HAVE_DLERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DL_H */ + +/* Define if the dot program is available */ +/* #undef HAVE_DOT */ + +/* Define if the dotty program is available */ +/* #undef HAVE_DOTTY */ + +/* Define if you have the _dyld_func_lookup function. */ +/* #undef HAVE_DYLD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if the system has the type `error_t'. */ +/* #undef HAVE_ERROR_T */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EXECINFO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Set to 1 if the finite function is found in */ +/* #undef HAVE_FINITE_IN_IEEEFP_H */ + +/* Define to 1 if you have the `floorf' function. */ +#define HAVE_FLOORF 1 + +/* Define to 1 if you have the `fmodf' function. */ +#define HAVE_FMODF 1 + +/* Does not have forward iterator */ +#define HAVE_FWD_ITERATOR 0 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define if the Graphviz program is available */ +/* #undef HAVE_GRAPHVIZ */ + +/* Define if the gv program is available */ +/* #undef HAVE_GV */ + +/* Define to 1 if you have the `index' function. */ +/* #undef HAVE_INDEX */ + +/* Define to 1 if the system has the type `int64_t'. */ +#define HAVE_INT64_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Set to 1 if the isinf function is found in */ +#define HAVE_ISINF_IN_CMATH 1 + +/* Set to 1 if the isinf function is found in */ +#define HAVE_ISINF_IN_MATH_H 1 + +/* Set to 1 if the isnan function is found in */ +#define HAVE_ISNAN_IN_CMATH 1 + +/* Set to 1 if the isnan function is found in */ +#define HAVE_ISNAN_IN_MATH_H 1 + +/* Define if you have the libdl library or equivalent. */ +#define HAVE_LIBDL 1 + +/* Define to 1 if you have the `elf' library (-lelf). */ +#define HAVE_LIBELF 1 + +/* Define to 1 if you have the `imagehlp' library (-limagehlp). */ +/* #undef HAVE_LIBIMAGEHLP */ + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `udis86' library (-ludis86). */ +/* #undef HAVE_LIBUDIS86 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if you can use -Wl,-export-dynamic. */ +#define HAVE_LINK_EXPORT_DYNAMIC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LINK_H 1 + +/* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add + the current directory to the dynamic linker search path. */ +#define HAVE_LINK_R 1 + +/* Define to 1 if you have the `longjmp' function. */ +#define HAVE_LONGJMP 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACH_MACH_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACH_O_DYLD_H */ + +/* Define if mallinfo() is available on this platform. */ +/* #undef HAVE_MALLINFO */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_MALLOC_H */ + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +/* #undef HAVE_MALLOC_ZONE_STATISTICS */ + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mkdtemp' function. */ +#define HAVE_MKDTEMP 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have the `mktemp' function. */ +#define HAVE_MKTEMP 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if + it uses MAP_ANON */ +/* #undef HAVE_MMAP_ANONYMOUS */ + +/* Define if mmap() can map files into memory */ +#define HAVE_MMAP_FILE + +/* define if the compiler implements namespaces */ +#define HAVE_NAMESPACES + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the `nearbyintf' function. */ +#define HAVE_NEARBYINTF 1 + +/* Define to 1 if you have the `opendir' function. */ +#define HAVE_OPENDIR 1 + +/* Define to 1 if you have the `powf' function. */ +#define HAVE_POWF 1 + +/* Define if libtool can extract symbol lists from object files. */ +#define HAVE_PRELOADED_SYMBOLS 1 + +/* Define to have the %a format string */ +#define HAVE_PRINTF_A 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Define to 1 if srand48/lrand48/drand48 exist in */ +#define HAVE_RAND48 1 + +/* Define to 1 if you have the `readdir' function. */ +#define HAVE_READDIR 1 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:40:24 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 574F71065670; Tue, 2 Jun 2009 20:40:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4337A8FC1A; Tue, 2 Jun 2009 20:40:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KeON7027660; Tue, 2 Jun 2009 20:40:24 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52KeN4j027656; Tue, 2 Jun 2009 20:40:23 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906022040.n52KeN4j027656@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 20:40:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193344 - in projects/clangbsd/contrib/llvm/tools/clang: lib/Driver lib/Frontend tools/clang-cc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:40:24 -0000 Author: ed Date: Tue Jun 2 20:40:23 2009 New Revision: 193344 URL: http://svn.freebsd.org/changeset/base/193344 Log: Add local modifications to the Clang sources. - Custom include paths. Use proper relative pathnames, to prevent stock header files from being included during buildworld, etc. - Experimental ARM modifications. I haven't submitted these yet, because I haven't tested them enough. Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp ============================================================================== --- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Tue Jun 2 20:35:15 2009 (r193343) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Tue Jun 2 20:40:23 2009 (r193344) @@ -53,6 +53,9 @@ Driver::Driver(const char *_Name, const // Only use clang on i386 and x86_64 by default. CCCClangArchs.insert("i386"); CCCClangArchs.insert("x86_64"); + + // XXX: Enable ARM + CCCClangArchs.insert("arm"); } Driver::~Driver() { Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Tue Jun 2 20:35:15 2009 (r193343) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Tue Jun 2 20:40:23 2009 (r193344) @@ -352,7 +352,7 @@ void Clang::ConstructJob(Compilation &C, if (getToolChain().getArchName() == "x86_64") CmdArgs.push_back("--mcpu=x86-64"); else if (getToolChain().getArchName() == "i386") - CmdArgs.push_back("--mcpu=pentium4"); + CmdArgs.push_back("--mcpu=i486"); } } @@ -1734,6 +1734,8 @@ void freebsd::Assemble::ConstructJob(Com // instruct as in the base system to assemble 32-bit code. if (getToolChain().getArchName() == "i386") CmdArgs.push_back("--32"); + else if (getToolChain().getArchName() == "arm") + CmdArgs.push_back("-mfpu=softvfp"); Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, options::OPT_Xassembler); Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp ============================================================================== --- projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp Tue Jun 2 20:35:15 2009 (r193343) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp Tue Jun 2 20:40:23 2009 (r193344) @@ -106,7 +106,11 @@ void InitHeaderSearch::AddDefaultSystemI // FIXME: temporary hack: hard-coded paths. // FIXME: get these from the target? -#ifdef LLVM_ON_WIN32 +#if defined(LLVM_ON_FREEBSD) + if (Lang.CPlusPlus) + AddPath("/usr/include/c++/4.2", System, true, false, false); + AddPath("/usr/include", System, false, false, false); +#elif defined(LLVM_ON_WIN32) if (Lang.CPlusPlus) { // Mingw32 GCC version 4 AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++", Modified: projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp ============================================================================== --- projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp Tue Jun 2 20:35:15 2009 (r193343) +++ projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp Tue Jun 2 20:40:23 2009 (r193344) @@ -1214,15 +1214,36 @@ void InitializeIncludePaths(const char * MainExecutablePath.eraseComponent(); // Remove /bin from foo/bin // Get foo/lib/clang//include +#ifdef LLVM_ON_FREEBSD + MainExecutablePath.appendComponent("include"); + MainExecutablePath.appendComponent("clang"); + MainExecutablePath.appendComponent("1.0"); +#else MainExecutablePath.appendComponent("lib"); MainExecutablePath.appendComponent("clang"); MainExecutablePath.appendComponent(CLANG_VERSION_STRING); MainExecutablePath.appendComponent("include"); +#endif // We pass true to ignore sysroot so that we *always* look for clang headers // relative to our executable, never relative to -isysroot. Init.AddPath(MainExecutablePath.c_str(), InitHeaderSearch::System, false, false, false, true /*ignore sysroot*/); + +#ifdef LLVM_ON_FREEBSD + if (!nostdinc) { + MainExecutablePath.eraseComponent(); + MainExecutablePath.eraseComponent(); + if (Lang.CPlusPlus) { + MainExecutablePath.appendComponent("c++"); + MainExecutablePath.appendComponent("4.2"); + Init.AddPath(MainExecutablePath.c_str(), InitHeaderSearch::System, true, false, false); + MainExecutablePath.eraseComponent(); + MainExecutablePath.eraseComponent(); + } + Init.AddPath(MainExecutablePath.c_str(), InitHeaderSearch::System, false, false, false); + } +#endif } if (!nostdinc) From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:44:21 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE7DC1065672; Tue, 2 Jun 2009 20:44:21 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CABB18FC1B; Tue, 2 Jun 2009 20:44:21 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KiLWC027771; Tue, 2 Jun 2009 20:44:21 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52KiLNn027770; Tue, 2 Jun 2009 20:44:21 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906022044.n52KiLNn027770@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 20:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193345 - projects/acpica_20090521/sys/contrib/dev/acpica/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:44:22 -0000 Author: jkim Date: Tue Jun 2 20:44:21 2009 New Revision: 193345 URL: http://svn.freebsd.org/changeset/base/193345 Log: Remove function redeclaration. It was upstreamed but lost somehow. Modified: projects/acpica_20090521/sys/contrib/dev/acpica/include/acdebug.h Modified: projects/acpica_20090521/sys/contrib/dev/acpica/include/acdebug.h ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/include/acdebug.h Tue Jun 2 20:40:23 2009 (r193344) +++ projects/acpica_20090521/sys/contrib/dev/acpica/include/acdebug.h Tue Jun 2 20:44:21 2009 (r193345) @@ -313,14 +313,6 @@ AcpiDbDisplayArgumentObject ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState); -void -AcpiDbCheckPredefinedNames ( - void); - -void -AcpiDbBatchExecute ( - void); - /* * dbexec - debugger control method execution */ From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:47:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B0E81065680; Tue, 2 Jun 2009 20:47:11 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E9F88FC23; Tue, 2 Jun 2009 20:47:11 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KlA3W027863; Tue, 2 Jun 2009 20:47:10 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52KlAa2027859; Tue, 2 Jun 2009 20:47:10 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906022047.n52KlAa2027859@svn.freebsd.org> From: Ed Schouten Date: Tue, 2 Jun 2009 20:47:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193346 - in projects/clangbsd: . gnu/usr.bin/cc/cc share/mk usr.bin/clang/bin/clang X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:47:11 -0000 Author: ed Date: Tue Jun 2 20:47:10 2009 New Revision: 193346 URL: http://svn.freebsd.org/changeset/base/193346 Log: Add CLANG_IS_CC, which will install Clang as cc, instead of GCC. This also means it will build everything with Clang. Modified: projects/clangbsd/Makefile.inc1 projects/clangbsd/gnu/usr.bin/cc/cc/Makefile projects/clangbsd/share/mk/bsd.own.mk projects/clangbsd/usr.bin/clang/bin/clang/Makefile Modified: projects/clangbsd/Makefile.inc1 ============================================================================== --- projects/clangbsd/Makefile.inc1 Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/Makefile.inc1 Tue Jun 2 20:47:10 2009 (r193346) @@ -1021,8 +1021,13 @@ _kgzip= usr.sbin/kgzip .endif .endif +.if ${MK_CLANG_IS_CC} != "no" +_clang= usr.bin/clang +.endif + cross-tools: .for _tool in \ + ${_clang} \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ usr.bin/sed \ Modified: projects/clangbsd/gnu/usr.bin/cc/cc/Makefile ============================================================================== --- projects/clangbsd/gnu/usr.bin/cc/cc/Makefile Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/gnu/usr.bin/cc/cc/Makefile Tue Jun 2 20:47:10 2009 (r193346) @@ -1,15 +1,18 @@ # $FreeBSD$ +.include + .include "../Makefile.inc" .include "../Makefile.fe" -PROG= cc -MAN= gcc.1 +PROG= gcc SRCS+= gccspec.c NO_SHARED?=yes -LINKS= ${BINDIR}/cc ${BINDIR}/gcc +.if ${MK_CLANG_IS_CC} == "no" +LINKS= ${BINDIR}/gcc ${BINDIR}/cc +.endif MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 .include Modified: projects/clangbsd/share/mk/bsd.own.mk ============================================================================== --- projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:47:10 2009 (r193346) @@ -408,6 +408,7 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ CLANG \ + CLANG_IS_CC \ GNU_CPIO \ HESIOD \ IDEA Modified: projects/clangbsd/usr.bin/clang/bin/clang/Makefile ============================================================================== --- projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Jun 2 20:47:10 2009 (r193346) @@ -8,6 +8,10 @@ SRCDIR= tools/clang/tools/driver SRCS= driver.cpp MAN= +.if ${MK_CLANG_IS_CC} != "no" +LINKS= ${BINDIR}/clang ${BINDIR}/cc +.endif + TGHDRS= DiagnosticCommonKinds LIBDEPS=clangdriver clangfrontend clanglex clangbasic \ llvmbitreader llvmbitwriter llvmsupport llvmsystem From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 20:58:35 2009 Return-Path: Delivered-To: svn-src-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7686F1065678; Tue, 2 Jun 2009 20:58:35 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 127C08FC21; Tue, 2 Jun 2009 20:58:34 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 862101CF8F; Tue, 2 Jun 2009 22:58:33 +0200 (CEST) Date: Tue, 2 Jun 2009 22:58:33 +0200 From: Ed Schouten To: Roman Divacky Message-ID: <20090602205833.GY48776@hoeg.nl> References: <200906022040.n52KeN4j027656@svn.freebsd.org> <20090602204632.GA79046@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MgQdU7jr+b9ajvaw" Content-Disposition: inline In-Reply-To: <20090602204632.GA79046@freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r193344 - in projects/clangbsd/contrib/llvm/tools/clang: lib/Driver lib/Frontend tools/clang-cc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 20:58:36 -0000 --MgQdU7jr+b9ajvaw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Roman, * Roman Divacky wrote: > no printf extensions? Nope, they're not there yet. We'll discuss the best way to solve this in the nearby future. I discussed this with Daniel Dunbar some time ago and we both agreed the best way to do it, would be to add a new attribute. We can then use _KERNEL in to let __printflike() use one attribute or the other. --=20 Ed Schouten WWW: http://80386.nl/ --MgQdU7jr+b9ajvaw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkolknkACgkQ52SDGA2eCwUdWgCcCMPoLMmJB2p6JBxyJw54KnWv LB0AniI1td1Rdgsi7FIJei3ZiDKJYwXR =3Y7n -----END PGP SIGNATURE----- --MgQdU7jr+b9ajvaw-- From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 21:06:18 2009 Return-Path: Delivered-To: svn-src-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3861010656C9 for ; Tue, 2 Jun 2009 21:06:18 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id E29048FC1F for ; Tue, 2 Jun 2009 21:06:17 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 4DE6B9CB076; Tue, 2 Jun 2009 22:46:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QD-MPmBJ9LA3; Tue, 2 Jun 2009 22:46:32 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id A84999CB10F; Tue, 2 Jun 2009 22:46:32 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id n52KkW7x079138; Tue, 2 Jun 2009 22:46:32 +0200 (CEST) (envelope-from rdivacky) Date: Tue, 2 Jun 2009 22:46:32 +0200 From: Roman Divacky To: Ed Schouten Message-ID: <20090602204632.GA79046@freebsd.org> References: <200906022040.n52KeN4j027656@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: <200906022040.n52KeN4j027656@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r193344 - in projects/clangbsd/contrib/llvm/tools/clang: lib/Driver lib/Frontend tools/clang-cc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 21:06:19 -0000 --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 02, 2009 at 08:40:23PM +0000, Ed Schouten wrote: > Author: ed > Date: Tue Jun 2 20:40:23 2009 > New Revision: 193344 > URL: http://svn.freebsd.org/changeset/base/193344 >=20 > Log: > Add local modifications to the Clang sources. > =20 > - Custom include paths. Use proper relative pathnames, to prevent stock > header files from being included during buildworld, etc. > - Experimental ARM modifications. I haven't submitted these yet, because > I haven't tested them enough. no printf extensions? --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAkolj6cACgkQLVEj6D3CBEw/6wCeIaU97lm0kG1BQrI0KFMEjRyn RDMAoIUJr4FgVnFqKfCa+FpM8P7KnesU =/YPv -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j-- From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 21:40:58 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38329106566B; Tue, 2 Jun 2009 21:40:58 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 25C168FC16; Tue, 2 Jun 2009 21:40:58 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52LewdT029222; Tue, 2 Jun 2009 21:40:58 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52LewDb029221; Tue, 2 Jun 2009 21:40:58 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906022140.n52LewDb029221@svn.freebsd.org> From: Rui Paulo Date: Tue, 2 Jun 2009 21:40:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193353 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 21:40:58 -0000 Author: rpaulo Date: Tue Jun 2 21:40:57 2009 New Revision: 193353 URL: http://svn.freebsd.org/changeset/base/193353 Log: Fix previous commits. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jun 2 21:17:56 2009 (r193352) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jun 2 21:40:57 2009 (r193353) @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); static int ieee80211_hwmp_send_action(struct ieee80211_node *, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN], - const uint8_t *, size_t); + uint8_t *, size_t); static uint8_t *hwmp_add_meshpreq(uint8_t *, const struct ieee80211_meshpreq_ie *); static uint8_t *hwmp_add_meshprep(uint8_t *, @@ -110,7 +110,7 @@ static int ieee80211_hwmp_pathtoroottime static int ieee80211_hmwp_rootint = 2000; static int ieee80211_hwmp_rannint = 1000; #endif -static int ieee80211_hwmp_targetonly = 1; +static int ieee80211_hwmp_targetonly = 0; static int ieee80211_hwmp_replyforward = 1; #ifdef notyet static int ieee80211_hwmp_pathmaintenance = 2000; @@ -281,9 +281,9 @@ ieee80211_hwmp_recv_action(struct ieee80 static int ieee80211_hwmp_send_action(struct ieee80211_node *ni, - const uint8_t addr1[IEEE80211_ADDR_LEN], - const uint8_t addr2[IEEE80211_ADDR_LEN], - const uint8_t *ie, size_t len) + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], + uint8_t *ie, size_t len) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; @@ -325,22 +325,22 @@ ieee80211_hwmp_send_action(struct ieee80 case IEEE80211_ELEMID_MESHPREQ: *frm++ = IEEE80211_ACTION_MESHPATH_REQ; frm = hwmp_add_meshpreq(frm, - (struct ieee80211_meshpreq_ie *)&ie); + (struct ieee80211_meshpreq_ie *)ie); break; case IEEE80211_ELEMID_MESHPREP: *frm++ = IEEE80211_ACTION_MESHPATH_REP; frm = hwmp_add_meshprep(frm, - (struct ieee80211_meshprep_ie *)&ie); + (struct ieee80211_meshprep_ie *)ie); break; case IEEE80211_ELEMID_MESHPERR: *frm++ = IEEE80211_ACTION_MESHPATH_ERR; frm = hwmp_add_meshperr(frm, - (struct ieee80211_meshperr_ie *)&ie); + (struct ieee80211_meshperr_ie *)ie); break; case IEEE80211_ELEMID_MESHRANN: *frm++ = IEEE80211_ACTION_MESHPATH_RANN; frm = hwmp_add_meshrann(frm, - (struct ieee80211_meshrann_ie *)&ie); + (struct ieee80211_meshrann_ie *)ie); break; } @@ -353,7 +353,7 @@ ieee80211_hwmp_send_action(struct ieee80 } ieee80211_send_setup(ni, m, IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_ACTION, - IEEE80211_NONQOS_TID, addr1, addr2, addr2); + IEEE80211_NONQOS_TID, sa, da, sa); m->m_flags |= M_ENCAP; /* mark encapsulated */ IEEE80211_NODE_STAT(ni, tx_mgmt); @@ -476,6 +476,9 @@ hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_hwmp_state *hs = vap->iv_hwmp; struct ieee80211_hwmp_fi *fi = NULL; + IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + "received PREQ, source %s", ether_sprintf(preq->preq_origaddr)); + /* * Acceptance criteria: if the PREQ is not for us and * forwarding is disabled, discard this PREQ. @@ -505,6 +508,9 @@ hwmp_recv_preq(struct ieee80211vap *vap, */ if (IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0))) { struct ieee80211_meshprep_ie prep; + + IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + "replying to %s", ether_sprintf(preq->preq_origaddr)); /* * Build and send a PREP frame. */ @@ -519,7 +525,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, IEEE80211_ADDR_COPY(prep.prep_origaddr, vap->iv_myaddr); prep.prep_origseq = hs->hs_seq++; /* XXX addr1 = next hop */ - hwmp_send_prep(ni, preq->preq_origaddr, vap->iv_myaddr, &prep); + hwmp_send_prep(ni, vap->iv_myaddr, preq->preq_origaddr, &prep); return; } @@ -532,6 +538,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, !(PREQ_TFLAGS(0) & IEEE80211_MESHPREQ_TFLAGS_TO)) { struct ieee80211_meshpreq_ie ppreq; /* propagated PREQ */ + memcpy(&ppreq, preq, sizeof(ppreq)); /* * Can we do an intermediate path reply? @@ -539,6 +546,9 @@ hwmp_recv_preq(struct ieee80211vap *vap, if (fi != NULL) { struct ieee80211_meshprep_ie prep; + IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + "replying and forwarding PREQ from %s", + ether_sprintf(preq->preq_origaddr)); /* * Propagate the original PREQ. */ @@ -573,6 +583,9 @@ hwmp_recv_preq(struct ieee80211vap *vap, hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &prep); } else { + IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + "forwarding PREQ from %s", + ether_sprintf(preq->preq_origaddr)); /* * We have no information about this path, * propagate the PREQ. @@ -612,21 +625,23 @@ hwmp_recv_preq(struct ieee80211vap *vap, static inline int hwmp_send_preq(struct ieee80211_node *ni, - const uint8_t addr1[IEEE80211_ADDR_LEN], - const uint8_t addr2[IEEE80211_ADDR_LEN], + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], struct ieee80211_meshpreq_ie *preq) { /* * mesh preq action frame format - * [6] addr1 - * [6] addr2 - * [6] addr3 = addr2 + * [6] da + * [6] sa + * [6] addr3 = sa * [1] action * [1] category * [tlv] mesh path request */ - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&preq, - sizeof(*preq)); + preq->preq_ie = IEEE80211_ELEMID_MESHPREQ; + + return ieee80211_hwmp_send_action(ni, sa, da, (uint8_t *)preq, + sizeof(struct ieee80211_meshpreq_ie)); } static void @@ -660,8 +675,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, pprep.prep_ttl -= 1; pprep.prep_metric += ieee80211_airtime_calc(ni); IEEE80211_ADDR_COPY(pprep.prep_origaddr, vap->iv_myaddr); - hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, - &pprep); + hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &pprep); /* * XXX: Step 5: update the precursor list. */ @@ -683,21 +697,23 @@ hwmp_recv_prep(struct ieee80211vap *vap, static inline int hwmp_send_prep(struct ieee80211_node *ni, - const uint8_t addr1[IEEE80211_ADDR_LEN], - const uint8_t addr2[IEEE80211_ADDR_LEN], + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], struct ieee80211_meshprep_ie *prep) { /* * mesh prep action frame format - * [6] addr1 - * [6] addr2 - * [6] addr3 = addr2 + * [6] da + * [6] sa + * [6] addr3 = sa * [1] action * [1] category * [tlv] mesh path reply */ - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&prep, - sizeof(*prep)); + prep->prep_ie = IEEE80211_ELEMID_MESHPREP; + + return ieee80211_hwmp_send_action(ni, sa, da, (uint8_t *)prep, + sizeof(struct ieee80211_meshprep_ie)); } #define PERR_DADDR(n) perr->perr_dests[n].dest_addr @@ -737,21 +753,21 @@ hwmp_recv_perr(struct ieee80211vap *vap, static inline int hwmp_send_perr(struct ieee80211_node *ni, - const uint8_t addr1[IEEE80211_ADDR_LEN], - const uint8_t addr2[IEEE80211_ADDR_LEN], + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], struct ieee80211_meshperr_ie *perr) { /* * mesh perr action frame format - * [6] addr1 - * [6] addr2 - * [6] addr3 = addr2 + * [6] da + * [6] sa + * [6] addr3 = sa * [1] action * [1] category * [tlv] mesh path error */ - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&perr, - sizeof(*perr)); + return ieee80211_hwmp_send_action(ni, sa, da, (uint8_t *)perr, + sizeof(struct ieee80211_meshperr_ie)); } static void @@ -791,8 +807,7 @@ hwmp_recv_rann(struct ieee80211vap *vap, preq.preq_targets[0].target_seq = rann->rann_seq; preq.preq_lifetime = ieee80211_hwmp_roottimeout; preq.preq_metric = IEEE80211_MESHLMETRIC_INITIALVAL; - hwmp_send_preq(ni, vap->iv_myaddr, broadcastaddr, - &preq); + hwmp_send_preq(ni, vap->iv_myaddr, broadcastaddr, &preq); /* * We have a path for this Root Mesh station, so * propagate the RANN if forwarding is enabled. @@ -804,27 +819,27 @@ hwmp_recv_rann(struct ieee80211vap *vap, prann.rann_hopcount += 1; prann.rann_ttl -= 1; prann.rann_metric += ieee80211_airtime_calc(ni); - hwmp_send_rann(ni, broadcastaddr, vap->iv_myaddr, &prann); + hwmp_send_rann(ni, vap->iv_myaddr, broadcastaddr, &prann); } } static inline int hwmp_send_rann(struct ieee80211_node *ni, - const uint8_t addr1[IEEE80211_ADDR_LEN], - const uint8_t addr2[IEEE80211_ADDR_LEN], + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], struct ieee80211_meshrann_ie *rann) { /* * mesh rann action frame format - * [6] addr1 - * [6] addr2 - * [6] addr3 = addr2 + * [6] da + * [6] sa + * [6] addr3 = sa * [1] action * [1] category * [tlv] root annoucement */ - return ieee80211_hwmp_send_action(ni, addr1, addr2, (uint8_t *)&rann, - sizeof(*rann)); + return ieee80211_hwmp_send_action(ni, sa, da, (uint8_t *)rann, + sizeof(struct ieee80211_meshrann_ie)); } #define PREQ_TFLAGS(n) preq.preq_targets[n].target_flags @@ -843,6 +858,12 @@ ieee80211_hwmp_discover(struct ieee80211 KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a mesh vap, opmode %d", vap->iv_opmode)); + if (IEEE80211_IS_MULTICAST(dest)) + return ieee80211_find_txnode(vap, dest); + + IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest, + "%s", "initiating path discovery"); + mtx_lock(&hs->hs_lock); TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) { @@ -850,43 +871,54 @@ ieee80211_hwmp_discover(struct ieee80211 /* XXX check preq retries */ sendpreq = 1; unknowndst = 1; - break; } + break; } } mtx_unlock(&hs->hs_lock); + if (fi == NULL) { + fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP, + M_NOWAIT | M_ZERO); + memcpy(fi->fi_dest, dest, IEEE80211_ADDR_LEN); + fi->fi_seq = ++hs->hs_seq; + fi->fi_metric = IEEE80211_MESHLMETRIC_INITIALVAL; + fi->fi_lifetime = ieee80211_hwmp_pathtimeout; + mtx_lock(&hs->hs_lock); + TAILQ_INSERT_TAIL(&hs->hs_head, fi, fi_next); + mtx_unlock(&hs->hs_lock); + sendpreq = 1; + unknowndst = 1; + } + if (sendpreq) { /* - * Try to discover the path for this - * node. + * Try to discover the path for this node. */ + preq.preq_flags = 0; preq.preq_hopcount = 0; preq.preq_ttl = ieee80211_mesh_ttl; preq.preq_id = ++hs->hs_preqid; - IEEE80211_ADDR_COPY(preq.preq_origaddr, - vap->iv_myaddr); - preq.preq_origseq = ++hs->hs_seq; - preq.preq_lifetime = - ieee80211_hwmp_pathtimeout; - preq.preq_metric = - IEEE80211_MESHLMETRIC_INITIALVAL; + IEEE80211_ADDR_COPY(preq.preq_origaddr, vap->iv_myaddr); + preq.preq_origseq = fi->fi_seq; + preq.preq_lifetime = fi->fi_lifetime; + preq.preq_metric = fi->fi_metric; preq.preq_tcount = 1; IEEE80211_ADDR_COPY(PREQ_TADDR(0), dest); if (ieee80211_hwmp_targetonly) PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_TO; if (ieee80211_hwmp_replyforward) PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_RF; - if (unknowndst) + if (unknowndst) { PREQ_TFLAGS(0) |= IEEE80211_MESHPREQ_TFLAGS_USN; - else + PREQ_TSEQ(0) = 0; + } else PREQ_TSEQ(0) = fi->fi_seq; hwmp_send_preq(vap->iv_bss, vap->iv_myaddr, broadcastaddr, &preq); } else return ieee80211_find_txnode(vap, fi->fi_nexthop); - /* XXX */ return vap->iv_bss; } #undef PREQ_TFLAGS From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 22:32:00 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C13A106567D; Tue, 2 Jun 2009 22:32:00 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA9A08FC19; Tue, 2 Jun 2009 22:31:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52MVxSJ030457; Tue, 2 Jun 2009 22:31:59 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52MVwCN030412; Tue, 2 Jun 2009 22:31:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906022231.n52MVwCN030412@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 22:31:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193356 - in projects/acpica_20090521/sys: amd64/acpica boot/i386/libi386 boot/ia64/ski conf dev/acpi_support dev/acpica dev/acpica/Osd dev/asmc dev/fdc dev/ipmi dev/pci i386/acpica i38... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 22:32:00 -0000 Author: jkim Date: Tue Jun 2 22:31:57 2009 New Revision: 193356 URL: http://svn.freebsd.org/changeset/base/193356 Log: Chase ACPICA API changes (for kernel and boot loader). Modified: projects/acpica_20090521/sys/amd64/acpica/OsdEnvironment.c projects/acpica_20090521/sys/amd64/acpica/acpi_machdep.c projects/acpica_20090521/sys/amd64/acpica/acpi_wakeup.c projects/acpica_20090521/sys/amd64/acpica/madt.c projects/acpica_20090521/sys/boot/i386/libi386/Makefile projects/acpica_20090521/sys/boot/i386/libi386/biosacpi.c projects/acpica_20090521/sys/boot/ia64/ski/acpi_stub.c projects/acpica_20090521/sys/conf/files projects/acpica_20090521/sys/dev/acpi_support/acpi_aiboost.c projects/acpica_20090521/sys/dev/acpi_support/acpi_asus.c projects/acpica_20090521/sys/dev/acpi_support/acpi_fujitsu.c projects/acpica_20090521/sys/dev/acpi_support/acpi_ibm.c projects/acpica_20090521/sys/dev/acpi_support/acpi_panasonic.c projects/acpica_20090521/sys/dev/acpi_support/acpi_sony.c projects/acpica_20090521/sys/dev/acpi_support/acpi_toshiba.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdDebug.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdHardware.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdInterrupt.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdMemory.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdSchedule.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdStream.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdSynch.c projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c projects/acpica_20090521/sys/dev/acpica/acpi.c projects/acpica_20090521/sys/dev/acpica/acpi_acad.c projects/acpica_20090521/sys/dev/acpica/acpi_battery.c projects/acpica_20090521/sys/dev/acpica/acpi_button.c projects/acpica_20090521/sys/dev/acpica/acpi_cmbat.c projects/acpica_20090521/sys/dev/acpica/acpi_cpu.c projects/acpica_20090521/sys/dev/acpica/acpi_dock.c projects/acpica_20090521/sys/dev/acpica/acpi_ec.c projects/acpica_20090521/sys/dev/acpica/acpi_hpet.c projects/acpica_20090521/sys/dev/acpica/acpi_if.m projects/acpica_20090521/sys/dev/acpica/acpi_isab.c projects/acpica_20090521/sys/dev/acpica/acpi_lid.c projects/acpica_20090521/sys/dev/acpica/acpi_package.c projects/acpica_20090521/sys/dev/acpica/acpi_pci.c projects/acpica_20090521/sys/dev/acpica/acpi_pci_link.c projects/acpica_20090521/sys/dev/acpica/acpi_pcib.c projects/acpica_20090521/sys/dev/acpica/acpi_pcib_acpi.c projects/acpica_20090521/sys/dev/acpica/acpi_pcib_pci.c projects/acpica_20090521/sys/dev/acpica/acpi_perf.c projects/acpica_20090521/sys/dev/acpica/acpi_powerres.c projects/acpica_20090521/sys/dev/acpica/acpi_quirk.c projects/acpica_20090521/sys/dev/acpica/acpi_resource.c projects/acpica_20090521/sys/dev/acpica/acpi_smbat.c projects/acpica_20090521/sys/dev/acpica/acpi_thermal.c projects/acpica_20090521/sys/dev/acpica/acpi_throttle.c projects/acpica_20090521/sys/dev/acpica/acpi_timer.c projects/acpica_20090521/sys/dev/acpica/acpi_video.c projects/acpica_20090521/sys/dev/asmc/asmc.c projects/acpica_20090521/sys/dev/fdc/fdc_acpi.c projects/acpica_20090521/sys/dev/ipmi/ipmi_acpi.c projects/acpica_20090521/sys/dev/pci/pci.c projects/acpica_20090521/sys/i386/acpica/OsdEnvironment.c projects/acpica_20090521/sys/i386/acpica/acpi_machdep.c projects/acpica_20090521/sys/i386/acpica/acpi_wakeup.c projects/acpica_20090521/sys/i386/acpica/madt.c projects/acpica_20090521/sys/i386/cpufreq/est.c projects/acpica_20090521/sys/i386/cpufreq/hwpstate.c projects/acpica_20090521/sys/i386/cpufreq/p4tcc.c projects/acpica_20090521/sys/ia64/acpica/OsdEnvironment.c projects/acpica_20090521/sys/ia64/acpica/acpi_machdep.c projects/acpica_20090521/sys/ia64/acpica/acpi_wakeup.c projects/acpica_20090521/sys/ia64/acpica/madt.c projects/acpica_20090521/sys/ia64/ia64/nexus.c projects/acpica_20090521/sys/modules/acpi/acpi/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_aiboost/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_asus/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_dock/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_fujitsu/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_ibm/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_panasonic/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_sony/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_toshiba/Makefile projects/acpica_20090521/sys/modules/acpi/acpi_video/Makefile projects/acpica_20090521/sys/modules/cpufreq/Makefile projects/acpica_20090521/sys/modules/fdc/Makefile Modified: projects/acpica_20090521/sys/amd64/acpica/OsdEnvironment.c ============================================================================== --- projects/acpica_20090521/sys/amd64/acpica/OsdEnvironment.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/amd64/acpica/OsdEnvironment.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include static u_long amd64_acpi_root; @@ -63,7 +63,7 @@ AcpiOsGetRootPointer(void) if (amd64_acpi_root == 0 && (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && ptr != 0) amd64_acpi_root = ptr; Modified: projects/acpica_20090521/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- projects/acpica_20090521/sys/amd64/acpica/acpi_machdep.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/amd64/acpica/acpi_machdep.c Tue Jun 2 22:31:57 2009 (r193356) @@ -33,7 +33,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #include Modified: projects/acpica_20090521/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- projects/acpica_20090521/sys/amd64/acpica/acpi_wakeup.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/amd64/acpica/acpi_wakeup.c Tue Jun 2 22:31:57 2009 (r193356) @@ -53,7 +53,8 @@ __FBSDID("$FreeBSD$"); #include #endif -#include +#include + #include #include "acpi_wakecode.h" Modified: projects/acpica_20090521/sys/amd64/acpica/madt.c ============================================================================== --- projects/acpica_20090521/sys/amd64/acpica/madt.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/amd64/acpica/madt.c Tue Jun 2 22:31:57 2009 (r193356) @@ -48,8 +48,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/boot/i386/libi386/Makefile ============================================================================== --- projects/acpica_20090521/sys/boot/i386/libi386/Makefile Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/boot/i386/libi386/Makefile Tue Jun 2 22:31:57 2009 (r193356) @@ -48,7 +48,7 @@ CFLAGS+= -DTERM_EMU CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ Modified: projects/acpica_20090521/sys/boot/i386/libi386/biosacpi.c ============================================================================== --- projects/acpica_20090521/sys/boot/i386/libi386/biosacpi.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/boot/i386/libi386/biosacpi.c Tue Jun 2 22:31:57 2009 (r193356) @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include "libi386.h" -#include "acfreebsd.h" +#include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" Modified: projects/acpica_20090521/sys/boot/ia64/ski/acpi_stub.c ============================================================================== --- projects/acpica_20090521/sys/boot/ia64/ski/acpi_stub.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/boot/ia64/ski/acpi_stub.c Tue Jun 2 22:31:57 2009 (r193356) @@ -27,7 +27,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC 7 Modified: projects/acpica_20090521/sys/conf/files ============================================================================== --- projects/acpica_20090521/sys/conf/files Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/conf/files Tue Jun 2 22:31:57 2009 (r193356) @@ -122,131 +122,134 @@ contrib/altq/altq/altq_rio.c optional al contrib/altq/altq/altq_rmclass.c optional altq contrib/altq/altq/altq_subr.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/dev/acpica/dbcmds.c optional acpi acpi_debug -contrib/dev/acpica/dbdisply.c optional acpi acpi_debug -contrib/dev/acpica/dbexec.c optional acpi acpi_debug -contrib/dev/acpica/dbfileio.c optional acpi acpi_debug -contrib/dev/acpica/dbhistry.c optional acpi acpi_debug -contrib/dev/acpica/dbinput.c optional acpi acpi_debug -contrib/dev/acpica/dbstats.c optional acpi acpi_debug -contrib/dev/acpica/dbutils.c optional acpi acpi_debug -contrib/dev/acpica/dbxface.c optional acpi acpi_debug -contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug -contrib/dev/acpica/dmnames.c optional acpi acpi_debug -contrib/dev/acpica/dmopcode.c optional acpi acpi_debug -contrib/dev/acpica/dmobject.c optional acpi acpi_debug -contrib/dev/acpica/dmresrc.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug -contrib/dev/acpica/dmutils.c optional acpi acpi_debug -contrib/dev/acpica/dmwalk.c optional acpi acpi_debug -contrib/dev/acpica/dsfield.c optional acpi -contrib/dev/acpica/dsinit.c optional acpi -contrib/dev/acpica/dsmethod.c optional acpi -contrib/dev/acpica/dsmthdat.c optional acpi -contrib/dev/acpica/dsobject.c optional acpi -contrib/dev/acpica/dsopcode.c optional acpi -contrib/dev/acpica/dsutils.c optional acpi -contrib/dev/acpica/dswexec.c optional acpi -contrib/dev/acpica/dswload.c optional acpi -contrib/dev/acpica/dswscope.c optional acpi -contrib/dev/acpica/dswstate.c optional acpi -contrib/dev/acpica/evevent.c optional acpi -contrib/dev/acpica/evgpe.c optional acpi -contrib/dev/acpica/evgpeblk.c optional acpi -contrib/dev/acpica/evmisc.c optional acpi -contrib/dev/acpica/evregion.c optional acpi -contrib/dev/acpica/evrgnini.c optional acpi -contrib/dev/acpica/evsci.c optional acpi -contrib/dev/acpica/evxface.c optional acpi -contrib/dev/acpica/evxfevnt.c optional acpi -contrib/dev/acpica/evxfregn.c optional acpi -contrib/dev/acpica/exconfig.c optional acpi -contrib/dev/acpica/exconvrt.c optional acpi -contrib/dev/acpica/excreate.c optional acpi -contrib/dev/acpica/exdump.c optional acpi -contrib/dev/acpica/exfield.c optional acpi -contrib/dev/acpica/exfldio.c optional acpi -contrib/dev/acpica/exmisc.c optional acpi -contrib/dev/acpica/exmutex.c optional acpi -contrib/dev/acpica/exnames.c optional acpi -contrib/dev/acpica/exoparg1.c optional acpi -contrib/dev/acpica/exoparg2.c optional acpi -contrib/dev/acpica/exoparg3.c optional acpi -contrib/dev/acpica/exoparg6.c optional acpi -contrib/dev/acpica/exprep.c optional acpi -contrib/dev/acpica/exregion.c optional acpi -contrib/dev/acpica/exresnte.c optional acpi -contrib/dev/acpica/exresolv.c optional acpi -contrib/dev/acpica/exresop.c optional acpi -contrib/dev/acpica/exstore.c optional acpi -contrib/dev/acpica/exstoren.c optional acpi -contrib/dev/acpica/exstorob.c optional acpi -contrib/dev/acpica/exsystem.c optional acpi -contrib/dev/acpica/exutils.c optional acpi -contrib/dev/acpica/hwacpi.c optional acpi -contrib/dev/acpica/hwgpe.c optional acpi -contrib/dev/acpica/hwregs.c optional acpi -contrib/dev/acpica/hwsleep.c optional acpi -contrib/dev/acpica/hwtimer.c optional acpi -contrib/dev/acpica/nsaccess.c optional acpi -contrib/dev/acpica/nsalloc.c optional acpi -contrib/dev/acpica/nsdump.c optional acpi -contrib/dev/acpica/nseval.c optional acpi -contrib/dev/acpica/nsinit.c optional acpi -contrib/dev/acpica/nsload.c optional acpi -contrib/dev/acpica/nsnames.c optional acpi -contrib/dev/acpica/nsobject.c optional acpi -contrib/dev/acpica/nsparse.c optional acpi -contrib/dev/acpica/nssearch.c optional acpi -contrib/dev/acpica/nsutils.c optional acpi -contrib/dev/acpica/nswalk.c optional acpi -contrib/dev/acpica/nsxfeval.c optional acpi -contrib/dev/acpica/nsxfname.c optional acpi -contrib/dev/acpica/nsxfobj.c optional acpi -contrib/dev/acpica/psargs.c optional acpi -contrib/dev/acpica/psloop.c optional acpi -contrib/dev/acpica/psopcode.c optional acpi -contrib/dev/acpica/psparse.c optional acpi -contrib/dev/acpica/psscope.c optional acpi -contrib/dev/acpica/pstree.c optional acpi -contrib/dev/acpica/psutils.c optional acpi -contrib/dev/acpica/pswalk.c optional acpi -contrib/dev/acpica/psxface.c optional acpi -contrib/dev/acpica/rsaddr.c optional acpi -contrib/dev/acpica/rscalc.c optional acpi -contrib/dev/acpica/rscreate.c optional acpi -contrib/dev/acpica/rsdump.c optional acpi -contrib/dev/acpica/rsinfo.c optional acpi -contrib/dev/acpica/rsio.c optional acpi -contrib/dev/acpica/rsirq.c optional acpi -contrib/dev/acpica/rslist.c optional acpi -contrib/dev/acpica/rsmemory.c optional acpi -contrib/dev/acpica/rsmisc.c optional acpi -contrib/dev/acpica/rsutils.c optional acpi -contrib/dev/acpica/rsxface.c optional acpi -contrib/dev/acpica/tbfadt.c optional acpi -contrib/dev/acpica/tbfind.c optional acpi -contrib/dev/acpica/tbinstal.c optional acpi -contrib/dev/acpica/tbutils.c optional acpi -contrib/dev/acpica/tbxface.c optional acpi -contrib/dev/acpica/tbxfroot.c optional acpi -contrib/dev/acpica/utalloc.c optional acpi -contrib/dev/acpica/utcache.c optional acpi -contrib/dev/acpica/utclib.c optional acpi -contrib/dev/acpica/utcopy.c optional acpi -contrib/dev/acpica/utdebug.c optional acpi -contrib/dev/acpica/utdelete.c optional acpi -contrib/dev/acpica/uteval.c optional acpi -contrib/dev/acpica/utglobal.c optional acpi -contrib/dev/acpica/utinit.c optional acpi -contrib/dev/acpica/utmath.c optional acpi -contrib/dev/acpica/utmisc.c optional acpi -contrib/dev/acpica/utmutex.c optional acpi -contrib/dev/acpica/utobject.c optional acpi -contrib/dev/acpica/utresrc.c optional acpi -contrib/dev/acpica/utstate.c optional acpi -contrib/dev/acpica/utxface.c optional acpi +contrib/dev/acpica/debugger/dbcmds.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbdisply.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbexec.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbfileio.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbhistry.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbinput.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbstats.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbutils.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbxface.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmnames.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmopcode.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmobject.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrc.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcl.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcs.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmutils.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmwalk.c optional acpi acpi_debug +contrib/dev/acpica/dispatcher/dsfield.c optional acpi +contrib/dev/acpica/dispatcher/dsinit.c optional acpi +contrib/dev/acpica/dispatcher/dsmethod.c optional acpi +contrib/dev/acpica/dispatcher/dsmthdat.c optional acpi +contrib/dev/acpica/dispatcher/dsobject.c optional acpi +contrib/dev/acpica/dispatcher/dsopcode.c optional acpi +contrib/dev/acpica/dispatcher/dsutils.c optional acpi +contrib/dev/acpica/dispatcher/dswexec.c optional acpi +contrib/dev/acpica/dispatcher/dswload.c optional acpi +contrib/dev/acpica/dispatcher/dswscope.c optional acpi +contrib/dev/acpica/dispatcher/dswstate.c optional acpi +contrib/dev/acpica/events/evevent.c optional acpi +contrib/dev/acpica/events/evgpe.c optional acpi +contrib/dev/acpica/events/evgpeblk.c optional acpi +contrib/dev/acpica/events/evmisc.c optional acpi +contrib/dev/acpica/events/evregion.c optional acpi +contrib/dev/acpica/events/evrgnini.c optional acpi +contrib/dev/acpica/events/evsci.c optional acpi +contrib/dev/acpica/events/evxface.c optional acpi +contrib/dev/acpica/events/evxfevnt.c optional acpi +contrib/dev/acpica/events/evxfregn.c optional acpi +contrib/dev/acpica/executer/exconfig.c optional acpi +contrib/dev/acpica/executer/exconvrt.c optional acpi +contrib/dev/acpica/executer/excreate.c optional acpi +contrib/dev/acpica/executer/exdump.c optional acpi +contrib/dev/acpica/executer/exfield.c optional acpi +contrib/dev/acpica/executer/exfldio.c optional acpi +contrib/dev/acpica/executer/exmisc.c optional acpi +contrib/dev/acpica/executer/exmutex.c optional acpi +contrib/dev/acpica/executer/exnames.c optional acpi +contrib/dev/acpica/executer/exoparg1.c optional acpi +contrib/dev/acpica/executer/exoparg2.c optional acpi +contrib/dev/acpica/executer/exoparg3.c optional acpi +contrib/dev/acpica/executer/exoparg6.c optional acpi +contrib/dev/acpica/executer/exprep.c optional acpi +contrib/dev/acpica/executer/exregion.c optional acpi +contrib/dev/acpica/executer/exresnte.c optional acpi +contrib/dev/acpica/executer/exresolv.c optional acpi +contrib/dev/acpica/executer/exresop.c optional acpi +contrib/dev/acpica/executer/exstore.c optional acpi +contrib/dev/acpica/executer/exstoren.c optional acpi +contrib/dev/acpica/executer/exstorob.c optional acpi +contrib/dev/acpica/executer/exsystem.c optional acpi +contrib/dev/acpica/executer/exutils.c optional acpi +contrib/dev/acpica/hardware/hwacpi.c optional acpi +contrib/dev/acpica/hardware/hwgpe.c optional acpi +contrib/dev/acpica/hardware/hwregs.c optional acpi +contrib/dev/acpica/hardware/hwsleep.c optional acpi +contrib/dev/acpica/hardware/hwtimer.c optional acpi +contrib/dev/acpica/hardware/hwvalid.c optional acpi +contrib/dev/acpica/hardware/hwxface.c optional acpi +contrib/dev/acpica/namespace/nsaccess.c optional acpi +contrib/dev/acpica/namespace/nsalloc.c optional acpi +contrib/dev/acpica/namespace/nsdump.c optional acpi +contrib/dev/acpica/namespace/nseval.c optional acpi +contrib/dev/acpica/namespace/nsinit.c optional acpi +contrib/dev/acpica/namespace/nsload.c optional acpi +contrib/dev/acpica/namespace/nsnames.c optional acpi +contrib/dev/acpica/namespace/nsobject.c optional acpi +contrib/dev/acpica/namespace/nsparse.c optional acpi +contrib/dev/acpica/namespace/nspredef.c optional acpi +contrib/dev/acpica/namespace/nssearch.c optional acpi +contrib/dev/acpica/namespace/nsutils.c optional acpi +contrib/dev/acpica/namespace/nswalk.c optional acpi +contrib/dev/acpica/namespace/nsxfeval.c optional acpi +contrib/dev/acpica/namespace/nsxfname.c optional acpi +contrib/dev/acpica/namespace/nsxfobj.c optional acpi +contrib/dev/acpica/parser/psargs.c optional acpi +contrib/dev/acpica/parser/psloop.c optional acpi +contrib/dev/acpica/parser/psopcode.c optional acpi +contrib/dev/acpica/parser/psparse.c optional acpi +contrib/dev/acpica/parser/psscope.c optional acpi +contrib/dev/acpica/parser/pstree.c optional acpi +contrib/dev/acpica/parser/psutils.c optional acpi +contrib/dev/acpica/parser/pswalk.c optional acpi +contrib/dev/acpica/parser/psxface.c optional acpi +contrib/dev/acpica/resources/rsaddr.c optional acpi +contrib/dev/acpica/resources/rscalc.c optional acpi +contrib/dev/acpica/resources/rscreate.c optional acpi +contrib/dev/acpica/resources/rsdump.c optional acpi +contrib/dev/acpica/resources/rsinfo.c optional acpi +contrib/dev/acpica/resources/rsio.c optional acpi +contrib/dev/acpica/resources/rsirq.c optional acpi +contrib/dev/acpica/resources/rslist.c optional acpi +contrib/dev/acpica/resources/rsmemory.c optional acpi +contrib/dev/acpica/resources/rsmisc.c optional acpi +contrib/dev/acpica/resources/rsutils.c optional acpi +contrib/dev/acpica/resources/rsxface.c optional acpi +contrib/dev/acpica/tables/tbfadt.c optional acpi +contrib/dev/acpica/tables/tbfind.c optional acpi +contrib/dev/acpica/tables/tbinstal.c optional acpi +contrib/dev/acpica/tables/tbutils.c optional acpi +contrib/dev/acpica/tables/tbxface.c optional acpi +contrib/dev/acpica/tables/tbxfroot.c optional acpi +contrib/dev/acpica/utilities/utalloc.c optional acpi +contrib/dev/acpica/utilities/utcache.c optional acpi +contrib/dev/acpica/utilities/utcopy.c optional acpi +contrib/dev/acpica/utilities/utdebug.c optional acpi +contrib/dev/acpica/utilities/utdelete.c optional acpi +contrib/dev/acpica/utilities/uteval.c optional acpi +contrib/dev/acpica/utilities/utglobal.c optional acpi +contrib/dev/acpica/utilities/utinit.c optional acpi +contrib/dev/acpica/utilities/utlock.c optional acpi +contrib/dev/acpica/utilities/utmath.c optional acpi +contrib/dev/acpica/utilities/utmisc.c optional acpi +contrib/dev/acpica/utilities/utmutex.c optional acpi +contrib/dev/acpica/utilities/utobject.c optional acpi +contrib/dev/acpica/utilities/utresrc.c optional acpi +contrib/dev/acpica/utilities/utstate.c optional acpi +contrib/dev/acpica/utilities/utxface.c optional acpi contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_aiboost.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_aiboost.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_aiboost.c Tue Jun 2 22:31:57 2009 (r193356) @@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include + +#include + #include "acpi_if.h" #include #include Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_asus.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_asus.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_asus.c Tue Jun 2 22:31:57 2009 (r193356) @@ -47,7 +47,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_fujitsu.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_fujitsu.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_fujitsu.c Tue Jun 2 22:31:57 2009 (r193356) @@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include /* Hooks for the ACPI CA debugging infrastructure */ Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_ibm.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_ibm.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_ibm.c Tue Jun 2 22:31:57 2009 (r193356) @@ -42,7 +42,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include + +#include +#include + #include "acpi_if.h" #include #include Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_panasonic.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_panasonic.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_panasonic.c Tue Jun 2 22:31:57 2009 (r193356) @@ -37,7 +37,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #define _COMPONENT ACPI_OEM Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_sony.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_sony.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_sony.c Tue Jun 2 22:31:57 2009 (r193356) @@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include + +#include + #include "acpi_if.h" #include #include Modified: projects/acpica_20090521/sys/dev/acpi_support/acpi_toshiba.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpi_support/acpi_toshiba.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpi_support/acpi_toshiba.c Tue Jun 2 22:31:57 2009 (r193356) @@ -34,7 +34,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #define _COMPONENT ACPI_OEM Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdDebug.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdDebug.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdDebug.c Tue Jun 2 22:31:57 2009 (r193356) @@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include +#include + #include UINT32 Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdHardware.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdHardware.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdHardware.c Tue Jun 2 22:31:57 2009 (r193356) @@ -32,7 +32,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include @@ -65,75 +65,9 @@ __FBSDID("$FreeBSD$"); #define ACPI_BUS_HANDLE 0 #endif -/* - * Some BIOS vendors use AML to read/write directly to IO space. This - * can cause a problem if such accesses interfere with the OS's access to - * the same ports. Windows XP and newer systems block accesses to certain - * IO ports. We print a message or block accesses based on a tunable. - */ -static int illegal_bios_ports[] = { - 0x000, 0x00f, /* DMA controller 1 */ - 0x020, 0x021, /* PIC */ - 0x040, 0x043, /* Timer 1 */ - 0x048, 0x04b, /* Timer 2 failsafe */ - 0x070, 0x071, /* CMOS and RTC */ - 0x074, 0x076, /* Extended CMOS */ - 0x081, 0x083, /* DMA1 page registers */ - 0x087, 0x087, /* DMA1 ch0 low page */ - 0x089, 0x08b, /* DMA2 ch2 (0x89), ch3 low page (0x8a, 0x8b) */ - 0x08f, 0x091, /* DMA2 low page refresh (0x8f) */ - /* Arb ctrl port, card select feedback (0x90, 0x91) */ - 0x093, 0x094, /* System board setup */ - 0x096, 0x097, /* POS channel select */ - 0x0a0, 0x0a1, /* PIC (cascaded) */ - 0x0c0, 0x0df, /* ISA DMA */ - 0x4d0, 0x4d1, /* PIC ELCR (edge/level control) */ - 0xcf8, 0xcff, /* PCI config space. Microsoft adds 0xd00 also but - that seems incorrect. */ - -1, -1 -}; - -/* Block accesses to bad IO port addresses or just print a warning. */ -static int block_bad_io; -TUNABLE_INT("debug.acpi.block_bad_io", &block_bad_io); - -/* - * Look up bad ports in our table. Returns 0 if ok, 1 if marked bad but - * access is still allowed, or -1 to deny access. - */ -static int -acpi_os_check_port(UINT32 addr, UINT32 width) -{ - int error, *port; - - error = 0; - for (port = illegal_bios_ports; *port != -1; port += 2) { - if ((addr >= port[0] && addr <= port[1]) || - (addr < port[0] && addr + (width / 8) > port[0])) { - if (block_bad_io) - error = -1; - else - error = 1; - break; - } - } - - return (error); -} - ACPI_STATUS AcpiOsReadPort(ACPI_IO_ADDRESS InPort, UINT32 *Value, UINT32 Width) { - int error; - - error = acpi_os_check_port(InPort, Width); - if (error != 0) { - if (bootverbose) - printf("acpi: bad read from port 0x%03x (%d)\n", - (int)InPort, Width); - if (error == -1) - return (AE_BAD_PARAMETER); - } switch (Width) { case 8: @@ -159,16 +93,6 @@ AcpiOsReadPort(ACPI_IO_ADDRESS InPort, U ACPI_STATUS AcpiOsWritePort(ACPI_IO_ADDRESS OutPort, UINT32 Value, UINT32 Width) { - int error; - - error = acpi_os_check_port(OutPort, Width); - if (error != 0) { - if (bootverbose) - printf("acpi: bad write to port 0x%03x (%d), val %#x\n", - (int)OutPort, Width, Value); - if (error == -1) - return (AE_BAD_PARAMETER); - } switch (Width) { case 8: Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdInterrupt.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdInterrupt.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdInterrupt.c Tue Jun 2 22:31:57 2009 (r193356) @@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #define _COMPONENT ACPI_OS_SERVICES Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdMemory.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdMemory.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdMemory.c Tue Jun 2 22:31:57 2009 (r193356) @@ -33,7 +33,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include @@ -55,7 +55,7 @@ AcpiOsFree(void *Memory) } void * -AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_NATIVE_UINT Length) +AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length) { return (pmap_mapbios((vm_offset_t)PhysicalAddress, Length)); } @@ -80,17 +80,6 @@ AcpiOsValidateInterface (char *Interface return (AE_SUPPORT); } -/* - * There is no clean way to do this. We make the charitable assumption - * that callers will not pass garbage to us. - */ -ACPI_STATUS -AcpiOsValidateAddress (UINT8 SpaceId, ACPI_PHYSICAL_ADDRESS Address, - ACPI_SIZE Length) -{ - return (AE_OK); -} - BOOLEAN AcpiOsReadable (void *Pointer, ACPI_SIZE Length) { Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdSchedule.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdSchedule.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdSchedule.c Tue Jun 2 22:31:57 2009 (r193356) @@ -43,7 +43,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #define _COMPONENT ACPI_OS_SERVICES Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdStream.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdStream.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdStream.c Tue Jun 2 22:31:57 2009 (r193356) @@ -32,7 +32,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include void AcpiOsPrintf(const char *Format, ...) Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdSynch.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdSynch.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdSynch.c Tue Jun 2 22:31:57 2009 (r193356) @@ -32,7 +32,8 @@ #include __FBSDID("$FreeBSD$"); -#include +#include +#include #include "opt_acpi.h" #include @@ -367,7 +368,7 @@ AcpiOsDeleteLock (ACPI_SPINLOCK Handle) * (and thus can't block) but since we have ithreads, we don't worry * about potentially blocking. */ -ACPI_NATIVE_UINT +ACPI_CPU_FLAGS AcpiOsAcquireLock (ACPI_SPINLOCK Handle) { struct acpi_spinlock *h = (struct acpi_spinlock *)Handle; Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #undef _COMPONENT #define _COMPONENT ACPI_TABLES Modified: projects/acpica_20090521/sys/dev/acpica/acpi.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi.c Tue Jun 2 22:31:57 2009 (r193356) @@ -61,11 +61,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include +#include + #include #include -#include -#include #include "pci_if.h" #include @@ -416,7 +417,6 @@ static int acpi_attach(device_t dev) { struct acpi_softc *sc; - ACPI_TABLE_FACS *facs; ACPI_STATUS status; int error, state; UINT32 flags; @@ -593,14 +593,7 @@ acpi_attach(device_t dev) } /* Only enable S4BIOS by default if the FACS says it is available. */ - status = AcpiGetTable(ACPI_SIG_FACS, 0, (ACPI_TABLE_HEADER **)&facs); - if (ACPI_FAILURE(status)) { - device_printf(dev, "couldn't get FACS: %s\n", - AcpiFormatException(status)); - error = ENXIO; - goto out; - } - if (facs->Flags & ACPI_FACS_S4_BIOS_PRESENT) + if (AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT) sc->acpi_s4bios = 1; /* Probe all supported sleep states. */ @@ -1848,8 +1841,7 @@ acpi_shutdown_final(void *arg, int howto (AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) && sc->acpi_handle_reboot) { /* Reboot using the reset register. */ - status = AcpiHwLowLevelWrite( - AcpiGbl_FADT.ResetRegister.BitWidth, + status = AcpiWrite( AcpiGbl_FADT.ResetValue, &AcpiGbl_FADT.ResetRegister); if (ACPI_FAILURE(status)) device_printf(sc->acpi_dev, "reset failed - %s\n", @@ -3391,8 +3383,6 @@ static struct debugtag dbg_layer[] = { }; static struct debugtag dbg_level[] = { - {"ACPI_LV_ERROR", ACPI_LV_ERROR}, - {"ACPI_LV_WARN", ACPI_LV_WARN}, {"ACPI_LV_INIT", ACPI_LV_INIT}, {"ACPI_LV_DEBUG_OBJECT", ACPI_LV_DEBUG_OBJECT}, {"ACPI_LV_INFO", ACPI_LV_INFO}, Modified: projects/acpica_20090521/sys/dev/acpica/acpi_acad.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_acad.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_acad.c Tue Jun 2 22:31:57 2009 (r193356) @@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_battery.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_battery.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_battery.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_button.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_button.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_button.c Tue Jun 2 22:31:57 2009 (r193356) @@ -35,7 +35,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include /* Hooks for the ACPI CA debugging infrastructure */ Modified: projects/acpica_20090521/sys/dev/acpica/acpi_cmbat.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_cmbat.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_cmbat.c Tue Jun 2 22:31:57 2009 (r193356) @@ -41,7 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_cpu.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_cpu.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_cpu.c Tue Jun 2 22:31:57 2009 (r193356) @@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include /* @@ -897,9 +899,9 @@ acpi_cpu_idle() * time if USB is loaded. */ if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active); + AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active); if (bm_active != 0) { - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1); cx_next_idx = min(cx_next_idx, sc->cpu_non_c3); } } @@ -926,8 +928,8 @@ acpi_cpu_idle() */ if (cx_next->type == ACPI_STATE_C3) { if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); + AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 1); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); } else ACPI_FLUSH_CPU_CACHE(); } @@ -938,7 +940,7 @@ acpi_cpu_idle() * get the time very close to the CPU start/stop clock logic, this * is the only reliable time source. */ - AcpiHwLowLevelRead(32, &start_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&start_time, &AcpiGbl_FADT.XPmTimerBlock); CPU_GET_REG(cx_next->p_lvlx, 1); /* @@ -947,14 +949,14 @@ acpi_cpu_idle() * the processor has stopped. Doing it again provides enough * margin that we are certain to have a correct value. */ - AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock); - AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock); /* Enable bus master arbitration and disable bus master wakeup. */ if (cx_next->type == ACPI_STATE_C3 && (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); + AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 0); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); } ACPI_ENABLE_IRQS(); @@ -1069,11 +1071,11 @@ acpi_cpu_quirks(void) val |= PIIX4_STOP_BREAK_MASK; pci_write_config(acpi_dev, PIIX4_DEVACTB_REG, val, 4); } - AcpiGetRegister(ACPI_BITREG_BUS_MASTER_RLD, &val); + AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_RLD, &val); if (val) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "acpi_cpu: PIIX4: reset BRLD_EN_BM\n")); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); } break; default: Modified: projects/acpica_20090521/sys/dev/acpica/acpi_dock.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_dock.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_dock.c Tue Jun 2 22:31:57 2009 (r193356) @@ -32,8 +32,9 @@ #include #include -#include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_ec.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_ec.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_ec.c Tue Jun 2 22:31:57 2009 (r193356) @@ -42,7 +42,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include /* Hooks for the ACPI CA debugging infrastructure */ Modified: projects/acpica_20090521/sys/dev/acpica/acpi_hpet.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_hpet.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_hpet.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_if.m ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_if.m Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_if.m Tue Jun 2 22:31:57 2009 (r193356) @@ -28,7 +28,8 @@ #include #include -#include + +#include INTERFACE acpi; Modified: projects/acpica_20090521/sys/dev/acpica/acpi_isab.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_isab.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_isab.c Tue Jun 2 22:31:57 2009 (r193356) @@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_lid.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_lid.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_lid.c Tue Jun 2 22:31:57 2009 (r193356) @@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include /* Hooks for the ACPI CA debugging infrastructure */ Modified: projects/acpica_20090521/sys/dev/acpica/acpi_package.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_package.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_package.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include /* Modified: projects/acpica_20090521/sys/dev/acpica/acpi_pci.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_pci.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_pci.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_pci_link.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_pci_link.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_pci_link.c Tue Jun 2 22:31:57 2009 (r193356) @@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_pcib.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_pcib.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_pcib.c Tue Jun 2 22:31:57 2009 (r193356) @@ -34,7 +34,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + #include #include Modified: projects/acpica_20090521/sys/dev/acpica/acpi_pcib_acpi.c ============================================================================== --- projects/acpica_20090521/sys/dev/acpica/acpi_pcib_acpi.c Tue Jun 2 22:22:09 2009 (r193355) +++ projects/acpica_20090521/sys/dev/acpica/acpi_pcib_acpi.c Tue Jun 2 22:31:57 2009 (r193356) @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include +#include + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Jun 2 22:52:59 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4EC21065670; Tue, 2 Jun 2009 22:52:58 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D28018FC1A; Tue, 2 Jun 2009 22:52:58 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52MqwwP030885; Tue, 2 Jun 2009 22:52:58 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52MqwQd030880; Tue, 2 Jun 2009 22:52:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200906022252.n52MqwQd030880@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 2 Jun 2009 22:52:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193357 - in projects/acpica_20090521/usr.sbin/acpi: . acpiconf acpidb iasl X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2009 22:52:59 -0000 Author: jkim Date: Tue Jun 2 22:52:58 2009 New Revision: 193357 URL: http://svn.freebsd.org/changeset/base/193357 Log: Merge ACPI utilities as well. Modified: projects/acpica_20090521/usr.sbin/acpi/Makefile.inc projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Modified: projects/acpica_20090521/usr.sbin/acpi/Makefile.inc ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/Makefile.inc Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/Makefile.inc Tue Jun 2 22:52:58 2009 (r193357) @@ -8,4 +8,17 @@ CFLAGS+= -I${.CURDIR}/../../../sys .include "${.CURDIR}/../../Makefile.inc" .endif -.PATH: ${ACPICA_DIR} ${ACPICA_DIR}/compiler ${ACPICA_DIR}/common +.PATH: ${ACPICA_DIR} \ + ${ACPICA_DIR}/common \ + ${ACPICA_DIR}/compiler \ + ${ACPICA_DIR}/debugger \ + ${ACPICA_DIR}/disassembler \ + ${ACPICA_DIR}/dispatcher \ + ${ACPICA_DIR}/events \ + ${ACPICA_DIR}/executer \ + ${ACPICA_DIR}/hardware \ + ${ACPICA_DIR}/namespace \ + ${ACPICA_DIR}/parser \ + ${ACPICA_DIR}/resources \ + ${ACPICA_DIR}/tables \ + ${ACPICA_DIR}/utilities Modified: projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c Tue Jun 2 22:52:58 2009 (r193357) @@ -37,7 +37,8 @@ #include #include -#include + +#include #define ACPIDEV "/dev/acpi" Modified: projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile Tue Jun 2 22:52:58 2009 (r193357) @@ -17,7 +17,7 @@ SRCS+= evevent.c evgpe.c evgpeblk.c evmi evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c # hardware -SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c +SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwvalid.c hwxface.c # interpreter/dispatcher SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c \ @@ -37,8 +37,9 @@ SRCS+= psargs.c psloop.c psopcode.c pspa # namespace SRCS+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c \ - nsload.c nsnames.c nsobject.c nsparse.c nssearch.c \ - nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c + nsload.c nsnames.c nsobject.c nsparse.c nspredef.c \ + nssearch.c nsutils.c nswalk.c nsxfeval.c nsxfname.c \ + nsxfobj.c # resources SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c \ @@ -51,14 +52,15 @@ SRCS+= tbfadt.c tbfind.c tbinstal.c tbut # utilities SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c \ - uteval.c utglobal.c utinit.c utmath.c utmisc.c \ + uteval.c utglobal.c utinit.c utlock.c utmath.c utmisc.c \ utmutex.c utobject.c utresrc.c utstate.c uttrack.c \ utxface.c MAN= acpidb.8 WARNS?= 2 -CFLAGS+= -DACPI_EXEC_APP -CFLAGS+=-fno-strict-aliasing +CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing +DPADD= ${LIBPTHREAD} +LDADD= -lpthread .include Modified: projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c Tue Jun 2 22:52:58 2009 (r193357) @@ -42,9 +42,8 @@ #include #include -#include -#include -#include +#include +#include /* * Dummy DSDT Table Header @@ -90,7 +89,13 @@ static void aml_simulation_regdump(con ACPI_STATUS AeLocalGetRootPointer(void) { - return AE_ERROR; + + return (AE_ERROR); +} + +void +AeTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable) +{ } static void Modified: projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Tue Jun 2 22:52:58 2009 (r193357) @@ -13,8 +13,8 @@ SRCS+= aslanalyze.c aslcodegen.c aslcomp aslfiles.c aslfold.c asllength.c asllisting.c \ aslload.c asllookup.c aslmain.c aslmap.c aslopcodes.c \ asloperands.c aslopt.c aslresource.c aslrestype1.c \ - aslrestype2.c aslstubs.c asltransform.c asltree.c \ - aslutils.c + aslrestype2.c aslstartup.c aslstubs.c asltransform.c \ + asltree.c aslutils.c # debugger SRCS+= dbfileio.c @@ -46,8 +46,8 @@ SRCS+= tbfadt.c tbinstal.c tbutils.c tbx # utilities SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c \ - utglobal.c utmath.c utmisc.c utmutex.c utobject.c \ - utresrc.c utstate.c + utglobal.c utinit.c utlock.c utmath.c utmisc.c \ + utmutex.c utobject.c utresrc.c utstate.c utxface.c MAN= iasl.8 @@ -55,6 +55,8 @@ CFLAGS+= -DACPI_ASL_COMPILER -I. CFLAGS+= -D_USE_BERKELEY_YACC LFLAGS= -i -PAslCompiler YFLAGS= -d -pAslCompiler +DPADD= ${LIBPTHREAD} +LDADD= -lpthread CLEANFILES= aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y From owner-svn-src-projects@FreeBSD.ORG Wed Jun 3 08:21:13 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E1771065672; Wed, 3 Jun 2009 08:21:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C3418FC08; Wed, 3 Jun 2009 08:21:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n538LB8O043237; Wed, 3 Jun 2009 08:21:11 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n538LBQA043231; Wed, 3 Jun 2009 08:21:11 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906030821.n538LBQA043231@svn.freebsd.org> From: Ed Schouten Date: Wed, 3 Jun 2009 08:21:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193370 - projects/clangbsd/lib/msun/src X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 08:21:13 -0000 Author: ed Date: Wed Jun 3 08:21:11 2009 New Revision: 193370 URL: http://svn.freebsd.org/changeset/base/193370 Log: Commit local msun changes. Apart from changes similar to r193368, I have to disable inline asm in msun, related to LLVM PR3678. Modified: projects/clangbsd/lib/msun/src/e_rem_pio2.c projects/clangbsd/lib/msun/src/e_rem_pio2f.c projects/clangbsd/lib/msun/src/k_cosf.c projects/clangbsd/lib/msun/src/k_sinf.c projects/clangbsd/lib/msun/src/k_tanf.c projects/clangbsd/lib/msun/src/math_private.h Modified: projects/clangbsd/lib/msun/src/e_rem_pio2.c ============================================================================== --- projects/clangbsd/lib/msun/src/e_rem_pio2.c Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/e_rem_pio2.c Wed Jun 3 08:21:11 2009 (r193370) @@ -48,10 +48,10 @@ pio2_2t = 2.02226624879595063154e-21, / pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ -#ifdef INLINE_REM_PIO2 -extern __gnu89_inline +#ifndef INLINE_REM_PIO2 +extern #endif -int +__inline int __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; Modified: projects/clangbsd/lib/msun/src/e_rem_pio2f.c ============================================================================== --- projects/clangbsd/lib/msun/src/e_rem_pio2f.c Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/e_rem_pio2f.c Wed Jun 3 08:21:11 2009 (r193370) @@ -40,10 +40,10 @@ invpio2 = 6.36619772367581382433e-01, / pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ -#ifdef INLINE_REM_PIO2F -extern __gnu89_inline +#ifndef INLINE_REM_PIO2F +extern #endif -int +__inline int __ieee754_rem_pio2f(float x, double *y) { double w,r,fn; Modified: projects/clangbsd/lib/msun/src/k_cosf.c ============================================================================== --- projects/clangbsd/lib/msun/src/k_cosf.c Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/k_cosf.c Wed Jun 3 08:21:11 2009 (r193370) @@ -30,10 +30,10 @@ C1 = 0x155553e1053a42.0p-57, /* 0.041 C2 = -0x16c087e80f1e27.0p-62, /* -0.00138867637746099294692 */ C3 = 0x199342e0ee5069.0p-68; /* 0.0000243904487962774090654 */ -#ifdef INLINE_KERNEL_COSDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_COSDF +extern #endif -float +__inline float __kernel_cosdf(double x) { double r, w, z; Modified: projects/clangbsd/lib/msun/src/k_sinf.c ============================================================================== --- projects/clangbsd/lib/msun/src/k_sinf.c Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/k_sinf.c Wed Jun 3 08:21:11 2009 (r193370) @@ -29,10 +29,10 @@ S2 = 0x111110896efbb2.0p-59, /* 0.0083 S3 = -0x1a00f9e2cae774.0p-65, /* -0.000198393348360966317347 */ S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */ -#ifdef INLINE_KERNEL_SINDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_SINDF +extern #endif -float +__inline float __kernel_sindf(double x) { double r, s, w, z; Modified: projects/clangbsd/lib/msun/src/k_tanf.c ============================================================================== --- projects/clangbsd/lib/msun/src/k_tanf.c Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/k_tanf.c Wed Jun 3 08:21:11 2009 (r193370) @@ -32,10 +32,10 @@ T[] = { 0x1362b9bf971bcd.0p-59, /* 0.00946564784943673166728 */ }; -#ifdef INLINE_KERNEL_TANDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_TANDF +extern #endif -float +__inline float __kernel_tandf(double x, int iy) { double z,r,w,s,t,u; Modified: projects/clangbsd/lib/msun/src/math_private.h ============================================================================== --- projects/clangbsd/lib/msun/src/math_private.h Wed Jun 3 08:17:18 2009 (r193369) +++ projects/clangbsd/lib/msun/src/math_private.h Wed Jun 3 08:21:11 2009 (r193370) @@ -252,7 +252,7 @@ cpackl(long double x, long double y) } #endif /* _COMPLEX_H */ -#ifdef __GNUCLIKE_ASM +#if defined(__GNUCLIKE_ASM) && !defined(__clang__) /* Asm versions of some functions. */ @@ -280,7 +280,7 @@ irint(double x) #define HAVE_EFFICIENT_IRINT #endif -#endif /* __GNUCLIKE_ASM */ +#endif /* __GNUCLIKE_ASM && !__clang__ */ /* * ieee style elementary functions @@ -345,15 +345,30 @@ irint(double x) int __kernel_rem_pio2(double*,double*,int,int,int); /* double precision kernel functions */ +#ifdef INLINE_REM_PIO2 +__inline +#endif int __ieee754_rem_pio2(double,double*); double __kernel_sin(double,double,int); double __kernel_cos(double,double); double __kernel_tan(double,double,int); /* float precision kernel functions */ +#ifdef INLINE_REM_PIO2F +__inline +#endif int __ieee754_rem_pio2f(float,double*); +#ifdef INLINE_KERNEL_SINDF +__inline +#endif float __kernel_sindf(double); +#ifdef INLINE_KERNEL_COSDF +__inline +#endif float __kernel_cosdf(double); +#ifdef INLINE_KERNEL_TANDF +__inline +#endif float __kernel_tandf(double,int); /* long double precision kernel functions */ From owner-svn-src-projects@FreeBSD.ORG Wed Jun 3 13:19:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09BE1106564A; Wed, 3 Jun 2009 13:19:14 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E9BC58FC12; Wed, 3 Jun 2009 13:19:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53DJDt9055420; Wed, 3 Jun 2009 13:19:13 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53DJCOQ055400; Wed, 3 Jun 2009 13:19:12 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906031319.n53DJCOQ055400@svn.freebsd.org> From: Ed Schouten Date: Wed, 3 Jun 2009 13:19:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193376 - in projects/clangbsd: . cddl/lib/libzpool contrib/gcc gnu/lib/csu gnu/lib/libgcc lib/csu/amd64 lib/csu/i386-elf lib/librt libexec/rtld-elf secure/lib/libcrypto sys/boot/i386/b... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 13:19:14 -0000 Author: ed Date: Wed Jun 3 13:19:12 2009 New Revision: 193376 URL: http://svn.freebsd.org/changeset/base/193376 Log: Add all local hacks to make apps build with Clang instead of GCC. - libcrypto: Disable inline assembly, because of LLVM PR3678. - libgcc: Build with GCC. Too many GCCisms. - csu: Clang somehow overoptimizes the out of bound array indexing. - gcc: Proper use of the inline keyword. - libzpool: Uses #pragma weak. LLVM PR3679. - librt: - rtld-elf: Places data in different sections than GCC, which triggers an assertion in rtld sources. Also uses #pragma weak. LLVM PR3679. - Several bootloaders: No support for -fno-unit-at-a-time. - loader: Issue with Clang's default library directories. To be investigated. Modified: projects/clangbsd/Makefile.inc1 projects/clangbsd/cddl/lib/libzpool/Makefile projects/clangbsd/contrib/gcc/bitmap.c projects/clangbsd/contrib/gcc/cfg.c projects/clangbsd/contrib/gcc/dominance.c projects/clangbsd/contrib/gcc/haifa-sched.c projects/clangbsd/contrib/gcc/longlong.h projects/clangbsd/contrib/gcc/toplev.h projects/clangbsd/gnu/lib/csu/Makefile projects/clangbsd/gnu/lib/libgcc/Makefile projects/clangbsd/lib/csu/amd64/Makefile projects/clangbsd/lib/csu/i386-elf/Makefile projects/clangbsd/lib/librt/Makefile projects/clangbsd/libexec/rtld-elf/Makefile projects/clangbsd/secure/lib/libcrypto/Makefile projects/clangbsd/sys/boot/i386/boot2/Makefile projects/clangbsd/sys/boot/i386/gptboot/Makefile projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile projects/clangbsd/sys/boot/i386/loader/Makefile projects/clangbsd/sys/boot/i386/zfsboot/Makefile Modified: projects/clangbsd/Makefile.inc1 ============================================================================== --- projects/clangbsd/Makefile.inc1 Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/Makefile.inc1 Wed Jun 3 13:19:12 2009 (r193376) @@ -282,9 +282,9 @@ LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTRE MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="${CC} ${LIB32FLAGS}" \ + CC="gcc ${LIB32FLAGS}" \ CXX="${CXX} ${LIB32FLAGS}" \ - OBJC="${OBJC} ${LIB32FLAGS}" \ + OBJC="gcc ${LIB32FLAGS}" \ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="${AS} --32" \ LIBDIR=/usr/lib32 \ Modified: projects/clangbsd/cddl/lib/libzpool/Makefile ============================================================================== --- projects/clangbsd/cddl/lib/libzpool/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/cddl/lib/libzpool/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -23,6 +23,13 @@ ATOMIC_SRCS= opensolaris_atomic.c LIB= zpool +.include + +# XXX: LLVM PR3679 +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c Modified: projects/clangbsd/contrib/gcc/bitmap.c ============================================================================== --- projects/clangbsd/contrib/gcc/bitmap.c Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/bitmap.c Wed Jun 3 13:19:12 2009 (r193376) @@ -186,7 +186,7 @@ bitmap_elt_clear_from (bitmap head, bitm /* Clear a bitmap by freeing the linked list. */ -inline void +void bitmap_clear (bitmap head) { if (head->first) Modified: projects/clangbsd/contrib/gcc/cfg.c ============================================================================== --- projects/clangbsd/contrib/gcc/cfg.c Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/cfg.c Wed Jun 3 13:19:12 2009 (r193376) @@ -658,7 +658,7 @@ static void *first_edge_aux_obj = 0; /* Allocate a memory block of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_blocks. */ -inline void +void alloc_aux_for_block (basic_block bb, int size) { /* Verify that aux field is clear. */ @@ -721,7 +721,7 @@ free_aux_for_blocks (void) /* Allocate a memory edge of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_edges. */ -inline void +void alloc_aux_for_edge (edge e, int size) { /* Verify that aux field is clear. */ Modified: projects/clangbsd/contrib/gcc/dominance.c ============================================================================== --- projects/clangbsd/contrib/gcc/dominance.c Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/dominance.c Wed Jun 3 13:19:12 2009 (r193376) @@ -686,7 +686,7 @@ get_immediate_dominator (enum cdi_direct /* Set the immediate dominator of the block possibly removing existing edge. NULL can be used to remove any edge. */ -inline void +void set_immediate_dominator (enum cdi_direction dir, basic_block bb, basic_block dominated_by) { Modified: projects/clangbsd/contrib/gcc/haifa-sched.c ============================================================================== --- projects/clangbsd/contrib/gcc/haifa-sched.c Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/haifa-sched.c Wed Jun 3 13:19:12 2009 (r193376) @@ -625,7 +625,7 @@ static rtx last_scheduled_insn; This is the number of cycles between instruction issue and instruction results. */ -HAIFA_INLINE int +int insn_cost (rtx insn, rtx link, rtx used) { return insn_cost1 (insn, used ? REG_NOTE_KIND (link) : REG_NOTE_MAX, Modified: projects/clangbsd/contrib/gcc/longlong.h ============================================================================== --- projects/clangbsd/contrib/gcc/longlong.h Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/longlong.h Wed Jun 3 13:19:12 2009 (r193376) @@ -322,22 +322,22 @@ UDItype __umulsidi3 (USItype, USItype); "g" ((USItype) (bl))) #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ __asm__ ("subl %5,%1\n\tsbbl %3,%0" \ - : "=r" ((USItype) (sh)), \ - "=&r" ((USItype) (sl)) \ + : "=r" ((sh)), \ + "=&r" ((sl)) \ : "0" ((USItype) (ah)), \ "g" ((USItype) (bh)), \ "1" ((USItype) (al)), \ "g" ((USItype) (bl))) #define umul_ppmm(w1, w0, u, v) \ __asm__ ("mull %3" \ - : "=a" ((USItype) (w0)), \ - "=d" ((USItype) (w1)) \ + : "=a" ((w0)), \ + "=d" ((w1)) \ : "%0" ((USItype) (u)), \ "rm" ((USItype) (v))) #define udiv_qrnnd(q, r, n1, n0, dv) \ __asm__ ("divl %4" \ - : "=a" ((USItype) (q)), \ - "=d" ((USItype) (r)) \ + : "=a" ((q)), \ + "=d" ((r)) \ : "0" ((USItype) (n0)), \ "1" ((USItype) (n1)), \ "rm" ((USItype) (dv))) @@ -387,10 +387,10 @@ UDItype __umulsidi3 (USItype, USItype); #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ /* The cmp clears the condition bit. */ \ __asm__ ("cmp %0,%0\n\tsubx %1,%5\n\tsubx %0,%3" \ - : "=r" ((USItype) (sh)), \ - "=&r" ((USItype) (sl)) \ - : "0" ((USItype) (ah)), \ - "r" ((USItype) (bh)), \ + : "=r" ((USItype)(sh)), \ + "=&r" ((USItype)(sl)) \ + : "0" ((USItype)(ah)), \ + "r" ((USItype)(bh)), \ "1" ((USItype) (al)), \ "r" ((USItype) (bl)) \ : "cbit") Modified: projects/clangbsd/contrib/gcc/toplev.h ============================================================================== --- projects/clangbsd/contrib/gcc/toplev.h Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/contrib/gcc/toplev.h Wed Jun 3 13:19:12 2009 (r193376) @@ -158,7 +158,7 @@ extern int exact_log2 ( extern int floor_log2 (unsigned HOST_WIDE_INT); /* Inline versions of the above for speed. */ -#if GCC_VERSION >= 3004 +#if 0 # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG # define CLZ_HWI __builtin_clzl # define CTZ_HWI __builtin_ctzl Modified: projects/clangbsd/gnu/lib/csu/Makefile ============================================================================== --- projects/clangbsd/gnu/lib/csu/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/gnu/lib/csu/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -3,6 +3,11 @@ .include MK_SSP= no +# XXX: prevents infinite loop on startup +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs CCDIR= ${.CURDIR}/../../usr.bin/cc Modified: projects/clangbsd/gnu/lib/libgcc/Makefile ============================================================================== --- projects/clangbsd/gnu/lib/libgcc/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/gnu/lib/libgcc/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -9,6 +9,11 @@ SHLIBDIR?= /lib .include .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" +# XXX: a lot of missing GCC builtins +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR} CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ Modified: projects/clangbsd/lib/csu/amd64/Makefile ============================================================================== --- projects/clangbsd/lib/csu/amd64/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/lib/csu/amd64/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,7 +1,14 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../common +# XXX: prevents infinite loop on startup +.if ${MK_CLANG_IS_CC} != "no" +CC= gcc +.endif + SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o Modified: projects/clangbsd/lib/csu/i386-elf/Makefile ============================================================================== --- projects/clangbsd/lib/csu/i386-elf/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/lib/csu/i386-elf/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,7 +1,14 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../common +# XXX: prevents infinite loop on startup +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + SRCS= crt1.c crti.S crtn.S FILES= ${SRCS:N*.h:R:S/$/.o/g} gcrt1.o FILESOWN= ${LIBOWN} Modified: projects/clangbsd/lib/librt/Makefile ============================================================================== --- projects/clangbsd/lib/librt/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/lib/librt/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,5 +1,12 @@ # $FreeBSD$ +.include + +# XXX: LLVM PR3678 +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} Modified: projects/clangbsd/libexec/rtld-elf/Makefile ============================================================================== --- projects/clangbsd/libexec/rtld-elf/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/libexec/rtld-elf/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -3,6 +3,11 @@ .include MK_SSP= no +# XXX: prevents failed assertion on startup +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + PROG?= ld-elf.so.1 SRCS= rtld_start.S \ reloc.c rtld.c rtld_lock.c map_object.c \ Modified: projects/clangbsd/secure/lib/libcrypto/Makefile ============================================================================== --- projects/clangbsd/secure/lib/libcrypto/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/secure/lib/libcrypto/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -3,11 +3,12 @@ SHLIBDIR?= /lib SUBDIR= engines -.include - LIB= crypto SHLIB_MAJOR= 5 +# XXX: LLVM PR3678 +CFLAGS+= -DOPENSSL_NO_INLINE_ASM + NO_LINT= .if exists(Makefile.man) Modified: projects/clangbsd/sys/boot/i386/boot2/Makefile ============================================================================== --- projects/clangbsd/sys/boot/i386/boot2/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/sys/boot/i386/boot2/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,5 +1,11 @@ # $FreeBSD$ +.include + +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + FILES= boot boot1 boot2 NM?= nm Modified: projects/clangbsd/sys/boot/i386/gptboot/Makefile ============================================================================== --- projects/clangbsd/sys/boot/i386/gptboot/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/sys/boot/i386/gptboot/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,5 +1,11 @@ # $FreeBSD$ +.include + +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + .PATH: ${.CURDIR}/../boot2 FILES= gptboot Modified: projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,5 +1,11 @@ # $FreeBSD$ +.include + +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot ${.CURDIR}/../zfsboot FILES= gptzfsboot Modified: projects/clangbsd/sys/boot/i386/loader/Makefile ============================================================================== --- projects/clangbsd/sys/boot/i386/loader/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/sys/boot/i386/loader/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -3,6 +3,11 @@ .include MK_SSP= no +# XXX: broken compiler include paths +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + PROG= loader.sym INTERNALPROG= NEWVERSWHAT= "bootstrap loader" i386 Modified: projects/clangbsd/sys/boot/i386/zfsboot/Makefile ============================================================================== --- projects/clangbsd/sys/boot/i386/zfsboot/Makefile Wed Jun 3 09:44:22 2009 (r193375) +++ projects/clangbsd/sys/boot/i386/zfsboot/Makefile Wed Jun 3 13:19:12 2009 (r193376) @@ -1,5 +1,11 @@ # $FreeBSD$ +.include + +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + .PATH: ${.CURDIR}/../boot2 FILES= zfsboot From owner-svn-src-projects@FreeBSD.ORG Wed Jun 3 16:04:21 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AF81106566C; Wed, 3 Jun 2009 16:04:21 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A1CB8FC13; Wed, 3 Jun 2009 16:04:21 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53G4LTH059258; Wed, 3 Jun 2009 16:04:21 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53G4LIS059257; Wed, 3 Jun 2009 16:04:21 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906031604.n53G4LIS059257@svn.freebsd.org> From: Ed Schouten Date: Wed, 3 Jun 2009 16:04:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193383 - projects/clangbsd/lib/libc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 16:04:21 -0000 Author: ed Date: Wed Jun 3 16:04:21 2009 New Revision: 193383 URL: http://svn.freebsd.org/changeset/base/193383 Log: Also build libc with GCC. It also needs #pragma weak. Not build libc with GCC causes things like PAM to break. Modified: projects/clangbsd/lib/libc/Makefile Modified: projects/clangbsd/lib/libc/Makefile ============================================================================== --- projects/clangbsd/lib/libc/Makefile Wed Jun 3 14:18:37 2009 (r193382) +++ projects/clangbsd/lib/libc/Makefile Wed Jun 3 16:04:21 2009 (r193383) @@ -5,6 +5,11 @@ SHLIBDIR?= /lib .include +# XXX: LLVM PR3679 +.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" +CC= gcc +.endif + # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS From owner-svn-src-projects@FreeBSD.ORG Wed Jun 3 16:11:28 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAB3D10656C0; Wed, 3 Jun 2009 16:11:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 954D28FC12; Wed, 3 Jun 2009 16:11:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53GBSNx059556; Wed, 3 Jun 2009 16:11:28 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53GBS3P059544; Wed, 3 Jun 2009 16:11:28 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200906031611.n53GBS3P059544@svn.freebsd.org> From: Ed Schouten Date: Wed, 3 Jun 2009 16:11:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193386 - in projects/clangbsd: . contrib/llvm contrib/llvm/docs contrib/llvm/include/llvm/ADT contrib/llvm/include/llvm/Analysis contrib/llvm/include/llvm/Support contrib/llvm/lib/Anal... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 16:11:28 -0000 Author: ed Date: Wed Jun 3 16:11:27 2009 New Revision: 193386 URL: http://svn.freebsd.org/changeset/base/193386 Log: Integrate latest FreeBSD, LLVM and Clang sources. The LLVM developers fixed PR4225. Because we saw some random crashes in the ports build cluster related to this bug, I think it's important to have this bugfix integrated. Added: projects/clangbsd/contrib/llvm/lib/CodeGen/MachO.h - copied unchanged from r193381, vendor/llvm/dist/lib/CodeGen/MachO.h projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.cpp - copied unchanged from r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.cpp projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.h - copied unchanged from r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.h projects/clangbsd/contrib/llvm/test/Archive/GNU.a - copied unchanged from r193381, vendor/llvm/dist/test/Archive/GNU.a projects/clangbsd/contrib/llvm/test/Archive/IsNAN.o - copied unchanged from r193381, vendor/llvm/dist/test/Archive/IsNAN.o projects/clangbsd/contrib/llvm/test/Archive/MacOSX.a - copied unchanged from r193381, vendor/llvm/dist/test/Archive/MacOSX.a projects/clangbsd/contrib/llvm/test/Archive/SVR4.a - copied unchanged from r193381, vendor/llvm/dist/test/Archive/SVR4.a projects/clangbsd/contrib/llvm/test/Archive/xpg4.a - copied unchanged from r193381, vendor/llvm/dist/test/Archive/xpg4.a projects/clangbsd/contrib/llvm/test/CodeGen/ARM/str_pre-2.ll - copied unchanged from r193381, vendor/llvm/dist/test/CodeGen/ARM/str_pre-2.ll projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-02-RewriterBug.ll - copied unchanged from r193381, vendor/llvm/dist/test/CodeGen/X86/2009-06-02-RewriterBug.ll projects/clangbsd/contrib/llvm/test/CodeGen/X86/codegen-prepare-cast.ll - copied unchanged from r193381, vendor/llvm/dist/test/CodeGen/X86/codegen-prepare-cast.ll projects/clangbsd/contrib/llvm/test/CodeGen/X86/x86-store-gv-addr.ll - copied unchanged from r193381, vendor/llvm/dist/test/CodeGen/X86/x86-store-gv-addr.ll projects/clangbsd/contrib/llvm/tools/clang/docs/PCHLayout.graffle - copied unchanged from r193381, vendor/clang/dist/docs/PCHLayout.graffle projects/clangbsd/contrib/llvm/tools/clang/docs/PCHLayout.png - copied unchanged from r193381, vendor/clang/dist/docs/PCHLayout.png projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/always_inline.c - copied unchanged from r193381, vendor/clang/dist/test/CodeGen/always_inline.c projects/clangbsd/contrib/llvm/tools/clang/test/Sema/vfprintf-invalid-redecl.c - copied unchanged from r193381, vendor/clang/dist/test/Sema/vfprintf-invalid-redecl.c projects/clangbsd/contrib/llvm/tools/clang/test/Sema/vfprintf-valid-redecl.c - copied unchanged from r193381, vendor/clang/dist/test/Sema/vfprintf-valid-redecl.c projects/clangbsd/etc/rc.d/nfscbd - copied unchanged from r193381, head/etc/rc.d/nfscbd projects/clangbsd/etc/rc.d/nfsuserd - copied unchanged from r193381, head/etc/rc.d/nfsuserd Deleted: projects/clangbsd/sys/amd64/conf/MAC projects/clangbsd/sys/i386/conf/MAC projects/clangbsd/sys/ia64/conf/MAC projects/clangbsd/sys/pc98/conf/MAC projects/clangbsd/sys/powerpc/conf/MAC projects/clangbsd/sys/sparc64/conf/MAC projects/clangbsd/sys/sun4v/conf/MAC Modified: projects/clangbsd/ (props changed) projects/clangbsd/contrib/llvm/ (props changed) projects/clangbsd/contrib/llvm/docs/LangRef.html projects/clangbsd/contrib/llvm/include/llvm/ADT/ilist.h projects/clangbsd/contrib/llvm/include/llvm/Analysis/ConstantFolding.h projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h projects/clangbsd/contrib/llvm/include/llvm/Support/TargetFolder.h projects/clangbsd/contrib/llvm/lib/Analysis/ConstantFolding.cpp projects/clangbsd/contrib/llvm/lib/CodeGen/LiveVariables.cpp projects/clangbsd/contrib/llvm/lib/CodeGen/MachOWriter.cpp projects/clangbsd/contrib/llvm/lib/CodeGen/MachOWriter.h projects/clangbsd/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp projects/clangbsd/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp projects/clangbsd/contrib/llvm/lib/System/Atomic.cpp projects/clangbsd/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp projects/clangbsd/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp projects/clangbsd/contrib/llvm/tools/clang/ (props changed) projects/clangbsd/contrib/llvm/tools/clang/docs/PCHInternals.html projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/Builtins.def projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td projects/clangbsd/contrib/llvm/tools/clang/include/clang/Frontend/CompileOptions.h projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/Backend.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/PCHWriter.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/Sema.cpp projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/clangbsd/contrib/llvm/tools/clang/test/Parser/cxx-ambig-paren-expr.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaCXX/const-cast.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaCXX/decl-expr-ambiguity.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaCXX/member-expr.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaCXX/reinterpret-cast.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaCXX/static-cast.cpp projects/clangbsd/contrib/llvm/tools/clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m projects/clangbsd/contrib/llvm/tools/clang/test/SemaObjCXX/blocks.mm projects/clangbsd/contrib/llvm/tools/clang/test/SemaTemplate/temp_arg_nontype.cpp projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp projects/clangbsd/contrib/llvm/utils/NewNightlyTest.pl projects/clangbsd/etc/defaults/rc.conf projects/clangbsd/etc/rc.d/Makefile projects/clangbsd/etc/rc.d/mountd projects/clangbsd/etc/rc.d/nfsd projects/clangbsd/lib/libusb/ (props changed) projects/clangbsd/lib/libusb/libusb.3 (props changed) projects/clangbsd/sbin/fsck_ffs/gjournal.c projects/clangbsd/sbin/mksnap_ffs/mksnap_ffs.c projects/clangbsd/share/examples/kld/dyn_sysctl/dyn_sysctl.c projects/clangbsd/share/examples/kld/syscall/module/syscall.c projects/clangbsd/sys/amd64/conf/GENERIC projects/clangbsd/sys/dev/ath/if_ath.c projects/clangbsd/sys/dev/if_ndis/if_ndis.c projects/clangbsd/sys/dev/usb/usb_dev.c projects/clangbsd/sys/dev/usb/usb_dev.h projects/clangbsd/sys/dev/xen/netfront/ (props changed) projects/clangbsd/sys/dev/xen/xenpci/ (props changed) projects/clangbsd/sys/gnu/fs/ext2fs/ext2_fs.h projects/clangbsd/sys/gnu/fs/ext2fs/ext2_fs_sb.h projects/clangbsd/sys/gnu/fs/ext2fs/ext2_lookup.c projects/clangbsd/sys/gnu/fs/ext2fs/ext2_vfsops.c projects/clangbsd/sys/gnu/fs/ext2fs/ext2_vnops.c projects/clangbsd/sys/i386/conf/GENERIC projects/clangbsd/sys/ia64/conf/GENERIC projects/clangbsd/sys/kern/kern_prot.c projects/clangbsd/sys/kern/sys_socket.c projects/clangbsd/sys/kern/uipc_socket.c projects/clangbsd/sys/kern/uipc_syscalls.c projects/clangbsd/sys/kern/uipc_usrreq.c projects/clangbsd/sys/modules/dtrace/dtnfsclient/ (props changed) projects/clangbsd/sys/modules/ip6_mroute_mod/ (props changed) projects/clangbsd/sys/modules/ipmi/ipmi_linux/ (props changed) projects/clangbsd/sys/net/if.c projects/clangbsd/sys/net80211/ieee80211.c projects/clangbsd/sys/net80211/ieee80211_ioctl.c projects/clangbsd/sys/net80211/ieee80211_proto.c projects/clangbsd/sys/net80211/ieee80211_scan.c projects/clangbsd/sys/netatalk/ddp_input.c projects/clangbsd/sys/netinet/ip_divert.c projects/clangbsd/sys/netinet/tcp_input.c projects/clangbsd/sys/netinet/tcp_syncache.c projects/clangbsd/sys/pc98/conf/GENERIC projects/clangbsd/sys/powerpc/conf/GENERIC projects/clangbsd/sys/rpc/svc_vc.c projects/clangbsd/sys/security/mac/mac_framework.c projects/clangbsd/sys/security/mac/mac_internal.h projects/clangbsd/sys/security/mac/mac_socket.c projects/clangbsd/sys/security/mac_biba/mac_biba.c projects/clangbsd/sys/sparc64/conf/GENERIC projects/clangbsd/sys/sun4v/conf/GENERIC projects/clangbsd/sys/ufs/ufs/dirhash.h projects/clangbsd/sys/ufs/ufs/ufs_dirhash.c projects/clangbsd/tools/regression/fstest/fstest.c projects/clangbsd/tools/regression/lib/msun/test-conj.t (props changed) projects/clangbsd/tools/tools/ath/common/dumpregs.h (props changed) projects/clangbsd/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/clangbsd/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/clangbsd/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/clangbsd/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/clangbsd/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/clangbsd/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/clangbsd/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/clangbsd/usr.sbin/makefs/getid.c (props changed) Modified: projects/clangbsd/contrib/llvm/docs/LangRef.html ============================================================================== --- projects/clangbsd/contrib/llvm/docs/LangRef.html Wed Jun 3 16:10:08 2009 (r193385) +++ projects/clangbsd/contrib/llvm/docs/LangRef.html Wed Jun 3 16:11:27 2009 (r193386) @@ -2403,9 +2403,10 @@ cleanup is performed in the case of eith exception. Additionally, this is important for implementation of 'catch' clauses in high-level languages that support them.

-

It is not valid to reference the return value of an invoke call from -anywhere not dominated by the normal label, since an unwind does not -provide a return value.

+

For the purposes of the SSA form, the definition of the value +returned by the 'invoke' instruction is deemed to occur on +the edge from the current block to the "normal" label. If the callee +unwinds then no return value is available.

Example:
@@ -4518,6 +4519,11 @@ may be used as the label arguments.

 block and the PHI instructions: i.e. PHI instructions must be first in
 a basic block.

 
+
For the purposes of the SSA form, the use of each incoming value is
+deemed to occur on the edge from the corresponding predecessor block
+to the current block (but after any definition of an 'invoke'
+instruction's return value on the same edge).

+
 
Semantics:

 
 
At runtime, the 'phi' instruction logically takes on the value
@@ -7104,7 +7110,7 @@ declare void @llvm.stackprotector( i8* &
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2009-05-30 18:08:30 +0200 (Sat, 30 May 2009) $
+  Last modified: $Date: 2009-06-03 12:20:10 +0200 (Wed, 03 Jun 2009) $
 
 
 

Modified: projects/clangbsd/contrib/llvm/include/llvm/ADT/ilist.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/ADT/ilist.h	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/include/llvm/ADT/ilist.h	Wed Jun  3 16:11:27 2009	(r193386)
@@ -481,8 +481,8 @@ private:
       L2.setTail(0);
 
       // Remove [first, last) from its old position.
-      NodeTy *First = &*first, *Prev = getPrev(First);
-      NodeTy *Next = last.getNodePtrUnchecked(), *Last = getPrev(Next);
+      NodeTy *First = &*first, *Prev = this->getPrev(First);
+      NodeTy *Next = last.getNodePtrUnchecked(), *Last = this->getPrev(Next);
       if (Prev)
         this->setNext(Prev, Next);
       else
@@ -491,7 +491,7 @@ private:
 
       // Splice [first, last) into its new position.
       NodeTy *PosNext = position.getNodePtrUnchecked();
-      NodeTy *PosPrev = getPrev(PosNext);
+      NodeTy *PosPrev = this->getPrev(PosNext);
 
       // Fix head of list...
       if (PosPrev)
@@ -504,7 +504,7 @@ private:
       this->setNext(Last, PosNext);
       this->setPrev(PosNext, Last);
 
-      transferNodesFromList(L2, First, PosNext);
+      this->transferNodesFromList(L2, First, PosNext);
 
       // Now that everything is set, restore the pointers to the list sentinels.
       L2.setTail(L2Sentinel);

Modified: projects/clangbsd/contrib/llvm/include/llvm/Analysis/ConstantFolding.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/Analysis/ConstantFolding.h	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/include/llvm/Analysis/ConstantFolding.h	Wed Jun  3 16:11:27 2009	(r193386)
@@ -34,7 +34,7 @@ Constant *ConstantFoldInstruction(Instru
 /// using the specified TargetData.  If successful, the constant result is
 /// result is returned, if not, null is returned.
 Constant *ConstantFoldConstantExpression(ConstantExpr *CE,
-                                         const TargetData *TD);
+                                         const TargetData *TD = 0);
 
 /// ConstantFoldInstOperands - Attempt to constant fold an instruction with the
 /// specified operands.  If successful, the constant result is returned, if not,

Modified: projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h	Wed Jun  3 16:11:27 2009	(r193386)
@@ -19,7 +19,6 @@
 namespace llvm {
   class ConstantInt;
   class ConstantRange;
-  class APInt;
   class DominatorTree;
 
   enum SCEVTypes {

Modified: projects/clangbsd/contrib/llvm/include/llvm/Support/TargetFolder.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/Support/TargetFolder.h	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/include/llvm/Support/TargetFolder.h	Wed Jun  3 16:11:27 2009	(r193386)
@@ -9,8 +9,10 @@
 //
 // This file defines the TargetFolder class, a helper for IRBuilder.
 // It provides IRBuilder with a set of methods for creating constants with
-// target dependent folding.  For general constant creation and folding,
-// use ConstantExpr and the routines in llvm/Analysis/ConstantFolding.h.
+// target dependent folding, in addition to the same target-independent
+// folding that the ConstantFolder class provides.  For general constant
+// creation and folding, use ConstantExpr and the routines in
+// llvm/Analysis/ConstantFolding.h.
 //
 //===----------------------------------------------------------------------===//
 
@@ -26,18 +28,18 @@ class TargetData;
 
 /// TargetFolder - Create constants with target dependent folding.
 class TargetFolder {
-  const TargetData &TD;
+  const TargetData *TD;
 
   /// Fold - Fold the constant using target specific information.
   Constant *Fold(Constant *C) const {
     if (ConstantExpr *CE = dyn_cast(C))
-      if (Constant *CF = ConstantFoldConstantExpression(CE, &TD))
+      if (Constant *CF = ConstantFoldConstantExpression(CE, TD))
         return CF;
     return C;
   }
 
 public:
-  TargetFolder(const TargetData &TheTD) : TD(TheTD) {}
+  explicit TargetFolder(const TargetData *TheTD) : TD(TheTD) {}
 
   //===--------------------------------------------------------------------===//
   // Binary Operators

Modified: projects/clangbsd/contrib/llvm/lib/Analysis/ConstantFolding.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/Analysis/ConstantFolding.cpp	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/lib/Analysis/ConstantFolding.cpp	Wed Jun  3 16:11:27 2009	(r193386)
@@ -317,8 +317,6 @@ Constant *llvm::ConstantFoldInstruction(
 /// result is returned, if not, null is returned.
 Constant *llvm::ConstantFoldConstantExpression(ConstantExpr *CE,
                                                const TargetData *TD) {
-  assert(TD && "ConstantFoldConstantExpression requires a valid TargetData.");
-
   SmallVector Ops;
   for (User::op_iterator i = CE->op_begin(), e = CE->op_end(); i != e; ++i)
     Ops.push_back(cast(*i));

Modified: projects/clangbsd/contrib/llvm/lib/CodeGen/LiveVariables.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/CodeGen/LiveVariables.cpp	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/LiveVariables.cpp	Wed Jun  3 16:11:27 2009	(r193386)
@@ -242,20 +242,6 @@ void LiveVariables::HandlePhysRegUse(uns
     }
   }
 
-  // There was an earlier def of a super-register. Add implicit def to that MI.
-  //
-  //   A: EAX = ...
-  //   B: ... = AX
-  //
-  // Add implicit def to A if there isn't a use of AX (or EAX) before B.
-  if (!PhysRegUse[Reg]) {
-    MachineInstr *Def = PhysRegDef[Reg];
-    if (Def && !Def->modifiesRegister(Reg))
-      Def->addOperand(MachineOperand::CreateReg(Reg,
-                                                true  /*IsDef*/,
-                                                true  /*IsImp*/));
-  }
-  
   // Remember this use.
   PhysRegUse[Reg]  = MI;
   for (const unsigned *SubRegs = TRI->getSubRegisters(Reg);

Copied: projects/clangbsd/contrib/llvm/lib/CodeGen/MachO.h (from r193381, vendor/llvm/dist/lib/CodeGen/MachO.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/MachO.h	Wed Jun  3 16:11:27 2009	(r193386, copy of r193381, vendor/llvm/dist/lib/CodeGen/MachO.h)
@@ -0,0 +1,423 @@
+//=== MachO.h - Mach-O structures and constants -----------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines MachO .
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MACHO_H
+#define MACHO_H
+
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/CodeGen/MachineRelocation.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include 
+#include 
+
+namespace llvm {
+
+typedef std::vector DataBuffer;
+  
+/// MachOSym - This struct contains information about each symbol that is
+/// added to logical symbol table for the module.  This is eventually
+/// turned into a real symbol table in the file.
+struct MachOSym {
+  const GlobalValue *GV;    // The global value this corresponds to.
+  std::string GVName;       // The mangled name of the global value.
+  uint32_t    n_strx;       // index into the string table
+  uint8_t     n_type;       // type flag
+  uint8_t     n_sect;       // section number or NO_SECT
+  int16_t     n_desc;       // see 
+  uint64_t    n_value;      // value for this symbol (or stab offset)
+  
+  // Constants for the n_sect field
+  // see 
+  enum { NO_SECT = 0 };   // symbol is not in any section
+
+  // Constants for the n_type field
+  // see 
+  enum { N_UNDF  = 0x0,  // undefined, n_sect == NO_SECT
+         N_ABS   = 0x2,  // absolute, n_sect == NO_SECT
+         N_SECT  = 0xe,  // defined in section number n_sect
+         N_PBUD  = 0xc,  // prebound undefined (defined in a dylib)
+         N_INDR  = 0xa   // indirect
+  };
+  // The following bits are OR'd into the types above. For example, a type
+  // of 0x0f would be an external N_SECT symbol (0x0e | 0x01).
+  enum { N_EXT  = 0x01,   // external symbol bit
+         N_PEXT = 0x10    // private external symbol bit
+  };
+  
+  // Constants for the n_desc field
+  // see 
+  enum { REFERENCE_FLAG_UNDEFINED_NON_LAZY          = 0,
+         REFERENCE_FLAG_UNDEFINED_LAZY              = 1,
+         REFERENCE_FLAG_DEFINED                     = 2,
+         REFERENCE_FLAG_PRIVATE_DEFINED             = 3,
+         REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY  = 4,
+         REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY      = 5
+  };
+  enum { N_NO_DEAD_STRIP = 0x0020, // symbol is not to be dead stripped
+         N_WEAK_REF      = 0x0040, // symbol is weak referenced
+         N_WEAK_DEF      = 0x0080  // coalesced symbol is a weak definition
+  };
+  
+  MachOSym(const GlobalValue *gv, std::string name, uint8_t sect,
+           const TargetAsmInfo *TAI);
+
+  struct SymCmp {
+    // FIXME: this does not appear to be sorting 'f' after 'F'
+    bool operator()(const MachOSym &LHS, const MachOSym &RHS) {
+      return LHS.GVName < RHS.GVName;
+    }
+  };
+
+
+  /// PartitionByLocal - Simple boolean predicate that returns true if Sym is
+  /// a local symbol rather than an external symbol.
+  
+  static inline bool PartitionByLocal(const MachOSym &Sym) {
+    return (Sym.n_type & (MachOSym::N_EXT | MachOSym::N_PEXT)) == 0;
+  }
+  
+  /// PartitionByDefined - Simple boolean predicate that returns true if Sym is
+  /// defined in this module.
+  
+  static inline bool PartitionByDefined(const MachOSym &Sym) {
+    // FIXME: Do N_ABS or N_INDR count as defined?
+    return (Sym.n_type & MachOSym::N_SECT) == MachOSym::N_SECT;
+  }
+
+}; // end struct MachOSym
+
+/// MachOHeader - This struct contains the header information about a
+/// specific architecture type/subtype pair that is emitted to the file.
+
+struct MachOHeader {
+  uint32_t  magic;      // mach magic number identifier
+  uint32_t  filetype;   // type of file
+  uint32_t  ncmds;      // number of load commands
+  uint32_t  sizeofcmds; // the size of all the load commands
+  uint32_t  flags;      // flags
+  uint32_t  reserved;   // 64-bit only
+  
+  /// HeaderData - The actual data for the header which we are building
+  /// up for emission to the file.
+  DataBuffer HeaderData;
+
+  // Constants for the filetype field
+  // see  for additional info on the various types
+  enum { MH_OBJECT     = 1, // relocatable object file
+         MH_EXECUTE    = 2, // demand paged executable file
+         MH_FVMLIB     = 3, // fixed VM shared library file
+         MH_CORE       = 4, // core file
+         MH_PRELOAD    = 5, // preloaded executable file
+         MH_DYLIB      = 6, // dynamically bound shared library
+         MH_DYLINKER   = 7, // dynamic link editor
+         MH_BUNDLE     = 8, // dynamically bound bundle file
+         MH_DYLIB_STUB = 9, // shared library stub for static linking only
+         MH_DSYM       = 10 // companion file wiht only debug sections
+  };
+  
+  // Constants for the flags field
+  enum { MH_NOUNDEFS                = 1 << 0,
+            // the object file has no undefined references
+         MH_INCRLINK                = 1 << 1,
+            // the object file is the output of an incremental link against
+            // a base file and cannot be link edited again
+         MH_DYLDLINK                = 1 << 2,
+            // the object file is input for the dynamic linker and cannot be
+            // statically link edited again.
+         MH_BINDATLOAD              = 1 << 3,
+            // the object file's undefined references are bound by the
+            // dynamic linker when loaded.
+         MH_PREBOUND                = 1 << 4,
+            // the file has its dynamic undefined references prebound
+         MH_SPLIT_SEGS              = 1 << 5,
+            // the file has its read-only and read-write segments split
+            // see 
+         MH_LAZY_INIT               = 1 << 6,
+            // the shared library init routine is to be run lazily via
+            // catching memory faults to its writable segments (obsolete)
+         MH_TWOLEVEL                = 1 << 7,
+            // the image is using two-level namespace bindings
+         MH_FORCE_FLAT              = 1 << 8,
+            // the executable is forcing all images to use flat namespace
+            // bindings.
+         MH_NOMULTIDEFS             = 1 << 8,
+            // this umbrella guarantees no multiple definitions of symbols
+            // in its sub-images so the two-level namespace hints can
+            // always be used.
+         MH_NOFIXPREBINDING         = 1 << 10,
+            // do not have dyld notify the prebidning agent about this
+            // executable.
+         MH_PREBINDABLE             = 1 << 11,
+            // the binary is not prebound but can have its prebinding
+            // redone.  only used when MH_PREBOUND is not set.
+         MH_ALLMODSBOUND            = 1 << 12,
+            // indicates that this binary binds to all two-level namespace
+            // modules of its dependent libraries.  Only used when
+            // MH_PREBINDABLE and MH_TWOLEVEL are both set.
+         MH_SUBSECTIONS_VIA_SYMBOLS = 1 << 13,
+            // safe to divide up the sections into sub-sections via symbols
+            // for dead code stripping.
+         MH_CANONICAL               = 1 << 14,
+            // the binary has been canonicalized via the unprebind operation
+         MH_WEAK_DEFINES            = 1 << 15,
+            // the final linked image contains external weak symbols
+         MH_BINDS_TO_WEAK           = 1 << 16,
+            // the final linked image uses weak symbols
+         MH_ALLOW_STACK_EXECUTION   = 1 << 17
+            // When this bit is set, all stacks in the task will be given
+            // stack execution privilege.  Only used in MH_EXECUTE filetype
+  };
+
+  MachOHeader() : magic(0), filetype(0), ncmds(0), sizeofcmds(0), flags(0),
+                  reserved(0) { }
+  
+  /// cmdSize - This routine returns the size of the MachOSection as written
+  /// to disk, depending on whether the destination is a 64 bit Mach-O file.
+  unsigned cmdSize(bool is64Bit) const {
+    if (is64Bit)
+      return 8 * sizeof(uint32_t);
+    else
+      return 7 * sizeof(uint32_t);
+  }
+
+  /// setMagic - This routine sets the appropriate value for the 'magic'
+  /// field based on pointer size and endianness.
+  void setMagic(bool isLittleEndian, bool is64Bit) {
+    if (isLittleEndian)
+      if (is64Bit) magic = 0xcffaedfe;
+      else         magic = 0xcefaedfe;
+    else
+      if (is64Bit) magic = 0xfeedfacf;
+      else         magic = 0xfeedface;
+  }
+
+}; // end struct MachOHeader
+    
+/// MachOSegment - This struct contains the necessary information to
+/// emit the load commands for each section in the file.
+struct MachOSegment {
+  uint32_t    cmd;      // LC_SEGMENT or LC_SEGMENT_64
+  uint32_t    cmdsize;  // Total size of this struct and section commands
+  std::string segname;  // segment name
+  uint64_t    vmaddr;   // address of this segment
+  uint64_t    vmsize;   // size of this segment, may be larger than filesize
+  uint64_t    fileoff;  // offset in file
+  uint64_t    filesize; // amount to read from file
+  uint32_t    maxprot;  // maximum VM protection
+  uint32_t    initprot; // initial VM protection
+  uint32_t    nsects;   // number of sections in this segment
+  uint32_t    flags;    // flags
+  
+  // The following constants are getting pulled in by one of the
+  // system headers, which creates a neat clash with the enum.
+#if !defined(VM_PROT_NONE)
+#define VM_PROT_NONE    0x00
+#endif
+#if !defined(VM_PROT_READ)
+#define VM_PROT_READ    0x01
+#endif
+#if !defined(VM_PROT_WRITE)
+#define VM_PROT_WRITE   0x02
+#endif
+#if !defined(VM_PROT_EXECUTE)
+#define VM_PROT_EXECUTE 0x04
+#endif
+#if !defined(VM_PROT_ALL)
+#define VM_PROT_ALL     0x07
+#endif
+
+  // Constants for the vm protection fields
+  // see 
+  enum { SEG_VM_PROT_NONE     = VM_PROT_NONE, 
+         SEG_VM_PROT_READ     = VM_PROT_READ, // read permission
+         SEG_VM_PROT_WRITE    = VM_PROT_WRITE, // write permission
+         SEG_VM_PROT_EXECUTE  = VM_PROT_EXECUTE,
+         SEG_VM_PROT_ALL      = VM_PROT_ALL
+  };
+  
+  // Constants for the cmd field
+  // see 
+  enum { LC_SEGMENT    = 0x01,  // segment of this file to be mapped
+         LC_SEGMENT_64 = 0x19   // 64-bit segment of this file to be mapped
+  };
+  
+  /// cmdSize - This routine returns the size of the MachOSection as written
+  /// to disk, depending on whether the destination is a 64 bit Mach-O file.
+  unsigned cmdSize(bool is64Bit) const {
+    if (is64Bit)
+      return 6 * sizeof(uint32_t) + 4 * sizeof(uint64_t) + 16;
+    else
+      return 10 * sizeof(uint32_t) + 16;  // addresses only 32 bits
+  }
+
+  MachOSegment(const std::string &seg, bool is64Bit)
+    : cmd(is64Bit ? LC_SEGMENT_64 : LC_SEGMENT), cmdsize(0), segname(seg),
+      vmaddr(0), vmsize(0), fileoff(0), filesize(0), maxprot(VM_PROT_ALL),
+      initprot(VM_PROT_ALL), nsects(0), flags(0) { }
+};
+
+/// MachOSection - This struct contains information about each section in a 
+/// particular segment that is emitted to the file.  This is eventually
+/// turned into the SectionCommand in the load command for a particlar
+/// segment.
+
+struct MachOSection { 
+  std::string  sectname; // name of this section, 
+  std::string  segname;  // segment this section goes in
+  uint64_t  addr;        // memory address of this section
+  uint64_t  size;        // size in bytes of this section
+  uint32_t  offset;      // file offset of this section
+  uint32_t  align;       // section alignment (power of 2)
+  uint32_t  reloff;      // file offset of relocation entries
+  uint32_t  nreloc;      // number of relocation entries
+  uint32_t  flags;       // flags (section type and attributes)
+  uint32_t  reserved1;   // reserved (for offset or index)
+  uint32_t  reserved2;   // reserved (for count or sizeof)
+  uint32_t  reserved3;   // reserved (64 bit only)
+  
+  /// A unique number for this section, which will be used to match symbols
+  /// to the correct section.
+  uint32_t Index;
+  
+  /// SectionData - The actual data for this section which we are building
+  /// up for emission to the file.
+  DataBuffer SectionData;
+
+  /// RelocBuffer - A buffer to hold the mach-o relocations before we write
+  /// them out at the appropriate location in the file.
+  DataBuffer RelocBuffer;
+  
+  /// Relocations - The relocations that we have encountered so far in this 
+  /// section that we will need to convert to MachORelocation entries when
+  /// the file is written.
+  std::vector Relocations;
+  
+  // Constants for the section types (low 8 bits of flags field)
+  // see 
+  enum { S_REGULAR = 0,
+            // regular section
+         S_ZEROFILL = 1,
+            // zero fill on demand section
+         S_CSTRING_LITERALS = 2,
+            // section with only literal C strings
+         S_4BYTE_LITERALS = 3,
+            // section with only 4 byte literals
+         S_8BYTE_LITERALS = 4,
+            // section with only 8 byte literals
+         S_LITERAL_POINTERS = 5, 
+            // section with only pointers to literals
+         S_NON_LAZY_SYMBOL_POINTERS = 6,
+            // section with only non-lazy symbol pointers
+         S_LAZY_SYMBOL_POINTERS = 7,
+            // section with only lazy symbol pointers
+         S_SYMBOL_STUBS = 8,
+            // section with only symbol stubs
+            // byte size of stub in the reserved2 field
+         S_MOD_INIT_FUNC_POINTERS = 9,
+            // section with only function pointers for initialization
+         S_MOD_TERM_FUNC_POINTERS = 10,
+            // section with only function pointers for termination
+         S_COALESCED = 11,
+            // section contains symbols that are coalesced
+         S_GB_ZEROFILL = 12,
+            // zero fill on demand section (that can be larger than 4GB)
+         S_INTERPOSING = 13,
+            // section with only pairs of function pointers for interposing
+         S_16BYTE_LITERALS = 14
+            // section with only 16 byte literals
+  };
+  
+  // Constants for the section flags (high 24 bits of flags field)
+  // see 
+  enum { S_ATTR_PURE_INSTRUCTIONS   = 1 << 31,
+            // section contains only true machine instructions
+         S_ATTR_NO_TOC              = 1 << 30,
+            // section contains coalesced symbols that are not to be in a 
+            // ranlib table of contents
+         S_ATTR_STRIP_STATIC_SYMS   = 1 << 29,
+            // ok to strip static symbols in this section in files with the
+            // MY_DYLDLINK flag
+         S_ATTR_NO_DEAD_STRIP       = 1 << 28,
+            // no dead stripping
+         S_ATTR_LIVE_SUPPORT        = 1 << 27,
+            // blocks are live if they reference live blocks
+         S_ATTR_SELF_MODIFYING_CODE = 1 << 26,
+            // used with i386 code stubs written on by dyld
+         S_ATTR_DEBUG               = 1 << 25,
+            // a debug section
+         S_ATTR_SOME_INSTRUCTIONS   = 1 << 10,
+            // section contains some machine instructions
+         S_ATTR_EXT_RELOC           = 1 << 9,
+            // section has external relocation entries
+         S_ATTR_LOC_RELOC           = 1 << 8
+            // section has local relocation entries
+  };
+
+  /// cmdSize - This routine returns the size of the MachOSection as written
+  /// to disk, depending on whether the destination is a 64 bit Mach-O file.
+  unsigned cmdSize(bool is64Bit) const {
+    if (is64Bit)
+      return 7 * sizeof(uint32_t) + 2 * sizeof(uint64_t) + 32;
+    else
+      return 9 * sizeof(uint32_t) + 32;  // addresses only 32 bits
+  }
+
+  MachOSection(const std::string &seg, const std::string §)
+    : sectname(sect), segname(seg), addr(0), size(0), offset(0), align(2),
+      reloff(0), nreloc(0), flags(0), reserved1(0), reserved2(0),
+      reserved3(0) { }
+
+}; // end struct MachOSection
+
+    /// MachOSymTab - This struct contains information about the offsets and 
+    /// size of symbol table information.
+    /// segment.
+    struct MachODySymTab {
+      uint32_t cmd;             // LC_DYSYMTAB
+      uint32_t cmdsize;         // sizeof( MachODySymTab )
+      uint32_t ilocalsym;       // index to local symbols
+      uint32_t nlocalsym;       // number of local symbols
+      uint32_t iextdefsym;      // index to externally defined symbols
+      uint32_t nextdefsym;      // number of externally defined symbols
+      uint32_t iundefsym;       // index to undefined symbols
+      uint32_t nundefsym;       // number of undefined symbols
+      uint32_t tocoff;          // file offset to table of contents
+      uint32_t ntoc;            // number of entries in table of contents
+      uint32_t modtaboff;       // file offset to module table
+      uint32_t nmodtab;         // number of module table entries
+      uint32_t extrefsymoff;    // offset to referenced symbol table
+      uint32_t nextrefsyms;     // number of referenced symbol table entries
+      uint32_t indirectsymoff;  // file offset to the indirect symbol table
+      uint32_t nindirectsyms;   // number of indirect symbol table entries
+      uint32_t extreloff;       // offset to external relocation entries
+      uint32_t nextrel;         // number of external relocation entries
+      uint32_t locreloff;       // offset to local relocation entries
+      uint32_t nlocrel;         // number of local relocation entries
+
+      // Constants for the cmd field
+      // see 
+      enum { LC_DYSYMTAB = 0x0B  // dynamic link-edit symbol table info
+      };
+      
+      MachODySymTab() : cmd(LC_DYSYMTAB), cmdsize(20 * sizeof(uint32_t)),
+        ilocalsym(0), nlocalsym(0), iextdefsym(0), nextdefsym(0),
+        iundefsym(0), nundefsym(0), tocoff(0), ntoc(0), modtaboff(0),
+        nmodtab(0), extrefsymoff(0), nextrefsyms(0), indirectsymoff(0),
+        nindirectsyms(0), extreloff(0), nextrel(0), locreloff(0), nlocrel(0) { }
+    };
+
+} // end namespace llvm
+
+#endif
+

Copied: projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.cpp (from r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.cpp	Wed Jun  3 16:11:27 2009	(r193386, copy of r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.cpp)
@@ -0,0 +1,207 @@
+//===-- MachOEmitter.cpp - Target-independent Mach-O Emitter code --------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MachOCodeEmitter.h"
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Function.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
+#include "llvm/CodeGen/MachineJumpTableInfo.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Support/Mangler.h"
+#include "llvm/Support/OutputBuffer.h"
+
+//===----------------------------------------------------------------------===//
+//                       MachOCodeEmitter Implementation
+//===----------------------------------------------------------------------===//
+
+namespace llvm {
+    
+/// startFunction - This callback is invoked when a new machine function is
+/// about to be emitted.
+
+void MachOCodeEmitter::startFunction(MachineFunction &MF) {
+  const TargetData *TD = TM.getTargetData();
+  const Function *F = MF.getFunction();
+
+  // Align the output buffer to the appropriate alignment, power of 2.
+  unsigned FnAlign = F->getAlignment();
+  unsigned TDAlign = TD->getPrefTypeAlignment(F->getType());
+  unsigned Align = Log2_32(std::max(FnAlign, TDAlign));
+  assert(!(Align & (Align-1)) && "Alignment is not a power of two!");
+
+  // Get the Mach-O Section that this function belongs in.
+  MachOSection *MOS = MOW.getTextSection();
+  
+  // FIXME: better memory management
+  MOS->SectionData.reserve(4096);
+  BufferBegin = &MOS->SectionData[0];
+  BufferEnd = BufferBegin + MOS->SectionData.capacity();
+
+  // Upgrade the section alignment if required.
+  if (MOS->align < Align) MOS->align = Align;
+
+  // Round the size up to the correct alignment for starting the new function.
+  if ((MOS->size & ((1 << Align) - 1)) != 0) {
+    MOS->size += (1 << Align);
+    MOS->size &= ~((1 << Align) - 1);
+  }
+
+  // FIXME: Using MOS->size directly here instead of calculating it from the
+  // output buffer size (impossible because the code emitter deals only in raw
+  // bytes) forces us to manually synchronize size and write padding zero bytes
+  // to the output buffer for all non-text sections.  For text sections, we do
+  // not synchonize the output buffer, and we just blow up if anyone tries to
+  // write non-code to it.  An assert should probably be added to
+  // AddSymbolToSection to prevent calling it on the text section.
+  CurBufferPtr = BufferBegin + MOS->size;
+}
+
+/// finishFunction - This callback is invoked after the function is completely
+/// finished.
+
+bool MachOCodeEmitter::finishFunction(MachineFunction &MF) {
+    
+  // Get the Mach-O Section that this function belongs in.
+  MachOSection *MOS = MOW.getTextSection();
+
+  // Get a symbol for the function to add to the symbol table
+  // FIXME: it seems like we should call something like AddSymbolToSection
+  // in startFunction rather than changing the section size and symbol n_value
+  // here.
+  const GlobalValue *FuncV = MF.getFunction();
+  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, TAI);
+  FnSym.n_value = MOS->size;
+  MOS->size = CurBufferPtr - BufferBegin;
+  
+  // Emit constant pool to appropriate section(s)
+  emitConstantPool(MF.getConstantPool());
+
+  // Emit jump tables to appropriate section
+  emitJumpTables(MF.getJumpTableInfo());
+  
+  // If we have emitted any relocations to function-specific objects such as 
+  // basic blocks, constant pools entries, or jump tables, record their
+  // addresses now so that we can rewrite them with the correct addresses
+  // later.
+  for (unsigned i = 0, e = Relocations.size(); i != e; ++i) {
+    MachineRelocation &MR = Relocations[i];
+    intptr_t Addr;
+
+    if (MR.isBasicBlock()) {
+      Addr = getMachineBasicBlockAddress(MR.getBasicBlock());
+      MR.setConstantVal(MOS->Index);
+      MR.setResultPointer((void*)Addr);
+    } else if (MR.isJumpTableIndex()) {
+      Addr = getJumpTableEntryAddress(MR.getJumpTableIndex());
+      MR.setConstantVal(MOW.getJumpTableSection()->Index);
+      MR.setResultPointer((void*)Addr);
+    } else if (MR.isConstantPoolIndex()) {
+      Addr = getConstantPoolEntryAddress(MR.getConstantPoolIndex());
+      MR.setConstantVal(CPSections[MR.getConstantPoolIndex()]);
+      MR.setResultPointer((void*)Addr);
+    } else if (MR.isGlobalValue()) {
+      // FIXME: This should be a set or something that uniques
+      MOW.PendingGlobals.push_back(MR.getGlobalValue());
+    } else {
+      assert(0 && "Unhandled relocation type");
+    }
+    MOS->Relocations.push_back(MR);
+  }
+  Relocations.clear();
+  
+  // Finally, add it to the symtab.
+  MOW.SymbolTable.push_back(FnSym);
+
+  // Clear per-function data structures.
+  CPLocations.clear();
+  CPSections.clear();
+  JTLocations.clear();
+  MBBLocations.clear();
+
+  return false;
+}
+
+/// emitConstantPool - For each constant pool entry, figure out which section
+/// the constant should live in, allocate space for it, and emit it to the 
+/// Section data buffer.
+void MachOCodeEmitter::emitConstantPool(MachineConstantPool *MCP) {
+  const std::vector &CP = MCP->getConstants();
+  if (CP.empty()) return;
+
+  // FIXME: handle PIC codegen
+  assert(TM.getRelocationModel() != Reloc::PIC_ &&
+         "PIC codegen not yet handled for mach-o jump tables!");
+
+  // Although there is no strict necessity that I am aware of, we will do what
+  // gcc for OS X does and put each constant pool entry in a section of constant
+  // objects of a certain size.  That means that float constants go in the
+  // literal4 section, and double objects go in literal8, etc.
+  //
+  // FIXME: revisit this decision if we ever do the "stick everything into one
+  // "giant object for PIC" optimization.
+  for (unsigned i = 0, e = CP.size(); i != e; ++i) {
+    const Type *Ty = CP[i].getType();
+    unsigned Size = TM.getTargetData()->getTypeAllocSize(Ty);
+
+    MachOSection *Sec = MOW.getConstSection(CP[i].Val.ConstVal);
+    OutputBuffer SecDataOut(Sec->SectionData, is64Bit, isLittleEndian);
+
+    CPLocations.push_back(Sec->SectionData.size());
+    CPSections.push_back(Sec->Index);
+    
+    // FIXME: remove when we have unified size + output buffer
+    Sec->size += Size;
+
+    // Allocate space in the section for the global.
+    // FIXME: need alignment?
+    // FIXME: share between here and AddSymbolToSection?
+    for (unsigned j = 0; j < Size; ++j)
+      SecDataOut.outbyte(0);
+
+    MOW.InitMem(CP[i].Val.ConstVal, &Sec->SectionData[0], CPLocations[i],
+                TM.getTargetData(), Sec->Relocations);
+  }
+}
+
+/// emitJumpTables - Emit all the jump tables for a given jump table info
+/// record to the appropriate section.
+
+void MachOCodeEmitter::emitJumpTables(MachineJumpTableInfo *MJTI) {
+  const std::vector &JT = MJTI->getJumpTables();
+  if (JT.empty()) return;
+
+  // FIXME: handle PIC codegen
+  assert(TM.getRelocationModel() != Reloc::PIC_ &&
+         "PIC codegen not yet handled for mach-o jump tables!");
+
+  MachOSection *Sec = MOW.getJumpTableSection();
+  unsigned TextSecIndex = MOW.getTextSection()->Index;
+  OutputBuffer SecDataOut(Sec->SectionData, is64Bit, isLittleEndian);
+
+  for (unsigned i = 0, e = JT.size(); i != e; ++i) {
+    // For each jump table, record its offset from the start of the section,
+    // reserve space for the relocations to the MBBs, and add the relocations.
+    const std::vector &MBBs = JT[i].MBBs;
+    JTLocations.push_back(Sec->SectionData.size());
+    for (unsigned mi = 0, me = MBBs.size(); mi != me; ++mi) {
+      MachineRelocation MR(MOW.GetJTRelocation(Sec->SectionData.size(),
+                                               MBBs[mi]));
+      MR.setResultPointer((void *)JTLocations[i]);
+      MR.setConstantVal(TextSecIndex);
+      Sec->Relocations.push_back(MR);
+      SecDataOut.outaddr(0);
+    }
+  }
+  // FIXME: remove when we have unified size + output buffer
+  Sec->size = Sec->SectionData.size();
+}
+
+} // end namespace llvm
+

Copied: projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.h (from r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/MachOCodeEmitter.h	Wed Jun  3 16:11:27 2009	(r193386, copy of r193381, vendor/llvm/dist/lib/CodeGen/MachOCodeEmitter.h)
@@ -0,0 +1,129 @@
+//===-- MachOEmitter.h - Target-independent Mach-O Emitter class ----------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MACHOCODEEMITTER_H
+#define MACHOCODEEMITTER_H
+
+#include "MachOWriter.h"
+#include "llvm/CodeGen/MachineCodeEmitter.h"
+#include 
+
+namespace llvm {
+
+/// MachOCodeEmitter - This class is used by the MachOWriter to emit the code 
+/// for functions to the Mach-O file.
+
+class MachOCodeEmitter : public MachineCodeEmitter {
+  MachOWriter &MOW;
+
+  /// Target machine description.
+  TargetMachine &TM;
+
+  /// is64Bit/isLittleEndian - This information is inferred from the target
+  /// machine directly, indicating what header values and flags to set.
+  bool is64Bit, isLittleEndian;
+
+  const TargetAsmInfo *TAI;
+
+  /// Relocations - These are the relocations that the function needs, as
+  /// emitted.
+  std::vector Relocations;
+  
+  /// CPLocations - This is a map of constant pool indices to offsets from the
+  /// start of the section for that constant pool index.
+  std::vector CPLocations;
+
+  /// CPSections - This is a map of constant pool indices to the MachOSection
+  /// containing the constant pool entry for that index.
+  std::vector CPSections;
+
+  /// JTLocations - This is a map of jump table indices to offsets from the
+  /// start of the section for that jump table index.
+  std::vector JTLocations;
+
+  /// MBBLocations - This vector is a mapping from MBB ID's to their address.
+  /// It is filled in by the StartMachineBasicBlock callback and queried by
+  /// the getMachineBasicBlockAddress callback.
+  std::vector MBBLocations;
+  
+public:
+  MachOCodeEmitter(MachOWriter &mow) : MOW(mow), TM(MOW.TM)
+  {
+    is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
+    isLittleEndian = TM.getTargetData()->isLittleEndian();
+    TAI = TM.getTargetAsmInfo();  
+  }
+
+  virtual void startFunction(MachineFunction &MF);
+  virtual bool finishFunction(MachineFunction &MF);
+
+  virtual void addRelocation(const MachineRelocation &MR) {
+    Relocations.push_back(MR);
+  }
+  
+  void emitConstantPool(MachineConstantPool *MCP);
+  void emitJumpTables(MachineJumpTableInfo *MJTI);
+  
+  virtual uintptr_t getConstantPoolEntryAddress(unsigned Index) const {
+    assert(CPLocations.size() > Index && "CP not emitted!");
+    return CPLocations[Index];
+  }
+  virtual uintptr_t getJumpTableEntryAddress(unsigned Index) const {
+    assert(JTLocations.size() > Index && "JT not emitted!");
+    return JTLocations[Index];
+  }
+
+  virtual void StartMachineBasicBlock(MachineBasicBlock *MBB) {
+    if (MBBLocations.size() <= (unsigned)MBB->getNumber())
+      MBBLocations.resize((MBB->getNumber()+1)*2);
+    MBBLocations[MBB->getNumber()] = getCurrentPCOffset();
+  }
+
+  virtual uintptr_t getMachineBasicBlockAddress(MachineBasicBlock *MBB) const {
+    assert(MBBLocations.size() > (unsigned)MBB->getNumber() && 
+           MBBLocations[MBB->getNumber()] && "MBB not emitted!");
+    return MBBLocations[MBB->getNumber()];
+  }
+
+  virtual uintptr_t getLabelAddress(uint64_t Label) const {
+    assert(0 && "get Label not implemented");
+    abort();
+    return 0;
+  }
+
+  virtual void emitLabel(uint64_t LabelID) {
+    assert(0 && "emit Label not implemented");
+    abort();
+  }
+
+  virtual void setModuleInfo(llvm::MachineModuleInfo* MMI) { }
+
+  /// JIT SPECIFIC FUNCTIONS - DO NOT IMPLEMENT THESE HERE!
+  virtual void startGVStub(const GlobalValue* F, unsigned StubSize,
+                           unsigned Alignment = 1) {
+    assert(0 && "JIT specific function called!");
+    abort();
+  }
+  virtual void startGVStub(const GlobalValue* F, void *Buffer, 
+                           unsigned StubSize) {
+    assert(0 && "JIT specific function called!");
+    abort();
+  }
+  virtual void *finishGVStub(const GlobalValue* F) {
+    assert(0 && "JIT specific function called!");
+    abort();
+    return 0;
+  }
+
+}; // end class MachOCodeEmitter
+
+} // end namespace llvm
+
+#endif
+

Modified: projects/clangbsd/contrib/llvm/lib/CodeGen/MachOWriter.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/CodeGen/MachOWriter.cpp	Wed Jun  3 16:10:08 2009	(r193385)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/MachOWriter.cpp	Wed Jun  3 16:11:27 2009	(r193386)
@@ -23,6 +23,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MachOWriter.h"
+#include "MachOCodeEmitter.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
@@ -40,11 +41,12 @@
 #include "llvm/Support/raw_ostream.h"
 #include 
 #include 
-using namespace llvm;
+
+namespace llvm {
 
 /// AddMachOWriter - Concrete function to add the Mach-O writer to the function
 /// pass manager.
-MachineCodeEmitter *llvm::AddMachOWriter(PassManagerBase &PM,
+MachineCodeEmitter *AddMachOWriter(PassManagerBase &PM,
                                          raw_ostream &O,
                                          TargetMachine &TM) {
   MachOWriter *MOW = new MachOWriter(O, TM);
@@ -53,304 +55,74 @@ MachineCodeEmitter *llvm::AddMachOWriter
 }
 
 //===----------------------------------------------------------------------===//
-//                       MachOCodeEmitter Implementation
+//                          MachOWriter Implementation
 //===----------------------------------------------------------------------===//
 
-namespace llvm {
-  /// MachOCodeEmitter - This class is used by the MachOWriter to emit the code 
-  /// for functions to the Mach-O file.
-  class MachOCodeEmitter : public MachineCodeEmitter {
-    MachOWriter &MOW;
-
-    /// Target machine description.
-    TargetMachine &TM;
-
-    /// is64Bit/isLittleEndian - This information is inferred from the target
-    /// machine directly, indicating what header values and flags to set.
-    bool is64Bit, isLittleEndian;
-
-    /// Relocations - These are the relocations that the function needs, as
-    /// emitted.
-    std::vector Relocations;
-    
-    /// CPLocations - This is a map of constant pool indices to offsets from the
-    /// start of the section for that constant pool index.
-    std::vector CPLocations;
-
-    /// CPSections - This is a map of constant pool indices to the MachOSection
-    /// containing the constant pool entry for that index.
-    std::vector CPSections;
-
-    /// JTLocations - This is a map of jump table indices to offsets from the
-    /// start of the section for that jump table index.
-    std::vector JTLocations;
-
-    /// MBBLocations - This vector is a mapping from MBB ID's to their address.
-    /// It is filled in by the StartMachineBasicBlock callback and queried by
-    /// the getMachineBasicBlockAddress callback.
-    std::vector MBBLocations;
-    
-  public:
-    MachOCodeEmitter(MachOWriter &mow) : MOW(mow), TM(MOW.TM) {
-      is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
-      isLittleEndian = TM.getTargetData()->isLittleEndian();
-    }

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

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun  3 20:24:28 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6FF3106566C;
	Wed,  3 Jun 2009 20:24:28 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB87C8FC1C;
	Wed,  3 Jun 2009 20:24:28 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53KOSI8065437;
	Wed, 3 Jun 2009 20:24:28 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53KOSdA065436;
	Wed, 3 Jun 2009 20:24:28 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906032024.n53KOSdA065436@svn.freebsd.org>
From: Jung-uk Kim 
Date: Wed, 3 Jun 2009 20:24:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193395 -
	projects/acpica_20090521/usr.sbin/acpi/acpidump
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 03 Jun 2009 20:24:29 -0000

Author: jkim
Date: Wed Jun  3 20:24:28 2009
New Revision: 193395
URL: http://svn.freebsd.org/changeset/base/193395

Log:
  Fix acpidump(8) disassmebly with option -d.  iasl(8) creates disassembled
  output file from input file name as a template.  Honor TMPDIR environment
  variable while I am here.

Modified:
  projects/acpica_20090521/usr.sbin/acpi/acpidump/acpi.c

Modified: projects/acpica_20090521/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- projects/acpica_20090521/usr.sbin/acpi/acpidump/acpi.c	Wed Jun  3 20:21:17 2009	(r193394)
+++ projects/acpica_20090521/usr.sbin/acpi/acpidump/acpi.c	Wed Jun  3 20:24:28 2009	(r193395)
@@ -34,7 +34,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -803,11 +805,26 @@ dsdt_save_file(char *outfile, struct ACP
 void
 aml_disassemble(struct ACPIsdt *rsdt, struct ACPIsdt *dsdp)
 {
-	char tmpstr[32], buf[256];
+	char buf[PATH_MAX], tmpstr[PATH_MAX];
+	const char *tmpdir;
+	char *tmpext;
 	FILE *fp;
-	int fd, len;
+	size_t len;
+	int fd;
 
-	strcpy(tmpstr, "/tmp/acpidump.XXXXXX");
+	tmpdir = getenv("TMPDIR");
+	if (tmpdir == NULL)
+		tmpdir = _PATH_TMP;
+	strncpy(tmpstr, tmpdir, sizeof(tmpstr));
+	strncat(tmpstr, "/acpidump.", sizeof(tmpstr) - strlen(tmpdir));
+	if (realpath(tmpstr, buf) == NULL) {
+		perror("realpath tmp file");
+		return;
+	}
+	strncpy(tmpstr, buf, sizeof(tmpstr));
+	len = strlen(buf);
+	tmpext = tmpstr + len;
+	strncpy(tmpext, "XXXXXX", sizeof(tmpstr) - len);
 	fd = mkstemp(tmpstr);
 	if (fd < 0) {
 		perror("iasl tmp file");
@@ -821,7 +838,7 @@ aml_disassemble(struct ACPIsdt *rsdt, st
 		close(STDOUT_FILENO);
 		if (vflag == 0)
 			close(STDERR_FILENO);
-		execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, (char *) 0);
+		execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, NULL);
 		err(1, "exec");
 	}
 
@@ -829,8 +846,9 @@ aml_disassemble(struct ACPIsdt *rsdt, st
 	unlink(tmpstr);
 
 	/* Dump iasl's output to stdout */
-	fp = fopen("acpidump.dsl", "r");
-	unlink("acpidump.dsl");
+	strncpy(tmpext, "dsl", sizeof(tmpstr) - len);
+	fp = fopen(tmpstr, "r");
+	unlink(tmpstr);
 	if (fp == NULL) {
 		perror("iasl tmp file (read)");
 		return;

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun  3 21:47:13 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DDF631065672;
	Wed,  3 Jun 2009 21:47:13 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1BE58FC1B;
	Wed,  3 Jun 2009 21:47:13 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53LlDpb067959;
	Wed, 3 Jun 2009 21:47:13 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53LlDYm067958;
	Wed, 3 Jun 2009 21:47:13 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906032147.n53LlDYm067958@svn.freebsd.org>
From: Jung-uk Kim 
Date: Wed, 3 Jun 2009 21:47:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193406 - in
	projects/acpica_20090521/sys/contrib/dev/acpica: . include
	include/platform tools/acpiexec tools/acpisrc
	tools/acpixtract tools/examples utilities
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 03 Jun 2009 21:47:14 -0000

Author: jkim
Date: Wed Jun  3 21:47:13 2009
New Revision: 193406
URL: http://svn.freebsd.org/changeset/base/193406

Log:
  Trim unnecessary files from the import.

Deleted:
  projects/acpica_20090521/sys/contrib/dev/acpica/include/actbl2.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/accygwin.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acefi.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acintel.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/aclinux.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acmsvc.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acnetbsd.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acos2.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acwin.h
  projects/acpica_20090521/sys/contrib/dev/acpica/include/platform/acwin64.h
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/Makefile
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/aeexec.c
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/aehandlers.c
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/aemain.c
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/aetables.c
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpiexec/osunixdir.c
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpisrc/
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/acpixtract/
  projects/acpica_20090521/sys/contrib/dev/acpica/tools/examples/
  projects/acpica_20090521/sys/contrib/dev/acpica/utilities/utclib.c
Modified:
  projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh

Modified: projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh
==============================================================================
--- projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh	Wed Jun  3 21:29:50 2009	(r193405)
+++ projects/acpica_20090521/sys/contrib/dev/acpica/acpica_prep.sh	Wed Jun  3 21:47:13 2009	(r193406)
@@ -19,18 +19,18 @@ fulldirs="common compiler debugger disas
 	tools utilities"
 
 # files to remove
-stripdirs="acpisrc generate os_specific"
+stripdirs="acpisrc acpixtract examples generate os_specific"
 stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h	\
-	acos2.h acpixtract.c accygwin.h acefi.h acwin.h acwin64.h	\
-	aeexec.c aehandlers.c aemain.c aetables.c examples.c		\
-	osunixdir.c oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c"
+	acos2.h accygwin.h acefi.h actbl2.h acwin.h acwin64.h aeexec.c	\
+	aehandlers.c aemain.c aetables.c osunixdir.c readme.txt		\
+	utclib.c"
 
 # include files to canonify
 src_headers="acapps.h accommon.h acconfig.h acdebug.h acdisasm.h	\
 	acdispat.h acevents.h acexcep.h acglobal.h achware.h acinterp.h	\
 	aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h	\
 	acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h	\
-	acresrc.h acrestyp.h acstruct.h	actables.h actbl.h actbl1.h	\
+	acresrc.h acrestyp.h acstruct.h actables.h actbl.h actbl1.h	\
 	actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h	\
 	platform/acfreebsd.h platform/acgcc.h"
 comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h"

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun  3 22:54:29 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C5B96106566C;
	Wed,  3 Jun 2009 22:54:29 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B055E8FC17;
	Wed,  3 Jun 2009 22:54:29 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53MsTUZ069553;
	Wed, 3 Jun 2009 22:54:29 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53MsSL4069519;
	Wed, 3 Jun 2009 22:54:28 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906032254.n53MsSL4069519@svn.freebsd.org>
From: Jung-uk Kim 
Date: Wed, 3 Jun 2009 22:54:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193409 - in projects/acpica_20090521: . etc/defaults
	etc/periodic/daily etc/rc.d lib/bind lib/libusb lib/msun/src
	sbin/fsck_ffs sbin/mksnap_ffs share/examples/kld/dyn_sysctl
	share/exam...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 03 Jun 2009 22:54:30 -0000

Author: jkim
Date: Wed Jun  3 22:54:27 2009
New Revision: 193409
URL: http://svn.freebsd.org/changeset/base/193409

Log:
  Resync with head.

Added:
  projects/acpica_20090521/etc/rc.d/nfscbd
     - copied unchanged from r193408, head/etc/rc.d/nfscbd
  projects/acpica_20090521/etc/rc.d/nfsuserd
     - copied unchanged from r193408, head/etc/rc.d/nfsuserd
  projects/acpica_20090521/tools/build/options/WITH_BIND_IDN
     - copied unchanged from r193408, head/tools/build/options/WITH_BIND_IDN
  projects/acpica_20090521/tools/build/options/WITH_BIND_LARGE_FILE
     - copied unchanged from r193408, head/tools/build/options/WITH_BIND_LARGE_FILE
  projects/acpica_20090521/tools/build/options/WITH_BIND_SIGCHASE
     - copied unchanged from r193408, head/tools/build/options/WITH_BIND_SIGCHASE
  projects/acpica_20090521/tools/build/options/WITH_BIND_XML
     - copied unchanged from r193408, head/tools/build/options/WITH_BIND_XML
  projects/acpica_20090521/usr.bin/ee/nls/hu_HU.ISO8859-2/
     - copied from r193408, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
Replaced:
  projects/acpica_20090521/tools/build/options/WITH_BIND_LIBS
     - copied unchanged from r193408, head/tools/build/options/WITH_BIND_LIBS
Deleted:
  projects/acpica_20090521/sys/amd64/conf/MAC
  projects/acpica_20090521/sys/gnu/fs/ext2fs/sparc64-bitops.h
  projects/acpica_20090521/sys/i386/conf/MAC
  projects/acpica_20090521/sys/ia64/conf/MAC
  projects/acpica_20090521/sys/pc98/conf/MAC
  projects/acpica_20090521/sys/powerpc/conf/MAC
  projects/acpica_20090521/sys/sparc64/conf/MAC
  projects/acpica_20090521/sys/sun4v/conf/MAC
  projects/acpica_20090521/usr.bin/window/
Modified:
  projects/acpica_20090521/   (props changed)
  projects/acpica_20090521/ObsoleteFiles.inc
  projects/acpica_20090521/UPDATING
  projects/acpica_20090521/etc/defaults/rc.conf
  projects/acpica_20090521/etc/periodic/daily/100.clean-disks
  projects/acpica_20090521/etc/rc.d/Makefile
  projects/acpica_20090521/etc/rc.d/mountd
  projects/acpica_20090521/etc/rc.d/nfsd
  projects/acpica_20090521/lib/bind/config.mk
  projects/acpica_20090521/lib/libusb/   (props changed)
  projects/acpica_20090521/lib/libusb/libusb.3   (contents, props changed)
  projects/acpica_20090521/lib/libusb/libusb20.c
  projects/acpica_20090521/lib/libusb/libusb20.h
  projects/acpica_20090521/lib/msun/src/e_rem_pio2.c
  projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c
  projects/acpica_20090521/lib/msun/src/k_cosf.c
  projects/acpica_20090521/lib/msun/src/k_sinf.c
  projects/acpica_20090521/lib/msun/src/k_tanf.c
  projects/acpica_20090521/lib/msun/src/math_private.h
  projects/acpica_20090521/sbin/fsck_ffs/fsck.h
  projects/acpica_20090521/sbin/fsck_ffs/gjournal.c
  projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c
  projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c
  projects/acpica_20090521/share/man/man4/msk.4
  projects/acpica_20090521/share/man/man5/src.conf.5
  projects/acpica_20090521/share/mk/bsd.own.mk
  projects/acpica_20090521/sys/amd64/conf/GENERIC
  projects/acpica_20090521/sys/boot/uboot/lib/disk.c
  projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile
  projects/acpica_20090521/sys/dev/ata/ata-all.h
  projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c
  projects/acpica_20090521/sys/dev/ath/if_ath.c
  projects/acpica_20090521/sys/dev/bwi/if_bwi.c
  projects/acpica_20090521/sys/dev/if_ndis/if_ndis.c
  projects/acpica_20090521/sys/dev/iir/iir.c
  projects/acpica_20090521/sys/dev/iir/iir_ctrl.c
  projects/acpica_20090521/sys/dev/ksyms/ksyms.c
  projects/acpica_20090521/sys/dev/mii/e1000phy.c
  projects/acpica_20090521/sys/dev/mii/e1000phyreg.h
  projects/acpica_20090521/sys/dev/msk/if_msk.c
  projects/acpica_20090521/sys/dev/msk/if_mskreg.h
  projects/acpica_20090521/sys/dev/mxge/if_mxge.c
  projects/acpica_20090521/sys/dev/mxge/if_mxge_var.h
  projects/acpica_20090521/sys/dev/pci/pci.c
  projects/acpica_20090521/sys/dev/puc/pucdata.c
  projects/acpica_20090521/sys/dev/usb/input/ukbd.c
  projects/acpica_20090521/sys/dev/usb/usb_compat_linux.h
  projects/acpica_20090521/sys/dev/usb/usb_dev.c
  projects/acpica_20090521/sys/dev/usb/usb_dev.h
  projects/acpica_20090521/sys/dev/usb/usb_request.c
  projects/acpica_20090521/sys/dev/xen/netfront/   (props changed)
  projects/acpica_20090521/sys/dev/xen/xenpci/   (props changed)
  projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_fs.h
  projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_lookup.c
  projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/acpica_20090521/sys/i386/conf/GENERIC
  projects/acpica_20090521/sys/ia64/conf/GENERIC
  projects/acpica_20090521/sys/kern/kern_descrip.c
  projects/acpica_20090521/sys/kern/kern_lock.c
  projects/acpica_20090521/sys/kern/kern_prot.c
  projects/acpica_20090521/sys/kern/kern_rwlock.c
  projects/acpica_20090521/sys/kern/kern_sx.c
  projects/acpica_20090521/sys/kern/sys_socket.c
  projects/acpica_20090521/sys/kern/uipc_mbuf.c
  projects/acpica_20090521/sys/kern/uipc_shm.c
  projects/acpica_20090521/sys/kern/uipc_socket.c
  projects/acpica_20090521/sys/kern/uipc_syscalls.c
  projects/acpica_20090521/sys/kern/uipc_usrreq.c
  projects/acpica_20090521/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/acpica_20090521/sys/modules/ip6_mroute_mod/   (props changed)
  projects/acpica_20090521/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/acpica_20090521/sys/net/if.c
  projects/acpica_20090521/sys/net80211/ieee80211.c
  projects/acpica_20090521/sys/net80211/ieee80211_ddb.c
  projects/acpica_20090521/sys/net80211/ieee80211_freebsd.c
  projects/acpica_20090521/sys/net80211/ieee80211_hostap.c
  projects/acpica_20090521/sys/net80211/ieee80211_input.c
  projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c
  projects/acpica_20090521/sys/net80211/ieee80211_monitor.c
  projects/acpica_20090521/sys/net80211/ieee80211_proto.c
  projects/acpica_20090521/sys/net80211/ieee80211_radiotap.c
  projects/acpica_20090521/sys/net80211/ieee80211_scan.c
  projects/acpica_20090521/sys/net80211/ieee80211_var.h
  projects/acpica_20090521/sys/netatalk/ddp_input.c
  projects/acpica_20090521/sys/netinet/in_pcb.c
  projects/acpica_20090521/sys/netinet/ip_divert.c
  projects/acpica_20090521/sys/netinet/tcp_input.c
  projects/acpica_20090521/sys/netinet/tcp_syncache.c
  projects/acpica_20090521/sys/pc98/conf/GENERIC
  projects/acpica_20090521/sys/powerpc/conf/GENERIC
  projects/acpica_20090521/sys/rpc/svc_vc.c
  projects/acpica_20090521/sys/security/mac/mac_atalk.c
  projects/acpica_20090521/sys/security/mac/mac_framework.c
  projects/acpica_20090521/sys/security/mac/mac_inet.c
  projects/acpica_20090521/sys/security/mac/mac_inet6.c
  projects/acpica_20090521/sys/security/mac/mac_internal.h
  projects/acpica_20090521/sys/security/mac/mac_net.c
  projects/acpica_20090521/sys/security/mac/mac_socket.c
  projects/acpica_20090521/sys/security/mac_biba/mac_biba.c
  projects/acpica_20090521/sys/security/mac_lomac/mac_lomac.c
  projects/acpica_20090521/sys/security/mac_mls/mac_mls.c
  projects/acpica_20090521/sys/security/mac_stub/mac_stub.c
  projects/acpica_20090521/sys/security/mac_test/mac_test.c
  projects/acpica_20090521/sys/sparc64/conf/GENERIC
  projects/acpica_20090521/sys/sun4v/conf/GENERIC
  projects/acpica_20090521/sys/sun4v/include/pcpu.h
  projects/acpica_20090521/sys/sys/pmc.h
  projects/acpica_20090521/sys/sys/vnode.h
  projects/acpica_20090521/sys/ufs/ffs/ffs_softdep.c
  projects/acpica_20090521/sys/ufs/ufs/dirhash.h
  projects/acpica_20090521/sys/ufs/ufs/ufs_dirhash.c
  projects/acpica_20090521/sys/vm/vnode_pager.c
  projects/acpica_20090521/tools/regression/fstest/fstest.c
  projects/acpica_20090521/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/acpica_20090521/usr.bin/Makefile
  projects/acpica_20090521/usr.bin/dig/Makefile
  projects/acpica_20090521/usr.bin/ee/Makefile
  projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/getid.c   (props changed)
  projects/acpica_20090521/usr.sbin/named/Makefile
  projects/acpica_20090521/usr.sbin/nfsd/nfsv4.4
  projects/acpica_20090521/usr.sbin/pmcstat/pmcstat.8

Modified: projects/acpica_20090521/ObsoleteFiles.inc
==============================================================================
--- projects/acpica_20090521/ObsoleteFiles.inc	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/ObsoleteFiles.inc	Wed Jun  3 22:54:27 2009	(r193409)
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()

Modified: projects/acpica_20090521/UPDATING
==============================================================================
--- projects/acpica_20090521/UPDATING	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/UPDATING	Wed Jun  3 22:54:27 2009	(r193409)
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090602:
+	window(1) has been removed from the base system. It can now be
+	installed from ports. The port is called misc/window.
+
 20090601:
 	The way we are storing and accessing `routing table' entries
 	has changed. Programs reading the FIB, like netstat, need to
@@ -33,6 +37,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	rebuilt.
 	Bump __FreeBSD_version to 800096.
 
+20090531:
+	For those who use ipfw and especially pf, those two firewalls
+	are now started BEFORE the network is initialized (i.e., before
+	rc.d/netif). Please review your rules to make sure that your
+	interfaces will be properly described.
+
 20090530:
 	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
 	is no more valid.

Modified: projects/acpica_20090521/etc/defaults/rc.conf
==============================================================================
--- projects/acpica_20090521/etc/defaults/rc.conf	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/etc/defaults/rc.conf	Wed Jun  3 22:54:27 2009	(r193409)
@@ -315,6 +315,11 @@ rpcbind_flags=""		# Flags to rpcbind (if
 rpc_ypupdated_enable="NO"	# Run if NIS master and SecureRPC (or NO).
 keyserv_enable="NO"		# Run the SecureRPC keyserver (or NO).
 keyserv_flags=""		# Flags to keyserv (if enabled).
+nfsv4_server_enable="NO"	# Enable support for NFSv4
+nfscbd_enable="NO"		# NFSv4 client side callback daemon
+nfscbd_flags=""			# Flags for nfscbd
+nfsuserd_enable="NO"		# NFSv4 user/group name mapping daemon
+nfsuserd_flags=""		# Flags for nfsuserd
 
 ### Network Time Services options: ###
 timed_enable="NO"		# Run the time daemon (or NO).

Modified: projects/acpica_20090521/etc/periodic/daily/100.clean-disks
==============================================================================
--- projects/acpica_20090521/etc/periodic/daily/100.clean-disks	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/etc/periodic/daily/100.clean-disks	Wed Jun  3 22:54:27 2009	(r193409)
@@ -29,7 +29,7 @@ case "$daily_clean_disks_enable" in
 	    echo ""
 	    echo "Cleaning disks:"
 	    set -f noglob
-	    args="$args -name "`echo "$daily_clean_disks_files" |
+	    args="-name "`echo "$daily_clean_disks_files" |
 		sed -e 's/^[ 	]*//' \
 		    -e 's/[ 	]*$//' \
 		    -e 's/[ 	][ 	]*/ -o -name /g'`
@@ -41,9 +41,9 @@ case "$daily_clean_disks_enable" in
 		    print=;;
 	    esac
 
-	    rc=$(find / \( ! -fstype local -o -fstype rdonly \) -a -prune -o \
-		\( $args \) -atime +$daily_clean_disks_days -delete $print |
-		tee /dev/stderr | wc -l)
+	    rc=$(find / \( ! -fstype local -o -fstype rdonly \) -prune -o \
+		\( $args \) -atime +$daily_clean_disks_days \
+		-execdir rm -df {} \; $print | tee /dev/stderr | wc -l)
 	    [ -z "$print" ] && rc=0
 	    [ $rc -gt 1 ] && rc=1
 	    set -f glob

Modified: projects/acpica_20090521/etc/rc.d/Makefile
==============================================================================
--- projects/acpica_20090521/etc/rc.d/Makefile	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/etc/rc.d/Makefile	Wed Jun  3 22:54:27 2009	(r193409)
@@ -23,8 +23,8 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	mixer motd mountcritlocal mountcritremote mountlate \
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions \
-	network_ipv6 newsyslog nfsclient nfsd \
-	nfsserver nisdomain nsswitch ntpd ntpdate \
+	network_ipv6 newsyslog nfsclient nfscbd nfsd \
+	nfsserver nfsuserd nisdomain nsswitch ntpd ntpdate \
 	othermta \
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \

Modified: projects/acpica_20090521/etc/rc.d/mountd
==============================================================================
--- projects/acpica_20090521/etc/rc.d/mountd	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/etc/rc.d/mountd	Wed Jun  3 22:54:27 2009	(r193409)
@@ -37,6 +37,13 @@ mountd_precmd()
 		fi
 	fi
 
+	# If nfsv4_server_enable is yes, force use of the experimental
+	# server
+	#
+	if checkyesno nfsv4_server_enable; then
+		rc_flags="-e ${rc_flags}"
+	fi
+
 	if checkyesno zfs_enable; then
 		rc_flags="${rc_flags} /etc/exports /etc/zfs/exports"
 	fi

Copied: projects/acpica_20090521/etc/rc.d/nfscbd (from r193408, head/etc/rc.d/nfscbd)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/acpica_20090521/etc/rc.d/nfscbd	Wed Jun  3 22:54:27 2009	(r193409, copy of r193408, head/etc/rc.d/nfscbd)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: nfscbd
+# REQUIRE: NETWORKING nfsuserd
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="nfscbd"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+sig_stop="USR1"
+
+load_rc_config $name
+
+run_rc_command "$1"

Modified: projects/acpica_20090521/etc/rc.d/nfsd
==============================================================================
--- projects/acpica_20090521/etc/rc.d/nfsd	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/etc/rc.d/nfsd	Wed Jun  3 22:54:27 2009	(r193409)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd hostname gssd
+# REQUIRE: mountd hostname gssd nfsuserd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr
@@ -14,14 +14,33 @@ rcvar=`set_rcvar nfs_server`
 command="/usr/sbin/${name}"
 
 load_rc_config $name
-command_args="${nfs_server_flags}"
 start_precmd="nfsd_precmd"
 sig_stop="USR1"
 
 nfsd_precmd()
 {
-	if ! sysctl vfs.nfsrv >/dev/null 2>&1; then
-		force_depend nfsserver || return 1
+	if checkyesno nfsv4_server_enable; then
+		# If nfsv4_server_enable is yes, force use
+		# of the experimental server
+		#
+		rc_flags="-e ${nfs_server_flags}"
+
+		if ! checkyesno nfsuserd_enable  && \
+		    ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1
+		then
+			force_depend nfsuserd || return 1
+		fi
+	else
+		rc_flags="${nfs_server_flags}"
+
+		if ! sysctl vfs.nfsrv >/dev/null 2>&1; then
+			force_depend nfsserver || return 1
+		fi
+
+		if checkyesno nfs_reserved_port_only; then
+			echo 'NFS on reserved port only=YES'
+			sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
+		fi
 	fi
 
 	if ! checkyesno rpcbind_enable  && \
@@ -35,11 +54,6 @@ nfsd_precmd()
 	then
 		force_depend mountd || return 1
 	fi
-
-	if checkyesno nfs_reserved_port_only; then
-		echo 'NFS on reserved port only=YES'
-		sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
-	fi
 	return 0
 }
 

Copied: projects/acpica_20090521/etc/rc.d/nfsuserd (from r193408, head/etc/rc.d/nfsuserd)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/acpica_20090521/etc/rc.d/nfsuserd	Wed Jun  3 22:54:27 2009	(r193409, copy of r193408, head/etc/rc.d/nfsuserd)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: nfsuserd
+# REQUIRE: NETWORKING
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="nfsuserd"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+sig_stop="USR1"
+
+load_rc_config $name
+
+run_rc_command "$1"

Modified: projects/acpica_20090521/lib/bind/config.mk
==============================================================================
--- projects/acpica_20090521/lib/bind/config.mk	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/bind/config.mk	Wed Jun  3 22:54:27 2009	(r193409)
@@ -70,6 +70,19 @@ ISC_ATOMIC_ARCH=	x86_32
 ISC_ATOMIC_ARCH=	${MACHINE_ARCH}
 .endif
 
+# Optional features
+.if ${MK_BIND_LARGE_FILE} == "yes"
+CFLAGS+=	-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+.endif
+.if ${MK_BIND_SIGCHASE} == "yes"
+CFLAGS+=	-DDIG_SIGCHASE
+.endif
+.if ${MK_BIND_XML} == "yes"
+CFLAGS+=	-DHAVE_LIBXML2
+CFLAGS+=	-I/usr/local/include -I/usr/local/include/libxml2
+CFLAGS+=	-L/usr/local/lib -lxml2 -lz -liconv -lm
+.endif
+
 # Link against BIND libraries
 .if ${MK_BIND_LIBS} == "no"
 LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a

Modified: projects/acpica_20090521/lib/libusb/libusb.3
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb.3	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/libusb/libusb.3	Wed Jun  3 22:54:27 2009	(r193409)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2009
+.Dd May 28, 2009
 .Dt LIBUSB 3
 .Os
 .Sh NAME
@@ -78,6 +78,8 @@ USB access library (libusb -lusb)
 .Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb"
 .Ft void
 .Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags"
+.Ft uint32_t
+.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index"
 .Ft void
 .Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index"
 .Ft void
@@ -183,6 +185,10 @@ USB access library (libusb -lusb)
 .Ft int
 .Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq"
 .Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_default "void"
+.Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_freebsd "void"
+.Ft struct libusb20_backend *
 .Fn libusb20_be_alloc_linux "void"
 .Ft struct libusb20_device *
 .Fn libusb20_be_device_foreach  "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
@@ -227,7 +233,7 @@ Non-zero return values indicate a LIBUSB
 .Pp
 .
 .Fn libusb20_tr_open
-will allocate kernel resources like
+will allocate kernel buffer resources according to
 .Fa max_buf_size
 and
 .Fa max_frame_count
@@ -235,6 +241,18 @@ associated with an USB
 .Fa pxfer
 and bind the transfer to the specified
 .Fa ep_no .
+.Fa max_buf_size
+is the minimum buffer size which the data transport layer has to support.
+If
+.Fa max_buf_size
+is zero, the
+.Nm
+library will use wMaxPacketSize to compute the buffer size.
+This can be useful for isochronous transfers.
+The actual buffer size can be greater than
+.Fa max_buf_size
+and is returned by
+.Fn libusb20_tr_get_max_total_length .
 .
 This function returns zero upon success.
 .
@@ -367,8 +385,14 @@ Will do a clear-stall before starting th
 .
 .Pp
 .
+.Fn libusb20_tr_get_length
+returns the length of the given USB frame by index.
+After an USB transfer is complete the USB frame length will get updated to the actual transferred length.
+.
+.Pp
+.
 .Fn libusb20_tr_set_length
-sets the length of a given USB transfer and frame index.
+sets the length of the given USB frame by index.
 .
 .Pp
 .
@@ -750,7 +774,7 @@ function will wait until a pending USB t
 the given USB device.
 .
 A timeout value can be specified which is passed on to the
-.Xr 2 poll
+.Xr poll 2
 function.
 .
 .Sh USB BACKEND OPERATIONS
@@ -829,6 +853,10 @@ returned.
 If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is
 returned.
 .
+.Pp
+.
+.Fn libusb20_be_alloc_default
+.Fn libusb20_be_alloc_freebsd
 .Fn libusb20_be_alloc_linux
 These functions are used to allocate a specific USB backend or the
 operating system default USB backend. Allocating a backend is a way to

Modified: projects/acpica_20090521/lib/libusb/libusb20.c
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb20.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/libusb/libusb20.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -319,6 +319,12 @@ libusb20_tr_set_flags(struct libusb20_tr
 	return;
 }
 
+uint32_t
+libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex)
+{
+	return (xfer->pLength[frIndex]);
+}
+
 void
 libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex)
 {

Modified: projects/acpica_20090521/lib/libusb/libusb20.h
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb20.h	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/libusb/libusb20.h	Wed Jun  3 22:54:27 2009	(r193409)
@@ -216,6 +216,7 @@ void	libusb20_tr_drain(struct libusb20_t
 void	libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index);
 void	libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb);
 void	libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags);
+uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index);
 void	libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index);
 void	libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0);
 void	libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1);

Modified: projects/acpica_20090521/lib/msun/src/e_rem_pio2.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/e_rem_pio2.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/e_rem_pio2.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -48,10 +48,10 @@ pio2_2t =  2.02226624879595063154e-21, /
 pio2_3  =  2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
 pio2_3t =  8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
 
-#ifdef INLINE_REM_PIO2
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2
+extern
 #endif
-int
+__inline int
 __ieee754_rem_pio2(double x, double *y)
 {
 	double z,w,t,r,fn;

Modified: projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -40,10 +40,10 @@ invpio2 =  6.36619772367581382433e-01, /
 pio2_1  =  1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */
 pio2_1t =  1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */
 
-#ifdef INLINE_REM_PIO2F
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2F
+extern
 #endif
-int
+__inline int
 __ieee754_rem_pio2f(float x, double *y)
 {
 	double w,r,fn;

Modified: projects/acpica_20090521/lib/msun/src/k_cosf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_cosf.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/k_cosf.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -30,10 +30,10 @@ C1  =  0x155553e1053a42.0p-57,	/*  0.041
 C2  = -0x16c087e80f1e27.0p-62,	/* -0.00138867637746099294692 */
 C3  =  0x199342e0ee5069.0p-68;	/*  0.0000243904487962774090654 */
 
-#ifdef INLINE_KERNEL_COSDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_COSDF
+extern
 #endif
-float
+__inline float
 __kernel_cosdf(double x)
 {
 	double r, w, z;

Modified: projects/acpica_20090521/lib/msun/src/k_sinf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_sinf.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/k_sinf.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -29,10 +29,10 @@ S2 =  0x111110896efbb2.0p-59,	/*  0.0083
 S3 = -0x1a00f9e2cae774.0p-65,	/* -0.000198393348360966317347 */
 S4 =  0x16cd878c3b46a7.0p-71;	/*  0.0000027183114939898219064 */
 
-#ifdef INLINE_KERNEL_SINDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_SINDF
+extern
 #endif
-float
+__inline float
 __kernel_sindf(double x)
 {
 	double r, s, w, z;

Modified: projects/acpica_20090521/lib/msun/src/k_tanf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_tanf.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/k_tanf.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -32,10 +32,10 @@ T[] =  {
   0x1362b9bf971bcd.0p-59,	/* 0.00946564784943673166728 */
 };
 
-#ifdef INLINE_KERNEL_TANDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_TANDF
+extern
 #endif
-float
+__inline float
 __kernel_tandf(double x, int iy)
 {
 	double z,r,w,s,t,u;

Modified: projects/acpica_20090521/lib/msun/src/math_private.h
==============================================================================
--- projects/acpica_20090521/lib/msun/src/math_private.h	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/lib/msun/src/math_private.h	Wed Jun  3 22:54:27 2009	(r193409)
@@ -345,15 +345,30 @@ irint(double x)
 int	__kernel_rem_pio2(double*,double*,int,int,int);
 
 /* double precision kernel functions */
+#ifdef INLINE_REM_PIO2
+__inline
+#endif
 int	__ieee754_rem_pio2(double,double*);
 double	__kernel_sin(double,double,int);
 double	__kernel_cos(double,double);
 double	__kernel_tan(double,double,int);
 
 /* float precision kernel functions */
+#ifdef INLINE_REM_PIO2F
+__inline
+#endif
 int	__ieee754_rem_pio2f(float,double*);
+#ifdef INLINE_KERNEL_SINDF
+__inline
+#endif
 float	__kernel_sindf(double);
+#ifdef INLINE_KERNEL_COSDF
+__inline
+#endif
 float	__kernel_cosdf(double);
+#ifdef INLINE_KERNEL_TANDF
+__inline
+#endif
 float	__kernel_tandf(double,int);
 
 /* long double precision kernel functions */

Modified: projects/acpica_20090521/sbin/fsck_ffs/fsck.h
==============================================================================
--- projects/acpica_20090521/sbin/fsck_ffs/fsck.h	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sbin/fsck_ffs/fsck.h	Wed Jun  3 22:54:27 2009	(r193409)
@@ -297,8 +297,8 @@ int	lfmode;			/* lost & found directory 
 ufs2_daddr_t n_blks;		/* number of blocks in use */
 ino_t n_files;			/* number of files in use */
 
-sig_atomic_t	got_siginfo;	/* received a SIGINFO */
-sig_atomic_t	got_sigalarm;	/* received a SIGALRM */
+volatile sig_atomic_t	got_siginfo;	/* received a SIGINFO */
+volatile sig_atomic_t	got_sigalarm;	/* received a SIGALRM */
 
 #define	clearinode(dp) \
 	if (sblock.fs_magic == FS_UFS1_MAGIC) { \

Modified: projects/acpica_20090521/sbin/fsck_ffs/gjournal.c
==============================================================================
--- projects/acpica_20090521/sbin/fsck_ffs/gjournal.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sbin/fsck_ffs/gjournal.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -672,7 +672,7 @@ gjournal_check(const char *filesys)
 
 	devnam = filesys;
 	getdisk();
-	/* Are there any unreferenced inodes in this cylinder group? */
+	/* Are there any unreferenced inodes in this file system? */
 	if (fs->fs_unrefs == 0) {
 		//printf("No unreferenced inodes.\n");
 		closedisk();

Modified: projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c
==============================================================================
--- projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -112,6 +112,8 @@ main(int argc, char **argv)
 	if ((grp = getgrnam("operator")) == NULL)
 		errx(1, "Cannot retrieve operator gid");
 
+	iov = NULL;
+	iovlen = 0;
 	build_iovec(&iov, &iovlen, "fstype", "ffs", 4);
 	build_iovec(&iov, &iovlen, "from", snapname, (size_t)-1);
 	build_iovec(&iov, &iovlen, "fspath", stfsbuf.f_mntonname, (size_t)-1);

Modified: projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c
==============================================================================
--- projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -42,7 +42,7 @@ static struct sysctl_oid *a_root, *a_roo
 static struct sysctl_ctx_list clist, clist1, clist2;
 
 static int
-sysctl_dyn_sysctl_test (SYSCTL_HANDLER_ARGS)
+sysctl_dyn_sysctl_test(SYSCTL_HANDLER_ARGS)
 {
 	char *buf = "let's produce some text...";
 	
@@ -53,7 +53,7 @@ sysctl_dyn_sysctl_test (SYSCTL_HANDLER_A
  * The function called at load/unload.
  */
 static int
-load (module_t mod, int cmd, void *arg)
+load(module_t mod, int cmd, void *arg)
 {
 	int error;
 
@@ -78,37 +78,37 @@ load (module_t mod, int cmd, void *arg)
 			SYSCTL_STATIC_CHILDREN(/* top of sysctl tree */),
 			OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0,
 			"dyn_sysctl root node");
-		if(a_root == NULL) {
+		if (a_root == NULL) {
 			printf("SYSCTL_ADD_NODE failed!\n");
 			return (EINVAL);
 		}
 		SYSCTL_ADD_LONG(&clist, SYSCTL_CHILDREN(a_root),
-		 OID_AUTO, "long_a", CTLFLAG_RW, &a, "just to try");
+		    OID_AUTO, "long_a", CTLFLAG_RW, &a, "just to try");
 		SYSCTL_ADD_INT(&clist, SYSCTL_CHILDREN(a_root),
-		 OID_AUTO, "int_b", CTLFLAG_RW, &b, 0, "just to try 1");
-		a_root1=SYSCTL_ADD_NODE(&clist, SYSCTL_CHILDREN(a_root),
-		 OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
+		    OID_AUTO, "int_b", CTLFLAG_RW, &b, 0, "just to try 1");
+		a_root1 = SYSCTL_ADD_NODE(&clist, SYSCTL_CHILDREN(a_root),
+		    OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
 		SYSCTL_ADD_STRING(&clist, SYSCTL_CHILDREN(a_root1),
-		 OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "just to try 2");
+		    OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "just to try 2");
 		printf("1. (%p)	/		  dyn_sysctl\n", &clist);
 
 		/* Add a subtree under already existing category */
 		a_root1 = SYSCTL_ADD_NODE(&clist, SYSCTL_STATIC_CHILDREN(_kern),
-		 OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0, "dyn_sysctl root node");
-		if(a_root1 == NULL) {
+		    OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0, "dyn_sysctl root node");
+		if (a_root1 == NULL) {
 			printf("SYSCTL_ADD_NODE failed!\n");
 			return (EINVAL);
 		}
 		SYSCTL_ADD_PROC(&clist, SYSCTL_CHILDREN(a_root1),
-		 OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
-		 sysctl_dyn_sysctl_test, "A", "I can be here, too");
+		    OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
+		    sysctl_dyn_sysctl_test, "A", "I can be here, too");
 		printf("   (%p)	/kern		  dyn_sysctl\n", &clist);
 
 		/* Overlap second tree with the first. */
 		b_root = SYSCTL_ADD_NODE(&clist1, SYSCTL_CHILDREN(a_root),
-		 OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
+		    OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
 		SYSCTL_ADD_STRING(&clist1, SYSCTL_CHILDREN(b_root),
-		 OID_AUTO, "string_c1", CTLFLAG_RD, c, 0, "just to try 2");
+		    OID_AUTO, "string_c1", CTLFLAG_RD, c, 0, "just to try 2");
 		printf("2. (%p)	/		  dyn_sysctl	(overlapping #1)\n", &clist1);
 
 		/*
@@ -117,19 +117,19 @@ load (module_t mod, int cmd, void *arg)
 		 * WARNING: this is an example of WRONG use of dynamic sysctls.
 		 */
 		b_root=SYSCTL_ADD_NODE(&clist2, SYSCTL_CHILDREN(a_root1),
-		 OID_AUTO, "bad", CTLFLAG_RW, 0, "dependent node");
+		    OID_AUTO, "bad", CTLFLAG_RW, 0, "dependent node");
 		SYSCTL_ADD_STRING(&clist2, SYSCTL_CHILDREN(b_root),
-		 OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "shouldn't panic");
+		    OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "shouldn't panic");
 		printf("3. (%p)	/kern/dyn_sysctl  bad		(WRONG!)\n", &clist2);
 		break;
 	case MOD_UNLOAD :
 		printf("1. Try to free ctx1 (%p): ", &clist);
-		if(sysctl_ctx_free(&clist))
+		if (sysctl_ctx_free(&clist) != 0)
 			printf("failed: expected. Need to remove ctx3 first.\n");
 		else
 			printf("HELP! sysctl_ctx_free(%p) succeeded. EXPECT PANIC!!!\n", &clist);
 		printf("2. Try to free ctx3 (%p): ", &clist2);
-		if(sysctl_ctx_free(&clist2)) {
+		if (sysctl_ctx_free(&clist2) != 0) {
 			printf("sysctl_ctx_free(%p) failed!\n", &clist2);
 			/* Remove subtree forcefully... */
 			sysctl_remove_oid(b_root, 1, 1);
@@ -137,7 +137,7 @@ load (module_t mod, int cmd, void *arg)
 		} else
 			printf("Ok\n");
 		printf("3. Try to free ctx1 (%p) again: ", &clist);
-		if(sysctl_ctx_free(&clist)) {
+		if (sysctl_ctx_free(&clist) != 0) {
 			printf("sysctl_ctx_free(%p) failed!\n", &clist);
 			/* Remove subtree forcefully... */
 			sysctl_remove_oid(a_root1, 1, 1);
@@ -145,7 +145,7 @@ load (module_t mod, int cmd, void *arg)
 		} else
 			printf("Ok\n");
 		printf("4. Try to free ctx2 (%p): ", &clist1);
-		if(sysctl_ctx_free(&clist1)) {
+		if (sysctl_ctx_free(&clist1) != 0) {
 			printf("sysctl_ctx_free(%p) failed!\n", &clist1);
 			/* Remove subtree forcefully... */
 			sysctl_remove_oid(a_root, 1, 1);
@@ -156,10 +156,10 @@ load (module_t mod, int cmd, void *arg)
 		error = EOPNOTSUPP;
 		break;
 	}
-	return error;
+	return (error);
 }
 
-static moduledata_t mod_data= {
+static moduledata_t mod_data = {
 	"dyn_sysctl",
 	load,
 	0

Modified: projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c
==============================================================================
--- projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -26,7 +26,6 @@
  * $FreeBSD$
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -38,18 +37,17 @@
 /*
  * The function for implementing the syscall.
  */
-
 static int
-hello (struct thread *td, void *arg)
+hello(struct thread *td, void *arg)
 {
-	printf ("hello kernel\n");
-	return 0;
+
+	printf("hello kernel\n");
+	return (0);
 }
 
 /*
  * The `sysent' for the new syscall
  */
-
 static struct sysent hello_sysent = {
 	0,			/* sy_narg */
 	hello			/* sy_call */
@@ -58,30 +56,28 @@ static struct sysent hello_sysent = {
 /*
  * The offset in sysent where the syscall is allocated.
  */
-
 static int offset = NO_SYSCALL;
 
 /*
  * The function called at load/unload.
  */
-
 static int
-load (struct module *module, int cmd, void *arg)
+load(struct module *module, int cmd, void *arg)
 {
 	int error = 0;
 
 	switch (cmd) {
 	case MOD_LOAD :
-		printf ("syscall loaded at %d\n", offset);
+		printf("syscall loaded at %d\n", offset);
 		break;
 	case MOD_UNLOAD :
-		printf ("syscall unloaded from %d\n", offset);
+		printf("syscall unloaded from %d\n", offset);
 		break;
 	default :
 		error = EOPNOTSUPP;
 		break;
 	}
-	return error;
+	return (error);
 }
 
 SYSCALL_MODULE(syscall, &offset, &hello_sysent, load, NULL);

Modified: projects/acpica_20090521/share/man/man4/msk.4
==============================================================================
--- projects/acpica_20090521/share/man/man4/msk.4	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/share/man/man4/msk.4	Wed Jun  3 22:54:27 2009	(r193409)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 25, 2009
+.Dd June 2, 2009
 .Dt MSK 4
 .Os
 .Sh NAME
@@ -202,7 +202,11 @@ Marvell Yukon 88E8056 Gigabit Ethernet
 .It
 Marvell Yukon 88E8058 Gigabit Ethernet
 .It
-Marvell Yukon 88E8070 Fast Ethernet
+Marvell Yukon 88E8070 Gigabit Ethernet
+.It
+Marvell Yukon 88E8071 Gigabit Ethernet
+.It
+Marvell Yukon 88E8072 Gigabit Ethernet
 .It
 SysKonnect SK-9Sxx Gigabit Ethernet
 .It

Modified: projects/acpica_20090521/share/man/man5/src.conf.5
==============================================================================
--- projects/acpica_20090521/share/man/man5/src.conf.5	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/share/man/man5/src.conf.5	Wed Jun  3 22:54:27 2009	(r193409)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
 .\" $FreeBSD$
-.Dd April  5, 2009
+.Dd June  1, 2009
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -150,8 +150,15 @@ and
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_ETC 156932 2006-03-21 07:50:50Z ru
 Set to avoid installing the default files to
 .Pa /var/named/etc/namedb .
+.It Va WITH_BIND_IDN
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_IDN 193280 2009-06-01 21:58:59Z dougb
+Set to enable IDN support for dig, host, and nslookup.
+This requires ports/dns/idnkit to be installed in /usr/local.
+.It Va WITH_BIND_LARGE_FILE
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_LARGE_FILE 193280 2009-06-01 21:58:59Z dougb
+Set to enable 64-bit file support.
 .It Va WITH_BIND_LIBS
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 193280 2009-06-01 21:58:59Z dougb
 Set to install BIND libraries and include files.
 .It Va WITHOUT_BIND_LIBS_LWRES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_LIBS_LWRES 156932 2006-03-21 07:50:50Z ru
@@ -182,6 +189,9 @@ Set to avoid building or installing
 .Xr rndc 8 ,
 and
 .Xr rndc-confgen 8 .
+.It Va WITH_BIND_SIGCHASE
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_SIGCHASE 193280 2009-06-01 21:58:59Z dougb
+Set to enable DNSSEC validation support for dig, host, and nslookup.
 .It Va WITHOUT_BIND_UTILS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_UTILS 156932 2006-03-21 07:50:50Z ru
 Set to avoid building or installing the BIND userland utilities,
@@ -190,6 +200,10 @@ Set to avoid building or installing the 
 .Xr nslookup 1 ,
 and
 .Xr nsupdate 8 .
+.It Va WITH_BIND_XML
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_XML 193280 2009-06-01 21:58:59Z dougb
+Set to enable the http statistics interface for named.
+This requires ports/textproc/libxml2 to be installed in /usr/local.
 .It Va WITHOUT_BLUETOOTH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru
 Set to not build Bluetooth related kernel modules, programs and libraries.

Modified: projects/acpica_20090521/share/mk/bsd.own.mk
==============================================================================
--- projects/acpica_20090521/share/mk/bsd.own.mk	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/share/mk/bsd.own.mk	Wed Jun  3 22:54:27 2009	(r193409)
@@ -402,7 +402,11 @@ MK_${var}:=	yes
 # MK_* options which default to "no".
 #
 .for var in \
+    BIND_IDN \
+    BIND_LARGE_FILE \
     BIND_LIBS \
+    BIND_SIGCHASE \
+    BIND_XML \
     GNU_CPIO \
     HESIOD \
     IDEA

Modified: projects/acpica_20090521/sys/amd64/conf/GENERIC
==============================================================================
--- projects/acpica_20090521/sys/amd64/conf/GENERIC	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sys/amd64/conf/GENERIC	Wed Jun  3 22:54:27 2009	(r193409)
@@ -70,6 +70,7 @@ options 	KBD_INSTALL_CDEV	# install a CD
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
+options 	MAC			# TrustedBSD MAC Framework
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 

Modified: projects/acpica_20090521/sys/boot/uboot/lib/disk.c
==============================================================================
--- projects/acpica_20090521/sys/boot/uboot/lib/disk.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sys/boot/uboot/lib/disk.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -34,6 +34,7 @@
 __FBSDID("$FreeBSD$");
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -122,6 +123,15 @@ struct devsw uboot_storage = {
 	stor_print
 };
 
+static void
+uuid_letoh(uuid_t *uuid)
+{
+
+	uuid->time_low = le32toh(uuid->time_low);
+	uuid->time_mid = le16toh(uuid->time_mid);
+	uuid->time_hi_and_version = le16toh(uuid->time_hi_and_version);
+}
+
 static int
 stor_init(void)
 {
@@ -251,7 +261,7 @@ stor_open_gpt(struct open_dev *od, struc
 	}
 
 	/* Check the slice table magic. */
-	if (*((uint16_t *)(buf + DOSMAGICOFFSET)) != DOSMAGIC) {
+	if (le16toh(*((uint16_t *)(buf + DOSMAGICOFFSET))) != DOSMAGIC) {
 		err = ENXIO;
 		goto out;
 	}
@@ -286,9 +296,10 @@ stor_open_gpt(struct open_dev *od, struc
 
 	/* Check GPT header */
 	if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 ||
-	    hdr->hdr_lba_self != 1 || hdr->hdr_revision < 0x00010000 ||
-	    hdr->hdr_entsz < sizeof(*ent) ||
-	    od->od_bsize % hdr->hdr_entsz != 0) {
+	    le64toh(hdr->hdr_lba_self) != 1 ||
+	    le32toh(hdr->hdr_revision) < 0x00010000 ||
+	    le32toh(hdr->hdr_entsz) < sizeof(*ent) ||
+	    od->od_bsize % le32toh(hdr->hdr_entsz) != 0) {
 		debugf("Invalid GPT header!\n");
 		err = EINVAL;
 		goto out;
@@ -296,9 +307,9 @@ stor_open_gpt(struct open_dev *od, struc
 
 	/* Count number of valid partitions */
 	part = 0;
-	eps = od->od_bsize / hdr->hdr_entsz;
-	slba = hdr->hdr_lba_table;
-	elba = slba + hdr->hdr_entries / eps;
+	eps = od->od_bsize / le32toh(hdr->hdr_entsz);
+	slba = le64toh(hdr->hdr_lba_table);
+	elba = slba + le32toh(hdr->hdr_entries) / eps;
 
 	for (lba = slba; lba < elba; lba++) {
 		err = stor_readdev(dev, lba, 1, buf);
@@ -312,8 +323,9 @@ stor_open_gpt(struct open_dev *od, struc
 
 		for (i = 0; i < eps; i++) {
 			if (uuid_is_nil(&ent[i].ent_type, NULL) ||
-			    ent[i].ent_lba_start == 0 ||
-			    ent[i].ent_lba_end < ent[i].ent_lba_start)
+			    le64toh(ent[i].ent_lba_start) == 0 ||
+			    le64toh(ent[i].ent_lba_end) <
+			    le64toh(ent[i].ent_lba_start))
 				continue;
 
 			part += 1;
@@ -343,8 +355,9 @@ stor_open_gpt(struct open_dev *od, struc
 
 			for (i = 0; i < eps; i++) {
 				if (uuid_is_nil(&ent[i].ent_type, NULL) ||
-				    ent[i].ent_lba_start == 0 ||
-				    ent[i].ent_lba_end < ent[i].ent_lba_start)
+				    le64toh(ent[i].ent_lba_start) == 0 ||
+				    le64toh(ent[i].ent_lba_end) <
+				    le64toh(ent[i].ent_lba_start))
 					continue;
 
 				od->od_partitions[part].gp_index = (lba - slba)
@@ -352,9 +365,11 @@ stor_open_gpt(struct open_dev *od, struc
 				od->od_partitions[part].gp_type =
 				    ent[i].ent_type;
 				od->od_partitions[part].gp_start =
-				    ent[i].ent_lba_start;
+				    le64toh(ent[i].ent_lba_start);
 				od->od_partitions[part].gp_end =
-				    ent[i].ent_lba_end;
+				    le64toh(ent[i].ent_lba_end);
+
+				uuid_letoh(&od->od_partitions[part].gp_type);
 				part += 1;
 			}
 		}

Modified: projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile
==============================================================================
--- projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile	Wed Jun  3 22:54:27 2009	(r193409)
@@ -15,6 +15,7 @@ SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSR
 CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
 DPADD=	${LIBL}
 LDADD=	-ll
+WARNS?=	6
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file

Modified: projects/acpica_20090521/sys/dev/ata/ata-all.h
==============================================================================
--- projects/acpica_20090521/sys/dev/ata/ata-all.h	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sys/dev/ata/ata-all.h	Wed Jun  3 22:54:27 2009	(r193409)
@@ -149,11 +149,26 @@
 /* SATA AHCI v1.0 register defines */
 #define ATA_AHCI_CAP                    0x00
 #define		ATA_AHCI_CAP_NPMASK	0x0000001f
+#define		ATA_AHCI_CAP_SXS	0x00000020
+#define		ATA_AHCI_CAP_EMS	0x00000040
+#define		ATA_AHCI_CAP_CCCS	0x00000080
+#define		ATA_AHCI_CAP_NCS	0x00001F00
+#define		ATA_AHCI_CAP_NCS_SHIFT	8
 #define		ATA_AHCI_CAP_PSC	0x00002000
 #define		ATA_AHCI_CAP_SSC	0x00004000
+#define		ATA_AHCI_CAP_PMD	0x00008000
+#define		ATA_AHCI_CAP_FBSS	0x00010000
 #define		ATA_AHCI_CAP_SPM	0x00020000
-#define		ATA_AHCI_CAP_CLO	0x01000000
+#define		ATA_AHCI_CAP_SAM	0x00080000
+#define		ATA_AHCI_CAP_ISS	0x00F00000
+#define		ATA_AHCI_CAP_ISS_SHIFT	20
+#define		ATA_AHCI_CAP_SCLO	0x01000000
+#define		ATA_AHCI_CAP_SAL	0x02000000
 #define		ATA_AHCI_CAP_SALP	0x04000000
+#define		ATA_AHCI_CAP_SSS	0x08000000
+#define		ATA_AHCI_CAP_SMPS	0x10000000
+#define		ATA_AHCI_CAP_SSNTF	0x20000000
+#define		ATA_AHCI_CAP_SNCQ	0x40000000
 #define		ATA_AHCI_CAP_64BIT	0x80000000
 
 #define ATA_AHCI_GHC                    0x04

Modified: projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c	Wed Jun  3 21:56:29 2009	(r193408)
+++ projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c	Wed Jun  3 22:54:27 2009	(r193409)
@@ -101,8 +101,8 @@ int
 ata_ahci_chipinit(device_t dev)
 {
     struct ata_pci_controller *ctlr = device_get_softc(dev);
-    int	error;
-    u_int32_t version;
+    int error, speed;
+    u_int32_t caps, version;
 
     /* if we have a memory BAR(5) we are likely on an AHCI part */
     ctlr->r_type2 = SYS_RES_MEMORY;
@@ -142,16 +142,45 @@ ata_ahci_chipinit(device_t dev)
     ctlr->suspend = ata_ahci_suspend;
     ctlr->resume = ata_ahci_ctlr_reset;
 
-    /* announce we support the HW */
-    version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS);
-    device_printf(dev,
-		  "AHCI Version %x%x.%x%x controller with %d ports PM %s\n",
-		  (version >> 24) & 0xff, (version >> 16) & 0xff,
-		  (version >> 8) & 0xff, version & 0xff,
-		  (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_NPMASK) + 1,
-		  (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_SPM) ?
-		  "supported" : "not supported");
-    return 0;
+	/* announce we support the HW */
+	version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS);
+	caps = ATA_INL(ctlr->r_res2, ATA_AHCI_CAP);
+	speed = (caps & ATA_AHCI_CAP_ISS) >> ATA_AHCI_CAP_ISS_SHIFT;
+	device_printf(dev,
+		    "AHCI v%x.%02x controller with %d %sGbps ports, PM %s\n",
+		    ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f),
+		    ((version >> 4) & 0xf0) + (version & 0x0f),
+		    (caps & ATA_AHCI_CAP_NPMASK) + 1,
+		    ((speed == 1) ? "1.5":((speed == 2) ? "3":
+		    ((speed == 3) ? "6":"?"))),
+		    (caps & ATA_AHCI_CAP_SPM) ?
+		    "supported" : "not supported");
+	if (bootverbose) {
+		device_printf(dev, "Caps:%s%s%s%s%s%s%s%s %sGbps",
+		    (caps & ATA_AHCI_CAP_64BIT) ? " 64bit":"",
+		    (caps & ATA_AHCI_CAP_SNCQ) ? " NCQ":"",
+		    (caps & ATA_AHCI_CAP_SSNTF) ? " SNTF":"",
+		    (caps & ATA_AHCI_CAP_SMPS) ? " MPS":"",
+		    (caps & ATA_AHCI_CAP_SSS) ? " SS":"",
+		    (caps & ATA_AHCI_CAP_SALP) ? " ALP":"",
+		    (caps & ATA_AHCI_CAP_SAL) ? " AL":"",
+		    (caps & ATA_AHCI_CAP_SCLO) ? " CLO":"",
+		    ((speed == 1) ? "1.5":((speed == 2) ? "3":
+		    ((speed == 3) ? "6":"?"))));
+		printf("%s%s%s%s%s%s %dcmd%s%s%s %dports\n",
+		    (caps & ATA_AHCI_CAP_SAM) ? " AM":"",
+		    (caps & ATA_AHCI_CAP_SPM) ? " PM":"",
+		    (caps & ATA_AHCI_CAP_FBSS) ? " FBS":"",
+		    (caps & ATA_AHCI_CAP_PMD) ? " PMD":"",
+		    (caps & ATA_AHCI_CAP_SSC) ? " SSC":"",
+		    (caps & ATA_AHCI_CAP_PSC) ? " PSC":"",
+		    ((caps & ATA_AHCI_CAP_NCS) >> ATA_AHCI_CAP_NCS_SHIFT) + 1,
+		    (caps & ATA_AHCI_CAP_CCCS) ? " CCC":"",
+		    (caps & ATA_AHCI_CAP_EMS) ? " EM":"",
+		    (caps & ATA_AHCI_CAP_SXS) ? " eSATA":"",
+		    (caps & ATA_AHCI_CAP_NPMASK) + 1);
+	}
+	return 0;
 }
 
 int
@@ -625,7 +654,7 @@ ata_ahci_clo(device_t dev)
     int timeout;

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

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 06:27:53 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BCE8106564A;
	Thu,  4 Jun 2009 06:27:53 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BBEB8FC14;
	Thu,  4 Jun 2009 06:27:53 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n546RrBR079701;
	Thu, 4 Jun 2009 06:27:53 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n546RrC5079700;
	Thu, 4 Jun 2009 06:27:53 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906040627.n546RrC5079700@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 4 Jun 2009 06:27:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193429 - projects/clangbsd/lib/msun/src
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 06:27:53 -0000

Author: ed
Date: Thu Jun  4 06:27:53 2009
New Revision: 193429
URL: http://svn.freebsd.org/changeset/base/193429

Log:
  Allow us to build msun's inline asm with Clang!
  
  Discussed with:	Christoph Mallon

Modified:
  projects/clangbsd/lib/msun/src/math_private.h

Modified: projects/clangbsd/lib/msun/src/math_private.h
==============================================================================
--- projects/clangbsd/lib/msun/src/math_private.h	Thu Jun  4 05:20:46 2009	(r193428)
+++ projects/clangbsd/lib/msun/src/math_private.h	Thu Jun  4 06:27:53 2009	(r193429)
@@ -252,7 +252,7 @@ cpackl(long double x, long double y)
 }
 #endif /* _COMPLEX_H */
  
-#if defined(__GNUCLIKE_ASM) && !defined(__clang__)
+#ifdef __GNUCLIKE_ASM
 
 /* Asm versions of some functions. */
 
@@ -262,7 +262,7 @@ irint(double x)
 {
 	int n;
 
-	asm("cvtsd2si %1,%0" : "=r" (n) : "Y" (x));
+	asm("cvtsd2si %1,%0" : "=r" (n) : "x" (x));
 	return (n);
 }
 #define	HAVE_EFFICIENT_IRINT
@@ -280,7 +280,7 @@ irint(double x)
 #define	HAVE_EFFICIENT_IRINT
 #endif
 
-#endif /* __GNUCLIKE_ASM && !__clang__ */
+#endif /* __GNUCLIKE_ASM */
 
 /*
  * ieee style elementary functions

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 06:30:39 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BF171065674;
	Thu,  4 Jun 2009 06:30:39 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 173738FC0A;
	Thu,  4 Jun 2009 06:30:39 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n546Uck5079814;
	Thu, 4 Jun 2009 06:30:38 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n546UcLa079802;
	Thu, 4 Jun 2009 06:30:38 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906040630.n546UcLa079802@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 4 Jun 2009 06:30:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193430 - in projects/clangbsd: . contrib/llvm
	contrib/llvm/docs contrib/llvm/include/llvm/CodeGen
	contrib/llvm/include/llvm/ExecutionEngine
	contrib/llvm/include/llvm/Support contrib/ll...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 06:30:39 -0000

Author: ed
Date: Thu Jun  4 06:30:38 2009
New Revision: 193430
URL: http://svn.freebsd.org/changeset/base/193430

Log:
  Update sources.
  
  On amd64, we can now run buildworld and build a LINT kernel.

Added:
  projects/clangbsd/contrib/llvm/include/llvm/Support/StandardPasses.h
     - copied unchanged from r193403, vendor/llvm/dist/include/llvm/Support/StandardPasses.h
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp
     - copied unchanged from r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h
     - copied unchanged from r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.h
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaMachineFunctionInfo.h
     - copied unchanged from r193403, vendor/llvm/dist/lib/Target/Alpha/AlphaMachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
     - copied unchanged from r193403, vendor/llvm/dist/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-1.ll
     - copied unchanged from r193403, vendor/llvm/dist/test/Transforms/IndVarSimplify/variable-stride-ivs-1.ll
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGCXXTemp.cpp
     - copied unchanged from r193403, vendor/clang/dist/lib/CodeGen/CGCXXTemp.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGenObjC/objc2-weak-assign.m
     - copied unchanged from r193403, vendor/clang/dist/test/CodeGenObjC/objc2-weak-assign.m
Deleted:
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs.ll
  projects/clangbsd/sys/gnu/fs/ext2fs/sparc64-bitops.h
Modified:
  projects/clangbsd/   (props changed)
  projects/clangbsd/contrib/llvm/   (props changed)
  projects/clangbsd/contrib/llvm/CMakeLists.txt
  projects/clangbsd/contrib/llvm/docs/CMake.html
  projects/clangbsd/contrib/llvm/docs/GoldPlugin.html
  projects/clangbsd/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h
  projects/clangbsd/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
  projects/clangbsd/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h
  projects/clangbsd/contrib/llvm/lib/CodeGen/CMakeLists.txt
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16.h
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16AsmPrinter.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16DebugInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.td
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
  projects/clangbsd/contrib/llvm/tools/clang/   (props changed)
  projects/clangbsd/contrib/llvm/tools/clang/clang.xcodeproj/project.pbxproj
  projects/clangbsd/contrib/llvm/tools/clang/docs/PCHInternals.html
  projects/clangbsd/contrib/llvm/tools/clang/docs/PCHLayout.graffle
  projects/clangbsd/contrib/llvm/tools/clang/docs/PCHLayout.png
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/HostInfo.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.def
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/Backend.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/Analysis/retain-release-gc-only.m
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/always_inline.c
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/cast-to-union.c
  projects/clangbsd/contrib/llvm/tools/llvm-config/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/llvm-ld/Optimize.cpp
  projects/clangbsd/contrib/llvm/tools/lto/LTOCodeGenerator.cpp
  projects/clangbsd/contrib/llvm/tools/opt/opt.cpp
  projects/clangbsd/lib/libusb/   (props changed)
  projects/clangbsd/sys/boot/uboot/lib/disk.c
  projects/clangbsd/sys/dev/ath/if_ath.c
  projects/clangbsd/sys/dev/iir/iir.c
  projects/clangbsd/sys/dev/iir/iir_ctrl.c
  projects/clangbsd/sys/dev/xen/netfront/   (props changed)
  projects/clangbsd/sys/dev/xen/xenpci/   (props changed)
  projects/clangbsd/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/clangbsd/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/clangbsd/sys/modules/ip6_mroute_mod/   (props changed)
  projects/clangbsd/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/clangbsd/sys/netinet/in_pcb.c
  projects/clangbsd/sys/security/mac/mac_atalk.c
  projects/clangbsd/sys/security/mac/mac_inet.c
  projects/clangbsd/sys/security/mac/mac_inet6.c
  projects/clangbsd/sys/security/mac/mac_net.c
  projects/clangbsd/sys/security/mac/mac_socket.c
  projects/clangbsd/sys/security/mac_biba/mac_biba.c
  projects/clangbsd/sys/security/mac_lomac/mac_lomac.c
  projects/clangbsd/sys/security/mac_mls/mac_mls.c
  projects/clangbsd/sys/security/mac_stub/mac_stub.c
  projects/clangbsd/sys/security/mac_test/mac_test.c
  projects/clangbsd/sys/sun4v/include/pcpu.h
  projects/clangbsd/sys/sys/pmc.h
  projects/clangbsd/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/clangbsd/usr.bin/clang/lib/libclangcodegen/Makefile
  projects/clangbsd/usr.bin/clang/lib/libllvmcodegen/Makefile
  projects/clangbsd/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/clangbsd/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/clangbsd/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/clangbsd/usr.sbin/makefs/getid.c   (props changed)

Modified: projects/clangbsd/contrib/llvm/CMakeLists.txt
==============================================================================
--- projects/clangbsd/contrib/llvm/CMakeLists.txt	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/CMakeLists.txt	Thu Jun  4 06:30:38 2009	(r193430)
@@ -17,6 +17,8 @@ This process created the file `CMakeCach
 Please delete them.")
 endif()
 
+string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+
 include(FindPerl)
 
 set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -55,6 +57,16 @@ endif( MSVC )
 
 option(LLVM_ENABLE_THREADS "Use threads if available." ON)
 
+if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
+  option(LLVM_ENABLE_ASSERTS "Enable asserts" OFF)
+else()
+  option(LLVM_ENABLE_ASSERTS "Enable asserts" ON)
+endif()
+
+if( LLVM_ENABLE_ASSERTS )
+  add_definitions( -D_DEBUG -UNDEBUG )
+endif()
+
 if( LLVM_TARGETS_TO_BUILD STREQUAL "all" )
   set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} )
 endif()

Modified: projects/clangbsd/contrib/llvm/docs/CMake.html
==============================================================================
--- projects/clangbsd/contrib/llvm/docs/CMake.html	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/docs/CMake.html	Thu Jun  4 06:30:38 2009	(r193430)
@@ -248,6 +248,10 @@
   
LLVM_ENABLE_THREADS:BOOL

   
Build with threads support, if available. Defaults to ON.

 
+  
LLVM_ENABLE_ASSERTS:BOOL

+  
Enables code asserts. Defaults to ON if and only if
+    CMAKE_BUILD_TYPE is Release.

+
   
LLVM_ENABLE_PIC:BOOL

   
Add the -fPIC flag to the compiler command-line, if the
     compiler supports this flag. Some systems, like Windows, does not

Modified: projects/clangbsd/contrib/llvm/docs/GoldPlugin.html
==============================================================================
--- projects/clangbsd/contrib/llvm/docs/GoldPlugin.html	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/docs/GoldPlugin.html	Thu Jun  4 06:30:38 2009	(r193430)
@@ -14,6 +14,7 @@
   
  • Usage
   
    • 
   
  • Licensing
    • 
 
@@ -136,6 +137,35 @@ $ llvm-gcc -use-gold-plugin a.o b.o -o m
 
 
 
+
    Quickstart for using LTO with autotooled projects
    
+
+
    
+  
    gold, ar and nm all support plugins now, so everything should be
+  in place for an easy to use LTO build of autotooled projects:
    
+  
      
+    
    • Follow the instructions on how to build libLLVMgold.so.
      • 
+    
    • Install the newly built binutils to $PREFIX
      • 
+    
    • Copy Release/lib/libLLVMgold.so to
+    $PREFIX/libexec/gcc/x86_64-unknown-linux-gnu/4.2.1/ and
+    $PREFIX/lib/bfd-plugins/
      • 
+    
    • Set environment variables ($PREFIX is where you installed llvm-gcc and
+    binutils):
+    
      +export CC="$PREFIX/bin/llvm-gcc -use-gold-plugin"
+export CXX="$PREFIX/bin/llvm-g++ -use-gold-plugin"
+export AR="$PREFIX/bin/ar --plugin libLLVMgold.so"
+export NM="$PREFIX/bin/nm --plugin libLLVMgold.so"
+export RANLIB=/bin/true #ranlib is not needed, and doesn't support .bc files in .a
+export CFLAGS="-O4"
+     
      
+     
      • 
+     
    • Configure & build the project as usual: ./configure && make && make check 
      • 
+   
    
+   
     The environment variable settings may work for non-autotooled projects
+   too, but you may need to set the LD environment variable as well.
    
+
    
+
+
 
    Licensing
    
 
 
    

Modified: projects/clangbsd/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h	Thu Jun  4 06:30:38 2009	(r193430)
@@ -89,7 +89,7 @@ public:
   /// emitByte - This callback is invoked when a byte needs to be written to the
   /// output stream.
   ///
-  void emitByte(uint8_t B) {
+  void emitByte(unsigned char B) {
     if (CurBufferPtr != BufferEnd)
       *CurBufferPtr++ = B;
   }
@@ -99,10 +99,10 @@ public:
   ///
   void emitWordLE(unsigned W) {
     if (4 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -113,10 +113,10 @@ public:
   ///
   void emitWordBE(unsigned W) {
     if (4 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -127,14 +127,14 @@ public:
   ///
   void emitDWordLE(uint64_t W) {
     if (8 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 32);
-      *CurBufferPtr++ = (uint8_t)(W >> 40);
-      *CurBufferPtr++ = (uint8_t)(W >> 48);
-      *CurBufferPtr++ = (uint8_t)(W >> 56);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 32);
+      *CurBufferPtr++ = (unsigned char)(W >> 40);
+      *CurBufferPtr++ = (unsigned char)(W >> 48);
+      *CurBufferPtr++ = (unsigned char)(W >> 56);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -145,14 +145,14 @@ public:
   ///
   void emitDWordBE(uint64_t W) {
     if (8 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >> 56);
-      *CurBufferPtr++ = (uint8_t)(W >> 48);
-      *CurBufferPtr++ = (uint8_t)(W >> 40);
-      *CurBufferPtr++ = (uint8_t)(W >> 32);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >> 56);
+      *CurBufferPtr++ = (unsigned char)(W >> 48);
+      *CurBufferPtr++ = (unsigned char)(W >> 40);
+      *CurBufferPtr++ = (unsigned char)(W >> 32);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -166,8 +166,8 @@ public:
     if(Alignment <= (uintptr_t)(BufferEnd-CurBufferPtr)) {
       // Move the current buffer ptr up to the specified alignment.
       CurBufferPtr =
-        (uint8_t*)(((uintptr_t)CurBufferPtr+Alignment-1) &
-                   ~(uintptr_t)(Alignment-1));
+        (unsigned char*)(((uintptr_t)CurBufferPtr+Alignment-1) &
+                         ~(uintptr_t)(Alignment-1));
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -178,7 +178,7 @@ public:
   /// written to the output stream.
   void emitULEB128Bytes(unsigned Value) {
     do {
-      uint8_t Byte = Value & 0x7f;
+      unsigned char Byte = Value & 0x7f;
       Value >>= 7;
       if (Value) Byte |= 0x80;
       emitByte(Byte);
@@ -187,12 +187,12 @@ public:
   
   /// emitSLEB128Bytes - This callback is invoked when a SLEB128 needs to be
   /// written to the output stream.
-  void emitSLEB128Bytes(int32_t Value) {
-    int32_t Sign = Value >> (8 * sizeof(Value) - 1);
+  void emitSLEB128Bytes(int Value) {
+    int Sign = Value >> (8 * sizeof(Value) - 1);
     bool IsMore;
   
     do {
-      uint8_t Byte = Value & 0x7f;
+      unsigned char Byte = Value & 0x7f;
       Value >>= 7;
       IsMore = Value != Sign || ((Byte ^ Sign) & 0x40) != 0;
       if (IsMore) Byte |= 0x80;
@@ -205,14 +205,14 @@ public:
   void emitString(const std::string &String) {
     for (unsigned i = 0, N = static_cast(String.size());
          i < N; ++i) {
-      uint8_t C = String[i];
+      unsigned char C = String[i];
       emitByte(C);
     }
     emitByte(0);
   }
   
   /// emitInt32 - Emit a int32 directive.
-  void emitInt32(int32_t Value) {
+  void emitInt32(int Value) {
     if (4 <= BufferEnd-CurBufferPtr) {
       *((uint32_t*)CurBufferPtr) = Value;
       CurBufferPtr += 4;

Modified: projects/clangbsd/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h	Thu Jun  4 06:30:38 2009	(r193430)
@@ -50,14 +50,14 @@ class MachineCodeEmitter {
 protected:
   /// BufferBegin/BufferEnd - Pointers to the start and end of the memory
   /// allocated for this code buffer.
-  uint8_t *BufferBegin, *BufferEnd;
+  unsigned char *BufferBegin, *BufferEnd;
   
   /// CurBufferPtr - Pointer to the next byte of memory to fill when emitting 
   /// code.  This is guranteed to be in the range [BufferBegin,BufferEnd].  If
   /// this pointer is at BufferEnd, it will never move due to code emission, and
   /// all code emission requests will be ignored (this is the buffer overflow
   /// condition).
-  uint8_t *CurBufferPtr;
+  unsigned char *CurBufferPtr;
 
 public:
   virtual ~MachineCodeEmitter() {}
@@ -96,7 +96,7 @@ public:
   /// emitByte - This callback is invoked when a byte needs to be written to the
   /// output stream.
   ///
-  void emitByte(uint8_t B) {
+  void emitByte(unsigned char B) {
     if (CurBufferPtr != BufferEnd)
       *CurBufferPtr++ = B;
   }
@@ -106,10 +106,10 @@ public:
   ///
   void emitWordLE(unsigned W) {
     if (4 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -120,10 +120,10 @@ public:
   ///
   void emitWordBE(unsigned W) {
     if (4 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -134,14 +134,14 @@ public:
   ///
   void emitDWordLE(uint64_t W) {
     if (8 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 32);
-      *CurBufferPtr++ = (uint8_t)(W >> 40);
-      *CurBufferPtr++ = (uint8_t)(W >> 48);
-      *CurBufferPtr++ = (uint8_t)(W >> 56);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 32);
+      *CurBufferPtr++ = (unsigned char)(W >> 40);
+      *CurBufferPtr++ = (unsigned char)(W >> 48);
+      *CurBufferPtr++ = (unsigned char)(W >> 56);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -152,14 +152,14 @@ public:
   ///
   void emitDWordBE(uint64_t W) {
     if (8 <= BufferEnd-CurBufferPtr) {
-      *CurBufferPtr++ = (uint8_t)(W >> 56);
-      *CurBufferPtr++ = (uint8_t)(W >> 48);
-      *CurBufferPtr++ = (uint8_t)(W >> 40);
-      *CurBufferPtr++ = (uint8_t)(W >> 32);
-      *CurBufferPtr++ = (uint8_t)(W >> 24);
-      *CurBufferPtr++ = (uint8_t)(W >> 16);
-      *CurBufferPtr++ = (uint8_t)(W >>  8);
-      *CurBufferPtr++ = (uint8_t)(W >>  0);
+      *CurBufferPtr++ = (unsigned char)(W >> 56);
+      *CurBufferPtr++ = (unsigned char)(W >> 48);
+      *CurBufferPtr++ = (unsigned char)(W >> 40);
+      *CurBufferPtr++ = (unsigned char)(W >> 32);
+      *CurBufferPtr++ = (unsigned char)(W >> 24);
+      *CurBufferPtr++ = (unsigned char)(W >> 16);
+      *CurBufferPtr++ = (unsigned char)(W >>  8);
+      *CurBufferPtr++ = (unsigned char)(W >>  0);
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -173,8 +173,8 @@ public:
     if(Alignment <= (uintptr_t)(BufferEnd-CurBufferPtr)) {
       // Move the current buffer ptr up to the specified alignment.
       CurBufferPtr =
-        (uint8_t*)(((uintptr_t)CurBufferPtr+Alignment-1) &
-                   ~(uintptr_t)(Alignment-1));
+        (unsigned char*)(((uintptr_t)CurBufferPtr+Alignment-1) &
+                         ~(uintptr_t)(Alignment-1));
     } else {
       CurBufferPtr = BufferEnd;
     }
@@ -185,7 +185,7 @@ public:
   /// written to the output stream.
   void emitULEB128Bytes(unsigned Value) {
     do {
-      uint8_t Byte = Value & 0x7f;
+      unsigned char Byte = Value & 0x7f;
       Value >>= 7;
       if (Value) Byte |= 0x80;
       emitByte(Byte);
@@ -194,12 +194,12 @@ public:
   
   /// emitSLEB128Bytes - This callback is invoked when a SLEB128 needs to be
   /// written to the output stream.
-  void emitSLEB128Bytes(int32_t Value) {
-    int32_t Sign = Value >> (8 * sizeof(Value) - 1);
+  void emitSLEB128Bytes(int Value) {
+    int Sign = Value >> (8 * sizeof(Value) - 1);
     bool IsMore;
   
     do {
-      uint8_t Byte = Value & 0x7f;
+      unsigned char Byte = Value & 0x7f;
       Value >>= 7;
       IsMore = Value != Sign || ((Byte ^ Sign) & 0x40) != 0;
       if (IsMore) Byte |= 0x80;
@@ -212,14 +212,14 @@ public:
   void emitString(const std::string &String) {
     for (unsigned i = 0, N = static_cast(String.size());
          i < N; ++i) {
-      uint8_t C = String[i];
+      unsigned char C = String[i];
       emitByte(C);
     }
     emitByte(0);
   }
   
   /// emitInt32 - Emit a int32 directive.
-  void emitInt32(int32_t Value) {
+  void emitInt32(int Value) {
     if (4 <= BufferEnd-CurBufferPtr) {
       *((uint32_t*)CurBufferPtr) = Value;
       CurBufferPtr += 4;

Modified: projects/clangbsd/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h	Thu Jun  4 06:30:38 2009	(r193430)
@@ -60,7 +60,7 @@ public:
   
   /// getGOTBase - If this is managing a Global Offset Table, this method should
   /// return a pointer to its base.
-  virtual uint8_t *getGOTBase() const = 0;
+  virtual unsigned char *getGOTBase() const = 0;
   
   /// SetDlsymTable - If the JIT must be able to relocate stubs after they have
   /// been emitted, potentially because they are being copied to a process
@@ -89,8 +89,8 @@ public:
   /// emit the function, so it doesn't pass in the size.  Instead, this method
   /// is required to pass back a "valid size".  The JIT will be careful to not
   /// write more than the returned ActualSize bytes of memory. 
-  virtual uint8_t *startFunctionBody(const Function *F, 
-                                     uintptr_t &ActualSize) = 0;
+  virtual unsigned char *startFunctionBody(const Function *F, 
+                                           uintptr_t &ActualSize) = 0;
   
   /// allocateStub - This method is called by the JIT to allocate space for a
   /// function stub (used to handle limited branch displacements) while it is
@@ -100,8 +100,9 @@ public:
   /// thunk for it.  The stub should be "close" to the current function body,
   /// but should not be included in the 'actualsize' returned by
   /// startFunctionBody.
-  virtual uint8_t *allocateStub(const GlobalValue* F, unsigned StubSize,
-                                unsigned Alignment) = 0;
+  virtual unsigned char *allocateStub(const GlobalValue* F, unsigned StubSize,
+                                      unsigned Alignment) =0;
+  
   
   /// endFunctionBody - This method is called when the JIT is done codegen'ing
   /// the specified function.  At this point we know the size of the JIT
@@ -109,11 +110,11 @@ public:
   /// the startFunctionBody method) and FunctionEnd which is a pointer to the 
   /// actual end of the function.  This method should mark the space allocated
   /// and remember where it is in case the client wants to deallocate it.
-  virtual void endFunctionBody(const Function *F, uint8_t *FunctionStart,
-                               uint8_t *FunctionEnd) = 0;
+  virtual void endFunctionBody(const Function *F, unsigned char *FunctionStart,
+                               unsigned char *FunctionEnd) = 0;
 
   /// allocateSpace - Allocate a memory block of the given size.
-  virtual uint8_t *allocateSpace(intptr_t Size, unsigned Alignment) = 0;
+  virtual unsigned char *allocateSpace(intptr_t Size, unsigned Alignment) = 0;
   
   /// deallocateMemForFunction - Free JIT memory for the specified function.
   /// This is never called when the JIT is currently emitting a function.
@@ -121,13 +122,14 @@ public:
   
   /// startExceptionTable - When we finished JITing the function, if exception
   /// handling is set, we emit the exception table.
-  virtual uint8_t* startExceptionTable(const Function* F,
-                                       uintptr_t &ActualSize) = 0;
+  virtual unsigned char* startExceptionTable(const Function* F,
+                                             uintptr_t &ActualSize) = 0;
   
   /// endExceptionTable - This method is called when the JIT is done emitting
   /// the exception table.
-  virtual void endExceptionTable(const Function *F, uint8_t *TableStart,
-                                 uint8_t *TableEnd, uint8_t* FrameRegister) = 0;
+  virtual void endExceptionTable(const Function *F, unsigned char *TableStart,
+                                 unsigned char *TableEnd, 
+                                 unsigned char* FrameRegister) = 0;
 };
 
 } // end namespace llvm.

Copied: projects/clangbsd/contrib/llvm/include/llvm/Support/StandardPasses.h (from r193403, vendor/llvm/dist/include/llvm/Support/StandardPasses.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/include/llvm/Support/StandardPasses.h	Thu Jun  4 06:30:38 2009	(r193430, copy of r193403, vendor/llvm/dist/include/llvm/Support/StandardPasses.h)
@@ -0,0 +1,250 @@
+//===-- llvm/Support/StandardPasses.h - Standard pass lists -----*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines utility functions for creating a "standard" set of
+// optimization passes, so that compilers and tools which use optimization
+// passes use the same set of standard passes.
+//
+// These are implemented as inline functions so that we do not have to worry
+// about link issues.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_STANDARDPASSES_H
+#define LLVM_SUPPORT_STANDARDPASSES_H
+
+#include "llvm/PassManager.h"
+#include "llvm/Analysis/Passes.h"
+#include "llvm/Analysis/Verifier.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/IPO.h"
+
+namespace llvm {
+  /// createStandardFunctionPasses - Add the standard list of function passes to
+  /// the provided pass manager.
+  ///
+  /// \arg OptimizationLevel - The optimization level, corresponding to -O0,
+  /// -O1, etc.
+  static inline void createStandardFunctionPasses(FunctionPassManager *PM,
+                                                  unsigned OptimizationLevel);
+
+  /// createStandardModulePasses - Add the standard list of module passes to the
+  /// provided pass manager.
+  ///
+  /// \arg OptimizationLevel - The optimization level, corresponding to -O0,
+  /// -O1, etc.
+  /// \arg OptimizeSize - Whether the transformations should optimize for size.
+  /// \arg UnitAtATime - Allow passes which may make global module changes.
+  /// \arg UnrollLoops - Allow loop unrolling.
+  /// \arg SimplifyLibCalls - Allow library calls to be simplified.
+  /// \arg HaveExceptions - Whether the module may have code using exceptions.
+  /// \arg InliningPass - The inlining pass to use, if any, or null. This will
+  /// always be added, even at -O0.a
+  static inline void createStandardModulePasses(PassManager *PM,
+                                                unsigned OptimizationLevel,
+                                                bool OptimizeSize,
+                                                bool UnitAtATime,
+                                                bool UnrollLoops,
+                                                bool SimplifyLibCalls,
+                                                bool HaveExceptions,
+                                                Pass *InliningPass);
+
+  /// createStandardLTOPasses - Add the standard list of module passes suitable
+  /// for link time optimization.
+  ///
+  /// Internalize - Run the internalize pass.
+  /// RunInliner - Use a function inlining pass.
+  /// RunSecondGlobalOpt - Run the global optimizer pass twice.
+  /// VerifyEach - Run the verifier after each pass.
+  //
+  // FIXME: RunSecondGlobalOpt should go away once we resolve which of LTO or
+  // llvm-ld is better.
+  static inline void createStandardLTOPasses(PassManager *PM,
+                                             bool Internalize,
+                                             bool RunInliner,
+                                             bool RunSecondGlobalOpt,
+                                             bool VerifyEach);
+
+  // Implementations
+
+  static inline void createStandardFunctionPasses(FunctionPassManager *PM,
+                                                  unsigned OptimizationLevel) {
+    if (OptimizationLevel > 0) {
+      PM->add(createCFGSimplificationPass());
+      if (OptimizationLevel == 1)
+        PM->add(createPromoteMemoryToRegisterPass());
+      else
+        PM->add(createScalarReplAggregatesPass());
+      PM->add(createInstructionCombiningPass());
+    }
+  }
+
+  static inline void createStandardModulePasses(PassManager *PM,
+                                                unsigned OptimizationLevel,
+                                                bool OptimizeSize,
+                                                bool UnitAtATime,
+                                                bool UnrollLoops,
+                                                bool SimplifyLibCalls,
+                                                bool HaveExceptions,
+                                                Pass *InliningPass) {
+    if (OptimizationLevel == 0) {
+      if (InliningPass)
+        PM->add(InliningPass);
+    } else {
+      if (UnitAtATime)
+        PM->add(createRaiseAllocationsPass());    // call %malloc -> malloc inst
+      PM->add(createCFGSimplificationPass());     // Clean up disgusting code
+       // Kill useless allocas
+      PM->add(createPromoteMemoryToRegisterPass());
+      if (UnitAtATime) {
+        PM->add(createGlobalOptimizerPass());     // Optimize out global vars
+        PM->add(createGlobalDCEPass());           // Remove unused fns and globs
+        // IP Constant Propagation
+        PM->add(createIPConstantPropagationPass());
+        PM->add(createDeadArgEliminationPass());  // Dead argument elimination
+      }
+      PM->add(createInstructionCombiningPass());  // Clean up after IPCP & DAE
+      PM->add(createCFGSimplificationPass());     // Clean up after IPCP & DAE
+      if (UnitAtATime) {
+        if (HaveExceptions)
+          PM->add(createPruneEHPass());           // Remove dead EH info
+        PM->add(createFunctionAttrsPass());       // Set readonly/readnone attrs
+      }
+      if (InliningPass)
+        PM->add(InliningPass);
+      if (OptimizationLevel > 2)
+        PM->add(createArgumentPromotionPass());   // Scalarize uninlined fn args
+      if (SimplifyLibCalls)
+        PM->add(createSimplifyLibCallsPass());    // Library Call Optimizations
+      PM->add(createInstructionCombiningPass());  // Cleanup for scalarrepl.
+      PM->add(createJumpThreadingPass());         // Thread jumps.
+      PM->add(createCFGSimplificationPass());     // Merge & remove BBs
+      PM->add(createScalarReplAggregatesPass());  // Break up aggregate allocas
+      PM->add(createInstructionCombiningPass());  // Combine silly seq's
+      PM->add(createCondPropagationPass());       // Propagate conditionals
+      PM->add(createTailCallEliminationPass());   // Eliminate tail calls
+      PM->add(createCFGSimplificationPass());     // Merge & remove BBs
+      PM->add(createReassociatePass());           // Reassociate expressions
+      PM->add(createLoopRotatePass());            // Rotate Loop
+      PM->add(createLICMPass());                  // Hoist loop invariants
+      PM->add(createLoopUnswitchPass(OptimizeSize));
+      PM->add(createLoopIndexSplitPass());        // Split loop index
+      PM->add(createInstructionCombiningPass());  
+      PM->add(createIndVarSimplifyPass());        // Canonicalize indvars
+      PM->add(createLoopDeletionPass());          // Delete dead loops
+      if (UnrollLoops)
+        PM->add(createLoopUnrollPass());          // Unroll small loops
+      PM->add(createInstructionCombiningPass());  // Clean up after the unroller
+      PM->add(createGVNPass());                   // Remove redundancies
+      PM->add(createMemCpyOptPass());             // Remove memcpy / form memset
+      PM->add(createSCCPPass());                  // Constant prop with SCCP
+    
+      // Run instcombine after redundancy elimination to exploit opportunities
+      // opened up by them.
+      PM->add(createInstructionCombiningPass());
+      PM->add(createCondPropagationPass());       // Propagate conditionals
+      PM->add(createDeadStoreEliminationPass());  // Delete dead stores
+      PM->add(createAggressiveDCEPass());         // Delete dead instructions
+      PM->add(createCFGSimplificationPass());     // Merge & remove BBs
+
+      if (UnitAtATime) {
+        PM->add(createStripDeadPrototypesPass()); // Get rid of dead prototypes
+        PM->add(createDeadTypeEliminationPass()); // Eliminate dead types
+      }
+
+      if (OptimizationLevel > 1 && UnitAtATime)
+        PM->add(createConstantMergePass());       // Merge dup global constants
+    }
+  }
+
+  static inline void addOnePass(PassManager *PM, Pass *P, bool AndVerify) {
+    PM->add(P);
+
+    if (AndVerify)
+      PM->add(createVerifierPass());
+  }
+
+  static inline void createStandardLTOPasses(PassManager *PM,
+                                             bool Internalize,
+                                             bool RunInliner,
+                                             bool RunSecondGlobalOpt,
+                                             bool VerifyEach) {
+    // Now that composite has been compiled, scan through the module, looking
+    // for a main function.  If main is defined, mark all other functions
+    // internal.
+    if (Internalize)
+      addOnePass(PM, createInternalizePass(true), VerifyEach);
+
+    // Propagate constants at call sites into the functions they call.  This
+    // opens opportunities for globalopt (and inlining) by substituting function
+    // pointers passed as arguments to direct uses of functions.  
+    addOnePass(PM, createIPSCCPPass(), VerifyEach);
+
+    // Now that we internalized some globals, see if we can hack on them!
+    addOnePass(PM, createGlobalOptimizerPass(), VerifyEach);
+    
+    // Linking modules together can lead to duplicated global constants, only
+    // keep one copy of each constant...
+    addOnePass(PM, createConstantMergePass(), VerifyEach);
+    
+    // Remove unused arguments from functions...
+    addOnePass(PM, createDeadArgEliminationPass(), VerifyEach);
+
+    // Reduce the code after globalopt and ipsccp.  Both can open up significant
+    // simplification opportunities, and both can propagate functions through
+    // function pointers.  When this happens, we often have to resolve varargs
+    // calls, etc, so let instcombine do this.
+    addOnePass(PM, createInstructionCombiningPass(), VerifyEach);
+
+    // Inline small functions
+    if (RunInliner)
+      addOnePass(PM, createFunctionInliningPass(), VerifyEach);
+
+    addOnePass(PM, createPruneEHPass(), VerifyEach);   // Remove dead EH info.
+    // Optimize globals again.
+    if (RunSecondGlobalOpt)
+      addOnePass(PM, createGlobalOptimizerPass(), VerifyEach);
+    addOnePass(PM, createGlobalDCEPass(), VerifyEach); // Remove dead functions.
+
+    // If we didn't decide to inline a function, check to see if we can
+    // transform it to pass arguments by value instead of by reference.
+    addOnePass(PM, createArgumentPromotionPass(), VerifyEach);
+
+    // The IPO passes may leave cruft around.  Clean up after them.
+    addOnePass(PM, createInstructionCombiningPass(), VerifyEach);
+    addOnePass(PM, createJumpThreadingPass(), VerifyEach);
+    // Break up allocas
+    addOnePass(PM, createScalarReplAggregatesPass(), VerifyEach);
+
+    // Run a few AA driven optimizations here and now, to cleanup the code.
+    addOnePass(PM, createFunctionAttrsPass(), VerifyEach); // Add nocapture.
+    addOnePass(PM, createGlobalsModRefPass(), VerifyEach); // IP alias analysis.
+
+    addOnePass(PM, createLICMPass(), VerifyEach);      // Hoist loop invariants.
+    addOnePass(PM, createGVNPass(), VerifyEach);       // Remove redundancies.
+    addOnePass(PM, createMemCpyOptPass(), VerifyEach); // Remove dead memcpys.
+    // Nuke dead stores.
+    addOnePass(PM, createDeadStoreEliminationPass(), VerifyEach);
+
+    // Cleanup and simplify the code after the scalar optimizations.
+    addOnePass(PM, createInstructionCombiningPass(), VerifyEach);
+
+    addOnePass(PM, createJumpThreadingPass(), VerifyEach);
+    // Cleanup jump threading.
+    addOnePass(PM, createPromoteMemoryToRegisterPass(), VerifyEach);
+    
+    // Delete basic blocks, which optimization passes may have killed...
+    addOnePass(PM, createCFGSimplificationPass(), VerifyEach);
+
+    // Now that we have optimized the program, discard unreachable functions.
+    addOnePass(PM, createGlobalDCEPass(), VerifyEach);
+  }
+}
+
+#endif

Modified: projects/clangbsd/contrib/llvm/lib/CodeGen/CMakeLists.txt
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/CodeGen/CMakeLists.txt	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/CMakeLists.txt	Thu Jun  4 06:30:38 2009	(r193430)
@@ -3,6 +3,7 @@ add_llvm_library(LLVMCodeGen
   CodePlacementOpt.cpp
   DeadMachineInstructionElim.cpp
   DwarfEHPrepare.cpp
+  ELFCodeEmitter.cpp
   ELFWriter.cpp
   GCMetadata.cpp
   GCMetadataPrinter.cpp
@@ -16,6 +17,7 @@ add_llvm_library(LLVMCodeGen
   LiveStackAnalysis.cpp
   LiveVariables.cpp
   LowerSubregs.cpp
+  MachOCodeEmitter.cpp
   MachOWriter.cpp
   MachineBasicBlock.cpp
   MachineDominators.cpp

Copied: projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp (from r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp	Thu Jun  4 06:30:38 2009	(r193430, copy of r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.cpp)
@@ -0,0 +1,94 @@
+//===-- lib/CodeGen/ELFCodeEmitter.cpp ------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ELFCodeEmitter.h"
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Function.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
+#include "llvm/CodeGen/MachineJumpTableInfo.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/TargetData.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Support/Mangler.h"
+#include "llvm/Support/OutputBuffer.h"
+
+//===----------------------------------------------------------------------===//
+//                       ELFCodeEmitter Implementation
+//===----------------------------------------------------------------------===//
+
+namespace llvm {
+
+/// startFunction - This callback is invoked when a new machine function is
+/// about to be emitted.
+void ELFCodeEmitter::startFunction(MachineFunction &F) {
+  // Align the output buffer to the appropriate alignment.
+  unsigned Align = 16;   // FIXME: GENERICIZE!!
+  // Get the ELF Section that this function belongs in.
+  ES = &EW.getSection(".text", ELFWriter::ELFSection::SHT_PROGBITS,
+                      ELFWriter::ELFSection::SHF_EXECINSTR |
+                      ELFWriter::ELFSection::SHF_ALLOC);
+  OutBuffer = &ES->SectionData;
+  cerr << "FIXME: This code needs to be updated for changes in the "
+       << "CodeEmitter interfaces.  In particular, this should set "
+       << "BufferBegin/BufferEnd/CurBufferPtr, not deal with OutBuffer!";
+  abort();
+
+  // Upgrade the section alignment if required.
+  if (ES->Align < Align) ES->Align = Align;
+
+  // Add padding zeros to the end of the buffer to make sure that the
+  // function will start on the correct byte alignment within the section.
+  OutputBuffer OB(*OutBuffer,
+                  TM.getTargetData()->getPointerSizeInBits() == 64,
+                  TM.getTargetData()->isLittleEndian());
+  OB.align(Align);
+  FnStart = OutBuffer->size();
+}
+
+/// finishFunction - This callback is invoked after the function is completely
+/// finished.
+bool ELFCodeEmitter::finishFunction(MachineFunction &F) {
+  // We now know the size of the function, add a symbol to represent it.
+  ELFWriter::ELFSym FnSym(F.getFunction());
+
+  // Figure out the binding (linkage) of the symbol.
+  switch (F.getFunction()->getLinkage()) {
+  default:
+    // appending linkage is illegal for functions.
+    assert(0 && "Unknown linkage type!");
+  case GlobalValue::ExternalLinkage:
+    FnSym.SetBind(ELFWriter::ELFSym::STB_GLOBAL);
+    break;
+  case GlobalValue::LinkOnceAnyLinkage:
+  case GlobalValue::LinkOnceODRLinkage:
+  case GlobalValue::WeakAnyLinkage:
+  case GlobalValue::WeakODRLinkage:
+    FnSym.SetBind(ELFWriter::ELFSym::STB_WEAK);
+    break;
+  case GlobalValue::PrivateLinkage:
+    assert (0 && "PrivateLinkage should not be in the symbol table.");
+  case GlobalValue::InternalLinkage:
+    FnSym.SetBind(ELFWriter::ELFSym::STB_LOCAL);
+    break;
+  }
+
+  ES->Size = OutBuffer->size();
+
+  FnSym.SetType(ELFWriter::ELFSym::STT_FUNC);
+  FnSym.SectionIdx = ES->SectionIdx;
+  FnSym.Value = FnStart;   // Value = Offset from start of Section.
+  FnSym.Size = OutBuffer->size()-FnStart;
+
+  // Finally, add it to the symtab.
+  EW.SymbolTable.push_back(FnSym);
+  return false;
+}
+
+} // end namespace llvm

Copied: projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h (from r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h	Thu Jun  4 06:30:38 2009	(r193430, copy of r193403, vendor/llvm/dist/lib/CodeGen/ELFCodeEmitter.h)
@@ -0,0 +1,87 @@
+//===-- lib/CodeGen/ELFCodeEmitter.h ----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef ELFCODEEMITTER_H
+#define ELFCODEEMITTER_H
+
+#include "ELFWriter.h"
+#include "llvm/CodeGen/MachineCodeEmitter.h"
+#include 
+
+namespace llvm {
+
+  /// ELFCodeEmitter - This class is used by the ELFWriter to 
+  /// emit the code for functions to the ELF file.
+  class ELFCodeEmitter : public MachineCodeEmitter {
+    ELFWriter &EW;
+    TargetMachine &TM;
+    ELFWriter::ELFSection *ES;  // Section to write to.
+    std::vector *OutBuffer;
+    size_t FnStart;
+  public:
+    explicit ELFCodeEmitter(ELFWriter &ew) : EW(ew), TM(EW.TM), OutBuffer(0) {}
+
+    void startFunction(MachineFunction &F);
+    bool finishFunction(MachineFunction &F);
+
+    void addRelocation(const MachineRelocation &MR) {
+      assert(0 && "relo not handled yet!");
+    }
+
+    virtual void StartMachineBasicBlock(MachineBasicBlock *MBB) {
+    }
+
+    virtual uintptr_t getConstantPoolEntryAddress(unsigned Index) const {
+      assert(0 && "CP not implementated yet!");
+      return 0;
+    }
+    virtual uintptr_t getJumpTableEntryAddress(unsigned Index) const {
+      assert(0 && "JT not implementated yet!");
+      return 0;
+    }
+
+    virtual uintptr_t getMachineBasicBlockAddress(MachineBasicBlock *MBB) const {
+      assert(0 && "JT not implementated yet!");
+      return 0;
+    }
+
+    virtual uintptr_t getLabelAddress(uint64_t Label) const {
+      assert(0 && "Label address not implementated yet!");
+      abort();
+      return 0;
+    }
+
+    virtual void emitLabel(uint64_t LabelID) {
+      assert(0 && "emit Label not implementated yet!");
+      abort();
+    }
+
+    virtual void setModuleInfo(llvm::MachineModuleInfo* MMI) { }
+
+    /// JIT SPECIFIC FUNCTIONS - DO NOT IMPLEMENT THESE HERE!
+    void startGVStub(const GlobalValue* F, unsigned StubSize,
+                     unsigned Alignment = 1) {
+      assert(0 && "JIT specific function called!");
+      abort();
+    }
+    void startGVStub(const GlobalValue* F,  void *Buffer, unsigned StubSize) {
+      assert(0 && "JIT specific function called!");
+      abort();
+    }
+    void *finishGVStub(const GlobalValue *F) {
+      assert(0 && "JIT specific function called!");
+      abort();
+      return 0;
+    }
+};  // end class ELFCodeEmitter
+
+} // end namespace llvm
+
+#endif
+

Modified: projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.cpp	Thu Jun  4 06:27:53 2009	(r193429)
+++ projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.cpp	Thu Jun  4 06:30:38 2009	(r193430)
@@ -32,6 +32,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ELFWriter.h"
+#include "ELFCodeEmitter.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/DerivedTypes.h"
@@ -61,149 +62,10 @@ MachineCodeEmitter *llvm::AddELFWriter(P
 }
 
 //===----------------------------------------------------------------------===//
-//                       ELFCodeEmitter Implementation
-//===----------------------------------------------------------------------===//
-
-namespace llvm {
-  /// ELFCodeEmitter - This class is used by the ELFWriter to emit the code for
-  /// functions to the ELF file.
-  class ELFCodeEmitter : public MachineCodeEmitter {
-    ELFWriter &EW;
-    TargetMachine &TM;
-    ELFWriter::ELFSection *ES;  // Section to write to.
-    std::vector *OutBuffer;
-    size_t FnStart;
-  public:
-    explicit ELFCodeEmitter(ELFWriter &ew) : EW(ew), TM(EW.TM), OutBuffer(0) {}
-
-    void startFunction(MachineFunction &F);
-    bool finishFunction(MachineFunction &F);
-
-    void addRelocation(const MachineRelocation &MR) {
-      assert(0 && "relo not handled yet!");
-    }
-    
-    virtual void StartMachineBasicBlock(MachineBasicBlock *MBB) {
-    }
-
-    virtual uintptr_t getConstantPoolEntryAddress(unsigned Index) const {
-      assert(0 && "CP not implementated yet!");
-      return 0;
-    }
-    virtual uintptr_t getJumpTableEntryAddress(unsigned Index) const {
-      assert(0 && "JT not implementated yet!");
-      return 0;
-    }
-
-    virtual uintptr_t getMachineBasicBlockAddress(MachineBasicBlock *MBB) const {
-      assert(0 && "JT not implementated yet!");
-      return 0;
-    }
-
-    virtual uintptr_t getLabelAddress(uint64_t Label) const {
-      assert(0 && "Label address not implementated yet!");
-      abort();
-      return 0;
-    }
-
-    virtual void emitLabel(uint64_t LabelID) {
-      assert(0 && "emit Label not implementated yet!");
-      abort();
-    }
-
-
-    virtual void setModuleInfo(llvm::MachineModuleInfo* MMI) { }
-
-
-    /// JIT SPECIFIC FUNCTIONS - DO NOT IMPLEMENT THESE HERE!
-    void startGVStub(const GlobalValue* F, unsigned StubSize,
-                     unsigned Alignment = 1) {
-      assert(0 && "JIT specific function called!");
-      abort();
-    }
-    void startGVStub(const GlobalValue* F,  void *Buffer, unsigned StubSize) {
-      assert(0 && "JIT specific function called!");
-      abort();
-    }
-    void *finishGVStub(const GlobalValue *F) {
-      assert(0 && "JIT specific function called!");
-      abort();
-      return 0;
-    }
-  };
-}
-
-/// startFunction - This callback is invoked when a new machine function is
-/// about to be emitted.
-void ELFCodeEmitter::startFunction(MachineFunction &F) {
-  // Align the output buffer to the appropriate alignment.

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

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 06:57:51 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3648F1065673;
	Thu,  4 Jun 2009 06:57:51 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25BA18FC12;
	Thu,  4 Jun 2009 06:57:51 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n546voDB080400;
	Thu, 4 Jun 2009 06:57:50 GMT (envelope-from jb@svn.freebsd.org)
Received: (from jb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n546voB2080396;
	Thu, 4 Jun 2009 06:57:50 GMT (envelope-from jb@svn.freebsd.org)
Message-Id: <200906040657.n546voB2080396@svn.freebsd.org>
From: John Birrell 
Date: Thu, 4 Jun 2009 06:57:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193431 - in projects/jbuild/usr.bin: jbuild/port
	jdirdep
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 06:57:51 -0000

Author: jb
Date: Thu Jun  4 06:57:50 2009
New Revision: 193431
URL: http://svn.freebsd.org/changeset/base/193431

Log:
  Add jcommit, a simple script that will run jbuild check-commit
  before committing.

Added:
  projects/jbuild/usr.bin/jdirdep/jcommit   (contents, props changed)
Modified:
  projects/jbuild/usr.bin/jbuild/port/Makefile
  projects/jbuild/usr.bin/jbuild/port/pkg-plist
  projects/jbuild/usr.bin/jdirdep/Buildfile

Modified: projects/jbuild/usr.bin/jbuild/port/Makefile
==============================================================================
--- projects/jbuild/usr.bin/jbuild/port/Makefile	Thu Jun  4 06:30:38 2009	(r193430)
+++ projects/jbuild/usr.bin/jbuild/port/Makefile	Thu Jun  4 06:57:50 2009	(r193431)
@@ -4,7 +4,7 @@
 #
 
 PORTNAME=      jbuild
-PORTVERSION=   10
+PORTVERSION=   11
 CATEGORIES=    devel
 
 MAINTAINER=    rodrigc@FreeBSD.org
@@ -22,6 +22,7 @@ do-install:
 	( cd ${WRKSRC}/filemon; ${MAKE} install KMODDIR=/boot/modules)
 	( cd ${WRKSRC}/jbuild; ${MAKE} install BINDIR=${PREFIX}/bin )
 	( cd ${WRKSRC}/jdirdep; ${MAKE} install BINDIR=${PREFIX}/bin )
+	cp ${WRKSRC}/jdirdep/jcommit ${PREFIX}/bin
 	cp ${WRKSRC}/jdirdep/jgetsrc ${PREFIX}/bin
 
 do-clean:

Modified: projects/jbuild/usr.bin/jbuild/port/pkg-plist
==============================================================================
--- projects/jbuild/usr.bin/jbuild/port/pkg-plist	Thu Jun  4 06:30:38 2009	(r193430)
+++ projects/jbuild/usr.bin/jbuild/port/pkg-plist	Thu Jun  4 06:57:50 2009	(r193431)
@@ -1,5 +1,6 @@
 bin/jbuild
 bin/jdirdep
+bin/jcommit
 bin/jgetsrc
 @cwd /boot/modules
 filemon.ko

Modified: projects/jbuild/usr.bin/jdirdep/Buildfile
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/Buildfile	Thu Jun  4 06:30:38 2009	(r193430)
+++ projects/jbuild/usr.bin/jdirdep/Buildfile	Thu Jun  4 06:57:50 2009	(r193431)
@@ -14,6 +14,8 @@ CFLAGS += -g
 STRIP =
 
 RELDIR = ${STAGEDIR}/usr/bin
-RELFILES = jgetsrc
+RELFILES = \
+	jcommit \
+	jgetsrc
 
 .include 

Added: projects/jbuild/usr.bin/jdirdep/jcommit
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/jbuild/usr.bin/jdirdep/jcommit	Thu Jun  4 06:57:50 2009	(r193431)
@@ -0,0 +1,14 @@
+#
+# $FreeBSD$
+#
+
+srcdir=`jbuild -V .SRCTOP test`
+
+jbuild check-commit
+if [ $? -ne 0 ]
+then
+	exit 1;
+fi
+echo $srcdir
+cd $srcdir
+svn commit

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 17:12:50 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93F781065770;
	Thu,  4 Jun 2009 17:12:50 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82A5A8FC1C;
	Thu,  4 Jun 2009 17:12:50 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54HCoVN098329;
	Thu, 4 Jun 2009 17:12:50 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54HConN098328;
	Thu, 4 Jun 2009 17:12:50 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906041712.n54HConN098328@svn.freebsd.org>
From: Sam Leffler 
Date: Thu, 4 Jun 2009 17:12:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193443 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 17:12:51 -0000

Author: sam
Date: Thu Jun  4 17:12:50 2009
New Revision: 193443
URL: http://svn.freebsd.org/changeset/base/193443

Log:
  o add list mesh
  o reduce list sta knowledge of  mesh

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Jun  4 16:50:03 2009	(r193442)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Jun  4 17:12:50 2009	(r193443)
@@ -3013,9 +3013,7 @@ printies(const u_int8_t *vp, int ielen, 
 				printssid(" MESHID", vp, 2+vp[1], maxcols);
 			break;
 		case IEEE80211_ELEMID_MESHCONF:
-			if (verbose)
-				printmeshconf(" MESHCONF", vp, 2+vp[1],
-				    maxcols);
+			printmeshconf(" MESHCONF", vp, 2+vp[1], maxcols);
 			break;
 		default:
 			if (verbose)
@@ -3187,20 +3185,6 @@ getrxseq(const struct ieee80211req_sta_i
 #undef IEEE80211_NODE_QOS
 }
 
-static const char *
-mesh_linkstate_string(uint8_t state)
-{
-	switch (state) {
-	case 0: return "IDLE";
-	case 1: return "OPEN SENT";
-	case 2: return "OPEN RECEIVED";
-	case 3: return "CONFIRM RECEIVED";
-	case 4: return "ESTABLISHED";
-	case 5: return "HOLDING";
-	default: return "UNKNOWN";
-	}
-}
-
 static void
 list_stations(int s)
 {
@@ -3260,10 +3244,94 @@ list_stations(int s)
 			, getflags(si->isi_state)
 		);
 		printies(cp + si->isi_ie_off, si->isi_ie_len, 24);
-		if (verbose && opmode == IEEE80211_M_MBSS)
-			printf(" MESHLINK", si->isi_peerid, si->isi_localid,
-			    mesh_linkstate_string(si->isi_peerstate));
+		printmimo(&si->isi_mimo);
+		printf("\n");
+		cp += si->isi_len, len -= si->isi_len;
+	} while (len >= sizeof(struct ieee80211req_sta_info));
+}
+
+static const char *
+mesh_linkstate_string(uint8_t state)
+{
+#define	N(a)	(sizeof(a) / sizeof(a[0]))
+	static const char *state_names[] = {
+	    [0] = "IDLE",
+	    [1] = "OPEN-TX",
+	    [2] = "OPEN-RX",
+	    [3] = "CONF-RX",
+	    [4] = "ESTAB",
+	    [5] = "HOLDING",
+	};
+
+	if (state >= N(state_names)) {
+		static char buf[10];
+		snprintf(buf, sizeof(buf), "#%u", state);
+		return buf;
+	} else
+		return state_names[state];
+#undef N
+}
+
+static void
+list_mesh(int s)
+{
+	union {
+		struct ieee80211req_sta_req req;
+		uint8_t buf[24*1024];
+	} u;
+	enum ieee80211_opmode opmode = get80211opmode(s);
+	const uint8_t *cp;
+	int len;
+
+	/* broadcast address =>'s get all stations */
+	(void) memset(u.req.is_u.macaddr, 0xff, IEEE80211_ADDR_LEN);
+	if (opmode == IEEE80211_M_STA) {
+		/*
+		 * Get information about the associated AP.
+		 */
+		(void) get80211(s, IEEE80211_IOC_BSSID,
+		    u.req.is_u.macaddr, IEEE80211_ADDR_LEN);
+	}
+	if (get80211len(s, IEEE80211_IOC_STA_INFO, &u, sizeof(u), &len) < 0)
+		errx(1, "unable to get station information");
+	if (len < sizeof(struct ieee80211req_sta_info))
+		return;
+
+	getchaninfo(s);
+
+	printf("%-17.17s %4s %5s %5s %7s %4s %4s %4s %6s %6s\n"
+		, "ADDR"
+		, "CHAN"
+		, "LOCAL"
+		, "PEER"
+		, "STATE"
+		, "RATE"
+		, "RSSI"
+		, "IDLE"
+		, "TXSEQ"
+		, "RXSEQ"
+	);
+	cp = (const uint8_t *) u.req.info;
+	do {
+		const struct ieee80211req_sta_info *si;
+
+		si = (const struct ieee80211req_sta_info *) cp;
+		if (si->isi_len < sizeof(*si))
+			break;
+		printf("%s %4d %5x %5x %7.7s %3dM %3.1f %4d %6d %6d"
+			, ether_ntoa((const struct ether_addr*) si->isi_macaddr)
+			, ieee80211_mhz2ieee(si->isi_freq, si->isi_flags)
+			, si->isi_localid
+			, si->isi_peerid
+			, mesh_linkstate_string(si->isi_peerstate)
+			, si->isi_txmbps/2
+			, si->isi_rssi/2.
+			, si->isi_inact
+			, gettxseq(si)
+			, getrxseq(si)
+		);
+		if (verbose)
+			printies(cp + si->isi_ie_off, si->isi_ie_len, 24);
 		printmimo(&si->isi_mimo);
 		printf("\n");
 		cp += si->isi_len, len -= si->isi_len;
@@ -3843,6 +3911,8 @@ DECL_CMD_FUNC(set80211list, arg, d)
 		list_regdomain(s, 1);
 	else if (iseq(arg, "countries"))
 		list_countries();
+	else if (iseq(arg, "mesh"))
+		list_mesh(s);
 	else
 		errx(1, "Don't know how to list %s for %s", arg, name);
 	LINE_BREAK();

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:03:03 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA02A106566B;
	Thu,  4 Jun 2009 18:03:03 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9C9A8FC16;
	Thu,  4 Jun 2009 18:03:03 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54I333e099478;
	Thu, 4 Jun 2009 18:03:03 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54I33LK099476;
	Thu, 4 Jun 2009 18:03:03 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906041803.n54I33LK099476@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 18:03:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193445 - projects/mesh11s/sys/dev/ath
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:03:04 -0000

Author: rpaulo
Date: Thu Jun  4 18:03:03 2009
New Revision: 193445
URL: http://svn.freebsd.org/changeset/base/193445

Log:
  Enable promisc filtering for MBSS. XXX need to think about this
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/dev/ath/if_ath.c

Modified: projects/mesh11s/sys/dev/ath/if_ath.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/if_ath.c	Thu Jun  4 17:55:42 2009	(r193444)
+++ projects/mesh11s/sys/dev/ath/if_ath.c	Thu Jun  4 18:03:03 2009	(r193445)
@@ -2374,7 +2374,7 @@ ath_calcrxfilter(struct ath_softc *sc)
 	    IEEE80211_IS_CHAN_ANYG(ic->ic_curchan))
 		rfilt |= HAL_RX_FILTER_BEACON;
 	if (ic->ic_opmode == IEEE80211_M_MBSS)
-		rfilt |= HAL_RX_FILTER_BEACON;
+		rfilt |= HAL_RX_FILTER_PROM | HAL_RX_FILTER_BEACON;
 	if (ic->ic_opmode == IEEE80211_M_MONITOR)
 		rfilt |= HAL_RX_FILTER_CONTROL;
 	DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x, %s if_flags 0x%x\n",

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:03:13 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9020C106564A;
	Thu,  4 Jun 2009 18:03:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F5958FC13;
	Thu,  4 Jun 2009 18:03:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54I3Dbx099516;
	Thu, 4 Jun 2009 18:03:13 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54I3DCG099513;
	Thu, 4 Jun 2009 18:03:13 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906041803.n54I3DCG099513@svn.freebsd.org>
From: Ed Schouten 
Date: Thu, 4 Jun 2009 18:03:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193446 - in projects/clangbsd:
	crypto/openssl/crypto/rc5 secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:03:13 -0000

Author: ed
Date: Thu Jun  4 18:03:13 2009
New Revision: 193446
URL: http://svn.freebsd.org/changeset/base/193446

Log:
  Allow us to build libcrypto with Clang.

Modified:
  projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
  projects/clangbsd/secure/lib/libcrypto/Makefile
  projects/clangbsd/secure/lib/libcrypto/Makefile.inc

Modified: projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
==============================================================================
--- projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:13 2009	(r193446)
@@ -73,7 +73,11 @@ extern "C" {
 #define RC5_DECRYPT	0
 
 /* 32 bit.  For Alpha, things may get weird */
+#ifdef __amd64__
+#define RC5_32_INT unsigned int
+#else
 #define RC5_32_INT unsigned long
+#endif
 
 #define RC5_32_BLOCK		8
 #define RC5_32_KEY_LENGTH	16 /* This is a default, max is 255 */

Modified: projects/clangbsd/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/clangbsd/secure/lib/libcrypto/Makefile	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/secure/lib/libcrypto/Makefile	Thu Jun  4 18:03:13 2009	(r193446)
@@ -3,12 +3,11 @@
 SHLIBDIR?=	/lib
 SUBDIR=		engines
 
+.include 
+
 LIB=		crypto
 SHLIB_MAJOR=	5
 
-# XXX: LLVM PR3678
-CFLAGS+=	-DOPENSSL_NO_INLINE_ASM
-
 NO_LINT=
 
 .if exists(Makefile.man)

Modified: projects/clangbsd/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/clangbsd/secure/lib/libcrypto/Makefile.inc	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/secure/lib/libcrypto/Makefile.inc	Thu Jun  4 18:03:13 2009	(r193446)
@@ -14,7 +14,7 @@ CFLAGS+=	-DOPENSSL_NO_IDEA
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -DL_ENDIAN
+CFLAGS+= -DL_ENDIAN -DMD32_REG_T=int
 .endif
 
 MANDIR=	${SHAREDIR}/openssl/man/man

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:24:48 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 448891065887;
	Thu,  4 Jun 2009 18:24:48 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3432F8FC12;
	Thu,  4 Jun 2009 18:24:48 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54IOmR5000288;
	Thu, 4 Jun 2009 18:24:48 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54IOmfY000287;
	Thu, 4 Jun 2009 18:24:48 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906041824.n54IOmfY000287@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 18:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193448 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:24:48 -0000

Author: rpaulo
Date: Thu Jun  4 18:24:47 2009
New Revision: 193448
URL: http://svn.freebsd.org/changeset/base/193448

Log:
  Remove padding from meshctl.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Jun  4 18:22:21 2009	(r193447)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Jun  4 18:24:47 2009	(r193448)
@@ -342,7 +342,6 @@ struct ieee80211_meshcntl {
 	uint8_t		mc_flags;
 	uint8_t		mc_ttl;
 	uint32_t	mc_seq;
-	uint16_t	_pad;
 	/* more mesh addresses follow */
 } __packed;
 

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:25:39 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67A08106566B;
	Thu,  4 Jun 2009 18:25:39 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 576EB8FC2A;
	Thu,  4 Jun 2009 18:25:39 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54IPdKX000362;
	Thu, 4 Jun 2009 18:25:39 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54IPdkt000361;
	Thu, 4 Jun 2009 18:25:39 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906041825.n54IPdkt000361@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 18:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193449 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:25:39 -0000

Author: rpaulo
Date: Thu Jun  4 18:25:39 2009
New Revision: 193449
URL: http://svn.freebsd.org/changeset/base/193449

Log:
  Add preqid to the fi structure.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun  4 18:24:47 2009	(r193448)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun  4 18:25:39 2009	(r193449)
@@ -38,7 +38,8 @@ struct ieee80211_hwmp_fi {
 	TAILQ_ENTRY(ieee80211_hwmp_fi) fi_next;
 	uint8_t		fi_dest[IEEE80211_ADDR_LEN];
 	ieee80211_seq	fi_seq;			/* HWMP sequence number */
-        uint8_t		fi_nexthop[IEEE80211_ADDR_LEN];
+	ieee80211_seq	fi_preqid;		/* Last PREQ ID seen */
+	uint8_t		fi_nexthop[IEEE80211_ADDR_LEN];
 	uint32_t	fi_metric;		/* Path Metric */
 	uint32_t	fi_nhops;		/* Number of Hops */
 	uint8_t		fi_prevhop[IEEE80211_ADDR_LEN];

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:27:17 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB7561065784;
	Thu,  4 Jun 2009 18:27:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AA59B8FC15;
	Thu,  4 Jun 2009 18:27:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54IRH1P000433;
	Thu, 4 Jun 2009 18:27:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54IRHq1000432;
	Thu, 4 Jun 2009 18:27:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906041827.n54IRHq1000432@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 18:27:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193450 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:27:18 -0000

Author: rpaulo
Date: Thu Jun  4 18:27:17 2009
New Revision: 193450
URL: http://svn.freebsd.org/changeset/base/193450

Log:
  Add more allocation handling code.
  Remove 'Step XX' from the comments.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 18:25:39 2009	(r193449)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 18:27:17 2009	(r193450)
@@ -125,6 +125,8 @@ static const uint8_t	proactiveaddr[IEEE8
 	{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 static const uint8_t	broadcastaddr[IEEE80211_ADDR_LEN] =
 	{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+static const uint8_t	invalidaddr[IEEE80211_ADDR_LEN] =
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0,
     "IEEE 802.11s HWMP parameters");
@@ -495,15 +497,24 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 	mtx_unlock(&hs->hs_lock);
 
 	/*
-	 * Step 1. Record the PREQ ID and the originator MAC address.
-	 */
-
-	/*
-	 * Step 2.
+	 * Record the PREQ ID and the originator MAC address.
 	 */
+	if (fi == NULL) {
+		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP,
+		    M_NOWAIT | M_ZERO);
+		memset(fi, 0, sizeof(*fi));
+		IEEE80211_ADDR_COPY(fi->fi_dest, preq->preq_origaddr);
+		fi->fi_seq = preq->preq_origseq;
+		fi->fi_metric = preq->preq_metric;
+		fi->fi_lifetime = preq->preq_lifetime;
+		mtx_lock(&hs->hs_lock);
+		TAILQ_INSERT_TAIL(&hs->hs_head, fi, fi_next);
+		mtx_unlock(&hs->hs_lock);
+	}
+	fi->fi_preqid = preq->preq_id;
 
 	/*
-	 * Step 3. Check if the PREQ is addressed to us.
+	 * Check if the PREQ is addressed to us.
 	 * XXX: check if this is part of a proxy address.
 	 */
 	if (IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0))) {
@@ -526,19 +537,26 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 		prep.prep_origseq = hs->hs_seq++;
 		/* XXX addr1 = next hop */
 		hwmp_send_prep(ni, vap->iv_myaddr, preq->preq_origaddr, &prep);
+		/*
+		 * Build the reverse path, if we don't have it already.
+		 */
+		if (fi == NULL ||
+		    memcmp(fi->fi_nexthop, invalidaddr, IEEE80211_ADDR_LEN)) {
+			ieee80211_hwmp_discover(vap, fi->fi_dest);
+		}
+
 		return;
 	}
 
-	/* XXX: Step 4. Check for AE bit and update proxy information */
+	/* XXX missing. Check for AE bit and update proxy information */
 
 	/*
-	 * Step 5. Intermediate reply for PREQs with 1 target.
+	 * Intermediate reply for PREQs with 1 target.
 	 */
 	if (preq->preq_ttl > 1 && preq->preq_tcount == 1 &&
 	    !(PREQ_TFLAGS(0) & IEEE80211_MESHPREQ_TFLAGS_TO)) {
 		struct ieee80211_meshpreq_ie ppreq; /* propagated PREQ */
 
-
 		memcpy(&ppreq, preq, sizeof(ppreq));
 		/*
 		 * Can we do an intermediate path reply?
@@ -597,14 +615,14 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 			    &ppreq);
 		}
 		/*
-		 * XXX: Step 6. Update the percursor table
+		 * XXX: Update the percursor table
 		 */
 		return;
 	}
 		
 
 	/*
-	 * XXX: Step 8. Proactive PREQ: reply with a proactive PREP to the
+	 * XXX: Proactive PREQ: reply with a proactive PREP to the
 	 * root STA if requested.
 	 */
 	if (IEEE80211_ADDR_EQ(PREQ_TADDR(0), proactiveaddr) &&
@@ -658,12 +676,12 @@ hwmp_recv_prep(struct ieee80211vap *vap,
 		return;
 
 	/*
-	 * Step 1: Update the Forwarding Information.
+	 * Update the Forwarding Information.
 	 */
 
 
 	/*
-	 * Step 2: If it's NOT for us, propagate the PREP if TTL is
+	 * If it's NOT for us, propagate the PREP if TTL is
 	 * greater than 1.
 	 */
 	if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, prep->prep_targetaddr) &&
@@ -677,18 +695,18 @@ hwmp_recv_prep(struct ieee80211vap *vap,
 		IEEE80211_ADDR_COPY(pprep.prep_origaddr, vap->iv_myaddr);
 		hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &pprep);
 		/*
-		 * XXX: Step 5: update the precursor list.
+		 * XXX: update the precursor list.
 		 */
 		return;
 	}
 
 	/*
-	 * XXX: Step 3: If it's for us and the AE bit is set, update the
+	 * XXX: If it's for us and the AE bit is set, update the
 	 * proxy information table.
 	 */
 
 	/*
-	 * XXX: Step 4: If it's NOT for us and the AE bit is set,
+	 * XXX: If it's NOT for us and the AE bit is set,
 	 * update the proxy information table.
 	 */
 
@@ -917,7 +935,7 @@ ieee80211_hwmp_discover(struct ieee80211
 		hwmp_send_preq(vap->iv_bss, vap->iv_myaddr, broadcastaddr,
 		    &preq);
 	} else 
-		return ieee80211_find_txnode(vap, fi->fi_nexthop);
+		return vap->iv_bss; //ieee80211_find_txnode(vap, fi->fi_nexthop);
 
 	return vap->iv_bss;
 }

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:27:54 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FE0310658DA;
	Thu,  4 Jun 2009 18:27:54 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04CCA8FC1F;
	Thu,  4 Jun 2009 18:27:54 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54IRrTH000483;
	Thu, 4 Jun 2009 18:27:53 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54IRrVs000480;
	Thu, 4 Jun 2009 18:27:53 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906041827.n54IRrVs000480@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 18:27:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193451 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:27:54 -0000

Author: rpaulo
Date: Thu Jun  4 18:27:53 2009
New Revision: 193451
URL: http://svn.freebsd.org/changeset/base/193451

Log:
  Rename meshframe struct.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.h
  projects/mesh11s/sys/net80211/ieee80211_input.c
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Thu Jun  4 18:27:53 2009	(r193451)
@@ -107,7 +107,7 @@ struct ieee80211_qosframe_addr4 {
 	uint8_t		i_qos[2];
 } __packed;
 
-struct ieee80211_meshqosframe_addr4 {
+struct ieee80211_meshframe {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];

Modified: projects/mesh11s/sys/net80211/ieee80211_input.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Jun  4 18:27:53 2009	(r193451)
@@ -225,7 +225,7 @@ ieee80211_deliver_data(struct ieee80211v
 struct mbuf *
 ieee80211_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen)
 {
-	struct ieee80211_meshqosframe_addr4 wh;	/* Max size address frames */
+	struct ieee80211_meshframe wh;	/* Max size address frames */
 	struct ether_header *eh;
 	struct llc *llc;
 

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:27:53 2009	(r193451)
@@ -1412,10 +1412,10 @@ ieee80211_encap(struct ieee80211vap *vap
 			M_SEQNO_SET(m, seqno);
 		}
 		if (vap->iv_opmode == IEEE80211_M_MBSS) {
-			struct ieee80211_meshqosframe_addr4 *mwh;
+			struct ieee80211_meshframe *mwh;
 			uint32_t seq;
 				
-			mwh = (struct ieee80211_meshqosframe_addr4 *)wh;
+			mwh = (struct ieee80211_meshframe *)wh;
 			mwh->i_mflags	= 0;	/* address extension bit */
 			mwh->i_mttl	= 160;
 			seq = ieee80211_mesh_getseq();

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:31:12 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E801A1065776;
	Thu,  4 Jun 2009 18:31:12 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D73628FC32;
	Thu,  4 Jun 2009 18:31:12 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54IVCR3000620;
	Thu, 4 Jun 2009 18:31:12 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54IVCh6000618;
	Thu, 4 Jun 2009 18:31:12 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906041831.n54IVCh6000618@svn.freebsd.org>
From: Sam Leffler 
Date: Thu, 4 Jun 2009 18:31:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193452 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 18:31:13 -0000

Author: sam
Date: Thu Jun  4 18:31:12 2009
New Revision: 193452
URL: http://svn.freebsd.org/changeset/base/193452

Log:
  avoid IEEE80211_F_DATAPAD as it requires hardware understanding of 11s
  headers, for now we will have to use s/w crypto; this fixes data frame
  crashes with ath caused by ieee80211_decap copying data over the stack
  due to hdr size being rounded for datapad requirements
  
  Reviewed by:	rpaulo

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 18:27:53 2009	(r193451)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 18:31:12 2009	(r193452)
@@ -232,7 +232,7 @@ mesh_input(struct ieee80211_node *ni, st
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
-	int hdrspace, need_tap;
+	int hdrlen, need_tap;
 	uint8_t dir, type, subtype, qos;
 
 	KASSERT(ni != NULL, ("null node"));
@@ -282,13 +282,14 @@ mesh_input(struct ieee80211_node *ni, st
 			    "peer link not yet established (%s)",
 			    nodemeshstates[ni->ni_mlstate]);
 		}	
-		hdrspace = ieee80211_hdrspace(ic, wh)
+		/* NB: not ieee80211_hdrspace, datapad is not honored */
+		hdrlen = ieee80211_hdrsize(wh)
 		    + sizeof(struct ieee80211_meshcntl);
-		if (m->m_len < hdrspace &&
-		    (m = m_pullup(m, hdrspace)) == NULL) {
+		if (m->m_len < hdrlen &&
+		    (m = m_pullup(m, hdrlen)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
-			    "data too short: expecting %u", hdrspace);
+			    "data too short: expecting %u", hdrlen);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
@@ -311,7 +312,7 @@ mesh_input(struct ieee80211_node *ni, st
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-			m = ieee80211_defrag(ni, m, hdrspace);
+			m = ieee80211_defrag(ni, m, hdrlen);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
@@ -324,7 +325,7 @@ mesh_input(struct ieee80211_node *ni, st
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
-		m = ieee80211_decap(vap, m, hdrspace);
+		m = ieee80211_decap(vap, m, hdrlen);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:27:53 2009	(r193451)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:31:12 2009	(r193452)
@@ -1282,18 +1282,24 @@ ieee80211_encap(struct ieee80211vap *vap
 	     !IEEE80211_ADDR_EQ(eh.ether_shost, vap->iv_myaddr));
 	if (is4addr)
 		hdrsize += IEEE80211_ADDR_LEN;
-	/*
-	 * All Mesh data frames have a Mesh Control field.
-	 */
-	if (vap->iv_opmode == IEEE80211_M_MBSS)
+	if (vap->iv_opmode == IEEE80211_M_MBSS) {
+		/*
+		 * Mesh data frames have a Mesh Control field.
+		 * XXX also cannot honor DATAPAD as this is used by
+		 * hardware and that hardware does not (yet) understand
+		 * 11s headers so will be confused.
+		 */
 		hdrsize += sizeof(struct ieee80211_meshcntl);
-	/*
-	 * Honor driver DATAPAD requirement.
-	 */
-	if (ic->ic_flags & IEEE80211_F_DATAPAD)
-		hdrspace = roundup(hdrsize, sizeof(uint32_t));
-	else
 		hdrspace = hdrsize;
+	} else {
+		/*
+		 * Honor driver DATAPAD requirement.
+		 */
+		if (ic->ic_flags & IEEE80211_F_DATAPAD)
+			hdrspace = roundup(hdrsize, sizeof(uint32_t));
+		else
+			hdrspace = hdrsize;
+	}
 
 	if (__predict_true((m->m_flags & M_FF) == 0)) {
 		/*

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 20:48:31 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADE10106566C;
	Thu,  4 Jun 2009 20:48:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BEBB8FC18;
	Thu,  4 Jun 2009 20:48:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KmVBK003534;
	Thu, 4 Jun 2009 20:48:31 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54KmVMP003533;
	Thu, 4 Jun 2009 20:48:31 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042048.n54KmVMP003533@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 4 Jun 2009 20:48:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193453 -
	projects/acpica_20090521/sys/contrib/dev/acpica/tables
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 20:48:32 -0000

Author: jkim
Date: Thu Jun  4 20:48:31 2009
New Revision: 193453
URL: http://svn.freebsd.org/changeset/base/193453

Log:
  Do not install SSDT when DSDT is overriden by user.

Modified:
  projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c

Modified: projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c
==============================================================================
--- projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c	Thu Jun  4 18:31:12 2009	(r193452)
+++ projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c	Thu Jun  4 20:48:31 2009	(r193453)
@@ -360,6 +360,21 @@ AcpiTbInstallTable (
         return;
     }
 
+    /* Skip SSDT when DSDT is overriden */
+
+    if (ACPI_COMPARE_NAME (MappedTable->Signature, ACPI_SIG_SSDT) &&
+       (AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Flags &
+            ACPI_TABLE_ORIGIN_OVERRIDE))
+    {
+        ACPI_INFO ((AE_INFO,
+            "%4.4s @ 0x%p Table override, replaced with:", ACPI_SIG_SSDT,
+            ACPI_CAST_PTR (void, Address)));
+        AcpiTbPrintTableHeader (
+            AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Address,
+            AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Pointer);
+        goto UnmapAndExit;
+    }
+
     /* If a particular signature is expected (DSDT/FACS), it must match */
 
     if (Signature &&

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 20:53:26 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B4CD1065677;
	Thu,  4 Jun 2009 20:53:26 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 897D18FC28;
	Thu,  4 Jun 2009 20:53:26 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KrQZT003655;
	Thu, 4 Jun 2009 20:53:26 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54KrQ9l003654;
	Thu, 4 Jun 2009 20:53:26 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042053.n54KrQ9l003654@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 4 Jun 2009 20:53:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193454 - projects/acpica_20090521/sys/dev/acpica/Osd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 20:53:27 -0000

Author: jkim
Date: Thu Jun  4 20:53:26 2009
New Revision: 193454
URL: http://svn.freebsd.org/changeset/base/193454

Log:
  Fix ACPI table override.  Since ACPI CA 20090123, any ACPI table can be
  overriden, not just DSDT.  However, we do not support this feature yet.

Modified:
  projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c

Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c
==============================================================================
--- projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 20:48:31 2009	(r193453)
+++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 20:53:26 2009	(r193454)
@@ -67,17 +67,30 @@ ACPI_STATUS
 AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
     ACPI_TABLE_HEADER **NewTable)
 {
-    caddr_t acpi_dsdt, p;
+    char modname[] = "acpi_dsdt";
+    caddr_t acpi_table, p, s;
 
     if (ExistingTable == NULL || NewTable == NULL)
 	return (AE_BAD_PARAMETER);
 
+#ifdef notyet
+    for (int i = 0; i < ACPI_NAME_SIZE; i++)
+	modname[i + 5] = tolower(ExistingTable->Signature[i]);
+#else
     /* If we're not overriding the DSDT, just return. */
-    if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL ||
-	(p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL) {
+    if (strncmp(ExistingTable->Signature, "DSDT", ACPI_NAME_SIZE) != 0) {
 	*NewTable = NULL;
-    } else
+	return (AE_OK);
+    }
+#endif
+
+    if ((acpi_table = preload_search_by_type(modname)) != NULL &&
+	(p = preload_search_info(acpi_table, MODINFO_ADDR)) != NULL &&
+	(s = preload_search_info(acpi_table, MODINFO_SIZE)) != NULL &&
+	*(size_t *)s != 0)
 	*NewTable = *(ACPI_TABLE_HEADER **)p;
+    else
+	*NewTable = NULL;
 
     return (AE_OK);
 }

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:01:04 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A11A106564A;
	Thu,  4 Jun 2009 21:01:04 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 589038FC23;
	Thu,  4 Jun 2009 21:01:04 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54L14CW003917;
	Thu, 4 Jun 2009 21:01:04 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54L14U2003916;
	Thu, 4 Jun 2009 21:01:04 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042101.n54L14U2003916@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 4 Jun 2009 21:01:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193455 - projects/acpica_20090521/sys/dev/acpica/Osd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:01:04 -0000

Author: jkim
Date: Thu Jun  4 21:01:04 2009
New Revision: 193455
URL: http://svn.freebsd.org/changeset/base/193455

Log:
  Prefer predefined DSDT signature from header file.

Modified:
  projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c

Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c
==============================================================================
--- projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 20:53:26 2009	(r193454)
+++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 21:01:04 2009	(r193455)
@@ -78,7 +78,7 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *E
 	modname[i + 5] = tolower(ExistingTable->Signature[i]);
 #else
     /* If we're not overriding the DSDT, just return. */
-    if (strncmp(ExistingTable->Signature, "DSDT", ACPI_NAME_SIZE) != 0) {
+    if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) {
 	*NewTable = NULL;
 	return (AE_OK);
     }

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:16:28 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7922610656AC;
	Thu,  4 Jun 2009 21:16:28 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 67A108FC1F;
	Thu,  4 Jun 2009 21:16:28 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54LGSOr004241;
	Thu, 4 Jun 2009 21:16:28 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54LGSU6004240;
	Thu, 4 Jun 2009 21:16:28 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042116.n54LGSU6004240@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 21:16:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193456 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:16:28 -0000

Author: rpaulo
Date: Thu Jun  4 21:16:28 2009
New Revision: 193456
URL: http://svn.freebsd.org/changeset/base/193456

Log:
  __pack the struct, not the array.
  
  Spotted by:	sam
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Jun  4 21:01:04 2009	(r193455)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Jun  4 21:16:28 2009	(r193456)
@@ -160,7 +160,7 @@ struct ieee80211_meshbeacont_ie {
 		uint8_t		mp_aid;		/* Least Octet of AID */
 		uint16_t	mp_btime;	/* Beacon Time */
 		uint16_t	mp_bint;	/* Beacon Interval */
-	} mp[1] __packed;			/* NB: variable size */
+	} __packed mp[1];			/* NB: variable size */
 } __packed;
 
 /* MDAOP Setup Request */
@@ -249,7 +249,7 @@ struct ieee80211_meshpreq_ie {
 #define	IEEE80211_MESHPREQ_TFLAGS_USN	0x04	/* Unknown HWMP seq number */
 		uint8_t		target_addr[IEEE80211_ADDR_LEN];
 		uint32_t	target_seq;	/* HWMP Sequence Number */
-	} preq_targets[1] __packed;	/* NB: variable size */
+	} __packed preq_targets[1];		/* NB: variable size */
 } __packed;
 
 /* Mesh Path Reply */
@@ -277,7 +277,7 @@ struct ieee80211_meshperr_ie {
 	struct {
 		uint8_t		dest_addr[IEEE80211_ADDR_LEN];
 		uint32_t	dest_seq;	/* HWMP Sequence Number */
-	} perr_dests[1] __packed;		/* NB: variable size */
+	} __packed perr_dests[1];		/* NB: variable size */
 } __packed;
 
 #ifdef notyet

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:21:16 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45846106566B;
	Thu,  4 Jun 2009 21:21:16 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 33BA78FC0A;
	Thu,  4 Jun 2009 21:21:16 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54LLG59004388;
	Thu, 4 Jun 2009 21:21:16 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54LLGIi004387;
	Thu, 4 Jun 2009 21:21:16 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <200906042121.n54LLGIi004387@svn.freebsd.org>
From: Craig Rodrigues 
Date: Thu, 4 Jun 2009 21:21:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193457 - projects/jbuild/usr.bin/jdirdep
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:21:16 -0000

Author: rodrigc
Date: Thu Jun  4 21:21:15 2009
New Revision: 193457
URL: http://svn.freebsd.org/changeset/base/193457

Log:
  Statically link, to eliminate dynamic link dependency on mysql client libs.
  
  Reviewed by:  jb

Modified:
  projects/jbuild/usr.bin/jdirdep/Makefile.common

Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/Makefile.common	Thu Jun  4 21:16:28 2009	(r193456)
+++ projects/jbuild/usr.bin/jdirdep/Makefile.common	Thu Jun  4 21:21:15 2009	(r193457)
@@ -15,4 +15,5 @@ MYSQL_CFLAGS != mysql_config --cflags
 MYSQL_LIBS != mysql_config --libs
 CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS}
 LDADD += ${MYSQL_LIBS}
+LDADD += -static
 .endif

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:24:33 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CACF31065670;
	Thu,  4 Jun 2009 21:24:33 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B951C8FC0C;
	Thu,  4 Jun 2009 21:24:33 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54LOX51004487;
	Thu, 4 Jun 2009 21:24:33 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54LOX2U004486;
	Thu, 4 Jun 2009 21:24:33 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042124.n54LOX2U004486@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 21:24:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193458 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:24:34 -0000

Author: rpaulo
Date: Thu Jun  4 21:24:33 2009
New Revision: 193458
URL: http://svn.freebsd.org/changeset/base/193458

Log:
  Add debugging.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 21:21:15 2009	(r193457)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 21:24:33 2009	(r193458)
@@ -196,7 +196,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 	    ("wrong category"));
 
 	while (efrm - frm > 1) {
-		IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
+		/*IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);*/
 		switch (*frm) {
 		case IEEE80211_ELEMID_MESHPREQ:
 			meshpreq = (struct ieee80211_meshpreq_ie *) frm;
@@ -486,8 +486,11 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 	 * forwarding is disabled, discard this PREQ.
 	 */
 	if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0)) &&
-	    !ieee80211_mesh_forwarding)
+	    !ieee80211_mesh_forwarding) {
+		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
+		    preq->preq_origaddr, NULL, "%s", "not accepting PREQ");
 		return;
+	}
 
 	mtx_lock(&hs->hs_lock);
 	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:31:04 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF128106566B;
	Thu,  4 Jun 2009 21:31:04 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B90098FC08;
	Thu,  4 Jun 2009 21:31:04 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54LV4aK004678;
	Thu, 4 Jun 2009 21:31:04 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54LV4ub004661;
	Thu, 4 Jun 2009 21:31:04 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042131.n54LV4ub004661@svn.freebsd.org>
From: Jung-uk Kim 
Date: Thu, 4 Jun 2009 21:31:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193459 - in projects/acpica_20090521: . lib/libusb
	sbin/ifconfig sys/cddl/contrib/opensolaris/uts/common/fs/zfs
	sys/dev/usb/wlan sys/dev/xen/netfront sys/dev/xen/xenpci
	sys/fs/devfs sy...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:31:05 -0000

Author: jkim
Date: Thu Jun  4 21:31:03 2009
New Revision: 193459
URL: http://svn.freebsd.org/changeset/base/193459

Log:
  Resync with head.

Modified:
  projects/acpica_20090521/   (props changed)
  projects/acpica_20090521/lib/libusb/   (props changed)
  projects/acpica_20090521/sbin/ifconfig/ifieee80211.c
  projects/acpica_20090521/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/acpica_20090521/sys/dev/usb/wlan/if_zyd.c
  projects/acpica_20090521/sys/dev/usb/wlan/if_zydreg.h
  projects/acpica_20090521/sys/dev/xen/netfront/   (props changed)
  projects/acpica_20090521/sys/dev/xen/xenpci/   (props changed)
  projects/acpica_20090521/sys/fs/devfs/devfs_vfsops.c
  projects/acpica_20090521/sys/kern/vfs_vnops.c
  projects/acpica_20090521/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/acpica_20090521/sys/modules/ip6_mroute_mod/   (props changed)
  projects/acpica_20090521/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/acpica_20090521/sys/modules/usb/zyd/Makefile
  projects/acpica_20090521/sys/net80211/ieee80211.h
  projects/acpica_20090521/sys/net80211/ieee80211_hostap.c
  projects/acpica_20090521/sys/net80211/ieee80211_input.c
  projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c
  projects/acpica_20090521/sys/net80211/ieee80211_output.c
  projects/acpica_20090521/sys/net80211/ieee80211_proto.c
  projects/acpica_20090521/sys/net80211/ieee80211_proto.h
  projects/acpica_20090521/sys/net80211/ieee80211_scan.h
  projects/acpica_20090521/sys/net80211/ieee80211_sta.c
  projects/acpica_20090521/sys/net80211/ieee80211_var.h
  projects/acpica_20090521/sys/netinet/ip_dummynet.h
  projects/acpica_20090521/sys/nlm/nlm_advlock.c
  projects/acpica_20090521/sys/rpc/clnt_dg.c
  projects/acpica_20090521/sys/rpc/clnt_vc.c
  projects/acpica_20090521/sys/rpc/svc.c
  projects/acpica_20090521/sys/rpc/svc.h
  projects/acpica_20090521/sys/rpc/svc_vc.c
  projects/acpica_20090521/sys/sys/mount.h
  projects/acpica_20090521/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/acpica_20090521/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/acpica_20090521/usr.sbin/makefs/getid.c   (props changed)

Modified: projects/acpica_20090521/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/acpica_20090521/sbin/ifconfig/ifieee80211.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sbin/ifconfig/ifieee80211.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -2888,7 +2888,7 @@ iename(int elemid)
 	case IEEE80211_ELEMID_TPCREQ:	return " TPCREQ";
 	case IEEE80211_ELEMID_TPCREP:	return " TPCREP";
 	case IEEE80211_ELEMID_SUPPCHAN:	return " SUPPCHAN";
-	case IEEE80211_ELEMID_CHANSWITCHANN:return " CSA";
+	case IEEE80211_ELEMID_CSA:	return " CSA";
 	case IEEE80211_ELEMID_MEASREQ:	return " MEASREQ";
 	case IEEE80211_ELEMID_MEASREP:	return " MEASREP";
 	case IEEE80211_ELEMID_QUIET:	return " QUIET";

Modified: projects/acpica_20090521/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- projects/acpica_20090521/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -573,6 +573,7 @@ zfs_domount(vfs_t *vfsp, char *osname)
 	vfsp->mnt_flag |= MNT_LOCAL;
 	vfsp->mnt_kern_flag |= MNTK_MPSAFE;
 	vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED;
+	vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES;
 
 	if (error = dsl_prop_get_integer(osname, "readonly", &readonly, NULL))
 		goto out;

Modified: projects/acpica_20090521/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- projects/acpica_20090521/sys/dev/usb/wlan/if_zyd.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/dev/usb/wlan/if_zyd.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -190,9 +190,10 @@ static int	zyd_al2210_set_channel(struct
 static int	zyd_gct_init(struct zyd_rf *);
 static int	zyd_gct_switch_radio(struct zyd_rf *, int);
 static int	zyd_gct_set_channel(struct zyd_rf *, uint8_t);
-static int	zyd_maxim_init(struct zyd_rf *);
-static int	zyd_maxim_switch_radio(struct zyd_rf *, int);
-static int	zyd_maxim_set_channel(struct zyd_rf *, uint8_t);
+static int	zyd_gct_mode(struct zyd_rf *);
+static int	zyd_gct_set_channel_synth(struct zyd_rf *, int, int);
+static int	zyd_gct_write(struct zyd_rf *, uint16_t);
+static int	zyd_gct_txgain(struct zyd_rf *, uint8_t);
 static int	zyd_maxim2_init(struct zyd_rf *);
 static int	zyd_maxim2_switch_radio(struct zyd_rf *, int);
 static int	zyd_maxim2_set_channel(struct zyd_rf *, uint8_t);
@@ -204,55 +205,59 @@ static const struct zyd_phy_pair zyd_def
 #define ZYD_ZD1211	0
 #define ZYD_ZD1211B	1
 
+#define	ZYD_ZD1211_DEV(v,p)	\
+	{ USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211) }
+#define	ZYD_ZD1211B_DEV(v,p)	\
+	{ USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211B) }
 static const struct usb_device_id zyd_devs[] = {
-    /* ZYD_ZD1211 */
-    {USB_VPI(USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL159G, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GD, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_1, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_2, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220, ZYD_ZD1211)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, ZYD_ZD1211)},
-    /* ZYD_ZD1211B */
-    {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SMCWUSBG, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A9T_WIFI, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050_V4000, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54L, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SNU5600, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG76NA, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_USR, USB_PRODUCT_USR_USR5423, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_VTECH, USB_PRODUCT_VTECH_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G202, ZYD_ZD1211B)},
-    {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2, ZYD_ZD1211B)},
+	/* ZYD_ZD1211 */
+	ZYD_ZD1211_DEV(3COM2, 3CRUSB10075),
+	ZYD_ZD1211_DEV(ABOCOM, WL54),
+	ZYD_ZD1211_DEV(ASUS, WL159G),
+	ZYD_ZD1211_DEV(CYBERTAN, TG54USB),
+	ZYD_ZD1211_DEV(DRAYTEK, VIGOR550),
+	ZYD_ZD1211_DEV(PLANEX2, GWUS54GD),
+	ZYD_ZD1211_DEV(PLANEX2, GWUS54GZL),
+	ZYD_ZD1211_DEV(PLANEX3, GWUS54GZ),
+	ZYD_ZD1211_DEV(PLANEX3, GWUS54MINI),
+	ZYD_ZD1211_DEV(SAGEM, XG760A),
+	ZYD_ZD1211_DEV(SENAO, NUB8301),
+	ZYD_ZD1211_DEV(SITECOMEU, WL113),
+	ZYD_ZD1211_DEV(SWEEX, ZD1211),
+	ZYD_ZD1211_DEV(TEKRAM, QUICKWLAN),
+	ZYD_ZD1211_DEV(TEKRAM, ZD1211_1),
+	ZYD_ZD1211_DEV(TEKRAM, ZD1211_2),
+	ZYD_ZD1211_DEV(TWINMOS, G240),
+	ZYD_ZD1211_DEV(UMEDIA, ALL0298V2),
+	ZYD_ZD1211_DEV(UMEDIA, TEW429UB_A),
+	ZYD_ZD1211_DEV(UMEDIA, TEW429UB),
+	ZYD_ZD1211_DEV(WISTRONNEWEB, UR055G),
+	ZYD_ZD1211_DEV(ZCOM, ZD1211),
+	ZYD_ZD1211_DEV(ZYDAS, ZD1211),
+	ZYD_ZD1211_DEV(ZYXEL, AG225H),
+	ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220),
+	ZYD_ZD1211_DEV(ZYXEL, G200V2),
+	/* ZYD_ZD1211B */
+	ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG),
+	ZYD_ZD1211B_DEV(ACCTON, ZD1211B),
+	ZYD_ZD1211B_DEV(ASUS, A9T_WIFI),
+	ZYD_ZD1211B_DEV(BELKIN, F5D7050_V4000),
+	ZYD_ZD1211B_DEV(BELKIN, ZD1211B),
+	ZYD_ZD1211B_DEV(CISCOLINKSYS, WUSBF54G),
+	ZYD_ZD1211B_DEV(FIBERLINE, WL430U),
+	ZYD_ZD1211B_DEV(MELCO, KG54L),
+	ZYD_ZD1211B_DEV(PHILIPS, SNU5600),
+	ZYD_ZD1211B_DEV(PLANEX2, GW_US54GXS),
+	ZYD_ZD1211B_DEV(SAGEM, XG76NA),
+	ZYD_ZD1211B_DEV(SITECOMEU, ZD1211B),
+	ZYD_ZD1211B_DEV(UMEDIA, TEW429UBC1),
+	ZYD_ZD1211B_DEV(USR, USR5423),
+	ZYD_ZD1211B_DEV(VTECH, ZD1211B),
+	ZYD_ZD1211B_DEV(ZCOM, ZD1211B),
+	ZYD_ZD1211B_DEV(ZYDAS, ZD1211B),
+	ZYD_ZD1211B_DEV(ZYXEL, M202),
+	ZYD_ZD1211B_DEV(ZYXEL, G202),
+	ZYD_ZD1211B_DEV(ZYXEL, G220V2)
 };
 
 static const struct usb_config zyd_config[ZYD_N_TRANSFER] = {
@@ -1417,11 +1422,14 @@ fail:
 static int
 zyd_gct_init(struct zyd_rf *rf)
 {
+#define	ZYD_GCT_INTR_REG	0x85c1
 #define N(a)	(sizeof(a) / sizeof((a)[0]))
 	struct zyd_softc *sc = rf->rf_sc;
 	static const struct zyd_phy_pair phyini[] = ZYD_GCT_PHY;
 	static const uint32_t rfini[] = ZYD_GCT_RF;
-	int i, error;
+	static const uint16_t vco[11][7] = ZYD_GCT_VCO;
+	int i, idx = -1, error;
+	uint16_t data;
 
 	/* init RF-dependent PHY registers */
 	for (i = 0; i < N(phyini); i++)
@@ -1432,122 +1440,153 @@ zyd_gct_init(struct zyd_rf *rf)
 		if ((error = zyd_rfwrite(sc, rfini[i])) != 0)
 			return (error);
 	}
+
+	error = zyd_gct_mode(rf);
+	if (error != 0)
+		return (error);
+
+	for (i = 0; i < N(vco) - 1; i++) {
+		error = zyd_gct_set_channel_synth(rf, 1, 0);
+		if (error != 0)
+			goto fail;
+		error = zyd_gct_write(rf, vco[i][0]);
+		if (error != 0)
+			goto fail;
+		zyd_write16_m(sc, ZYD_GCT_INTR_REG, 0xf);
+		zyd_read16_m(sc, ZYD_GCT_INTR_REG, &data);
+		if ((data & 0xf) == 0) {
+			idx = i;
+			break;
+		}
+	}
+	if (idx == -1) {
+		error = zyd_gct_set_channel_synth(rf, 1, 1);
+		if (error != 0)
+			goto fail;
+		error = zyd_gct_write(rf, 0x6662);
+		if (error != 0)
+			goto fail;
+	}
+
+	rf->idx = idx;
+	zyd_write16_m(sc, ZYD_CR203, 0x6);
 fail:
 	return (error);
 #undef N
+#undef ZYD_GCT_INTR_REG
 }
 
 static int
-zyd_gct_switch_radio(struct zyd_rf *rf, int on)
+zyd_gct_mode(struct zyd_rf *rf)
 {
-	/* vendor driver does nothing for this RF chip */
+#define N(a)	(sizeof(a) / sizeof((a)[0]))
+	struct zyd_softc *sc = rf->rf_sc;
+	static const uint32_t mode[] = {
+		0x25f98, 0x25f9a, 0x25f94, 0x27fd4
+	};
+	int i, error;
 
-	return (0);
+	for (i = 0; i < N(mode); i++) {
+		if ((error = zyd_rfwrite(sc, mode[i])) != 0)
+			break;
+	}
+	return (error);
+#undef N
 }
 
 static int
-zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan)
+zyd_gct_set_channel_synth(struct zyd_rf *rf, int chan, int acal)
 {
-	int error;
+	int error, idx = chan - 1;
 	struct zyd_softc *sc = rf->rf_sc;
-	static const uint32_t rfprog[] = ZYD_GCT_CHANTABLE;
+	static uint32_t acal_synth[] = ZYD_GCT_CHANNEL_ACAL;
+	static uint32_t std_synth[] = ZYD_GCT_CHANNEL_STD;
+	static uint32_t div_synth[] = ZYD_GCT_CHANNEL_DIV;
 
-	error = zyd_rfwrite(sc, 0x1c0000);
-	if (error != 0)
-		goto fail;
-	error = zyd_rfwrite(sc, rfprog[chan - 1]);
+	error = zyd_rfwrite(sc,
+	    (acal == 1) ? acal_synth[idx] : std_synth[idx]);
 	if (error != 0)
-		goto fail;
-	error = zyd_rfwrite(sc, 0x1c0008);
-fail:
-	return (error);
+		return (error);
+	return zyd_rfwrite(sc, div_synth[idx]);
 }
 
-/*
- * Maxim RF methods.
- */
 static int
-zyd_maxim_init(struct zyd_rf *rf)
+zyd_gct_write(struct zyd_rf *rf, uint16_t value)
 {
-#define N(a)	(sizeof(a) / sizeof((a)[0]))
 	struct zyd_softc *sc = rf->rf_sc;
-	static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY;
-	static const uint32_t rfini[] = ZYD_MAXIM_RF;
-	uint16_t tmp;
-	int i, error;
 
-	/* init RF-dependent PHY registers */
-	for (i = 0; i < N(phyini); i++)
-		zyd_write16_m(sc, phyini[i].reg, phyini[i].val);
-
-	zyd_read16_m(sc, ZYD_CR203, &tmp);
-	zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4));
-
-	/* init maxim radio */
-	for (i = 0; i < N(rfini); i++) {
-		if ((error = zyd_rfwrite(sc, rfini[i])) != 0)
-			return (error);
-	}
-	zyd_read16_m(sc, ZYD_CR203, &tmp);
-	zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4));
-fail:
-	return (error);
-#undef N
+	return zyd_rfwrite(sc, 0x300000 | 0x40000 | value);
 }
 
 static int
-zyd_maxim_switch_radio(struct zyd_rf *rf, int on)
+zyd_gct_switch_radio(struct zyd_rf *rf, int on)
 {
+#define N(a)	(sizeof(a) / sizeof((a)[0]))
+	int error;
+	struct zyd_softc *sc = rf->rf_sc;
 
-	/* vendor driver does nothing for this RF chip */
-	return (0);
+	error = zyd_rfwrite(sc, on ? 0x25f94 : 0x25f90);
+	if (error != 0)
+		return (error);
+
+	zyd_write16_m(sc, ZYD_CR11, on ? 0x00 : 0x04);
+	zyd_write16_m(sc, ZYD_CR251,
+	    on ? ((sc->sc_macrev == ZYD_ZD1211B) ? 0x7f : 0x3f) : 0x2f);
+fail:
+	return (error);
 }
 
 static int
-zyd_maxim_set_channel(struct zyd_rf *rf, uint8_t chan)
+zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan)
 {
 #define N(a)	(sizeof(a) / sizeof((a)[0]))
+	int error, i;
 	struct zyd_softc *sc = rf->rf_sc;
-	static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY;
-	static const uint32_t rfini[] = ZYD_MAXIM_RF;
-	static const struct {
-		uint32_t	r1, r2;
-	} rfprog[] = ZYD_MAXIM_CHANTABLE;
-	uint16_t tmp;
-	int i, error;
-
-	/*
-	 * Do the same as we do when initializing it, except for the channel
-	 * values coming from the two channel tables.
-	 */
-
-	/* init RF-dependent PHY registers */
-	for (i = 0; i < N(phyini); i++)
-		zyd_write16_m(sc, phyini[i].reg, phyini[i].val);
-
-	zyd_read16_m(sc, ZYD_CR203, &tmp);
-	zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4));
+	static const struct zyd_phy_pair cmd[] = {
+		{ ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, { ZYD_CR79, 0x58 },
+		{ ZYD_CR12, 0xf0 }, { ZYD_CR77, 0x1b }, { ZYD_CR78, 0x58 },
+	};
+	static const uint16_t vco[11][7] = ZYD_GCT_VCO;
 
-	/* first two values taken from the chantables */
-	error = zyd_rfwrite(sc, rfprog[chan - 1].r1);
+	error = zyd_gct_set_channel_synth(rf, chan, 0);
 	if (error != 0)
 		goto fail;
-	error = zyd_rfwrite(sc, rfprog[chan - 1].r2);
+	error = zyd_gct_write(rf, (rf->idx == -1) ? 0x6662 :
+	    vco[rf->idx][((chan - 1) / 2)]);
 	if (error != 0)
 		goto fail;
-
-	/* init maxim radio - skipping the two first values */
-	for (i = 2; i < N(rfini); i++) {
-		if ((error = zyd_rfwrite(sc, rfini[i])) != 0)
-			return (error);
-	}
-	zyd_read16_m(sc, ZYD_CR203, &tmp);
-	zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4));
+	error = zyd_gct_mode(rf);
+	if (error != 0)
+		return (error);
+	for (i = 0; i < N(cmd); i++)
+		zyd_write16_m(sc, cmd[i].reg, cmd[i].val);
+	error = zyd_gct_txgain(rf, chan);
+	if (error != 0)
+		return (error);
+	zyd_write16_m(sc, ZYD_CR203, 0x6);
 fail:
 	return (error);
 #undef N
 }
 
+static int
+zyd_gct_txgain(struct zyd_rf *rf, uint8_t chan)
+{
+#define N(a)	(sizeof(a) / sizeof((a)[0]))
+	struct zyd_softc *sc = rf->rf_sc;
+	static uint32_t txgain[] = ZYD_GCT_TXGAIN;
+	uint8_t idx = sc->sc_pwrint[chan - 1];
+
+	if (idx >= N(txgain)) {
+		device_printf(sc->sc_dev, "could not set TX gain (%d %#x)\n",
+		    chan, idx);
+		return 0;
+	}
+
+	return zyd_rfwrite(sc, 0x700000 | txgain[idx]);
+#undef N
+}
+
 /*
  * Maxim2 RF methods.
  */
@@ -1639,6 +1678,7 @@ zyd_rf_attach(struct zyd_softc *sc, uint
 	struct zyd_rf *rf = &sc->sc_rf;
 
 	rf->rf_sc = sc;
+	rf->update_pwr = 1;
 
 	switch (type) {
 	case ZYD_RF_RFMD:
@@ -1672,17 +1712,13 @@ zyd_rf_attach(struct zyd_softc *sc, uint
 		rf->set_channel  = zyd_al2210_set_channel;
 		rf->width        = 24;	/* 24-bit RF values */
 		break;
+	case ZYD_RF_MAXIM_NEW:
 	case ZYD_RF_GCT:
 		rf->init         = zyd_gct_init;
 		rf->switch_radio = zyd_gct_switch_radio;
 		rf->set_channel  = zyd_gct_set_channel;
-		rf->width        = 21;	/* 21-bit RF values */
-		break;
-	case ZYD_RF_MAXIM_NEW:
-		rf->init         = zyd_maxim_init;
-		rf->switch_radio = zyd_maxim_switch_radio;
-		rf->set_channel  = zyd_maxim_set_channel;
-		rf->width        = 18;	/* 18-bit RF values */
+		rf->width        = 24;	/* 24-bit RF values */
+		rf->update_pwr   = 0;
 		break;
 	case ZYD_RF_MAXIM_NEW2:
 		rf->init         = zyd_maxim2_init;
@@ -2062,16 +2098,21 @@ zyd_set_chan(struct zyd_softc *sc, struc
 	if (error != 0)
 		goto fail;
 
-	/* update Tx power */
-	zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]);
+	if (rf->update_pwr) {
+		/* update Tx power */
+		zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]);
 
-	if (sc->sc_macrev == ZYD_ZD1211B) {
-		zyd_write16_m(sc, ZYD_CR67, sc->sc_ofdm36_cal[chan - 1]);
-		zyd_write16_m(sc, ZYD_CR66, sc->sc_ofdm48_cal[chan - 1]);
-		zyd_write16_m(sc, ZYD_CR65, sc->sc_ofdm54_cal[chan - 1]);
-		zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]);
-		zyd_write16_m(sc, ZYD_CR69, 0x28);
-		zyd_write16_m(sc, ZYD_CR69, 0x2a);
+		if (sc->sc_macrev == ZYD_ZD1211B) {
+			zyd_write16_m(sc, ZYD_CR67,
+			    sc->sc_ofdm36_cal[chan - 1]);
+			zyd_write16_m(sc, ZYD_CR66,
+			    sc->sc_ofdm48_cal[chan - 1]);
+			zyd_write16_m(sc, ZYD_CR65,
+			    sc->sc_ofdm54_cal[chan - 1]);
+			zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]);
+			zyd_write16_m(sc, ZYD_CR69, 0x28);
+			zyd_write16_m(sc, ZYD_CR69, 0x2a);
+		}
 	}
 	if (sc->sc_cckgain) {
 		/* set CCK baseband gain from EEPROM */

Modified: projects/acpica_20090521/sys/dev/usb/wlan/if_zydreg.h
==============================================================================
--- projects/acpica_20090521/sys/dev/usb/wlan/if_zydreg.h	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/dev/usb/wlan/if_zydreg.h	Thu Jun  4 21:31:03 2009	(r193459)
@@ -840,82 +840,75 @@
 
 #define ZYD_GCT_PHY							\
 {									\
-	{ ZYD_CR47,  0x1e }, { ZYD_CR15, 0xdc }, { ZYD_CR113, 0xc0 },	\
-	{ ZYD_CR20,  0x0c }, { ZYD_CR17, 0x65 }, { ZYD_CR34,  0x04 },	\
-	{ ZYD_CR35,  0x35 }, { ZYD_CR24, 0x20 }, { ZYD_CR9,   0xe0 },	\
-	{ ZYD_CR127, 0x02 }, { ZYD_CR10, 0x91 }, { ZYD_CR23,  0x7f },	\
-	{ ZYD_CR27,  0x10 }, { ZYD_CR28, 0x7a }, { ZYD_CR79,  0xb5 },	\
-	{ ZYD_CR64,  0x80 }, { ZYD_CR33, 0x28 }, { ZYD_CR38,  0x30 }	\
+	{ ZYD_CR10,  0x89 }, { ZYD_CR15,  0x20 }, { ZYD_CR17,  0x28 },	\
+	{ ZYD_CR23,  0x38 }, { ZYD_CR24,  0x20 }, { ZYD_CR26,  0x93 },	\
+	{ ZYD_CR27,  0x15 }, { ZYD_CR28,  0x3e }, { ZYD_CR29,  0x00 },	\
+	{ ZYD_CR33,  0x28 }, { ZYD_CR34,  0x30 }, { ZYD_CR35,  0x43 },	\
+	{ ZYD_CR41,  0x24 }, { ZYD_CR44,  0x32 }, { ZYD_CR46,  0x92 },	\
+	{ ZYD_CR47,  0x1e }, { ZYD_CR48,  0x04 }, { ZYD_CR49,  0xfa },	\
+	{ ZYD_CR79,  0x58 }, { ZYD_CR80,  0x30 }, { ZYD_CR81,  0x30 },	\
+	{ ZYD_CR87,  0x0a }, { ZYD_CR89,  0x04 }, { ZYD_CR91,  0x00 },	\
+	{ ZYD_CR92,  0x0a }, { ZYD_CR98,  0x8d }, { ZYD_CR99,  0x28 },	\
+	{ ZYD_CR100, 0x02 }, { ZYD_CR101, 0x09 }, { ZYD_CR102, 0x27 },	\
+	{ ZYD_CR106, 0x1c }, { ZYD_CR107, 0x1c }, { ZYD_CR109, 0x13 },	\
+	{ ZYD_CR110, 0x1f }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x1f },	\
+	{ ZYD_CR113, 0x27 }, { ZYD_CR114, 0x23 }, { ZYD_CR115, 0x24 },	\
+	{ ZYD_CR116, 0x24 }, { ZYD_CR117, 0xfa }, { ZYD_CR118, 0xf0 },	\
+	{ ZYD_CR119, 0x1a }, { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x1f },	\
+	{ ZYD_CR122, 0xf0 }, { ZYD_CR123, 0x57 }, { ZYD_CR125, 0xad },	\
+	{ ZYD_CR126, 0x6c }, { ZYD_CR127, 0x03 }, { ZYD_CR128, 0x14 },	\
+	{ ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, { ZYD_CR137, 0x50 },	\
+	{ ZYD_CR138, 0xa8 }, { ZYD_CR144, 0xac }, { ZYD_CR146, 0x20 },	\
+	{ ZYD_CR252, 0xff }, { ZYD_CR253, 0xff }			\
 }
 
 #define ZYD_GCT_RF							\
 {									\
-	0x1f0000, 0x1f0000, 0x1f0200, 0x1f0600, 0x1f8600, 0x1f8600,	\
-	0x002050, 0x1f8000, 0x1f8200, 0x1f8600, 0x1c0000, 0x10c458,	\
-	0x088e92, 0x187b82, 0x0401b4, 0x140816, 0x0c7000, 0x1c0000,	\
-	0x02ccae, 0x128023, 0x0a0000, 0x1a0000, 0x06e380, 0x16cb94,	\
-	0x0e1740, 0x014980, 0x116240, 0x090000, 0x192304, 0x05112f,	\
-	0x0d54a8, 0x0f8000, 0x1c0008, 0x1c0000, 0x1a0000, 0x1c0008,	\
-	0x150000, 0x0c7000, 0x150800, 0x150000				\
+	0x40002b, 0x519e4f, 0x6f81ad, 0x73fffe, 0x25f9c, 0x100047,	\
+	0x200999, 0x307602, 0x346063,					\
 }
 
-#define ZYD_GCT_CHANTABLE						\
+#define	ZYD_GCT_VCO							\
 {									\
-	0x1a0000, 0x1a8000, 0x1a4000, 0x1ac000,	0x1a2000, 0x1aa000,	\
-	0x1a6000, 0x1ae000, 0x1a1000, 0x1a9000, 0x1a5000, 0x1ad000,	\
-	0x1a3000, 0x1ab000						\
+	{ 0x664d, 0x604d, 0x6675, 0x6475, 0x6655, 0x6455, 0x6665 },	\
+	{ 0x666d, 0x606d, 0x664d, 0x644d, 0x6675, 0x6475, 0x6655 },	\
+	{ 0x665d, 0x605d, 0x666d, 0x646d, 0x664d, 0x644d, 0x6675 },	\
+	{ 0x667d, 0x607d, 0x665d, 0x645d, 0x666d, 0x646d, 0x664d },	\
+	{ 0x6643, 0x6043, 0x667d, 0x647d, 0x665d, 0x645d, 0x666d },	\
+	{ 0x6663, 0x6063, 0x6643, 0x6443, 0x667d, 0x647d, 0x665d },	\
+	{ 0x6653, 0x6053, 0x6663, 0x6463, 0x6643, 0x6443, 0x667d },	\
+	{ 0x6673, 0x6073, 0x6653, 0x6453, 0x6663, 0x6463, 0x6643 },	\
+	{ 0x664b, 0x604b, 0x6673, 0x6473, 0x6653, 0x6453, 0x6663 },	\
+	{ 0x666b, 0x606b, 0x664b, 0x644b, 0x6673, 0x6473, 0x6653 },	\
+	{ 0x665b, 0x605b, 0x666b, 0x646b, 0x664b, 0x644b, 0x6673 }	\
 }
 
-#define ZYD_MAXIM_PHY							\
+#define	ZYD_GCT_TXGAIN							\
 {									\
-	{ ZYD_CR23,  0x40 }, { ZYD_CR15,  0x20 }, { ZYD_CR28,  0x3e },	\
-	{ ZYD_CR29,  0x00 }, { ZYD_CR26,  0x11 }, { ZYD_CR44,  0x33 },	\
-	{ ZYD_CR106, 0x2a }, { ZYD_CR107, 0x1a }, { ZYD_CR109, 0x2b },	\
-	{ ZYD_CR110, 0x2b }, { ZYD_CR111, 0x2b }, { ZYD_CR112, 0x2b },	\
-	{ ZYD_CR10,  0x89 }, { ZYD_CR17,  0x20 }, { ZYD_CR26,  0x93 },	\
-	{ ZYD_CR34,  0x30 }, { ZYD_CR35,  0x40 }, { ZYD_CR41,  0x24 },	\
-	{ ZYD_CR44,  0x32 }, { ZYD_CR46,  0x90 }, { ZYD_CR89,  0x18 },	\
-	{ ZYD_CR92,  0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 },	\
-	{ ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x09 },	\
-	{ ZYD_CR110, 0x13 }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x13 },	\
-	{ ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 },	\
-	{ ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0xfa },	\
-	{ ZYD_CR120, 0x4f }, { ZYD_CR121, 0x77 }, { ZYD_CR122, 0xfe },	\
-	{ ZYD_CR10,  0x89 }, { ZYD_CR17,  0x20 }, { ZYD_CR26,  0x93 },	\
-	{ ZYD_CR34,  0x30 }, { ZYD_CR35,  0x40 }, { ZYD_CR41,  0x24 },	\
-	{ ZYD_CR44,  0x32 }, { ZYD_CR46,  0x90 }, { ZYD_CR89,  0x18 },	\
-	{ ZYD_CR92,  0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 },	\
-	{ ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x13 },	\
-	{ ZYD_CR110, 0x27 }, { ZYD_CR111, 0x27 }, { ZYD_CR112, 0x13 },	\
-	{ ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 },	\
-	{ ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0x00 },	\
-	{ ZYD_CR120, 0x4f }, { ZYD_CR121, 0x06 }, { ZYD_CR122, 0xfe },	\
-	{ ZYD_CR150, 0x0d }						\
+	0x0e313, 0x0fb13, 0x0e093, 0x0f893, 0x0ea93, 0x1f093, 0x1f493,	\
+	0x1f693, 0x1f393, 0x1f35b, 0x1e6db, 0x1ff3f, 0x1ffff, 0x361d7,	\
+	0x37fbf, 0x3ff8b, 0x3ff33, 0x3fb3f, 0x3ffff			\
 }
 
-#define ZYD_MAXIM_RF							\
+#define	ZYD_GCT_CHANNEL_ACAL						\
 {									\
-	0x00ccd4, 0x030a03, 0x000400, 0x000ca1, 0x010072, 0x018645,	\
-	0x004006, 0x0000a7, 0x008258, 0x003fc9, 0x00040a, 0x00000b,	\
-	0x00026c							\
+	0x106847, 0x106847, 0x106867, 0x106867, 0x106867, 0x106867,	\
+	0x106857, 0x106857, 0x106857, 0x106857, 0x106877, 0x106877,	\
+	0x106877, 0x10684f						\
 }
 
-#define ZYD_MAXIM_CHANTABLE	\
-{				\
-	{ 0x0ccd4, 0x30a03 },	\
-	{ 0x22224, 0x00a13 },	\
-	{ 0x37774, 0x10a13 },	\
-	{ 0x0ccd4, 0x30a13 },	\
-	{ 0x22224, 0x00a23 },	\
-	{ 0x37774, 0x10a23 },	\
-	{ 0x0ccd4, 0x30a23 },	\
-	{ 0x22224, 0x00a33 },	\
-	{ 0x37774, 0x10a33 },	\
-	{ 0x0ccd4, 0x30a33 },	\
-	{ 0x22224, 0x00a43 },	\
-	{ 0x37774, 0x10a43 },	\
-	{ 0x0ccd4, 0x30a43 },	\
-	{ 0x199a4, 0x20a53 }	\
+#define	ZYD_GCT_CHANNEL_STD						\
+{									\
+	0x100047, 0x100047, 0x100067, 0x100067, 0x100067, 0x100067,	\
+	0x100057, 0x100057, 0x100057, 0x100057, 0x100077, 0x100077,	\
+	0x100077, 0x10004f						\
+}
+
+#define	ZYD_GCT_CHANNEL_DIV						\
+{									\
+	0x200999, 0x20099b, 0x200998, 0x20099a, 0x200999, 0x20099b,	\
+	0x200998, 0x20099a, 0x200999, 0x20099b, 0x200998, 0x20099a,	\
+	0x200999, 0x200ccc						\
 }
 
 #define ZYD_MAXIM2_PHY							\
@@ -1226,6 +1219,8 @@ struct zyd_rf {
 	/* RF attributes */
 	struct zyd_softc	*rf_sc;	/* back-pointer */
 	int			width;
+	int			idx;	/* for GIT RF */
+	int			update_pwr;
 };
 
 struct zyd_rq {

Modified: projects/acpica_20090521/sys/fs/devfs/devfs_vfsops.c
==============================================================================
--- projects/acpica_20090521/sys/fs/devfs/devfs_vfsops.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/fs/devfs/devfs_vfsops.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -34,6 +34,8 @@
  * $FreeBSD$
  */
 
+#include "opt_mac.h"		/* To set MNT_MULTILABEL. */
+
 #include 
 #include 
 #include 

Modified: projects/acpica_20090521/sys/kern/vfs_vnops.c
==============================================================================
--- projects/acpica_20090521/sys/kern/vfs_vnops.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/kern/vfs_vnops.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -367,7 +367,7 @@ vn_rdwr(rw, vp, base, len, offset, segfl
 	struct iovec aiov;
 	struct mount *mp;
 	struct ucred *cred;
-	int error;
+	int error, lock_flags;
 
 	VFS_ASSERT_GIANT(vp->v_mount);
 
@@ -378,7 +378,13 @@ vn_rdwr(rw, vp, base, len, offset, segfl
 			    (error = vn_start_write(vp, &mp, V_WAIT | PCATCH))
 			    != 0)
 				return (error);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+			if (mp != NULL &&
+			    (mp->mnt_kern_flag & MNTK_SHARED_WRITES)) {
+				lock_flags = LK_SHARED;
+			} else {
+				lock_flags = LK_EXCLUSIVE;
+			}
+			vn_lock(vp, lock_flags | LK_RETRY);
 		} else
 			vn_lock(vp, LK_SHARED | LK_RETRY);
 
@@ -564,7 +570,7 @@ vn_write(fp, uio, active_cred, flags, td
 {
 	struct vnode *vp;
 	struct mount *mp;
-	int error, ioflag;
+	int error, ioflag, lock_flags;
 	int vfslocked;
 
 	KASSERT(uio->uio_td == td, ("uio_td %p is not td %p",
@@ -587,7 +593,15 @@ vn_write(fp, uio, active_cred, flags, td
 	if (vp->v_type != VCHR &&
 	    (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto unlock;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ 
+	if (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) &&
+	    (flags & FOF_OFFSET) != 0) {
+		lock_flags = LK_SHARED;
+	} else {
+		lock_flags = LK_EXCLUSIVE;
+	}
+
+	vn_lock(vp, lock_flags | LK_RETRY);
 	if ((flags & FOF_OFFSET) == 0)
 		uio->uio_offset = fp->f_offset;
 	ioflag |= sequential_heuristic(uio, fp);

Modified: projects/acpica_20090521/sys/modules/usb/zyd/Makefile
==============================================================================
--- projects/acpica_20090521/sys/modules/usb/zyd/Makefile	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/modules/usb/zyd/Makefile	Thu Jun  4 21:31:03 2009	(r193459)
@@ -31,6 +31,6 @@ S=	${.CURDIR}/../../..
 
 KMOD=	if_zyd
 SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
-	if_zyd.c
+	if_zyd.c if_zydreg.h if_zydfw.h
 
 .include 

Modified: projects/acpica_20090521/sys/net80211/ieee80211.h
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211.h	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211.h	Thu Jun  4 21:31:03 2009	(r193459)
@@ -686,7 +686,7 @@ enum {
 	IEEE80211_ELEMID_TPCREQ		= 34,
 	IEEE80211_ELEMID_TPCREP		= 35,
 	IEEE80211_ELEMID_SUPPCHAN	= 36,
-	IEEE80211_ELEMID_CHANSWITCHANN	= 37,
+	IEEE80211_ELEMID_CSA		= 37,
 	IEEE80211_ELEMID_MEASREQ	= 38,
 	IEEE80211_ELEMID_MEASREP	= 39,
 	IEEE80211_ELEMID_QUIET		= 40,
@@ -736,6 +736,14 @@ struct ieee80211_csa_ie {
 	uint8_t		csa_count;		/* Channel Switch Count */
 } __packed;
 
+/*
+ * Note the min acceptable CSA count is used to guard against
+ * malicious CSA injection in station mode.  Defining this value
+ * as other than 0 violates the 11h spec.
+ */
+#define	IEEE80211_CSA_COUNT_MIN	2
+#define	IEEE80211_CSA_COUNT_MAX	255
+
 /* rate set entries are in .5 Mb/s units, and potentially marked as basic */
 #define	IEEE80211_RATE_BASIC		0x80
 #define	IEEE80211_RATE_VAL		0x7f

Modified: projects/acpica_20090521/sys/net80211/ieee80211_hostap.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_hostap.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_hostap.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -114,6 +114,41 @@ sta_disassoc(void *arg, struct ieee80211
 	}
 }
 
+static void
+sta_csa(void *arg, struct ieee80211_node *ni)
+{
+	struct ieee80211vap *vap = arg;
+
+	if (ni->ni_vap == vap && ni->ni_associd != 0)
+		if (ni->ni_inact > vap->iv_inact_init) {
+			ni->ni_inact = vap->iv_inact_init;
+			IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni,
+			    "%s: inact %u", __func__, ni->ni_inact);
+		}
+}
+
+static void
+sta_drop(void *arg, struct ieee80211_node *ni)
+{
+	struct ieee80211vap *vap = arg;
+
+	if (ni->ni_vap == vap && ni->ni_associd != 0)
+		ieee80211_node_leave(ni);
+}
+
+/*
+ * Does a channel change require associated stations to re-associate
+ * so protocol state is correct.  This is used when doing CSA across
+ * bands or similar (e.g. HT -> legacy).
+ */
+static int
+isbandchange(struct ieee80211com *ic)
+{
+	return ((ic->ic_bsschan->ic_flags ^ ic->ic_csa_newchan->ic_flags) &
+	    (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_HALF |
+	     IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HT)) != 0;
+}
+
 /*
  * IEEE80211_M_HOSTAP vap state machine handler.
  */
@@ -249,6 +284,11 @@ hostap_newstate(struct ieee80211vap *vap
 			/* fall thru... */
 		case IEEE80211_S_CSA:
 			/*
+			 * Shorten inactivity timer of associated stations
+			 * to weed out sta's that don't follow a CSA.
+			 */
+			ieee80211_iterate_nodes(&ic->ic_sta, sta_csa, vap);
+			/*
 			 * Update bss node channel to reflect where
 			 * we landed after CSA.
 			 */
@@ -289,6 +329,18 @@ hostap_newstate(struct ieee80211vap *vap
 		}
 		ieee80211_node_authorize(vap->iv_bss);
 		break;
+	case IEEE80211_S_CSA:
+		if (ostate == IEEE80211_S_RUN && isbandchange(ic)) {
+			/*
+			 * On a ``band change'' silently drop associated
+			 * stations as they must re-associate before they
+			 * can pass traffic (as otherwise protocol state
+			 * such as capabilities and the negotiated rate
+			 * set may/will be wrong).
+			 */
+			ieee80211_iterate_nodes(&ic->ic_sta, sta_drop, vap);
+		}
+		break;
 	default:
 		break;
 	}

Modified: projects/acpica_20090521/sys/net80211/ieee80211_input.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_input.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_input.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -475,6 +475,7 @@ ieee80211_parse_beacon(struct ieee80211_
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 *	[tlv] country information
+	 *	[tlv] channel switch announcement (CSA)
 	 *	[tlv] parameter set (FH/DS)
 	 *	[tlv] erp information
 	 *	[tlv] extended supported rates
@@ -508,6 +509,9 @@ ieee80211_parse_beacon(struct ieee80211_
 		case IEEE80211_ELEMID_COUNTRY:
 			scan->country = frm;
 			break;
+		case IEEE80211_ELEMID_CSA:
+			scan->csa = frm;
+			break;
 		case IEEE80211_ELEMID_FHPARMS:
 			if (ic->ic_phytype == IEEE80211_T_FH) {
 				scan->fhdwell = LE_READ_2(&frm[2]);
@@ -642,6 +646,14 @@ ieee80211_parse_beacon(struct ieee80211_
 		IEEE80211_VERIFY_LENGTH(scan->country[1], 3 * sizeof(uint8_t),
 		    scan->country = NULL);
 	}
+	if (scan->csa != NULL) {
+		/*
+		 * Validate Channel Switch Announcement; this must
+		 * be the correct length or we toss the frame.
+		 */
+		IEEE80211_VERIFY_LENGTH(scan->csa[1], 3 * sizeof(uint8_t),
+		    scan->status |= IEEE80211_BPARSE_CSA_INVALID);
+	}
 	/*
 	 * Process HT ie's.  This is complicated by our
 	 * accepting both the standard ie's and the pre-draft

Modified: projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -2304,8 +2304,10 @@ ieee80211_ioctl_chanswitch(struct ieee80
 	error = copyin(ireq->i_data, &csr, sizeof(csr));
 	if (error != 0)
 		return error;
-	if ((vap->iv_flags & IEEE80211_F_DOTH) == 0)
-		return EINVAL;
+	/* XXX adhoc mode not supported */
+	if (vap->iv_opmode != IEEE80211_M_HOSTAP ||
+	    (vap->iv_flags & IEEE80211_F_DOTH) == 0)
+		return EOPNOTSUPP;
 	c = ieee80211_find_channel(ic,
 	    csr.csa_chan.ic_freq, csr.csa_chan.ic_flags);
 	if (c == NULL)
@@ -2313,6 +2315,8 @@ ieee80211_ioctl_chanswitch(struct ieee80
 	IEEE80211_LOCK(ic);
 	if ((ic->ic_flags & IEEE80211_F_CSAPENDING) == 0)
 		ieee80211_csa_startswitch(ic, c, csr.csa_mode, csr.csa_count);
+	else if (csr.csa_count == 0)
+		ieee80211_csa_cancelswitch(ic);
 	else
 		error = EBUSY;
 	IEEE80211_UNLOCK(ic);

Modified: projects/acpica_20090521/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_output.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_output.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -1468,7 +1468,7 @@ ieee80211_add_csa(uint8_t *frm, struct i
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_csa_ie *csa = (struct ieee80211_csa_ie *) frm;
 
-	csa->csa_ie = IEEE80211_ELEMID_CHANSWITCHANN;
+	csa->csa_ie = IEEE80211_ELEMID_CSA;
 	csa->csa_len = 3;
 	csa->csa_mode = 1;		/* XXX force quiet on channel */
 	csa->csa_newchan = ieee80211_chan2ieee(ic, ic->ic_csa_newchan);

Modified: projects/acpica_20090521/sys/net80211/ieee80211_proto.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_proto.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_proto.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -1374,7 +1374,7 @@ beacon_miss(void *arg, int npending)
 		 * handlers duplicating these checks.
 		 */
 		if (vap->iv_opmode == IEEE80211_M_STA &&
-		    vap->iv_state == IEEE80211_S_RUN &&
+		    vap->iv_state >= IEEE80211_S_RUN &&
 		    vap->iv_bmiss != NULL)
 			vap->iv_bmiss(vap);
 	}
@@ -1451,8 +1451,8 @@ ieee80211_csa_startswitch(struct ieee802
 	IEEE80211_LOCK_ASSERT(ic);
 
 	ic->ic_csa_newchan = c;
+	ic->ic_csa_mode = mode;
 	ic->ic_csa_count = count;
-	/* XXX record mode? */
 	ic->ic_flags |= IEEE80211_F_CSAPENDING;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
@@ -1465,6 +1465,19 @@ ieee80211_csa_startswitch(struct ieee802
 	ieee80211_notify_csa(ic, c, mode, count);
 }
 
+static void
+csa_completeswitch(struct ieee80211com *ic)
+{
+	struct ieee80211vap *vap;
+
+	ic->ic_csa_newchan = NULL;
+	ic->ic_flags &= ~IEEE80211_F_CSAPENDING;
+
+	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
+		if (vap->iv_state == IEEE80211_S_CSA)
+			ieee80211_new_state_locked(vap, IEEE80211_S_RUN, 0);
+}
+
 /*
  * Complete an 802.11h channel switch started by ieee80211_csa_startswitch.
  * We clear state and move all vap's in CSA state to RUN state
@@ -1473,19 +1486,25 @@ ieee80211_csa_startswitch(struct ieee802
 void
 ieee80211_csa_completeswitch(struct ieee80211com *ic)
 {
-	struct ieee80211vap *vap;
-
 	IEEE80211_LOCK_ASSERT(ic);
 
 	KASSERT(ic->ic_flags & IEEE80211_F_CSAPENDING, ("csa not pending"));
 
 	ieee80211_setcurchan(ic, ic->ic_csa_newchan);
-	ic->ic_csa_newchan = NULL;
-	ic->ic_flags &= ~IEEE80211_F_CSAPENDING;
+	csa_completeswitch(ic);
+}
 
-	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
-		if (vap->iv_state == IEEE80211_S_CSA)
-			ieee80211_new_state_locked(vap, IEEE80211_S_RUN, 0);
+/*
+ * Cancel an 802.11h channel switch started by ieee80211_csa_startswitch.
+ * We clear state and move all vap's in CSA state to RUN state
+ * so they can again transmit.
+ */
+void
+ieee80211_csa_cancelswitch(struct ieee80211com *ic)
+{
+	IEEE80211_LOCK_ASSERT(ic);
+
+	csa_completeswitch(ic);
 }
 
 /*

Modified: projects/acpica_20090521/sys/net80211/ieee80211_proto.h
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_proto.h	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_proto.h	Thu Jun  4 21:31:03 2009	(r193459)
@@ -340,6 +340,7 @@ int	ieee80211_beacon_update(struct ieee8
 void	ieee80211_csa_startswitch(struct ieee80211com *,
 		struct ieee80211_channel *, int mode, int count);
 void	ieee80211_csa_completeswitch(struct ieee80211com *);
+void	ieee80211_csa_cancelswitch(struct ieee80211com *);
 void	ieee80211_cac_completeswitch(struct ieee80211vap *);
 
 /*

Modified: projects/acpica_20090521/sys/net80211/ieee80211_scan.h
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_scan.h	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_scan.h	Thu Jun  4 21:31:03 2009	(r193459)
@@ -176,6 +176,7 @@ enum {
 	IEEE80211_BPARSE_CHAN_INVALID	= 0x10,	/* invalid FH/DSPARMS chan */
 	IEEE80211_BPARSE_OFFCHAN	= 0x20,	/* DSPARMS chan != curchan */
 	IEEE80211_BPARSE_BINTVAL_INVALID= 0x40,	/* invalid beacon interval */
+	IEEE80211_BPARSE_CSA_INVALID	= 0x80,	/* invalid CSA ie */
 };
 
 /*
@@ -211,7 +212,8 @@ struct ieee80211_scanparams {
 	uint8_t		*htinfo;
 	uint8_t		*ath;
 	uint8_t		*tdma;
-	uint8_t		*spare[4];
+	uint8_t		*csa;
+	uint8_t		*spare[3];
 };
 
 /*

Modified: projects/acpica_20090521/sys/net80211/ieee80211_sta.c
==============================================================================
--- projects/acpica_20090521/sys/net80211/ieee80211_sta.c	Thu Jun  4 21:24:33 2009	(r193458)
+++ projects/acpica_20090521/sys/net80211/ieee80211_sta.c	Thu Jun  4 21:31:03 2009	(r193459)
@@ -106,15 +106,28 @@ sta_vattach(struct ieee80211vap *vap)
 static void
 sta_beacon_miss(struct ieee80211vap *vap)
 {
-	KASSERT((vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning"));
-	KASSERT(vap->iv_state == IEEE80211_S_RUN,
-	    ("wrong state %d", vap->iv_state));
-
-	IEEE80211_DPRINTF(vap,
-		IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
-		"beacon miss, mode %u state %s\n",
-		vap->iv_opmode, ieee80211_state_name[vap->iv_state]);
+	struct ieee80211com *ic = vap->iv_ic;
 
+	KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning"));
+	KASSERT(vap->iv_state >= IEEE80211_S_RUN,
+	    ("wrong state %s", ieee80211_state_name[vap->iv_state]));
+
+	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
+	    "beacon miss, mode %s state %s\n",
+	    ieee80211_opmode_name[vap->iv_opmode],
+	    ieee80211_state_name[vap->iv_state]);
+
+	if (vap->iv_state == IEEE80211_S_CSA) {
+		/*
+		 * A Channel Switch is pending; assume we missed the
+		 * beacon that would've completed the process and just
+		 * force the switch.  If we made a mistake we'll not
+		 * find the AP on the new channel and fall back to a
+		 * normal scan.
+		 */
+		ieee80211_csa_completeswitch(ic);
+		return;
+	}
 	if (++vap->iv_bmiss_count < vap->iv_bmiss_max) {
 		/*
 		 * Send a directed probe req before falling back to a
@@ -359,6 +372,7 @@ sta_newstate(struct ieee80211vap *vap, e
 		}
 		switch (ostate) {
 		case IEEE80211_S_RUN:
+		case IEEE80211_S_CSA:
 			break;
 		case IEEE80211_S_AUTH:		/* when join is done in fw */
 		case IEEE80211_S_ASSOC:
@@ -412,6 +426,10 @@ sta_newstate(struct ieee80211vap *vap, e
 		if (ic->ic_newassoc != NULL)
 			ic->ic_newassoc(vap->iv_bss, ostate != IEEE80211_S_RUN);
 		break;
+	case IEEE80211_S_CSA:
+		if (ostate != IEEE80211_S_RUN)
+			goto invalid;
+		break;

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

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 21:45:16 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79C6F1065672;
	Thu,  4 Jun 2009 21:45:16 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 666FF8FC14;
	Thu,  4 Jun 2009 21:45:16 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54LjG45005073;
	Thu, 4 Jun 2009 21:45:16 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54LjG1I005072;
	Thu, 4 Jun 2009 21:45:16 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042145.n54LjG1I005072@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 21:45:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193461 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 21:45:16 -0000

Author: rpaulo
Date: Thu Jun  4 21:45:16 2009
New Revision: 193461
URL: http://svn.freebsd.org/changeset/base/193461

Log:
  fix comment

Modified:
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Thu Jun  4 21:40:36 2009	(r193460)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Thu Jun  4 21:45:16 2009	(r193461)
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 		/* for ieee80211_hwmp_fi */
+#include 		/* for ieee80211_hwmp_state */
 
 #define	IEEE80211_TXPOWER_MAX	100	/* .5 dbM (XXX units?) */
 #define	IEEE80211_TXPOWER_MIN	0	/* kill radio */

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 22:33:12 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E67B1106566B;
	Thu,  4 Jun 2009 22:33:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA0B08FC1B;
	Thu,  4 Jun 2009 22:33:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54MXCki006466;
	Thu, 4 Jun 2009 22:33:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54MXCuc006463;
	Thu, 4 Jun 2009 22:33:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042233.n54MXCuc006463@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 22:33:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193470 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 22:33:13 -0000

Author: rpaulo
Date: Thu Jun  4 22:33:12 2009
New Revision: 193470
URL: http://svn.freebsd.org/changeset/base/193470

Log:
  Initial handling of IEEE80211_IOC_HWMP_TABLE (getter).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 22:23:44 2009	(r193469)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun  4 22:33:12 2009	(r193470)
@@ -951,12 +951,40 @@ static int
 hwmp_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
 	int error;
+	size_t len, off;
+	struct ieee80211_hwmp_state *hs;
+	struct ieee80211_hwmp_fi *fi;
+	uint8_t *p;
 
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_HWMP_TABLE:
 		if (vap->iv_opmode != IEEE80211_M_MBSS)
 			return EINVAL;
+		hs = vap->iv_hwmp;
+		len = 0;
+		mtx_lock(&hs->hs_lock);
+		TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
+			len += sizeof(*fi);
+		}
+		mtx_unlock(&hs->hs_lock);
+		if (len > ireq->i_len || ireq->i_len < sizeof(*fi))
+			return EFAULT;
+		p = malloc(len, M_TEMP, M_NOWAIT | M_ZERO);
+		if (p == NULL)
+			return ENOMEM;
+		off = 0;
+		mtx_lock(&hs->hs_lock);
+		TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
+			if (off >= len)
+				break;
+			memcpy(p + off, fi, sizeof(*fi));
+			off += sizeof(*fi);
+		}
+		mtx_unlock(&hs->hs_lock);
+		error = copyout(p, (uint8_t *) ireq->i_data, ireq->i_len);
+		free(p, M_TEMP);
+		break;
 	default:
 		return ENOSYS;
 	}

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:23:44 2009	(r193469)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:33:12 2009	(r193470)
@@ -284,7 +284,7 @@ mesh_input(struct ieee80211_node *ni, st
 		}	
 		/* NB: not ieee80211_hdrspace, datapad is not honored */
 		hdrlen = ieee80211_hdrsize(wh)
-		    + sizeof(struct ieee80211_meshcntl);
+		    + sizeof(struct ieee80211_meshcntl) + 2;
 		if (m->m_len < hdrlen &&
 		    (m = m_pullup(m, hdrlen)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
@@ -652,6 +652,8 @@ mesh_recv_action(struct ieee80211_node *
 	 * XXX: wait for it to beacon or create ieee80211_node?
 	 */
 	if (ni == vap->iv_bss) {
+		IEEE80211_DISCARD(vap, IEEE80211_MSG_MESH,
+		    wh, NULL, "%s", "unknown node");
 		return;
 	}
 

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 22:23:44 2009	(r193469)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 22:33:12 2009	(r193470)
@@ -207,9 +207,12 @@ ieee80211_start(struct ifnet *ifp)
 				
 			}
 		}
+		ieee80211_hwmp_discover(vap, eh->ether_dhost);
+#if 0
 		if (vap->iv_opmode == IEEE80211_M_MBSS)
 			ni = ieee80211_hwmp_discover(vap, eh->ether_dhost);
 		else
+#endif
 			ni = ieee80211_find_txnode(vap, eh->ether_dhost);
 		if (ni == NULL) {
 			/* NB: ieee80211_find_txnode does stat+msg */

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 22:34:37 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8FE9106566C;
	Thu,  4 Jun 2009 22:34:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7C378FC0A;
	Thu,  4 Jun 2009 22:34:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54MYbK7006522;
	Thu, 4 Jun 2009 22:34:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54MYbPW006521;
	Thu, 4 Jun 2009 22:34:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042234.n54MYbPW006521@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 4 Jun 2009 22:34:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193471 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 22:34:38 -0000

Author: rpaulo
Date: Thu Jun  4 22:34:37 2009
New Revision: 193471
URL: http://svn.freebsd.org/changeset/base/193471

Log:
  Revert previous bit that shouldn't go in.

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:33:12 2009	(r193470)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:34:37 2009	(r193471)
@@ -284,7 +284,7 @@ mesh_input(struct ieee80211_node *ni, st
 		}	
 		/* NB: not ieee80211_hdrspace, datapad is not honored */
 		hdrlen = ieee80211_hdrsize(wh)
-		    + sizeof(struct ieee80211_meshcntl) + 2;
+		    + sizeof(struct ieee80211_meshcntl);
 		if (m->m_len < hdrlen &&
 		    (m = m_pullup(m, hdrlen)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 22:39:39 2009
Return-Path: 
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C6301065688;
	Thu,  4 Jun 2009 22:39:39 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id CF85A8FC21;
	Thu,  4 Jun 2009 22:39:38 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id n54MbJJg064463;
	Thu, 4 Jun 2009 16:37:19 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Thu, 04 Jun 2009 16:37:34 -0600 (MDT)
Message-Id: <20090604.163734.775976286.imp@bsdimp.com>
To: ed@FreeBSD.org
From: "M. Warner Losh" 
In-Reply-To: <200906041803.n54I3DCG099513@svn.freebsd.org>
References: <200906041803.n54I3DCG099513@svn.freebsd.org>
X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193446 - in projects/clangbsd:
 crypto/openssl/crypto/rc5 secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 22:39:39 -0000

In message: <200906041803.n54I3DCG099513@svn.freebsd.org>
            Ed Schouten  writes:
: Author: ed
: Date: Thu Jun  4 18:03:13 2009
: New Revision: 193446
: URL: http://svn.freebsd.org/changeset/base/193446
: 
: Log:
:   Allow us to build libcrypto with Clang.
: 
: Modified:
:   projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
:   projects/clangbsd/secure/lib/libcrypto/Makefile
:   projects/clangbsd/secure/lib/libcrypto/Makefile.inc
: 
: Modified: projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
: ==============================================================================
: --- projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:03 2009	(r193445)
: +++ projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:13 2009	(r193446)
: @@ -73,7 +73,11 @@ extern "C" {
:  #define RC5_DECRYPT	0
:  
:  /* 32 bit.  For Alpha, things may get weird */
: +#ifdef __amd64__
: +#define RC5_32_INT unsigned int
: +#else
:  #define RC5_32_INT unsigned long
: +#endif

Why not 
#define RC5_32_INT unsigned int

which will do the right thing on all our platforms????

Warner

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 23:31:41 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98DF51065673;
	Thu,  4 Jun 2009 23:31:41 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 876C78FC0A;
	Thu,  4 Jun 2009 23:31:41 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54NVfpV007902;
	Thu, 4 Jun 2009 23:31:41 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54NVf6N007901;
	Thu, 4 Jun 2009 23:31:41 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <200906042331.n54NVf6N007901@svn.freebsd.org>
From: Craig Rodrigues 
Date: Thu, 4 Jun 2009 23:31:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193474 - projects/jbuild/usr.bin/jbuild/port
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 04 Jun 2009 23:31:42 -0000

Author: rodrigc
Date: Thu Jun  4 23:31:41 2009
New Revision: 193474
URL: http://svn.freebsd.org/changeset/base/193474

Log:
  Port needs mysql-client to build, so add BUILD_DEPENDS.

Modified:
  projects/jbuild/usr.bin/jbuild/port/Makefile

Modified: projects/jbuild/usr.bin/jbuild/port/Makefile
==============================================================================
--- projects/jbuild/usr.bin/jbuild/port/Makefile	Thu Jun  4 23:31:05 2009	(r193473)
+++ projects/jbuild/usr.bin/jbuild/port/Makefile	Thu Jun  4 23:31:41 2009	(r193474)
@@ -10,6 +10,8 @@ CATEGORIES=    devel
 MAINTAINER=    rodrigc@FreeBSD.org
 COMMENT=       Utility for building software and tracking build dependencies.
 
+BUILD_DEPENDS += ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql60-client
+
 do-fetch:
 	${DO_NADA}
 

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 06:40:50 2009
Return-Path: 
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCE111065670;
	Fri,  5 Jun 2009 06:40:50 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211])
	by mx1.freebsd.org (Postfix) with ESMTP id 80AC38FC1E;
	Fri,  5 Jun 2009 06:40:50 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id E17541CF1A; Fri,  5 Jun 2009 08:40:49 +0200 (CEST)
Date: Fri, 5 Jun 2009 08:40:49 +0200
From: Ed Schouten 
To: "M. Warner Losh" 
Message-ID: <20090605064049.GK48776@hoeg.nl>
References: <200906041803.n54I3DCG099513@svn.freebsd.org>
	<20090604.163734.775976286.imp@bsdimp.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="kIf/M4+cOKmnPkRL"
Content-Disposition: inline
In-Reply-To: <20090604.163734.775976286.imp@bsdimp.com>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193446 - in projects/clangbsd:
	crypto/openssl/crypto/rc5 secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 06:40:51 -0000


--kIf/M4+cOKmnPkRL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Warner,

* M. Warner Losh  wrote:
> Why not=20
> #define RC5_32_INT unsigned int
>=20
> which will do the right thing on all our platforms????

I think my change to rc5.h breaks the current ABI, so I restricted it to
amd64 right now. I still want to discuss this with someone who knows a
little more about OpenSSL than I do. Maybe I should send an email to
benl@?

--=20
 Ed Schouten 
 WWW: http://80386.nl/

--kIf/M4+cOKmnPkRL
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iEYEARECAAYFAkoovfEACgkQ52SDGA2eCwWjbwCfX5JhXzry781Jj5XmJyFjrY+G
kvQAnijmx5N2sQ5TaOjxxwl66WkQ7bg3
=nXtY
-----END PGP SIGNATURE-----

--kIf/M4+cOKmnPkRL--

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 08:37:12 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 315D4106564A;
	Fri,  5 Jun 2009 08:37:12 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FCA18FC1C;
	Fri,  5 Jun 2009 08:37:12 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n558bBc8019140;
	Fri, 5 Jun 2009 08:37:11 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n558bBNE019139;
	Fri, 5 Jun 2009 08:37:11 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200906050837.n558bBNE019139@svn.freebsd.org>
From: Oleksandr Tymoshenko 
Date: Fri, 5 Jun 2009 08:37:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193487 - projects/mips/sys/mips/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 08:37:12 -0000

Author: gonzo
Date: Fri Jun  5 08:37:11 2009
New Revision: 193487
URL: http://svn.freebsd.org/changeset/base/193487

Log:
  - Use restoreintr instead of enableint while accessing pcpu in DO_AST

Modified:
  projects/mips/sys/mips/include/asm.h

Modified: projects/mips/sys/mips/include/asm.h
==============================================================================
--- projects/mips/sys/mips/include/asm.h	Fri Jun  5 07:57:10 2009	(r193486)
+++ projects/mips/sys/mips/include/asm.h	Fri Jun  5 08:37:11 2009	(r193487)
@@ -311,13 +311,14 @@ _C_LABEL(x):
 	la	s0, _C_LABEL(disableintr)           ;\
 	jalr	s0                                  ;\
 	nop                                         ;\
+	move	a0, v0                              ;\
 	GET_CPU_PCPU(s1)                            ;\
 	lw	s3, PC_CURPCB(s1)                   ;\
 	lw	s1, PC_CURTHREAD(s1)                ;\
 	lw	s2, TD_FLAGS(s1)                    ;\
 	li	s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\
 	and	s2, s0                              ;\
-	la	s0, _C_LABEL(enableintr)            ;\
+	la	s0, _C_LABEL(restoreintr)           ;\
 	jalr	s0                                  ;\
 	nop                                         ;\
 	beq	s2, zero, 4f                        ;\

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 09:21:04 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3201106566C;
	Fri,  5 Jun 2009 09:21:03 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D61338FC08;
	Fri,  5 Jun 2009 09:21:03 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n559L3ml020212;
	Fri, 5 Jun 2009 09:21:03 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n559L3Kd020211;
	Fri, 5 Jun 2009 09:21:03 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200906050921.n559L3Kd020211@svn.freebsd.org>
From: Oleksandr Tymoshenko 
Date: Fri, 5 Jun 2009 09:21:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193491 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 09:21:04 -0000

Author: gonzo
Date: Fri Jun  5 09:21:03 2009
New Revision: 193491
URL: http://svn.freebsd.org/changeset/base/193491

Log:
  - Status register should be set last in RESTORE_CPU in order
      to prevent race over k0, k1 registers.
  - Update interrupts mask in saved status register for
      MipsUserIntr and MipsUserGenException. It might be
      modified by intr filter or ithread.

Modified:
  projects/mips/sys/mips/mips/exception.S

Modified: projects/mips/sys/mips/mips/exception.S
==============================================================================
--- projects/mips/sys/mips/mips/exception.S	Fri Jun  5 09:16:52 2009	(r193490)
+++ projects/mips/sys/mips/mips/exception.S	Fri Jun  5 09:21:03 2009	(r193491)
@@ -326,10 +326,9 @@ SlowFault:
 
 #define	RESTORE_CPU \
 	mtc0	zero,COP_0_STATUS_REG	;\
-	RESTORE_REG(a0, SR, sp)		;\
+	RESTORE_REG(k0, SR, sp)		;\
 	RESTORE_REG(t0, MULLO, sp)	;\
 	RESTORE_REG(t1, MULHI, sp)	;\
-	mtc0	a0, COP_0_STATUS_REG	;\
 	mtlo	t0			;\
 	mthi	t1			;\
 	_MTC0	v0, COP_0_EXC_PC	;\
@@ -362,7 +361,8 @@ SlowFault:
 	RESTORE_REG(s8, S8, sp)	        ;\
 	RESTORE_REG(gp, GP, sp)		;\
 	RESTORE_REG(ra, RA, sp)		;\
-	addu	sp, sp, KERN_EXC_FRAME_SIZE
+	addu	sp, sp, KERN_EXC_FRAME_SIZE;\
+	mtc0	k0, COP_0_STATUS_REG
 
 
 /*
@@ -484,16 +484,19 @@ NNON_LEAF(MipsUserGenException, STAND_FR
 	la	k0, _C_LABEL(trap)
 	jalr	k0
 	nop
+
 /*
  * Restore user registers and return.
  * First disable interrupts and set exeption level.
  */
 	DO_AST
 
-	mtc0	zero, COP_0_STATUS_REG	# disable int
+	mfc0	t0, COP_0_STATUS_REG	# disable int
+	and	t0, t0, ~(MIPS_SR_INT_IE)
+	mtc0	t0, COP_0_STATUS_REG
 	ITLBNOPFIX
-	li	v0, SR_EXL
-	mtc0	v0, COP_0_STATUS_REG	# set exeption level
+	or	t0, t0, SR_EXL
+	mtc0	t0, COP_0_STATUS_REG	# set exeption level
 	ITLBNOPFIX
 
 /*
@@ -504,6 +507,18 @@ NNON_LEAF(MipsUserGenException, STAND_FR
 	GET_CPU_PCPU(k1)
 	lw	k1, PC_CURPCB(k1)
 
+	/*
+	 * Update interrupt mask in saved status register
+	 * Some of interrupts could be enabled by ithread
+	 * scheduled by ast()
+	 */
+	mfc0	a0, COP_0_STATUS_REG
+	and	a0, a0, SR_INT_MASK
+	RESTORE_U_PCB_REG(a1, SR, k1)
+	and	a1, a1, ~SR_INT_MASK
+	or	a1, a1, a0
+	SAVE_U_PCB_REG(a1, SR, k1)
+
 	RESTORE_U_PCB_REG(t0, MULLO, k1)
 	RESTORE_U_PCB_REG(t1, MULHI, k1)
 	mtlo	t0
@@ -714,14 +729,29 @@ NNON_LEAF(MipsUserIntr, STAND_FRAME_SIZE
 /*
  * Restore user registers and return. 
  */
-	mtc0	zero, COP_0_STATUS_REG	# re-disable interrupts
+	mfc0	t0, COP_0_STATUS_REG	# disable int
+	and	t0, t0, ~(MIPS_SR_INT_IE)
+	mtc0	t0, COP_0_STATUS_REG
 	ITLBNOPFIX
-	li	v0, SR_EXL
-	mtc0	v0, COP_0_STATUS_REG	# set exeption level bit.
+	or	t0, t0, SR_EXL
+	mtc0	t0, COP_0_STATUS_REG	# set exeption level
 	ITLBNOPFIX
 
 	GET_CPU_PCPU(k1)
 	lw	k1, PC_CURPCB(k1)
+
+	/*
+	 * Update interrupt mask in saved status register
+	 * Some of interrupts could be disabled by
+	 * intr filters
+	 */
+	mfc0	a0, COP_0_STATUS_REG
+	and	a0, a0, SR_INT_MASK
+	RESTORE_U_PCB_REG(a1, SR, k1)
+	and	a1, a1, ~SR_INT_MASK
+	or	a1, a1, a0
+	SAVE_U_PCB_REG(a1, SR, k1)
+
 	RESTORE_U_PCB_REG(s0, S0, k1)
 	RESTORE_U_PCB_REG(s1, S1, k1)
 	RESTORE_U_PCB_REG(s2, S2, k1)

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 16:43:47 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F6D2106566B;
	Fri,  5 Jun 2009 16:43:47 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E47A8FC15;
	Fri,  5 Jun 2009 16:43:47 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55Ghlwr031436;
	Fri, 5 Jun 2009 16:43:47 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55GhlqE031435;
	Fri, 5 Jun 2009 16:43:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906051643.n55GhlqE031435@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 16:43:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193517 - projects/ngroups/sys/fs/unionfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 16:43:47 -0000

Author: brooks
Date: Fri Jun  5 16:43:47 2009
New Revision: 193517
URL: http://svn.freebsd.org/changeset/base/193517

Log:
  Use groupmember() instead of hand rolling our own implementation.

Modified:
  projects/ngroups/sys/fs/unionfs/union_vnops.c

Modified: projects/ngroups/sys/fs/unionfs/union_vnops.c
==============================================================================
--- projects/ngroups/sys/fs/unionfs/union_vnops.c	Fri Jun  5 16:16:07 2009	(r193516)
+++ projects/ngroups/sys/fs/unionfs/union_vnops.c	Fri Jun  5 16:43:47 2009	(r193517)
@@ -638,7 +638,6 @@ unionfs_check_corrected_access(accmode_t
 	uid_t		uid;	/* upper side vnode's uid */
 	gid_t		gid;	/* upper side vnode's gid */
 	u_short		vmode;	/* upper side vnode's mode */
-	gid_t          *gp;
 	u_short		mask;
 
 	mask = 0;
@@ -659,17 +658,14 @@ unionfs_check_corrected_access(accmode_t
 
 	/* check group */
 	count = 0;
-	gp = cred->cr_groups;
-	for (; count < cred->cr_ngroups; count++, gp++) {
-		if (gid == *gp) {
-			if (accmode & VEXEC)
-				mask |= S_IXGRP;
-			if (accmode & VREAD)
-				mask |= S_IRGRP;
-			if (accmode & VWRITE)
-				mask |= S_IWGRP;
-			return ((vmode & mask) == mask ? 0 : EACCES);
-		}
+	if (groupmember(gid, cred)) {
+		if (accmode & VEXEC)
+			mask |= S_IXGRP;
+		if (accmode & VREAD)
+			mask |= S_IRGRP;
+		if (accmode & VWRITE)
+			mask |= S_IWGRP;
+		return ((vmode & mask) == mask ? 0 : EACCES);
 	}
 
 	/* check other */

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 16:45:58 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F909106566B;
	Fri,  5 Jun 2009 16:45:58 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E7F08FC12;
	Fri,  5 Jun 2009 16:45:58 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55Gjwos031570;
	Fri, 5 Jun 2009 16:45:58 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55GjwwD031568;
	Fri, 5 Jun 2009 16:45:58 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906051645.n55GjwwD031568@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 16:45:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193519 - projects/ngroups/sys/fs/portalfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 16:45:58 -0000

Author: brooks
Date: Fri Jun  5 16:45:58 2009
New Revision: 193519
URL: http://svn.freebsd.org/changeset/base/193519

Log:
  Clamp the number of groups in the portal credential to XU_NGROUPS (16).
  This should be modified along with userspace to be dynamic.

Modified:
  projects/ngroups/sys/fs/portalfs/portal.h
  projects/ngroups/sys/fs/portalfs/portal_vnops.c

Modified: projects/ngroups/sys/fs/portalfs/portal.h
==============================================================================
--- projects/ngroups/sys/fs/portalfs/portal.h	Fri Jun  5 16:44:42 2009	(r193518)
+++ projects/ngroups/sys/fs/portalfs/portal.h	Fri Jun  5 16:45:58 2009	(r193519)
@@ -43,7 +43,7 @@ struct portal_cred {
 	int		pcr_flag;		/* File open mode */
 	uid_t		pcr_uid;		/* From ucred */
 	short		pcr_ngroups;		/* From ucred */
-	gid_t		pcr_groups[NGROUPS];	/* From ucred */
+	gid_t		pcr_groups[XU_NGROUPS];	/* From ucred */
 };
 
 #ifdef _KERNEL

Modified: projects/ngroups/sys/fs/portalfs/portal_vnops.c
==============================================================================
--- projects/ngroups/sys/fs/portalfs/portal_vnops.c	Fri Jun  5 16:44:42 2009	(r193518)
+++ projects/ngroups/sys/fs/portalfs/portal_vnops.c	Fri Jun  5 16:45:58 2009	(r193519)
@@ -311,8 +311,9 @@ portal_open(ap)
 
 	pcred.pcr_flag = ap->a_mode;
 	pcred.pcr_uid = ap->a_cred->cr_uid;
-	pcred.pcr_ngroups = ap->a_cred->cr_ngroups;
-	bcopy(ap->a_cred->cr_groups, pcred.pcr_groups, NGROUPS * sizeof(gid_t));
+	pcred.pcr_ngroups = MIN(ap->a_cred->cr_ngroups, XU_NGROUPS);
+	bcopy(ap->a_cred->cr_groups, pcred.pcr_groups,
+	    pcred.pcr_ngroups * sizeof(gid_t));
 	aiov[0].iov_base = (caddr_t) &pcred;
 	aiov[0].iov_len = sizeof(pcred);
 	aiov[1].iov_base = pt->pt_arg;

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 16:47:35 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77D1D106566C;
	Fri,  5 Jun 2009 16:47:35 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 66EC48FC13;
	Fri,  5 Jun 2009 16:47:35 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55GlZQx031633;
	Fri, 5 Jun 2009 16:47:35 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55GlZQI031632;
	Fri, 5 Jun 2009 16:47:35 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906051647.n55GlZQI031632@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 16:47:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193520 - projects/ngroups/sys/fs/nfsserver
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 16:47:35 -0000

Author: brooks
Date: Fri Jun  5 16:47:35 2009
New Revision: 193520
URL: http://svn.freebsd.org/changeset/base/193520

Log:
  Remove a redundent assignment to cr_groups[0] immediatly after an
  assignment to cr_gid (which is currently defined as cr_groups[0]).

Modified:
  projects/ngroups/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: projects/ngroups/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/ngroups/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Jun  5 16:45:58 2009	(r193519)
+++ projects/ngroups/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Jun  5 16:47:35 2009	(r193520)
@@ -3577,7 +3577,6 @@ nfsrv_docallback(struct nfsclient *clp, 
 	nd->nd_repstat = 0;
 	cred->cr_uid = clp->lc_uid;
 	cred->cr_gid = clp->lc_gid;
-	cred->cr_groups[0] = clp->lc_gid;
 	callback = clp->lc_callback;
 	NFSUNLOCKSTATE();
 	cred->cr_ngroups = 1;

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 17:20:19 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 89CFE1065672;
	Fri,  5 Jun 2009 17:20:19 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 78B368FC16;
	Fri,  5 Jun 2009 17:20:19 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55HKJB2032552;
	Fri, 5 Jun 2009 17:20:19 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55HKJo7032551;
	Fri, 5 Jun 2009 17:20:19 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906051720.n55HKJo7032551@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 17:20:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193525 - projects/ngroups/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 17:20:19 -0000

Author: brooks
Date: Fri Jun  5 17:20:19 2009
New Revision: 193525
URL: http://svn.freebsd.org/changeset/base/193525

Log:
  Clamp the number of groups ipfw can track to 16 for now.

Modified:
  projects/ngroups/sys/netinet/ip_fw2.c

Modified: projects/ngroups/sys/netinet/ip_fw2.c
==============================================================================
--- projects/ngroups/sys/netinet/ip_fw2.c	Fri Jun  5 17:19:55 2009	(r193524)
+++ projects/ngroups/sys/netinet/ip_fw2.c	Fri Jun  5 17:20:19 2009	(r193525)
@@ -140,8 +140,9 @@ static uma_zone_t ipfw_dyn_rule_zone;
  * the user specified UID/GID based constraints in
  * a firewall rule.
  */
+#define FW_NGROUPS	16
 struct ip_fw_ugid {
-	gid_t		fw_groups[NGROUPS];
+	gid_t		fw_groups[FW_NGROUPS];	/* XXX: should be dynamic */
 	int		fw_ngroups;
 	uid_t		fw_uid;
 	int		fw_prid;
@@ -2017,8 +2018,8 @@ fill_ugid_cache(struct inpcb *inp, struc
 	cr = inp->inp_cred;
 	ugp->fw_prid = jailed(cr) ? cr->cr_prison->pr_id : -1;
 	ugp->fw_uid = cr->cr_uid;
-	ugp->fw_ngroups = cr->cr_ngroups;
-	bcopy(cr->cr_groups, ugp->fw_groups, sizeof(ugp->fw_groups));
+	ugp->fw_ngroups = MIN(cr->cr_ngroups, FW_NGROUPS);
+	bcopy(cr->cr_groups, ugp->fw_groups, sizeof(gid_t) * ugp->fw_ngroups);
 }
 
 static int

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 19:52:03 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8949910656CA;
	Fri,  5 Jun 2009 19:52:03 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DED18FC08;
	Fri,  5 Jun 2009 19:52:03 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55Jq3kR036361;
	Fri, 5 Jun 2009 19:52:03 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55Jq3Ks036360;
	Fri, 5 Jun 2009 19:52:03 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906051952.n55Jq3Ks036360@svn.freebsd.org>
From: Jung-uk Kim 
Date: Fri, 5 Jun 2009 19:52:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193533 - projects/acpica_20090521
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 19:52:03 -0000

Author: jkim
Date: Fri Jun  5 19:52:03 2009
New Revision: 193533
URL: http://svn.freebsd.org/changeset/base/193533

Log:
  ACPICA 20090521 is merged to head.

Deleted:
  projects/acpica_20090521/

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 20:23:24 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 660AD106566B;
	Fri,  5 Jun 2009 20:23:24 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5123E8FC08;
	Fri,  5 Jun 2009 20:23:24 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55KNOmY037124;
	Fri, 5 Jun 2009 20:23:24 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55KNNUM037101;
	Fri, 5 Jun 2009 20:23:23 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906052023.n55KNNUM037101@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 20:23:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193534 - in projects/ngroups/sys: contrib/pf/net
	fs/nfs fs/nfsclient fs/nfsserver gnu/fs/xfs
	gnu/fs/xfs/FreeBSD kern netncp netsmb nfsclient nfsserver rpc
	rpc/rpcsec_gss security/audit...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 20:23:24 -0000

Author: brooks
Date: Fri Jun  5 20:23:22 2009
New Revision: 193534
URL: http://svn.freebsd.org/changeset/base/193534

Log:
  Introduce a new crsetgroups() function and use it when copying groups
  into ucred structures.
  
  Consistently use the cr_gid macro to reference cr_groups[0].
  
  Increase cr_ngroups and cr_agroups from short to int.

Modified:
  projects/ngroups/sys/contrib/pf/net/pf.c
  projects/ngroups/sys/fs/nfs/nfs_commonport.c
  projects/ngroups/sys/fs/nfsclient/nfs_clport.c
  projects/ngroups/sys/fs/nfsserver/nfs_nfsdport.c
  projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h
  projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c
  projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c
  projects/ngroups/sys/kern/kern_prot.c
  projects/ngroups/sys/kern/vfs_export.c
  projects/ngroups/sys/kern/vfs_syscalls.c
  projects/ngroups/sys/netncp/ncp_conn.c
  projects/ngroups/sys/netsmb/smb_conn.c
  projects/ngroups/sys/nfsclient/nfs_subs.c
  projects/ngroups/sys/nfsserver/nfs_srvsock.c
  projects/ngroups/sys/nfsserver/nfs_srvsubs.c
  projects/ngroups/sys/rpc/authunix_prot.c
  projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
  projects/ngroups/sys/rpc/svc_auth.c
  projects/ngroups/sys/rpc/svc_auth_unix.c
  projects/ngroups/sys/security/audit/audit.c
  projects/ngroups/sys/security/audit/audit_arg.c
  projects/ngroups/sys/sys/ucred.h
  projects/ngroups/sys/ufs/ufs/ufs_vnops.c

Modified: projects/ngroups/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/ngroups/sys/contrib/pf/net/pf.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/contrib/pf/net/pf.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -2946,7 +2946,7 @@ pf_socket_lookup(int direction, struct p
 	if (inp_arg != NULL) {
 		INP_LOCK_ASSERT(inp_arg);
 		pd->lookup.uid = inp_arg->inp_cred->cr_uid;
-		pd->lookup.gid = inp_arg->inp_cred->cr_groups[0];
+		pd->lookup.gid = inp_arg->inp_cred->cr_gid;
 		return (1);
 	}
 #endif
@@ -3044,7 +3044,7 @@ pf_socket_lookup(int direction, struct p
 	}
 #ifdef __FreeBSD__
 	pd->lookup.uid = inp->inp_cred->cr_uid;
-	pd->lookup.gid = inp->inp_cred->cr_groups[0];
+	pd->lookup.gid = inp->inp_cred->cr_gid;
 	INP_INFO_RUNLOCK(pi);
 #else
 	pd->lookup.uid = inp->inp_socket->so_euid;

Modified: projects/ngroups/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/ngroups/sys/fs/nfs/nfs_commonport.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/fs/nfs/nfs_commonport.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -220,14 +220,9 @@ nfsrv_lookupfilename(struct nameidata *n
 void
 newnfs_copycred(struct nfscred *nfscr, struct ucred *cr)
 {
-	int ngroups, i;
 
 	cr->cr_uid = nfscr->nfsc_uid;
-	ngroups = (nfscr->nfsc_ngroups < NGROUPS) ?
-	    nfscr->nfsc_ngroups : NGROUPS;
-	for (i = 0; i < ngroups; i++)
-		cr->cr_groups[i] = nfscr->nfsc_groups[i];
-	cr->cr_ngroups = ngroups;
+	crsetgroups(cr, nfscr->nfsc_ngroups, nfscr->nfsc_groups);
 }
 
 /*
@@ -295,15 +290,13 @@ nfsrv_atroot(struct vnode *vp, long *ret
 
 /*
  * Set the credentials to refer to root.
- * If only the various BSDen could agree on whether cr_gid is a separate
- * field or cr_groups[0]...
  */
 void
 newnfs_setroot(struct ucred *cred)
 {
 
 	cred->cr_uid = 0;
-	cred->cr_groups[0] = 0;
+	cred->cr_gid = 0;
 	cred->cr_ngroups = 1;
 }
 

Modified: projects/ngroups/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- projects/ngroups/sys/fs/nfsclient/nfs_clport.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/fs/nfsclient/nfs_clport.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -976,14 +976,12 @@ nfscl_getmyip(struct nfsmount *nmp, int 
 void
 newnfs_copyincred(struct ucred *cr, struct nfscred *nfscr)
 {
-	int ngroups, i;
+	int i;
 
 	nfscr->nfsc_uid = cr->cr_uid;
-	ngroups = (cr->cr_ngroups > XU_NGROUPS) ? XU_NGROUPS :
-	    cr->cr_ngroups;
-	for (i = 0; i < ngroups; i++)
+	nfscr->nfsc_ngroups = MIN(cr->cr_ngroups, XU_NGROUPS);
+	for (i = 0; i < nfscr->nfsc_ngroups; i++)
 		nfscr->nfsc_groups[i] = cr->cr_groups[i];
-	nfscr->nfsc_ngroups = ngroups;
 }
 
 

Modified: projects/ngroups/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- projects/ngroups/sys/fs/nfsserver/nfs_nfsdport.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/fs/nfsserver/nfs_nfsdport.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -2360,7 +2360,6 @@ int
 nfsd_excred(struct nfsrv_descript *nd, struct nfsexstuff *exp,
     struct ucred *credanon)
 {
-	int i;
 	int error = 0;
 
 	/*
@@ -2403,9 +2402,8 @@ nfsd_excred(struct nfsrv_descript *nd, s
 	     (nd->nd_flag & ND_AUTHNONE))) {
 		nd->nd_cred->cr_uid = credanon->cr_uid;
 		nd->nd_cred->cr_gid = credanon->cr_gid;
-		for (i = 0; i < credanon->cr_ngroups && i < NGROUPS; i++)
-			nd->nd_cred->cr_groups[i] = credanon->cr_groups[i];
-		nd->nd_cred->cr_ngroups = i;
+		crsetgroups(nd->nd_cred, credanon->cr_ngroups,
+		    credanon->cr_groups);
 	}
 	return (0);
 }

Modified: projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h	Fri Jun  5 20:23:22 2009	(r193534)
@@ -163,7 +163,7 @@ typedef struct mtx xfs_mutex_t;
  * Cedentials manipulation.
  */
 #define current_fsuid(credp)	(credp)->cr_uid
-#define current_fsgid(credp)	(credp)->cr_groups[0]
+#define current_fsgid(credp)	(credp)->cr_gid
 
 #define PAGE_CACHE_SIZE PAGE_SIZE
 

Modified: projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -1124,7 +1124,7 @@ xfs_ialloc(
 	ip->i_d.di_nlink = nlink;
 	ASSERT(ip->i_d.di_nlink == nlink);
 	ip->i_d.di_uid = curthread->td_ucred->cr_uid;
-	ip->i_d.di_gid = curthread->td_ucred->cr_groups[0];
+	ip->i_d.di_gid = curthread->td_ucred->cr_gid;
 	ip->i_d.di_projid = prid;
 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
 

Modified: projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -3379,7 +3379,7 @@ xfs_symlink(
 	 */
 	error = XFS_QM_DQVOPALLOC(mp, dp,
 				  current->td_ucred->cr_uid,
-				  current->td_ucred->cr_groups[0],
+				  current->td_ucred->cr_gid,
 				  prid,
 				  XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
 	if (error)

Modified: projects/ngroups/sys/kern/kern_prot.c
==============================================================================
--- projects/ngroups/sys/kern/kern_prot.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/kern/kern_prot.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -83,6 +83,9 @@ static MALLOC_DEFINE(M_CRED, "cred", "cr
 
 SYSCTL_NODE(_security, OID_AUTO, bsd, CTLFLAG_RW, 0, "BSD security policy");
 
+static __inline void crsetgroups_locked(struct ucred *cr, int ngrp,
+    gid_t *groups);
+
 #ifndef _SYS_SYSPROTO_H_
 struct getpid_args {
 	int	dummy;
@@ -244,16 +247,11 @@ getgid(struct thread *td, struct getgid_
 
 	td->td_retval[0] = td->td_ucred->cr_rgid;
 #if defined(COMPAT_43)
-	td->td_retval[1] = td->td_ucred->cr_groups[0];
+	td->td_retval[1] = td->td_ucred->cr_gid;
 #endif
 	return (0);
 }
 
-/*
- * Get effective group ID.  The "egid" is groups[0], and could be obtained
- * via getgroups.  This syscall exists because it is somewhat painful to do
- * correctly in a library function.
- */
 #ifndef _SYS_SYSPROTO_H_
 struct getegid_args {
         int     dummy;
@@ -264,7 +262,7 @@ int
 getegid(struct thread *td, struct getegid_args *uap)
 {
 
-	td->td_retval[0] = td->td_ucred->cr_groups[0];
+	td->td_retval[0] = td->td_ucred->cr_gid;
 	return (0);
 }
 
@@ -680,7 +678,7 @@ setgid(struct thread *td, struct setgid_
 	    gid != oldcred->cr_svgid &&		/* allow setgid(saved gid) */
 #endif
 #ifdef POSIX_APPENDIX_B_4_2_2	/* Use BSD-compat clause from B.4.2.2 */
-	    gid != oldcred->cr_groups[0] && /* allow setgid(getegid()) */
+	    gid != oldcred->cr_gid && /* allow setgid(getegid()) */
 #endif
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETGID, 0)) != 0)
 		goto fail;
@@ -692,7 +690,7 @@ setgid(struct thread *td, struct setgid_
 	 */
 	if (
 #ifdef POSIX_APPENDIX_B_4_2_2	/* use the clause from B.4.2.2 */
-	    gid == oldcred->cr_groups[0] ||
+	    gid == oldcred->cr_gid ||
 #endif
 	    /* We are using privs. */
 	    priv_check_cred(oldcred, PRIV_CRED_SETGID, 0) == 0)
@@ -721,7 +719,7 @@ setgid(struct thread *td, struct setgid_
 	 * In all cases permitted cases, we are changing the egid.
 	 * Copy credentials so other references do not see our changes.
 	 */
-	if (oldcred->cr_groups[0] != gid) {
+	if (oldcred->cr_gid != gid) {
 		change_egid(newcred, gid);
 		setsugid(p);
 	}
@@ -767,7 +765,7 @@ setegid(struct thread *td, struct setegi
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETEGID, 0)) != 0)
 		goto fail;
 
-	if (oldcred->cr_groups[0] != egid) {
+	if (oldcred->cr_gid != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -841,8 +839,7 @@ kern_setgroups(struct thread *td, u_int 
 		 */
 		newcred->cr_ngroups = 1;
 	} else {
-		bcopy(groups, newcred->cr_groups, ngrp * sizeof(gid_t));
-		newcred->cr_ngroups = ngrp;
+		crsetgroups_locked(newcred, ngrp, groups);
 	}
 	setsugid(p);
 	p->p_ucred = newcred;
@@ -954,12 +951,12 @@ setregid(register struct thread *td, str
 
 	if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid &&
 	    rgid != oldcred->cr_svgid) ||
-	     (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] &&
+	     (egid != (gid_t)-1 && egid != oldcred->cr_gid &&
 	     egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) &&
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETREGID, 0)) != 0)
 		goto fail;
 
-	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
+	if (egid != (gid_t)-1 && oldcred->cr_gid != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -967,9 +964,9 @@ setregid(register struct thread *td, str
 		change_rgid(newcred, rgid);
 		setsugid(p);
 	}
-	if ((rgid != (gid_t)-1 || newcred->cr_groups[0] != newcred->cr_rgid) &&
-	    newcred->cr_svgid != newcred->cr_groups[0]) {
-		change_svgid(newcred, newcred->cr_groups[0]);
+	if ((rgid != (gid_t)-1 || newcred->cr_gid != newcred->cr_rgid) &&
+	    newcred->cr_svgid != newcred->cr_gid) {
+		change_svgid(newcred, newcred->cr_gid);
 		setsugid(p);
 	}
 	p->p_ucred = newcred;
@@ -1100,17 +1097,17 @@ setresgid(register struct thread *td, st
 
 	if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid &&
 	      rgid != oldcred->cr_svgid &&
-	      rgid != oldcred->cr_groups[0]) ||
+	      rgid != oldcred->cr_gid) ||
 	     (egid != (gid_t)-1 && egid != oldcred->cr_rgid &&
 	      egid != oldcred->cr_svgid &&
-	      egid != oldcred->cr_groups[0]) ||
+	      egid != oldcred->cr_gid) ||
 	     (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid &&
 	      sgid != oldcred->cr_svgid &&
-	      sgid != oldcred->cr_groups[0])) &&
+	      sgid != oldcred->cr_gid)) &&
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETRESGID, 0)) != 0)
 		goto fail;
 
-	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
+	if (egid != (gid_t)-1 && oldcred->cr_gid != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -1179,8 +1176,8 @@ getresgid(register struct thread *td, st
 		error1 = copyout(&cred->cr_rgid,
 		    uap->rgid, sizeof(cred->cr_rgid));
 	if (uap->egid)
-		error2 = copyout(&cred->cr_groups[0],
-		    uap->egid, sizeof(cred->cr_groups[0]));
+		error2 = copyout(&cred->cr_gid,
+		    uap->egid, sizeof(cred->cr_gid));
 	if (uap->sgid)
 		error3 = copyout(&cred->cr_svgid,
 		    uap->sgid, sizeof(cred->cr_svgid));
@@ -1899,7 +1896,7 @@ cru2x(struct ucred *cr, struct xucred *x
 	ngroups = min(cr->cr_ngroups, XU_NGROUPS);
 	xcr->cr_ngroups = ngroups;
 	bcopy(cr->cr_groups, xcr->cr_groups,
-	    ngroups * sizeof(cr->cr_groups[0]));
+	    ngroups * sizeof(*cr->cr_groups));
 }
 
 /*
@@ -1957,6 +1954,8 @@ crextend(struct ucred *cr, int n)
 	/*
 	 * We extend by 2 each time since we're using a power of two
 	 * allocator.
+	 * XXX: it probably makes more sense to right-size the
+	 * allocation if we need more than a page.
 	 */
 	if (cr->cr_agroups)
 		cnt = cr->cr_agroups * 2;
@@ -1975,6 +1974,36 @@ crextend(struct ucred *cr, int n)
 }
 
 /*
+ * Copy groups in to a credential, preserving any necessicary invariants
+ * (i.e. sorting in the future).  crextend() must have been called
+ * before hand to ensure sufficient space is available.  If 
+ */
+static inline void
+crsetgroups_locked(struct ucred *cr, int ngrp, gid_t *groups)
+{
+	
+	KASSERT(cr->cr_agroups >= ngrp, ("cr_ngroups is too small"));
+
+	bcopy(groups, cr->cr_groups, ngrp * sizeof(gid_t));
+	cr->cr_ngroups = ngrp;
+}
+
+/*
+ * Copy groups in to a credential after expanding it if required.
+ * Truncate the list to NGROUPS if it is too large.
+ */
+void
+crsetgroups(struct ucred *cr, int ngrp, gid_t *groups)
+{
+
+	if (ngrp > NGROUPS)
+		ngrp = NGROUPS;
+
+	crextend(cr, ngrp);
+	crsetgroups_locked(cr, ngrp, groups);
+}
+
+/*
  * Get login name, if available.
  */
 #ifndef _SYS_SYSPROTO_H_
@@ -2071,7 +2100,7 @@ void
 change_egid(struct ucred *newcred, gid_t egid)
 {
 
-	newcred->cr_groups[0] = egid;
+	newcred->cr_gid = egid;
 }
 
 /*-

Modified: projects/ngroups/sys/kern/vfs_export.c
==============================================================================
--- projects/ngroups/sys/kern/vfs_export.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/kern/vfs_export.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -120,9 +120,8 @@ vfs_hang_addrlist(struct mount *mp, stru
 		np->netc_exflags = argp->ex_flags;
 		np->netc_anon = crget();
 		np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
-		np->netc_anon->cr_ngroups = argp->ex_anon.cr_ngroups;
-		bcopy(argp->ex_anon.cr_groups, np->netc_anon->cr_groups,
-		    sizeof(np->netc_anon->cr_groups));
+		crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
+		    argp->ex_anon.cr_groups);
 		np->netc_numsecflavors = argp->ex_numsecflavors;
 		bcopy(argp->ex_secflavors, np->netc_secflavors,
 		    sizeof(np->netc_secflavors));
@@ -205,9 +204,8 @@ vfs_hang_addrlist(struct mount *mp, stru
 	np->netc_exflags = argp->ex_flags;
 	np->netc_anon = crget();
 	np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
-	np->netc_anon->cr_ngroups = argp->ex_anon.cr_ngroups;
-	bcopy(argp->ex_anon.cr_groups, np->netc_anon->cr_groups,
-	    sizeof(np->netc_anon->cr_groups));
+	crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
+	    np->netc_anon->cr_groups);
 	np->netc_numsecflavors = argp->ex_numsecflavors;
 	bcopy(argp->ex_secflavors, np->netc_secflavors,
 	    sizeof(np->netc_secflavors));

Modified: projects/ngroups/sys/kern/vfs_syscalls.c
==============================================================================
--- projects/ngroups/sys/kern/vfs_syscalls.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/kern/vfs_syscalls.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -2129,7 +2129,7 @@ kern_accessat(struct thread *td, int fd,
 		cred = td->td_ucred;
 		tmpcred = crdup(cred);
 		tmpcred->cr_uid = cred->cr_ruid;
-		tmpcred->cr_groups[0] = cred->cr_rgid;
+		tmpcred->cr_gid = cred->cr_rgid;
 		td->td_ucred = tmpcred;
 	} else
 		cred = tmpcred = td->td_ucred;

Modified: projects/ngroups/sys/netncp/ncp_conn.c
==============================================================================
--- projects/ngroups/sys/netncp/ncp_conn.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/netncp/ncp_conn.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -249,7 +249,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap
 	ncp->connid = 0xFFFF;
 	ncp->li = *cap;
 	ncp->nc_group = (cap->group != NCP_DEFAULT_GROUP) ?
-		cap->group : cred->cr_groups[0];
+		cap->group : cred->cr_gid;
 
 	if (cap->retry_count == 0)
 		ncp->li.retry_count = NCP_RETRY_COUNT;

Modified: projects/ngroups/sys/netsmb/smb_conn.c
==============================================================================
--- projects/ngroups/sys/netsmb/smb_conn.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/netsmb/smb_conn.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -416,7 +416,7 @@ smb_vc_create(struct smb_vcspec *vcspec,
 	if (uid == SMBM_ANY_OWNER)
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
-		gid = cred->cr_groups[0];
+		gid = cred->cr_gid;
 	vcp->vc_uid = uid;
 	vcp->vc_grp = gid;
 
@@ -714,7 +714,7 @@ smb_share_create(struct smb_vc *vcp, str
 	if (uid == SMBM_ANY_OWNER)
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
-		gid = cred->cr_groups[0];
+		gid = cred->cr_gid;
 	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK);
 	smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss ilock", "smbss");
 	ssp->obj.co_free = smb_share_free;

Modified: projects/ngroups/sys/nfsclient/nfs_subs.c
==============================================================================
--- projects/ngroups/sys/nfsclient/nfs_subs.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/nfsclient/nfs_subs.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -253,7 +253,7 @@ nfsm_rpchead(struct ucred *cr, int nmfla
 		*tl++ = 0;		/* stamp ?? */
 		*tl++ = 0;		/* NULL hostname */
 		*tl++ = txdr_unsigned(cr->cr_uid);
-		*tl++ = txdr_unsigned(cr->cr_groups[0]);
+		*tl++ = txdr_unsigned(cr->cr_gid);
 		grpsiz = (auth_len >> 2) - 5;
 		*tl++ = txdr_unsigned(grpsiz);
 		for (i = 1; i <= grpsiz; i++)

Modified: projects/ngroups/sys/nfsserver/nfs_srvsock.c
==============================================================================
--- projects/ngroups/sys/nfsserver/nfs_srvsock.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/nfsserver/nfs_srvsock.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -360,7 +360,7 @@ nfs_getreq(struct nfsrv_descript *nd, st
 		tl = nfsm_dissect_nonblock(u_int32_t *, 3 * NFSX_UNSIGNED);
 		nd->nd_cr->cr_uid = nd->nd_cr->cr_ruid =
 		    nd->nd_cr->cr_svuid = fxdr_unsigned(uid_t, *tl++);
-		nd->nd_cr->cr_groups[0] = nd->nd_cr->cr_rgid =
+		nd->nd_cr->cr_gid = nd->nd_cr->cr_rgid =
 		    nd->nd_cr->cr_svgid = fxdr_unsigned(gid_t, *tl++);
 #ifdef MAC
 		mac_cred_associate_nfsd(nd->nd_cr);
@@ -376,7 +376,7 @@ nfs_getreq(struct nfsrv_descript *nd, st
 			nd->nd_cr->cr_groups[i] = fxdr_unsigned(gid_t, *tl++);
 		    else
 			tl++;
-		nd->nd_cr->cr_ngroups = (len >= XU_NGROUPS) ? XU_NGROUPS : (len + 1);
+		nd->nd_cr->cr_ngroups = MIN(XU_NGROUPS, len + 1);
 		if (nd->nd_cr->cr_ngroups > 1)
 		    nfsrvw_sort(nd->nd_cr->cr_groups, nd->nd_cr->cr_ngroups);
 		len = fxdr_unsigned(int, *++tl);

Modified: projects/ngroups/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- projects/ngroups/sys/nfsserver/nfs_srvsubs.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/nfsserver/nfs_srvsubs.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -1181,9 +1181,7 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
 	cred = nfsd->nd_cr;
 	if (cred->cr_uid == 0 || (exflags & MNT_EXPORTANON)) {
 		cred->cr_uid = credanon->cr_uid;
-		for (i = 0; i < credanon->cr_ngroups && i < NGROUPS; i++)
-			cred->cr_groups[i] = credanon->cr_groups[i];
-		cred->cr_ngroups = i;
+		crsetgroups(cred, credanon->cr_ngroups, credanon->cr_groups);
 	}
 	if (exflags & MNT_EXRDONLY)
 		*rdonlyp = 1;

Modified: projects/ngroups/sys/rpc/authunix_prot.c
==============================================================================
--- projects/ngroups/sys/rpc/authunix_prot.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/rpc/authunix_prot.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -101,7 +101,7 @@ xdr_authunix_parms(XDR *xdrs, uint32_t *
 
 	if (!xdr_uint32_t(xdrs, &cred->cr_uid))
 		return (FALSE);
-	if (!xdr_uint32_t(xdrs, &cred->cr_groups[0]))
+	if (!xdr_uint32_t(xdrs, &cred->cr_gid))
 		return (FALSE);
 
 	if (xdrs->x_op == XDR_ENCODE) {

Modified: projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
==============================================================================
--- projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -447,11 +447,7 @@ rpc_gss_svc_getcred(struct svc_req *req,
 	cr = client->cl_cred = crget();
 	cr->cr_uid = cr->cr_ruid = cr->cr_svuid = uc->uid;
 	cr->cr_rgid = cr->cr_svgid = uc->gid;
-	cr->cr_ngroups = uc->gidlen;
-	if (cr->cr_ngroups > NGROUPS)
-		cr->cr_ngroups = NGROUPS;
-	for (i = 0; i < cr->cr_ngroups; i++)
-		cr->cr_groups[i] = uc->gidlist[i];
+	crsetgroups(cr, uc->gidlen, uc->gidlist);
 	*crp = crhold(cr);
 
 	return (TRUE);

Modified: projects/ngroups/sys/rpc/svc_auth.c
==============================================================================
--- projects/ngroups/sys/rpc/svc_auth.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/rpc/svc_auth.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -165,7 +165,7 @@ int
 svc_getcred(struct svc_req *rqst, struct ucred **crp, int *flavorp)
 {
 	struct ucred *cr = NULL;
-	int flavor, i;
+	int flavor;
 	struct xucred *xcr;
 
 	flavor = rqst->rq_cred.oa_flavor;
@@ -177,10 +177,8 @@ svc_getcred(struct svc_req *rqst, struct
 		xcr = (struct xucred *) rqst->rq_clntcred;
 		cr = crget();
 		cr->cr_uid = cr->cr_ruid = cr->cr_svuid = xcr->cr_uid;
-		cr->cr_ngroups = xcr->cr_ngroups;
-		for (i = 0; i < xcr->cr_ngroups; i++)
-			cr->cr_groups[i] = xcr->cr_groups[i];
-		cr->cr_rgid = cr->cr_svgid = cr->cr_groups[0];
+		crsetgroups(cr, xcr->cr_ngroups, xcr->cr_groups);
+		cr->cr_rgid = cr->cr_svgid = cr->cr_gid;
 		*crp = cr;
 		return (TRUE);
 

Modified: projects/ngroups/sys/rpc/svc_auth_unix.c
==============================================================================
--- projects/ngroups/sys/rpc/svc_auth_unix.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/rpc/svc_auth_unix.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -88,20 +88,20 @@ _svcauth_unix(struct svc_req *rqst, stru
 		str_len = RNDUP(str_len);
 		buf += str_len / sizeof (int32_t);
 		xcr->cr_uid = IXDR_GET_UINT32(buf);
-		xcr->cr_groups[0] = IXDR_GET_UINT32(buf);
+		xcr->cr_gid = IXDR_GET_UINT32(buf);
 		gid_len = (size_t)IXDR_GET_UINT32(buf);
 		if (gid_len > NGRPS) {
 			stat = AUTH_BADCRED;
 			goto done;
 		}
 		for (i = 0; i < gid_len; i++) {
-			if (i + 1 < NGROUPS)
+			if (i + 1 < XU_NGROUPS)
 				xcr->cr_groups[i + 1] = IXDR_GET_INT32(buf);
 			else
 				buf++;
 		}
-		if (gid_len + 1 > NGROUPS)
-			xcr->cr_ngroups = NGROUPS;
+		if (gid_len + 1 > XU_NGROUPS)
+			xcr->cr_ngroups = XU_NGROUPS;
 		else
 			xcr->cr_ngroups = gid_len + 1;
 

Modified: projects/ngroups/sys/security/audit/audit.c
==============================================================================
--- projects/ngroups/sys/security/audit/audit.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/security/audit/audit.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -224,7 +224,7 @@ audit_record_ctor(void *mem, int size, v
 	cru2x(cred, &ar->k_ar.ar_subj_cred);
 	ar->k_ar.ar_subj_ruid = cred->cr_ruid;
 	ar->k_ar.ar_subj_rgid = cred->cr_rgid;
-	ar->k_ar.ar_subj_egid = cred->cr_groups[0];
+	ar->k_ar.ar_subj_egid = cred->cr_gid;
 	ar->k_ar.ar_subj_auid = cred->cr_audit.ai_auid;
 	ar->k_ar.ar_subj_asid = cred->cr_audit.ai_asid;
 	ar->k_ar.ar_subj_pid = td->td_proc->p_pid;

Modified: projects/ngroups/sys/security/audit/audit_arg.c
==============================================================================
--- projects/ngroups/sys/security/audit/audit_arg.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/security/audit/audit_arg.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -369,7 +369,7 @@ audit_arg_process(struct proc *p)
 	cred = p->p_ucred;
 	ar->k_ar.ar_arg_auid = cred->cr_audit.ai_auid;
 	ar->k_ar.ar_arg_euid = cred->cr_uid;
-	ar->k_ar.ar_arg_egid = cred->cr_groups[0];
+	ar->k_ar.ar_arg_egid = cred->cr_gid;
 	ar->k_ar.ar_arg_ruid = cred->cr_ruid;
 	ar->k_ar.ar_arg_rgid = cred->cr_rgid;
 	ar->k_ar.ar_arg_asid = cred->cr_audit.ai_asid;

Modified: projects/ngroups/sys/sys/ucred.h
==============================================================================
--- projects/ngroups/sys/sys/ucred.h	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/sys/ucred.h	Fri Jun  5 20:23:22 2009	(r193534)
@@ -48,7 +48,7 @@ struct ucred {
 	uid_t	cr_uid;			/* effective user id */
 	uid_t	cr_ruid;		/* real user id */
 	uid_t	cr_svuid;		/* saved user id */
-	short	cr_ngroups;		/* number of groups */
+	int	cr_ngroups;		/* number of groups */
 	gid_t	cr_rgid;		/* real group id */
 	gid_t	cr_svgid;		/* saved group id */
 	struct uidinfo	*cr_uidinfo;	/* per euid resource consumption */
@@ -60,7 +60,7 @@ struct ucred {
 	struct label	*cr_label;	/* MAC label */
 	struct auditinfo_addr	cr_audit;	/* Audit properties. */
 	gid_t	*cr_groups;		/* groups */
-	short	cr_agroups;		/* Available groups */
+	int	cr_agroups;		/* Available groups */
 };
 #define	NOCRED	((struct ucred *)0)	/* no credential available */
 #define	FSCRED	((struct ucred *)-1)	/* filesystem credential */
@@ -94,7 +94,7 @@ void	change_ruid(struct ucred *newcred, 
 void	change_svgid(struct ucred *newcred, gid_t svgid);
 void	change_svuid(struct ucred *newcred, uid_t svuid);
 void	crcopy(struct ucred *dest, struct ucred *src);
-struct ucred	*crcopysafe(struct proc *, struct ucred *);
+struct ucred	*crcopysafe(struct proc *p, struct ucred *cr);
 struct ucred	*crdup(struct ucred *cr);
 void	cred_update_thread(struct thread *td);
 void	crfree(struct ucred *cr);
@@ -103,6 +103,7 @@ struct ucred	*crhold(struct ucred *cr);
 int	crshared(struct ucred *cr);
 void	cru2x(struct ucred *cr, struct xucred *xcr);
 void	crextend(struct ucred *cr, int n);
+void	crsetgroups(struct ucred *cr, int n, gid_t *groups);
 int	groupmember(gid_t gid, struct ucred *cred);
 #endif /* _KERNEL */
 

Modified: projects/ngroups/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- projects/ngroups/sys/ufs/ufs/ufs_vnops.c	Fri Jun  5 19:52:03 2009	(r193533)
+++ projects/ngroups/sys/ufs/ufs/ufs_vnops.c	Fri Jun  5 20:23:22 2009	(r193534)
@@ -1476,7 +1476,7 @@ ufs_mkdir(ap)
 				refcount_init(&ucred.cr_ref, 1);
 				ucred.cr_uid = ip->i_uid;
 				ucred.cr_ngroups = 1;
-				ucred.cr_groups[0] = dp->i_gid;
+				ucred.cr_gid = dp->i_gid;
 				ucp = &ucred;
 			}
 #endif
@@ -2267,6 +2267,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 	{
 #ifdef QUOTA
 		struct ucred ucred, *ucp;
+		gid_t ucred_group;
 		ucp = cnp->cn_cred;
 #endif
 		/*
@@ -2293,7 +2294,8 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 			refcount_init(&ucred.cr_ref, 1);
 			ucred.cr_uid = ip->i_uid;
 			ucred.cr_ngroups = 1;
-			ucred.cr_groups[0] = pdir->i_gid;
+			ucred.cr_groups = &ucred_group;
+			ucred.cr_gid = pdir->i_gid;
 			ucp = &ucred;
 #endif
 		} else {

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 21:00:24 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA62B106566B;
	Fri,  5 Jun 2009 21:00:24 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D30CF8FC15;
	Fri,  5 Jun 2009 21:00:24 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55L0OAs038081;
	Fri, 5 Jun 2009 21:00:24 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55L0NqM038059;
	Fri, 5 Jun 2009 21:00:23 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906052100.n55L0NqM038059@svn.freebsd.org>
From: Brooks Davis 
Date: Fri, 5 Jun 2009 21:00:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193537 - in projects/ngroups: . bin/cp bin/rm bin/sh
	contrib/bind9 contrib/bind9/bin contrib/bind9/bin/check
	contrib/bind9/bin/dig contrib/bind9/bin/dig/include/dig
	contrib/bind9/bin/d...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 05 Jun 2009 21:00:25 -0000

Author: brooks
Date: Fri Jun  5 21:00:21 2009
New Revision: 193537
URL: http://svn.freebsd.org/changeset/base/193537

Log:
  MFC @ r193535

Added:
  projects/ngroups/contrib/bind9/NSEC3-NOTES
     - copied unchanged from r193535, head/contrib/bind9/NSEC3-NOTES
  projects/ngroups/contrib/bind9/README.pkcs11
     - copied unchanged from r193535, head/contrib/bind9/README.pkcs11
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
     - copied unchanged from r193535, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  projects/ngroups/contrib/bind9/bin/named/bind9.xsl
     - copied unchanged from r193535, head/contrib/bind9/bin/named/bind9.xsl
  projects/ngroups/contrib/bind9/bin/named/bind9.xsl.h
     - copied unchanged from r193535, head/contrib/bind9/bin/named/bind9.xsl.h
  projects/ngroups/contrib/bind9/bin/named/convertxsl.pl
     - copied unchanged from r193535, head/contrib/bind9/bin/named/convertxsl.pl
  projects/ngroups/contrib/bind9/bin/named/include/named/statschannel.h
     - copied unchanged from r193535, head/contrib/bind9/bin/named/include/named/statschannel.h
  projects/ngroups/contrib/bind9/bin/named/statschannel.c
     - copied unchanged from r193535, head/contrib/bind9/bin/named/statschannel.c
  projects/ngroups/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
     - copied unchanged from r193535, head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/ngroups/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
     - copied unchanged from r193535, head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/ngroups/contrib/bind9/doc/arm/man.nsupdate.html
     - copied unchanged from r193535, head/contrib/bind9/doc/arm/man.nsupdate.html
  projects/ngroups/contrib/bind9/lib/dns/include/dns/iptable.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/include/dns/iptable.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/nsec3.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/ngroups/contrib/bind9/lib/dns/iptable.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/iptable.c
  projects/ngroups/contrib/bind9/lib/dns/nsec3.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/nsec3.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
  projects/ngroups/contrib/bind9/lib/dns/spnego.asn1
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/spnego.asn1
  projects/ngroups/contrib/bind9/lib/dns/spnego.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/spnego.c
  projects/ngroups/contrib/bind9/lib/dns/spnego.h
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/spnego.h
  projects/ngroups/contrib/bind9/lib/dns/spnego_asn1.c
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/spnego_asn1.c
  projects/ngroups/contrib/bind9/lib/dns/spnego_asn1.pl
     - copied unchanged from r193535, head/contrib/bind9/lib/dns/spnego_asn1.pl
  projects/ngroups/contrib/bind9/lib/isc/base32.c
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/base32.c
  projects/ngroups/contrib/bind9/lib/isc/httpd.c
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/httpd.c
  projects/ngroups/contrib/bind9/lib/isc/include/isc/base32.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/base32.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/httpd.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/httpd.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/iterated_hash.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/iterated_hash.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/radix.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/radix.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/stats.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/stats.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/xml.h
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/include/isc/xml.h
  projects/ngroups/contrib/bind9/lib/isc/iterated_hash.c
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/iterated_hash.c
  projects/ngroups/contrib/bind9/lib/isc/radix.c
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/radix.c
  projects/ngroups/contrib/bind9/lib/isc/stats.c
     - copied unchanged from r193535, head/contrib/bind9/lib/isc/stats.c
  projects/ngroups/etc/rc.d/nfscbd
     - copied unchanged from r193535, head/etc/rc.d/nfscbd
  projects/ngroups/etc/rc.d/nfsuserd
     - copied unchanged from r193535, head/etc/rc.d/nfsuserd
  projects/ngroups/share/man/man9/sglist.9
     - copied unchanged from r193535, head/share/man/man9/sglist.9
  projects/ngroups/sys/contrib/dev/acpica/changes.txt
     - copied unchanged from r193535, head/sys/contrib/dev/acpica/changes.txt
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslstartup.c
     - copied unchanged from r193535, head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/ngroups/sys/contrib/dev/acpica/debugger/
     - copied from r193535, head/sys/contrib/dev/acpica/debugger/
  projects/ngroups/sys/contrib/dev/acpica/disassembler/
     - copied from r193535, head/sys/contrib/dev/acpica/disassembler/
  projects/ngroups/sys/contrib/dev/acpica/dispatcher/
     - copied from r193535, head/sys/contrib/dev/acpica/dispatcher/
  projects/ngroups/sys/contrib/dev/acpica/events/
     - copied from r193535, head/sys/contrib/dev/acpica/events/
  projects/ngroups/sys/contrib/dev/acpica/executer/
     - copied from r193535, head/sys/contrib/dev/acpica/executer/
  projects/ngroups/sys/contrib/dev/acpica/hardware/
     - copied from r193535, head/sys/contrib/dev/acpica/hardware/
  projects/ngroups/sys/contrib/dev/acpica/include/
     - copied from r193535, head/sys/contrib/dev/acpica/include/
  projects/ngroups/sys/contrib/dev/acpica/namespace/
     - copied from r193535, head/sys/contrib/dev/acpica/namespace/
  projects/ngroups/sys/contrib/dev/acpica/parser/
     - copied from r193535, head/sys/contrib/dev/acpica/parser/
  projects/ngroups/sys/contrib/dev/acpica/resources/
     - copied from r193535, head/sys/contrib/dev/acpica/resources/
  projects/ngroups/sys/contrib/dev/acpica/tables/
     - copied from r193535, head/sys/contrib/dev/acpica/tables/
  projects/ngroups/sys/contrib/dev/acpica/tools/
     - copied from r193535, head/sys/contrib/dev/acpica/tools/
  projects/ngroups/sys/contrib/dev/acpica/utilities/
     - copied from r193535, head/sys/contrib/dev/acpica/utilities/
  projects/ngroups/sys/contrib/dev/mwl/
     - copied from r193535, head/sys/contrib/dev/mwl/
  projects/ngroups/sys/dev/mwl/
     - copied from r193535, head/sys/dev/mwl/
  projects/ngroups/sys/i386/include/xen/xen_clock_util.h
     - copied unchanged from r193535, head/sys/i386/include/xen/xen_clock_util.h
  projects/ngroups/sys/i386/xen/xen_clock_util.c
     - copied unchanged from r193535, head/sys/i386/xen/xen_clock_util.c
  projects/ngroups/sys/kern/subr_sglist.c
     - copied unchanged from r193535, head/sys/kern/subr_sglist.c
  projects/ngroups/sys/modules/mwl/
     - copied from r193535, head/sys/modules/mwl/
  projects/ngroups/sys/modules/mwlfw/
     - copied from r193535, head/sys/modules/mwlfw/
  projects/ngroups/sys/netinet/ipfw/
     - copied from r193535, head/sys/netinet/ipfw/
  projects/ngroups/sys/powerpc/cpufreq/
     - copied from r193535, head/sys/powerpc/cpufreq/
  projects/ngroups/sys/powerpc/ofw/ofw_cpu.c
     - copied unchanged from r193535, head/sys/powerpc/ofw/ofw_cpu.c
  projects/ngroups/sys/powerpc/powermac/vcoregpio.c
     - copied unchanged from r193535, head/sys/powerpc/powermac/vcoregpio.c
  projects/ngroups/sys/sys/sglist.h
     - copied unchanged from r193535, head/sys/sys/sglist.h
  projects/ngroups/tools/build/options/WITH_BIND_IDN
     - copied unchanged from r193535, head/tools/build/options/WITH_BIND_IDN
  projects/ngroups/tools/build/options/WITH_BIND_LARGE_FILE
     - copied unchanged from r193535, head/tools/build/options/WITH_BIND_LARGE_FILE
  projects/ngroups/tools/build/options/WITH_BIND_SIGCHASE
     - copied unchanged from r193535, head/tools/build/options/WITH_BIND_SIGCHASE
  projects/ngroups/tools/build/options/WITH_BIND_XML
     - copied unchanged from r193535, head/tools/build/options/WITH_BIND_XML
  projects/ngroups/tools/regression/bin/sh/builtins/eval1.0
     - copied unchanged from r193535, head/tools/regression/bin/sh/builtins/eval1.0
  projects/ngroups/tools/regression/bin/sh/set-e/eval1.0
     - copied unchanged from r193535, head/tools/regression/bin/sh/set-e/eval1.0
  projects/ngroups/tools/regression/bin/sh/set-e/eval2.1
     - copied unchanged from r193535, head/tools/regression/bin/sh/set-e/eval2.1
  projects/ngroups/tools/tools/mwl/
     - copied from r193535, head/tools/tools/mwl/
  projects/ngroups/usr.bin/ee/nls/hu_HU.ISO8859-2/
     - copied from r193535, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
  projects/ngroups/usr.sbin/dnssec-dsfromkey/
     - copied from r193535, head/usr.sbin/dnssec-dsfromkey/
  projects/ngroups/usr.sbin/dnssec-keyfromlabel/
     - copied from r193535, head/usr.sbin/dnssec-keyfromlabel/
Replaced:
  projects/ngroups/contrib/bind9/isc-config.sh.in
     - copied unchanged from r193535, head/contrib/bind9/isc-config.sh.in
  projects/ngroups/tools/build/options/WITH_BIND_LIBS
     - copied unchanged from r193535, head/tools/build/options/WITH_BIND_LIBS
Deleted:
  projects/ngroups/contrib/bind9/doc/draft/
  projects/ngroups/contrib/bind9/doc/rfc/
  projects/ngroups/contrib/bind9/lib/bind/
  projects/ngroups/etc/rc.d/early.sh
  projects/ngroups/lib/bind/bind/
  projects/ngroups/sys/amd64/conf/MAC
  projects/ngroups/sys/contrib/dev/acpica/CHANGES.txt
  projects/ngroups/sys/contrib/dev/acpica/acapps.h
  projects/ngroups/sys/contrib/dev/acpica/acconfig.h
  projects/ngroups/sys/contrib/dev/acpica/acdebug.h
  projects/ngroups/sys/contrib/dev/acpica/acdisasm.h
  projects/ngroups/sys/contrib/dev/acpica/acdispat.h
  projects/ngroups/sys/contrib/dev/acpica/acefi.h
  projects/ngroups/sys/contrib/dev/acpica/acenv.h
  projects/ngroups/sys/contrib/dev/acpica/acevents.h
  projects/ngroups/sys/contrib/dev/acpica/acexcep.h
  projects/ngroups/sys/contrib/dev/acpica/acfreebsd.h
  projects/ngroups/sys/contrib/dev/acpica/acgcc.h
  projects/ngroups/sys/contrib/dev/acpica/acglobal.h
  projects/ngroups/sys/contrib/dev/acpica/achware.h
  projects/ngroups/sys/contrib/dev/acpica/acinterp.h
  projects/ngroups/sys/contrib/dev/acpica/aclocal.h
  projects/ngroups/sys/contrib/dev/acpica/acmacros.h
  projects/ngroups/sys/contrib/dev/acpica/acnames.h
  projects/ngroups/sys/contrib/dev/acpica/acnamesp.h
  projects/ngroups/sys/contrib/dev/acpica/acobject.h
  projects/ngroups/sys/contrib/dev/acpica/acopcode.h
  projects/ngroups/sys/contrib/dev/acpica/acoutput.h
  projects/ngroups/sys/contrib/dev/acpica/acparser.h
  projects/ngroups/sys/contrib/dev/acpica/acpi.h
  projects/ngroups/sys/contrib/dev/acpica/acpiosxf.h
  projects/ngroups/sys/contrib/dev/acpica/acpixf.h
  projects/ngroups/sys/contrib/dev/acpica/acresrc.h
  projects/ngroups/sys/contrib/dev/acpica/acstruct.h
  projects/ngroups/sys/contrib/dev/acpica/actables.h
  projects/ngroups/sys/contrib/dev/acpica/actbl.h
  projects/ngroups/sys/contrib/dev/acpica/actbl1.h
  projects/ngroups/sys/contrib/dev/acpica/actbl2.h
  projects/ngroups/sys/contrib/dev/acpica/actypes.h
  projects/ngroups/sys/contrib/dev/acpica/acutils.h
  projects/ngroups/sys/contrib/dev/acpica/aecommon.h
  projects/ngroups/sys/contrib/dev/acpica/amlcode.h
  projects/ngroups/sys/contrib/dev/acpica/amlresrc.h
  projects/ngroups/sys/contrib/dev/acpica/dbcmds.c
  projects/ngroups/sys/contrib/dev/acpica/dbdisply.c
  projects/ngroups/sys/contrib/dev/acpica/dbexec.c
  projects/ngroups/sys/contrib/dev/acpica/dbfileio.c
  projects/ngroups/sys/contrib/dev/acpica/dbhistry.c
  projects/ngroups/sys/contrib/dev/acpica/dbinput.c
  projects/ngroups/sys/contrib/dev/acpica/dbstats.c
  projects/ngroups/sys/contrib/dev/acpica/dbutils.c
  projects/ngroups/sys/contrib/dev/acpica/dbxface.c
  projects/ngroups/sys/contrib/dev/acpica/dmbuffer.c
  projects/ngroups/sys/contrib/dev/acpica/dmnames.c
  projects/ngroups/sys/contrib/dev/acpica/dmobject.c
  projects/ngroups/sys/contrib/dev/acpica/dmopcode.c
  projects/ngroups/sys/contrib/dev/acpica/dmresrc.c
  projects/ngroups/sys/contrib/dev/acpica/dmresrcl.c
  projects/ngroups/sys/contrib/dev/acpica/dmresrcs.c
  projects/ngroups/sys/contrib/dev/acpica/dmutils.c
  projects/ngroups/sys/contrib/dev/acpica/dmwalk.c
  projects/ngroups/sys/contrib/dev/acpica/dsfield.c
  projects/ngroups/sys/contrib/dev/acpica/dsinit.c
  projects/ngroups/sys/contrib/dev/acpica/dsmethod.c
  projects/ngroups/sys/contrib/dev/acpica/dsmthdat.c
  projects/ngroups/sys/contrib/dev/acpica/dsobject.c
  projects/ngroups/sys/contrib/dev/acpica/dsopcode.c
  projects/ngroups/sys/contrib/dev/acpica/dsutils.c
  projects/ngroups/sys/contrib/dev/acpica/dswexec.c
  projects/ngroups/sys/contrib/dev/acpica/dswload.c
  projects/ngroups/sys/contrib/dev/acpica/dswscope.c
  projects/ngroups/sys/contrib/dev/acpica/dswstate.c
  projects/ngroups/sys/contrib/dev/acpica/evevent.c
  projects/ngroups/sys/contrib/dev/acpica/evgpe.c
  projects/ngroups/sys/contrib/dev/acpica/evgpeblk.c
  projects/ngroups/sys/contrib/dev/acpica/evmisc.c
  projects/ngroups/sys/contrib/dev/acpica/evregion.c
  projects/ngroups/sys/contrib/dev/acpica/evrgnini.c
  projects/ngroups/sys/contrib/dev/acpica/evsci.c
  projects/ngroups/sys/contrib/dev/acpica/evxface.c
  projects/ngroups/sys/contrib/dev/acpica/evxfevnt.c
  projects/ngroups/sys/contrib/dev/acpica/evxfregn.c
  projects/ngroups/sys/contrib/dev/acpica/exconfig.c
  projects/ngroups/sys/contrib/dev/acpica/exconvrt.c
  projects/ngroups/sys/contrib/dev/acpica/excreate.c
  projects/ngroups/sys/contrib/dev/acpica/exdump.c
  projects/ngroups/sys/contrib/dev/acpica/exfield.c
  projects/ngroups/sys/contrib/dev/acpica/exfldio.c
  projects/ngroups/sys/contrib/dev/acpica/exmisc.c
  projects/ngroups/sys/contrib/dev/acpica/exmutex.c
  projects/ngroups/sys/contrib/dev/acpica/exnames.c
  projects/ngroups/sys/contrib/dev/acpica/exoparg1.c
  projects/ngroups/sys/contrib/dev/acpica/exoparg2.c
  projects/ngroups/sys/contrib/dev/acpica/exoparg3.c
  projects/ngroups/sys/contrib/dev/acpica/exoparg6.c
  projects/ngroups/sys/contrib/dev/acpica/exprep.c
  projects/ngroups/sys/contrib/dev/acpica/exregion.c
  projects/ngroups/sys/contrib/dev/acpica/exresnte.c
  projects/ngroups/sys/contrib/dev/acpica/exresolv.c
  projects/ngroups/sys/contrib/dev/acpica/exresop.c
  projects/ngroups/sys/contrib/dev/acpica/exstore.c
  projects/ngroups/sys/contrib/dev/acpica/exstoren.c
  projects/ngroups/sys/contrib/dev/acpica/exstorob.c
  projects/ngroups/sys/contrib/dev/acpica/exsystem.c
  projects/ngroups/sys/contrib/dev/acpica/exutils.c
  projects/ngroups/sys/contrib/dev/acpica/hwacpi.c
  projects/ngroups/sys/contrib/dev/acpica/hwgpe.c
  projects/ngroups/sys/contrib/dev/acpica/hwregs.c
  projects/ngroups/sys/contrib/dev/acpica/hwsleep.c
  projects/ngroups/sys/contrib/dev/acpica/hwtimer.c
  projects/ngroups/sys/contrib/dev/acpica/nsaccess.c
  projects/ngroups/sys/contrib/dev/acpica/nsalloc.c
  projects/ngroups/sys/contrib/dev/acpica/nsdump.c
  projects/ngroups/sys/contrib/dev/acpica/nsdumpdv.c
  projects/ngroups/sys/contrib/dev/acpica/nseval.c
  projects/ngroups/sys/contrib/dev/acpica/nsinit.c
  projects/ngroups/sys/contrib/dev/acpica/nsload.c
  projects/ngroups/sys/contrib/dev/acpica/nsnames.c
  projects/ngroups/sys/contrib/dev/acpica/nsobject.c
  projects/ngroups/sys/contrib/dev/acpica/nsparse.c
  projects/ngroups/sys/contrib/dev/acpica/nssearch.c
  projects/ngroups/sys/contrib/dev/acpica/nsutils.c
  projects/ngroups/sys/contrib/dev/acpica/nswalk.c
  projects/ngroups/sys/contrib/dev/acpica/nsxfeval.c
  projects/ngroups/sys/contrib/dev/acpica/nsxfname.c
  projects/ngroups/sys/contrib/dev/acpica/nsxfobj.c
  projects/ngroups/sys/contrib/dev/acpica/psargs.c
  projects/ngroups/sys/contrib/dev/acpica/psloop.c
  projects/ngroups/sys/contrib/dev/acpica/psopcode.c
  projects/ngroups/sys/contrib/dev/acpica/psparse.c
  projects/ngroups/sys/contrib/dev/acpica/psscope.c
  projects/ngroups/sys/contrib/dev/acpica/pstree.c
  projects/ngroups/sys/contrib/dev/acpica/psutils.c
  projects/ngroups/sys/contrib/dev/acpica/pswalk.c
  projects/ngroups/sys/contrib/dev/acpica/psxface.c
  projects/ngroups/sys/contrib/dev/acpica/rsaddr.c
  projects/ngroups/sys/contrib/dev/acpica/rscalc.c
  projects/ngroups/sys/contrib/dev/acpica/rscreate.c
  projects/ngroups/sys/contrib/dev/acpica/rsdump.c
  projects/ngroups/sys/contrib/dev/acpica/rsinfo.c
  projects/ngroups/sys/contrib/dev/acpica/rsio.c
  projects/ngroups/sys/contrib/dev/acpica/rsirq.c
  projects/ngroups/sys/contrib/dev/acpica/rslist.c
  projects/ngroups/sys/contrib/dev/acpica/rsmemory.c
  projects/ngroups/sys/contrib/dev/acpica/rsmisc.c
  projects/ngroups/sys/contrib/dev/acpica/rsutils.c
  projects/ngroups/sys/contrib/dev/acpica/rsxface.c
  projects/ngroups/sys/contrib/dev/acpica/tbfadt.c
  projects/ngroups/sys/contrib/dev/acpica/tbfind.c
  projects/ngroups/sys/contrib/dev/acpica/tbinstal.c
  projects/ngroups/sys/contrib/dev/acpica/tbutils.c
  projects/ngroups/sys/contrib/dev/acpica/tbxface.c
  projects/ngroups/sys/contrib/dev/acpica/tbxfroot.c
  projects/ngroups/sys/contrib/dev/acpica/utalloc.c
  projects/ngroups/sys/contrib/dev/acpica/utcache.c
  projects/ngroups/sys/contrib/dev/acpica/utclib.c
  projects/ngroups/sys/contrib/dev/acpica/utcopy.c
  projects/ngroups/sys/contrib/dev/acpica/utdebug.c
  projects/ngroups/sys/contrib/dev/acpica/utdelete.c
  projects/ngroups/sys/contrib/dev/acpica/uteval.c
  projects/ngroups/sys/contrib/dev/acpica/utglobal.c
  projects/ngroups/sys/contrib/dev/acpica/utinit.c
  projects/ngroups/sys/contrib/dev/acpica/utmath.c
  projects/ngroups/sys/contrib/dev/acpica/utmisc.c
  projects/ngroups/sys/contrib/dev/acpica/utmutex.c
  projects/ngroups/sys/contrib/dev/acpica/utobject.c
  projects/ngroups/sys/contrib/dev/acpica/utresrc.c
  projects/ngroups/sys/contrib/dev/acpica/utstate.c
  projects/ngroups/sys/contrib/dev/acpica/uttrack.c
  projects/ngroups/sys/contrib/dev/acpica/utxface.c
  projects/ngroups/sys/gnu/fs/ext2fs/sparc64-bitops.h
  projects/ngroups/sys/i386/conf/MAC
  projects/ngroups/sys/ia64/conf/MAC
  projects/ngroups/sys/kern/subr_clist.c
  projects/ngroups/sys/netinet/ip_dummynet.c
  projects/ngroups/sys/netinet/ip_fw2.c
  projects/ngroups/sys/netinet/ip_fw_nat.c
  projects/ngroups/sys/netinet/ip_fw_pfil.c
  projects/ngroups/sys/pc98/conf/MAC
  projects/ngroups/sys/powerpc/conf/MAC
  projects/ngroups/sys/sparc64/conf/MAC
  projects/ngroups/sys/sun4v/conf/MAC
  projects/ngroups/sys/sys/clist.h
  projects/ngroups/usr.bin/window/
Modified:
  projects/ngroups/   (props changed)
  projects/ngroups/ObsoleteFiles.inc
  projects/ngroups/UPDATING
  projects/ngroups/bin/cp/utils.c
  projects/ngroups/bin/rm/rm.c
  projects/ngroups/bin/sh/alias.c
  projects/ngroups/bin/sh/eval.c
  projects/ngroups/bin/sh/eval.h
  projects/ngroups/bin/sh/exec.c
  projects/ngroups/bin/sh/histedit.c
  projects/ngroups/bin/sh/main.c
  projects/ngroups/bin/sh/memalloc.c
  projects/ngroups/bin/sh/memalloc.h
  projects/ngroups/bin/sh/miscbltin.c
  projects/ngroups/bin/sh/mkinit.c
  projects/ngroups/bin/sh/mksyntax.c
  projects/ngroups/bin/sh/parser.c
  projects/ngroups/bin/sh/sh.1
  projects/ngroups/bin/sh/trap.c
  projects/ngroups/bin/sh/var.c
  projects/ngroups/contrib/bind9/   (props changed)
  projects/ngroups/contrib/bind9/CHANGES
  projects/ngroups/contrib/bind9/COPYRIGHT
  projects/ngroups/contrib/bind9/FAQ
  projects/ngroups/contrib/bind9/FAQ.xml
  projects/ngroups/contrib/bind9/Makefile.in
  projects/ngroups/contrib/bind9/README
  projects/ngroups/contrib/bind9/README.idnkit
  projects/ngroups/contrib/bind9/acconfig.h
  projects/ngroups/contrib/bind9/bin/Makefile.in
  projects/ngroups/contrib/bind9/bin/check/Makefile.in
  projects/ngroups/contrib/bind9/bin/check/check-tool.c
  projects/ngroups/contrib/bind9/bin/check/check-tool.h
  projects/ngroups/contrib/bind9/bin/check/named-checkconf.8
  projects/ngroups/contrib/bind9/bin/check/named-checkconf.c
  projects/ngroups/contrib/bind9/bin/check/named-checkconf.docbook
  projects/ngroups/contrib/bind9/bin/check/named-checkconf.html
  projects/ngroups/contrib/bind9/bin/check/named-checkzone.8
  projects/ngroups/contrib/bind9/bin/check/named-checkzone.c
  projects/ngroups/contrib/bind9/bin/check/named-checkzone.docbook
  projects/ngroups/contrib/bind9/bin/check/named-checkzone.html
  projects/ngroups/contrib/bind9/bin/dig/Makefile.in
  projects/ngroups/contrib/bind9/bin/dig/dig.1
  projects/ngroups/contrib/bind9/bin/dig/dig.c
  projects/ngroups/contrib/bind9/bin/dig/dig.docbook
  projects/ngroups/contrib/bind9/bin/dig/dig.html
  projects/ngroups/contrib/bind9/bin/dig/dighost.c
  projects/ngroups/contrib/bind9/bin/dig/host.1
  projects/ngroups/contrib/bind9/bin/dig/host.c
  projects/ngroups/contrib/bind9/bin/dig/host.docbook
  projects/ngroups/contrib/bind9/bin/dig/host.html
  projects/ngroups/contrib/bind9/bin/dig/include/dig/dig.h
  projects/ngroups/contrib/bind9/bin/dig/nslookup.1
  projects/ngroups/contrib/bind9/bin/dig/nslookup.c
  projects/ngroups/contrib/bind9/bin/dig/nslookup.docbook
  projects/ngroups/contrib/bind9/bin/dig/nslookup.html
  projects/ngroups/contrib/bind9/bin/dnssec/Makefile.in
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keygen.8
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-keygen.html
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-signzone.8
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  projects/ngroups/contrib/bind9/bin/dnssec/dnssec-signzone.html
  projects/ngroups/contrib/bind9/bin/dnssec/dnssectool.c
  projects/ngroups/contrib/bind9/bin/dnssec/dnssectool.h
  projects/ngroups/contrib/bind9/bin/named/Makefile.in
  projects/ngroups/contrib/bind9/bin/named/builtin.c
  projects/ngroups/contrib/bind9/bin/named/client.c
  projects/ngroups/contrib/bind9/bin/named/config.c
  projects/ngroups/contrib/bind9/bin/named/control.c
  projects/ngroups/contrib/bind9/bin/named/controlconf.c
  projects/ngroups/contrib/bind9/bin/named/include/named/builtin.h
  projects/ngroups/contrib/bind9/bin/named/include/named/client.h
  projects/ngroups/contrib/bind9/bin/named/include/named/config.h
  projects/ngroups/contrib/bind9/bin/named/include/named/control.h
  projects/ngroups/contrib/bind9/bin/named/include/named/globals.h
  projects/ngroups/contrib/bind9/bin/named/include/named/interfacemgr.h
  projects/ngroups/contrib/bind9/bin/named/include/named/listenlist.h
  projects/ngroups/contrib/bind9/bin/named/include/named/log.h
  projects/ngroups/contrib/bind9/bin/named/include/named/logconf.h
  projects/ngroups/contrib/bind9/bin/named/include/named/lwaddr.h
  projects/ngroups/contrib/bind9/bin/named/include/named/lwdclient.h
  projects/ngroups/contrib/bind9/bin/named/include/named/lwresd.h
  projects/ngroups/contrib/bind9/bin/named/include/named/lwsearch.h
  projects/ngroups/contrib/bind9/bin/named/include/named/main.h
  projects/ngroups/contrib/bind9/bin/named/include/named/notify.h
  projects/ngroups/contrib/bind9/bin/named/include/named/ns_smf_globals.h
  projects/ngroups/contrib/bind9/bin/named/include/named/query.h
  projects/ngroups/contrib/bind9/bin/named/include/named/server.h
  projects/ngroups/contrib/bind9/bin/named/include/named/sortlist.h
  projects/ngroups/contrib/bind9/bin/named/include/named/tkeyconf.h
  projects/ngroups/contrib/bind9/bin/named/include/named/tsigconf.h
  projects/ngroups/contrib/bind9/bin/named/include/named/types.h
  projects/ngroups/contrib/bind9/bin/named/include/named/update.h
  projects/ngroups/contrib/bind9/bin/named/include/named/xfrout.h
  projects/ngroups/contrib/bind9/bin/named/include/named/zoneconf.h
  projects/ngroups/contrib/bind9/bin/named/interfacemgr.c
  projects/ngroups/contrib/bind9/bin/named/listenlist.c
  projects/ngroups/contrib/bind9/bin/named/log.c
  projects/ngroups/contrib/bind9/bin/named/logconf.c
  projects/ngroups/contrib/bind9/bin/named/lwaddr.c
  projects/ngroups/contrib/bind9/bin/named/lwdclient.c
  projects/ngroups/contrib/bind9/bin/named/lwderror.c
  projects/ngroups/contrib/bind9/bin/named/lwdgabn.c
  projects/ngroups/contrib/bind9/bin/named/lwdgnba.c
  projects/ngroups/contrib/bind9/bin/named/lwdgrbn.c
  projects/ngroups/contrib/bind9/bin/named/lwdnoop.c
  projects/ngroups/contrib/bind9/bin/named/lwresd.8
  projects/ngroups/contrib/bind9/bin/named/lwresd.c
  projects/ngroups/contrib/bind9/bin/named/lwresd.docbook
  projects/ngroups/contrib/bind9/bin/named/lwresd.html
  projects/ngroups/contrib/bind9/bin/named/lwsearch.c
  projects/ngroups/contrib/bind9/bin/named/main.c
  projects/ngroups/contrib/bind9/bin/named/named.8
  projects/ngroups/contrib/bind9/bin/named/named.conf.5
  projects/ngroups/contrib/bind9/bin/named/named.conf.docbook
  projects/ngroups/contrib/bind9/bin/named/named.conf.html
  projects/ngroups/contrib/bind9/bin/named/named.docbook
  projects/ngroups/contrib/bind9/bin/named/named.html
  projects/ngroups/contrib/bind9/bin/named/notify.c
  projects/ngroups/contrib/bind9/bin/named/query.c
  projects/ngroups/contrib/bind9/bin/named/server.c
  projects/ngroups/contrib/bind9/bin/named/sortlist.c
  projects/ngroups/contrib/bind9/bin/named/tkeyconf.c
  projects/ngroups/contrib/bind9/bin/named/tsigconf.c
  projects/ngroups/contrib/bind9/bin/named/unix/Makefile.in
  projects/ngroups/contrib/bind9/bin/named/unix/include/named/os.h
  projects/ngroups/contrib/bind9/bin/named/unix/os.c
  projects/ngroups/contrib/bind9/bin/named/update.c
  projects/ngroups/contrib/bind9/bin/named/xfrout.c
  projects/ngroups/contrib/bind9/bin/named/zoneconf.c
  projects/ngroups/contrib/bind9/bin/nsupdate/Makefile.in
  projects/ngroups/contrib/bind9/bin/nsupdate/nsupdate.1
  projects/ngroups/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/ngroups/contrib/bind9/bin/nsupdate/nsupdate.docbook
  projects/ngroups/contrib/bind9/bin/nsupdate/nsupdate.html
  projects/ngroups/contrib/bind9/bin/rndc/Makefile.in
  projects/ngroups/contrib/bind9/bin/rndc/include/rndc/os.h
  projects/ngroups/contrib/bind9/bin/rndc/rndc-confgen.8
  projects/ngroups/contrib/bind9/bin/rndc/rndc-confgen.c
  projects/ngroups/contrib/bind9/bin/rndc/rndc-confgen.docbook
  projects/ngroups/contrib/bind9/bin/rndc/rndc-confgen.html
  projects/ngroups/contrib/bind9/bin/rndc/rndc.8
  projects/ngroups/contrib/bind9/bin/rndc/rndc.c
  projects/ngroups/contrib/bind9/bin/rndc/rndc.conf
  projects/ngroups/contrib/bind9/bin/rndc/rndc.conf.5
  projects/ngroups/contrib/bind9/bin/rndc/rndc.conf.docbook
  projects/ngroups/contrib/bind9/bin/rndc/rndc.conf.html
  projects/ngroups/contrib/bind9/bin/rndc/rndc.docbook
  projects/ngroups/contrib/bind9/bin/rndc/rndc.html
  projects/ngroups/contrib/bind9/bin/rndc/unix/Makefile.in
  projects/ngroups/contrib/bind9/bin/rndc/unix/os.c
  projects/ngroups/contrib/bind9/bin/rndc/util.c
  projects/ngroups/contrib/bind9/bin/rndc/util.h
  projects/ngroups/contrib/bind9/config.guess
  projects/ngroups/contrib/bind9/config.h.in
  projects/ngroups/contrib/bind9/configure.in
  projects/ngroups/contrib/bind9/doc/Makefile.in
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.html
  projects/ngroups/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/ngroups/contrib/bind9/doc/arm/Makefile.in
  projects/ngroups/contrib/bind9/doc/arm/man.dig.html
  projects/ngroups/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/ngroups/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/ngroups/contrib/bind9/doc/arm/man.host.html
  projects/ngroups/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/ngroups/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/ngroups/contrib/bind9/doc/arm/man.named.html
  projects/ngroups/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/ngroups/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/ngroups/contrib/bind9/doc/arm/man.rndc.html
  projects/ngroups/contrib/bind9/doc/misc/Makefile.in
  projects/ngroups/contrib/bind9/doc/misc/format-options.pl
  projects/ngroups/contrib/bind9/doc/misc/ipv6
  projects/ngroups/contrib/bind9/doc/misc/migration
  projects/ngroups/contrib/bind9/doc/misc/options
  projects/ngroups/contrib/bind9/doc/misc/sort-options.pl
  projects/ngroups/contrib/bind9/lib/Makefile.in
  projects/ngroups/contrib/bind9/lib/bind9/Makefile.in
  projects/ngroups/contrib/bind9/lib/bind9/api
  projects/ngroups/contrib/bind9/lib/bind9/check.c
  projects/ngroups/contrib/bind9/lib/bind9/getaddresses.c
  projects/ngroups/contrib/bind9/lib/bind9/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/bind9/include/bind9/Makefile.in
  projects/ngroups/contrib/bind9/lib/bind9/include/bind9/check.h
  projects/ngroups/contrib/bind9/lib/bind9/include/bind9/getaddresses.h
  projects/ngroups/contrib/bind9/lib/bind9/include/bind9/version.h
  projects/ngroups/contrib/bind9/lib/bind9/version.c
  projects/ngroups/contrib/bind9/lib/dns/Makefile.in
  projects/ngroups/contrib/bind9/lib/dns/acache.c
  projects/ngroups/contrib/bind9/lib/dns/acl.c
  projects/ngroups/contrib/bind9/lib/dns/adb.c
  projects/ngroups/contrib/bind9/lib/dns/api
  projects/ngroups/contrib/bind9/lib/dns/byaddr.c
  projects/ngroups/contrib/bind9/lib/dns/cache.c
  projects/ngroups/contrib/bind9/lib/dns/callbacks.c
  projects/ngroups/contrib/bind9/lib/dns/compress.c
  projects/ngroups/contrib/bind9/lib/dns/db.c
  projects/ngroups/contrib/bind9/lib/dns/dbiterator.c
  projects/ngroups/contrib/bind9/lib/dns/dbtable.c
  projects/ngroups/contrib/bind9/lib/dns/diff.c
  projects/ngroups/contrib/bind9/lib/dns/dispatch.c
  projects/ngroups/contrib/bind9/lib/dns/dlz.c
  projects/ngroups/contrib/bind9/lib/dns/dnssec.c
  projects/ngroups/contrib/bind9/lib/dns/ds.c
  projects/ngroups/contrib/bind9/lib/dns/dst_api.c
  projects/ngroups/contrib/bind9/lib/dns/dst_internal.h
  projects/ngroups/contrib/bind9/lib/dns/dst_lib.c
  projects/ngroups/contrib/bind9/lib/dns/dst_openssl.h
  projects/ngroups/contrib/bind9/lib/dns/dst_parse.c
  projects/ngroups/contrib/bind9/lib/dns/dst_parse.h
  projects/ngroups/contrib/bind9/lib/dns/dst_result.c
  projects/ngroups/contrib/bind9/lib/dns/forward.c
  projects/ngroups/contrib/bind9/lib/dns/gen-unix.h
  projects/ngroups/contrib/bind9/lib/dns/gen.c
  projects/ngroups/contrib/bind9/lib/dns/gssapi_link.c
  projects/ngroups/contrib/bind9/lib/dns/gssapictx.c
  projects/ngroups/contrib/bind9/lib/dns/hmac_link.c
  projects/ngroups/contrib/bind9/lib/dns/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/dns/include/dns/Makefile.in
  projects/ngroups/contrib/bind9/lib/dns/include/dns/acache.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/acl.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/adb.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/bit.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/byaddr.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/cache.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/callbacks.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/cert.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/compress.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/db.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/dbiterator.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/dbtable.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/diff.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/dispatch.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/dlz.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/dnssec.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/ds.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/events.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/fixedname.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/forward.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/journal.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/keyflags.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/keytable.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/keyvalues.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/lib.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/log.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/lookup.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/master.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/masterdump.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/message.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/name.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/ncache.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/opcode.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/order.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/peer.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/portlist.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rbt.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rcode.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdataclass.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdatalist.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdataset.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdatasetiter.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdataslab.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rdatatype.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/request.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/resolver.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/result.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/rootns.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/sdlz.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/secalg.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/secproto.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/soa.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/ssu.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/stats.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/tcpmsg.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/time.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/timer.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/tkey.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/tsig.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/ttl.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/types.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/validator.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/version.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/view.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/xfrin.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/zone.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/zonekey.h
  projects/ngroups/contrib/bind9/lib/dns/include/dns/zt.h
  projects/ngroups/contrib/bind9/lib/dns/include/dst/Makefile.in
  projects/ngroups/contrib/bind9/lib/dns/include/dst/dst.h
  projects/ngroups/contrib/bind9/lib/dns/include/dst/gssapi.h
  projects/ngroups/contrib/bind9/lib/dns/include/dst/lib.h
  projects/ngroups/contrib/bind9/lib/dns/include/dst/result.h
  projects/ngroups/contrib/bind9/lib/dns/journal.c
  projects/ngroups/contrib/bind9/lib/dns/key.c
  projects/ngroups/contrib/bind9/lib/dns/keytable.c
  projects/ngroups/contrib/bind9/lib/dns/lib.c
  projects/ngroups/contrib/bind9/lib/dns/log.c
  projects/ngroups/contrib/bind9/lib/dns/lookup.c
  projects/ngroups/contrib/bind9/lib/dns/master.c
  projects/ngroups/contrib/bind9/lib/dns/masterdump.c
  projects/ngroups/contrib/bind9/lib/dns/message.c
  projects/ngroups/contrib/bind9/lib/dns/name.c
  projects/ngroups/contrib/bind9/lib/dns/ncache.c
  projects/ngroups/contrib/bind9/lib/dns/nsec.c
  projects/ngroups/contrib/bind9/lib/dns/openssl_link.c
  projects/ngroups/contrib/bind9/lib/dns/openssldh_link.c
  projects/ngroups/contrib/bind9/lib/dns/openssldsa_link.c
  projects/ngroups/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/ngroups/contrib/bind9/lib/dns/order.c
  projects/ngroups/contrib/bind9/lib/dns/peer.c
  projects/ngroups/contrib/bind9/lib/dns/portlist.c
  projects/ngroups/contrib/bind9/lib/dns/rbt.c
  projects/ngroups/contrib/bind9/lib/dns/rbtdb.c
  projects/ngroups/contrib/bind9/lib/dns/rbtdb.h
  projects/ngroups/contrib/bind9/lib/dns/rbtdb64.c
  projects/ngroups/contrib/bind9/lib/dns/rbtdb64.h
  projects/ngroups/contrib/bind9/lib/dns/rcode.c
  projects/ngroups/contrib/bind9/lib/dns/rdata.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/ch_3/a_1.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/ch_3/a_1.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/cert_37.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/cname_5.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/cname_5.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dname_39.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dname_39.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ds_43.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/gpos_27.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/gpos_27.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/isdn_20.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/isdn_20.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/key_25.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/key_25.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/loc_29.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/loc_29.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mb_7.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mb_7.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/md_3.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/md_3.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mf_4.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mf_4.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mg_8.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mg_8.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/minfo_14.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/minfo_14.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mr_9.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mr_9.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/mx_15.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ns_2.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ns_2.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/null_10.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/null_10.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nxt_30.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/nxt_30.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/opt_41.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/proforma.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/proforma.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ptr_12.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/ptr_12.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rp_17.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rp_17.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rt_21.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/rt_21.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/sig_24.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/soa_6.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/spf_99.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/spf_99.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/tkey_249.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/txt_16.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/unspec_103.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/unspec_103.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/x25_19.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/generic/x25_19.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/hs_4/a_1.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/hs_4/a_1.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/a6_38.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/a6_38.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/a_1.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/a_1.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/apl_42.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/kx_36.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/kx_36.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/px_26.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/px_26.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/srv_33.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/srv_33.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/wks_11.c
  projects/ngroups/contrib/bind9/lib/dns/rdata/in_1/wks_11.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/rdatastructpre.h
  projects/ngroups/contrib/bind9/lib/dns/rdata/rdatastructsuf.h
  projects/ngroups/contrib/bind9/lib/dns/rdatalist.c
  projects/ngroups/contrib/bind9/lib/dns/rdatalist_p.h
  projects/ngroups/contrib/bind9/lib/dns/rdataset.c
  projects/ngroups/contrib/bind9/lib/dns/rdatasetiter.c
  projects/ngroups/contrib/bind9/lib/dns/rdataslab.c
  projects/ngroups/contrib/bind9/lib/dns/request.c
  projects/ngroups/contrib/bind9/lib/dns/resolver.c
  projects/ngroups/contrib/bind9/lib/dns/result.c
  projects/ngroups/contrib/bind9/lib/dns/rootns.c
  projects/ngroups/contrib/bind9/lib/dns/sdb.c
  projects/ngroups/contrib/bind9/lib/dns/sdlz.c
  projects/ngroups/contrib/bind9/lib/dns/soa.c
  projects/ngroups/contrib/bind9/lib/dns/ssu.c
  projects/ngroups/contrib/bind9/lib/dns/stats.c
  projects/ngroups/contrib/bind9/lib/dns/tcpmsg.c
  projects/ngroups/contrib/bind9/lib/dns/time.c
  projects/ngroups/contrib/bind9/lib/dns/timer.c
  projects/ngroups/contrib/bind9/lib/dns/tkey.c
  projects/ngroups/contrib/bind9/lib/dns/tsig.c
  projects/ngroups/contrib/bind9/lib/dns/ttl.c
  projects/ngroups/contrib/bind9/lib/dns/validator.c
  projects/ngroups/contrib/bind9/lib/dns/version.c
  projects/ngroups/contrib/bind9/lib/dns/view.c
  projects/ngroups/contrib/bind9/lib/dns/xfrin.c
  projects/ngroups/contrib/bind9/lib/dns/zone.c
  projects/ngroups/contrib/bind9/lib/dns/zonekey.c
  projects/ngroups/contrib/bind9/lib/dns/zt.c
  projects/ngroups/contrib/bind9/lib/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/alpha/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/alpha/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/api
  projects/ngroups/contrib/bind9/lib/isc/assertions.c
  projects/ngroups/contrib/bind9/lib/isc/base64.c
  projects/ngroups/contrib/bind9/lib/isc/bitstring.c
  projects/ngroups/contrib/bind9/lib/isc/buffer.c
  projects/ngroups/contrib/bind9/lib/isc/bufferlist.c
  projects/ngroups/contrib/bind9/lib/isc/commandline.c
  projects/ngroups/contrib/bind9/lib/isc/entropy.c
  projects/ngroups/contrib/bind9/lib/isc/error.c
  projects/ngroups/contrib/bind9/lib/isc/event.c
  projects/ngroups/contrib/bind9/lib/isc/fsaccess.c
  projects/ngroups/contrib/bind9/lib/isc/hash.c
  projects/ngroups/contrib/bind9/lib/isc/heap.c
  projects/ngroups/contrib/bind9/lib/isc/hex.c
  projects/ngroups/contrib/bind9/lib/isc/hmacmd5.c
  projects/ngroups/contrib/bind9/lib/isc/hmacsha.c
  projects/ngroups/contrib/bind9/lib/isc/ia64/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/ia64/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/include/isc/app.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/assertions.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/base64.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/bitstring.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/boolean.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/buffer.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/bufferlist.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/commandline.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/entropy.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/error.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/event.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/eventclass.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/file.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/formatcheck.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/fsaccess.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/hash.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/heap.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/hex.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/hmacmd5.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/hmacsha.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/interfaceiter.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/ipv6.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/lang.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/lex.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/lfsr.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/lib.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/list.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/log.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/magic.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/md5.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/mem.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/msgcat.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/msgs.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/mutexblock.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/netaddr.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/netscope.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/ondestroy.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/os.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/parseint.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/platform.h.in
  projects/ngroups/contrib/bind9/lib/isc/include/isc/portset.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/print.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/quota.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/random.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/ratelimiter.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/refcount.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/region.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/resource.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/result.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/resultclass.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/rwlock.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/serial.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/sha1.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/sha2.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/sockaddr.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/socket.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/stdio.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/stdlib.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/string.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/symtab.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/task.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/taskpool.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/timer.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/types.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/util.h
  projects/ngroups/contrib/bind9/lib/isc/include/isc/version.h
  projects/ngroups/contrib/bind9/lib/isc/inet_aton.c
  projects/ngroups/contrib/bind9/lib/isc/inet_ntop.c
  projects/ngroups/contrib/bind9/lib/isc/inet_pton.c
  projects/ngroups/contrib/bind9/lib/isc/lex.c
  projects/ngroups/contrib/bind9/lib/isc/lfsr.c
  projects/ngroups/contrib/bind9/lib/isc/lib.c
  projects/ngroups/contrib/bind9/lib/isc/log.c
  projects/ngroups/contrib/bind9/lib/isc/md5.c
  projects/ngroups/contrib/bind9/lib/isc/mem.c
  projects/ngroups/contrib/bind9/lib/isc/mips/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/mips/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/mips/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/mutexblock.c
  projects/ngroups/contrib/bind9/lib/isc/netaddr.c
  projects/ngroups/contrib/bind9/lib/isc/netscope.c
  projects/ngroups/contrib/bind9/lib/isc/nls/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/nls/msgcat.c
  projects/ngroups/contrib/bind9/lib/isc/noatomic/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/noatomic/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/nothreads/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/nothreads/condition.c
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/isc/condition.h
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/isc/once.h
  projects/ngroups/contrib/bind9/lib/isc/nothreads/include/isc/thread.h
  projects/ngroups/contrib/bind9/lib/isc/nothreads/mutex.c
  projects/ngroups/contrib/bind9/lib/isc/nothreads/thread.c
  projects/ngroups/contrib/bind9/lib/isc/ondestroy.c
  projects/ngroups/contrib/bind9/lib/isc/parseint.c
  projects/ngroups/contrib/bind9/lib/isc/portset.c
  projects/ngroups/contrib/bind9/lib/isc/powerpc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/powerpc/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/print.c
  projects/ngroups/contrib/bind9/lib/isc/pthreads/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/pthreads/condition.c
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/isc/condition.h
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/isc/once.h
  projects/ngroups/contrib/bind9/lib/isc/pthreads/include/isc/thread.h
  projects/ngroups/contrib/bind9/lib/isc/pthreads/mutex.c
  projects/ngroups/contrib/bind9/lib/isc/pthreads/thread.c
  projects/ngroups/contrib/bind9/lib/isc/quota.c
  projects/ngroups/contrib/bind9/lib/isc/random.c
  projects/ngroups/contrib/bind9/lib/isc/ratelimiter.c
  projects/ngroups/contrib/bind9/lib/isc/refcount.c
  projects/ngroups/contrib/bind9/lib/isc/region.c
  projects/ngroups/contrib/bind9/lib/isc/result.c
  projects/ngroups/contrib/bind9/lib/isc/rwlock.c
  projects/ngroups/contrib/bind9/lib/isc/serial.c
  projects/ngroups/contrib/bind9/lib/isc/sha1.c
  projects/ngroups/contrib/bind9/lib/isc/sha2.c
  projects/ngroups/contrib/bind9/lib/isc/sockaddr.c
  projects/ngroups/contrib/bind9/lib/isc/sparc64/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/sparc64/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/string.c
  projects/ngroups/contrib/bind9/lib/isc/strtoul.c
  projects/ngroups/contrib/bind9/lib/isc/symtab.c
  projects/ngroups/contrib/bind9/lib/isc/task.c
  projects/ngroups/contrib/bind9/lib/isc/task_p.h
  projects/ngroups/contrib/bind9/lib/isc/taskpool.c
  projects/ngroups/contrib/bind9/lib/isc/timer.c
  projects/ngroups/contrib/bind9/lib/isc/timer_p.h
  projects/ngroups/contrib/bind9/lib/isc/unix/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/unix/app.c
  projects/ngroups/contrib/bind9/lib/isc/unix/dir.c
  projects/ngroups/contrib/bind9/lib/isc/unix/entropy.c
  projects/ngroups/contrib/bind9/lib/isc/unix/errno2result.c
  projects/ngroups/contrib/bind9/lib/isc/unix/errno2result.h
  projects/ngroups/contrib/bind9/lib/isc/unix/file.c
  projects/ngroups/contrib/bind9/lib/isc/unix/fsaccess.c
  projects/ngroups/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  projects/ngroups/contrib/bind9/lib/isc/unix/ifiter_ioctl.c
  projects/ngroups/contrib/bind9/lib/isc/unix/ifiter_sysctl.c
  projects/ngroups/contrib/bind9/lib/isc/unix/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/dir.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/int.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/keyboard.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/net.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/netdb.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/offset.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/stat.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/stdtime.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/strerror.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/syslog.h
  projects/ngroups/contrib/bind9/lib/isc/unix/include/isc/time.h
  projects/ngroups/contrib/bind9/lib/isc/unix/interfaceiter.c
  projects/ngroups/contrib/bind9/lib/isc/unix/ipv6.c
  projects/ngroups/contrib/bind9/lib/isc/unix/keyboard.c
  projects/ngroups/contrib/bind9/lib/isc/unix/net.c
  projects/ngroups/contrib/bind9/lib/isc/unix/os.c
  projects/ngroups/contrib/bind9/lib/isc/unix/resource.c
  projects/ngroups/contrib/bind9/lib/isc/unix/socket.c
  projects/ngroups/contrib/bind9/lib/isc/unix/socket_p.h
  projects/ngroups/contrib/bind9/lib/isc/unix/stdio.c
  projects/ngroups/contrib/bind9/lib/isc/unix/stdtime.c
  projects/ngroups/contrib/bind9/lib/isc/unix/strerror.c
  projects/ngroups/contrib/bind9/lib/isc/unix/syslog.c
  projects/ngroups/contrib/bind9/lib/isc/unix/time.c
  projects/ngroups/contrib/bind9/lib/isc/version.c
  projects/ngroups/contrib/bind9/lib/isc/x86_32/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_32/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isc/x86_64/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_64/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h
  projects/ngroups/contrib/bind9/lib/isccc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccc/alist.c
  projects/ngroups/contrib/bind9/lib/isccc/api
  projects/ngroups/contrib/bind9/lib/isccc/base64.c
  projects/ngroups/contrib/bind9/lib/isccc/cc.c
  projects/ngroups/contrib/bind9/lib/isccc/ccmsg.c
  projects/ngroups/contrib/bind9/lib/isccc/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/alist.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/base64.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/cc.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/events.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/lib.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/result.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/sexpr.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/symtab.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/symtype.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/types.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/util.h
  projects/ngroups/contrib/bind9/lib/isccc/include/isccc/version.h
  projects/ngroups/contrib/bind9/lib/isccc/lib.c
  projects/ngroups/contrib/bind9/lib/isccc/result.c
  projects/ngroups/contrib/bind9/lib/isccc/sexpr.c
  projects/ngroups/contrib/bind9/lib/isccc/symtab.c
  projects/ngroups/contrib/bind9/lib/isccc/version.c
  projects/ngroups/contrib/bind9/lib/isccfg/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccfg/aclconf.c
  projects/ngroups/contrib/bind9/lib/isccfg/api
  projects/ngroups/contrib/bind9/lib/isccfg/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/grammar.h
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/log.h
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  projects/ngroups/contrib/bind9/lib/isccfg/include/isccfg/version.h
  projects/ngroups/contrib/bind9/lib/isccfg/log.c
  projects/ngroups/contrib/bind9/lib/isccfg/namedconf.c
  projects/ngroups/contrib/bind9/lib/isccfg/parser.c
  projects/ngroups/contrib/bind9/lib/isccfg/version.c
  projects/ngroups/contrib/bind9/lib/lwres/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/api
  projects/ngroups/contrib/bind9/lib/lwres/assert_p.h
  projects/ngroups/contrib/bind9/lib/lwres/context.c
  projects/ngroups/contrib/bind9/lib/lwres/context_p.h
  projects/ngroups/contrib/bind9/lib/lwres/gai_strerror.c
  projects/ngroups/contrib/bind9/lib/lwres/getaddrinfo.c
  projects/ngroups/contrib/bind9/lib/lwres/gethost.c
  projects/ngroups/contrib/bind9/lib/lwres/getipnode.c
  projects/ngroups/contrib/bind9/lib/lwres/getnameinfo.c
  projects/ngroups/contrib/bind9/lib/lwres/getrrset.c
  projects/ngroups/contrib/bind9/lib/lwres/herror.c
  projects/ngroups/contrib/bind9/lib/lwres/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/context.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/int.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/ipv6.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/lang.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/list.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/lwpacket.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/lwres.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/netdb.h.in
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/platform.h.in
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/result.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/stdlib.h
  projects/ngroups/contrib/bind9/lib/lwres/include/lwres/version.h
  projects/ngroups/contrib/bind9/lib/lwres/lwbuffer.c
  projects/ngroups/contrib/bind9/lib/lwres/lwconfig.c
  projects/ngroups/contrib/bind9/lib/lwres/lwinetaton.c
  projects/ngroups/contrib/bind9/lib/lwres/lwinetntop.c
  projects/ngroups/contrib/bind9/lib/lwres/lwinetpton.c
  projects/ngroups/contrib/bind9/lib/lwres/lwpacket.c
  projects/ngroups/contrib/bind9/lib/lwres/lwres_gabn.c
  projects/ngroups/contrib/bind9/lib/lwres/lwres_gnba.c
  projects/ngroups/contrib/bind9/lib/lwres/lwres_grbn.c
  projects/ngroups/contrib/bind9/lib/lwres/lwres_noop.c
  projects/ngroups/contrib/bind9/lib/lwres/lwresutil.c
  projects/ngroups/contrib/bind9/lib/lwres/man/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_buffer.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_buffer.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_buffer.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_config.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_config.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_config.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_context.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_context.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_context.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gabn.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gabn.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gnba.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_gnba.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_noop.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_noop.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_packet.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_packet.html
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_resutil.3
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  projects/ngroups/contrib/bind9/lib/lwres/man/lwres_resutil.html
  projects/ngroups/contrib/bind9/lib/lwres/print.c
  projects/ngroups/contrib/bind9/lib/lwres/print_p.h
  projects/ngroups/contrib/bind9/lib/lwres/strtoul.c
  projects/ngroups/contrib/bind9/lib/lwres/unix/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/unix/include/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  projects/ngroups/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  projects/ngroups/contrib/bind9/lib/lwres/version.c
  projects/ngroups/contrib/bind9/libtool.m4
  projects/ngroups/contrib/bind9/ltmain.sh
  projects/ngroups/contrib/bind9/make/Makefile.in
  projects/ngroups/contrib/bind9/make/includes.in
  projects/ngroups/contrib/bind9/make/mkdep.in
  projects/ngroups/contrib/bind9/make/rules.in
  projects/ngroups/contrib/bind9/version
  projects/ngroups/contrib/csup/updater.c
  projects/ngroups/contrib/ee/   (props changed)
  projects/ngroups/contrib/ipfilter/lib/load_http.c
  projects/ngroups/contrib/less/   (props changed)
  projects/ngroups/contrib/netcat/   (props changed)
  projects/ngroups/contrib/netcat/nc.1
  projects/ngroups/contrib/netcat/netcat.c
  projects/ngroups/etc/defaults/rc.conf
  projects/ngroups/etc/network.subr
  projects/ngroups/etc/periodic/daily/100.clean-disks
  projects/ngroups/etc/rc.d/Makefile
  projects/ngroups/etc/rc.d/amd
  projects/ngroups/etc/rc.d/archdep
  projects/ngroups/etc/rc.d/ip6fw
  projects/ngroups/etc/rc.d/ipfilter
  projects/ngroups/etc/rc.d/ipfs
  projects/ngroups/etc/rc.d/ipfw
  projects/ngroups/etc/rc.d/ipnat
  projects/ngroups/etc/rc.d/keyserv
  projects/ngroups/etc/rc.d/mountd
  projects/ngroups/etc/rc.d/moused
  projects/ngroups/etc/rc.d/netif
  projects/ngroups/etc/rc.d/network_ipv6
  projects/ngroups/etc/rc.d/nfsd
  projects/ngroups/etc/rc.d/nisdomain
  projects/ngroups/etc/rc.d/nscd
  projects/ngroups/etc/rc.d/ntpd
  projects/ngroups/etc/rc.d/pf
  projects/ngroups/etc/rc.d/pflog
  projects/ngroups/etc/rc.d/pfsync
  projects/ngroups/etc/rc.d/quota
  projects/ngroups/etc/rc.d/yppasswdd
  projects/ngroups/etc/rc.subr
  projects/ngroups/games/fortune/datfiles/fortunes
  projects/ngroups/games/fortune/datfiles/fortunes-o.real
  projects/ngroups/lib/bind/Makefile
  projects/ngroups/lib/bind/config.h
  projects/ngroups/lib/bind/config.mk
  projects/ngroups/lib/bind/dns/Makefile
  projects/ngroups/lib/bind/dns/code.h
  projects/ngroups/lib/bind/dns/dns/enumclass.h
  projects/ngroups/lib/bind/dns/dns/enumtype.h
  projects/ngroups/lib/bind/dns/dns/rdatastruct.h
  projects/ngroups/lib/bind/isc/Makefile
  projects/ngroups/lib/bind/isc/isc/platform.h
  projects/ngroups/lib/bind/lwres/Makefile
  projects/ngroups/lib/bind/lwres/lwres/netdb.h
  projects/ngroups/lib/bind/lwres/lwres/platform.h
  projects/ngroups/lib/libarchive/Makefile
  projects/ngroups/lib/libc/arm/Makefile.inc
  projects/ngroups/lib/libc/arm/gen/_setjmp.S
  projects/ngroups/lib/libc/arm/gen/setjmp.S
  projects/ngroups/lib/libc/net/resolver.3
  projects/ngroups/lib/libc/resolv/res_comp.c
  projects/ngroups/lib/libc/sys/bind.2
  projects/ngroups/lib/libstand/Makefile
  projects/ngroups/lib/libstand/bootp.c
  projects/ngroups/lib/libstand/rpc.c
  projects/ngroups/lib/libstand/tftp.c
  projects/ngroups/lib/libusb/   (props changed)
  projects/ngroups/lib/libusb/libusb.3
  projects/ngroups/lib/libusb/libusb20.c
  projects/ngroups/lib/libusb/libusb20.h
  projects/ngroups/lib/msun/src/e_rem_pio2.c
  projects/ngroups/lib/msun/src/e_rem_pio2f.c
  projects/ngroups/lib/msun/src/k_cosf.c
  projects/ngroups/lib/msun/src/k_sinf.c
  projects/ngroups/lib/msun/src/k_tanf.c
  projects/ngroups/lib/msun/src/math_private.h
  projects/ngroups/sbin/dump/optr.c
  projects/ngroups/sbin/fsck_ffs/fsck.h
  projects/ngroups/sbin/fsck_ffs/gjournal.c
  projects/ngroups/sbin/ifconfig/ifieee80211.c
  projects/ngroups/sbin/ipfw/dummynet.c
  projects/ngroups/sbin/ipfw/ipfw2.c
  projects/ngroups/sbin/kldload/kldload.8
  projects/ngroups/sbin/kldload/kldload.c
  projects/ngroups/sbin/mksnap_ffs/Makefile
  projects/ngroups/sbin/mksnap_ffs/mksnap_ffs.8
  projects/ngroups/sbin/mksnap_ffs/mksnap_ffs.c
  projects/ngroups/sbin/mount_nfs/mount_nfs.c
  projects/ngroups/share/doc/bind9/Makefile
  projects/ngroups/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/ngroups/share/examples/kld/syscall/module/syscall.c
  projects/ngroups/share/man/man4/audit.4
  projects/ngroups/share/man/man4/ch.4
  projects/ngroups/share/man/man4/ip.4
  projects/ngroups/share/man/man4/msk.4
  projects/ngroups/share/man/man4/pcm.4
  projects/ngroups/share/man/man4/ral.4
  projects/ngroups/share/man/man4/rum.4
  projects/ngroups/share/man/man4/scsi.4
  projects/ngroups/share/man/man4/ural.4
  projects/ngroups/share/man/man5/src.conf.5
  projects/ngroups/share/man/man9/Makefile
  projects/ngroups/share/man/man9/VOP_ACCESS.9
  projects/ngroups/share/man/man9/rmlock.9
  projects/ngroups/share/man/man9/sx.9
  projects/ngroups/share/misc/committers-ports.dot
  projects/ngroups/share/mk/bsd.own.mk
  projects/ngroups/share/timedef/pt_PT.ISO8859-1.src
  projects/ngroups/share/timedef/pt_PT.UTF-8.src
  projects/ngroups/sys/amd64/acpica/OsdEnvironment.c
  projects/ngroups/sys/amd64/acpica/acpi_machdep.c
  projects/ngroups/sys/amd64/acpica/acpi_wakeup.c
  projects/ngroups/sys/amd64/acpica/madt.c
  projects/ngroups/sys/amd64/amd64/dump_machdep.c
  projects/ngroups/sys/amd64/amd64/minidump_machdep.c
  projects/ngroups/sys/amd64/amd64/support.S
  projects/ngroups/sys/amd64/conf/GENERIC
  projects/ngroups/sys/amd64/linux32/linux.h
  projects/ngroups/sys/amd64/linux32/linux32_sysent.c
  projects/ngroups/sys/arm/arm/dump_machdep.c
  projects/ngroups/sys/arm/xscale/ixp425/if_npe.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425_qmgr.h
  projects/ngroups/sys/boot/common/boot.c
  projects/ngroups/sys/boot/i386/libi386/Makefile
  projects/ngroups/sys/boot/i386/libi386/biosacpi.c
  projects/ngroups/sys/boot/i386/libi386/biosdisk.c
  projects/ngroups/sys/boot/ia64/ski/acpi_stub.c
  projects/ngroups/sys/boot/uboot/lib/disk.c
  projects/ngroups/sys/boot/uboot/lib/net.c
  projects/ngroups/sys/cddl/compat/opensolaris/kern/opensolaris.c
  projects/ngroups/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  projects/ngroups/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/ngroups/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/ngroups/sys/compat/freebsd32/freebsd32_sysent.c
  projects/ngroups/sys/compat/linux/linux_file.c
  projects/ngroups/sys/compat/linux/linux_getcwd.c
  projects/ngroups/sys/compat/linux/linux_misc.c
  projects/ngroups/sys/compat/linux/linux_socket.c
  projects/ngroups/sys/compat/linux/linux_stats.c
  projects/ngroups/sys/compat/ndis/subr_usbd.c
  projects/ngroups/sys/compat/svr4/svr4_fcntl.c
  projects/ngroups/sys/compat/svr4/svr4_ioctl.c
  projects/ngroups/sys/compat/svr4/svr4_misc.c
  projects/ngroups/sys/compat/svr4/svr4_resource.c
  projects/ngroups/sys/compat/svr4/svr4_signal.c
  projects/ngroups/sys/compat/svr4/svr4_socket.c
  projects/ngroups/sys/compat/svr4/svr4_stat.c
  projects/ngroups/sys/compat/svr4/svr4_stream.c
  projects/ngroups/sys/compat/svr4/svr4_sysconfig.h
  projects/ngroups/sys/compat/svr4/svr4_sysent.c
  projects/ngroups/sys/conf/NOTES
  projects/ngroups/sys/conf/files
  projects/ngroups/sys/conf/files.i386
  projects/ngroups/sys/conf/files.powerpc
  projects/ngroups/sys/conf/options
  projects/ngroups/sys/contrib/dev/acpica/   (props changed)
  projects/ngroups/sys/contrib/dev/acpica/acpica_prep.sh
  projects/ngroups/sys/contrib/dev/acpica/common/adfile.c
  projects/ngroups/sys/contrib/dev/acpica/common/adisasm.c
  projects/ngroups/sys/contrib/dev/acpica/common/adwalk.c
  projects/ngroups/sys/contrib/dev/acpica/common/dmrestag.c
  projects/ngroups/sys/contrib/dev/acpica/common/dmtable.c
  projects/ngroups/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/ngroups/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/ngroups/sys/contrib/dev/acpica/common/getopt.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/ngroups/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/ngroups/sys/contrib/dev/acpica/compiler/asllength.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslload.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asltree.c
  projects/ngroups/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/ngroups/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/ngroups/sys/contrib/dev/acpica/osunixxf.c
  projects/ngroups/sys/contrib/pf/net/pf.c
  projects/ngroups/sys/contrib/pf/net/pf_ioctl.c
  projects/ngroups/sys/ddb/db_textdump.c
  projects/ngroups/sys/dev/acpi_support/acpi_aiboost.c
  projects/ngroups/sys/dev/acpi_support/acpi_asus.c
  projects/ngroups/sys/dev/acpi_support/acpi_fujitsu.c
  projects/ngroups/sys/dev/acpi_support/acpi_ibm.c
  projects/ngroups/sys/dev/acpi_support/acpi_panasonic.c
  projects/ngroups/sys/dev/acpi_support/acpi_sony.c
  projects/ngroups/sys/dev/acpi_support/acpi_toshiba.c
  projects/ngroups/sys/dev/acpica/Osd/OsdDebug.c
  projects/ngroups/sys/dev/acpica/Osd/OsdHardware.c
  projects/ngroups/sys/dev/acpica/Osd/OsdInterrupt.c
  projects/ngroups/sys/dev/acpica/Osd/OsdMemory.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSchedule.c
  projects/ngroups/sys/dev/acpica/Osd/OsdStream.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSynch.c
  projects/ngroups/sys/dev/acpica/Osd/OsdTable.c
  projects/ngroups/sys/dev/acpica/acpi.c
  projects/ngroups/sys/dev/acpica/acpi_acad.c
  projects/ngroups/sys/dev/acpica/acpi_battery.c
  projects/ngroups/sys/dev/acpica/acpi_button.c
  projects/ngroups/sys/dev/acpica/acpi_cmbat.c
  projects/ngroups/sys/dev/acpica/acpi_cpu.c
  projects/ngroups/sys/dev/acpica/acpi_dock.c
  projects/ngroups/sys/dev/acpica/acpi_ec.c
  projects/ngroups/sys/dev/acpica/acpi_hpet.c
  projects/ngroups/sys/dev/acpica/acpi_if.m
  projects/ngroups/sys/dev/acpica/acpi_isab.c
  projects/ngroups/sys/dev/acpica/acpi_lid.c
  projects/ngroups/sys/dev/acpica/acpi_package.c
  projects/ngroups/sys/dev/acpica/acpi_pci.c
  projects/ngroups/sys/dev/acpica/acpi_pci_link.c
  projects/ngroups/sys/dev/acpica/acpi_pcib.c
  projects/ngroups/sys/dev/acpica/acpi_pcib_acpi.c
  projects/ngroups/sys/dev/acpica/acpi_pcib_pci.c
  projects/ngroups/sys/dev/acpica/acpi_perf.c
  projects/ngroups/sys/dev/acpica/acpi_powerres.c
  projects/ngroups/sys/dev/acpica/acpi_quirk.c
  projects/ngroups/sys/dev/acpica/acpi_resource.c
  projects/ngroups/sys/dev/acpica/acpi_smbat.c
  projects/ngroups/sys/dev/acpica/acpi_thermal.c
  projects/ngroups/sys/dev/acpica/acpi_throttle.c
  projects/ngroups/sys/dev/acpica/acpi_timer.c
  projects/ngroups/sys/dev/acpica/acpi_video.c
  projects/ngroups/sys/dev/aic7xxx/aicasm/Makefile
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  projects/ngroups/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
  projects/ngroups/sys/dev/asmc/asmc.c
  projects/ngroups/sys/dev/ata/   (props changed)
  projects/ngroups/sys/dev/ata/ata-all.h
  projects/ngroups/sys/dev/ata/ata-usb.c
  projects/ngroups/sys/dev/ata/chipsets/ata-ahci.c
  projects/ngroups/sys/dev/ata/chipsets/ata-intel.c
  projects/ngroups/sys/dev/ath/if_ath.c
  projects/ngroups/sys/dev/bge/if_bge.c
  projects/ngroups/sys/dev/bwi/if_bwi.c
  projects/ngroups/sys/dev/cfe/cfe_console.c
  projects/ngroups/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/ngroups/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/ngroups/sys/dev/dc/if_dc.c
  projects/ngroups/sys/dev/dcons/dcons_os.c
  projects/ngroups/sys/dev/e1000/if_em.c
  projects/ngroups/sys/dev/fdc/fdc_acpi.c
  projects/ngroups/sys/dev/firewire/firewire.c
  projects/ngroups/sys/dev/firewire/if_fwe.c
  projects/ngroups/sys/dev/firewire/if_fwip.c
  projects/ngroups/sys/dev/fxp/if_fxp.c
  projects/ngroups/sys/dev/if_ndis/if_ndis.c
  projects/ngroups/sys/dev/if_ndis/if_ndisvar.h
  projects/ngroups/sys/dev/iir/iir.c
  projects/ngroups/sys/dev/iir/iir_ctrl.c
  projects/ngroups/sys/dev/ipmi/ipmi_acpi.c
  projects/ngroups/sys/dev/iwn/if_iwn.c
  projects/ngroups/sys/dev/ixgb/if_ixgb.c
  projects/ngroups/sys/dev/kbd/kbd.c
  projects/ngroups/sys/dev/kbdmux/kbdmux.c
  projects/ngroups/sys/dev/ksyms/ksyms.c
  projects/ngroups/sys/dev/lmc/if_lmc.c
  projects/ngroups/sys/dev/lmc/if_lmc.h
  projects/ngroups/sys/dev/mge/if_mge.c
  projects/ngroups/sys/dev/mii/e1000phy.c
  projects/ngroups/sys/dev/mii/e1000phyreg.h
  projects/ngroups/sys/dev/msk/if_msk.c
  projects/ngroups/sys/dev/msk/if_mskreg.h
  projects/ngroups/sys/dev/mxge/if_mxge.c
  projects/ngroups/sys/dev/mxge/if_mxge_var.h
  projects/ngroups/sys/dev/nfe/if_nfe.c
  projects/ngroups/sys/dev/nge/if_nge.c
  projects/ngroups/sys/dev/nmdm/nmdm.c
  projects/ngroups/sys/dev/ofw/ofw_console.c
  projects/ngroups/sys/dev/pci/pci.c
  projects/ngroups/sys/dev/pci/pcivar.h
  projects/ngroups/sys/dev/puc/pucdata.c
  projects/ngroups/sys/dev/ral/rt2560.c
  projects/ngroups/sys/dev/re/if_re.c
  projects/ngroups/sys/dev/rp/rp.c
  projects/ngroups/sys/dev/sf/if_sf.c
  projects/ngroups/sys/dev/si/si.c
  projects/ngroups/sys/dev/sis/if_sis.c
  projects/ngroups/sys/dev/smc/if_smc.c
  projects/ngroups/sys/dev/sound/pci/hda/hdac.c
  projects/ngroups/sys/dev/sound/usb/uaudio.c
  projects/ngroups/sys/dev/ste/if_ste.c
  projects/ngroups/sys/dev/stge/if_stge.c
  projects/ngroups/sys/dev/syscons/daemon/daemon_saver.c
  projects/ngroups/sys/dev/syscons/scterm-teken.c
  projects/ngroups/sys/dev/syscons/syscons.c
  projects/ngroups/sys/dev/syscons/sysmouse.c
  projects/ngroups/sys/dev/syscons/teken/sequences
  projects/ngroups/sys/dev/syscons/teken/teken.c
  projects/ngroups/sys/dev/syscons/teken/teken.h
  projects/ngroups/sys/dev/syscons/teken/teken_subr_compat.h
  projects/ngroups/sys/dev/tsec/if_tsec.c
  projects/ngroups/sys/dev/uart/uart_tty.c
  projects/ngroups/sys/dev/usb/controller/at91dci.c
  projects/ngroups/sys/dev/usb/controller/at91dci.h
  projects/ngroups/sys/dev/usb/controller/atmegadci.c
  projects/ngroups/sys/dev/usb/controller/atmegadci.h
  projects/ngroups/sys/dev/usb/controller/avr32dci.c
  projects/ngroups/sys/dev/usb/controller/avr32dci.h
  projects/ngroups/sys/dev/usb/controller/ehci.c
  projects/ngroups/sys/dev/usb/controller/ehci.h
  projects/ngroups/sys/dev/usb/controller/musb_otg.c
  projects/ngroups/sys/dev/usb/controller/musb_otg.h
  projects/ngroups/sys/dev/usb/controller/ohci.c
  projects/ngroups/sys/dev/usb/controller/ohci.h
  projects/ngroups/sys/dev/usb/controller/uhci.c
  projects/ngroups/sys/dev/usb/controller/uhci.h
  projects/ngroups/sys/dev/usb/controller/usb_controller.c
  projects/ngroups/sys/dev/usb/controller/uss820dci.c
  projects/ngroups/sys/dev/usb/controller/uss820dci.h
  projects/ngroups/sys/dev/usb/input/uhid.c
  projects/ngroups/sys/dev/usb/input/ukbd.c
  projects/ngroups/sys/dev/usb/input/ums.c
  projects/ngroups/sys/dev/usb/misc/udbp.c
  projects/ngroups/sys/dev/usb/misc/ufm.c
  projects/ngroups/sys/dev/usb/net/if_aue.c
  projects/ngroups/sys/dev/usb/net/if_axe.c
  projects/ngroups/sys/dev/usb/net/if_cdce.c
  projects/ngroups/sys/dev/usb/net/if_cue.c
  projects/ngroups/sys/dev/usb/net/if_kue.c
  projects/ngroups/sys/dev/usb/net/if_rue.c
  projects/ngroups/sys/dev/usb/net/if_udav.c
  projects/ngroups/sys/dev/usb/net/usb_ethernet.c
  projects/ngroups/sys/dev/usb/net/usb_ethernet.h
  projects/ngroups/sys/dev/usb/serial/u3g.c
  projects/ngroups/sys/dev/usb/serial/uark.c
  projects/ngroups/sys/dev/usb/serial/ubsa.c
  projects/ngroups/sys/dev/usb/serial/ubser.c
  projects/ngroups/sys/dev/usb/serial/uchcom.c
  projects/ngroups/sys/dev/usb/serial/ucycom.c
  projects/ngroups/sys/dev/usb/serial/ufoma.c
  projects/ngroups/sys/dev/usb/serial/uftdi.c
  projects/ngroups/sys/dev/usb/serial/ugensa.c
  projects/ngroups/sys/dev/usb/serial/uipaq.c
  projects/ngroups/sys/dev/usb/serial/ulpt.c
  projects/ngroups/sys/dev/usb/serial/umct.c
  projects/ngroups/sys/dev/usb/serial/umodem.c
  projects/ngroups/sys/dev/usb/serial/umoscom.c
  projects/ngroups/sys/dev/usb/serial/uplcom.c
  projects/ngroups/sys/dev/usb/serial/usb_serial.c
  projects/ngroups/sys/dev/usb/serial/uslcom.c
  projects/ngroups/sys/dev/usb/serial/uvisor.c
  projects/ngroups/sys/dev/usb/serial/uvscom.c
  projects/ngroups/sys/dev/usb/storage/umass.c
  projects/ngroups/sys/dev/usb/storage/urio.c
  projects/ngroups/sys/dev/usb/storage/ustorage_fs.c
  projects/ngroups/sys/dev/usb/template/usb_template.c
  projects/ngroups/sys/dev/usb/usb_bus.h
  projects/ngroups/sys/dev/usb/usb_busdma.c
  projects/ngroups/sys/dev/usb/usb_busdma.h
  projects/ngroups/sys/dev/usb/usb_compat_linux.c
  projects/ngroups/sys/dev/usb/usb_compat_linux.h
  projects/ngroups/sys/dev/usb/usb_controller.h
  projects/ngroups/sys/dev/usb/usb_core.h
  projects/ngroups/sys/dev/usb/usb_dev.c
  projects/ngroups/sys/dev/usb/usb_dev.h
  projects/ngroups/sys/dev/usb/usb_device.c
  projects/ngroups/sys/dev/usb/usb_device.h
  projects/ngroups/sys/dev/usb/usb_dynamic.c
  projects/ngroups/sys/dev/usb/usb_dynamic.h
  projects/ngroups/sys/dev/usb/usb_error.c
  projects/ngroups/sys/dev/usb/usb_generic.c
  projects/ngroups/sys/dev/usb/usb_handle_request.c
  projects/ngroups/sys/dev/usb/usb_hid.c
  projects/ngroups/sys/dev/usb/usb_hid.h
  projects/ngroups/sys/dev/usb/usb_hub.c
  projects/ngroups/sys/dev/usb/usb_hub.h
  projects/ngroups/sys/dev/usb/usb_lookup.c
  projects/ngroups/sys/dev/usb/usb_lookup.h
  projects/ngroups/sys/dev/usb/usb_mbuf.c
  projects/ngroups/sys/dev/usb/usb_mbuf.h
  projects/ngroups/sys/dev/usb/usb_msctest.c
  projects/ngroups/sys/dev/usb/usb_msctest.h
  projects/ngroups/sys/dev/usb/usb_process.c
  projects/ngroups/sys/dev/usb/usb_process.h
  projects/ngroups/sys/dev/usb/usb_request.c
  projects/ngroups/sys/dev/usb/usb_request.h
  projects/ngroups/sys/dev/usb/usb_transfer.c
  projects/ngroups/sys/dev/usb/usb_transfer.h
  projects/ngroups/sys/dev/usb/usb_util.c
  projects/ngroups/sys/dev/usb/usbdevs
  projects/ngroups/sys/dev/usb/wlan/if_rum.c
  projects/ngroups/sys/dev/usb/wlan/if_uath.c
  projects/ngroups/sys/dev/usb/wlan/if_upgt.c
  projects/ngroups/sys/dev/usb/wlan/if_ural.c
  projects/ngroups/sys/dev/usb/wlan/if_urtw.c
  projects/ngroups/sys/dev/usb/wlan/if_urtwvar.h
  projects/ngroups/sys/dev/usb/wlan/if_zyd.c
  projects/ngroups/sys/dev/usb/wlan/if_zydreg.h
  projects/ngroups/sys/dev/vge/if_vge.c
  projects/ngroups/sys/dev/vr/if_vr.c
  projects/ngroups/sys/dev/xen/console/console.c
  projects/ngroups/sys/dev/xen/netfront/   (props changed)
  projects/ngroups/sys/dev/xen/xenpci/   (props changed)
  projects/ngroups/sys/dev/xl/if_xl.c
  projects/ngroups/sys/fs/cd9660/cd9660_rrip.c
  projects/ngroups/sys/fs/devfs/devfs_devs.c
  projects/ngroups/sys/fs/devfs/devfs_vnops.c
  projects/ngroups/sys/fs/nfs/nfs_commonacl.c
  projects/ngroups/sys/fs/nfs/nfsport.h
  projects/ngroups/sys/fs/nfsclient/nfs_clbio.c
  projects/ngroups/sys/fs/nfsclient/nfs_clnode.c
  projects/ngroups/sys/fs/nfsclient/nfs_clstate.c
  projects/ngroups/sys/fs/nfsclient/nfs_clvfsops.c
  projects/ngroups/sys/fs/nfsclient/nfs_clvnops.c
  projects/ngroups/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/ngroups/sys/fs/nfsserver/nfs_nfsdport.c
  projects/ngroups/sys/fs/nullfs/null_subr.c
  projects/ngroups/sys/fs/nullfs/null_vnops.c
  projects/ngroups/sys/fs/pseudofs/pseudofs_vnops.c
  projects/ngroups/sys/fs/unionfs/union_subr.c
  projects/ngroups/sys/geom/label/g_label.c
  projects/ngroups/sys/geom/vinum/geom_vinum_create.c
  projects/ngroups/sys/geom/vinum/geom_vinum_drive.c
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_fs.h
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_lookup.c
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/ngroups/sys/i386/acpica/OsdEnvironment.c
  projects/ngroups/sys/i386/acpica/acpi_machdep.c
  projects/ngroups/sys/i386/acpica/acpi_wakeup.c
  projects/ngroups/sys/i386/acpica/madt.c
  projects/ngroups/sys/i386/conf/GENERIC
  projects/ngroups/sys/i386/cpufreq/est.c
  projects/ngroups/sys/i386/cpufreq/hwpstate.c
  projects/ngroups/sys/i386/cpufreq/p4tcc.c
  projects/ngroups/sys/i386/i386/dump_machdep.c
  projects/ngroups/sys/i386/i386/minidump_machdep.c
  projects/ngroups/sys/i386/i386/sys_machdep.c
  projects/ngroups/sys/i386/ibcs2/ibcs2_misc.c
  projects/ngroups/sys/i386/ibcs2/ibcs2_socksys.c
  projects/ngroups/sys/i386/ibcs2/ibcs2_sysent.c
  projects/ngroups/sys/i386/include/apicvar.h
  projects/ngroups/sys/i386/linux/linux.h
  projects/ngroups/sys/i386/linux/linux_sysent.c
  projects/ngroups/sys/i386/xen/clock.c
  projects/ngroups/sys/i386/xen/mp_machdep.c
  projects/ngroups/sys/i386/xen/xen_rtc.c
  projects/ngroups/sys/ia64/acpica/OsdEnvironment.c
  projects/ngroups/sys/ia64/acpica/acpi_machdep.c
  projects/ngroups/sys/ia64/acpica/acpi_wakeup.c
  projects/ngroups/sys/ia64/acpica/madt.c
  projects/ngroups/sys/ia64/conf/GENERIC
  projects/ngroups/sys/ia64/ia64/dump_machdep.c
  projects/ngroups/sys/ia64/ia64/nexus.c
  projects/ngroups/sys/ia64/ia64/ssc.c
  projects/ngroups/sys/kern/init_main.c
  projects/ngroups/sys/kern/init_sysent.c
  projects/ngroups/sys/kern/kern_acct.c
  projects/ngroups/sys/kern/kern_alq.c
  projects/ngroups/sys/kern/kern_conf.c
  projects/ngroups/sys/kern/kern_cpu.c
  projects/ngroups/sys/kern/kern_descrip.c
  projects/ngroups/sys/kern/kern_environment.c
  projects/ngroups/sys/kern/kern_exec.c
  projects/ngroups/sys/kern/kern_exit.c
  projects/ngroups/sys/kern/kern_fork.c
  projects/ngroups/sys/kern/kern_jail.c
  projects/ngroups/sys/kern/kern_ktrace.c
  projects/ngroups/sys/kern/kern_linker.c
  projects/ngroups/sys/kern/kern_lock.c
  projects/ngroups/sys/kern/kern_malloc.c
  projects/ngroups/sys/kern/kern_mbuf.c
  projects/ngroups/sys/kern/kern_mib.c
  projects/ngroups/sys/kern/kern_mutex.c
  projects/ngroups/sys/kern/kern_osd.c
  projects/ngroups/sys/kern/kern_poll.c
  projects/ngroups/sys/kern/kern_priv.c
  projects/ngroups/sys/kern/kern_proc.c
  projects/ngroups/sys/kern/kern_prot.c
  projects/ngroups/sys/kern/kern_rmlock.c
  projects/ngroups/sys/kern/kern_rwlock.c
  projects/ngroups/sys/kern/kern_shutdown.c
  projects/ngroups/sys/kern/kern_sx.c
  projects/ngroups/sys/kern/kern_sysctl.c
  projects/ngroups/sys/kern/kern_vimage.c
  projects/ngroups/sys/kern/kern_xxx.c
  projects/ngroups/sys/kern/link_elf.c
  projects/ngroups/sys/kern/link_elf_obj.c
  projects/ngroups/sys/kern/makesyscalls.sh
  projects/ngroups/sys/kern/subr_trap.c
  projects/ngroups/sys/kern/sys_pipe.c
  projects/ngroups/sys/kern/sys_socket.c
  projects/ngroups/sys/kern/sysv_msg.c
  projects/ngroups/sys/kern/sysv_sem.c
  projects/ngroups/sys/kern/sysv_shm.c
  projects/ngroups/sys/kern/tty.c
  projects/ngroups/sys/kern/tty_pts.c
  projects/ngroups/sys/kern/uipc_mbuf.c
  projects/ngroups/sys/kern/uipc_mbuf2.c
  projects/ngroups/sys/kern/uipc_sem.c
  projects/ngroups/sys/kern/uipc_shm.c
  projects/ngroups/sys/kern/uipc_sockbuf.c
  projects/ngroups/sys/kern/uipc_socket.c
  projects/ngroups/sys/kern/uipc_syscalls.c
  projects/ngroups/sys/kern/uipc_usrreq.c
  projects/ngroups/sys/kern/vfs_acl.c
  projects/ngroups/sys/kern/vfs_aio.c
  projects/ngroups/sys/kern/vfs_bio.c
  projects/ngroups/sys/kern/vfs_cache.c
  projects/ngroups/sys/kern/vfs_default.c
  projects/ngroups/sys/kern/vfs_extattr.c
  projects/ngroups/sys/kern/vfs_lookup.c
  projects/ngroups/sys/kern/vfs_mount.c
  projects/ngroups/sys/kern/vfs_subr.c
  projects/ngroups/sys/kern/vfs_syscalls.c
  projects/ngroups/sys/kern/vfs_vnops.c
  projects/ngroups/sys/kern/vnode_if.src
  projects/ngroups/sys/kgssapi/gsstest.c
  projects/ngroups/sys/modules/Makefile
  projects/ngroups/sys/modules/acpi/acpi/Makefile
  projects/ngroups/sys/modules/acpi/acpi_aiboost/Makefile
  projects/ngroups/sys/modules/acpi/acpi_asus/Makefile
  projects/ngroups/sys/modules/acpi/acpi_dock/Makefile
  projects/ngroups/sys/modules/acpi/acpi_fujitsu/Makefile
  projects/ngroups/sys/modules/acpi/acpi_ibm/Makefile
  projects/ngroups/sys/modules/acpi/acpi_panasonic/Makefile
  projects/ngroups/sys/modules/acpi/acpi_sony/Makefile
  projects/ngroups/sys/modules/acpi/acpi_toshiba/Makefile
  projects/ngroups/sys/modules/acpi/acpi_video/Makefile
  projects/ngroups/sys/modules/cpufreq/Makefile
  projects/ngroups/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/ngroups/sys/modules/dummynet/Makefile
  projects/ngroups/sys/modules/fdc/Makefile
  projects/ngroups/sys/modules/geom/geom_part/geom_part_ebr/Makefile
  projects/ngroups/sys/modules/ip6_mroute_mod/   (props changed)
  projects/ngroups/sys/modules/ipfw/Makefile
  projects/ngroups/sys/modules/ipfw_nat/Makefile
  projects/ngroups/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/ngroups/sys/modules/usb/Makefile
  projects/ngroups/sys/modules/usb/zyd/Makefile
  projects/ngroups/sys/modules/zfs/Makefile
  projects/ngroups/sys/net/bpf.c
  projects/ngroups/sys/net/if.c
  projects/ngroups/sys/net/if.h
  projects/ngroups/sys/net/if_atmsubr.c
  projects/ngroups/sys/net/if_bridge.c
  projects/ngroups/sys/net/if_ethersubr.c
  projects/ngroups/sys/net/if_fddisubr.c
  projects/ngroups/sys/net/if_fwsubr.c
  projects/ngroups/sys/net/if_gif.c
  projects/ngroups/sys/net/if_iso88025subr.c
  projects/ngroups/sys/net/if_loop.c
  projects/ngroups/sys/net/if_stf.c
  projects/ngroups/sys/net/if_tun.c
  projects/ngroups/sys/net/if_var.h
  projects/ngroups/sys/net/netisr.c
  projects/ngroups/sys/net/netisr.h
  projects/ngroups/sys/net/pfil.h
  projects/ngroups/sys/net/route.c
  projects/ngroups/sys/net/route.h
  projects/ngroups/sys/net/rtsock.c
  projects/ngroups/sys/net/vnet.h
  projects/ngroups/sys/net80211/ieee80211.c
  projects/ngroups/sys/net80211/ieee80211.h
  projects/ngroups/sys/net80211/ieee80211_ddb.c
  projects/ngroups/sys/net80211/ieee80211_dfs.c
  projects/ngroups/sys/net80211/ieee80211_freebsd.c
  projects/ngroups/sys/net80211/ieee80211_hostap.c
  projects/ngroups/sys/net80211/ieee80211_ht.c
  projects/ngroups/sys/net80211/ieee80211_ht.h
  projects/ngroups/sys/net80211/ieee80211_input.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.h
  projects/ngroups/sys/net80211/ieee80211_monitor.c
  projects/ngroups/sys/net80211/ieee80211_node.h
  projects/ngroups/sys/net80211/ieee80211_output.c
  projects/ngroups/sys/net80211/ieee80211_phy.h
  projects/ngroups/sys/net80211/ieee80211_proto.c
  projects/ngroups/sys/net80211/ieee80211_proto.h
  projects/ngroups/sys/net80211/ieee80211_radiotap.c
  projects/ngroups/sys/net80211/ieee80211_scan.c
  projects/ngroups/sys/net80211/ieee80211_scan.h
  projects/ngroups/sys/net80211/ieee80211_sta.c
  projects/ngroups/sys/net80211/ieee80211_superg.c
  projects/ngroups/sys/net80211/ieee80211_tdma.c
  projects/ngroups/sys/net80211/ieee80211_var.h
  projects/ngroups/sys/netatalk/aarp.c
  projects/ngroups/sys/netatalk/ddp_input.c
  projects/ngroups/sys/netatalk/ddp_output.c
  projects/ngroups/sys/netatalk/ddp_usrreq.c
  projects/ngroups/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/ngroups/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/ngroups/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/ngroups/sys/netgraph/ng_ksocket.c
  projects/ngroups/sys/netinet/accf_data.c
  projects/ngroups/sys/netinet/accf_dns.c
  projects/ngroups/sys/netinet/accf_http.c
  projects/ngroups/sys/netinet/if_ether.c
  projects/ngroups/sys/netinet/igmp.c
  projects/ngroups/sys/netinet/in.h
  projects/ngroups/sys/netinet/in_pcb.c
  projects/ngroups/sys/netinet/in_pcb.h
  projects/ngroups/sys/netinet/in_rmx.c
  projects/ngroups/sys/netinet/ip_divert.c
  projects/ngroups/sys/netinet/ip_dummynet.h
  projects/ngroups/sys/netinet/ip_fw.h
  projects/ngroups/sys/netinet/ip_icmp.c
  projects/ngroups/sys/netinet/ip_input.c
  projects/ngroups/sys/netinet/ip_mroute.c
  projects/ngroups/sys/netinet/ip_options.c
  projects/ngroups/sys/netinet/ip_output.c
  projects/ngroups/sys/netinet/ip_var.h
  projects/ngroups/sys/netinet/ipfw/ip_fw2.c
  projects/ngroups/sys/netinet/raw_ip.c
  projects/ngroups/sys/netinet/sctp_pcb.c
  projects/ngroups/sys/netinet/sctp_sysctl.c
  projects/ngroups/sys/netinet/sctp_sysctl.h
  projects/ngroups/sys/netinet/sctp_uio.h
  projects/ngroups/sys/netinet/sctputil.c
  projects/ngroups/sys/netinet/tcp_input.c
  projects/ngroups/sys/netinet/tcp_output.c
  projects/ngroups/sys/netinet/tcp_subr.c
  projects/ngroups/sys/netinet/tcp_syncache.c
  projects/ngroups/sys/netinet/tcp_syncache.h
  projects/ngroups/sys/netinet/tcp_timewait.c
  projects/ngroups/sys/netinet/udp_usrreq.c
  projects/ngroups/sys/netinet6/frag6.c
  projects/ngroups/sys/netinet6/icmp6.c
  projects/ngroups/sys/netinet6/in6.h
  projects/ngroups/sys/netinet6/in6_ifattach.c
  projects/ngroups/sys/netinet6/in6_pcb.c
  projects/ngroups/sys/netinet6/in6_rmx.c
  projects/ngroups/sys/netinet6/ip6_input.c
  projects/ngroups/sys/netinet6/ip6_output.c
  projects/ngroups/sys/netinet6/nd6.c
  projects/ngroups/sys/netinet6/nd6_rtr.c
  projects/ngroups/sys/netinet6/udp6_usrreq.c
  projects/ngroups/sys/netinet6/vinet6.h
  projects/ngroups/sys/netipsec/ipsec_input.c
  projects/ngroups/sys/netipx/ipx_input.c
  projects/ngroups/sys/netnatm/natm_proto.c
  projects/ngroups/sys/netsmb/smb_trantcp.c
  projects/ngroups/sys/nfsclient/bootp_subr.c
  projects/ngroups/sys/nfsclient/nfs_bio.c
  projects/ngroups/sys/nfsclient/nfs_socket.c
  projects/ngroups/sys/nfsclient/nfs_vfsops.c
  projects/ngroups/sys/nfsserver/nfs.h
  projects/ngroups/sys/nfsserver/nfs_srvkrpc.c
  projects/ngroups/sys/nfsserver/nfs_srvsock.c
  projects/ngroups/sys/nfsserver/nfs_syscalls.c
  projects/ngroups/sys/nlm/nlm_advlock.c
  projects/ngroups/sys/pc98/conf/GENERIC
  projects/ngroups/sys/pci/if_rl.c
  projects/ngroups/sys/powerpc/aim/machdep.c
  projects/ngroups/sys/powerpc/booke/machdep.c
  projects/ngroups/sys/powerpc/booke/platform_bare.c
  projects/ngroups/sys/powerpc/booke/pmap.c
  projects/ngroups/sys/powerpc/conf/GENERIC
  projects/ngroups/sys/powerpc/conf/NOTES
  projects/ngroups/sys/powerpc/mpc85xx/atpic.c
  projects/ngroups/sys/powerpc/powermac/pmu.c
  projects/ngroups/sys/powerpc/powerpc/cpu.c
  projects/ngroups/sys/rpc/authunix_prot.c
  projects/ngroups/sys/rpc/clnt_dg.c
  projects/ngroups/sys/rpc/clnt_vc.c
  projects/ngroups/sys/rpc/svc.c
  projects/ngroups/sys/rpc/svc.h
  projects/ngroups/sys/rpc/svc_dg.c
  projects/ngroups/sys/rpc/svc_vc.c
  projects/ngroups/sys/rpc/xdr.h
  projects/ngroups/sys/security/audit/audit_syscalls.c
  projects/ngroups/sys/security/mac/mac_atalk.c
  projects/ngroups/sys/security/mac/mac_framework.c
  projects/ngroups/sys/security/mac/mac_inet.c
  projects/ngroups/sys/security/mac/mac_inet6.c
  projects/ngroups/sys/security/mac/mac_internal.h
  projects/ngroups/sys/security/mac/mac_net.c
  projects/ngroups/sys/security/mac/mac_socket.c
  projects/ngroups/sys/security/mac_biba/mac_biba.c
  projects/ngroups/sys/security/mac_lomac/mac_lomac.c
  projects/ngroups/sys/security/mac_mls/mac_mls.c
  projects/ngroups/sys/security/mac_stub/mac_stub.c
  projects/ngroups/sys/security/mac_test/mac_test.c
  projects/ngroups/sys/sparc64/conf/GENERIC
  projects/ngroups/sys/sparc64/sparc64/dump_machdep.c
  projects/ngroups/sys/sun4v/conf/GENERIC
  projects/ngroups/sys/sun4v/include/pcpu.h
  projects/ngroups/sys/sun4v/sun4v/dump_machdep.c
  projects/ngroups/sys/sun4v/sun4v/hvcons.c
  projects/ngroups/sys/sys/buf.h
  projects/ngroups/sys/sys/conf.h
  projects/ngroups/sys/sys/cpu.h
  projects/ngroups/sys/sys/jail.h
  projects/ngroups/sys/sys/kernel.h
  projects/ngroups/sys/sys/mount.h
  projects/ngroups/sys/sys/namei.h
  projects/ngroups/sys/sys/param.h
  projects/ngroups/sys/sys/pcpu.h
  projects/ngroups/sys/sys/pmc.h
  projects/ngroups/sys/sys/priv.h
  projects/ngroups/sys/sys/rmlock.h
  projects/ngroups/sys/sys/sockbuf.h
  projects/ngroups/sys/sys/socketvar.h
  projects/ngroups/sys/sys/sockio.h
  projects/ngroups/sys/sys/sx.h
  projects/ngroups/sys/sys/syscallsubr.h
  projects/ngroups/sys/sys/sysent.h
  projects/ngroups/sys/sys/tty.h
  projects/ngroups/sys/sys/ucred.h
  projects/ngroups/sys/sys/user.h
  projects/ngroups/sys/sys/vimage.h
  projects/ngroups/sys/sys/vnode.h
  projects/ngroups/sys/ufs/ffs/ffs_softdep.c
  projects/ngroups/sys/ufs/ffs/ffs_vfsops.c
  projects/ngroups/sys/ufs/ufs/dirhash.h
  projects/ngroups/sys/ufs/ufs/ufs_dirhash.c
  projects/ngroups/sys/ufs/ufs/ufs_vnops.c
  projects/ngroups/sys/vm/swap_pager.c
  projects/ngroups/sys/vm/vm_contig.c
  projects/ngroups/sys/vm/vm_glue.c
  projects/ngroups/sys/vm/vm_mmap.c
  projects/ngroups/sys/vm/vm_page.c
  projects/ngroups/sys/vm/vm_page.h
  projects/ngroups/sys/vm/vnode_pager.c
  projects/ngroups/sys/xen/evtchn/evtchn.c
  projects/ngroups/tools/regression/bin/sh/set-e/not2.0
  projects/ngroups/tools/regression/fstest/fstest.c
  projects/ngroups/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/ngroups/tools/tools/README
  projects/ngroups/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/ngroups/usr.bin/Makefile
  projects/ngroups/usr.bin/calendar/calendars/calendar.music
  projects/ngroups/usr.bin/dig/Makefile
  projects/ngroups/usr.bin/ee/Makefile
  projects/ngroups/usr.bin/find/function.c
  projects/ngroups/usr.bin/kdump/mkioctls
  projects/ngroups/usr.bin/netstat/route.c
  projects/ngroups/usr.bin/nfsstat/nfsstat.1
  projects/ngroups/usr.bin/nfsstat/nfsstat.c
  projects/ngroups/usr.bin/tail/extern.h
  projects/ngroups/usr.bin/tail/forward.c
  projects/ngroups/usr.bin/tail/misc.c
  projects/ngroups/usr.bin/tail/read.c
  projects/ngroups/usr.bin/tail/reverse.c
  projects/ngroups/usr.bin/tail/tail.1
  projects/ngroups/usr.bin/tail/tail.c
  projects/ngroups/usr.sbin/Makefile
  projects/ngroups/usr.sbin/acpi/Makefile.inc
  projects/ngroups/usr.sbin/acpi/acpiconf/acpiconf.c
  projects/ngroups/usr.sbin/acpi/acpidb/Makefile
  projects/ngroups/usr.sbin/acpi/acpidb/acpidb.c
  projects/ngroups/usr.sbin/acpi/acpidump/acpi.c
  projects/ngroups/usr.sbin/acpi/iasl/Makefile
  projects/ngroups/usr.sbin/ipfwpcap/Makefile
  projects/ngroups/usr.sbin/ipfwpcap/ipfwpcap.c
  projects/ngroups/usr.sbin/jail/jail.8
  projects/ngroups/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/ngroups/usr.sbin/makefs/getid.c   (props changed)
  projects/ngroups/usr.sbin/named/Makefile
  projects/ngroups/usr.sbin/nfscbd/nfscbd.c
  projects/ngroups/usr.sbin/nfsd/nfsv4.4
  projects/ngroups/usr.sbin/nfsdumpstate/nfsdumpstate.c
  projects/ngroups/usr.sbin/nfsrevoke/nfsrevoke.c
  projects/ngroups/usr.sbin/nfsuserd/Makefile
  projects/ngroups/usr.sbin/nfsuserd/nfsuserd.c
  projects/ngroups/usr.sbin/pkg_install/info/main.c
  projects/ngroups/usr.sbin/pmcstat/pmcstat.8
  projects/ngroups/usr.sbin/powerd/powerd.c
  projects/ngroups/usr.sbin/tcpdrop/tcpdrop.8
  projects/ngroups/usr.sbin/tcpdrop/tcpdrop.c
  projects/ngroups/usr.sbin/wpa/hostapd/driver_freebsd.c

Modified: projects/ngroups/ObsoleteFiles.inc
==============================================================================
--- projects/ngroups/ObsoleteFiles.inc	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/ObsoleteFiles.inc	Fri Jun  5 21:00:21 2009	(r193537)
@@ -14,6 +14,13 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090605: removal of clists
+OLD_FILES+=usr/include/sys/clist.h
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
+# 20090530: removal of early.sh
+OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz

Modified: projects/ngroups/UPDATING
==============================================================================
--- projects/ngroups/UPDATING	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/UPDATING	Fri Jun  5 21:00:21 2009	(r193537)
@@ -22,6 +22,48 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090602:
+	window(1) has been removed from the base system. It can now be
+	installed from ports. The port is called misc/window.
+
+20090601:
+	The way we are storing and accessing `routing table' entries
+	has changed. Programs reading the FIB, like netstat, need to
+	be re-compiled.
+
+20090601:
+	A new netisr implementation has been added for FreeBSD 8.  Network
+	file system modules, such as igmp, ipdivert, and others, should be
+	rebuilt.
+	Bump __FreeBSD_version to 800096.
+
+20090531:
+	For those who use ipfw and especially pf, those two firewalls
+	are now started BEFORE the network is initialized (i.e., before
+	rc.d/netif). Please review your rules to make sure that your
+	interfaces will be properly described.
+
+20090530:
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
+	is no more valid.
+
+20090530:
+	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
+	Bump __FreeBSD_version to 800094.
+
+20090529:
+	Add mnt_xflag field to 'struct mount'.  File system modules
+	need to be rebuilt.
+	Bump __FreeBSD_version to 800093.
+
+20090528:
+	The compiling option ADAPTIVE_SX has been retired while it has been
+	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+	The KPI for sx_init_flags() changes as accepting flags:
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+	has been introduced in order to handle the reversed logic.
+	Bump __FreeBSD_version to 800092.
+
 20090527:
 	Add support for hierarchical jails.  Remove global securelevel.
 	Bump __FreeBSD_version to 800091.

Modified: projects/ngroups/bin/cp/utils.c
==============================================================================
--- projects/ngroups/bin/cp/utils.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/cp/utils.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -365,7 +365,7 @@ setfile(struct stat *fs, int fd)
 	if (!gotstat || fs->st_flags != ts.st_flags)
 		if (fdval ?
 		    fchflags(fd, fs->st_flags) :
-		    (islink ? (errno = ENOSYS) :
+		    (islink ? lchflags(to.p_path, fs->st_flags) :
 		    chflags(to.p_path, fs->st_flags))) {
 			warn("chflags: %s", to.p_path);
 			rval = 1;

Modified: projects/ngroups/bin/rm/rm.c
==============================================================================
--- projects/ngroups/bin/rm/rm.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/rm/rm.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -234,7 +234,7 @@ rm_tree(char **argv)
 			else if (!uid &&
 				 (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 				 !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
-				 chflags(p->fts_accpath,
+				 lchflags(p->fts_accpath,
 					 p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0)
 				goto err;
 			continue;
@@ -253,7 +253,7 @@ rm_tree(char **argv)
 		if (!uid &&
 		    (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(p->fts_accpath,
+			rval = lchflags(p->fts_accpath,
 				       p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			/*
@@ -368,7 +368,7 @@ rm_file(char **argv)
 		if (!uid && !S_ISWHT(sb.st_mode) &&
 		    (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
+			rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			if (S_ISWHT(sb.st_mode))
 				rval = undelete(f);

Modified: projects/ngroups/bin/sh/alias.c
==============================================================================
--- projects/ngroups/bin/sh/alias.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/alias.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -97,7 +97,7 @@ setalias(char *name, char *val)
 	ap->val = savestr(val);
 #else /* hack */
 	{
-	int len = strlen(val);
+	size_t len = strlen(val);
 	ap->val = ckmalloc(len + 2);
 	memcpy(ap->val, val, len);
 	ap->val[len] = ' ';	/* fluff */

Modified: projects/ngroups/bin/sh/eval.c
==============================================================================
--- projects/ngroups/bin/sh/eval.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/eval.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -83,6 +83,7 @@ MKINIT int evalskip;		/* set if we are s
 STATIC int skipcount;		/* number of levels to skip */
 MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
+STATIC int builtin_flags;	/* evalcommand flags for builtins */
 
 
 char *commandname;
@@ -147,7 +148,7 @@ evalcmd(int argc, char **argv)
                         STPUTC('\0', concat);
                         p = grabstackstr(concat);
                 }
-                evalstring(p);
+                evalstring(p, builtin_flags & EV_TESTED);
         }
         return exitstatus;
 }
@@ -158,7 +159,7 @@ evalcmd(int argc, char **argv)
  */
 
 void
-evalstring(char *s)
+evalstring(char *s, int flags)
 {
 	union node *n;
 	struct stackmark smark;
@@ -167,7 +168,7 @@ evalstring(char *s)
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
 		if (n != NULL)
-			evaltree(n, 0);
+			evaltree(n, flags);
 		popstackmark(&smark);
 	}
 	popfile();
@@ -593,7 +594,7 @@ evalcommand(union node *cmd, int flags, 
 	char *lastarg;
 	int realstatus;
 	int do_clearcmdentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &argv;
 	(void) &argc;
@@ -839,6 +840,7 @@ evalcommand(union node *cmd, int flags, 
 		commandname = argv[0];
 		argptr = argv + 1;
 		optptr = NULL;			/* initialize nextopt */
+		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();
 cmddone:

Modified: projects/ngroups/bin/sh/eval.h
==============================================================================
--- projects/ngroups/bin/sh/eval.h	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/eval.h	Fri Jun  5 21:00:21 2009	(r193537)
@@ -46,7 +46,7 @@ struct backcmd {		/* result of evalbackc
 };
 
 int evalcmd(int, char **);
-void evalstring(char *);
+void evalstring(char *, int);
 union node;	/* BLETCH for ansi C */
 void evaltree(union node *, int);
 void evalbackcmd(union node *, struct backcmd *);

Modified: projects/ngroups/bin/sh/exec.c
==============================================================================
--- projects/ngroups/bin/sh/exec.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/exec.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -187,7 +187,8 @@ padvance(char **path, char *name)
 	if (*path == NULL)
 		return NULL;
 	start = *path;
-	for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+	for (p = start; *p && *p != ':' && *p != '%'; p++)
+		; /* nothing */
 	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
 	while (stackblocksize() < len)
 		growstackblock();

Modified: projects/ngroups/bin/sh/histedit.c
==============================================================================
--- projects/ngroups/bin/sh/histedit.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/histedit.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -350,7 +350,7 @@ histcmd(int argc, char **argv)
 				if (displayhist) {
 					out2str(s);
 				}
-				evalstring(s);
+				evalstring(s, 0);
 				if (displayhist && hist) {
 					/*
 					 *  XXX what about recursive and
@@ -382,7 +382,7 @@ histcmd(int argc, char **argv)
 		fclose(efp);
 		editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
 		sprintf(editcmd, "%s %s", editor, editfile);
-		evalstring(editcmd);	/* XXX - should use no JC command */
+		evalstring(editcmd, 0);	/* XXX - should use no JC command */
 		INTON;
 		readcmdfile(editfile);	/* XXX - should read back - quick tst */
 		unlink(editfile);

Modified: projects/ngroups/bin/sh/main.c
==============================================================================
--- projects/ngroups/bin/sh/main.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/main.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -178,7 +178,7 @@ state2:
 state3:
 	state = 4;
 	if (minusc) {
-		evalstring(minusc);
+		evalstring(minusc, 0);
 	}
 	if (sflag || minusc == NULL) {
 state4:	/* XXX ??? - why isn't this before the "if" statement */

Modified: projects/ngroups/bin/sh/memalloc.c
==============================================================================
--- projects/ngroups/bin/sh/memalloc.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/memalloc.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  */
 
 pointer
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	pointer p;
 

Modified: projects/ngroups/bin/sh/memalloc.h
==============================================================================
--- projects/ngroups/bin/sh/memalloc.h	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/memalloc.h	Fri Jun  5 21:00:21 2009	(r193537)
@@ -33,6 +33,8 @@
  * $FreeBSD$
  */
 
+#include 
+
 struct stackmark {
 	struct stack_block *stackp;
 	char *stacknxt;
@@ -46,7 +48,7 @@ extern int stacknleft;
 extern int sstrnleft;
 extern int herefd;
 
-pointer ckmalloc(int);
+pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
 char *savestr(char *);

Modified: projects/ngroups/bin/sh/miscbltin.c
==============================================================================
--- projects/ngroups/bin/sh/miscbltin.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/miscbltin.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -103,8 +103,6 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
-	struct termios told, tnew;
-	int tsaved;
 
 	rflag = 0;
 	prompt = NULL;
@@ -151,26 +149,11 @@ readcmd(int argc __unused, char **argv _
 
 	if (tv.tv_sec >= 0) {
 		/*
-		 * See if we can disable input processing; this will
-		 * not give the desired result if we are in a pipeline
-		 * and someone upstream is still in line-by-line mode.
-		 */
-		tsaved = 0;
-		if (tcgetattr(0, &told) == 0) {
-			memcpy(&tnew, &told, sizeof(told));
-			cfmakeraw(&tnew);
-			tnew.c_iflag |= told.c_iflag & ICRNL;
-			tcsetattr(0, TCSANOW, &tnew);
-			tsaved = 1;
-		}
-		/*
 		 * Wait for something to become available.
 		 */
 		FD_ZERO(&ifds);
 		FD_SET(0, &ifds);
 		status = select(1, &ifds, NULL, NULL, &tv);
-		if (tsaved)
-			tcsetattr(0, TCSANOW, &told);
 		/*
 		 * If there's nothing ready, return an error.
 		 */

Modified: projects/ngroups/bin/sh/mkinit.c
==============================================================================
--- projects/ngroups/bin/sh/mkinit.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/mkinit.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -159,7 +159,7 @@ void addstr(char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
 FILE *ckfopen(char *, char *);
-void *ckmalloc(int);
+void *ckmalloc(size_t);
 char *savestr(char *);
 void error(char *);
 
@@ -464,7 +464,7 @@ ckfopen(char *file, char *mode)
 }
 
 void *
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	char *p;
 

Modified: projects/ngroups/bin/sh/mksyntax.c
==============================================================================
--- projects/ngroups/bin/sh/mksyntax.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/mksyntax.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -354,7 +354,7 @@ output_type_macros(void)
 	char **pp;
 
 	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
+		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
 	if (digit_contig)

Modified: projects/ngroups/bin/sh/parser.c
==============================================================================
--- projects/ngroups/bin/sh/parser.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/parser.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -898,7 +898,7 @@ readtoken1(int firstc, char const *synta
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &out;
 	(void) "ef;
@@ -1323,7 +1323,7 @@ parsebackq: {
 	struct jmploc *volatile savehandler;
 	int savelen;
 	int saveprompt;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &saveprompt;
 #endif

Modified: projects/ngroups/bin/sh/sh.1
==============================================================================
--- projects/ngroups/bin/sh/sh.1	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/sh.1	Fri Jun  5 21:00:21 2009	(r193537)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd May 31, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1949,7 +1949,7 @@ If the
 .Fl t
 option is specified and the
 .Ar timeout
-elapses before any input is supplied,
+elapses before a complete line of input is supplied,
 the
 .Ic read
 command will return an exit status of 1 without assigning any values.

Modified: projects/ngroups/bin/sh/trap.c
==============================================================================
--- projects/ngroups/bin/sh/trap.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/trap.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -416,7 +416,7 @@ dotrap(void)
 					if (i == SIGCHLD)
 						ignore_sigchld++;
 					savestatus = exitstatus;
-					evalstring(trap[i]);
+					evalstring(trap[i], 0);
 					exitstatus = savestatus;
 					if (i == SIGCHLD)
 						ignore_sigchld--;
@@ -471,7 +471,7 @@ exitshell(int status)
 	handler = &loc1;
 	if ((p = trap[0]) != NULL && *p != '\0') {
 		trap[0] = NULL;
-		evalstring(p);
+		evalstring(p, 0);
 	}
 l1:   handler = &loc2;			/* probably unnecessary */
 	flushall();

Modified: projects/ngroups/bin/sh/var.c
==============================================================================
--- projects/ngroups/bin/sh/var.c	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/bin/sh/var.c	Fri Jun  5 21:00:21 2009	(r193537)
@@ -195,7 +195,7 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
 	int err = 0;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &err;
 #endif

Modified: projects/ngroups/contrib/bind9/CHANGES
==============================================================================
--- projects/ngroups/contrib/bind9/CHANGES	Fri Jun  5 20:41:51 2009	(r193536)
+++ projects/ngroups/contrib/bind9/CHANGES	Fri Jun  5 21:00:21 2009	(r193537)
@@ -1,18 +1,258 @@
-	--- 9.4.3-P2 released ---
+
+	--- 9.6.1rc1 released ---
+
+2599.	[bug]		Address rapid memory growth when validation fails.
+			[RT #19654]
+
+2597.	[bug]		Handle a validation failure with a insecure delegation
+			from a NSEC3 signed master/slave zone.  [RT #19464]
+
+2596.	[bug]		Stale tree nodes of cache/dynamic rbtdb could stay
+			long, leading to inefficient memory usage or rejecting
+			newer cache entries in the worst case. [RT #19563]
+
+2595.	[bug]		Fix unknown extended rcodes in dig. [RT #19625]
+
+2592.	[bug]		Treat "any" as a type in nsupdate. [RT #19455]
+
+2591.	[bug]		named could die when processing a update in
+			removed_orphaned_ds(). [RT #19507]
+
+2588.	[bug]		SO_REUSEADDR could be set unconditionally after failure
+			of bind(2) call.  This should be rare and mostly
+			harmless, but may cause interference with other
+			processes that happen to use the same port. [RT #19642]
+
+2586.	[bug]		Missing cleanup of SIG rdataset in searching a DLZ DB
+			or SDB. [RT #19577]
+
+2585.	[bug]		Uninitialized socket name could be referenced via a
+			statistics channel, triggering an assertion failure in
+			XML rendering. [RT #19427]
+
+2584.	[bug]		alpha: gcc optimization could break atomic operations.
+			[RT #19227]
+
+2583.	[port]		netbsd: provide a control to not add the compile
+			date to the version string, -DNO_VERSION_DATE.
+
+2582.	[bug]		Don't emit warning log message when we attempt to
+			remove non-existant journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
 
-	--- 9.4.3-P1 released ---
+2578.	[bug]		Changed default sig-signing-type to 65534, because
+			65535 turns out to be reserved.  [RT #19477]
+
+2499.	[port]		solaris: lib/lwres/getaddrinfo.c namespace clash.
+			[RT #18837]
+
+	--- 9.6.1b1 released ---
+
+2577.	[doc]		Clarified some statistics counters. [RT #19454]
+
+2576.	[bug]		NSEC record were not being correctly signed when
+			a zone transitions from insecure to secure.
+			Handle such incorrectly signed zones. [RT #19114]
+
+2574.	[doc]		Document nsupdate -g and -o. [RT #19351]
+
+2573.	[bug]		Replacing a non-CNAME record with a CNAME record in a
+			single transaction in a signed zone failed. [RT #19397]
+
+2568.	[bug]		Report when the write to indicate a otherwise
+			successful start fails. [RT #19360]
+
+2567.	[bug]		dst__privstruct_writefile() could miss write errors.
+			write_public_key() could miss write errors.
+			dnssec-dsfromkey could miss write errors.
+			[RT #19360]
+
+2564.	[bug]		Only take EDNS fallback steps when processing timeouts.
+			[RT #19405]
+
+2563.	[bug]		Dig could leak a socket causing it to wait forever
+			to exit. [RT #19359]
+
+2562.	[doc]		ARM: miscellaneous improvements, reorganization,
+			and some new content.
+
+2561.	[doc]		Add isc-config.sh(1) man page. [RT #16378]
+
+2560.	[bug]		Add #include  to iptable.c. [RT #18258]
+
+2559.	[bug]		dnssec-dsfromkey could compute bad DS records when
+			reading from a K* files.  [RT #19357]
+
+2557.	[cleanup]	PCI compliance:
+			* new libisc log module file
+			* isc_dir_chroot() now also changes the working
+			  directory to "/".
+			* additional INSISTs
+			* additional logging when files can't be removed.
+
+2556.	[port]		Solaris: mkdir(2) on tmpfs filesystems does not do the
+			error checks in the correct order resulting in the
+			wrong error code sometimes being returned. [RT #19249]
+			
+2554.	[bug]		Validation of uppercase queries from NSEC3 zones could
+			fail. [RT #19297]
+
+2553.	[bug]		Reference leak on DNSSEC validation errors. [RT #19291]
+
+2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+			[RT #19340]
+
+2551.	[bug]		Potential Reference leak on return. [RT #19341]
+
+2550.	[bug]		Check --with-openssl= finds .
+			[RT #19343]
+
+2549.	[port]		linux: define NR_OPEN if not currently defined.
+			[RT #19344]
+
+2548.	[bug]		Install iterated_hash.h. [RT #19335]
+
+2547.	[bug]		openssl_link.c:mem_realloc() could reference an
+			out-of-range area of the source buffer.  New public
+			function isc_mem_reallocate() was introduced to address
+			this bug. [RT #19313]
+
+2545.	[doc]		ARM: Legal hostname checking (check-names) is
+			for SRV RDATA too. [RT #19304]
+
+2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
+
+2543.	[contrib]	Update contrib/zkt to version 0.98. [RT #19113]
+
+2542.	[doc]		Update the description of dig +adflag. [RT #19290]
+
+2541.	[bug]		Conditionally update dispatch manager statistics.
+			[RT #19247]
+
+2539.	[security]	Update the interaction between recursion, allow-query,
+			allow-query-cache and allow-recursion.  [RT #19198]
+
+2538.	[bug]		cache/ADB memory could grow over max-cache-size,
+			especially with threads and smaller max-cache-size
+			values. [RT #19240]
+
+2537.	[experimental]	Added more statistics counters including those on socket
+			I/O events and query RTT histograms. [RT #18802]
+
+2536.	[cleanup]	Silence some warnings when -Werror=format-security is
+			specified. [RT #19083]
+
+2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+
+2532.	[bug]		dig: check the question section of the response to
+			see if it matches the asked question. [RT #18495]
+
+2531.	[bug]		Change #2207 was incomplete. [RT #19098]
+
+2530.	[bug]		named failed to reject insecure to secure transitions
+			via UPDATE. [RT #19101]
+
+2529.	[cleanup]	Upgrade libtool to silence complaints from recent
+			version of autoconf. [RT #18657]
+
+2528.   [cleanup]       Silence spurious configure warning about
+                        --datarootdir [RT #19096]
+
+2527.	[bug]		named could reuse cache on reload with
+			enabling/disabling validation. [RT #19119]
+
+2525.	[experimental]	New logging category "query-errors" to provide detailed
+			internal information about query failures, especially
+			about server failures. [RT #19027]
+
+2524.	[port]		sunos: dnssec-signzone needs strtoul(). [RT #19129]
+
+2523.	[bug]		Random type rdata freed by dns_nsec_typepresent().
+			[RT #19112]
+
+2522.	[security]	Handle -1 from DSA_do_verify() and EVP_VerifyFinal().
+
+2521.	[bug]		Improve epoll cross compilation support. [RT #19047]
+
+2519.	[bug]		dig/host with -4 or -6 didn't work if more than two
+			nameserver addresses of the excluded address family
+			preceded in resolv.conf. [RT #19081]
+
+2517.	[bug]		dig +trace with -4 or -6 failed when it chose a
+			nameserver address of the excluded address.
+			[RT #18843]
+
+2516.	[bug]		glue sort for responses was performed even when not
+			needed. [RT #19039]
+
+2514.	[bug]		dig/host failed with -4 or -6 when resolv.conf contains
+			a nameserver of the excluded address family.
+			[RT #18848]
+
+2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
+			[RT #18885]
+
+2506.	[port]		solaris: Check at configure time if 
+			hack_shutup_pthreadonceinit is needed. [RT #19037]
+
+2505.	[port]		Treat amd64 similarly to x86_64 when determining
+			atomic operation support. [RT #19031]
+
+2503.	[port]		linux: improve compatibility with Linux Standard
+			Base. [RT #18793]
+
+2502.	[cleanup]	isc_radix: Improve compliance with coding style,
+			document function in . [RT #18534]
+
+	--- 9.6.0 released ---
+
+2520.	[bug]		Update xml statistics version number to 2.0 as change
+			#2388 made the schema incompatible to the previous
+			version. [RT #19080]
+
+	--- 9.6.0rc2 released ---
+
+2515.	[port]		win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
+			[RT #19063]
+
+2513	[bug]		Fix windows cli build. [RT #19062]
+
+2510.	[bug]		"dig +sigchase" could trigger REQUIRE failures.
+			[RT #19033]
+
+2509.	[bug]		Specifying a fixed query source port was broken.
+			[RT #19051]
 
-2522.	[security]	Handle -1 from DSA_do_verify().
+2504.	[bug]		Address race condition in the socket code. [RT #18899]
+
+	--- 9.6.0rc1 released ---
 
 2498.	[bug]		Removed a bogus function argument used with
 			ISC_SOCKET_USE_POLLWATCH: it could cause compiler
 			warning or crash named with the debug 1 level
 			of logging. [RT #18917]
 
-	--- 9.4.3 released ---
+2497.	[bug]		Don't add RRSIG bit to NSEC3 bit map for insecure
+			delegation.
+
+2496.	[bug]		Add sanity length checks to NSID option. [RT #18813]
+
+2495.	[bug]		Tighten RRSIG checks. [RT #18795]
+
+2494.	[bug]		isc/radix.h, dns/sdlz.h and dns/dlz.h were not being
+			installed. [RT #18826]
+
+2493.	[bug]		The linux capabilities code was not correctly cleaning
+			up after itself. [RT #18767]
+
+2492.	[func]		Rndc status now reports the number of cpus discovered
+			and the number of worker threads when running
+			multi-threaded. [RT #18273]
+
+2491.	[func]		Attempt to re-use a local port if we are already using
+			the port. [RT #18548]
 
 2490.	[port]		aix: work around a kernel bug where IPV6_RECVPKTINFO
 			is cleared when IPV6_V6ONLY is set. [RT #18785]
@@ -23,7 +263,58 @@
 			Define ISC_SOCKET_USE_POLLWATCH at build time to enable
 			this workaround. [RT #18870]
 
-	--- 9.4.3rc1 released ---
+2488.	[func]		Added a tool, dnssec-dsfromkey, to generate DS records
+			from keyset and .key files. [RT #18694]
+
+2487.	[bug]		Give TCP connections longer to complete. [RT #18675]
+
+2486.	[func]		The default locations for named.pid and lwresd.pid
+			are now /var/run/named/named.pid and
+			/var/run/lwresd/lwresd.pid respectively.
+
+			This allows the owner of the containing directory
+			to be set, for "named -u" support, and allows there
+			to be a permanent symbolic link in the path, for
+			"named -t" support.  [RT #18306]
+
+2485.	[bug]		Change update's the handling of obscured RRSIG
+			records.  Not all orphaned DS records were being
+			removed. [RT #18828]
+
+2484.	[bug]		It was possible to trigger a REQUIRE failure when
+			adding NSEC3 proofs to the response in
+			query_addwildcardproof().  [RT #18828]
+
+2483.	[port]		win32: chroot() is not supported. [RT #18805]
+
+2482.	[port]		libxml2: support versions 2.7.* in addition
+			to 2.6.*. [RT #18806]
+
+	--- 9.6.0b1 released ---
+
+2481.	[bug]		rbtdb.c:matchparams() failed to handle NSEC3 chain
+			collisions.  [RT #18812]
+
+2480.	[bug]		named could fail to emit all the required NSEC3
+			records.  [RT #18812]
+
+2479.	[bug]		xfrout:covers was not properly initialized. [RT #18801]
+
+2478.	[bug]		'addresses' could be used uninitialized in
+			configure_forward(). [RT #18800]
+	
+2477.	[bug]		dig: the global option to print the command line is
+			+cmd not print_cmd.  Update the output to reflect
+			this. [RT #17008]
+
+2476.	[doc]		ARM: improve documentation for max-journal-size and
+			ixfr-from-differences. [RT #15909] [RT #18541]
+
+2475.	[bug]		LRU cache cleanup under overmem condition could purge
+			particular entries more aggressively. [RT #17628]
+
+2474.	[bug]		ACL structures could be allocated with insufficient
+			space, causing an array overrun. [RT #18765]
 
 2473.	[port]		linux: raise the limit on open files to the possible
 			maximum value before spawning threads; 'files'
@@ -33,9 +324,12 @@
 2472.	[port]		linux: check the number of available cpu's before
 			calling chroot as it depends on "/proc". [RT #16923]
 
-2471.	[bug]		named-checkzone was not reporting missing manditory
+2471.	[bug]		named-checkzone was not reporting missing mandatory
 			glue when sibling checks were disabled. [RT #18768]
 
+2470.	[bug]		Elements of the isc_radix_node_t could be incorrectly
+			overwritten.  [RT# 18719]
+
 2469.	[port]		solaris: Work around Solaris's select() limitations.
 			[RT #18769]
 
@@ -50,10 +344,14 @@
 2465.	[bug]		Adb's handling of lame addresses was different
 			for IPv4 and IPv6. [RT #18738]
 
+2464.	[port]		linux: check that a capability is present before
+			trying to set it. [RT #18135]
+
 2463.   [port]          linux: POSIX doesn't include the IPv6 Advanced Socket
 			API and glibc hides parts of the IPv6 Advanced Socket
 			API as a result.  This is stupid as it breaks how the
-			two halves (Basic and Advanced) of the IPv6 Socket API				were designed to be used but we have to live with it.
+			two halves (Basic and Advanced) of the IPv6 Socket API
+			were designed to be used but we have to live with it.
 			Define _GNU_SOURCE to pull in the IPv6 Advanced Socket
 			API. [RT #18388]
 
@@ -62,17 +360,48 @@
 
 2461.	[port]		sunos: Change #2363 was not complete. [RT #17513]
 
+	--- 9.6.0a1 released ---
+
+2460.	[bug]		Don't call dns_db_getnsec3parameters() on the cache.
+			[RT #18697]
+
+2459.	[contrib]	Import dnssec-zkt to contrib/zkt. [RT #18448]
+
 2458.	[doc]		ARM: update and correction for max-cache-size.
 			[RT #18294]
 
-2455.	[bug]		Stop metadata being transfered via axfr/ixfr.
+2457.	[tuning]	max-cache-size is reverted to 0, the previous
+			default.  It should be safe because expired cache
+			entries are also purged. [RT #18684]
+
+2456.	[bug]		In ACLs, ::/0 and 0.0.0.0/0 would both match any
+			address, regardless of family.  They now correctly
+			distinguish IPv4 from IPv6.  [RT #18559]
+                        
+2455.	[bug]		Stop metadata being transferred via axfr/ixfr.
 			[RT #18639]
 
+2454.	[func]		nsupdate: you can now set a default ttl. [RT #18317]
+
 2453.	[bug]		Remove NULL pointer dereference in dns_journal_print().
 			[RT #18316]
 
-2449.	[bug]		libbind: Out of bounds reference in dns_ho.c:addrsort.
-			[RT #18044]
+2452.	[func]		Improve bin/test/journalprint. [RT #18316]
+
+2451.	[port]		solaris: handle runtime linking better. [RT #18356]
+
+2450.	[doc]		Fix lwresd docbook problem for manual page.
+			[RT #18672]
+
+2449.	[placeholder]
+
+2448.	[func]		Add NSEC3 support. [RT #15452]
+
+2447.	[cleanup]	libbind has been split out as a separate product.
+
+2446.	[func]		Add a new log message about build options on startup.
+			A new command-line option '-V' for named is also
+			provided to show this information. [RT# 18645]
 
 2445.	[doc]		ARM out-of-date on empty reverse zones (list includes
 			RFC1918 address, but these are not yet compiled in).
@@ -81,31 +410,46 @@
 2444.	[port]		Linux, FreeBSD, AIX: Turn off path mtu discovery
 			(clear DF) for UDP responses and requests.
 
-	--- 9.4.3b3 released ---
-
 2443.	[bug]		win32: UDP connect() would not generate an event,
 			and so connected UDP sockets would never clean up.
 			Fix this by doing an immediate WSAConnect() rather
 			than an io completion port type for UDP.
 
-2438.	[bug]		Timeouts could be logged incorrectly under win32.
-			[RT #18617]
+2442.	[bug]		A lock could be destroyed twice. [RT# 18626]
+
+2441.   [bug]           isc_radix_insert() could copy radix tree nodes
+			incompletely. [RT #18573]
+
+2440.   [bug]		named-checkconf used an incorrect test to determine
+			if an ACL was set to none.
+
+2439.   [bug]		Potential NULL dereference in dns_acl_isanyornone().
+			[RT #18559]
+
+2438.   [bug]		Timeouts could be logged incorrectly under win32.
 
 2437.	[bug]		Sockets could be closed too early, leading to
 			inconsistent states in the socket module. [RT #18298]
 
 2436.	[security]	win32: UDP client handler can be shutdown. [RT #18576]
 
+2435.	[bug]		Fixed an ACL memory leak affecting win32.
+
+2434.	[bug]		Fixed a minor error-reporting bug in
+			lib/isc/win32/socket.c.
+
 2433.	[tuning]	Set initial timeout to 800ms.
 
-2432.	[bug]		More Windows socket handling improvements.  Stop
+2432.   [bug]		More Windows socket handling improvements.  Stop
 			using I/O events and use IO Completion Ports
 			throughout.  Rewrite the receive path logic to make
 			it easier to support multiple simultaneous
-			requestrs in the future.  Add stricter consistency
+			requesters in the future.  Add stricter consistency
 			checking as a compile-time option (define
 			ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off).
 
+2431.	[bug]		Acl processing could leak memory. [RT #18323]
+
 2430.	[bug]		win32: isc_interval_set() could round down to
 			zero if the input was less than NS_INTERVAL
 			nanoseconds.  Round up instead. [RT #18549]
@@ -113,8 +457,14 @@
 2429.	[doc]		nsupdate should be in section 1 of the man pages.
 			[RT #18283]
 
+2428.	[bug]		dns_iptable_merge() mishandled merges of negative
+			tables. [RT #18409]
+
+2427.	[func]		Treat DNSKEY queries as if "minimal-response yes;"
+			was set. [RT #18528]
+
 2426.	[bug]		libbind: inet_net_pton() can sometimes return the
-			wrong value if excessively large netmasks are
+			wrong value if excessively large net masks are
 			supplied. [RT #18512]
 
 2425.	[bug]		named didn't detect unavailable query source addresses
@@ -125,6 +475,12 @@
 			epoll and /dev/poll to be selected at compile
 			time. [RT #18277]
 			
+2423.   [security]	Randomize server selection on queries, so as to
+                        make forgery a little more difficult.  Instead of
+                        always preferring the server with the lowest RTT,
+                        pick a server with RTT within the same 128
+                        millisecond band.  [RT #18441]
+
 2422.	[bug]		Handle the special return value of a empty node as
 			if it was a NXRRSET in the validator. [RT #18447]
 
@@ -133,13 +489,20 @@
 			Use caution: this option may not work for some
 			operating systems without rebuilding named.
 
-2420.	[bug]		Windows socket handling cleanup.  Let the io
-			completion event send out cancelled read/write
-			done events, which keeps us from writing to memeory
+2420.   [bug]		Windows socket handling cleanup.  Let the io
+			completion event send out canceled read/write
+			done events, which keeps us from writing to memory
 			we no longer have ownership of.  Add debugging
 			socket_log() function.  Rework TCP socket handling
 			to not leak sockets.
 
+2419.	[cleanup]	Document that isc_socket_create() and isc_socket_open()
+			should not be used for isc_sockettype_fdwatch sockets.
+			[RT #18521]
+
+2418.	[bug]		AXFR request on a DLZ could trigger a REQUIRE failure
+			[RT #18430]
+
 2417.	[bug]		Connecting UDP sockets for outgoing queries could
 			unexpectedly fail with an 'address already in use'
 			error. [RT #18411]
@@ -147,26 +510,42 @@
 2416.	[func]		Log file descriptors that cause exceeding the
 			internal maximum. [RT #18460]
 
+2415.	[bug]		'rndc dumpdb' could trigger various assertion failures
+			in rbtdb.c. [RT #18455]
+
 2414.	[bug]		A masterdump context held the database lock too long,
 			causing various troubles such as dead lock and
 			recursive lock acquisition. [RT #18311, #18456]
 
 2413.	[bug]		Fixed an unreachable code path in socket.c. [RT #18442]
 
-2412.	[bug]		win32: address a resourse leak. [RT #18374]
+2412.	[bug]		win32: address a resource leak. [RT #18374]
 
 2411.	[bug]		Allow using a larger number of sockets than FD_SETSIZE
 			for select().  To enable this, set ISC_SOCKET_MAXSOCKETS
 			at compilation time.  [RT #18433]
 
+			Note: with changes #2469 and #2421 above, there is no
+			need to tweak ISC_SOCKET_MAXSOCKETS at compilation time
+			any more.
+
 2410.	[bug]		Correctly delete m_versionInfo. [RT #18432]
 
+2409.	[bug]		Only log that we disabled EDNS processing if we were
+			subsequently successful.  [RT #18029]
+
 2408.	[bug]		A duplicate TCP dispatch event could be sent, which
 			could then trigger an assertion failure in
 			resquery_response().  [RT #18275]
 
 2407.	[port]		hpux: test for sys/dyntune.h. [RT #18421]
 
+2406.	[placeholder]
+
+2405.   [cleanup]       The default value for dnssec-validation was changed to
+                        "yes" in 9.5.0-P1 and all subsequent releases; this
+                        was inadvertently omitted from CHANGES at the time.
+
 2404.	[port]		hpux: files unlimited support.
 
 2403.	[bug]		TSIG context leak. [RT #18341]
@@ -176,13 +555,17 @@
 2401.	[bug]		Expect to get E[MN]FILE errno internal_accept()
 			(from accept() or fcntl() system calls). [RT #18358]
 
-2399.	[bug]		Abort timeout queries to reduce the number of open
-			UDP sockets. [RT #18367]
+2400.	[bug]		Log if kqueue()/epoll_create()/open(/dev/poll) fails.
+			[RT #18297]
+
+2399.	[placeholder]
 
 2398.	[bug]           Improve file descriptor management.  New,
 			temporary, named.conf option reserved-sockets,
 			default 512. [RT #18344]
 
+2397.	[bug]		gssapi_functions had too many elements. [RT #18355]
+
 2396.	[bug]		Don't set SO_REUSEADDR for randomized ports.
 			[RT #18336]
 
@@ -193,35 +576,42 @@
 			open files to 'unlimited' as described in the
 			documentation. [RT #18331]
 
+2393.	[bug]		nested acls containing keys could trigger an
+			assertion in acl.c. [RT #18166]
+
 2392.	[bug]		remove 'grep -q' from acl test script, some platforms
 			don't support it. [RT #18253]
 
-2391	[port]		hpux: cover additional recvmsg() error codes.
+2391.	[port]		hpux: cover additional recvmsg() error codes.
 			[RT #18301]
 
-2390	[bug]		dispatch.c could make a false warning on 'odd socket'.
+2390.	[bug]		dispatch.c could make a false warning on 'odd socket'.
 			[RT #18301].
 
-2389	[bug]		Move the "working directory writable" check to after
+2389.	[bug]		Move the "working directory writable" check to after
 			the ns_os_changeuser() call. [RT #18326]
 
+2388.	[bug]		Avoid using tables for layout purposes in
+			statistics XSL [RT #18159].
+
+2387.	[bug]		Silence compiler warnings in lib/isc/radix.c.

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

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun  6 22:15:18 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DE921065670;
	Sat,  6 Jun 2009 22:15:18 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 76A008FC15;
	Sat,  6 Jun 2009 22:15:18 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n56MFIeD073236;
	Sat, 6 Jun 2009 22:15:18 GMT (envelope-from jb@svn.freebsd.org)
Received: (from jb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n56MFHl1073213;
	Sat, 6 Jun 2009 22:15:17 GMT (envelope-from jb@svn.freebsd.org)
Message-Id: <200906062215.n56MFHl1073213@svn.freebsd.org>
From: John Birrell 
Date: Sat, 6 Jun 2009 22:15:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193596 - in projects/jbuild: . bin/cp bin/rm bin/sh
	contrib/bind9 contrib/bind9/bin contrib/bind9/bin/check
	contrib/bind9/bin/dig contrib/bind9/bin/dig/include/dig
	contrib/bind9/bin/dn...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 06 Jun 2009 22:15:18 -0000

Author: jb
Date: Sat Jun  6 22:15:15 2009
New Revision: 193596
URL: http://svn.freebsd.org/changeset/base/193596

Log:
  MFC

Added:
  projects/jbuild/contrib/bind9/NSEC3-NOTES
     - copied unchanged from r193593, head/contrib/bind9/NSEC3-NOTES
  projects/jbuild/contrib/bind9/README.pkcs11
     - copied unchanged from r193593, head/contrib/bind9/README.pkcs11
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
     - copied unchanged from r193593, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  projects/jbuild/contrib/bind9/bin/named/bind9.xsl
     - copied unchanged from r193593, head/contrib/bind9/bin/named/bind9.xsl
  projects/jbuild/contrib/bind9/bin/named/bind9.xsl.h
     - copied unchanged from r193593, head/contrib/bind9/bin/named/bind9.xsl.h
  projects/jbuild/contrib/bind9/bin/named/convertxsl.pl
     - copied unchanged from r193593, head/contrib/bind9/bin/named/convertxsl.pl
  projects/jbuild/contrib/bind9/bin/named/include/named/statschannel.h
     - copied unchanged from r193593, head/contrib/bind9/bin/named/include/named/statschannel.h
  projects/jbuild/contrib/bind9/bin/named/statschannel.c
     - copied unchanged from r193593, head/contrib/bind9/bin/named/statschannel.c
  projects/jbuild/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
     - copied unchanged from r193593, head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/jbuild/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
     - copied unchanged from r193593, head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/jbuild/contrib/bind9/doc/arm/man.nsupdate.html
     - copied unchanged from r193593, head/contrib/bind9/doc/arm/man.nsupdate.html
  projects/jbuild/contrib/bind9/lib/dns/include/dns/iptable.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/include/dns/iptable.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/nsec3.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/jbuild/contrib/bind9/lib/dns/iptable.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/iptable.c
  projects/jbuild/contrib/bind9/lib/dns/nsec3.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/nsec3.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
  projects/jbuild/contrib/bind9/lib/dns/spnego.asn1
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/spnego.asn1
  projects/jbuild/contrib/bind9/lib/dns/spnego.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/spnego.c
  projects/jbuild/contrib/bind9/lib/dns/spnego.h
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/spnego.h
  projects/jbuild/contrib/bind9/lib/dns/spnego_asn1.c
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/spnego_asn1.c
  projects/jbuild/contrib/bind9/lib/dns/spnego_asn1.pl
     - copied unchanged from r193593, head/contrib/bind9/lib/dns/spnego_asn1.pl
  projects/jbuild/contrib/bind9/lib/isc/base32.c
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/base32.c
  projects/jbuild/contrib/bind9/lib/isc/httpd.c
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/httpd.c
  projects/jbuild/contrib/bind9/lib/isc/include/isc/base32.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/base32.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/httpd.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/httpd.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/iterated_hash.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/iterated_hash.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/radix.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/radix.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/stats.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/stats.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/xml.h
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/include/isc/xml.h
  projects/jbuild/contrib/bind9/lib/isc/iterated_hash.c
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/iterated_hash.c
  projects/jbuild/contrib/bind9/lib/isc/radix.c
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/radix.c
  projects/jbuild/contrib/bind9/lib/isc/stats.c
     - copied unchanged from r193593, head/contrib/bind9/lib/isc/stats.c
  projects/jbuild/etc/rc.d/nfscbd
     - copied unchanged from r193593, head/etc/rc.d/nfscbd
  projects/jbuild/etc/rc.d/nfsuserd
     - copied unchanged from r193593, head/etc/rc.d/nfsuserd
  projects/jbuild/share/man/man9/sglist.9
     - copied unchanged from r193593, head/share/man/man9/sglist.9
  projects/jbuild/sys/contrib/dev/acpica/changes.txt
     - copied unchanged from r193593, head/sys/contrib/dev/acpica/changes.txt
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslstartup.c
     - copied unchanged from r193593, head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/jbuild/sys/contrib/dev/acpica/debugger/
     - copied from r193593, head/sys/contrib/dev/acpica/debugger/
  projects/jbuild/sys/contrib/dev/acpica/disassembler/
     - copied from r193593, head/sys/contrib/dev/acpica/disassembler/
  projects/jbuild/sys/contrib/dev/acpica/dispatcher/
     - copied from r193593, head/sys/contrib/dev/acpica/dispatcher/
  projects/jbuild/sys/contrib/dev/acpica/events/
     - copied from r193593, head/sys/contrib/dev/acpica/events/
  projects/jbuild/sys/contrib/dev/acpica/executer/
     - copied from r193593, head/sys/contrib/dev/acpica/executer/
  projects/jbuild/sys/contrib/dev/acpica/hardware/
     - copied from r193593, head/sys/contrib/dev/acpica/hardware/
  projects/jbuild/sys/contrib/dev/acpica/include/
     - copied from r193593, head/sys/contrib/dev/acpica/include/
  projects/jbuild/sys/contrib/dev/acpica/namespace/
     - copied from r193593, head/sys/contrib/dev/acpica/namespace/
  projects/jbuild/sys/contrib/dev/acpica/parser/
     - copied from r193593, head/sys/contrib/dev/acpica/parser/
  projects/jbuild/sys/contrib/dev/acpica/resources/
     - copied from r193593, head/sys/contrib/dev/acpica/resources/
  projects/jbuild/sys/contrib/dev/acpica/tables/
     - copied from r193593, head/sys/contrib/dev/acpica/tables/
  projects/jbuild/sys/contrib/dev/acpica/tools/
     - copied from r193593, head/sys/contrib/dev/acpica/tools/
  projects/jbuild/sys/contrib/dev/acpica/utilities/
     - copied from r193593, head/sys/contrib/dev/acpica/utilities/
  projects/jbuild/sys/contrib/dev/mwl/
     - copied from r193593, head/sys/contrib/dev/mwl/
  projects/jbuild/sys/dev/mwl/
     - copied from r193593, head/sys/dev/mwl/
  projects/jbuild/sys/dev/sec/
     - copied from r193593, head/sys/dev/sec/
  projects/jbuild/sys/i386/include/xen/xen_clock_util.h
     - copied unchanged from r193593, head/sys/i386/include/xen/xen_clock_util.h
  projects/jbuild/sys/i386/xen/xen_clock_util.c
     - copied unchanged from r193593, head/sys/i386/xen/xen_clock_util.c
  projects/jbuild/sys/i386/xen/xen_rtc.c
     - copied unchanged from r193593, head/sys/i386/xen/xen_rtc.c
  projects/jbuild/sys/kern/subr_sglist.c
     - copied unchanged from r193593, head/sys/kern/subr_sglist.c
  projects/jbuild/sys/modules/mwl/
     - copied from r193593, head/sys/modules/mwl/
  projects/jbuild/sys/modules/mwlfw/
     - copied from r193593, head/sys/modules/mwlfw/
  projects/jbuild/sys/modules/nfscl/
     - copied from r193593, head/sys/modules/nfscl/
  projects/jbuild/sys/modules/nfscommon/
     - copied from r193593, head/sys/modules/nfscommon/
  projects/jbuild/sys/modules/nfsd/
     - copied from r193593, head/sys/modules/nfsd/
  projects/jbuild/sys/netinet/ipfw/
     - copied from r193593, head/sys/netinet/ipfw/
  projects/jbuild/sys/powerpc/cpufreq/
     - copied from r193593, head/sys/powerpc/cpufreq/
  projects/jbuild/sys/powerpc/ofw/ofw_cpu.c
     - copied unchanged from r193593, head/sys/powerpc/ofw/ofw_cpu.c
  projects/jbuild/sys/powerpc/powermac/vcoregpio.c
     - copied unchanged from r193593, head/sys/powerpc/powermac/vcoregpio.c
  projects/jbuild/sys/sys/sglist.h
     - copied unchanged from r193593, head/sys/sys/sglist.h
  projects/jbuild/tools/build/options/WITH_BIND_IDN
     - copied unchanged from r193593, head/tools/build/options/WITH_BIND_IDN
  projects/jbuild/tools/build/options/WITH_BIND_LARGE_FILE
     - copied unchanged from r193593, head/tools/build/options/WITH_BIND_LARGE_FILE
  projects/jbuild/tools/build/options/WITH_BIND_SIGCHASE
     - copied unchanged from r193593, head/tools/build/options/WITH_BIND_SIGCHASE
  projects/jbuild/tools/build/options/WITH_BIND_XML
     - copied unchanged from r193593, head/tools/build/options/WITH_BIND_XML
  projects/jbuild/tools/regression/bin/sh/builtins/eval1.0
     - copied unchanged from r193593, head/tools/regression/bin/sh/builtins/eval1.0
  projects/jbuild/tools/regression/bin/sh/set-e/eval1.0
     - copied unchanged from r193593, head/tools/regression/bin/sh/set-e/eval1.0
  projects/jbuild/tools/regression/bin/sh/set-e/eval2.1
     - copied unchanged from r193593, head/tools/regression/bin/sh/set-e/eval2.1
  projects/jbuild/tools/tools/mwl/
     - copied from r193593, head/tools/tools/mwl/
  projects/jbuild/tools/tools/vimage/
     - copied from r193593, head/tools/tools/vimage/
  projects/jbuild/usr.bin/ee/nls/hu_HU.ISO8859-2/
     - copied from r193593, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
  projects/jbuild/usr.sbin/dnssec-dsfromkey/
     - copied from r193593, head/usr.sbin/dnssec-dsfromkey/
  projects/jbuild/usr.sbin/dnssec-keyfromlabel/
     - copied from r193593, head/usr.sbin/dnssec-keyfromlabel/
Replaced:
  projects/jbuild/contrib/bind9/isc-config.sh.in
     - copied unchanged from r193593, head/contrib/bind9/isc-config.sh.in
  projects/jbuild/tools/build/options/WITH_BIND_LIBS
     - copied unchanged from r193593, head/tools/build/options/WITH_BIND_LIBS
Deleted:
  projects/jbuild/contrib/bind9/doc/draft/
  projects/jbuild/contrib/bind9/doc/rfc/
  projects/jbuild/contrib/bind9/lib/bind/
  projects/jbuild/etc/rc.d/early.sh
  projects/jbuild/lib/bind/bind/
  projects/jbuild/sys/amd64/conf/MAC
  projects/jbuild/sys/contrib/dev/acpica/CHANGES.txt
  projects/jbuild/sys/contrib/dev/acpica/acapps.h
  projects/jbuild/sys/contrib/dev/acpica/acconfig.h
  projects/jbuild/sys/contrib/dev/acpica/acdebug.h
  projects/jbuild/sys/contrib/dev/acpica/acdisasm.h
  projects/jbuild/sys/contrib/dev/acpica/acdispat.h
  projects/jbuild/sys/contrib/dev/acpica/acefi.h
  projects/jbuild/sys/contrib/dev/acpica/acenv.h
  projects/jbuild/sys/contrib/dev/acpica/acevents.h
  projects/jbuild/sys/contrib/dev/acpica/acexcep.h
  projects/jbuild/sys/contrib/dev/acpica/acfreebsd.h
  projects/jbuild/sys/contrib/dev/acpica/acgcc.h
  projects/jbuild/sys/contrib/dev/acpica/acglobal.h
  projects/jbuild/sys/contrib/dev/acpica/achware.h
  projects/jbuild/sys/contrib/dev/acpica/acinterp.h
  projects/jbuild/sys/contrib/dev/acpica/aclocal.h
  projects/jbuild/sys/contrib/dev/acpica/acmacros.h
  projects/jbuild/sys/contrib/dev/acpica/acnames.h
  projects/jbuild/sys/contrib/dev/acpica/acnamesp.h
  projects/jbuild/sys/contrib/dev/acpica/acobject.h
  projects/jbuild/sys/contrib/dev/acpica/acopcode.h
  projects/jbuild/sys/contrib/dev/acpica/acoutput.h
  projects/jbuild/sys/contrib/dev/acpica/acparser.h
  projects/jbuild/sys/contrib/dev/acpica/acpi.h
  projects/jbuild/sys/contrib/dev/acpica/acpiosxf.h
  projects/jbuild/sys/contrib/dev/acpica/acpixf.h
  projects/jbuild/sys/contrib/dev/acpica/acresrc.h
  projects/jbuild/sys/contrib/dev/acpica/acstruct.h
  projects/jbuild/sys/contrib/dev/acpica/actables.h
  projects/jbuild/sys/contrib/dev/acpica/actbl.h
  projects/jbuild/sys/contrib/dev/acpica/actbl1.h
  projects/jbuild/sys/contrib/dev/acpica/actbl2.h
  projects/jbuild/sys/contrib/dev/acpica/actypes.h
  projects/jbuild/sys/contrib/dev/acpica/acutils.h
  projects/jbuild/sys/contrib/dev/acpica/aecommon.h
  projects/jbuild/sys/contrib/dev/acpica/amlcode.h
  projects/jbuild/sys/contrib/dev/acpica/amlresrc.h
  projects/jbuild/sys/contrib/dev/acpica/dbcmds.c
  projects/jbuild/sys/contrib/dev/acpica/dbdisply.c
  projects/jbuild/sys/contrib/dev/acpica/dbexec.c
  projects/jbuild/sys/contrib/dev/acpica/dbfileio.c
  projects/jbuild/sys/contrib/dev/acpica/dbhistry.c
  projects/jbuild/sys/contrib/dev/acpica/dbinput.c
  projects/jbuild/sys/contrib/dev/acpica/dbstats.c
  projects/jbuild/sys/contrib/dev/acpica/dbutils.c
  projects/jbuild/sys/contrib/dev/acpica/dbxface.c
  projects/jbuild/sys/contrib/dev/acpica/dmbuffer.c
  projects/jbuild/sys/contrib/dev/acpica/dmnames.c
  projects/jbuild/sys/contrib/dev/acpica/dmobject.c
  projects/jbuild/sys/contrib/dev/acpica/dmopcode.c
  projects/jbuild/sys/contrib/dev/acpica/dmresrc.c
  projects/jbuild/sys/contrib/dev/acpica/dmresrcl.c
  projects/jbuild/sys/contrib/dev/acpica/dmresrcs.c
  projects/jbuild/sys/contrib/dev/acpica/dmutils.c
  projects/jbuild/sys/contrib/dev/acpica/dmwalk.c
  projects/jbuild/sys/contrib/dev/acpica/dsfield.c
  projects/jbuild/sys/contrib/dev/acpica/dsinit.c
  projects/jbuild/sys/contrib/dev/acpica/dsmethod.c
  projects/jbuild/sys/contrib/dev/acpica/dsmthdat.c
  projects/jbuild/sys/contrib/dev/acpica/dsobject.c
  projects/jbuild/sys/contrib/dev/acpica/dsopcode.c
  projects/jbuild/sys/contrib/dev/acpica/dsutils.c
  projects/jbuild/sys/contrib/dev/acpica/dswexec.c
  projects/jbuild/sys/contrib/dev/acpica/dswload.c
  projects/jbuild/sys/contrib/dev/acpica/dswscope.c
  projects/jbuild/sys/contrib/dev/acpica/dswstate.c
  projects/jbuild/sys/contrib/dev/acpica/evevent.c
  projects/jbuild/sys/contrib/dev/acpica/evgpe.c
  projects/jbuild/sys/contrib/dev/acpica/evgpeblk.c
  projects/jbuild/sys/contrib/dev/acpica/evmisc.c
  projects/jbuild/sys/contrib/dev/acpica/evregion.c
  projects/jbuild/sys/contrib/dev/acpica/evrgnini.c
  projects/jbuild/sys/contrib/dev/acpica/evsci.c
  projects/jbuild/sys/contrib/dev/acpica/evxface.c
  projects/jbuild/sys/contrib/dev/acpica/evxfevnt.c
  projects/jbuild/sys/contrib/dev/acpica/evxfregn.c
  projects/jbuild/sys/contrib/dev/acpica/exconfig.c
  projects/jbuild/sys/contrib/dev/acpica/exconvrt.c
  projects/jbuild/sys/contrib/dev/acpica/excreate.c
  projects/jbuild/sys/contrib/dev/acpica/exdump.c
  projects/jbuild/sys/contrib/dev/acpica/exfield.c
  projects/jbuild/sys/contrib/dev/acpica/exfldio.c
  projects/jbuild/sys/contrib/dev/acpica/exmisc.c
  projects/jbuild/sys/contrib/dev/acpica/exmutex.c
  projects/jbuild/sys/contrib/dev/acpica/exnames.c
  projects/jbuild/sys/contrib/dev/acpica/exoparg1.c
  projects/jbuild/sys/contrib/dev/acpica/exoparg2.c
  projects/jbuild/sys/contrib/dev/acpica/exoparg3.c
  projects/jbuild/sys/contrib/dev/acpica/exoparg6.c
  projects/jbuild/sys/contrib/dev/acpica/exprep.c
  projects/jbuild/sys/contrib/dev/acpica/exregion.c
  projects/jbuild/sys/contrib/dev/acpica/exresnte.c
  projects/jbuild/sys/contrib/dev/acpica/exresolv.c
  projects/jbuild/sys/contrib/dev/acpica/exresop.c
  projects/jbuild/sys/contrib/dev/acpica/exstore.c
  projects/jbuild/sys/contrib/dev/acpica/exstoren.c
  projects/jbuild/sys/contrib/dev/acpica/exstorob.c
  projects/jbuild/sys/contrib/dev/acpica/exsystem.c
  projects/jbuild/sys/contrib/dev/acpica/exutils.c
  projects/jbuild/sys/contrib/dev/acpica/hwacpi.c
  projects/jbuild/sys/contrib/dev/acpica/hwgpe.c
  projects/jbuild/sys/contrib/dev/acpica/hwregs.c
  projects/jbuild/sys/contrib/dev/acpica/hwsleep.c
  projects/jbuild/sys/contrib/dev/acpica/hwtimer.c
  projects/jbuild/sys/contrib/dev/acpica/nsaccess.c
  projects/jbuild/sys/contrib/dev/acpica/nsalloc.c
  projects/jbuild/sys/contrib/dev/acpica/nsdump.c
  projects/jbuild/sys/contrib/dev/acpica/nsdumpdv.c
  projects/jbuild/sys/contrib/dev/acpica/nseval.c
  projects/jbuild/sys/contrib/dev/acpica/nsinit.c
  projects/jbuild/sys/contrib/dev/acpica/nsload.c
  projects/jbuild/sys/contrib/dev/acpica/nsnames.c
  projects/jbuild/sys/contrib/dev/acpica/nsobject.c
  projects/jbuild/sys/contrib/dev/acpica/nsparse.c
  projects/jbuild/sys/contrib/dev/acpica/nssearch.c
  projects/jbuild/sys/contrib/dev/acpica/nsutils.c
  projects/jbuild/sys/contrib/dev/acpica/nswalk.c
  projects/jbuild/sys/contrib/dev/acpica/nsxfeval.c
  projects/jbuild/sys/contrib/dev/acpica/nsxfname.c
  projects/jbuild/sys/contrib/dev/acpica/nsxfobj.c
  projects/jbuild/sys/contrib/dev/acpica/psargs.c
  projects/jbuild/sys/contrib/dev/acpica/psloop.c
  projects/jbuild/sys/contrib/dev/acpica/psopcode.c
  projects/jbuild/sys/contrib/dev/acpica/psparse.c
  projects/jbuild/sys/contrib/dev/acpica/psscope.c
  projects/jbuild/sys/contrib/dev/acpica/pstree.c
  projects/jbuild/sys/contrib/dev/acpica/psutils.c
  projects/jbuild/sys/contrib/dev/acpica/pswalk.c
  projects/jbuild/sys/contrib/dev/acpica/psxface.c
  projects/jbuild/sys/contrib/dev/acpica/rsaddr.c
  projects/jbuild/sys/contrib/dev/acpica/rscalc.c
  projects/jbuild/sys/contrib/dev/acpica/rscreate.c
  projects/jbuild/sys/contrib/dev/acpica/rsdump.c
  projects/jbuild/sys/contrib/dev/acpica/rsinfo.c
  projects/jbuild/sys/contrib/dev/acpica/rsio.c
  projects/jbuild/sys/contrib/dev/acpica/rsirq.c
  projects/jbuild/sys/contrib/dev/acpica/rslist.c
  projects/jbuild/sys/contrib/dev/acpica/rsmemory.c
  projects/jbuild/sys/contrib/dev/acpica/rsmisc.c
  projects/jbuild/sys/contrib/dev/acpica/rsutils.c
  projects/jbuild/sys/contrib/dev/acpica/rsxface.c
  projects/jbuild/sys/contrib/dev/acpica/tbfadt.c
  projects/jbuild/sys/contrib/dev/acpica/tbfind.c
  projects/jbuild/sys/contrib/dev/acpica/tbinstal.c
  projects/jbuild/sys/contrib/dev/acpica/tbutils.c
  projects/jbuild/sys/contrib/dev/acpica/tbxface.c
  projects/jbuild/sys/contrib/dev/acpica/tbxfroot.c
  projects/jbuild/sys/contrib/dev/acpica/utalloc.c
  projects/jbuild/sys/contrib/dev/acpica/utcache.c
  projects/jbuild/sys/contrib/dev/acpica/utclib.c
  projects/jbuild/sys/contrib/dev/acpica/utcopy.c
  projects/jbuild/sys/contrib/dev/acpica/utdebug.c
  projects/jbuild/sys/contrib/dev/acpica/utdelete.c
  projects/jbuild/sys/contrib/dev/acpica/uteval.c
  projects/jbuild/sys/contrib/dev/acpica/utglobal.c
  projects/jbuild/sys/contrib/dev/acpica/utinit.c
  projects/jbuild/sys/contrib/dev/acpica/utmath.c
  projects/jbuild/sys/contrib/dev/acpica/utmisc.c
  projects/jbuild/sys/contrib/dev/acpica/utmutex.c
  projects/jbuild/sys/contrib/dev/acpica/utobject.c
  projects/jbuild/sys/contrib/dev/acpica/utresrc.c
  projects/jbuild/sys/contrib/dev/acpica/utstate.c
  projects/jbuild/sys/contrib/dev/acpica/uttrack.c
  projects/jbuild/sys/contrib/dev/acpica/utxface.c
  projects/jbuild/sys/gnu/fs/ext2fs/sparc64-bitops.h
  projects/jbuild/sys/i386/conf/MAC
  projects/jbuild/sys/ia64/conf/MAC
  projects/jbuild/sys/kern/subr_clist.c
  projects/jbuild/sys/netinet/ip_dummynet.c
  projects/jbuild/sys/netinet/ip_fw2.c
  projects/jbuild/sys/netinet/ip_fw_nat.c
  projects/jbuild/sys/netinet/ip_fw_pfil.c
  projects/jbuild/sys/pc98/conf/MAC
  projects/jbuild/sys/powerpc/conf/MAC
  projects/jbuild/sys/sparc64/conf/MAC
  projects/jbuild/sys/sun4v/conf/MAC
  projects/jbuild/sys/sys/clist.h
  projects/jbuild/usr.bin/window/
Modified:
  projects/jbuild/   (props changed)
  projects/jbuild/ObsoleteFiles.inc
  projects/jbuild/UPDATING
  projects/jbuild/bin/cp/utils.c
  projects/jbuild/bin/rm/rm.c
  projects/jbuild/bin/sh/alias.c
  projects/jbuild/bin/sh/eval.c
  projects/jbuild/bin/sh/eval.h
  projects/jbuild/bin/sh/exec.c
  projects/jbuild/bin/sh/histedit.c
  projects/jbuild/bin/sh/main.c
  projects/jbuild/bin/sh/memalloc.c
  projects/jbuild/bin/sh/memalloc.h
  projects/jbuild/bin/sh/miscbltin.c
  projects/jbuild/bin/sh/mkinit.c
  projects/jbuild/bin/sh/mksyntax.c
  projects/jbuild/bin/sh/parser.c
  projects/jbuild/bin/sh/sh.1
  projects/jbuild/bin/sh/trap.c
  projects/jbuild/bin/sh/var.c
  projects/jbuild/contrib/bind9/   (props changed)
  projects/jbuild/contrib/bind9/CHANGES
  projects/jbuild/contrib/bind9/COPYRIGHT
  projects/jbuild/contrib/bind9/FAQ
  projects/jbuild/contrib/bind9/FAQ.xml
  projects/jbuild/contrib/bind9/Makefile.in
  projects/jbuild/contrib/bind9/README
  projects/jbuild/contrib/bind9/README.idnkit
  projects/jbuild/contrib/bind9/acconfig.h
  projects/jbuild/contrib/bind9/bin/Makefile.in
  projects/jbuild/contrib/bind9/bin/check/Makefile.in
  projects/jbuild/contrib/bind9/bin/check/check-tool.c
  projects/jbuild/contrib/bind9/bin/check/check-tool.h
  projects/jbuild/contrib/bind9/bin/check/named-checkconf.8
  projects/jbuild/contrib/bind9/bin/check/named-checkconf.c
  projects/jbuild/contrib/bind9/bin/check/named-checkconf.docbook
  projects/jbuild/contrib/bind9/bin/check/named-checkconf.html
  projects/jbuild/contrib/bind9/bin/check/named-checkzone.8
  projects/jbuild/contrib/bind9/bin/check/named-checkzone.c
  projects/jbuild/contrib/bind9/bin/check/named-checkzone.docbook
  projects/jbuild/contrib/bind9/bin/check/named-checkzone.html
  projects/jbuild/contrib/bind9/bin/dig/Makefile.in
  projects/jbuild/contrib/bind9/bin/dig/dig.1
  projects/jbuild/contrib/bind9/bin/dig/dig.c
  projects/jbuild/contrib/bind9/bin/dig/dig.docbook
  projects/jbuild/contrib/bind9/bin/dig/dig.html
  projects/jbuild/contrib/bind9/bin/dig/dighost.c
  projects/jbuild/contrib/bind9/bin/dig/host.1
  projects/jbuild/contrib/bind9/bin/dig/host.c
  projects/jbuild/contrib/bind9/bin/dig/host.docbook
  projects/jbuild/contrib/bind9/bin/dig/host.html
  projects/jbuild/contrib/bind9/bin/dig/include/dig/dig.h
  projects/jbuild/contrib/bind9/bin/dig/nslookup.1
  projects/jbuild/contrib/bind9/bin/dig/nslookup.c
  projects/jbuild/contrib/bind9/bin/dig/nslookup.docbook
  projects/jbuild/contrib/bind9/bin/dig/nslookup.html
  projects/jbuild/contrib/bind9/bin/dnssec/Makefile.in
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keygen.8
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-keygen.html
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-signzone.8
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  projects/jbuild/contrib/bind9/bin/dnssec/dnssec-signzone.html
  projects/jbuild/contrib/bind9/bin/dnssec/dnssectool.c
  projects/jbuild/contrib/bind9/bin/dnssec/dnssectool.h
  projects/jbuild/contrib/bind9/bin/named/Makefile.in
  projects/jbuild/contrib/bind9/bin/named/builtin.c
  projects/jbuild/contrib/bind9/bin/named/client.c
  projects/jbuild/contrib/bind9/bin/named/config.c
  projects/jbuild/contrib/bind9/bin/named/control.c
  projects/jbuild/contrib/bind9/bin/named/controlconf.c
  projects/jbuild/contrib/bind9/bin/named/include/named/builtin.h
  projects/jbuild/contrib/bind9/bin/named/include/named/client.h
  projects/jbuild/contrib/bind9/bin/named/include/named/config.h
  projects/jbuild/contrib/bind9/bin/named/include/named/control.h
  projects/jbuild/contrib/bind9/bin/named/include/named/globals.h
  projects/jbuild/contrib/bind9/bin/named/include/named/interfacemgr.h
  projects/jbuild/contrib/bind9/bin/named/include/named/listenlist.h
  projects/jbuild/contrib/bind9/bin/named/include/named/log.h
  projects/jbuild/contrib/bind9/bin/named/include/named/logconf.h
  projects/jbuild/contrib/bind9/bin/named/include/named/lwaddr.h
  projects/jbuild/contrib/bind9/bin/named/include/named/lwdclient.h
  projects/jbuild/contrib/bind9/bin/named/include/named/lwresd.h
  projects/jbuild/contrib/bind9/bin/named/include/named/lwsearch.h
  projects/jbuild/contrib/bind9/bin/named/include/named/main.h
  projects/jbuild/contrib/bind9/bin/named/include/named/notify.h
  projects/jbuild/contrib/bind9/bin/named/include/named/ns_smf_globals.h
  projects/jbuild/contrib/bind9/bin/named/include/named/query.h
  projects/jbuild/contrib/bind9/bin/named/include/named/server.h
  projects/jbuild/contrib/bind9/bin/named/include/named/sortlist.h
  projects/jbuild/contrib/bind9/bin/named/include/named/tkeyconf.h
  projects/jbuild/contrib/bind9/bin/named/include/named/tsigconf.h
  projects/jbuild/contrib/bind9/bin/named/include/named/types.h
  projects/jbuild/contrib/bind9/bin/named/include/named/update.h
  projects/jbuild/contrib/bind9/bin/named/include/named/xfrout.h
  projects/jbuild/contrib/bind9/bin/named/include/named/zoneconf.h
  projects/jbuild/contrib/bind9/bin/named/interfacemgr.c
  projects/jbuild/contrib/bind9/bin/named/listenlist.c
  projects/jbuild/contrib/bind9/bin/named/log.c
  projects/jbuild/contrib/bind9/bin/named/logconf.c
  projects/jbuild/contrib/bind9/bin/named/lwaddr.c
  projects/jbuild/contrib/bind9/bin/named/lwdclient.c
  projects/jbuild/contrib/bind9/bin/named/lwderror.c
  projects/jbuild/contrib/bind9/bin/named/lwdgabn.c
  projects/jbuild/contrib/bind9/bin/named/lwdgnba.c
  projects/jbuild/contrib/bind9/bin/named/lwdgrbn.c
  projects/jbuild/contrib/bind9/bin/named/lwdnoop.c
  projects/jbuild/contrib/bind9/bin/named/lwresd.8
  projects/jbuild/contrib/bind9/bin/named/lwresd.c
  projects/jbuild/contrib/bind9/bin/named/lwresd.docbook
  projects/jbuild/contrib/bind9/bin/named/lwresd.html
  projects/jbuild/contrib/bind9/bin/named/lwsearch.c
  projects/jbuild/contrib/bind9/bin/named/main.c
  projects/jbuild/contrib/bind9/bin/named/named.8
  projects/jbuild/contrib/bind9/bin/named/named.conf.5
  projects/jbuild/contrib/bind9/bin/named/named.conf.docbook
  projects/jbuild/contrib/bind9/bin/named/named.conf.html
  projects/jbuild/contrib/bind9/bin/named/named.docbook
  projects/jbuild/contrib/bind9/bin/named/named.html
  projects/jbuild/contrib/bind9/bin/named/notify.c
  projects/jbuild/contrib/bind9/bin/named/query.c
  projects/jbuild/contrib/bind9/bin/named/server.c
  projects/jbuild/contrib/bind9/bin/named/sortlist.c
  projects/jbuild/contrib/bind9/bin/named/tkeyconf.c
  projects/jbuild/contrib/bind9/bin/named/tsigconf.c
  projects/jbuild/contrib/bind9/bin/named/unix/Makefile.in
  projects/jbuild/contrib/bind9/bin/named/unix/include/named/os.h
  projects/jbuild/contrib/bind9/bin/named/unix/os.c
  projects/jbuild/contrib/bind9/bin/named/update.c
  projects/jbuild/contrib/bind9/bin/named/xfrout.c
  projects/jbuild/contrib/bind9/bin/named/zoneconf.c
  projects/jbuild/contrib/bind9/bin/nsupdate/Makefile.in
  projects/jbuild/contrib/bind9/bin/nsupdate/nsupdate.1
  projects/jbuild/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/jbuild/contrib/bind9/bin/nsupdate/nsupdate.docbook
  projects/jbuild/contrib/bind9/bin/nsupdate/nsupdate.html
  projects/jbuild/contrib/bind9/bin/rndc/Makefile.in
  projects/jbuild/contrib/bind9/bin/rndc/include/rndc/os.h
  projects/jbuild/contrib/bind9/bin/rndc/rndc-confgen.8
  projects/jbuild/contrib/bind9/bin/rndc/rndc-confgen.c
  projects/jbuild/contrib/bind9/bin/rndc/rndc-confgen.docbook
  projects/jbuild/contrib/bind9/bin/rndc/rndc-confgen.html
  projects/jbuild/contrib/bind9/bin/rndc/rndc.8
  projects/jbuild/contrib/bind9/bin/rndc/rndc.c
  projects/jbuild/contrib/bind9/bin/rndc/rndc.conf
  projects/jbuild/contrib/bind9/bin/rndc/rndc.conf.5
  projects/jbuild/contrib/bind9/bin/rndc/rndc.conf.docbook
  projects/jbuild/contrib/bind9/bin/rndc/rndc.conf.html
  projects/jbuild/contrib/bind9/bin/rndc/rndc.docbook
  projects/jbuild/contrib/bind9/bin/rndc/rndc.html
  projects/jbuild/contrib/bind9/bin/rndc/unix/Makefile.in
  projects/jbuild/contrib/bind9/bin/rndc/unix/os.c
  projects/jbuild/contrib/bind9/bin/rndc/util.c
  projects/jbuild/contrib/bind9/bin/rndc/util.h
  projects/jbuild/contrib/bind9/config.guess
  projects/jbuild/contrib/bind9/config.h.in
  projects/jbuild/contrib/bind9/configure.in
  projects/jbuild/contrib/bind9/doc/Makefile.in
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.html
  projects/jbuild/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/jbuild/contrib/bind9/doc/arm/Makefile.in
  projects/jbuild/contrib/bind9/doc/arm/man.dig.html
  projects/jbuild/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/jbuild/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/jbuild/contrib/bind9/doc/arm/man.host.html
  projects/jbuild/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/jbuild/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/jbuild/contrib/bind9/doc/arm/man.named.html
  projects/jbuild/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/jbuild/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/jbuild/contrib/bind9/doc/arm/man.rndc.html
  projects/jbuild/contrib/bind9/doc/misc/Makefile.in
  projects/jbuild/contrib/bind9/doc/misc/format-options.pl
  projects/jbuild/contrib/bind9/doc/misc/ipv6
  projects/jbuild/contrib/bind9/doc/misc/migration
  projects/jbuild/contrib/bind9/doc/misc/options
  projects/jbuild/contrib/bind9/doc/misc/sort-options.pl
  projects/jbuild/contrib/bind9/lib/Makefile.in
  projects/jbuild/contrib/bind9/lib/bind9/Makefile.in
  projects/jbuild/contrib/bind9/lib/bind9/api
  projects/jbuild/contrib/bind9/lib/bind9/check.c
  projects/jbuild/contrib/bind9/lib/bind9/getaddresses.c
  projects/jbuild/contrib/bind9/lib/bind9/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/bind9/include/bind9/Makefile.in
  projects/jbuild/contrib/bind9/lib/bind9/include/bind9/check.h
  projects/jbuild/contrib/bind9/lib/bind9/include/bind9/getaddresses.h
  projects/jbuild/contrib/bind9/lib/bind9/include/bind9/version.h
  projects/jbuild/contrib/bind9/lib/bind9/version.c
  projects/jbuild/contrib/bind9/lib/dns/Makefile.in
  projects/jbuild/contrib/bind9/lib/dns/acache.c
  projects/jbuild/contrib/bind9/lib/dns/acl.c
  projects/jbuild/contrib/bind9/lib/dns/adb.c
  projects/jbuild/contrib/bind9/lib/dns/api
  projects/jbuild/contrib/bind9/lib/dns/byaddr.c
  projects/jbuild/contrib/bind9/lib/dns/cache.c
  projects/jbuild/contrib/bind9/lib/dns/callbacks.c
  projects/jbuild/contrib/bind9/lib/dns/compress.c
  projects/jbuild/contrib/bind9/lib/dns/db.c
  projects/jbuild/contrib/bind9/lib/dns/dbiterator.c
  projects/jbuild/contrib/bind9/lib/dns/dbtable.c
  projects/jbuild/contrib/bind9/lib/dns/diff.c
  projects/jbuild/contrib/bind9/lib/dns/dispatch.c
  projects/jbuild/contrib/bind9/lib/dns/dlz.c
  projects/jbuild/contrib/bind9/lib/dns/dnssec.c
  projects/jbuild/contrib/bind9/lib/dns/ds.c
  projects/jbuild/contrib/bind9/lib/dns/dst_api.c
  projects/jbuild/contrib/bind9/lib/dns/dst_internal.h
  projects/jbuild/contrib/bind9/lib/dns/dst_lib.c
  projects/jbuild/contrib/bind9/lib/dns/dst_openssl.h
  projects/jbuild/contrib/bind9/lib/dns/dst_parse.c
  projects/jbuild/contrib/bind9/lib/dns/dst_parse.h
  projects/jbuild/contrib/bind9/lib/dns/dst_result.c
  projects/jbuild/contrib/bind9/lib/dns/forward.c
  projects/jbuild/contrib/bind9/lib/dns/gen-unix.h
  projects/jbuild/contrib/bind9/lib/dns/gen.c
  projects/jbuild/contrib/bind9/lib/dns/gssapi_link.c
  projects/jbuild/contrib/bind9/lib/dns/gssapictx.c
  projects/jbuild/contrib/bind9/lib/dns/hmac_link.c
  projects/jbuild/contrib/bind9/lib/dns/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/dns/include/dns/Makefile.in
  projects/jbuild/contrib/bind9/lib/dns/include/dns/acache.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/acl.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/adb.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/bit.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/byaddr.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/cache.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/callbacks.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/cert.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/compress.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/db.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/dbiterator.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/dbtable.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/diff.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/dispatch.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/dlz.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/dnssec.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/ds.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/events.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/fixedname.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/forward.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/journal.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/keyflags.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/keytable.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/keyvalues.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/lib.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/log.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/lookup.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/master.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/masterdump.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/message.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/name.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/ncache.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/opcode.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/order.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/peer.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/portlist.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rbt.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rcode.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdataclass.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdatalist.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdataset.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdatasetiter.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdataslab.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rdatatype.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/request.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/resolver.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/result.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/rootns.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/sdlz.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/secalg.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/secproto.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/soa.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/ssu.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/stats.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/tcpmsg.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/time.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/timer.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/tkey.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/tsig.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/ttl.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/types.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/validator.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/version.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/view.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/xfrin.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/zone.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/zonekey.h
  projects/jbuild/contrib/bind9/lib/dns/include/dns/zt.h
  projects/jbuild/contrib/bind9/lib/dns/include/dst/Makefile.in
  projects/jbuild/contrib/bind9/lib/dns/include/dst/dst.h
  projects/jbuild/contrib/bind9/lib/dns/include/dst/gssapi.h
  projects/jbuild/contrib/bind9/lib/dns/include/dst/lib.h
  projects/jbuild/contrib/bind9/lib/dns/include/dst/result.h
  projects/jbuild/contrib/bind9/lib/dns/journal.c
  projects/jbuild/contrib/bind9/lib/dns/key.c
  projects/jbuild/contrib/bind9/lib/dns/keytable.c
  projects/jbuild/contrib/bind9/lib/dns/lib.c
  projects/jbuild/contrib/bind9/lib/dns/log.c
  projects/jbuild/contrib/bind9/lib/dns/lookup.c
  projects/jbuild/contrib/bind9/lib/dns/master.c
  projects/jbuild/contrib/bind9/lib/dns/masterdump.c
  projects/jbuild/contrib/bind9/lib/dns/message.c
  projects/jbuild/contrib/bind9/lib/dns/name.c
  projects/jbuild/contrib/bind9/lib/dns/ncache.c
  projects/jbuild/contrib/bind9/lib/dns/nsec.c
  projects/jbuild/contrib/bind9/lib/dns/openssl_link.c
  projects/jbuild/contrib/bind9/lib/dns/openssldh_link.c
  projects/jbuild/contrib/bind9/lib/dns/openssldsa_link.c
  projects/jbuild/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/jbuild/contrib/bind9/lib/dns/order.c
  projects/jbuild/contrib/bind9/lib/dns/peer.c
  projects/jbuild/contrib/bind9/lib/dns/portlist.c
  projects/jbuild/contrib/bind9/lib/dns/rbt.c
  projects/jbuild/contrib/bind9/lib/dns/rbtdb.c
  projects/jbuild/contrib/bind9/lib/dns/rbtdb.h
  projects/jbuild/contrib/bind9/lib/dns/rbtdb64.c
  projects/jbuild/contrib/bind9/lib/dns/rbtdb64.h
  projects/jbuild/contrib/bind9/lib/dns/rcode.c
  projects/jbuild/contrib/bind9/lib/dns/rdata.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/ch_3/a_1.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/ch_3/a_1.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/cert_37.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/cname_5.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/cname_5.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dname_39.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dname_39.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ds_43.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/gpos_27.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/gpos_27.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/isdn_20.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/isdn_20.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/key_25.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/key_25.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/loc_29.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/loc_29.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mb_7.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mb_7.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/md_3.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/md_3.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mf_4.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mf_4.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mg_8.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mg_8.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/minfo_14.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/minfo_14.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mr_9.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mr_9.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/mx_15.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ns_2.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ns_2.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/null_10.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/null_10.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nxt_30.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/nxt_30.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/opt_41.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/proforma.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/proforma.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ptr_12.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/ptr_12.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rp_17.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rp_17.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rt_21.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/rt_21.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/sig_24.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/soa_6.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/spf_99.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/spf_99.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/tkey_249.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/txt_16.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/unspec_103.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/unspec_103.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/x25_19.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/generic/x25_19.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/hs_4/a_1.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/hs_4/a_1.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/a6_38.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/a6_38.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/a_1.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/a_1.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/apl_42.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/kx_36.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/kx_36.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/px_26.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/px_26.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/srv_33.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/srv_33.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/wks_11.c
  projects/jbuild/contrib/bind9/lib/dns/rdata/in_1/wks_11.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/rdatastructpre.h
  projects/jbuild/contrib/bind9/lib/dns/rdata/rdatastructsuf.h
  projects/jbuild/contrib/bind9/lib/dns/rdatalist.c
  projects/jbuild/contrib/bind9/lib/dns/rdatalist_p.h
  projects/jbuild/contrib/bind9/lib/dns/rdataset.c
  projects/jbuild/contrib/bind9/lib/dns/rdatasetiter.c
  projects/jbuild/contrib/bind9/lib/dns/rdataslab.c
  projects/jbuild/contrib/bind9/lib/dns/request.c
  projects/jbuild/contrib/bind9/lib/dns/resolver.c
  projects/jbuild/contrib/bind9/lib/dns/result.c
  projects/jbuild/contrib/bind9/lib/dns/rootns.c
  projects/jbuild/contrib/bind9/lib/dns/sdb.c
  projects/jbuild/contrib/bind9/lib/dns/sdlz.c
  projects/jbuild/contrib/bind9/lib/dns/soa.c
  projects/jbuild/contrib/bind9/lib/dns/ssu.c
  projects/jbuild/contrib/bind9/lib/dns/stats.c
  projects/jbuild/contrib/bind9/lib/dns/tcpmsg.c
  projects/jbuild/contrib/bind9/lib/dns/time.c
  projects/jbuild/contrib/bind9/lib/dns/timer.c
  projects/jbuild/contrib/bind9/lib/dns/tkey.c
  projects/jbuild/contrib/bind9/lib/dns/tsig.c
  projects/jbuild/contrib/bind9/lib/dns/ttl.c
  projects/jbuild/contrib/bind9/lib/dns/validator.c
  projects/jbuild/contrib/bind9/lib/dns/version.c
  projects/jbuild/contrib/bind9/lib/dns/view.c
  projects/jbuild/contrib/bind9/lib/dns/xfrin.c
  projects/jbuild/contrib/bind9/lib/dns/zone.c
  projects/jbuild/contrib/bind9/lib/dns/zonekey.c
  projects/jbuild/contrib/bind9/lib/dns/zt.c
  projects/jbuild/contrib/bind9/lib/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/alpha/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/alpha/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/api
  projects/jbuild/contrib/bind9/lib/isc/assertions.c
  projects/jbuild/contrib/bind9/lib/isc/base64.c
  projects/jbuild/contrib/bind9/lib/isc/bitstring.c
  projects/jbuild/contrib/bind9/lib/isc/buffer.c
  projects/jbuild/contrib/bind9/lib/isc/bufferlist.c
  projects/jbuild/contrib/bind9/lib/isc/commandline.c
  projects/jbuild/contrib/bind9/lib/isc/entropy.c
  projects/jbuild/contrib/bind9/lib/isc/error.c
  projects/jbuild/contrib/bind9/lib/isc/event.c
  projects/jbuild/contrib/bind9/lib/isc/fsaccess.c
  projects/jbuild/contrib/bind9/lib/isc/hash.c
  projects/jbuild/contrib/bind9/lib/isc/heap.c
  projects/jbuild/contrib/bind9/lib/isc/hex.c
  projects/jbuild/contrib/bind9/lib/isc/hmacmd5.c
  projects/jbuild/contrib/bind9/lib/isc/hmacsha.c
  projects/jbuild/contrib/bind9/lib/isc/ia64/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/ia64/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/include/isc/app.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/assertions.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/base64.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/bitstring.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/boolean.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/buffer.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/bufferlist.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/commandline.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/entropy.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/error.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/event.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/eventclass.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/file.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/formatcheck.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/fsaccess.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/hash.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/heap.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/hex.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/hmacmd5.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/hmacsha.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/interfaceiter.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/ipv6.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/lang.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/lex.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/lfsr.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/lib.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/list.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/log.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/magic.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/md5.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/mem.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/msgcat.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/msgs.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/mutexblock.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/netaddr.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/netscope.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/ondestroy.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/os.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/parseint.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/platform.h.in
  projects/jbuild/contrib/bind9/lib/isc/include/isc/portset.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/print.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/quota.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/random.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/ratelimiter.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/refcount.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/region.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/resource.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/result.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/resultclass.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/rwlock.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/serial.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/sha1.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/sha2.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/sockaddr.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/socket.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/stdio.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/stdlib.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/string.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/symtab.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/task.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/taskpool.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/timer.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/types.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/util.h
  projects/jbuild/contrib/bind9/lib/isc/include/isc/version.h
  projects/jbuild/contrib/bind9/lib/isc/inet_aton.c
  projects/jbuild/contrib/bind9/lib/isc/inet_ntop.c
  projects/jbuild/contrib/bind9/lib/isc/inet_pton.c
  projects/jbuild/contrib/bind9/lib/isc/lex.c
  projects/jbuild/contrib/bind9/lib/isc/lfsr.c
  projects/jbuild/contrib/bind9/lib/isc/lib.c
  projects/jbuild/contrib/bind9/lib/isc/log.c
  projects/jbuild/contrib/bind9/lib/isc/md5.c
  projects/jbuild/contrib/bind9/lib/isc/mem.c
  projects/jbuild/contrib/bind9/lib/isc/mips/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/mips/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/mips/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/mutexblock.c
  projects/jbuild/contrib/bind9/lib/isc/netaddr.c
  projects/jbuild/contrib/bind9/lib/isc/netscope.c
  projects/jbuild/contrib/bind9/lib/isc/nls/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/nls/msgcat.c
  projects/jbuild/contrib/bind9/lib/isc/noatomic/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/noatomic/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/nothreads/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/nothreads/condition.c
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/isc/condition.h
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/isc/once.h
  projects/jbuild/contrib/bind9/lib/isc/nothreads/include/isc/thread.h
  projects/jbuild/contrib/bind9/lib/isc/nothreads/mutex.c
  projects/jbuild/contrib/bind9/lib/isc/nothreads/thread.c
  projects/jbuild/contrib/bind9/lib/isc/ondestroy.c
  projects/jbuild/contrib/bind9/lib/isc/parseint.c
  projects/jbuild/contrib/bind9/lib/isc/portset.c
  projects/jbuild/contrib/bind9/lib/isc/powerpc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/powerpc/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/print.c
  projects/jbuild/contrib/bind9/lib/isc/pthreads/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/pthreads/condition.c
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/isc/condition.h
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/isc/once.h
  projects/jbuild/contrib/bind9/lib/isc/pthreads/include/isc/thread.h
  projects/jbuild/contrib/bind9/lib/isc/pthreads/mutex.c
  projects/jbuild/contrib/bind9/lib/isc/pthreads/thread.c
  projects/jbuild/contrib/bind9/lib/isc/quota.c
  projects/jbuild/contrib/bind9/lib/isc/random.c
  projects/jbuild/contrib/bind9/lib/isc/ratelimiter.c
  projects/jbuild/contrib/bind9/lib/isc/refcount.c
  projects/jbuild/contrib/bind9/lib/isc/region.c
  projects/jbuild/contrib/bind9/lib/isc/result.c
  projects/jbuild/contrib/bind9/lib/isc/rwlock.c
  projects/jbuild/contrib/bind9/lib/isc/serial.c
  projects/jbuild/contrib/bind9/lib/isc/sha1.c
  projects/jbuild/contrib/bind9/lib/isc/sha2.c
  projects/jbuild/contrib/bind9/lib/isc/sockaddr.c
  projects/jbuild/contrib/bind9/lib/isc/sparc64/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/sparc64/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/string.c
  projects/jbuild/contrib/bind9/lib/isc/strtoul.c
  projects/jbuild/contrib/bind9/lib/isc/symtab.c
  projects/jbuild/contrib/bind9/lib/isc/task.c
  projects/jbuild/contrib/bind9/lib/isc/task_p.h
  projects/jbuild/contrib/bind9/lib/isc/taskpool.c
  projects/jbuild/contrib/bind9/lib/isc/timer.c
  projects/jbuild/contrib/bind9/lib/isc/timer_p.h
  projects/jbuild/contrib/bind9/lib/isc/unix/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/unix/app.c
  projects/jbuild/contrib/bind9/lib/isc/unix/dir.c
  projects/jbuild/contrib/bind9/lib/isc/unix/entropy.c
  projects/jbuild/contrib/bind9/lib/isc/unix/errno2result.c
  projects/jbuild/contrib/bind9/lib/isc/unix/errno2result.h
  projects/jbuild/contrib/bind9/lib/isc/unix/file.c
  projects/jbuild/contrib/bind9/lib/isc/unix/fsaccess.c
  projects/jbuild/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  projects/jbuild/contrib/bind9/lib/isc/unix/ifiter_ioctl.c
  projects/jbuild/contrib/bind9/lib/isc/unix/ifiter_sysctl.c
  projects/jbuild/contrib/bind9/lib/isc/unix/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/dir.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/int.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/keyboard.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/net.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/netdb.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/offset.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/stat.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/stdtime.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/strerror.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/syslog.h
  projects/jbuild/contrib/bind9/lib/isc/unix/include/isc/time.h
  projects/jbuild/contrib/bind9/lib/isc/unix/interfaceiter.c
  projects/jbuild/contrib/bind9/lib/isc/unix/ipv6.c
  projects/jbuild/contrib/bind9/lib/isc/unix/keyboard.c
  projects/jbuild/contrib/bind9/lib/isc/unix/net.c
  projects/jbuild/contrib/bind9/lib/isc/unix/os.c
  projects/jbuild/contrib/bind9/lib/isc/unix/resource.c
  projects/jbuild/contrib/bind9/lib/isc/unix/socket.c
  projects/jbuild/contrib/bind9/lib/isc/unix/socket_p.h
  projects/jbuild/contrib/bind9/lib/isc/unix/stdio.c
  projects/jbuild/contrib/bind9/lib/isc/unix/stdtime.c
  projects/jbuild/contrib/bind9/lib/isc/unix/strerror.c
  projects/jbuild/contrib/bind9/lib/isc/unix/syslog.c
  projects/jbuild/contrib/bind9/lib/isc/unix/time.c
  projects/jbuild/contrib/bind9/lib/isc/version.c
  projects/jbuild/contrib/bind9/lib/isc/x86_32/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_32/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isc/x86_64/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_64/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h
  projects/jbuild/contrib/bind9/lib/isccc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccc/alist.c
  projects/jbuild/contrib/bind9/lib/isccc/api
  projects/jbuild/contrib/bind9/lib/isccc/base64.c
  projects/jbuild/contrib/bind9/lib/isccc/cc.c
  projects/jbuild/contrib/bind9/lib/isccc/ccmsg.c
  projects/jbuild/contrib/bind9/lib/isccc/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/alist.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/base64.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/cc.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/events.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/lib.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/result.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/sexpr.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/symtab.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/symtype.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/types.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/util.h
  projects/jbuild/contrib/bind9/lib/isccc/include/isccc/version.h
  projects/jbuild/contrib/bind9/lib/isccc/lib.c
  projects/jbuild/contrib/bind9/lib/isccc/result.c
  projects/jbuild/contrib/bind9/lib/isccc/sexpr.c
  projects/jbuild/contrib/bind9/lib/isccc/symtab.c
  projects/jbuild/contrib/bind9/lib/isccc/version.c
  projects/jbuild/contrib/bind9/lib/isccfg/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccfg/aclconf.c
  projects/jbuild/contrib/bind9/lib/isccfg/api
  projects/jbuild/contrib/bind9/lib/isccfg/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/grammar.h
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/log.h
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  projects/jbuild/contrib/bind9/lib/isccfg/include/isccfg/version.h
  projects/jbuild/contrib/bind9/lib/isccfg/log.c
  projects/jbuild/contrib/bind9/lib/isccfg/namedconf.c
  projects/jbuild/contrib/bind9/lib/isccfg/parser.c
  projects/jbuild/contrib/bind9/lib/isccfg/version.c
  projects/jbuild/contrib/bind9/lib/lwres/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/api
  projects/jbuild/contrib/bind9/lib/lwres/assert_p.h
  projects/jbuild/contrib/bind9/lib/lwres/context.c
  projects/jbuild/contrib/bind9/lib/lwres/context_p.h
  projects/jbuild/contrib/bind9/lib/lwres/gai_strerror.c
  projects/jbuild/contrib/bind9/lib/lwres/getaddrinfo.c
  projects/jbuild/contrib/bind9/lib/lwres/gethost.c
  projects/jbuild/contrib/bind9/lib/lwres/getipnode.c
  projects/jbuild/contrib/bind9/lib/lwres/getnameinfo.c
  projects/jbuild/contrib/bind9/lib/lwres/getrrset.c
  projects/jbuild/contrib/bind9/lib/lwres/herror.c
  projects/jbuild/contrib/bind9/lib/lwres/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/context.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/int.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/ipv6.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/lang.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/list.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/lwpacket.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/lwres.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/netdb.h.in
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/platform.h.in
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/result.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/stdlib.h
  projects/jbuild/contrib/bind9/lib/lwres/include/lwres/version.h
  projects/jbuild/contrib/bind9/lib/lwres/lwbuffer.c
  projects/jbuild/contrib/bind9/lib/lwres/lwconfig.c
  projects/jbuild/contrib/bind9/lib/lwres/lwinetaton.c
  projects/jbuild/contrib/bind9/lib/lwres/lwinetntop.c
  projects/jbuild/contrib/bind9/lib/lwres/lwinetpton.c
  projects/jbuild/contrib/bind9/lib/lwres/lwpacket.c
  projects/jbuild/contrib/bind9/lib/lwres/lwres_gabn.c
  projects/jbuild/contrib/bind9/lib/lwres/lwres_gnba.c
  projects/jbuild/contrib/bind9/lib/lwres/lwres_grbn.c
  projects/jbuild/contrib/bind9/lib/lwres/lwres_noop.c
  projects/jbuild/contrib/bind9/lib/lwres/lwresutil.c
  projects/jbuild/contrib/bind9/lib/lwres/man/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_buffer.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_buffer.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_buffer.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_config.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_config.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_config.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_context.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_context.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_context.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gabn.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gabn.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gnba.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_gnba.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_noop.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_noop.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_packet.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_packet.html
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_resutil.3
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  projects/jbuild/contrib/bind9/lib/lwres/man/lwres_resutil.html
  projects/jbuild/contrib/bind9/lib/lwres/print.c
  projects/jbuild/contrib/bind9/lib/lwres/print_p.h
  projects/jbuild/contrib/bind9/lib/lwres/strtoul.c
  projects/jbuild/contrib/bind9/lib/lwres/unix/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/unix/include/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  projects/jbuild/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  projects/jbuild/contrib/bind9/lib/lwres/version.c
  projects/jbuild/contrib/bind9/libtool.m4
  projects/jbuild/contrib/bind9/ltmain.sh
  projects/jbuild/contrib/bind9/make/Makefile.in
  projects/jbuild/contrib/bind9/make/includes.in
  projects/jbuild/contrib/bind9/make/mkdep.in
  projects/jbuild/contrib/bind9/make/rules.in
  projects/jbuild/contrib/bind9/version
  projects/jbuild/contrib/cpio/   (props changed)
  projects/jbuild/contrib/csup/updater.c
  projects/jbuild/contrib/ee/   (props changed)
  projects/jbuild/contrib/ee/ee.c
  projects/jbuild/contrib/gdb/   (props changed)
  projects/jbuild/contrib/gdtoa/   (props changed)
  projects/jbuild/contrib/ipfilter/lib/load_http.c
  projects/jbuild/contrib/less/   (props changed)
  projects/jbuild/contrib/libpcap/   (props changed)
  projects/jbuild/contrib/ncurses/   (props changed)
  projects/jbuild/contrib/netcat/   (props changed)
  projects/jbuild/contrib/netcat/nc.1
  projects/jbuild/contrib/netcat/netcat.c
  projects/jbuild/contrib/ntp/   (props changed)
  projects/jbuild/contrib/openbsm/   (props changed)
  projects/jbuild/contrib/openpam/   (props changed)
  projects/jbuild/contrib/pf/   (props changed)
  projects/jbuild/contrib/sendmail/   (props changed)
  projects/jbuild/contrib/tcpdump/   (props changed)
  projects/jbuild/contrib/top/   (props changed)
  projects/jbuild/contrib/wpa/   (props changed)
  projects/jbuild/crypto/openssh/   (props changed)
  projects/jbuild/crypto/openssl/   (props changed)
  projects/jbuild/etc/defaults/rc.conf
  projects/jbuild/etc/network.subr
  projects/jbuild/etc/periodic/daily/100.clean-disks
  projects/jbuild/etc/periodic/daily/460.status-mail-rejects
  projects/jbuild/etc/rc.d/Makefile
  projects/jbuild/etc/rc.d/amd
  projects/jbuild/etc/rc.d/archdep
  projects/jbuild/etc/rc.d/ip6fw
  projects/jbuild/etc/rc.d/ipfilter
  projects/jbuild/etc/rc.d/ipfs
  projects/jbuild/etc/rc.d/ipfw
  projects/jbuild/etc/rc.d/ipnat
  projects/jbuild/etc/rc.d/keyserv
  projects/jbuild/etc/rc.d/mountd
  projects/jbuild/etc/rc.d/moused
  projects/jbuild/etc/rc.d/netif
  projects/jbuild/etc/rc.d/network_ipv6
  projects/jbuild/etc/rc.d/nfsd
  projects/jbuild/etc/rc.d/nisdomain
  projects/jbuild/etc/rc.d/nscd
  projects/jbuild/etc/rc.d/ntpd
  projects/jbuild/etc/rc.d/pf
  projects/jbuild/etc/rc.d/pflog
  projects/jbuild/etc/rc.d/pfsync
  projects/jbuild/etc/rc.d/quota
  projects/jbuild/etc/rc.d/yppasswdd
  projects/jbuild/etc/rc.subr
  projects/jbuild/games/fortune/datfiles/fortunes
  projects/jbuild/games/fortune/datfiles/fortunes-o.real
  projects/jbuild/lib/bind/Makefile
  projects/jbuild/lib/bind/config.h
  projects/jbuild/lib/bind/config.mk
  projects/jbuild/lib/bind/dns/Makefile
  projects/jbuild/lib/bind/dns/code.h
  projects/jbuild/lib/bind/dns/dns/enumclass.h
  projects/jbuild/lib/bind/dns/dns/enumtype.h
  projects/jbuild/lib/bind/dns/dns/rdatastruct.h
  projects/jbuild/lib/bind/isc/Makefile
  projects/jbuild/lib/bind/isc/isc/platform.h
  projects/jbuild/lib/bind/lwres/Makefile
  projects/jbuild/lib/bind/lwres/lwres/netdb.h
  projects/jbuild/lib/bind/lwres/lwres/platform.h
  projects/jbuild/lib/libarchive/Makefile
  projects/jbuild/lib/libc/   (props changed)
  projects/jbuild/lib/libc/arm/Makefile.inc
  projects/jbuild/lib/libc/arm/gen/_setjmp.S
  projects/jbuild/lib/libc/arm/gen/setjmp.S
  projects/jbuild/lib/libc/include/nss_tls.h
  projects/jbuild/lib/libc/net/resolver.3
  projects/jbuild/lib/libc/posix1e/acl_entry.c
  projects/jbuild/lib/libc/resolv/res_comp.c
  projects/jbuild/lib/libc/rpc/svc_generic.c
  projects/jbuild/lib/libc/stdtime/   (props changed)
  projects/jbuild/lib/libc/string/ffsll.c   (props changed)
  projects/jbuild/lib/libc/string/flsll.c   (props changed)
  projects/jbuild/lib/libc/sys/bind.2
  projects/jbuild/lib/libstand/Makefile
  projects/jbuild/lib/libstand/bootp.c
  projects/jbuild/lib/libstand/rpc.c
  projects/jbuild/lib/libstand/tftp.c
  projects/jbuild/lib/libusb/   (props changed)
  projects/jbuild/lib/libusb/libusb.3   (contents, props changed)
  projects/jbuild/lib/libusb/libusb20.c
  projects/jbuild/lib/libusb/libusb20.h
  projects/jbuild/lib/libusb/libusb20_int.h
  projects/jbuild/lib/libusb/libusb20_ugen20.c
  projects/jbuild/lib/libusbhid/descr.c
  projects/jbuild/lib/libutil/   (props changed)
  projects/jbuild/lib/libutil/flopen.3
  projects/jbuild/lib/libutil/flopen.c
  projects/jbuild/lib/libutil/pidfile.3
  projects/jbuild/lib/msun/src/e_rem_pio2.c
  projects/jbuild/lib/msun/src/e_rem_pio2f.c
  projects/jbuild/lib/msun/src/k_cosf.c
  projects/jbuild/lib/msun/src/k_sinf.c
  projects/jbuild/lib/msun/src/k_tanf.c
  projects/jbuild/lib/msun/src/math_private.h
  projects/jbuild/sbin/dump/optr.c
  projects/jbuild/sbin/fsck_ffs/fsck.h
  projects/jbuild/sbin/fsck_ffs/gjournal.c
  projects/jbuild/sbin/ifconfig/ifieee80211.c
  projects/jbuild/sbin/ipfw/   (props changed)
  projects/jbuild/sbin/ipfw/dummynet.c
  projects/jbuild/sbin/ipfw/ipfw2.c
  projects/jbuild/sbin/kldload/kldload.8
  projects/jbuild/sbin/kldload/kldload.c
  projects/jbuild/sbin/mksnap_ffs/Makefile
  projects/jbuild/sbin/mksnap_ffs/mksnap_ffs.8
  projects/jbuild/sbin/mksnap_ffs/mksnap_ffs.c
  projects/jbuild/sbin/mount_nfs/mount_nfs.c
  projects/jbuild/share/doc/bind9/Makefile
  projects/jbuild/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/jbuild/share/examples/kld/syscall/module/syscall.c
  projects/jbuild/share/man/man4/audit.4
  projects/jbuild/share/man/man4/ch.4
  projects/jbuild/share/man/man4/ip.4
  projects/jbuild/share/man/man4/msk.4
  projects/jbuild/share/man/man4/pcm.4
  projects/jbuild/share/man/man4/ral.4
  projects/jbuild/share/man/man4/rum.4
  projects/jbuild/share/man/man4/scsi.4
  projects/jbuild/share/man/man4/ural.4
  projects/jbuild/share/man/man5/src.conf.5
  projects/jbuild/share/man/man9/Makefile
  projects/jbuild/share/man/man9/VOP_ACCESS.9
  projects/jbuild/share/man/man9/fail.9
  projects/jbuild/share/man/man9/rmlock.9
  projects/jbuild/share/man/man9/sx.9
  projects/jbuild/share/misc/committers-ports.dot
  projects/jbuild/share/misc/pci_vendors
  projects/jbuild/share/mk/bsd.own.mk
  projects/jbuild/share/timedef/pt_PT.ISO8859-1.src
  projects/jbuild/share/timedef/pt_PT.UTF-8.src
  projects/jbuild/share/zoneinfo/   (props changed)
  projects/jbuild/sys/   (props changed)
  projects/jbuild/sys/amd64/acpica/OsdEnvironment.c
  projects/jbuild/sys/amd64/acpica/acpi_machdep.c
  projects/jbuild/sys/amd64/acpica/acpi_wakeup.c
  projects/jbuild/sys/amd64/acpica/madt.c
  projects/jbuild/sys/amd64/amd64/dump_machdep.c
  projects/jbuild/sys/amd64/amd64/minidump_machdep.c
  projects/jbuild/sys/amd64/amd64/support.S
  projects/jbuild/sys/amd64/conf/GENERIC
  projects/jbuild/sys/amd64/include/xen/   (props changed)
  projects/jbuild/sys/amd64/linux32/linux.h
  projects/jbuild/sys/amd64/linux32/linux32_sysent.c
  projects/jbuild/sys/arm/arm/dump_machdep.c
  projects/jbuild/sys/arm/xscale/ixp425/if_npe.c
  projects/jbuild/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/jbuild/sys/arm/xscale/ixp425/ixp425_qmgr.h
  projects/jbuild/sys/boot/common/boot.c
  projects/jbuild/sys/boot/common/ufsread.c
  projects/jbuild/sys/boot/i386/libi386/Makefile
  projects/jbuild/sys/boot/i386/libi386/biosacpi.c
  projects/jbuild/sys/boot/i386/libi386/biosdisk.c
  projects/jbuild/sys/boot/ia64/ski/acpi_stub.c
  projects/jbuild/sys/boot/pc98/boot2/sys.c
  projects/jbuild/sys/boot/uboot/lib/disk.c
  projects/jbuild/sys/boot/uboot/lib/net.c
  projects/jbuild/sys/cddl/boot/zfs/zfssubr.c   (props changed)
  projects/jbuild/sys/cddl/compat/opensolaris/kern/opensolaris.c
  projects/jbuild/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  projects/jbuild/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/jbuild/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  projects/jbuild/sys/compat/freebsd32/freebsd32_sysent.c
  projects/jbuild/sys/compat/linux/linux_file.c
  projects/jbuild/sys/compat/linux/linux_getcwd.c
  projects/jbuild/sys/compat/linux/linux_misc.c
  projects/jbuild/sys/compat/linux/linux_socket.c
  projects/jbuild/sys/compat/linux/linux_stats.c
  projects/jbuild/sys/compat/ndis/subr_usbd.c
  projects/jbuild/sys/compat/svr4/svr4_fcntl.c
  projects/jbuild/sys/compat/svr4/svr4_ioctl.c
  projects/jbuild/sys/compat/svr4/svr4_misc.c
  projects/jbuild/sys/compat/svr4/svr4_resource.c
  projects/jbuild/sys/compat/svr4/svr4_signal.c
  projects/jbuild/sys/compat/svr4/svr4_socket.c
  projects/jbuild/sys/compat/svr4/svr4_stat.c
  projects/jbuild/sys/compat/svr4/svr4_stream.c
  projects/jbuild/sys/compat/svr4/svr4_sysconfig.h
  projects/jbuild/sys/compat/svr4/svr4_sysent.c
  projects/jbuild/sys/conf/NOTES
  projects/jbuild/sys/conf/files
  projects/jbuild/sys/conf/files.i386
  projects/jbuild/sys/conf/files.powerpc
  projects/jbuild/sys/conf/options
  projects/jbuild/sys/contrib/dev/acpica/   (props changed)
  projects/jbuild/sys/contrib/dev/acpica/acpica_prep.sh
  projects/jbuild/sys/contrib/dev/acpica/common/adfile.c
  projects/jbuild/sys/contrib/dev/acpica/common/adisasm.c
  projects/jbuild/sys/contrib/dev/acpica/common/adwalk.c
  projects/jbuild/sys/contrib/dev/acpica/common/dmrestag.c
  projects/jbuild/sys/contrib/dev/acpica/common/dmtable.c
  projects/jbuild/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/jbuild/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/jbuild/sys/contrib/dev/acpica/common/getopt.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/jbuild/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/jbuild/sys/contrib/dev/acpica/compiler/asllength.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslload.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asltree.c
  projects/jbuild/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/jbuild/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/jbuild/sys/contrib/dev/acpica/osunixxf.c
  projects/jbuild/sys/contrib/pf/   (props changed)
  projects/jbuild/sys/contrib/pf/net/pf.c
  projects/jbuild/sys/contrib/pf/net/pf_ioctl.c
  projects/jbuild/sys/ddb/db_textdump.c
  projects/jbuild/sys/dev/acpi_support/acpi_aiboost.c
  projects/jbuild/sys/dev/acpi_support/acpi_asus.c
  projects/jbuild/sys/dev/acpi_support/acpi_fujitsu.c
  projects/jbuild/sys/dev/acpi_support/acpi_ibm.c
  projects/jbuild/sys/dev/acpi_support/acpi_panasonic.c
  projects/jbuild/sys/dev/acpi_support/acpi_sony.c
  projects/jbuild/sys/dev/acpi_support/acpi_toshiba.c
  projects/jbuild/sys/dev/acpica/Osd/OsdDebug.c
  projects/jbuild/sys/dev/acpica/Osd/OsdHardware.c
  projects/jbuild/sys/dev/acpica/Osd/OsdInterrupt.c
  projects/jbuild/sys/dev/acpica/Osd/OsdMemory.c
  projects/jbuild/sys/dev/acpica/Osd/OsdSchedule.c
  projects/jbuild/sys/dev/acpica/Osd/OsdStream.c
  projects/jbuild/sys/dev/acpica/Osd/OsdSynch.c
  projects/jbuild/sys/dev/acpica/Osd/OsdTable.c
  projects/jbuild/sys/dev/acpica/acpi.c
  projects/jbuild/sys/dev/acpica/acpi_acad.c
  projects/jbuild/sys/dev/acpica/acpi_battery.c
  projects/jbuild/sys/dev/acpica/acpi_button.c
  projects/jbuild/sys/dev/acpica/acpi_cmbat.c
  projects/jbuild/sys/dev/acpica/acpi_cpu.c
  projects/jbuild/sys/dev/acpica/acpi_dock.c
  projects/jbuild/sys/dev/acpica/acpi_ec.c
  projects/jbuild/sys/dev/acpica/acpi_hpet.c
  projects/jbuild/sys/dev/acpica/acpi_if.m
  projects/jbuild/sys/dev/acpica/acpi_isab.c
  projects/jbuild/sys/dev/acpica/acpi_lid.c
  projects/jbuild/sys/dev/acpica/acpi_package.c
  projects/jbuild/sys/dev/acpica/acpi_pci.c
  projects/jbuild/sys/dev/acpica/acpi_pci_link.c
  projects/jbuild/sys/dev/acpica/acpi_pcib.c
  projects/jbuild/sys/dev/acpica/acpi_pcib_acpi.c
  projects/jbuild/sys/dev/acpica/acpi_pcib_pci.c
  projects/jbuild/sys/dev/acpica/acpi_perf.c
  projects/jbuild/sys/dev/acpica/acpi_powerres.c
  projects/jbuild/sys/dev/acpica/acpi_quirk.c
  projects/jbuild/sys/dev/acpica/acpi_resource.c
  projects/jbuild/sys/dev/acpica/acpi_smbat.c
  projects/jbuild/sys/dev/acpica/acpi_thermal.c
  projects/jbuild/sys/dev/acpica/acpi_throttle.c
  projects/jbuild/sys/dev/acpica/acpi_timer.c
  projects/jbuild/sys/dev/acpica/acpi_video.c
  projects/jbuild/sys/dev/aic7xxx/aicasm/Makefile
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  projects/jbuild/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
  projects/jbuild/sys/dev/asmc/asmc.c
  projects/jbuild/sys/dev/ata/   (props changed)
  projects/jbuild/sys/dev/ata/ata-all.h
  projects/jbuild/sys/dev/ata/ata-usb.c
  projects/jbuild/sys/dev/ata/chipsets/ata-ahci.c
  projects/jbuild/sys/dev/ata/chipsets/ata-intel.c
  projects/jbuild/sys/dev/ath/if_ath.c
  projects/jbuild/sys/dev/bge/if_bge.c
  projects/jbuild/sys/dev/bwi/if_bwi.c
  projects/jbuild/sys/dev/cfe/cfe_console.c
  projects/jbuild/sys/dev/cxgb/   (props changed)
  projects/jbuild/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/jbuild/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/jbuild/sys/dev/dc/if_dc.c
  projects/jbuild/sys/dev/dcons/dcons_os.c
  projects/jbuild/sys/dev/e1000/if_em.c
  projects/jbuild/sys/dev/fdc/fdc_acpi.c
  projects/jbuild/sys/dev/firewire/firewire.c
  projects/jbuild/sys/dev/firewire/if_fwe.c
  projects/jbuild/sys/dev/firewire/if_fwip.c
  projects/jbuild/sys/dev/fxp/if_fxp.c
  projects/jbuild/sys/dev/if_ndis/if_ndis.c
  projects/jbuild/sys/dev/if_ndis/if_ndis_usb.c
  projects/jbuild/sys/dev/if_ndis/if_ndisvar.h
  projects/jbuild/sys/dev/iir/iir.c
  projects/jbuild/sys/dev/iir/iir_ctrl.c
  projects/jbuild/sys/dev/ipmi/ipmi_acpi.c
  projects/jbuild/sys/dev/iwn/if_iwn.c
  projects/jbuild/sys/dev/ixgb/if_ixgb.c
  projects/jbuild/sys/dev/kbd/kbd.c
  projects/jbuild/sys/dev/kbdmux/kbdmux.c
  projects/jbuild/sys/dev/ksyms/ksyms.c
  projects/jbuild/sys/dev/lmc/if_lmc.c
  projects/jbuild/sys/dev/lmc/if_lmc.h
  projects/jbuild/sys/dev/mge/if_mge.c
  projects/jbuild/sys/dev/mii/e1000phy.c
  projects/jbuild/sys/dev/mii/e1000phyreg.h
  projects/jbuild/sys/dev/msk/if_msk.c
  projects/jbuild/sys/dev/msk/if_mskreg.h
  projects/jbuild/sys/dev/mxge/if_mxge.c
  projects/jbuild/sys/dev/mxge/if_mxge_var.h
  projects/jbuild/sys/dev/nfe/if_nfe.c
  projects/jbuild/sys/dev/nge/if_nge.c
  projects/jbuild/sys/dev/nmdm/nmdm.c
  projects/jbuild/sys/dev/ofw/ofw_console.c
  projects/jbuild/sys/dev/pci/pci.c
  projects/jbuild/sys/dev/pci/pcivar.h
  projects/jbuild/sys/dev/puc/pucdata.c
  projects/jbuild/sys/dev/ral/rt2560.c
  projects/jbuild/sys/dev/re/if_re.c
  projects/jbuild/sys/dev/rp/rp.c
  projects/jbuild/sys/dev/sf/if_sf.c
  projects/jbuild/sys/dev/si/si.c
  projects/jbuild/sys/dev/sis/if_sis.c
  projects/jbuild/sys/dev/smc/if_smc.c
  projects/jbuild/sys/dev/sound/pci/hda/hdac.c
  projects/jbuild/sys/dev/sound/usb/uaudio.c
  projects/jbuild/sys/dev/sound/usb/uaudioreg.h
  projects/jbuild/sys/dev/ste/if_ste.c
  projects/jbuild/sys/dev/stge/if_stge.c
  projects/jbuild/sys/dev/syscons/daemon/daemon_saver.c
  projects/jbuild/sys/dev/syscons/scterm-teken.c
  projects/jbuild/sys/dev/syscons/syscons.c
  projects/jbuild/sys/dev/syscons/sysmouse.c
  projects/jbuild/sys/dev/syscons/teken/sequences
  projects/jbuild/sys/dev/syscons/teken/teken.c
  projects/jbuild/sys/dev/syscons/teken/teken.h
  projects/jbuild/sys/dev/syscons/teken/teken_subr_compat.h
  projects/jbuild/sys/dev/tsec/if_tsec.c
  projects/jbuild/sys/dev/uart/uart_tty.c
  projects/jbuild/sys/dev/usb/controller/at91dci.c
  projects/jbuild/sys/dev/usb/controller/at91dci.h
  projects/jbuild/sys/dev/usb/controller/atmegadci.c
  projects/jbuild/sys/dev/usb/controller/atmegadci.h
  projects/jbuild/sys/dev/usb/controller/atmegadci_atmelarm.c
  projects/jbuild/sys/dev/usb/controller/avr32dci.c
  projects/jbuild/sys/dev/usb/controller/avr32dci.h
  projects/jbuild/sys/dev/usb/controller/ehci.c
  projects/jbuild/sys/dev/usb/controller/ehci.h
  projects/jbuild/sys/dev/usb/controller/musb_otg.c
  projects/jbuild/sys/dev/usb/controller/musb_otg.h
  projects/jbuild/sys/dev/usb/controller/ohci.c
  projects/jbuild/sys/dev/usb/controller/ohci.h
  projects/jbuild/sys/dev/usb/controller/uhci.c
  projects/jbuild/sys/dev/usb/controller/uhci.h
  projects/jbuild/sys/dev/usb/controller/usb_controller.c
  projects/jbuild/sys/dev/usb/controller/uss820dci.c
  projects/jbuild/sys/dev/usb/controller/uss820dci.h
  projects/jbuild/sys/dev/usb/input/uhid.c
  projects/jbuild/sys/dev/usb/input/ukbd.c
  projects/jbuild/sys/dev/usb/input/ums.c
  projects/jbuild/sys/dev/usb/misc/udbp.c
  projects/jbuild/sys/dev/usb/misc/ufm.c
  projects/jbuild/sys/dev/usb/net/if_aue.c
  projects/jbuild/sys/dev/usb/net/if_auereg.h
  projects/jbuild/sys/dev/usb/net/if_axe.c
  projects/jbuild/sys/dev/usb/net/if_axereg.h
  projects/jbuild/sys/dev/usb/net/if_cdce.c
  projects/jbuild/sys/dev/usb/net/if_cdcereg.h
  projects/jbuild/sys/dev/usb/net/if_cue.c
  projects/jbuild/sys/dev/usb/net/if_cuereg.h
  projects/jbuild/sys/dev/usb/net/if_kue.c
  projects/jbuild/sys/dev/usb/net/if_kuereg.h
  projects/jbuild/sys/dev/usb/net/if_rue.c
  projects/jbuild/sys/dev/usb/net/if_ruereg.h
  projects/jbuild/sys/dev/usb/net/if_udav.c
  projects/jbuild/sys/dev/usb/net/if_udavreg.h
  projects/jbuild/sys/dev/usb/net/usb_ethernet.c
  projects/jbuild/sys/dev/usb/net/usb_ethernet.h
  projects/jbuild/sys/dev/usb/quirk/usb_quirk.c
  projects/jbuild/sys/dev/usb/serial/u3g.c
  projects/jbuild/sys/dev/usb/serial/uark.c
  projects/jbuild/sys/dev/usb/serial/ubsa.c
  projects/jbuild/sys/dev/usb/serial/ubser.c
  projects/jbuild/sys/dev/usb/serial/uchcom.c
  projects/jbuild/sys/dev/usb/serial/ucycom.c
  projects/jbuild/sys/dev/usb/serial/ufoma.c
  projects/jbuild/sys/dev/usb/serial/uftdi.c
  projects/jbuild/sys/dev/usb/serial/ugensa.c
  projects/jbuild/sys/dev/usb/serial/uipaq.c
  projects/jbuild/sys/dev/usb/serial/ulpt.c
  projects/jbuild/sys/dev/usb/serial/umct.c
  projects/jbuild/sys/dev/usb/serial/umodem.c
  projects/jbuild/sys/dev/usb/serial/umoscom.c
  projects/jbuild/sys/dev/usb/serial/uplcom.c
  projects/jbuild/sys/dev/usb/serial/usb_serial.c
  projects/jbuild/sys/dev/usb/serial/usb_serial.h
  projects/jbuild/sys/dev/usb/serial/uslcom.c
  projects/jbuild/sys/dev/usb/serial/uvisor.c
  projects/jbuild/sys/dev/usb/serial/uvscom.c
  projects/jbuild/sys/dev/usb/storage/umass.c
  projects/jbuild/sys/dev/usb/storage/urio.c
  projects/jbuild/sys/dev/usb/storage/ustorage_fs.c
  projects/jbuild/sys/dev/usb/template/usb_template.c
  projects/jbuild/sys/dev/usb/template/usb_template.h
  projects/jbuild/sys/dev/usb/template/usb_template_cdce.c
  projects/jbuild/sys/dev/usb/template/usb_template_msc.c
  projects/jbuild/sys/dev/usb/template/usb_template_mtp.c
  projects/jbuild/sys/dev/usb/usb.h
  projects/jbuild/sys/dev/usb/usb_bus.h
  projects/jbuild/sys/dev/usb/usb_busdma.c
  projects/jbuild/sys/dev/usb/usb_busdma.h
  projects/jbuild/sys/dev/usb/usb_cdc.h
  projects/jbuild/sys/dev/usb/usb_compat_linux.c
  projects/jbuild/sys/dev/usb/usb_compat_linux.h
  projects/jbuild/sys/dev/usb/usb_controller.h
  projects/jbuild/sys/dev/usb/usb_core.h
  projects/jbuild/sys/dev/usb/usb_debug.c
  projects/jbuild/sys/dev/usb/usb_debug.h
  projects/jbuild/sys/dev/usb/usb_dev.c
  projects/jbuild/sys/dev/usb/usb_dev.h
  projects/jbuild/sys/dev/usb/usb_device.c
  projects/jbuild/sys/dev/usb/usb_device.h
  projects/jbuild/sys/dev/usb/usb_dynamic.c
  projects/jbuild/sys/dev/usb/usb_dynamic.h
  projects/jbuild/sys/dev/usb/usb_error.c
  projects/jbuild/sys/dev/usb/usb_generic.c
  projects/jbuild/sys/dev/usb/usb_generic.h
  projects/jbuild/sys/dev/usb/usb_handle_request.c
  projects/jbuild/sys/dev/usb/usb_hid.c
  projects/jbuild/sys/dev/usb/usb_hid.h
  projects/jbuild/sys/dev/usb/usb_hub.c
  projects/jbuild/sys/dev/usb/usb_hub.h
  projects/jbuild/sys/dev/usb/usb_ioctl.h
  projects/jbuild/sys/dev/usb/usb_lookup.c
  projects/jbuild/sys/dev/usb/usb_lookup.h
  projects/jbuild/sys/dev/usb/usb_mbuf.c
  projects/jbuild/sys/dev/usb/usb_mbuf.h
  projects/jbuild/sys/dev/usb/usb_msctest.c
  projects/jbuild/sys/dev/usb/usb_msctest.h
  projects/jbuild/sys/dev/usb/usb_parse.c
  projects/jbuild/sys/dev/usb/usb_parse.h
  projects/jbuild/sys/dev/usb/usb_process.c
  projects/jbuild/sys/dev/usb/usb_process.h
  projects/jbuild/sys/dev/usb/usb_request.c
  projects/jbuild/sys/dev/usb/usb_request.h
  projects/jbuild/sys/dev/usb/usb_transfer.c
  projects/jbuild/sys/dev/usb/usb_transfer.h
  projects/jbuild/sys/dev/usb/usb_util.c
  projects/jbuild/sys/dev/usb/usbdevs
  projects/jbuild/sys/dev/usb/usbhid.h
  projects/jbuild/sys/dev/usb/wlan/if_rum.c
  projects/jbuild/sys/dev/usb/wlan/if_rumvar.h
  projects/jbuild/sys/dev/usb/wlan/if_uath.c
  projects/jbuild/sys/dev/usb/wlan/if_uathvar.h
  projects/jbuild/sys/dev/usb/wlan/if_upgt.c
  projects/jbuild/sys/dev/usb/wlan/if_upgtvar.h
  projects/jbuild/sys/dev/usb/wlan/if_ural.c
  projects/jbuild/sys/dev/usb/wlan/if_uralvar.h
  projects/jbuild/sys/dev/usb/wlan/if_urtw.c
  projects/jbuild/sys/dev/usb/wlan/if_urtwvar.h
  projects/jbuild/sys/dev/usb/wlan/if_zyd.c
  projects/jbuild/sys/dev/usb/wlan/if_zydreg.h
  projects/jbuild/sys/dev/vge/if_vge.c
  projects/jbuild/sys/dev/vr/if_vr.c
  projects/jbuild/sys/dev/xen/console/console.c
  projects/jbuild/sys/dev/xen/netfront/   (props changed)
  projects/jbuild/sys/dev/xen/xenpci/   (props changed)
  projects/jbuild/sys/dev/xl/if_xl.c
  projects/jbuild/sys/fs/cd9660/cd9660_rrip.c
  projects/jbuild/sys/fs/devfs/devfs_devs.c
  projects/jbuild/sys/fs/devfs/devfs_vnops.c
  projects/jbuild/sys/fs/nfs/nfs_commonacl.c
  projects/jbuild/sys/fs/nfs/nfsport.h
  projects/jbuild/sys/fs/nfsclient/nfs_clbio.c
  projects/jbuild/sys/fs/nfsclient/nfs_clnode.c
  projects/jbuild/sys/fs/nfsclient/nfs_clstate.c
  projects/jbuild/sys/fs/nfsclient/nfs_clvfsops.c
  projects/jbuild/sys/fs/nfsclient/nfs_clvnops.c
  projects/jbuild/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/jbuild/sys/fs/nfsserver/nfs_nfsdport.c
  projects/jbuild/sys/fs/nullfs/null_subr.c
  projects/jbuild/sys/fs/nullfs/null_vnops.c
  projects/jbuild/sys/fs/pseudofs/pseudofs_vncache.c
  projects/jbuild/sys/fs/pseudofs/pseudofs_vnops.c
  projects/jbuild/sys/fs/smbfs/smbfs_io.c
  projects/jbuild/sys/fs/udf/osta.c
  projects/jbuild/sys/fs/unionfs/union_subr.c
  projects/jbuild/sys/geom/geom_subr.c
  projects/jbuild/sys/geom/label/g_label.c
  projects/jbuild/sys/geom/vinum/geom_vinum_create.c
  projects/jbuild/sys/geom/vinum/geom_vinum_drive.c
  projects/jbuild/sys/gnu/fs/ext2fs/ext2_fs.h
  projects/jbuild/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  projects/jbuild/sys/gnu/fs/ext2fs/ext2_lookup.c
  projects/jbuild/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/jbuild/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/jbuild/sys/i386/acpica/OsdEnvironment.c
  projects/jbuild/sys/i386/acpica/acpi_machdep.c
  projects/jbuild/sys/i386/acpica/acpi_wakeup.c
  projects/jbuild/sys/i386/acpica/madt.c
  projects/jbuild/sys/i386/conf/GENERIC
  projects/jbuild/sys/i386/cpufreq/est.c
  projects/jbuild/sys/i386/cpufreq/hwpstate.c
  projects/jbuild/sys/i386/cpufreq/p4tcc.c
  projects/jbuild/sys/i386/i386/dump_machdep.c
  projects/jbuild/sys/i386/i386/minidump_machdep.c
  projects/jbuild/sys/i386/i386/sys_machdep.c
  projects/jbuild/sys/i386/ibcs2/ibcs2_misc.c
  projects/jbuild/sys/i386/ibcs2/ibcs2_socksys.c
  projects/jbuild/sys/i386/ibcs2/ibcs2_sysent.c
  projects/jbuild/sys/i386/include/apicvar.h
  projects/jbuild/sys/i386/linux/linux.h
  projects/jbuild/sys/i386/linux/linux_sysent.c
  projects/jbuild/sys/i386/xen/clock.c
  projects/jbuild/sys/i386/xen/mp_machdep.c
  projects/jbuild/sys/ia64/acpica/OsdEnvironment.c
  projects/jbuild/sys/ia64/acpica/acpi_machdep.c
  projects/jbuild/sys/ia64/acpica/acpi_wakeup.c
  projects/jbuild/sys/ia64/acpica/madt.c
  projects/jbuild/sys/ia64/conf/GENERIC
  projects/jbuild/sys/ia64/ia64/dump_machdep.c
  projects/jbuild/sys/ia64/ia64/nexus.c
  projects/jbuild/sys/ia64/ia64/ssc.c
  projects/jbuild/sys/kern/init_main.c
  projects/jbuild/sys/kern/init_sysent.c
  projects/jbuild/sys/kern/kern_acct.c
  projects/jbuild/sys/kern/kern_alq.c
  projects/jbuild/sys/kern/kern_conf.c
  projects/jbuild/sys/kern/kern_cpu.c
  projects/jbuild/sys/kern/kern_descrip.c
  projects/jbuild/sys/kern/kern_environment.c
  projects/jbuild/sys/kern/kern_exec.c
  projects/jbuild/sys/kern/kern_exit.c
  projects/jbuild/sys/kern/kern_fork.c
  projects/jbuild/sys/kern/kern_jail.c
  projects/jbuild/sys/kern/kern_ktrace.c
  projects/jbuild/sys/kern/kern_linker.c
  projects/jbuild/sys/kern/kern_lock.c
  projects/jbuild/sys/kern/kern_malloc.c
  projects/jbuild/sys/kern/kern_mbuf.c
  projects/jbuild/sys/kern/kern_mib.c
  projects/jbuild/sys/kern/kern_mutex.c
  projects/jbuild/sys/kern/kern_osd.c
  projects/jbuild/sys/kern/kern_poll.c
  projects/jbuild/sys/kern/kern_priv.c
  projects/jbuild/sys/kern/kern_proc.c
  projects/jbuild/sys/kern/kern_prot.c
  projects/jbuild/sys/kern/kern_rmlock.c
  projects/jbuild/sys/kern/kern_rwlock.c
  projects/jbuild/sys/kern/kern_shutdown.c
  projects/jbuild/sys/kern/kern_sx.c
  projects/jbuild/sys/kern/kern_sysctl.c
  projects/jbuild/sys/kern/kern_vimage.c
  projects/jbuild/sys/kern/kern_xxx.c
  projects/jbuild/sys/kern/link_elf.c
  projects/jbuild/sys/kern/link_elf_obj.c
  projects/jbuild/sys/kern/makesyscalls.sh
  projects/jbuild/sys/kern/subr_trap.c
  projects/jbuild/sys/kern/sys_pipe.c
  projects/jbuild/sys/kern/sys_socket.c
  projects/jbuild/sys/kern/sysv_msg.c
  projects/jbuild/sys/kern/sysv_sem.c
  projects/jbuild/sys/kern/sysv_shm.c
  projects/jbuild/sys/kern/tty.c
  projects/jbuild/sys/kern/tty_pts.c
  projects/jbuild/sys/kern/uipc_mbuf.c
  projects/jbuild/sys/kern/uipc_mbuf2.c
  projects/jbuild/sys/kern/uipc_sem.c
  projects/jbuild/sys/kern/uipc_shm.c
  projects/jbuild/sys/kern/uipc_sockbuf.c
  projects/jbuild/sys/kern/uipc_socket.c
  projects/jbuild/sys/kern/uipc_syscalls.c
  projects/jbuild/sys/kern/uipc_usrreq.c
  projects/jbuild/sys/kern/vfs_acl.c
  projects/jbuild/sys/kern/vfs_aio.c
  projects/jbuild/sys/kern/vfs_bio.c
  projects/jbuild/sys/kern/vfs_cache.c
  projects/jbuild/sys/kern/vfs_default.c
  projects/jbuild/sys/kern/vfs_extattr.c
  projects/jbuild/sys/kern/vfs_lookup.c
  projects/jbuild/sys/kern/vfs_mount.c
  projects/jbuild/sys/kern/vfs_subr.c
  projects/jbuild/sys/kern/vfs_syscalls.c
  projects/jbuild/sys/kern/vfs_vnops.c
  projects/jbuild/sys/kern/vnode_if.src
  projects/jbuild/sys/kgssapi/gsstest.c
  projects/jbuild/sys/modules/Makefile
  projects/jbuild/sys/modules/acpi/acpi/Makefile
  projects/jbuild/sys/modules/acpi/acpi_aiboost/Makefile
  projects/jbuild/sys/modules/acpi/acpi_asus/Makefile
  projects/jbuild/sys/modules/acpi/acpi_dock/Makefile
  projects/jbuild/sys/modules/acpi/acpi_fujitsu/Makefile
  projects/jbuild/sys/modules/acpi/acpi_ibm/Makefile
  projects/jbuild/sys/modules/acpi/acpi_panasonic/Makefile
  projects/jbuild/sys/modules/acpi/acpi_sony/Makefile
  projects/jbuild/sys/modules/acpi/acpi_toshiba/Makefile
  projects/jbuild/sys/modules/acpi/acpi_video/Makefile
  projects/jbuild/sys/modules/cpufreq/Makefile
  projects/jbuild/sys/modules/cxgb/tom/Makefile
  projects/jbuild/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/jbuild/sys/modules/dummynet/Makefile
  projects/jbuild/sys/modules/fdc/Makefile
  projects/jbuild/sys/modules/firewire/fwip/Makefile
  projects/jbuild/sys/modules/geom/geom_part/geom_part_ebr/Makefile
  projects/jbuild/sys/modules/ibcs2/Makefile
  projects/jbuild/sys/modules/if_gif/Makefile
  projects/jbuild/sys/modules/if_ppp/Makefile
  projects/jbuild/sys/modules/if_stf/Makefile
  projects/jbuild/sys/modules/if_tun/Makefile
  projects/jbuild/sys/modules/ip6_mroute_mod/   (props changed)
  projects/jbuild/sys/modules/ip6_mroute_mod/Makefile
  projects/jbuild/sys/modules/ip_mroute_mod/Makefile
  projects/jbuild/sys/modules/ipfw/Makefile
  projects/jbuild/sys/modules/ipfw_nat/Makefile
  projects/jbuild/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/jbuild/sys/modules/linux/Makefile
  projects/jbuild/sys/modules/mac_lomac/Makefile
  projects/jbuild/sys/modules/nfsserver/Makefile
  projects/jbuild/sys/modules/pf/Makefile
  projects/jbuild/sys/modules/pseudofs/Makefile
  projects/jbuild/sys/modules/sem/Makefile
  projects/jbuild/sys/modules/svr4/Makefile
  projects/jbuild/sys/modules/sysvipc/sysvmsg/Makefile
  projects/jbuild/sys/modules/sysvipc/sysvsem/Makefile
  projects/jbuild/sys/modules/sysvipc/sysvshm/Makefile
  projects/jbuild/sys/modules/ufs/Makefile
  projects/jbuild/sys/modules/usb/Makefile
  projects/jbuild/sys/modules/usb/zyd/Makefile
  projects/jbuild/sys/modules/zfs/Makefile
  projects/jbuild/sys/net/bpf.c
  projects/jbuild/sys/net/if.c
  projects/jbuild/sys/net/if.h
  projects/jbuild/sys/net/if_atmsubr.c
  projects/jbuild/sys/net/if_bridge.c
  projects/jbuild/sys/net/if_ethersubr.c
  projects/jbuild/sys/net/if_fddisubr.c
  projects/jbuild/sys/net/if_fwsubr.c
  projects/jbuild/sys/net/if_gif.c
  projects/jbuild/sys/net/if_iso88025subr.c
  projects/jbuild/sys/net/if_loop.c
  projects/jbuild/sys/net/if_stf.c
  projects/jbuild/sys/net/if_tun.c
  projects/jbuild/sys/net/if_var.h
  projects/jbuild/sys/net/netisr.c
  projects/jbuild/sys/net/netisr.h
  projects/jbuild/sys/net/pfil.h
  projects/jbuild/sys/net/route.c
  projects/jbuild/sys/net/route.h
  projects/jbuild/sys/net/rtsock.c
  projects/jbuild/sys/net/vnet.h
  projects/jbuild/sys/net80211/ieee80211.c
  projects/jbuild/sys/net80211/ieee80211.h
  projects/jbuild/sys/net80211/ieee80211_crypto.h
  projects/jbuild/sys/net80211/ieee80211_crypto_ccmp.c
  projects/jbuild/sys/net80211/ieee80211_crypto_tkip.c
  projects/jbuild/sys/net80211/ieee80211_ddb.c
  projects/jbuild/sys/net80211/ieee80211_dfs.c
  projects/jbuild/sys/net80211/ieee80211_freebsd.c
  projects/jbuild/sys/net80211/ieee80211_hostap.c
  projects/jbuild/sys/net80211/ieee80211_ht.c
  projects/jbuild/sys/net80211/ieee80211_ht.h
  projects/jbuild/sys/net80211/ieee80211_input.c
  projects/jbuild/sys/net80211/ieee80211_ioctl.c
  projects/jbuild/sys/net80211/ieee80211_ioctl.h
  projects/jbuild/sys/net80211/ieee80211_monitor.c
  projects/jbuild/sys/net80211/ieee80211_node.h
  projects/jbuild/sys/net80211/ieee80211_output.c
  projects/jbuild/sys/net80211/ieee80211_phy.h
  projects/jbuild/sys/net80211/ieee80211_proto.c
  projects/jbuild/sys/net80211/ieee80211_proto.h
  projects/jbuild/sys/net80211/ieee80211_radiotap.c
  projects/jbuild/sys/net80211/ieee80211_scan.c
  projects/jbuild/sys/net80211/ieee80211_scan.h
  projects/jbuild/sys/net80211/ieee80211_sta.c
  projects/jbuild/sys/net80211/ieee80211_superg.c
  projects/jbuild/sys/net80211/ieee80211_tdma.c
  projects/jbuild/sys/net80211/ieee80211_var.h
  projects/jbuild/sys/netatalk/aarp.c
  projects/jbuild/sys/netatalk/ddp_input.c
  projects/jbuild/sys/netatalk/ddp_output.c
  projects/jbuild/sys/netatalk/ddp_usrreq.c
  projects/jbuild/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/jbuild/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
  projects/jbuild/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/jbuild/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/jbuild/sys/netgraph/ng_ksocket.c
  projects/jbuild/sys/netinet/accf_data.c
  projects/jbuild/sys/netinet/accf_dns.c
  projects/jbuild/sys/netinet/accf_http.c
  projects/jbuild/sys/netinet/if_ether.c
  projects/jbuild/sys/netinet/igmp.c
  projects/jbuild/sys/netinet/in.h
  projects/jbuild/sys/netinet/in_pcb.c
  projects/jbuild/sys/netinet/in_pcb.h
  projects/jbuild/sys/netinet/in_rmx.c
  projects/jbuild/sys/netinet/ip_divert.c
  projects/jbuild/sys/netinet/ip_dummynet.h
  projects/jbuild/sys/netinet/ip_fw.h
  projects/jbuild/sys/netinet/ip_icmp.c
  projects/jbuild/sys/netinet/ip_input.c
  projects/jbuild/sys/netinet/ip_ipsec.c
  projects/jbuild/sys/netinet/ip_ipsec.h
  projects/jbuild/sys/netinet/ip_mroute.c
  projects/jbuild/sys/netinet/ip_options.c
  projects/jbuild/sys/netinet/ip_output.c
  projects/jbuild/sys/netinet/ip_var.h
  projects/jbuild/sys/netinet/raw_ip.c
  projects/jbuild/sys/netinet/sctp_pcb.c
  projects/jbuild/sys/netinet/sctp_sysctl.c
  projects/jbuild/sys/netinet/sctp_sysctl.h
  projects/jbuild/sys/netinet/sctp_uio.h
  projects/jbuild/sys/netinet/sctputil.c
  projects/jbuild/sys/netinet/tcp_input.c
  projects/jbuild/sys/netinet/tcp_output.c
  projects/jbuild/sys/netinet/tcp_subr.c
  projects/jbuild/sys/netinet/tcp_syncache.c
  projects/jbuild/sys/netinet/tcp_syncache.h
  projects/jbuild/sys/netinet/tcp_timewait.c
  projects/jbuild/sys/netinet/udp_usrreq.c
  projects/jbuild/sys/netinet6/frag6.c
  projects/jbuild/sys/netinet6/icmp6.c
  projects/jbuild/sys/netinet6/in6.h
  projects/jbuild/sys/netinet6/in6_ifattach.c
  projects/jbuild/sys/netinet6/in6_pcb.c
  projects/jbuild/sys/netinet6/in6_rmx.c
  projects/jbuild/sys/netinet6/ip6_input.c
  projects/jbuild/sys/netinet6/ip6_output.c
  projects/jbuild/sys/netinet6/nd6.c
  projects/jbuild/sys/netinet6/nd6_rtr.c
  projects/jbuild/sys/netinet6/udp6_usrreq.c
  projects/jbuild/sys/netinet6/vinet6.h
  projects/jbuild/sys/netipsec/ipsec_input.c
  projects/jbuild/sys/netipx/ipx_input.c
  projects/jbuild/sys/netnatm/natm_proto.c
  projects/jbuild/sys/netsmb/smb_trantcp.c
  projects/jbuild/sys/nfsclient/bootp_subr.c
  projects/jbuild/sys/nfsclient/nfs_bio.c
  projects/jbuild/sys/nfsclient/nfs_socket.c
  projects/jbuild/sys/nfsclient/nfs_vfsops.c
  projects/jbuild/sys/nfsserver/nfs.h
  projects/jbuild/sys/nfsserver/nfs_srvkrpc.c
  projects/jbuild/sys/nfsserver/nfs_srvsock.c
  projects/jbuild/sys/nfsserver/nfs_syscalls.c
  projects/jbuild/sys/nlm/nlm_advlock.c
  projects/jbuild/sys/pc98/conf/GENERIC
  projects/jbuild/sys/pci/if_rl.c
  projects/jbuild/sys/powerpc/aim/machdep.c
  projects/jbuild/sys/powerpc/booke/machdep.c
  projects/jbuild/sys/powerpc/booke/platform_bare.c
  projects/jbuild/sys/powerpc/booke/pmap.c
  projects/jbuild/sys/powerpc/conf/GENERIC
  projects/jbuild/sys/powerpc/conf/MPC85XX
  projects/jbuild/sys/powerpc/conf/NOTES
  projects/jbuild/sys/powerpc/include/ocpbus.h
  projects/jbuild/sys/powerpc/include/pio.h
  projects/jbuild/sys/powerpc/mpc85xx/atpic.c
  projects/jbuild/sys/powerpc/mpc85xx/ocpbus.c
  projects/jbuild/sys/powerpc/mpc85xx/ocpbus.h
  projects/jbuild/sys/powerpc/powermac/pmu.c
  projects/jbuild/sys/powerpc/powerpc/bus_machdep.c
  projects/jbuild/sys/powerpc/powerpc/cpu.c
  projects/jbuild/sys/rpc/authunix_prot.c
  projects/jbuild/sys/rpc/clnt_dg.c
  projects/jbuild/sys/rpc/clnt_vc.c
  projects/jbuild/sys/rpc/svc.c
  projects/jbuild/sys/rpc/svc.h
  projects/jbuild/sys/rpc/svc_dg.c
  projects/jbuild/sys/rpc/svc_vc.c
  projects/jbuild/sys/rpc/xdr.h
  projects/jbuild/sys/security/audit/audit_syscalls.c
  projects/jbuild/sys/security/mac/mac_atalk.c
  projects/jbuild/sys/security/mac/mac_framework.c
  projects/jbuild/sys/security/mac/mac_inet.c
  projects/jbuild/sys/security/mac/mac_inet6.c
  projects/jbuild/sys/security/mac/mac_internal.h
  projects/jbuild/sys/security/mac/mac_net.c
  projects/jbuild/sys/security/mac/mac_socket.c
  projects/jbuild/sys/security/mac_biba/mac_biba.c
  projects/jbuild/sys/security/mac_lomac/mac_lomac.c
  projects/jbuild/sys/security/mac_mls/mac_mls.c
  projects/jbuild/sys/security/mac_stub/mac_stub.c
  projects/jbuild/sys/security/mac_test/mac_test.c
  projects/jbuild/sys/sparc64/conf/GENERIC
  projects/jbuild/sys/sparc64/sparc64/dump_machdep.c
  projects/jbuild/sys/sun4v/conf/GENERIC
  projects/jbuild/sys/sun4v/include/pcpu.h
  projects/jbuild/sys/sun4v/sun4v/dump_machdep.c
  projects/jbuild/sys/sun4v/sun4v/hvcons.c
  projects/jbuild/sys/sys/buf.h
  projects/jbuild/sys/sys/conf.h
  projects/jbuild/sys/sys/cpu.h
  projects/jbuild/sys/sys/jail.h
  projects/jbuild/sys/sys/kernel.h
  projects/jbuild/sys/sys/mount.h
  projects/jbuild/sys/sys/namei.h
  projects/jbuild/sys/sys/param.h
  projects/jbuild/sys/sys/pcpu.h
  projects/jbuild/sys/sys/pmc.h
  projects/jbuild/sys/sys/priv.h
  projects/jbuild/sys/sys/rmlock.h
  projects/jbuild/sys/sys/sockbuf.h
  projects/jbuild/sys/sys/socketvar.h
  projects/jbuild/sys/sys/sockio.h
  projects/jbuild/sys/sys/sx.h
  projects/jbuild/sys/sys/syscallsubr.h
  projects/jbuild/sys/sys/sysent.h
  projects/jbuild/sys/sys/tty.h
  projects/jbuild/sys/sys/ucred.h
  projects/jbuild/sys/sys/user.h
  projects/jbuild/sys/sys/vimage.h
  projects/jbuild/sys/sys/vnode.h
  projects/jbuild/sys/ufs/ffs/ffs_softdep.c
  projects/jbuild/sys/ufs/ffs/ffs_vfsops.c
  projects/jbuild/sys/ufs/ufs/dirhash.h
  projects/jbuild/sys/ufs/ufs/ufs_dirhash.c
  projects/jbuild/sys/ufs/ufs/ufs_vnops.c
  projects/jbuild/sys/vm/swap_pager.c
  projects/jbuild/sys/vm/vm_contig.c
  projects/jbuild/sys/vm/vm_glue.c
  projects/jbuild/sys/vm/vm_mmap.c
  projects/jbuild/sys/vm/vm_object.c
  projects/jbuild/sys/vm/vm_page.c
  projects/jbuild/sys/vm/vm_page.h
  projects/jbuild/sys/vm/vm_pageout.c
  projects/jbuild/sys/vm/vnode_pager.c
  projects/jbuild/sys/xdr/xdr_mem.c
  projects/jbuild/sys/xen/evtchn.h   (props changed)
  projects/jbuild/sys/xen/evtchn/evtchn.c
  projects/jbuild/sys/xen/hypervisor.h   (props changed)
  projects/jbuild/sys/xen/xen_intr.h   (props changed)
  projects/jbuild/sys/xen/xenbus/xenbus_xs.c
  projects/jbuild/tools/regression/bin/sh/set-e/not2.0
  projects/jbuild/tools/regression/file/flock/Makefile
  projects/jbuild/tools/regression/file/flock/flock.c
  projects/jbuild/tools/regression/fstest/fstest.c
  projects/jbuild/tools/regression/lib/libutil/test-flopen.c
  projects/jbuild/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/jbuild/tools/tools/README
  projects/jbuild/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/jbuild/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/jbuild/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/jbuild/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/jbuild/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/jbuild/tools/tools/pciid/mk_pci_vendors.pl
  projects/jbuild/usr.bin/Makefile
  projects/jbuild/usr.bin/calendar/calendars/calendar.music
  projects/jbuild/usr.bin/dig/Makefile
  projects/jbuild/usr.bin/ee/Makefile
  projects/jbuild/usr.bin/find/function.c
  projects/jbuild/usr.bin/kdump/mkioctls
  projects/jbuild/usr.bin/netstat/route.c
  projects/jbuild/usr.bin/nfsstat/nfsstat.1
  projects/jbuild/usr.bin/nfsstat/nfsstat.c
  projects/jbuild/usr.bin/perror/perror.c
  projects/jbuild/usr.bin/procstat/   (props changed)
  projects/jbuild/usr.bin/tail/extern.h
  projects/jbuild/usr.bin/tail/forward.c
  projects/jbuild/usr.bin/tail/misc.c
  projects/jbuild/usr.bin/tail/read.c
  projects/jbuild/usr.bin/tail/reverse.c
  projects/jbuild/usr.bin/tail/tail.1
  projects/jbuild/usr.bin/tail/tail.c
  projects/jbuild/usr.sbin/Makefile
  projects/jbuild/usr.sbin/acpi/Makefile.inc
  projects/jbuild/usr.sbin/acpi/acpiconf/acpiconf.c
  projects/jbuild/usr.sbin/acpi/acpidb/Makefile
  projects/jbuild/usr.sbin/acpi/acpidb/acpidb.c
  projects/jbuild/usr.sbin/acpi/acpidump/acpi.c
  projects/jbuild/usr.sbin/acpi/iasl/Makefile
  projects/jbuild/usr.sbin/ipfwpcap/Makefile
  projects/jbuild/usr.sbin/ipfwpcap/ipfwpcap.c
  projects/jbuild/usr.sbin/jail/jail.8
  projects/jbuild/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/jbuild/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/jbuild/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/jbuild/usr.sbin/makefs/getid.c   (props changed)
  projects/jbuild/usr.sbin/mountd/mountd.8
  projects/jbuild/usr.sbin/mountd/mountd.c
  projects/jbuild/usr.sbin/named/Makefile
  projects/jbuild/usr.sbin/nfscbd/nfscbd.c
  projects/jbuild/usr.sbin/nfsd/nfsd.8
  projects/jbuild/usr.sbin/nfsd/nfsd.c
  projects/jbuild/usr.sbin/nfsd/nfsv4.4
  projects/jbuild/usr.sbin/nfsdumpstate/nfsdumpstate.c
  projects/jbuild/usr.sbin/nfsrevoke/nfsrevoke.c
  projects/jbuild/usr.sbin/nfsuserd/Makefile
  projects/jbuild/usr.sbin/nfsuserd/nfsuserd.c
  projects/jbuild/usr.sbin/pkg_install/info/main.c
  projects/jbuild/usr.sbin/pmcstat/pmcstat.8
  projects/jbuild/usr.sbin/powerd/powerd.c
  projects/jbuild/usr.sbin/tcpdrop/tcpdrop.8
  projects/jbuild/usr.sbin/tcpdrop/tcpdrop.c
  projects/jbuild/usr.sbin/wpa/hostapd/driver_freebsd.c
  projects/jbuild/usr.sbin/zic/   (props changed)

Modified: projects/jbuild/ObsoleteFiles.inc
==============================================================================
--- projects/jbuild/ObsoleteFiles.inc	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/ObsoleteFiles.inc	Sat Jun  6 22:15:15 2009	(r193596)
@@ -14,6 +14,13 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090605: removal of clists
+OLD_FILES+=usr/include/sys/clist.h
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
+# 20090530: removal of early.sh
+OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz

Modified: projects/jbuild/UPDATING
==============================================================================
--- projects/jbuild/UPDATING	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/UPDATING	Sat Jun  6 22:15:15 2009	(r193596)
@@ -22,6 +22,48 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090602:
+	window(1) has been removed from the base system. It can now be
+	installed from ports. The port is called misc/window.
+
+20090601:
+	The way we are storing and accessing `routing table' entries
+	has changed. Programs reading the FIB, like netstat, need to
+	be re-compiled.
+
+20090601:
+	A new netisr implementation has been added for FreeBSD 8.  Network
+	file system modules, such as igmp, ipdivert, and others, should be
+	rebuilt.
+	Bump __FreeBSD_version to 800096.
+
+20090531:
+	For those who use ipfw and especially pf, those two firewalls
+	are now started BEFORE the network is initialized (i.e., before
+	rc.d/netif). Please review your rules to make sure that your
+	interfaces will be properly described.
+
+20090530:
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
+	is no more valid.
+
+20090530:
+	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
+	Bump __FreeBSD_version to 800094.
+
+20090529:
+	Add mnt_xflag field to 'struct mount'.  File system modules
+	need to be rebuilt.
+	Bump __FreeBSD_version to 800093.
+
+20090528:
+	The compiling option ADAPTIVE_SX has been retired while it has been
+	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+	The KPI for sx_init_flags() changes as accepting flags:
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+	has been introduced in order to handle the reversed logic.
+	Bump __FreeBSD_version to 800092.
+
 20090527:
 	Add support for hierarchical jails.  Remove global securelevel.
 	Bump __FreeBSD_version to 800091.

Modified: projects/jbuild/bin/cp/utils.c
==============================================================================
--- projects/jbuild/bin/cp/utils.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/cp/utils.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -365,7 +365,7 @@ setfile(struct stat *fs, int fd)
 	if (!gotstat || fs->st_flags != ts.st_flags)
 		if (fdval ?
 		    fchflags(fd, fs->st_flags) :
-		    (islink ? (errno = ENOSYS) :
+		    (islink ? lchflags(to.p_path, fs->st_flags) :
 		    chflags(to.p_path, fs->st_flags))) {
 			warn("chflags: %s", to.p_path);
 			rval = 1;

Modified: projects/jbuild/bin/rm/rm.c
==============================================================================
--- projects/jbuild/bin/rm/rm.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/rm/rm.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -234,7 +234,7 @@ rm_tree(char **argv)
 			else if (!uid &&
 				 (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 				 !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
-				 chflags(p->fts_accpath,
+				 lchflags(p->fts_accpath,
 					 p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0)
 				goto err;
 			continue;
@@ -253,7 +253,7 @@ rm_tree(char **argv)
 		if (!uid &&
 		    (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(p->fts_accpath,
+			rval = lchflags(p->fts_accpath,
 				       p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			/*
@@ -368,7 +368,7 @@ rm_file(char **argv)
 		if (!uid && !S_ISWHT(sb.st_mode) &&
 		    (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
+			rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			if (S_ISWHT(sb.st_mode))
 				rval = undelete(f);

Modified: projects/jbuild/bin/sh/alias.c
==============================================================================
--- projects/jbuild/bin/sh/alias.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/alias.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -97,7 +97,7 @@ setalias(char *name, char *val)
 	ap->val = savestr(val);
 #else /* hack */
 	{
-	int len = strlen(val);
+	size_t len = strlen(val);
 	ap->val = ckmalloc(len + 2);
 	memcpy(ap->val, val, len);
 	ap->val[len] = ' ';	/* fluff */

Modified: projects/jbuild/bin/sh/eval.c
==============================================================================
--- projects/jbuild/bin/sh/eval.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/eval.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -83,6 +83,7 @@ MKINIT int evalskip;		/* set if we are s
 STATIC int skipcount;		/* number of levels to skip */
 MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
+STATIC int builtin_flags;	/* evalcommand flags for builtins */
 
 
 char *commandname;
@@ -147,7 +148,7 @@ evalcmd(int argc, char **argv)
                         STPUTC('\0', concat);
                         p = grabstackstr(concat);
                 }
-                evalstring(p);
+                evalstring(p, builtin_flags & EV_TESTED);
         }
         return exitstatus;
 }
@@ -158,7 +159,7 @@ evalcmd(int argc, char **argv)
  */
 
 void
-evalstring(char *s)
+evalstring(char *s, int flags)
 {
 	union node *n;
 	struct stackmark smark;
@@ -167,7 +168,7 @@ evalstring(char *s)
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
 		if (n != NULL)
-			evaltree(n, 0);
+			evaltree(n, flags);
 		popstackmark(&smark);
 	}
 	popfile();
@@ -593,7 +594,7 @@ evalcommand(union node *cmd, int flags, 
 	char *lastarg;
 	int realstatus;
 	int do_clearcmdentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &argv;
 	(void) &argc;
@@ -839,6 +840,7 @@ evalcommand(union node *cmd, int flags, 
 		commandname = argv[0];
 		argptr = argv + 1;
 		optptr = NULL;			/* initialize nextopt */
+		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();
 cmddone:

Modified: projects/jbuild/bin/sh/eval.h
==============================================================================
--- projects/jbuild/bin/sh/eval.h	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/eval.h	Sat Jun  6 22:15:15 2009	(r193596)
@@ -46,7 +46,7 @@ struct backcmd {		/* result of evalbackc
 };
 
 int evalcmd(int, char **);
-void evalstring(char *);
+void evalstring(char *, int);
 union node;	/* BLETCH for ansi C */
 void evaltree(union node *, int);
 void evalbackcmd(union node *, struct backcmd *);

Modified: projects/jbuild/bin/sh/exec.c
==============================================================================
--- projects/jbuild/bin/sh/exec.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/exec.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -187,7 +187,8 @@ padvance(char **path, char *name)
 	if (*path == NULL)
 		return NULL;
 	start = *path;
-	for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+	for (p = start; *p && *p != ':' && *p != '%'; p++)
+		; /* nothing */
 	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
 	while (stackblocksize() < len)
 		growstackblock();

Modified: projects/jbuild/bin/sh/histedit.c
==============================================================================
--- projects/jbuild/bin/sh/histedit.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/histedit.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -350,7 +350,7 @@ histcmd(int argc, char **argv)
 				if (displayhist) {
 					out2str(s);
 				}
-				evalstring(s);
+				evalstring(s, 0);
 				if (displayhist && hist) {
 					/*
 					 *  XXX what about recursive and
@@ -382,7 +382,7 @@ histcmd(int argc, char **argv)
 		fclose(efp);
 		editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
 		sprintf(editcmd, "%s %s", editor, editfile);
-		evalstring(editcmd);	/* XXX - should use no JC command */
+		evalstring(editcmd, 0);	/* XXX - should use no JC command */
 		INTON;
 		readcmdfile(editfile);	/* XXX - should read back - quick tst */
 		unlink(editfile);

Modified: projects/jbuild/bin/sh/main.c
==============================================================================
--- projects/jbuild/bin/sh/main.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/main.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -178,7 +178,7 @@ state2:
 state3:
 	state = 4;
 	if (minusc) {
-		evalstring(minusc);
+		evalstring(minusc, 0);
 	}
 	if (sflag || minusc == NULL) {
 state4:	/* XXX ??? - why isn't this before the "if" statement */

Modified: projects/jbuild/bin/sh/memalloc.c
==============================================================================
--- projects/jbuild/bin/sh/memalloc.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/memalloc.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  */
 
 pointer
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	pointer p;
 

Modified: projects/jbuild/bin/sh/memalloc.h
==============================================================================
--- projects/jbuild/bin/sh/memalloc.h	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/memalloc.h	Sat Jun  6 22:15:15 2009	(r193596)
@@ -33,6 +33,8 @@
  * $FreeBSD$
  */
 
+#include 
+
 struct stackmark {
 	struct stack_block *stackp;
 	char *stacknxt;
@@ -46,7 +48,7 @@ extern int stacknleft;
 extern int sstrnleft;
 extern int herefd;
 
-pointer ckmalloc(int);
+pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
 char *savestr(char *);

Modified: projects/jbuild/bin/sh/miscbltin.c
==============================================================================
--- projects/jbuild/bin/sh/miscbltin.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/miscbltin.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -103,8 +103,6 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
-	struct termios told, tnew;
-	int tsaved;
 
 	rflag = 0;
 	prompt = NULL;
@@ -151,26 +149,11 @@ readcmd(int argc __unused, char **argv _
 
 	if (tv.tv_sec >= 0) {
 		/*
-		 * See if we can disable input processing; this will
-		 * not give the desired result if we are in a pipeline
-		 * and someone upstream is still in line-by-line mode.
-		 */
-		tsaved = 0;
-		if (tcgetattr(0, &told) == 0) {
-			memcpy(&tnew, &told, sizeof(told));
-			cfmakeraw(&tnew);
-			tnew.c_iflag |= told.c_iflag & ICRNL;
-			tcsetattr(0, TCSANOW, &tnew);
-			tsaved = 1;
-		}
-		/*
 		 * Wait for something to become available.
 		 */
 		FD_ZERO(&ifds);
 		FD_SET(0, &ifds);
 		status = select(1, &ifds, NULL, NULL, &tv);
-		if (tsaved)
-			tcsetattr(0, TCSANOW, &told);
 		/*
 		 * If there's nothing ready, return an error.
 		 */

Modified: projects/jbuild/bin/sh/mkinit.c
==============================================================================
--- projects/jbuild/bin/sh/mkinit.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/mkinit.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -159,7 +159,7 @@ void addstr(char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
 FILE *ckfopen(char *, char *);
-void *ckmalloc(int);
+void *ckmalloc(size_t);
 char *savestr(char *);
 void error(char *);
 
@@ -464,7 +464,7 @@ ckfopen(char *file, char *mode)
 }
 
 void *
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	char *p;
 

Modified: projects/jbuild/bin/sh/mksyntax.c
==============================================================================
--- projects/jbuild/bin/sh/mksyntax.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/mksyntax.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -354,7 +354,7 @@ output_type_macros(void)
 	char **pp;
 
 	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
+		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
 	if (digit_contig)

Modified: projects/jbuild/bin/sh/parser.c
==============================================================================
--- projects/jbuild/bin/sh/parser.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/parser.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -898,7 +898,7 @@ readtoken1(int firstc, char const *synta
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &out;
 	(void) "ef;
@@ -1323,7 +1323,7 @@ parsebackq: {
 	struct jmploc *volatile savehandler;
 	int savelen;
 	int saveprompt;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &saveprompt;
 #endif

Modified: projects/jbuild/bin/sh/sh.1
==============================================================================
--- projects/jbuild/bin/sh/sh.1	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/sh.1	Sat Jun  6 22:15:15 2009	(r193596)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd May 31, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1949,7 +1949,7 @@ If the
 .Fl t
 option is specified and the
 .Ar timeout
-elapses before any input is supplied,
+elapses before a complete line of input is supplied,
 the
 .Ic read
 command will return an exit status of 1 without assigning any values.

Modified: projects/jbuild/bin/sh/trap.c
==============================================================================
--- projects/jbuild/bin/sh/trap.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/trap.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -416,7 +416,7 @@ dotrap(void)
 					if (i == SIGCHLD)
 						ignore_sigchld++;
 					savestatus = exitstatus;
-					evalstring(trap[i]);
+					evalstring(trap[i], 0);
 					exitstatus = savestatus;
 					if (i == SIGCHLD)
 						ignore_sigchld--;
@@ -471,7 +471,7 @@ exitshell(int status)
 	handler = &loc1;
 	if ((p = trap[0]) != NULL && *p != '\0') {
 		trap[0] = NULL;
-		evalstring(p);
+		evalstring(p, 0);
 	}
 l1:   handler = &loc2;			/* probably unnecessary */
 	flushall();

Modified: projects/jbuild/bin/sh/var.c
==============================================================================
--- projects/jbuild/bin/sh/var.c	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/bin/sh/var.c	Sat Jun  6 22:15:15 2009	(r193596)
@@ -195,7 +195,7 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
 	int err = 0;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &err;
 #endif

Modified: projects/jbuild/contrib/bind9/CHANGES
==============================================================================
--- projects/jbuild/contrib/bind9/CHANGES	Sat Jun  6 22:06:37 2009	(r193595)
+++ projects/jbuild/contrib/bind9/CHANGES	Sat Jun  6 22:15:15 2009	(r193596)
@@ -1,18 +1,258 @@
-	--- 9.4.3-P2 released ---
+
+	--- 9.6.1rc1 released ---
+
+2599.	[bug]		Address rapid memory growth when validation fails.
+			[RT #19654]
+
+2597.	[bug]		Handle a validation failure with a insecure delegation
+			from a NSEC3 signed master/slave zone.  [RT #19464]
+
+2596.	[bug]		Stale tree nodes of cache/dynamic rbtdb could stay
+			long, leading to inefficient memory usage or rejecting
+			newer cache entries in the worst case. [RT #19563]
+
+2595.	[bug]		Fix unknown extended rcodes in dig. [RT #19625]
+
+2592.	[bug]		Treat "any" as a type in nsupdate. [RT #19455]
+
+2591.	[bug]		named could die when processing a update in
+			removed_orphaned_ds(). [RT #19507]
+
+2588.	[bug]		SO_REUSEADDR could be set unconditionally after failure
+			of bind(2) call.  This should be rare and mostly
+			harmless, but may cause interference with other
+			processes that happen to use the same port. [RT #19642]
+
+2586.	[bug]		Missing cleanup of SIG rdataset in searching a DLZ DB
+			or SDB. [RT #19577]
+
+2585.	[bug]		Uninitialized socket name could be referenced via a
+			statistics channel, triggering an assertion failure in
+			XML rendering. [RT #19427]
+
+2584.	[bug]		alpha: gcc optimization could break atomic operations.
+			[RT #19227]
+
+2583.	[port]		netbsd: provide a control to not add the compile
+			date to the version string, -DNO_VERSION_DATE.
+
+2582.	[bug]		Don't emit warning log message when we attempt to
+			remove non-existant journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
 
-	--- 9.4.3-P1 released ---
+2578.	[bug]		Changed default sig-signing-type to 65534, because
+			65535 turns out to be reserved.  [RT #19477]
+
+2499.	[port]		solaris: lib/lwres/getaddrinfo.c namespace clash.
+			[RT #18837]
+
+	--- 9.6.1b1 released ---
+
+2577.	[doc]		Clarified some statistics counters. [RT #19454]
+
+2576.	[bug]		NSEC record were not being correctly signed when
+			a zone transitions from insecure to secure.
+			Handle such incorrectly signed zones. [RT #19114]
+
+2574.	[doc]		Document nsupdate -g and -o. [RT #19351]
+
+2573.	[bug]		Replacing a non-CNAME record with a CNAME record in a
+			single transaction in a signed zone failed. [RT #19397]
+
+2568.	[bug]		Report when the write to indicate a otherwise
+			successful start fails. [RT #19360]
+
+2567.	[bug]		dst__privstruct_writefile() could miss write errors.
+			write_public_key() could miss write errors.
+			dnssec-dsfromkey could miss write errors.
+			[RT #19360]
+
+2564.	[bug]		Only take EDNS fallback steps when processing timeouts.
+			[RT #19405]
+
+2563.	[bug]		Dig could leak a socket causing it to wait forever
+			to exit. [RT #19359]
+
+2562.	[doc]		ARM: miscellaneous improvements, reorganization,
+			and some new content.
+
+2561.	[doc]		Add isc-config.sh(1) man page. [RT #16378]
+
+2560.	[bug]		Add #include  to iptable.c. [RT #18258]
+
+2559.	[bug]		dnssec-dsfromkey could compute bad DS records when
+			reading from a K* files.  [RT #19357]
+
+2557.	[cleanup]	PCI compliance:
+			* new libisc log module file
+			* isc_dir_chroot() now also changes the working
+			  directory to "/".
+			* additional INSISTs
+			* additional logging when files can't be removed.
+
+2556.	[port]		Solaris: mkdir(2) on tmpfs filesystems does not do the
+			error checks in the correct order resulting in the
+			wrong error code sometimes being returned. [RT #19249]
+			
+2554.	[bug]		Validation of uppercase queries from NSEC3 zones could
+			fail. [RT #19297]
+
+2553.	[bug]		Reference leak on DNSSEC validation errors. [RT #19291]
+
+2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+			[RT #19340]
+
+2551.	[bug]		Potential Reference leak on return. [RT #19341]
+
+2550.	[bug]		Check --with-openssl= finds .
+			[RT #19343]
+
+2549.	[port]		linux: define NR_OPEN if not currently defined.
+			[RT #19344]
+
+2548.	[bug]		Install iterated_hash.h. [RT #19335]
+
+2547.	[bug]		openssl_link.c:mem_realloc() could reference an
+			out-of-range area of the source buffer.  New public
+			function isc_mem_reallocate() was introduced to address
+			this bug. [RT #19313]
+
+2545.	[doc]		ARM: Legal hostname checking (check-names) is
+			for SRV RDATA too. [RT #19304]
+
+2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
+
+2543.	[contrib]	Update contrib/zkt to version 0.98. [RT #19113]
+
+2542.	[doc]		Update the description of dig +adflag. [RT #19290]
+
+2541.	[bug]		Conditionally update dispatch manager statistics.
+			[RT #19247]
+
+2539.	[security]	Update the interaction between recursion, allow-query,
+			allow-query-cache and allow-recursion.  [RT #19198]
+
+2538.	[bug]		cache/ADB memory could grow over max-cache-size,
+			especially with threads and smaller max-cache-size
+			values. [RT #19240]
+
+2537.	[experimental]	Added more statistics counters including those on socket
+			I/O events and query RTT histograms. [RT #18802]
+
+2536.	[cleanup]	Silence some warnings when -Werror=format-security is
+			specified. [RT #19083]
+
+2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+
+2532.	[bug]		dig: check the question section of the response to
+			see if it matches the asked question. [RT #18495]
+
+2531.	[bug]		Change #2207 was incomplete. [RT #19098]
+
+2530.	[bug]		named failed to reject insecure to secure transitions
+			via UPDATE. [RT #19101]
+
+2529.	[cleanup]	Upgrade libtool to silence complaints from recent
+			version of autoconf. [RT #18657]
+
+2528.   [cleanup]       Silence spurious configure warning about
+                        --datarootdir [RT #19096]
+
+2527.	[bug]		named could reuse cache on reload with
+			enabling/disabling validation. [RT #19119]
+
+2525.	[experimental]	New logging category "query-errors" to provide detailed
+			internal information about query failures, especially
+			about server failures. [RT #19027]
+
+2524.	[port]		sunos: dnssec-signzone needs strtoul(). [RT #19129]
+
+2523.	[bug]		Random type rdata freed by dns_nsec_typepresent().
+			[RT #19112]
+
+2522.	[security]	Handle -1 from DSA_do_verify() and EVP_VerifyFinal().
+
+2521.	[bug]		Improve epoll cross compilation support. [RT #19047]
+
+2519.	[bug]		dig/host with -4 or -6 didn't work if more than two
+			nameserver addresses of the excluded address family
+			preceded in resolv.conf. [RT #19081]
+
+2517.	[bug]		dig +trace with -4 or -6 failed when it chose a
+			nameserver address of the excluded address.
+			[RT #18843]
+
+2516.	[bug]		glue sort for responses was performed even when not
+			needed. [RT #19039]
+
+2514.	[bug]		dig/host failed with -4 or -6 when resolv.conf contains
+			a nameserver of the excluded address family.
+			[RT #18848]
+
+2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
+			[RT #18885]
+
+2506.	[port]		solaris: Check at configure time if 
+			hack_shutup_pthreadonceinit is needed. [RT #19037]
+
+2505.	[port]		Treat amd64 similarly to x86_64 when determining
+			atomic operation support. [RT #19031]
+
+2503.	[port]		linux: improve compatibility with Linux Standard
+			Base. [RT #18793]
+
+2502.	[cleanup]	isc_radix: Improve compliance with coding style,
+			document function in . [RT #18534]
+
+	--- 9.6.0 released ---
+
+2520.	[bug]		Update xml statistics version number to 2.0 as change
+			#2388 made the schema incompatible to the previous
+			version. [RT #19080]
+
+	--- 9.6.0rc2 released ---
+
+2515.	[port]		win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
+			[RT #19063]
+
+2513	[bug]		Fix windows cli build. [RT #19062]
+
+2510.	[bug]		"dig +sigchase" could trigger REQUIRE failures.
+			[RT #19033]
+
+2509.	[bug]		Specifying a fixed query source port was broken.
+			[RT #19051]
 
-2522.	[security]	Handle -1 from DSA_do_verify().
+2504.	[bug]		Address race condition in the socket code. [RT #18899]
+
+	--- 9.6.0rc1 released ---
 
 2498.	[bug]		Removed a bogus function argument used with
 			ISC_SOCKET_USE_POLLWATCH: it could cause compiler
 			warning or crash named with the debug 1 level
 			of logging. [RT #18917]
 
-	--- 9.4.3 released ---
+2497.	[bug]		Don't add RRSIG bit to NSEC3 bit map for insecure
+			delegation.
+
+2496.	[bug]		Add sanity length checks to NSID option. [RT #18813]
+
+2495.	[bug]		Tighten RRSIG checks. [RT #18795]
+
+2494.	[bug]		isc/radix.h, dns/sdlz.h and dns/dlz.h were not being
+			installed. [RT #18826]
+
+2493.	[bug]		The linux capabilities code was not correctly cleaning
+			up after itself. [RT #18767]
+
+2492.	[func]		Rndc status now reports the number of cpus discovered
+			and the number of worker threads when running
+			multi-threaded. [RT #18273]
+
+2491.	[func]		Attempt to re-use a local port if we are already using
+			the port. [RT #18548]
 
 2490.	[port]		aix: work around a kernel bug where IPV6_RECVPKTINFO
 			is cleared when IPV6_V6ONLY is set. [RT #18785]
@@ -23,7 +263,58 @@
 			Define ISC_SOCKET_USE_POLLWATCH at build time to enable
 			this workaround. [RT #18870]
 
-	--- 9.4.3rc1 released ---
+2488.	[func]		Added a tool, dnssec-dsfromkey, to generate DS records
+			from keyset and .key files. [RT #18694]
+
+2487.	[bug]		Give TCP connections longer to complete. [RT #18675]
+
+2486.	[func]		The default locations for named.pid and lwresd.pid
+			are now /var/run/named/named.pid and
+			/var/run/lwresd/lwresd.pid respectively.
+
+			This allows the owner of the containing directory
+			to be set, for "named -u" support, and allows there
+			to be a permanent symbolic link in the path, for
+			"named -t" support.  [RT #18306]
+
+2485.	[bug]		Change update's the handling of obscured RRSIG
+			records.  Not all orphaned DS records were being
+			removed. [RT #18828]
+
+2484.	[bug]		It was possible to trigger a REQUIRE failure when
+			adding NSEC3 proofs to the response in
+			query_addwildcardproof().  [RT #18828]
+
+2483.	[port]		win32: chroot() is not supported. [RT #18805]
+
+2482.	[port]		libxml2: support versions 2.7.* in addition
+			to 2.6.*. [RT #18806]
+
+	--- 9.6.0b1 released ---
+
+2481.	[bug]		rbtdb.c:matchparams() failed to handle NSEC3 chain
+			collisions.  [RT #18812]
+
+2480.	[bug]		named could fail to emit all the required NSEC3
+			records.  [RT #18812]
+
+2479.	[bug]		xfrout:covers was not properly initialized. [RT #18801]
+
+2478.	[bug]		'addresses' could be used uninitialized in
+			configure_forward(). [RT #18800]
+	
+2477.	[bug]		dig: the global option to print the command line is
+			+cmd not print_cmd.  Update the output to reflect
+			this. [RT #17008]
+
+2476.	[doc]		ARM: improve documentation for max-journal-size and
+			ixfr-from-differences. [RT #15909] [RT #18541]
+
+2475.	[bug]		LRU cache cleanup under overmem condition could purge
+			particular entries more aggressively. [RT #17628]
+
+2474.	[bug]		ACL structures could be allocated with insufficient
+			space, causing an array overrun. [RT #18765]
 
 2473.	[port]		linux: raise the limit on open files to the possible
 			maximum value before spawning threads; 'files'
@@ -33,9 +324,12 @@
 2472.	[port]		linux: check the number of available cpu's before
 			calling chroot as it depends on "/proc". [RT #16923]
 
-2471.	[bug]		named-checkzone was not reporting missing manditory
+2471.	[bug]		named-checkzone was not reporting missing mandatory
 			glue when sibling checks were disabled. [RT #18768]
 
+2470.	[bug]		Elements of the isc_radix_node_t could be incorrectly
+			overwritten.  [RT# 18719]
+
 2469.	[port]		solaris: Work around Solaris's select() limitations.
 			[RT #18769]
 
@@ -50,10 +344,14 @@
 2465.	[bug]		Adb's handling of lame addresses was different
 			for IPv4 and IPv6. [RT #18738]
 
+2464.	[port]		linux: check that a capability is present before
+			trying to set it. [RT #18135]
+
 2463.   [port]          linux: POSIX doesn't include the IPv6 Advanced Socket
 			API and glibc hides parts of the IPv6 Advanced Socket
 			API as a result.  This is stupid as it breaks how the
-			two halves (Basic and Advanced) of the IPv6 Socket API				were designed to be used but we have to live with it.
+			two halves (Basic and Advanced) of the IPv6 Socket API
+			were designed to be used but we have to live with it.
 			Define _GNU_SOURCE to pull in the IPv6 Advanced Socket
 			API. [RT #18388]
 
@@ -62,17 +360,48 @@
 
 2461.	[port]		sunos: Change #2363 was not complete. [RT #17513]
 
+	--- 9.6.0a1 released ---
+
+2460.	[bug]		Don't call dns_db_getnsec3parameters() on the cache.
+			[RT #18697]
+
+2459.	[contrib]	Import dnssec-zkt to contrib/zkt. [RT #18448]
+
 2458.	[doc]		ARM: update and correction for max-cache-size.
 			[RT #18294]
 
-2455.	[bug]		Stop metadata being transfered via axfr/ixfr.
+2457.	[tuning]	max-cache-size is reverted to 0, the previous
+			default.  It should be safe because expired cache
+			entries are also purged. [RT #18684]
+
+2456.	[bug]		In ACLs, ::/0 and 0.0.0.0/0 would both match any
+			address, regardless of family.  They now correctly
+			distinguish IPv4 from IPv6.  [RT #18559]
+                        
+2455.	[bug]		Stop metadata being transferred via axfr/ixfr.
 			[RT #18639]
 
+2454.	[func]		nsupdate: you can now set a default ttl. [RT #18317]
+
 2453.	[bug]		Remove NULL pointer dereference in dns_journal_print().
 			[RT #18316]
 
-2449.	[bug]		libbind: Out of bounds reference in dns_ho.c:addrsort.
-			[RT #18044]
+2452.	[func]		Improve bin/test/journalprint. [RT #18316]
+
+2451.	[port]		solaris: handle runtime linking better. [RT #18356]
+
+2450.	[doc]		Fix lwresd docbook problem for manual page.
+			[RT #18672]
+
+2449.	[placeholder]
+
+2448.	[func]		Add NSEC3 support. [RT #15452]
+
+2447.	[cleanup]	libbind has been split out as a separate product.
+
+2446.	[func]		Add a new log message about build options on startup.
+			A new command-line option '-V' for named is also
+			provided to show this information. [RT# 18645]
 
 2445.	[doc]		ARM out-of-date on empty reverse zones (list includes
 			RFC1918 address, but these are not yet compiled in).
@@ -81,31 +410,46 @@
 2444.	[port]		Linux, FreeBSD, AIX: Turn off path mtu discovery
 			(clear DF) for UDP responses and requests.
 
-	--- 9.4.3b3 released ---
-
 2443.	[bug]		win32: UDP connect() would not generate an event,
 			and so connected UDP sockets would never clean up.
 			Fix this by doing an immediate WSAConnect() rather
 			than an io completion port type for UDP.
 
-2438.	[bug]		Timeouts could be logged incorrectly under win32.
-			[RT #18617]
+2442.	[bug]		A lock could be destroyed twice. [RT# 18626]
+
+2441.   [bug]           isc_radix_insert() could copy radix tree nodes
+			incompletely. [RT #18573]
+
+2440.   [bug]		named-checkconf used an incorrect test to determine
+			if an ACL was set to none.
+
+2439.   [bug]		Potential NULL dereference in dns_acl_isanyornone().
+			[RT #18559]
+
+2438.   [bug]		Timeouts could be logged incorrectly under win32.
 
 2437.	[bug]		Sockets could be closed too early, leading to
 			inconsistent states in the socket module. [RT #18298]
 
 2436.	[security]	win32: UDP client handler can be shutdown. [RT #18576]
 
+2435.	[bug]		Fixed an ACL memory leak affecting win32.
+
+2434.	[bug]		Fixed a minor error-reporting bug in
+			lib/isc/win32/socket.c.
+
 2433.	[tuning]	Set initial timeout to 800ms.
 
-2432.	[bug]		More Windows socket handling improvements.  Stop
+2432.   [bug]		More Windows socket handling improvements.  Stop
 			using I/O events and use IO Completion Ports
 			throughout.  Rewrite the receive path logic to make
 			it easier to support multiple simultaneous
-			requestrs in the future.  Add stricter consistency
+			requesters in the future.  Add stricter consistency
 			checking as a compile-time option (define
 			ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off).
 
+2431.	[bug]		Acl processing could leak memory. [RT #18323]
+
 2430.	[bug]		win32: isc_interval_set() could round down to
 			zero if the input was less than NS_INTERVAL
 			nanoseconds.  Round up instead. [RT #18549]
@@ -113,8 +457,14 @@
 2429.	[doc]		nsupdate should be in section 1 of the man pages.
 			[RT #18283]
 
+2428.	[bug]		dns_iptable_merge() mishandled merges of negative
+			tables. [RT #18409]
+
+2427.	[func]		Treat DNSKEY queries as if "minimal-response yes;"
+			was set. [RT #18528]
+
 2426.	[bug]		libbind: inet_net_pton() can sometimes return the
-			wrong value if excessively large netmasks are
+			wrong value if excessively large net masks are
 			supplied. [RT #18512]
 
 2425.	[bug]		named didn't detect unavailable query source addresses
@@ -125,6 +475,12 @@
 			epoll and /dev/poll to be selected at compile
 			time. [RT #18277]
 			
+2423.   [security]	Randomize server selection on queries, so as to
+                        make forgery a little more difficult.  Instead of
+                        always preferring the server with the lowest RTT,
+                        pick a server with RTT within the same 128
+                        millisecond band.  [RT #18441]
+
 2422.	[bug]		Handle the special return value of a empty node as
 			if it was a NXRRSET in the validator. [RT #18447]
 
@@ -133,13 +489,20 @@
 			Use caution: this option may not work for some
 			operating systems without rebuilding named.
 
-2420.	[bug]		Windows socket handling cleanup.  Let the io
-			completion event send out cancelled read/write
-			done events, which keeps us from writing to memeory
+2420.   [bug]		Windows socket handling cleanup.  Let the io
+			completion event send out canceled read/write
+			done events, which keeps us from writing to memory
 			we no longer have ownership of.  Add debugging
 			socket_log() function.  Rework TCP socket handling
 			to not leak sockets.
 
+2419.	[cleanup]	Document that isc_socket_create() and isc_socket_open()
+			should not be used for isc_sockettype_fdwatch sockets.
+			[RT #18521]
+
+2418.	[bug]		AXFR request on a DLZ could trigger a REQUIRE failure
+			[RT #18430]
+
 2417.	[bug]		Connecting UDP sockets for outgoing queries could
 			unexpectedly fail with an 'address already in use'
 			error. [RT #18411]
@@ -147,26 +510,42 @@
 2416.	[func]		Log file descriptors that cause exceeding the
 			internal maximum. [RT #18460]
 
+2415.	[bug]		'rndc dumpdb' could trigger various assertion failures
+			in rbtdb.c. [RT #18455]
+
 2414.	[bug]		A masterdump context held the database lock too long,
 			causing various troubles such as dead lock and
 			recursive lock acquisition. [RT #18311, #18456]
 
 2413.	[bug]		Fixed an unreachable code path in socket.c. [RT #18442]
 
-2412.	[bug]		win32: address a resourse leak. [RT #18374]
+2412.	[bug]		win32: address a resource leak. [RT #18374]
 
 2411.	[bug]		Allow using a larger number of sockets than FD_SETSIZE
 			for select().  To enable this, set ISC_SOCKET_MAXSOCKETS
 			at compilation time.  [RT #18433]
 
+			Note: with changes #2469 and #2421 above, there is no
+			need to tweak ISC_SOCKET_MAXSOCKETS at compilation time
+			any more.
+
 2410.	[bug]		Correctly delete m_versionInfo. [RT #18432]
 
+2409.	[bug]		Only log that we disabled EDNS processing if we were
+			subsequently successful.  [RT #18029]
+
 2408.	[bug]		A duplicate TCP dispatch event could be sent, which
 			could then trigger an assertion failure in
 			resquery_response().  [RT #18275]
 
 2407.	[port]		hpux: test for sys/dyntune.h. [RT #18421]
 
+2406.	[placeholder]
+
+2405.   [cleanup]       The default value for dnssec-validation was changed to
+                        "yes" in 9.5.0-P1 and all subsequent releases; this
+                        was inadvertently omitted from CHANGES at the time.
+
 2404.	[port]		hpux: files unlimited support.
 
 2403.	[bug]		TSIG context leak. [RT #18341]
@@ -176,13 +555,17 @@
 2401.	[bug]		Expect to get E[MN]FILE errno internal_accept()
 			(from accept() or fcntl() system calls). [RT #18358]
 
-2399.	[bug]		Abort timeout queries to reduce the number of open
-			UDP sockets. [RT #18367]
+2400.	[bug]		Log if kqueue()/epoll_create()/open(/dev/poll) fails.
+			[RT #18297]
+
+2399.	[placeholder]
 
 2398.	[bug]           Improve file descriptor management.  New,
 			temporary, named.conf option reserved-sockets,
 			default 512. [RT #18344]
 
+2397.	[bug]		gssapi_functions had too many elements. [RT #18355]
+
 2396.	[bug]		Don't set SO_REUSEADDR for randomized ports.
 			[RT #18336]
 
@@ -193,35 +576,42 @@
 			open files to 'unlimited' as described in the
 			documentation. [RT #18331]
 
+2393.	[bug]		nested acls containing keys could trigger an
+			assertion in acl.c. [RT #18166]
+
 2392.	[bug]		remove 'grep -q' from acl test script, some platforms
 			don't support it. [RT #18253]
 
-2391	[port]		hpux: cover additional recvmsg() error codes.
+2391.	[port]		hpux: cover additional recvmsg() error codes.
 			[RT #18301]
 
-2390	[bug]		dispatch.c could make a false warning on 'odd socket'.
+2390.	[bug]		dispatch.c could make a false warning on 'odd socket'.
 			[RT #18301].
 
-2389	[bug]		Move the "working directory writable" check to after
+2389.	[bug]		Move the "working directory writable" check to after
 			the ns_os_changeuser() call. [RT #18326]
 
+2388.	[bug]		Avoid using tables for layout purposes in
+			statistics XSL [RT #18159].
+
+2387.	[bug]		Silence compiler warnings in lib/isc/radix.c.

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