From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 03:53:28 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10674106575C; Sun, 28 Feb 2010 03:53:28 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0064E8FC12; Sun, 28 Feb 2010 03:53:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1S3rRCP063453; Sun, 28 Feb 2010 03:53:27 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1S3rRSL063449; Sun, 28 Feb 2010 03:53:27 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201002280353.o1S3rRSL063449@svn.freebsd.org> From: Juli Mallett Date: Sun, 28 Feb 2010 03:53:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204439 - in user/jmallett/octeon: gnu/lib/libgcc lib/libc lib/libc/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 03:53:28 -0000 Author: jmallett Date: Sun Feb 28 03:53:27 2010 New Revision: 204439 URL: http://svn.freebsd.org/changeset/base/204439 Log: Go back to using libgcc softfloat rather than libc softfloat since we need tfloat functions and libc doesn't provide them. I'm probably just setting something wrong. Maybe we just need SOFTFLOAT_BITS=64? This would seem to be enough for further experimentation. Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile user/jmallett/octeon/lib/libc/Makefile user/jmallett/octeon/lib/libc/mips/Makefile.inc Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/libgcc/Makefile Sun Feb 28 01:25:12 2010 (r204438) +++ user/jmallett/octeon/gnu/lib/libgcc/Makefile Sun Feb 28 03:53:27 2010 (r204439) @@ -90,6 +90,11 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsu _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \ _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf +.if ${TARGET_ARCH} == "mips" +FPBIT_FUNCS += _sf_to_tf +DPBIT_FUNCS += _df_to_tf +.endif + # These might cause a divide overflow trap and so are compiled with # unwinder info. LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 @@ -116,7 +121,8 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns .endif .if ${TARGET_ARCH} == "mips" -LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c +CFLAGS+= -D__LDBL_MANT_DIG__=113 +#LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c .endif .if ${TARGET_ARCH} == "ia64" @@ -183,7 +189,7 @@ OBJ_GRPS = STD DIV # # Floating point emulation functions # -.if ${TARGET_ARCH} == "armNOT_YET" || \ +.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \ ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT @@ -195,6 +201,14 @@ DPBIT_CFILE = config/fp-bit.c OBJ_GRPS += FPBIT DPBIT .endif +.if ${TARGET_ARCH} == "mips" +TPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DTFLOAT + +TPBIT_CFILE = config/fp-bit.c + +OBJ_GRPS += TPBIT +.endif + #----------------------------------------------------------------------- # # Generic build rules for object groups defined above Modified: user/jmallett/octeon/lib/libc/Makefile ============================================================================== --- user/jmallett/octeon/lib/libc/Makefile Sun Feb 28 01:25:12 2010 (r204438) +++ user/jmallett/octeon/lib/libc/Makefile Sun Feb 28 03:53:27 2010 (r204439) @@ -64,7 +64,7 @@ NOASM= .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" +.if ${MACHINE_ARCH} == "arm" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" Modified: user/jmallett/octeon/lib/libc/mips/Makefile.inc ============================================================================== --- user/jmallett/octeon/lib/libc/mips/Makefile.inc Sun Feb 28 01:25:12 2010 (r204438) +++ user/jmallett/octeon/lib/libc/mips/Makefile.inc Sun Feb 28 03:53:27 2010 (r204439) @@ -1,9 +1,5 @@ # $NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $ # $FreeBSD$ -SOFTFLOAT_BITS=32 - -CFLAGS+=-DSOFTFLOAT - MDSRCS+= machdep_ldisd.c SYM_MAPS+= ${.CURDIR}/mips/Symbol.map From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 04:10:26 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3C66106564A; Sun, 28 Feb 2010 04:10:26 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D48898FC13; Sun, 28 Feb 2010 04:10:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1S4AQbJ067202; Sun, 28 Feb 2010 04:10:26 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1S4AQFB067200; Sun, 28 Feb 2010 04:10:26 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201002280410.o1S4AQFB067200@svn.freebsd.org> From: Juli Mallett Date: Sun, 28 Feb 2010 04:10:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204440 - user/jmallett/octeon/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 04:10:27 -0000 Author: jmallett Date: Sun Feb 28 04:10:26 2010 New Revision: 204440 URL: http://svn.freebsd.org/changeset/base/204440 Log: Reduce differences with n32 kernel. The .text change wrt . fixes entry point setting. Modified: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64 Modified: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64 ============================================================================== --- user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64 Sun Feb 28 03:53:27 2010 (r204439) +++ user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64 Sun Feb 28 04:10:26 2010 (r204440) @@ -2,23 +2,19 @@ TARGET(elf64-tradbigmips) OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips") OUTPUT_ARCH(mips) ENTRY(_start) -/* __DYNAMIC = 0; + __DYNAMIC = 0; PROVIDE (_DYNAMIC = 0); -*/ -PHDRS { - text PT_LOAD FLAGS ( 5 ) ; -} SECTIONS { . = KERNLOADADDR + SIZEOF_HEADERS; - .text _start : { + .text . : { *(.text) - /*(.dynamic)*/ + *(.dynamic) etext = .; _etext = .; . = ALIGN(0x2000); - } : text + } .rodata ALIGN(0x2000) : { _fdata = .; From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 04:12:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08533106566B; Sun, 28 Feb 2010 04:12:30 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED94D8FC0A; Sun, 28 Feb 2010 04:12:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1S4CTJP067718; Sun, 28 Feb 2010 04:12:29 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1S4CTgZ067716; Sun, 28 Feb 2010 04:12:29 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002280412.o1S4CTgZ067716@svn.freebsd.org> From: Doug Barton Date: Sun, 28 Feb 2010 04:12:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204441 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 04:12:30 -0000 Author: dougb Date: Sun Feb 28 04:12:29 2010 New Revision: 204441 URL: http://svn.freebsd.org/changeset/base/204441 Log: Improve --index support to a functional version: 1. Move the file priming code up above where it is needed for the -L option 2. Add parse_index() to pull out the specified bit of data 3. Start using the data from the index in check_for_updates() to prove that something needs updating. In other news: Add -m 1 to those grep invocations that can/do involve large files when there is only one possible match Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Feb 28 04:10:26 2010 (r204440) +++ user/dougb/portmaster/portmaster Sun Feb 28 04:12:29 2010 (r204441) @@ -473,6 +473,42 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then [ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] && fail Package installation support requires FreeBSD 6.4 or newer fi + +# XXX + if [ -n "$PM_INDEX" ]; then + pm_cd_pd + if [ -z "$FETCHINDEX" ]; then + FETCHINDEX=`pm_make_b -V FETCHINDEX` + [ -n "$FETCHINDEX" ] || + fail 'The value of FETCHINDEX cannot be empty' + fi + if [ -z "$MASTER_SITE_INDEX" ]; then + MASTER_SITE_INDEX=`pm_make_b -V MASTER_SITE_INDEX` + [ -n "$MASTER_SITE_INDEX" ] || + fail 'The value of MASTER_SITE_INDEX cannot be empty' + fi + if [ -z "$INDEXDIR" ]; then + INDEXDIR=`pm_make_b -V INDEXDIR` + [ -n "$INDEXDIR" ] || + fail 'The value of INDEXDIR cannot be empty' + fi + if [ -z "$INDEXFILE" ]; then + INDEXFILE=`pm_make_b -V INDEXFILE` + [ -n "$INDEXFILE" ] || + fail 'The value of INDEXFILE cannot be empty' + fi + + PM_INDEX="${INDEXDIR}/${INDEXFILE}" + + [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Updating INDEX file" + $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 + temp_index=`pm_mktemp index` + bunzip2 < ${PM_INDEX}.bz2 > $temp_index + pm_install_s $temp_index $PM_INDEX + + unlink $temp_index + unset temp_index + fi fi set -- $newopts @@ -492,7 +528,7 @@ iport_from_origin () { origin_from_pdb () { local o - o=`grep '@comment ORIGIN:' $pdb/$1/+CONTENTS 2>/dev/null` + o=`grep -m1 '@comment ORIGIN:' $pdb/$1/+CONTENTS 2>/dev/null` echo ${o#@comment ORIGIN:} } @@ -1004,6 +1040,26 @@ check_state () { return 0 } +# XXX + +parse_index () { + local line + + line=`grep -m1 .*\|${pd}/${1}\|.* $PM_INDEX` + + case "$2" in + name) echo ${line%%|*} ;; + localbase) echo $line | cut -f 3 -d\| ;; + comment) echo $line | cut -f 4 -d\| ;; + descr) echo $line | cut -f 5 -d\| ;; + maintainer) echo $line | cut -f 6 -d\| ;; + category) echo $line | cut -f 7 -d\| ;; + b-deps) echo $line | cut -f 8 -d\| ;; + r-deps) echo $line | cut -f 9 -d\| ;; + www) echo $line | cut -f 10 -d\| ;; + esac +} + check_for_updates () { # Global: num_updates local list_only nf iport origin port_ver udf do_update @@ -1024,8 +1080,20 @@ check_for_updates () { fi return 0 fi +# XXX + + if [ -n "$PM_INDEX" ]; then + port_ver=`parse_index $origin name` - if [ -d "$pd/$origin" ]; then + case `pkg_version -t $iport $port_ver` in + \<) do_update=update_index +#echo ''; echo "Debug> Found one from the INDEX!"; echo '' + ;; + =) ;; # Potential future use + esac + fi + + if [ -d "$pd/$origin" -a -z "$do_update" ]; then if ! pm_cd $pd/$origin; then if [ -e "$pdb/$iport/+IGNOREME" ]; then echo " ===>>> Warning: Unable to cd to $pd/$origin" @@ -1088,7 +1156,7 @@ check_for_updates () { fi ;; esac fi - else + elif [ -z "$do_update" ]; then find_moved_port $origin $iport $nf # If the port has moved, we have to update it, otherwise ignore @@ -2214,42 +2282,6 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S export DI_FILES=`pm_mktemp DI-FILES` fi -# XXX - if [ -n "$PM_INDEX" ]; then - pm_cd_pd - if [ -z "$FETCHINDEX" ]; then - FETCHINDEX=`pm_make_b -V FETCHINDEX` - [ -n "$FETCHINDEX" ] || - fail 'The value of FETCHINDEX cannot be empty' - fi - if [ -z "$MASTER_SITE_INDEX" ]; then - MASTER_SITE_INDEX=`pm_make_b -V MASTER_SITE_INDEX` - [ -n "$MASTER_SITE_INDEX" ] || - fail 'The value of MASTER_SITE_INDEX cannot be empty' - fi - if [ -z "$INDEXDIR" ]; then - INDEXDIR=`pm_make_b -V INDEXDIR` - [ -n "$INDEXDIR" ] || - fail 'The value of INDEXDIR cannot be empty' - fi - if [ -z "$INDEXFILE" ]; then - INDEXFILE=`pm_make_b -V INDEXFILE` - [ -n "$INDEXFILE" ] || - fail 'The value of INDEXFILE cannot be empty' - fi - - PM_INDEX="${INDEXDIR}/${INDEXFILE}" - export PM_INDEX - - [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Updating INDEX file" - $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 - temp_index=`pm_mktemp index` - bunzip2 < ${PM_INDEX}.bz2 > $temp_index - pm_install_s $temp_index $i - - unset temp_index - fi - if [ $# -gt 1 -a -z "$REPLACE_ORIGIN" ]; then multiport $@ fi @@ -2790,7 +2822,7 @@ fetch_package () { fi for s in ${new_port%\.*} ${new_port%%\.*} ${new_port%-*}; do - latest_pv=`grep "href=\"${s}" $dirlist` + latest_pv=`grep -m1 "href=\"${s}" $dirlist` [ -n "$latest_pv" ] && break done fi From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 20:36:25 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9339D106566B; Sun, 28 Feb 2010 20:36:25 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 692848FC13; Sun, 28 Feb 2010 20:36:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1SKaPq1085764; Sun, 28 Feb 2010 20:36:25 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1SKaPUI085762; Sun, 28 Feb 2010 20:36:25 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201002282036.o1SKaPUI085762@svn.freebsd.org> From: Edwin Groothuis Date: Sun, 28 Feb 2010 20:36:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 20:36:25 -0000 Author: edwin Date: Sun Feb 28 20:36:24 2010 New Revision: 204479 URL: http://svn.freebsd.org/changeset/base/204479 Log: Do some work on ncal while we're at it. Added: - copied from r204478, head/usr.bin/ncal/ Directory Properties: user/edwin/ncal/ (props changed) From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 20:51:11 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC32D1065678; Sun, 28 Feb 2010 20:51:11 +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 62D578FC13; Sun, 28 Feb 2010 20:51:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id E9B2D9CB0A6; Sun, 28 Feb 2010 21:50:07 +0100 (CET) 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 QfYUmixnGINF; Sun, 28 Feb 2010 21:50:05 +0100 (CET) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 835FD9CB1FB; Sun, 28 Feb 2010 21:50:05 +0100 (CET) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id o1SKo58S004104; Sun, 28 Feb 2010 21:50:05 +0100 (CET) (envelope-from rdivacky) Date: Sun, 28 Feb 2010 21:50:05 +0100 From: Roman Divacky To: Edwin Groothuis Message-ID: <20100228205005.GA4003@freebsd.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201002282036.o1SKaPUI085762@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 20:51:11 -0000 On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: > Author: edwin > Date: Sun Feb 28 20:36:24 2010 > New Revision: 204479 > URL: http://svn.freebsd.org/changeset/base/204479 > > Log: > Do some work on ncal while we're at it. I have a patch that implementes "cal -3" are you interested in it? From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 21:54:16 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FC8E1065676; Sun, 28 Feb 2010 21:54:16 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1F2D68FC13; Sun, 28 Feb 2010 21:54:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1SLsGwU003649; Sun, 28 Feb 2010 21:54:16 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1SLsFKq003647; Sun, 28 Feb 2010 21:54:15 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002282154.o1SLsFKq003647@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 28 Feb 2010 21:54:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204487 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 21:54:16 -0000 Author: luigi Date: Sun Feb 28 21:54:15 2010 New Revision: 204487 URL: http://svn.freebsd.org/changeset/base/204487 Log: clear the right variable after freeing Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Sun Feb 28 21:45:00 2010 (r204486) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Sun Feb 28 21:54:15 2010 (r204487) @@ -1798,7 +1798,7 @@ dummynet_get(struct sockopt *sopt, void DN_BH_WUNLOCK(); if (start) free(start, M_DUMMYNET); - buf = NULL; + start = NULL; if (need > sopt_valsize) break; have = need; From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 22:18:10 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA720106564A; Sun, 28 Feb 2010 22:18:10 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from k7.mavetju.org (ppp113-58.static.internode.on.net [150.101.113.58]) by mx1.freebsd.org (Postfix) with ESMTP id 877DE8FC19; Sun, 28 Feb 2010 22:18:10 +0000 (UTC) Received: by k7.mavetju.org (Postfix, from userid 1001) id AD8664517C; Mon, 1 Mar 2010 09:16:53 +1100 (EST) Date: Mon, 1 Mar 2010 09:16:53 +1100 From: Edwin Groothuis To: Roman Divacky Message-ID: <20100228221653.GA2682@mavetju.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> <20100228205005.GA4003@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100228205005.GA4003@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 22:18:10 -0000 On Sun, Feb 28, 2010 at 09:50:05PM +0100, Roman Divacky wrote: > On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: > > Author: edwin > > Date: Sun Feb 28 20:36:24 2010 > > New Revision: 204479 > > URL: http://svn.freebsd.org/changeset/base/204479 > > > > Log: > > Do some work on ncal while we're at it. > > I have a patch that implementes "cal -3" are you interested in it? Sure. What does it do? :-) Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ edwin@mavetju.org Weblog: http://www.mavetju.org/weblog/ From owner-svn-src-user@FreeBSD.ORG Sun Feb 28 22:33:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE18106566C; Sun, 28 Feb 2010 22:33:54 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AD148FC12; Sun, 28 Feb 2010 22:33:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1SMXr41012601; Sun, 28 Feb 2010 22:33:53 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1SMXr3j012598; Sun, 28 Feb 2010 22:33:53 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201002282233.o1SMXr3j012598@svn.freebsd.org> From: Edwin Groothuis Date: Sun, 28 Feb 2010 22:33:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204492 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2010 22:33:54 -0000 Author: edwin Date: Sun Feb 28 22:33:53 2010 New Revision: 204492 URL: http://svn.freebsd.org/changeset/base/204492 Log: Fix this enhancement: bin/144329: [request] cal(1) not highlightening today in year mode Modified: user/edwin/ncal/ncal.1 user/edwin/ncal/ncal.c Modified: user/edwin/ncal/ncal.1 ============================================================================== --- user/edwin/ncal/ncal.1 Sun Feb 28 22:25:39 2010 (r204491) +++ user/edwin/ncal/ncal.1 Sun Feb 28 22:33:53 2010 (r204492) @@ -109,6 +109,12 @@ Britain and her colonies switched to the Print the number of the week below each week column. .It Fl y Display a calendar for the specified year. +.It Fl b +Switch to backwards compatibility mode (for debugging). +.It Fl d Ar yyyy-mm-dd +Use +.Ar yyyy-mm-dd +as the current date (for debugging of highlighting). .El .Pp A single parameter specifies the year (1\(en9999) to be displayed; @@ -116,12 +122,13 @@ note the year must be fully specified: .Dq Li cal 89 will .Em not -display a calendar for 1989. -Two parameters denote the month and year; the month is either a number between -1 and 12, or a full or abbreviated name as specified by the current locale. -Month and year default to those of the current system clock and time zone (so +display a calendar for 1989. Two parameters denote the month and +year; the month is either a number between 1 and 12, or a full or +abbreviated name as specified by the current locale. Month and +year default to those of the current system clock and time zone (so .Dq Li cal -m 8 -will display a calendar for the month of August in the current year). +will display a calendar for the month of August in the current +year). .Pp A year starts on January 1. .Sh SEE ALSO @@ -142,5 +149,5 @@ The command and manual were written by .An Wolfgang Helbig Aq helbig@FreeBSD.org . .Sh BUGS -The assignment of Julian\(enGregorian switching dates to -country codes is historically naive for many countries. +The assignment of Julian\(enGregorian switching dates to country +codes is historically naive for many countries. Modified: user/edwin/ncal/ncal.c ============================================================================== --- user/edwin/ncal/ncal.c Sun Feb 28 22:25:39 2010 (r204491) +++ user/edwin/ncal/ncal.c Sun Feb 28 22:33:53 2010 (r204492) @@ -60,6 +60,7 @@ struct monthlines { wchar_t name[MAX_WIDTH + 1]; char lines[7][MAX_WIDTH + 1]; char weeks[MAX_WIDTH + 1]; + int linelen[7]; }; struct weekdays { @@ -202,6 +203,7 @@ main(int argc, char *argv[]) int flag_easter = 0; /* use wants easter date */ char *cp; /* character pointer */ char *flag_month = NULL; /* requested month as string */ + char *flag_date = NULL; const char *locale; /* locale to get country code */ char tbuf[1024], cbuf[512], *b; time_t t; @@ -263,7 +265,7 @@ main(int argc, char *argv[]) if (flag_backward) nswitchb = ndaysj(&ukswitch); - while ((ch = getopt(argc, argv, "Jehjm:ops:wy")) != -1) + while ((ch = getopt(argc, argv, "Jbd:ehjm:ops:wy")) != -1) switch (ch) { case 'J': if (flag_backward) @@ -271,6 +273,12 @@ main(int argc, char *argv[]) nswitch = ndaysj(&never); flag_julian_cal = 1; break; + case 'b': + flag_backward = 1; + break; + case 'd': + flag_date = optarg; + break; case 'h': term_so = term_se = NULL; break; @@ -359,11 +367,19 @@ main(int argc, char *argv[]) } } + if (flag_date != NULL) { + date dt; /* handy date */ + + dt.y = strtol(flag_date, NULL, 10); + dt.m = strtol(flag_date + 5, NULL, 10); + dt.d = strtol(flag_date + 8, NULL, 10); + + today = sndaysb(&dt); + } + if (flag_easter) printeaster(y, flag_julian_cal, flag_orthodox); else if (argc == 1 || flag_hole_year) { - /* disable the highlight for now */ - today = 0; if (flag_backward) printyearb(y, flag_julian_day); else @@ -385,7 +401,9 @@ usage(void) "usage: cal [-hjy] [[month] year]\n" " cal [-hj] [-m month] [year]\n" " ncal [-hJjpwy] [-s country_code] [[month] year]\n" - " ncal [-hJeo] [year]\n", stderr); + " ncal [-hJeo] [year]\n" + "for debug the highlighting: [-b] [-d yyyy-mm-dd]\n", + stderr); exit(EX_USAGE); } @@ -512,6 +530,9 @@ printyear(int y, int jd_flag) sprintf(s, "%d", y); printf("%s\n", center(t, s, mpl * mw)); +#define MW(mw, ms, ml) \ + strlen(ms) > (ml) ? (mw) + 9 : (mw) + for (j = 0; j != 12; j += mpl) { wprintf(L" %-*ls%-*ls", mw, year[j].name, @@ -523,16 +544,19 @@ printyear(int y, int jd_flag) mw, year[j + 2].name, year[j + 3].name); for (i = 0; i != 7; i++) { - wprintf(L"%.2ls%-*s%-*s", + wprintf(L"%.2ls%-*s%-*s%-*s", wds.names[i], - mw, year[j].lines[i], - mw, year[j + 1].lines[i]); - if (mpl == 3) - printf("%s\n", year[j + 2].lines[i]); - else - printf("%-*s%s\n", - mw, year[j + 2].lines[i], - year[j + 3].lines[i]); + MW(mw, year[j].lines[i], year[j].linelen[i]), + year[j].lines[i], + MW(mw, year[j + 1].lines[i], + year[j + 1].linelen[i]), + year[j + 1].lines[i], + MW(mw, year[j + 2].lines[i], + year[j + 2].linelen[i]), + year[j + 2].lines[i]); + if (mpl == 4) + printf("%s", year[j + 3].lines[i]); + printf("\n"); } if (flag_weeks) { if (mpl == 3) @@ -706,7 +730,7 @@ mkmonth(int y, int m, int jd_flag, struc memcpy(mlines->lines[i] + k + l, " ", dw); } mlines->lines[i][k + l] = '\0'; - + mlines->linelen[i] = k; } /* fill the weeknumbers */ From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 02:52:37 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB748106566C; Mon, 1 Mar 2010 02:52:37 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A0B508FC16; Mon, 1 Mar 2010 02:52:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o212qbtF069728; Mon, 1 Mar 2010 02:52:37 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o212qbPJ069726; Mon, 1 Mar 2010 02:52:37 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010252.o212qbPJ069726@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 02:52:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204500 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 02:52:37 -0000 Author: jmallett Date: Mon Mar 1 02:52:37 2010 New Revision: 204500 URL: http://svn.freebsd.org/changeset/base/204500 Log: Add much-needed volatile. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Mon Mar 1 00:46:45 2010 (r204499) +++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Mon Mar 1 02:52:37 2010 (r204500) @@ -94,19 +94,19 @@ extern struct pcpu *cpuid_to_pcpu[]; static inline void oct_write64 (uint64_t csr_addr, uint64_t val64) { - uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; *ptr = val64; } static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i) { - int64_t *ptr = (int64_t *)(intptr_t)csr_addr; + volatile int64_t *ptr = (volatile int64_t *)(intptr_t)csr_addr; *ptr = val64i; } static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8) { - uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; *ptr = (uint64_t) val8; } @@ -127,32 +127,32 @@ static inline void oct_write32 (uint64_t static inline uint8_t oct_read8 (uint64_t csr_addr) { - uint8_t *ptr = (uint8_t *)(intptr_t)csr_addr; + volatile uint8_t *ptr = (volatile uint8_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint8_t oct_read16 (uint64_t csr_addr) { - uint16_t *ptr = (uint16_t *)(intptr_t)csr_addr; + volatile uint16_t *ptr = (volatile uint16_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint32_t oct_read32 (uint64_t csr_addr) { - uint32_t *ptr = (uint32_t *)(intptr_t)csr_addr; + volatile uint32_t *ptr = (volatile uint32_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint64_t oct_read64 (uint64_t csr_addr) { - uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; return (*ptr); } static inline int32_t oct_readint32 (uint64_t csr_addr) { - int32_t *ptr = (int32_t *)(intptr_t)csr_addr; + volatile int32_t *ptr = (volatile int32_t *)(intptr_t)csr_addr; return (*ptr); } From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 03:24:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2620106564A; Mon, 1 Mar 2010 03:24:56 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D21B58FC08; Mon, 1 Mar 2010 03:24:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o213Ouq5077042; Mon, 1 Mar 2010 03:24:56 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o213Oues077038; Mon, 1 Mar 2010 03:24:56 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010324.o213Oues077038@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 03:24:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204501 - user/jmallett/octeon/sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 03:24:57 -0000 Author: jmallett Date: Mon Mar 1 03:24:56 2010 New Revision: 204501 URL: http://svn.freebsd.org/changeset/base/204501 Log: o) Fix size_t and ssize_t max values for n64. o) Don't define MIPS_MAX_MEM_ADDR and MIPS_RESERVED_ADDR in two places. o) Try to correctly define the kseg addresses for both 32-bit and 64-bit systems. Ugly :( Modified: user/jmallett/octeon/sys/mips/include/_limits.h user/jmallett/octeon/sys/mips/include/cpu.h user/jmallett/octeon/sys/mips/include/cpuregs.h Modified: user/jmallett/octeon/sys/mips/include/_limits.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/_limits.h Mon Mar 1 02:52:37 2010 (r204500) +++ user/jmallett/octeon/sys/mips/include/_limits.h Mon Mar 1 03:24:56 2010 (r204501) @@ -76,9 +76,9 @@ #define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ #define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ -#define __SSIZE_MAX __INT_MAX /* max value for a ssize_t */ +#define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ -#define __SIZE_T_MAX __UINT_MAX /* max value for a size_t */ +#define __SIZE_T_MAX __ULONG_MAX /* max value for a size_t */ #define __OFF_MAX __LLONG_MAX /* max value for an off_t */ #define __OFF_MIN __LLONG_MIN /* min value for an off_t */ Modified: user/jmallett/octeon/sys/mips/include/cpu.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/cpu.h Mon Mar 1 02:52:37 2010 (r204500) +++ user/jmallett/octeon/sys/mips/include/cpu.h Mon Mar 1 03:24:56 2010 (r204501) @@ -52,8 +52,6 @@ #define MIPS_CACHED_MEMORY_ADDR 0x80000000 #define MIPS_UNCACHED_MEMORY_ADDR 0xa0000000 -#define MIPS_MAX_MEM_ADDR 0xbe000000 -#define MIPS_RESERVED_ADDR 0xbfc80000 #define MIPS_KSEG0_LARGEST_PHYS 0x20000000 #define MIPS_CACHED_TO_PHYS(x) ((uintptr_t)(x) & 0x1fffffff) Modified: user/jmallett/octeon/sys/mips/include/cpuregs.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/cpuregs.h Mon Mar 1 02:52:37 2010 (r204500) +++ user/jmallett/octeon/sys/mips/include/cpuregs.h Mon Mar 1 03:24:56 2010 (r204501) @@ -78,19 +78,30 @@ * Caching of mapped addresses is controlled by bits in the TLB entry. */ +#if defined(_LOCORE) || defined(LOCORE) +#ifdef __mips_n64 +#define KSEG_ADDRESS(x) __CONCAT(0xffffffff, x) +#else +#define KSEG_ADDRESS(x) __CONCAT(0x, x) +#endif +#else +#define KSEG_ADDRESS(x) ((intptr_t)(int32_t)__CONCAT(0x, x)) +#endif + #define MIPS_KUSEG_START 0x0 -#define MIPS_KSEG0_START 0x80000000 -#define MIPS_KSEG0_END 0x9fffffff -#define MIPS_KSEG1_START 0xa0000000 -#define MIPS_KSEG1_END 0xbfffffff -#define MIPS_KSSEG_START 0xc0000000 -#define MIPS_KSSEG_END 0xdfffffff +#define MIPS_KSEG0_START KSEG_ADDRESS(80000000) +#define MIPS_KSEG0_END KSEG_ADDRESS(9fffffff) +#define MIPS_KSEG1_START KSEG_ADDRESS(a0000000) +#define MIPS_KSEG1_END KSEG_ADDRESS(bfffffff) +#define MIPS_KSSEG_START KSEG_ADDRESS(c0000000) +#define MIPS_KSSEG_END KSEG_ADDRESS(dfffffff) +#define MIPS_KSEG3_START KSEG_ADDRESS(e0000000) +#define MIPS_KSEG3_END KSEG_ADDRESS(ffffffff) +#define MIPS_MAX_MEM_ADDR KSEG_ADDRESS(be000000) +#define MIPS_RESERVED_ADDR KSEG_ADDRESS(bfc80000) + #define MIPS_KSEG2_START MIPS_KSSEG_START #define MIPS_KSEG2_END MIPS_KSSEG_END -#define MIPS_KSEG3_START 0xe0000000 -#define MIPS_KSEG3_END 0xffffffff -#define MIPS_MAX_MEM_ADDR 0xbe000000 -#define MIPS_RESERVED_ADDR 0xbfc80000 /* Map virtual address to index in mips3 r4k virtually-indexed cache */ #define MIPS3_VA_TO_CINDEX(x) \ From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 03:36:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC2E01065670; Mon, 1 Mar 2010 03:36:59 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AC0898FC08; Mon, 1 Mar 2010 03:36:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o213ax3o079689; Mon, 1 Mar 2010 03:36:59 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o213axuP079686; Mon, 1 Mar 2010 03:36:59 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010336.o213axuP079686@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 03:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204502 - user/jmallett/octeon/sys/mips/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 03:36:59 -0000 Author: jmallett Date: Mon Mar 1 03:36:59 2010 New Revision: 204502 URL: http://svn.freebsd.org/changeset/base/204502 Log: o) Change my configurations. o) Load the 64-bit kernel at the same address as the n32 one. Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1 Mon Mar 1 03:24:56 2010 (r204501) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1 Mon Mar 1 03:36:59 2010 (r204502) @@ -35,7 +35,8 @@ makeoptions LDSCRIPT_NAME=ldscript.mips. makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined makeoptions TARGET_64BIT=defined -makeoptions KERNLOADADDR=0xffffffff80100000 + +makeoptions KERNLOADADDR=0xffffffff81000000 include "../cavium/std.octeon1" @@ -52,12 +53,16 @@ options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -78,14 +83,14 @@ device ether device md device uart nodevice uart_ns8250 -device rgmii -#options VERBOSE_SYSINIT +device rgmii +options VERBOSE_SYSINIT # # Use the following for Compact Flash file-system device cf -options ROOTDEVNAME = \"ufs:cf0s2\" # Unmask if compact flash is needed as RFS +#options ROOTDEVNAME = \"ufs:cf0s2\" # Unmask if compact flash is needed as RFS # # Use the following for RFS in mem-device Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Mon Mar 1 03:24:56 2010 (r204501) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Mon Mar 1 03:36:59 2010 (r204502) @@ -25,9 +25,11 @@ ident OCTEON1 makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined makeoptions TARGET_N32=defined +makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.n32 makeoptions KERNLOADADDR=0xffffffff81000000 + include "../cavium/std.octeon1" hints "OCTEON1.hints" #Default places to look for devices. @@ -35,7 +37,6 @@ hints "OCTEON1.hints" #Default places makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options ISA_MIPS64 -makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" options DDB options KDB @@ -43,12 +44,16 @@ options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -69,14 +74,14 @@ device ether device md device uart nodevice uart_ns8250 -device rgmii -#options VERBOSE_SYSINIT +device rgmii +options VERBOSE_SYSINIT # # Use the following for Compact Flash file-system device cf -options ROOTDEVNAME=\"ufs:cf0s1\" +#options ROOTDEVNAME=\"ufs:cf0s1\" # # Use the following for RFS in mem-device From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 03:37:38 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 598B71065672; Mon, 1 Mar 2010 03:37:38 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 48E1B8FC18; Mon, 1 Mar 2010 03:37:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o213bcu0079861; Mon, 1 Mar 2010 03:37:38 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o213bcRn079857; Mon, 1 Mar 2010 03:37:38 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010337.o213bcRn079857@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 03:37:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204503 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 03:37:38 -0000 Author: jmallett Date: Mon Mar 1 03:37:37 2010 New Revision: 204503 URL: http://svn.freebsd.org/changeset/base/204503 Log: Use common spellings of KSEG0 and KSEG1 related macros rather than the duplicated ones that call them CACHED and UNCACHED. Modified: user/jmallett/octeon/sys/mips/include/cpu.h user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/include/cpu.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/cpu.h Mon Mar 1 03:36:59 2010 (r204502) +++ user/jmallett/octeon/sys/mips/include/cpu.h Mon Mar 1 03:37:37 2010 (r204503) @@ -50,21 +50,11 @@ #include #include -#define MIPS_CACHED_MEMORY_ADDR 0x80000000 -#define MIPS_UNCACHED_MEMORY_ADDR 0xa0000000 - -#define MIPS_KSEG0_LARGEST_PHYS 0x20000000 -#define MIPS_CACHED_TO_PHYS(x) ((uintptr_t)(x) & 0x1fffffff) -#define MIPS_PHYS_TO_CACHED(x) ((uintptr_t)(x) | MIPS_CACHED_MEMORY_ADDR) -#define MIPS_UNCACHED_TO_PHYS(x) ((uintptr_t)(x) & 0x1fffffff) -#define MIPS_PHYS_TO_UNCACHED(x) ((uintptr_t)(x) | MIPS_UNCACHED_MEMORY_ADDR) +#define MIPS_KSEG0_LARGEST_PHYS (0x20000000) #define MIPS_PHYS_MASK (0x1fffffff) #define MIPS_PA_2_K1VA(x) (MIPS_KSEG1_START | ((x) & MIPS_PHYS_MASK)) -#define MIPS_VA_TO_CINDEX(x) ((uintptr_t)(x) & 0xffffff | MIPS_CACHED_MEMORY_ADDR) -#define MIPS_CACHED_TO_UNCACHED(x) (MIPS_PHYS_TO_UNCACHED(MIPS_CACHED_TO_PHYS(x))) - #define MIPS_PHYS_TO_KSEG0(x) ((uintptr_t)(x) | MIPS_KSEG0_START) #define MIPS_PHYS_TO_KSEG1(x) ((uintptr_t)(x) | MIPS_KSEG1_START) #define MIPS_KSEG0_TO_PHYS(x) ((uintptr_t)(x) & MIPS_PHYS_MASK) @@ -175,11 +165,11 @@ /* * Location of exception vectors. */ -#define RESET_EXC_VEC 0xbfc00000 -#define TLB_MISS_EXC_VEC 0x80000000 -#define XTLB_MISS_EXC_VEC 0x80000080 -#define CACHE_ERR_EXC_VEC 0x80000100 -#define GEN_EXC_VEC 0x80000180 +#define RESET_EXC_VEC ((intptr_t)(int32_t)0xbfc00000) +#define TLB_MISS_EXC_VEC ((intptr_t)(int32_t)0x80000000) +#define XTLB_MISS_EXC_VEC ((intptr_t)(int32_t)0x80000080) +#define CACHE_ERR_EXC_VEC ((intptr_t)(int32_t)0x80000100) +#define GEN_EXC_VEC ((intptr_t)(int32_t)0x80000180) /* * Coprocessor 0 registers: Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Mon Mar 1 03:36:59 2010 (r204502) +++ user/jmallett/octeon/sys/mips/mips/exception.S Mon Mar 1 03:37:37 2010 (r204503) @@ -1253,7 +1253,7 @@ VECTOR(MipsCache, unknown) PTR_LA k0, _C_LABEL(MipsCacheException) li k1, MIPS_PHYS_MASK and k0, k1 - li k1, MIPS_UNCACHED_MEMORY_ADDR + li k1, MIPS_KSEG1_START or k0, k1 j k0 nop Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 03:36:59 2010 (r204502) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 03:37:37 2010 (r204503) @@ -205,7 +205,7 @@ struct local_sysmaps { /* This structure is for large memory * above 512Meg. We can't (in 32 bit mode) - * just use the direct mapped MIPS_CACHED_TO_PHYS() + * just use the direct mapped MIPS_KSEG0_TO_PHYS() * macros since we can't see the memory and must * map it in when we need to access it. In 64 * bit mode this goes away. @@ -271,7 +271,7 @@ pmap_steal_memory(vm_size_t size) if (pa >= MIPS_KSEG0_LARGEST_PHYS) { panic("Out of memory below 512Meg?"); } - va = MIPS_PHYS_TO_CACHED(pa); + va = MIPS_PHYS_TO_KSEG0(pa); bzero((caddr_t)va, size); return va; } @@ -994,7 +994,7 @@ pmap_unuse_pt(pmap_t pmap, vm_offset_t v mpte = pmap->pm_ptphint; } else { pteva = *pmap_pde(pmap, va); - mpte = PHYS_TO_VM_PAGE(MIPS_CACHED_TO_PHYS(pteva)); + mpte = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS(pteva)); pmap->pm_ptphint = mpte; } } @@ -1048,7 +1048,7 @@ pmap_pinit(pmap_t pmap) ptdpg->valid = VM_PAGE_BITS_ALL; pmap->pm_segtab = (pd_entry_t *) - MIPS_PHYS_TO_CACHED(VM_PAGE_TO_PHYS(ptdpg)); + MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(ptdpg)); if ((ptdpg->flags & PG_ZERO) == 0) bzero(pmap->pm_segtab, PAGE_SIZE); @@ -1115,7 +1115,7 @@ _pmap_allocpte(pmap_t pmap, unsigned pte pmap->pm_stats.resident_count++; ptepa = VM_PAGE_TO_PHYS(m); - pteva = MIPS_PHYS_TO_CACHED(ptepa); + pteva = MIPS_PHYS_TO_KSEG0(ptepa); pmap->pm_segtab[ptepindex] = (pd_entry_t)pteva; /* @@ -1169,7 +1169,7 @@ retry: (pmap->pm_ptphint->pindex == ptepindex)) { m = pmap->pm_ptphint; } else { - m = PHYS_TO_VM_PAGE(MIPS_CACHED_TO_PHYS(pteva)); + m = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS(pteva)); pmap->pm_ptphint = m; } m->wire_count++; @@ -1215,7 +1215,7 @@ pmap_release(pmap_t pmap) ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); - ptdpg = PHYS_TO_VM_PAGE(MIPS_CACHED_TO_PHYS(pmap->pm_segtab)); + ptdpg = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS(pmap->pm_segtab)); ptdpg->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(ptdpg); @@ -1285,7 +1285,7 @@ pmap_growkernel(vm_offset_t addr) */ panic("Gak, can't handle a k-page table outside of lower 512Meg"); } - pte = (pt_entry_t *)MIPS_PHYS_TO_CACHED(ptppaddr); + pte = (pt_entry_t *)MIPS_PHYS_TO_KSEG0(ptppaddr); segtab_pde(kernel_segmap, kernel_vm_end) = (pd_entry_t)pte; /* @@ -2027,7 +2027,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - mpte = PHYS_TO_VM_PAGE(MIPS_CACHED_TO_PHYS(pteva)); + mpte = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS(pteva)); pmap->pm_ptphint = mpte; } mpte->wire_count++; @@ -2117,7 +2117,7 @@ pmap_kenter_temporary(vm_paddr_t pa, int } else #endif if (pa < MIPS_KSEG0_LARGEST_PHYS) { - va = MIPS_PHYS_TO_CACHED(pa); + va = MIPS_PHYS_TO_KSEG0(pa); } else { int cpu; struct local_sysmaps *sysm; @@ -2289,7 +2289,7 @@ pmap_zero_page(vm_page_t m) #endif if (phys < MIPS_KSEG0_LARGEST_PHYS) { - va = MIPS_PHYS_TO_CACHED(phys); + va = MIPS_PHYS_TO_KSEG0(phys); bzero((caddr_t)va, PAGE_SIZE); mips_dcache_wbinv_range(va, PAGE_SIZE); @@ -2347,7 +2347,7 @@ pmap_zero_page_area(vm_page_t m, int off } else #endif if (phys < MIPS_KSEG0_LARGEST_PHYS) { - va = MIPS_PHYS_TO_CACHED(phys); + va = MIPS_PHYS_TO_KSEG0(phys); bzero((char *)(caddr_t)va + off, size); mips_dcache_wbinv_range(va + off, size); } else { @@ -2388,7 +2388,7 @@ pmap_zero_page_idle(vm_page_t m) } else #endif if (phys < MIPS_KSEG0_LARGEST_PHYS) { - va = MIPS_PHYS_TO_CACHED(phys); + va = MIPS_PHYS_TO_KSEG0(phys); bzero((caddr_t)va, PAGE_SIZE); mips_dcache_wbinv_range(va, PAGE_SIZE); } else { @@ -2463,9 +2463,9 @@ pmap_copy_page(vm_page_t src, vm_page_t */ pmap_flush_pvcache(src); mips_dcache_wbinv_range_index( - MIPS_PHYS_TO_CACHED(phy_dst), NBPG); - va_src = MIPS_PHYS_TO_CACHED(phy_src); - va_dst = MIPS_PHYS_TO_CACHED(phy_dst); + MIPS_PHYS_TO_KSEG0(phy_dst), NBPG); + va_src = MIPS_PHYS_TO_KSEG0(phy_src); + va_dst = MIPS_PHYS_TO_KSEG0(phy_dst); bcopy((caddr_t)va_src, (caddr_t)va_dst, PAGE_SIZE); mips_dcache_wbinv_range(va_dst, PAGE_SIZE); } else { @@ -2479,14 +2479,14 @@ pmap_copy_page(vm_page_t src, vm_page_t int_level = disableintr(); if (phy_src < MIPS_KSEG0_LARGEST_PHYS) { /* one side needs mapping - dest */ - va_src = MIPS_PHYS_TO_CACHED(phy_src); + va_src = MIPS_PHYS_TO_KSEG0(phy_src); sysm->CMAP2 = mips_paddr_to_tlbpfn(phy_dst) | PTE_RW | PTE_V | PTE_G | PTE_W | PTE_CACHE; pmap_TLB_update_kernel((vm_offset_t)sysm->CADDR2, sysm->CMAP2); sysm->valid2 = 1; va_dst = (vm_offset_t)sysm->CADDR2; } else if (phy_dst < MIPS_KSEG0_LARGEST_PHYS) { /* one side needs mapping - src */ - va_dst = MIPS_PHYS_TO_CACHED(phy_dst); + va_dst = MIPS_PHYS_TO_KSEG0(phy_dst); sysm->CMAP1 = mips_paddr_to_tlbpfn(phy_src) | PTE_RW | PTE_V | PTE_G | PTE_W | PTE_CACHE; pmap_TLB_update_kernel((vm_offset_t)sysm->CADDR1, sysm->CMAP1); va_src = (vm_offset_t)sysm->CADDR1; @@ -3306,7 +3306,7 @@ pmap_kextract(vm_offset_t va) { vm_offset_t pa = 0; - if (va < MIPS_CACHED_MEMORY_ADDR) { + if (va < MIPS_KSEG0_START) { /* user virtual address */ pt_entry_t *ptep; @@ -3316,16 +3316,16 @@ pmap_kextract(vm_offset_t va) pa = mips_tlbpfn_to_paddr(*ptep) | (va & PAGE_MASK); } - } else if (va >= MIPS_CACHED_MEMORY_ADDR && - va < MIPS_UNCACHED_MEMORY_ADDR) - pa = MIPS_CACHED_TO_PHYS(va); - else if (va >= MIPS_UNCACHED_MEMORY_ADDR && + } else if (va >= MIPS_KSEG0_START && + va < MIPS_KSEG1_START) + pa = MIPS_KSEG0_TO_PHYS(va); + else if (va >= MIPS_KSEG1_START && va < MIPS_KSEG2_START) - pa = MIPS_UNCACHED_TO_PHYS(va); + pa = MIPS_KSEG1_TO_PHYS(va); #ifdef VM_ALLOC_WIRED_TLB_PG_POOL else if (need_wired_tlb_page_pool && ((va >= VM_MIN_KERNEL_ADDRESS) && (va < (VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET)))) - pa = MIPS_CACHED_TO_PHYS(va); + pa = MIPS_KSEG0_TO_PHYS(va); #endif else if (va >= MIPS_KSEG2_START && va < VM_MAX_KERNEL_ADDRESS) { pt_entry_t *ptep; From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 04:07:56 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9354106566C; Mon, 1 Mar 2010 04:07:56 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A91E68FC0A; Mon, 1 Mar 2010 04:07:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2147u1i086488; Mon, 1 Mar 2010 04:07:56 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2147uf3086485; Mon, 1 Mar 2010 04:07:56 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010407.o2147uf3086485@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 04:07:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204504 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 04:07:56 -0000 Author: jmallett Date: Mon Mar 1 04:07:56 2010 New Revision: 204504 URL: http://svn.freebsd.org/changeset/base/204504 Log: o) nkpt calculation is busted with 64-bit addresses, so don't use memory above 512M so we don't have to recalculate it. Gross. o) Fix thread0 stack setup to load the whole stack address in case of n64. Modified: user/jmallett/octeon/sys/mips/mips/locore.S user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/mips/locore.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 03:37:37 2010 (r204503) +++ user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 04:07:56 2010 (r204504) @@ -178,8 +178,8 @@ VECTOR(_locore, unknown) nop PTR_LA sp, _C_LABEL(thread0) - lw a0, TD_PCB(sp) - li t0, ~7 + REG_L a0, TD_PCB(sp) + REG_LI t0, ~7 and a0, a0, t0 subu sp, a0, START_FRAME Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 03:37:37 2010 (r204503) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 04:07:56 2010 (r204504) @@ -297,14 +297,22 @@ again: phys_avail[i] = round_page(phys_avail[i]); phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); - if (phys_avail[i + 1] >= MIPS_KSEG0_LARGEST_PHYS) + if (phys_avail[i] >= MIPS_KSEG0_LARGEST_PHYS) { + phys_avail[i] = 0; + phys_avail[i + 1] = 0; + } + + if (phys_avail[i + 1] >= MIPS_KSEG0_LARGEST_PHYS) { +#if 0 memory_larger_than_512meg++; +#endif + phys_avail[i + 1] = trunc_page(MIPS_KSEG0_LARGEST_PHYS - 1); + } if (i < 2) continue; if (phys_avail[i - 2] > phys_avail[i]) { vm_paddr_t ptemp[2]; - ptemp[0] = phys_avail[i + 0]; ptemp[1] = phys_avail[i + 1]; From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 04:43:18 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E5BC1065675; Mon, 1 Mar 2010 04:43:18 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 23E568FC13; Mon, 1 Mar 2010 04:43:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o214hIuO094257; Mon, 1 Mar 2010 04:43:18 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o214hIMe094254; Mon, 1 Mar 2010 04:43:18 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010443.o214hIMe094254@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 04:43:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204505 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 04:43:18 -0000 Author: jmallett Date: Mon Mar 1 04:43:17 2010 New Revision: 204505 URL: http://svn.freebsd.org/changeset/base/204505 Log: Sign extend some more addresses. Seem to no longer require my nkpt hack. Fix PMAP_DEBUG compilation. Modified: user/jmallett/octeon/sys/mips/include/vmparam.h user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/include/vmparam.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/vmparam.h Mon Mar 1 04:07:56 2010 (r204504) +++ user/jmallett/octeon/sys/mips/include/vmparam.h Mon Mar 1 04:43:17 2010 (r204505) @@ -97,17 +97,17 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vm_offset_t)0x00000000) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAXUSER_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0x80000000) #define VM_MAX_MMAP_ADDR VM_MAXUSER_ADDRESS -#define VM_MAX_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAX_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0x80000000) #ifndef VM_KERNEL_ALLOC_OFFSET #define VM_KERNEL_ALLOC_OFFSET ((vm_offset_t)0x00000000) #endif -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0xC0000000) +#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xC0000000) #define VM_KERNEL_WIRED_ADDR_END (VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFFFFC000) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xFFFFC000) /* * Disable superpage reservations. (not sure if this is right Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 04:07:56 2010 (r204504) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 04:43:17 2010 (r204505) @@ -297,16 +297,8 @@ again: phys_avail[i] = round_page(phys_avail[i]); phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); - if (phys_avail[i] >= MIPS_KSEG0_LARGEST_PHYS) { - phys_avail[i] = 0; - phys_avail[i + 1] = 0; - } - if (phys_avail[i + 1] >= MIPS_KSEG0_LARGEST_PHYS) { -#if 0 memory_larger_than_512meg++; -#endif - phys_avail[i + 1] = trunc_page(MIPS_KSEG0_LARGEST_PHYS - 1); } if (i < 2) continue; @@ -704,7 +696,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p pt_entry_t npte, opte; #ifdef PMAP_DEBUG - printf("pmap_kenter: va: 0x%08x -> pa: 0x%08x\n", va, pa); + printf("pmap_kenter: va: %p -> pa: %p\n", (void *)va, (void *)pa); #endif npte = mips_paddr_to_tlbpfn(pa) | PTE_RW | PTE_V | PTE_G | PTE_W; @@ -1916,7 +1908,7 @@ validate: rw = init_pte_prot(va, m, prot); #ifdef PMAP_DEBUG - printf("pmap_enter: va: 0x%08x -> pa: 0x%08x\n", va, pa); + printf("pmap_enter: va: %p -> pa: %p\n", (void *)va, (void *)pa); #endif /* * Now validate mapping with desired protection/wiring. From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 05:21:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D255410656A9; Mon, 1 Mar 2010 05:21:35 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A7CC38FC08; Mon, 1 Mar 2010 05:21:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o215LZkO002775; Mon, 1 Mar 2010 05:21:35 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o215LZqd002772; Mon, 1 Mar 2010 05:21:35 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010521.o215LZqd002772@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 05:21:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204507 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 05:21:35 -0000 Author: jmallett Date: Mon Mar 1 05:21:35 2010 New Revision: 204507 URL: http://svn.freebsd.org/changeset/base/204507 Log: o) Adjust ptr and register macros for assembly wrt ABI in a way that ought to work better. Need to check for places where the assembly assumes pointers are register width, I guess. Modified: user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/mips/locore.S Modified: user/jmallett/octeon/sys/mips/include/asm.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/asm.h Mon Mar 1 04:46:07 2010 (r204506) +++ user/jmallett/octeon/sys/mips/include/asm.h Mon Mar 1 05:21:35 2010 (r204507) @@ -362,16 +362,13 @@ _C_LABEL(x): * ABI calls. */ -#if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 -/* #if !defined(__mips_n64) */ +#if !defined(__mips_n32) && !defined(__mips_n64) #define REG_L lw #define REG_S sw #define REG_LI li #define REG_PROLOGUE .set push #define REG_EPILOGUE .set pop #define SZREG 4 -#define PTR_LA la -#define PTR_ADDU addu #else #define REG_L ld #define REG_S sd @@ -379,9 +376,19 @@ _C_LABEL(x): #define REG_PROLOGUE .set push ; .set mips3 #define REG_EPILOGUE .set pop #define SZREG 8 +#endif + +#if !defined(__mips_n64) +#define PTR_LA la +#define PTR_ADDU addu +#define PTR_L lw +#define PTR_S sw +#else #define PTR_LA dla #define PTR_ADDU daddu -#endif /* _MIPS_BSD_API */ +#define PTR_L ld +#define PTR_S sd +#endif #define mfc0_macro(data, spr) \ __asm __volatile ("mfc0 %0, $%1" \ Modified: user/jmallett/octeon/sys/mips/mips/locore.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 04:46:07 2010 (r204506) +++ user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 05:21:35 2010 (r204507) @@ -178,7 +178,7 @@ VECTOR(_locore, unknown) nop PTR_LA sp, _C_LABEL(thread0) - REG_L a0, TD_PCB(sp) + PTR_L a0, TD_PCB(sp) REG_LI t0, ~7 and a0, a0, t0 subu sp, a0, START_FRAME From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 07:27:26 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0ADB51065676; Mon, 1 Mar 2010 07:27:26 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E42BA8FC15; Mon, 1 Mar 2010 07:27:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o217RPq7030765; Mon, 1 Mar 2010 07:27:25 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o217RP2d030764; Mon, 1 Mar 2010 07:27:25 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201003010727.o217RP2d030764@svn.freebsd.org> From: Doug Barton Date: Mon, 1 Mar 2010 07:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204508 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 07:27:26 -0000 Author: dougb Date: Mon Mar 1 07:27:24 2010 New Revision: 204508 URL: http://svn.freebsd.org/changeset/base/204508 Log: Begin adding support for the use of the INDEX file alone, including the use of portmaster without any ports tree. 1. Add --index-only option (only works with -L so far) 2. If the values of certain variables are empty (due to the lack of /usr/ports/Mk/bsd.port.mk) fill in sensible defaults, or error out. Right now this includes PORTSDIR, PKG_DBDIR, DISTDIR, PORT_DBDIR, FETCHINDEX, MASTER_SITE_INDEX, INDEXDIR, and INDEXFILE. More to come. 3. Since DISTDIR and PORT_DBDIR are not going to be set unconditionally, and since not having them is only fatal with certain combinations of options, test for them when they are really needed. 4. Introduce check_pkg_version() which has the logic that was previously incarnated within check_for_updates(). This allows it to be called once if the INDEX is in use, and later in check_for() if we get there. 5. Also in check_for(), change the values of some flag variables for easier debugging with -x. Begin the long-overdue process of deprecating the use of /etc/portmaster.rc Minor optimization, only do the bunzip routine with the INDEX file if it is new. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Mar 1 05:21:35 2010 (r204507) +++ user/dougb/portmaster/portmaster Mon Mar 1 07:27:24 2010 (r204508) @@ -23,7 +23,13 @@ if [ -z "$PM_PARENT_PID" ]; then set -o allexport # Read a global rc file first - [ -r /etc/portmaster.rc ] && . /etc/portmaster.rc + if [ -r /etc/portmaster.rc ]; then + echo '' ; echo "===>>> WARNING" + echo ' Your portmaster.rc is in /etc, however support for the file in this' + echo ' location is deprecated, and will be removed in a future version.' + echo '' ; echo ' The proper location for this file is /usr/local/etc' + echo '' ; . /etc/portmaster.rc + fi [ -r /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc # Read a local one next, and allow the command line to override @@ -246,7 +252,7 @@ usage () { echo " [[--packages|--packages-only] [-P|-PP] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" echo " [--local-packagedir=] [--no-confirm] [--no-term-title]" - echo " [--index]" + echo " [--index] [--index-only]" echo " [-m ] [-x ]" echo "${0##*/} [Common flags] " echo "${0##*/} [Common flags] " @@ -306,6 +312,7 @@ usage () { echo ' installed and/or updated before proceeding' echo '--no-term-title do not update the xterm title bar' echo "--index use $pd/INDEX-[6-9] to check if a port is out of date" + echo '--index-only do not try to use /usr/ports' echo '' echo '--show-work list what ports are and would be installed' echo '' @@ -380,31 +387,6 @@ pm_unlink_s () { /bin/test -e $1 & #=============== End functions we always want to have =============== -# Do this here so it can use the fancy functions above, and default values -# can be overridden in the rc files -if [ "$$" -eq "$PM_PARENT_PID" ]; then - if [ -z "$pd" ]; then - pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR` - [ -n "$pd" ] || fail 'The value of PORTSDIR cannot be empty' - fi - if [ -z "$pdb" ]; then - pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR` - [ -n "$pdb" ] || fail 'The value of PKG_DBDIR cannot be empty' - fi - if [ -z "$distdir" ]; then - distdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -VDISTDIR` - [ -n "$distdir" ] || fail 'The value of DISTDIR cannot be empty' - # In case it is a symlink - distdir="${distdir}/" - fi - if [ -z "$port_dbdir" ]; then - port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR` - [ -n "$port_dbdir" ] && export port_dbdir - fi - - export pd pdb distdir -fi - packages_init () { local e1 e2 @@ -449,6 +431,8 @@ for var in "$@" ; do --no-term-title) PM_NO_TERM_TITLE=pm_no_term_title export PM_NO_TERM_TITLE ;; --index) PM_INDEX=pm_index ; export PM_INDEX ;; + --index-only) PM_INDEX=pm_index ; PM_INDEX_ONLY=pm_index_only + export PM_INDEX PM_INDEX_ONLY ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -464,7 +448,37 @@ for var in "$@" ; do esac done +# Do this here so it can use the fancy functions above, and default values +# can be overridden in the rc files if [ "$$" -eq "$PM_PARENT_PID" ]; then + if [ -z "$pd" ]; then + pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null` + [ -n "$pd" -o -n "$PM_INDEX_ONLY" ] || + fail 'The value of PORTSDIR cannot be empty' + fi + if [ -z "$pdb" ]; then + pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` + if [ -z "$pdb" ]; then + if [ -d /var/db/pkg ]; then + pdb='/var/db/pkg' + else + fail 'The value of PKG_DBDIR cannot be empty' + fi + fi + fi + if [ -z "$distdir" -a "$PM_PACKAGES" != only ]; then + distdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V DISTDIR 2>/dev/null` + # In case it is a symlink + distdir="${distdir%/}/" + fi + if [ -z "$port_dbdir" ]; then + port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null` + [ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir='/var/db/ports' + [ -n "$port_dbdir" ] && export port_dbdir + fi + + export pd pdb distdir + if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then PM_BUILD_ONLY_LIST=pm_bol export PM_BUILD_ONLY_LIST @@ -475,39 +489,47 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi # XXX + if [ -n "$PM_INDEX" ]; then - pm_cd_pd + [ -d "$pd" ] && pm_cd_pd if [ -z "$FETCHINDEX" ]; then - FETCHINDEX=`pm_make_b -V FETCHINDEX` - [ -n "$FETCHINDEX" ] || - fail 'The value of FETCHINDEX cannot be empty' + [ -d "$pd" ] && FETCHINDEX=`pm_make_b -V FETCHINDEX` + [ -n "$FETCHINDEX" ] || FETCHINDEX='fetch -am -o' fi if [ -z "$MASTER_SITE_INDEX" ]; then + [ -d "$pd" ] && MASTER_SITE_INDEX=`pm_make_b -V MASTER_SITE_INDEX` [ -n "$MASTER_SITE_INDEX" ] || - fail 'The value of MASTER_SITE_INDEX cannot be empty' + MASTER_SITE_INDEX='http://www.FreeBSD.org/ports/' fi if [ -z "$INDEXDIR" ]; then - INDEXDIR=`pm_make_b -V INDEXDIR` - [ -n "$INDEXDIR" ] || - fail 'The value of INDEXDIR cannot be empty' + [ -d "$pd" ] && INDEXDIR=`pm_make_b -V INDEXDIR` + [ -n "$INDEXDIR" ] || INDEXDIR="$TMPDIR" fi if [ -z "$INDEXFILE" ]; then - INDEXFILE=`pm_make_b -V INDEXFILE` - [ -n "$INDEXFILE" ] || - fail 'The value of INDEXFILE cannot be empty' + [ -d "$pd" ] && INDEXFILE=`pm_make_b -V INDEXFILE` + if [ -z "$INDEXFILE" ]; then + ver=`uname -r` + INDEXFILE=INDEX-${ver%%\.*} + unset ver + fi fi PM_INDEX="${INDEXDIR}/${INDEXFILE}" - + index_time=`stat -f '%Ua' $PM_INDEX` [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Updating INDEX file" $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 - temp_index=`pm_mktemp index` - bunzip2 < ${PM_INDEX}.bz2 > $temp_index - pm_install_s $temp_index $PM_INDEX - - unlink $temp_index - unset temp_index + if [ $index_time -ne `stat -f '%Ua' $PM_INDEX` ]; then +#echo '' ; echo "Debug> Updating INDEX" ; echo '' + temp_index=`pm_mktemp index` + bunzip2 < ${PM_INDEX}.bz2 > $temp_index + pm_install_s $temp_index $PM_INDEX + unlink $temp_index + unset temp_index + else +#echo '' ; echo "Debug> NOT updating INDEX" ; echo '' + fi + unset index_time fi fi @@ -815,6 +837,8 @@ delete_empty_dist_subdirs () { #=============== Begin code relevant only to --features =============== if [ -n "$CLEAN_DISTFILES" ]; then + [ "$distdir" != '/' ] || fail 'There is no DISTDIR to clean' + # Set the file name here since we are usually called in a subshell DI_FILES=`pm_mktemp DI-FILES` read_distinfos @@ -895,6 +919,9 @@ IFS=' fi if [ -n "$CHECK_PORT_DBDIR" ]; then + [ -d "$port_dbdir" ] || + fail 'PORT_DBIR is empty, or the directory $port_dbdir does not exist' + if [ "$1" = "-v" ]; then PM_VERBOSE=vopt; fi unique_list=':' @@ -1043,7 +1070,9 @@ check_state () { # XXX parse_index () { - local line + local pd line + + [ -z "$pd" -a -n "$PM_INDEX_ONLY" ] && pd=/usr/ports line=`grep -m1 .*\|${pd}/${1}\|.* $PM_INDEX` @@ -1060,6 +1089,32 @@ parse_index () { esac } +check_pkg_version () { + local iport port_ver udf + + iport=$1 ; port_ver=$2 ; udf=$3 + + case `pkg_version -t $iport $port_ver` in + \<) return 1 ;; + =) return ;; + \>) if [ -n "$PM_VERBOSE" ]; then + echo " ===>>> Port version $port_ver does not" + echo " ===>>> seem newer than installed $iport" + fi + if [ -n "$PM_FORCE" ]; then + check_restart_and_udf $udf $iport || return 1 + elif [ -n "$URB_YES" ]; then + case "$MASTER_RB_LIST" in *" $iport "*) + if ! check_restart_and_udf $udf $iport; then + return 1 + else + URB_DONE_LIST="${URB_DONE_LIST}${upg_port}:" + fi ;; + esac + fi ;; + esac +} + check_for_updates () { # Global: num_updates local list_only nf iport origin port_ver udf do_update @@ -1085,15 +1140,12 @@ check_for_updates () { if [ -n "$PM_INDEX" ]; then port_ver=`parse_index $origin name` - case `pkg_version -t $iport $port_ver` in - \<) do_update=update_index -#echo ''; echo "Debug> Found one from the INDEX!"; echo '' - ;; - =) ;; # Potential future use - esac + check_pkg_version $iport $port_ver || { do_update=update_index ; +#echo ''; echo "Debug> Found one from the INDEX!"; echo ''; +} fi - if [ -d "$pd/$origin" -a -z "$do_update" ]; then + if [ -d "$pd/$origin" -a -z "$do_update" -a -z "$PM_INDEX_ONLY" ]; then if ! pm_cd $pd/$origin; then if [ -e "$pdb/$iport/+IGNOREME" ]; then echo " ===>>> Warning: Unable to cd to $pd/$origin" @@ -1110,12 +1162,12 @@ check_for_updates () { if [ "$iport" = "$port_ver" ]; then if [ -n "$PM_FORCE" ]; then check_restart_and_udf $udf $iport || - do_update=do_update + do_update=do_update_force elif [ -n "$URB_YES" ]; then # Outdent case "$MASTER_RB_LIST" in *" $iport "*) if ! check_restart_and_udf $udf $iport; then - do_update=do_update2 + do_update=do_update_urb else URB_DONE_LIST="${URB_DONE_LIST}${upg_port}:" fi ;; @@ -1123,40 +1175,19 @@ check_for_updates () { # Outdent elif [ -n "$PM_MULTI_PORTS" ]; then case "$PM_MULTI_PORTS" in - *:${iport}:*) do_update=do_update7 ;; - *:${origin}:*) do_update=do_update8 ;; + *:${iport}:*) do_update=do_update_mi ;; + *:${origin}:*) do_update=do_update_mo ;; esac elif [ -n "$LIST_PLUS" ]; then - check_state + [ -z "$PM_INDEX_ONLY" ] && check_state return 0 elif [ -n "$LIST" ]; then return 0 fi else - case `pkg_version -t $iport $port_ver` in - \<) do_update=do_update3 ;; - =) ;; # Should not be reached - \>) if [ -n "$PM_VERBOSE" ]; then - echo " ===>>> Port version $port_ver does not" - echo " ===>>> seem newer than installed $iport" - fi - if [ -n "$PM_FORCE" ]; then - check_restart_and_udf $udf $iport || - do_update=do_update4 - elif [ -n "$URB_YES" ]; then - # Outdent - case "$MASTER_RB_LIST" in *" $iport "*) - if ! check_restart_and_udf $udf $iport; then - do_update=do_update5 - else - URB_DONE_LIST="${URB_DONE_LIST}${upg_port}:" - fi ;; - esac - # Outdent - fi ;; - esac + check_pkg_version $iport $port_ver $udf || do_update=do_update_check fi - elif [ -z "$do_update" ]; then + elif [ -z "$do_update" -a -z "$PM_INDEX_ONLY" ]; then find_moved_port $origin $iport $nf # If the port has moved, we have to update it, otherwise ignore @@ -1171,7 +1202,7 @@ check_for_updates () { echo " ===>>> New version available: $port_ver" [ -e "$pdb/$iport/+IGNOREME" ] && echo " ===>>> +IGNOREME file is present for $1" - check_state + [ -z "$PM_INDEX_ONLY" ] && check_state num_updates=$(( $num_updates + 1 )) else unset moved_npd @@ -1646,6 +1677,9 @@ if [ -n "$CLEAN_STALE" ]; then fi #=============== End code relevant only to getopts features =============== + +[ "$distdir" = '/' -a "$PM_PACKAGES" != only ] && fail 'The value of DISTDIR cannot be empty' + #=============== Begin functions for main =============== already_done () { From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 07:54:07 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10B51106566B; Mon, 1 Mar 2010 07:54:07 +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 C09DB8FC1E; Mon, 1 Mar 2010 07:54:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id CA9089CB093; Mon, 1 Mar 2010 08:53:02 +0100 (CET) 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 d6U4v8utJnV5; Mon, 1 Mar 2010 08:53:00 +0100 (CET) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 9A9F79CB11C; Mon, 1 Mar 2010 08:53:00 +0100 (CET) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id o217qwDZ092532; Mon, 1 Mar 2010 08:52:58 +0100 (CET) (envelope-from rdivacky) Date: Mon, 1 Mar 2010 08:52:58 +0100 From: Roman Divacky To: Edwin Groothuis Message-ID: <20100301075258.GA92408@freebsd.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> <20100228205005.GA4003@freebsd.org> <20100228221653.GA2682@mavetju.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100228221653.GA2682@mavetju.org> User-Agent: Mutt/1.4.2.3i Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 07:54:07 -0000 On Mon, Mar 01, 2010 at 09:16:53AM +1100, Edwin Groothuis wrote: > On Sun, Feb 28, 2010 at 09:50:05PM +0100, Roman Divacky wrote: > > On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: > > > Author: edwin > > > Date: Sun Feb 28 20:36:24 2010 > > > New Revision: 204479 > > > URL: http://svn.freebsd.org/changeset/base/204479 > > > > > > Log: > > > Do some work on ncal while we're at it. > > > > I have a patch that implementes "cal -3" are you interested in it? > > Sure. What does it do? :-) it shows 3 months period - this month, month before and month after. patch: vlakno.cz/~rdivacky/ncal.3months.patch example: lev ~/ncal$ ./ncal -3 February 2010 March 2010 April 2010 Mo 1 8 15 22 1 8 15 22 29 5 12 19 26 Tu 2 9 16 23 2 9 16 23 30 6 13 20 27 We 3 10 17 24 3 10 17 24 31 7 14 21 28 Th 4 11 18 25 4 11 18 25 1 8 15 22 29 Fr 5 12 19 26 5 12 19 26 2 9 16 23 30 Sa 6 13 20 27 6 13 20 27 3 10 17 24 Su 7 14 21 28 7 14 21 28 4 11 18 25 From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 08:39:38 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F5F31065677; Mon, 1 Mar 2010 08:39:38 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from k7.mavetju.org (ppp113-58.static.internode.on.net [150.101.113.58]) by mx1.freebsd.org (Postfix) with ESMTP id AAA0A8FC1C; Mon, 1 Mar 2010 08:39:37 +0000 (UTC) Received: by k7.mavetju.org (Postfix, from userid 1001) id 55AB445188; Mon, 1 Mar 2010 19:38:21 +1100 (EST) Date: Mon, 1 Mar 2010 19:38:21 +1100 From: Edwin Groothuis To: Roman Divacky Message-ID: <20100301083821.GA1761@mavetju.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> <20100228205005.GA4003@freebsd.org> <20100228221653.GA2682@mavetju.org> <20100301075258.GA92408@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100301075258.GA92408@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 08:39:38 -0000 On Mon, Mar 01, 2010 at 08:52:58AM +0100, Roman Divacky wrote: > On Mon, Mar 01, 2010 at 09:16:53AM +1100, Edwin Groothuis wrote: > > On Sun, Feb 28, 2010 at 09:50:05PM +0100, Roman Divacky wrote: > > > On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: > > > > Author: edwin > > > > Date: Sun Feb 28 20:36:24 2010 > > > > New Revision: 204479 > > > > URL: http://svn.freebsd.org/changeset/base/204479 > > > > > > > > Log: > > > > Do some work on ncal while we're at it. > > > > > > I have a patch that implementes "cal -3" are you interested in it? > > > > Sure. What does it do? :-) > > it shows 3 months period - this month, month before and month after. > > patch: vlakno.cz/~rdivacky/ncal.3months.patch Nice, looks good. I've seen how the NetBSD cal has implemented the sliding months and want to see if I can recreate something like that without breaking too much of our current implementation. Should not have to be the case. Oh, the time wasted on trains :-) -- Edwin Groothuis Website: http://www.mavetju.org/ edwin@mavetju.org Weblog: http://www.mavetju.org/weblog/ From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 10:42:12 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85C6B106566C; Mon, 1 Mar 2010 10:42:12 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 74E2E8FC13; Mon, 1 Mar 2010 10:42:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21AgCW1074475; Mon, 1 Mar 2010 10:42:12 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21AgCq0074474; Mon, 1 Mar 2010 10:42:12 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003011042.o21AgCq0074474@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 10:42:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204512 - user/jmallett/octeon/lib/libc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 10:42:12 -0000 Author: jmallett Date: Mon Mar 1 10:42:12 2010 New Revision: 204512 URL: http://svn.freebsd.org/changeset/base/204512 Log: For now don't build quad stubs on MIPS, since I'm only concerned with n32 at present. Modified: user/jmallett/octeon/lib/libc/Makefile Modified: user/jmallett/octeon/lib/libc/Makefile ============================================================================== --- user/jmallett/octeon/lib/libc/Makefile Mon Mar 1 09:46:27 2010 (r204511) +++ user/jmallett/octeon/lib/libc/Makefile Mon Mar 1 10:42:12 2010 (r204512) @@ -51,7 +51,8 @@ NOASM= .include "${.CURDIR}/posix1e/Makefile.inc" .if ${MACHINE_ARCH} != "amd64" && \ ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "sparc64" + ${MACHINE_ARCH} != "sparc64" && \ + ${MACHINE_ARCH} != "mips" .include "${.CURDIR}/quad/Makefile.inc" .endif .include "${.CURDIR}/regex/Makefile.inc" From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 10:43:13 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A9DF106566B; Mon, 1 Mar 2010 10:43:13 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 37B0B8FC19; Mon, 1 Mar 2010 10:43:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21AhDbN074714; Mon, 1 Mar 2010 10:43:13 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21AhDXB074709; Mon, 1 Mar 2010 10:43:13 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003011043.o21AhDXB074709@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 10:43:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204513 - in user/jmallett/octeon: lib/libc/mips/gen sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 10:43:13 -0000 Author: jmallett Date: Mon Mar 1 10:43:12 2010 New Revision: 204513 URL: http://svn.freebsd.org/changeset/base/204513 Log: Store registers in jmp buffers properly on n32 (and n64.) Modified: user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S user/jmallett/octeon/lib/libc/mips/gen/setjmp.S user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S user/jmallett/octeon/sys/mips/include/setjmp.h Modified: user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S ============================================================================== --- user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S Mon Mar 1 10:42:12 2010 (r204512) +++ user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S Mon Mar 1 10:43:12 2010 (r204513) @@ -65,21 +65,21 @@ LEAF(_setjmp) .cprestore 16 #endif li v0, _JB_MAGIC__SETJMP - sw v0, (_JB_MAGIC * SZREG)(a0) - sw ra, (_JB_REG_RA * SZREG)(a0) - sw s0, (_JB_REG_S0 * SZREG)(a0) - sw s1, (_JB_REG_S1 * SZREG)(a0) - sw s2, (_JB_REG_S2 * SZREG)(a0) - sw s3, (_JB_REG_S3 * SZREG)(a0) - sw s4, (_JB_REG_S4 * SZREG)(a0) - sw s5, (_JB_REG_S5 * SZREG)(a0) - sw s6, (_JB_REG_S6 * SZREG)(a0) - sw s7, (_JB_REG_S7 * SZREG)(a0) - sw s8, (_JB_REG_S8 * SZREG)(a0) + REG_S v0, (_JB_MAGIC * SZREG)(a0) + REG_S ra, (_JB_REG_RA * SZREG)(a0) + REG_S s0, (_JB_REG_S0 * SZREG)(a0) + REG_S s1, (_JB_REG_S1 * SZREG)(a0) + REG_S s2, (_JB_REG_S2 * SZREG)(a0) + REG_S s3, (_JB_REG_S3 * SZREG)(a0) + REG_S s4, (_JB_REG_S4 * SZREG)(a0) + REG_S s5, (_JB_REG_S5 * SZREG)(a0) + REG_S s6, (_JB_REG_S6 * SZREG)(a0) + REG_S s7, (_JB_REG_S7 * SZREG)(a0) + REG_S s8, (_JB_REG_S8 * SZREG)(a0) #ifdef __ABICALLS__ addu sp, sp, CALLFRAME_SIZ # un-allocate the stack frame #endif - sw sp, (_JB_REG_SP * SZREG)(a0) + REG_S sp, (_JB_REG_SP * SZREG)(a0) j ra move v0, zero END(_setjmp) @@ -91,20 +91,20 @@ LEAF(_longjmp) subu sp, sp, CALLFRAME_SIZ # allocate stack frame .cprestore 16 #endif - lw v0, (_JB_MAGIC * SZREG)(a0) - lw ra, (_JB_REG_RA * SZREG)(a0) + REG_L v0, (_JB_MAGIC * SZREG)(a0) + REG_L ra, (_JB_REG_RA * SZREG)(a0) li t0, _JB_MAGIC__SETJMP bne v0, t0, botch # jump if error - lw s0, (_JB_REG_S0 * SZREG)(a0) - lw s1, (_JB_REG_S1 * SZREG)(a0) - lw s2, (_JB_REG_S2 * SZREG)(a0) - lw s3, (_JB_REG_S3 * SZREG)(a0) - lw s4, (_JB_REG_S4 * SZREG)(a0) - lw s5, (_JB_REG_S5 * SZREG)(a0) - lw s6, (_JB_REG_S6 * SZREG)(a0) - lw s7, (_JB_REG_S7 * SZREG)(a0) - lw sp, (_JB_REG_SP * SZREG)(a0) - lw s8, (_JB_REG_S8 * SZREG)(a0) + REG_L s0, (_JB_REG_S0 * SZREG)(a0) + REG_L s1, (_JB_REG_S1 * SZREG)(a0) + REG_L s2, (_JB_REG_S2 * SZREG)(a0) + REG_L s3, (_JB_REG_S3 * SZREG)(a0) + REG_L s4, (_JB_REG_S4 * SZREG)(a0) + REG_L s5, (_JB_REG_S5 * SZREG)(a0) + REG_L s6, (_JB_REG_S6 * SZREG)(a0) + REG_L s7, (_JB_REG_S7 * SZREG)(a0) + REG_L sp, (_JB_REG_SP * SZREG)(a0) + REG_L s8, (_JB_REG_S8 * SZREG)(a0) j ra move v0, a1 Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S ============================================================================== --- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S Mon Mar 1 10:42:12 2010 (r204512) +++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S Mon Mar 1 10:43:12 2010 (r204513) @@ -69,8 +69,8 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra) #ifdef __ABICALLS__ .cprestore 16 #endif - sw ra, CALLFRAME_RA(sp) # save RA - sw a0, CALLFRAME_SIZ(sp) # store env + REG_S ra, CALLFRAME_RA(sp) # save RA + REG_S a0, CALLFRAME_SIZ(sp) # store env /* Get the signal mask. */ addu a2, a0, _JB_SIGMASK * SZREG # &oenv @@ -80,23 +80,23 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra) jal t9 nop - lw a0, CALLFRAME_SIZ(sp) # restore env pointer - lw ra, CALLFRAME_RA(sp) # restore RA + REG_L a0, CALLFRAME_SIZ(sp) # restore env pointer + REG_L ra, CALLFRAME_RA(sp) # restore RA addu sp, sp, SETJMP_FRAME_SIZE # pop stack frame li v0, _JB_MAGIC_SETJMP - sw v0, (_JB_MAGIC * SZREG)(a0) - sw ra, (_JB_REG_RA * SZREG)(a0) - sw s0, (_JB_REG_S0 * SZREG)(a0) - sw s1, (_JB_REG_S1 * SZREG)(a0) - sw s2, (_JB_REG_S2 * SZREG)(a0) - sw s3, (_JB_REG_S3 * SZREG)(a0) - sw s4, (_JB_REG_S4 * SZREG)(a0) - sw s5, (_JB_REG_S5 * SZREG)(a0) - sw s6, (_JB_REG_S6 * SZREG)(a0) - sw s7, (_JB_REG_S7 * SZREG)(a0) - sw sp, (_JB_REG_SP * SZREG)(a0) - sw s8, (_JB_REG_S8 * SZREG)(a0) + REG_S v0, (_JB_MAGIC * SZREG)(a0) + REG_S ra, (_JB_REG_RA * SZREG)(a0) + REG_S s0, (_JB_REG_S0 * SZREG)(a0) + REG_S s1, (_JB_REG_S1 * SZREG)(a0) + REG_S s2, (_JB_REG_S2 * SZREG)(a0) + REG_S s3, (_JB_REG_S3 * SZREG)(a0) + REG_S s4, (_JB_REG_S4 * SZREG)(a0) + REG_S s5, (_JB_REG_S5 * SZREG)(a0) + REG_S s6, (_JB_REG_S6 * SZREG)(a0) + REG_S s7, (_JB_REG_S7 * SZREG)(a0) + REG_S sp, (_JB_REG_SP * SZREG)(a0) + REG_S s8, (_JB_REG_S8 * SZREG)(a0) move v0, zero j ra @@ -114,14 +114,14 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) #ifdef __ABICALLS__ .cprestore 16 #endif - sw ra, CALLFRAME_RA(sp) # save RA - lw v0, (_JB_MAGIC * SZREG)(a0) + REG_S ra, CALLFRAME_RA(sp) # save RA + REG_L v0, (_JB_MAGIC * SZREG)(a0) li t0, _JB_MAGIC_SETJMP bne v0, t0, botch # jump if error nop - sw a0, CALLFRAME_SIZ(sp) # save env - sw a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value + REG_S a0, CALLFRAME_SIZ(sp) # save env + REG_S a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value # set sigmask addu a1, a0, _JB_SIGMASK * SZREG # &set @@ -131,20 +131,20 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) jal t9 nop - lw a0, CALLFRAME_SIZ(sp) # restore env - lw a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value + REG_L a0, CALLFRAME_SIZ(sp) # restore env + REG_L a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value - lw ra, (_JB_REG_RA * SZREG)(a0) - lw s0, (_JB_REG_S0 * SZREG)(a0) - lw s1, (_JB_REG_S1 * SZREG)(a0) - lw s2, (_JB_REG_S2 * SZREG)(a0) - lw s3, (_JB_REG_S3 * SZREG)(a0) - lw s4, (_JB_REG_S4 * SZREG)(a0) - lw s5, (_JB_REG_S5 * SZREG)(a0) - lw s6, (_JB_REG_S6 * SZREG)(a0) - lw s7, (_JB_REG_S7 * SZREG)(a0) - lw sp, (_JB_REG_SP * SZREG)(a0) - lw s8, (_JB_REG_S8 * SZREG)(a0) + REG_L ra, (_JB_REG_RA * SZREG)(a0) + REG_L s0, (_JB_REG_S0 * SZREG)(a0) + REG_L s1, (_JB_REG_S1 * SZREG)(a0) + REG_L s2, (_JB_REG_S2 * SZREG)(a0) + REG_L s3, (_JB_REG_S3 * SZREG)(a0) + REG_L s4, (_JB_REG_S4 * SZREG)(a0) + REG_L s5, (_JB_REG_S5 * SZREG)(a0) + REG_L s6, (_JB_REG_S6 * SZREG)(a0) + REG_L s7, (_JB_REG_S7 * SZREG)(a0) + REG_L sp, (_JB_REG_SP * SZREG)(a0) + REG_L s8, (_JB_REG_S8 * SZREG)(a0) move v0, a1 j ra nop Modified: user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S ============================================================================== --- user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S Mon Mar 1 10:42:12 2010 (r204512) +++ user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S Mon Mar 1 10:43:12 2010 (r204513) @@ -64,10 +64,10 @@ LEAF(sigsetjmp) #endif bne a1, 0x0, 1f # do saving of signal mask? la t9, _setjmp - jr t9 + jr t9 1: la t9, setjmp - jr t9 + jr t9 END(sigsetjmp) LEAF(siglongjmp) @@ -76,7 +76,7 @@ LEAF(siglongjmp) .cpload t9 .set reorder #endif - lw t0, (_JB_MAGIC * SZREG)(a0) + REG_L t0, (_JB_MAGIC * SZREG)(a0) li t1, _JB_MAGIC__SETJMP bne t0, t1, 1f # setjmp or _setjmp magic? la t9, _longjmp Modified: user/jmallett/octeon/sys/mips/include/setjmp.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/setjmp.h Mon Mar 1 10:42:12 2010 (r204512) +++ user/jmallett/octeon/sys/mips/include/setjmp.h Mon Mar 1 10:43:12 2010 (r204513) @@ -49,10 +49,18 @@ #ifndef _LOCORE #ifndef __ASSEMBLER__ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE +#ifdef __mips_n32 +typedef struct _sigjmp_buf { long long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; +#else typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; #endif +#endif +#ifdef __mips_n32 +typedef struct _jmp_buf { long long _jb[_JBLEN + 1]; } jmp_buf[1]; +#else typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1]; +#endif #endif /* __ASSEMBLER__ */ #endif /* _LOCORE */ From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 13:52:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F9BD106566C; Mon, 1 Mar 2010 13:52:35 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 500158FC0A; Mon, 1 Mar 2010 13:52:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21DqZne016606; Mon, 1 Mar 2010 13:52:35 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21DqZCi016605; Mon, 1 Mar 2010 13:52:35 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201003011352.o21DqZCi016605@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 1 Mar 2010 13:52:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204516 - user/luigi/ipfw3-head/sbin/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 13:52:35 -0000 Author: luigi Date: Mon Mar 1 13:52:34 2010 New Revision: 204516 URL: http://svn.freebsd.org/changeset/base/204516 Log: remember to check this at some point Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c ============================================================================== --- user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Mon Mar 1 12:11:37 2010 (r204515) +++ user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Mon Mar 1 13:52:34 2010 (r204516) @@ -2514,6 +2514,7 @@ add_dstip(ipfw_insn *cmd, char *av) static ipfw_insn * add_ports(ipfw_insn *cmd, char *av, u_char proto, int opcode) { + /* XXX "any" is trapped before. Perhaps "to" */ if (_substrcmp(av, "any") == 0) { return NULL; } else if (fill_newports((ipfw_insn_u16 *)cmd, av, proto)) { From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 13:55:29 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B51D106567E; Mon, 1 Mar 2010 13:55:29 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A2ED8FC19; Mon, 1 Mar 2010 13:55:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21DtTCk017272; Mon, 1 Mar 2010 13:55:29 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21DtT67017270; Mon, 1 Mar 2010 13:55:29 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201003011355.o21DtT67017270@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 1 Mar 2010 13:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204517 - user/luigi/ipfw3-head/sbin/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 13:55:29 -0000 Author: luigi Date: Mon Mar 1 13:55:28 2010 New Revision: 204517 URL: http://svn.freebsd.org/changeset/base/204517 Log: start documenting the new features. Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw.8 Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw.8 ============================================================================== --- user/luigi/ipfw3-head/sbin/ipfw/ipfw.8 Mon Mar 1 13:52:34 2010 (r204516) +++ user/luigi/ipfw3-head/sbin/ipfw/ipfw.8 Mon Mar 1 13:55:28 2010 (r204517) @@ -6,8 +6,10 @@ .Os .Sh NAME .Nm ipfw -.Nd IP firewall and traffic shaper control program +.Nd User interface for firewall, traffic shaper, packet scheduler, +in-kernel NAT. .Sh SYNOPSIS +.Ss FIREWALL CONFIGURATION .Nm .Op Fl cq .Cm add @@ -26,12 +28,6 @@ .Op Cm set Ar N .Brq Cm delete | zero | resetlog .Op Ar number ... -.Nm -.Cm enable -.Brq Cm firewall | altq | one_pass | debug | verbose | dyn_keepalive -.Nm -.Cm disable -.Brq Cm firewall | altq | one_pass | debug | verbose | dyn_keepalive .Pp .Nm .Cm set Oo Cm disable Ar number ... Oc Op Cm enable Ar number ... @@ -43,8 +39,17 @@ .Cm set swap Ar number number .Nm .Cm set show +.Ss SYSCTL SHORTCUTS .Pp .Nm +.Cm enable +.Brq Cm firewall | altq | one_pass | debug | verbose | dyn_keepalive +.Nm +.Cm disable +.Brq Cm firewall | altq | one_pass | debug | verbose | dyn_keepalive +.Pp +.Ss LOOKUP TABLES +.Nm .Cm table Ar number Cm add Ar addr Ns Oo / Ns Ar masklen Oc Op Ar value .Nm .Cm table Ar number Cm delete Ar addr Ns Op / Ns Ar masklen @@ -57,17 +62,19 @@ .Brq Ar number | all .Cm list .Pp +.Ss DUMMYNET CONFIGURATION (TRAFFIC SHAPER AND PACKET SCHEDULER) .Nm -.Brq Cm pipe | queue +.Brq Cm pipe | queue | sched .Ar number .Cm config .Ar config-options .Nm .Op Fl s Op Ar field -.Brq Cm pipe | queue +.Brq Cm pipe | queue | sched .Brq Cm delete | list | show .Op Ar number ... .Pp +.Ss IN-KERNEL NAT .Nm .Op Fl q .Cm nat @@ -89,28 +96,27 @@ The .Nm utility is the user interface for controlling the .Xr ipfw 4 -firewall and the +firewall, the .Xr dummynet 4 -traffic shaper in -.Fx . +traffic shaper/packet scheduler, and the +in-kernel NAT services. .Pp -An -.Nm -configuration, or +A firewall configuration, or .Em ruleset , is made of a list of .Em rules numbered from 1 to 65535. -Packets are passed to -.Nm +Packets are passed to the firewall from a number of different places in the protocol stack (depending on the source and destination of the packet, -it is possible that -.Nm -is invoked multiple times on the same packet). +it is possible for the firewall to be +invoked multiple times on the same packet). The packet passed to the firewall is compared -against each of the rules in the firewall -.Em ruleset . +against each of the rules in the +.Em ruleset , +in rule-number order +(multiple rules with the same number are permitted, in which case +they are processed in order of insertion). When a match is found, the action corresponding to the matching rule is performed. .Pp @@ -118,9 +124,7 @@ Depending on the action and certain syst can be reinjected into the firewall at some rule after the matching one for further processing. .Pp -An -.Nm -ruleset always includes a +A ruleset always includes a .Em default rule (numbered 65535) which cannot be modified or deleted, and matches all packets. @@ -137,14 +141,14 @@ If the ruleset includes one or more rule or .Cm limit option, -.Nm -will have a +the firewall will have a .Em stateful -behaviour, i.e., upon a match it will create dynamic rules matching -the exact parameters (source and destination addresses and ports) -of the matching packet. -.Pp -These dynamic rules, which have a limited lifetime, are checked +behaviour, i.e., upon a match it will create +.Em dynamic rules , +i.e. rules that match packets with the same 5-tuple +(protocol, source and destination addresses and ports) +as the packet which caused their creation. +Dynamic rules, which have a limited lifetime, are checked at the first occurrence of a .Cm check-state , .Cm keep-state @@ -283,6 +287,7 @@ When listing, show last match timestamp This form can be more convenient for postprocessing by scripts. .El .Pp +.Ss LIST OF RULES AND PREPROCESSING To ease configuration, rules can be put into a file which is processed using .Nm @@ -322,14 +327,16 @@ This allows for flexible configuration f them on the local hostname) and the use of macros to centralize frequently required arguments like IP addresses. .Pp +.Ss TRAFFIC SHAPER CONFIGURATION The .Nm -.Cm pipe +.Cm pipe , queue and -.Cm queue -commands are used to configure the traffic shaper, as shown in the +.Cm sched +commands are used to configure the traffic shaper and packet scheduler. +See the .Sx TRAFFIC SHAPER (DUMMYNET) CONFIGURATION -Section below. +Section below for details. .Pp If the world and the kernel get out of sync the .Nm @@ -362,7 +369,7 @@ have this picture in mind in order to de | to devices | .Ed .Pp -As can be noted from the above picture, the number of +The number of times the same packet goes through the firewall can vary between 0 and 4 depending on packet source and destination, and system configuration. @@ -421,9 +428,9 @@ Keywords are case-sensitive, whereas arg or may not be case-sensitive depending on their nature (e.g.\& uid's are, hostnames are not). .Pp -In -.Nm ipfw2 -you can introduce spaces after commas ',' to make +Some arguments (e.g. port or address lists) are comma-separated +lists of values. +In this case, spaces after commas ',' are allowed to make the line more readable. You can also put the entire command (including flags) into a single argument. @@ -434,9 +441,7 @@ ipfw -q add deny src-ip 10.0.0.0/24, 127 ipfw "-q add deny src-ip 10.0.0.0/24, 127.0.0.1/8" .Ed .Sh RULE FORMAT -The format of -.Nm -rules is the following: +The format of firewall rules is the following: .Bd -ragged -offset indent .Bk -words .Op Ar rule_number @@ -496,7 +501,7 @@ in future forwarding decisions. .El .Pp Note that some of the above information, e.g.\& source MAC or IP addresses and -TCP/UDP ports, could easily be spoofed, so filtering on those fields +TCP/UDP ports, can be easily spoofed, so filtering on those fields alone might not guarantee the desired results. .Bl -tag -width indent .It Ar rule_number @@ -1643,15 +1648,17 @@ because it engages only on packets with connected networks instead of all source addresses. .El .Sh LOOKUP TABLES -Lookup tables are useful to handle large sparse address sets, -typically from a hundred to several thousands of entries. +Lookup tables are useful to handle large sparse sets of +addresses or other search keys (e.g. ports, jail IDs). +In the rest of this section we will use the term ``address'' +to mean any unsigned value of up to 32-bit. There may be up to 128 different lookup tables, numbered 0 to 127. .Pp Each entry is represented by an .Ar addr Ns Op / Ns Ar masklen and will match all addresses with base .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a hostname or an unsigned integer) and mask width of .Ar masklen bits. @@ -1669,9 +1676,9 @@ is not specified, it defaults to 0. .Pp An entry can be added to a table .Pq Cm add , -removed from a table -.Pq Cm delete , -a table can be examined +or removed from a table +.Pq Cm delete . +A table can be examined .Pq Cm list or flushed .Pq Cm flush . @@ -1680,7 +1687,7 @@ Internally, each table is stored in a Ra the routing table (see .Xr route 4 ) . .Pp -Lookup tables currently support IPv4 addresses only. +Lookup tables currently support only ports, jail IDs and IPv4 addresses. .Pp The .Cm tablearg @@ -1838,7 +1845,7 @@ for more examples on how to use dynamic .Nm is also the user interface for the .Nm dummynet -traffic shaper and network emulator, a subsystem that +traffic shaper, packet scheduler and network emulator, a subsystem that can artificially queue, delay or drop packets emulator the behaviour of certain network links or queueing systems. @@ -1858,17 +1865,17 @@ Packets are queued in front of the pipe and then transferred to the pipe according to the pipe's parameters. .It Em queue A queue -is an abstraction used to implement the WF2Q+ -(Worst-case Fair Weighted Fair Queueing) policy, which is -an efficient variant of the WFQ policy. +is an abstraction used to implement packet scheduling +using one of several packet scheduling algorithms. .Pp The queue associates a .Em weight -and a reference pipe to each flow (a flow is a set of packets +and a reference scheduler to each flow (a flow is a set of packets with the same addresses and ports after masking). -All backlogged flows (i.e., those -with packets queued) linked to the same pipe share the pipe's -bandwidth proportionally to their weights. +A scheduler in turn is connected to a pipe, and arbitrates +the pipe's bandwidth among backlogged flows according to +weights and to the features of the scheduling algorithm in use. +.Pp Note that weights are not priorities; a flow with a lower weight is still guaranteed to get its fraction of the bandwidth even if a flow with a higher weight is permanently backlogged. @@ -1911,16 +1918,19 @@ mode can be enabled by setting the .Xr sysctl 8 variable to a non-zero value. .Pp -.Ss PIPE AND QUEUE CONFIGURATION +.Ss PIPE, QUEUE AND SCHEDULER CONFIGURATION The -.Em pipe -and +.Em pipe , .Em queue +and +.Em scheduler configuration commands are the following: .Bd -ragged -offset indent .Cm pipe Ar number Cm config Ar pipe-configuration .Pp .Cm queue Ar number Cm config Ar queue-configuration +.Pp +.Cm sched Ar number Cm config Ar sched-configuration .Ed .Pp The following parameters can be configured for a pipe: @@ -2073,6 +2083,14 @@ Specifies the weight to be used for flow The weight must be in the range 1..100, and defaults to 1. .El .Pp +The following parameters can be configured for a scheduler: +.Pp +.Bl -tag -width indent -compact +.It Cm type Ar {fifo | wf2qp | rr | qfq} +.El +.Pp +plus all the parameters allowed for a pipe. +.Pp Finally, the following parameters can be configured for both pipes and queues: .Pp From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 19:12:40 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B8FE106567C; Mon, 1 Mar 2010 19:12:40 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C1198FC22; Mon, 1 Mar 2010 19:12:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21JCeer091387; Mon, 1 Mar 2010 19:12:40 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21JCe68091385; Mon, 1 Mar 2010 19:12:40 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003011912.o21JCe68091385@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 19:12:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204527 - user/jmallett/octeon/lib/libc/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 19:12:40 -0000 Author: jmallett Date: Mon Mar 1 19:12:40 2010 New Revision: 204527 URL: http://svn.freebsd.org/changeset/base/204527 Log: Add n32 and n64 style PIC prologues, etc. Submitted by: imp Modified: user/jmallett/octeon/lib/libc/mips/SYS.h Modified: user/jmallett/octeon/lib/libc/mips/SYS.h ============================================================================== --- user/jmallett/octeon/lib/libc/mips/SYS.h Mon Mar 1 18:58:18 2010 (r204526) +++ user/jmallett/octeon/lib/libc/mips/SYS.h Mon Mar 1 19:12:40 2010 (r204527) @@ -79,10 +79,19 @@ */ #ifdef __ABICALLS__ .abicalls -# define PIC_PROLOGUE(x,sr) .set noreorder; .cpload sr; .set reorder +#if defined (__mips_n64) || defined(__mips_n32) +# define PIC_PROLOGUE(x,sr) subu sp,sp,8; sd gp, 0(sp); .cpsetup $25, $24, ## x; +# define PIC_RESTORE ld gp, 0(sp); addu sp,sp,8; +# define PIC_CALL(l,sr) la sr, _C_LABEL(l); ld gp, 0(sp); addu sp,sp,8; jr sr +#else +# define PIC_PROLOGUE(x,sr) .set noreorder; .cpload sr; .set reorder +# define PIC_RESTORE # define PIC_CALL(l,sr) la sr, _C_LABEL(l); jr sr +#endif + #else # define PIC_PROLOGUE(x,sr) +# define PIC_RESTORE # define PIC_CALL(l,sr) j _C_LABEL(l) #endif @@ -123,6 +132,8 @@ LEAF(__sys_ ## x); \ PIC_PROLOGUE(x,t9); \ SYSTRAP(x); \ bne a3,zero,err; \ + nop; \ + PIC_RESTORE; \ j ra; \ err: \ PIC_CALL(__cerror,t9); \ From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 20:42:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 452581065677; Mon, 1 Mar 2010 20:42:30 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A24A8FC21; Mon, 1 Mar 2010 20:42:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21KgT73011864; Mon, 1 Mar 2010 20:42:29 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21KgT7j011862; Mon, 1 Mar 2010 20:42:29 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003012042.o21KgT7j011862@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 20:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204534 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 20:42:30 -0000 Author: jmallett Date: Mon Mar 1 20:42:29 2010 New Revision: 204534 URL: http://svn.freebsd.org/changeset/base/204534 Log: Add support for N32 and N64 syscalls -- take additional arguments from ta[0-4]. XXX I did this by breaking O32 support, but I only care about N32 right now. Modified: user/jmallett/octeon/sys/mips/mips/trap.c Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 1 20:41:27 2010 (r204533) +++ user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 1 20:42:29 2010 (r204534) @@ -286,7 +286,6 @@ trap(struct trapframe *trapframe) pt_entry_t *pte; unsigned int entry; pmap_t pmap; - int quad_syscall = 0; int access_type; ksiginfo_t ksi; char *msg = NULL; @@ -632,6 +631,7 @@ dofault: switch (code) { case SYS_syscall: + case SYS___syscall: /* * Code is first argument, followed by * actual args. @@ -640,24 +640,11 @@ dofault: args[0] = locr0->a1; args[1] = locr0->a2; args[2] = locr0->a3; - nsaved = 3; - break; - - case SYS___syscall: - /* - * Like syscall, but code is a quad, so as - * to maintain quad alignment for the rest - * of the arguments. - */ - if (_QUAD_LOWWORD == 0) { - code = locr0->a0; - } else { - code = locr0->a1; - } - args[0] = locr0->a2; - args[1] = locr0->a3; - nsaved = 2; - quad_syscall = 1; + args[3] = locr0->t4; + args[4] = locr0->t5; + args[5] = locr0->t6; + args[6] = locr0->t7; + nsaved = 7; break; default: @@ -665,7 +652,11 @@ dofault: args[1] = locr0->a1; args[2] = locr0->a2; args[3] = locr0->a3; - nsaved = 4; + args[4] = locr0->t4; + args[5] = locr0->t5; + args[6] = locr0->t6; + args[7] = locr0->t7; + nsaved = 8; } #ifdef TRAP_DEBUG printf("SYSCALL #%d pid:%u\n", code, p->p_pid); @@ -695,6 +686,11 @@ dofault: goto done; } } +#ifdef TRAP_DEBUG + for (i = 0; i < nargs; i++) { + printf("args[%d] = %#llx\n", i, args[i]); + } +#endif #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, nargs, args); From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 21:30:45 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 171BC1065674; Mon, 1 Mar 2010 21:30:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 068ED8FC2F; Mon, 1 Mar 2010 21:30:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21LUiA3022743; Mon, 1 Mar 2010 21:30:44 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21LUiTg022741; Mon, 1 Mar 2010 21:30:44 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201003012130.o21LUiTg022741@svn.freebsd.org> From: Doug Barton Date: Mon, 1 Mar 2010 21:30:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204538 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 21:30:45 -0000 Author: dougb Date: Mon Mar 1 21:30:44 2010 New Revision: 204538 URL: http://svn.freebsd.org/changeset/base/204538 Log: Continue the setting of reasonable defaults when bsd.port.mk is not available for PACKAGES, FETCH_ARGS, and LOCALBASE. For the first two make a corresponding change to use upper case variable names to match what's in bsd.port.mk. This will make the documentation easier when explaining what values the user may want to supply. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Mar 1 21:30:11 2010 (r204537) +++ user/dougb/portmaster/portmaster Mon Mar 1 21:30:44 2010 (r204538) @@ -1217,40 +1217,50 @@ check_for_updates () { return 0 } -init_packages () { - # Global: packages pbu - local pkgrep +init_packages_var () { + # Global: PACKAGES - packages=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES` - [ -n "$packages" ] || fail 'The value of PACKAGES cannot be empty' + [ -n "$PACKAGES" ] && return - # Compatibility shim for users who had previously defined this - pkgrep=`pm_make -f/usr/share/mk/bsd.port.mk -V PKGREPOSITORY` - if [ ! "$packages" = "${pkgrep%/All}" ]; then - echo '' - echo "===>>> The PACKAGES and PKGREPOSITORY variables conflict" - fail "Set PACKAGES only - 'man portmaster' for more information" + PACKAGES=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES 2>/dev/null` + if [ -z "$PACKAGES" ]; then + if [ -d /usr/ports/packages ]; then + PACKAGES='/usr/ports/packages' + else + if [ -d /usr/ports/ ]; then + PACKAGES='/usr/ports/packages' + else + fail 'The value of PACKAGES cannot be empty' + fi + fi fi + export PACKAGES +} + +init_packages () { + # Global: pbu - pbu=$packages/portmaster-backup + init_packages_var + + pbu=$PACKAGES/portmaster-backup if [ ! -d "$pbu" ]; then [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Creating $pbu" pm_mkdir_s $pbu fi - export packages pbu + export pbu } pm_pkg_create () { local pkgdir - if [ "$1" = "${packages}" ]; then + if [ "$1" = "$PACKAGES" ]; then for pkgdir in All Latest ${portdir%/*}; do - pm_mkdir_s ${packages}/${pkgdir} || - fail "Cannot mkdir -p ${packages}/${pkgdir}" + pm_mkdir_s ${PACKAGES}/${pkgdir} || + fail "Cannot mkdir -p ${PACKAGES}/${pkgdir}" done - pkgdir=${packages}/All + pkgdir=${PACKAGES}/All echo "===>>> Creating a package for new version $2" else pkgdir=$1 @@ -1266,7 +1276,7 @@ pm_pkg_create () { local pkg ; pkg=`echo $2.*` NB_DELETE="${NB_DELETE}${pkg} " fi - elif [ "$1" = "${packages}" ]; then + elif [ "$1" = "$PACKAGES" ]; then local pkg latest_link pkg=`echo $2.*` @@ -1651,7 +1661,7 @@ if [ -n "$CLEAN_STALE" ]; then read answer case "$answer" in [yY]) if [ -n "$BACKUP" ]; then - [ -z "$packages" ] && init_packages + [ -z "$PACKAGES" ] && init_packages pm_pkg_create $pbu $iport fi @@ -2258,10 +2268,21 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S PM_DEPTH='' ; IPC_SAVE=`pm_mktemp IPC_SAVE` export CUR_DEPS DISPLAY_LIST INSTALLED_LIST PM_DEPTH IPC_SAVE - PORTS_LOCALBASE=`pm_make_b -f/usr/share/mk/bsd.port.mk -V LOCALBASE` - [ -n "$PORTS_LOCALBASE" ] || - fail 'The value of LOCALBASE cannot be empty' - LOCALBASE_COMPAT="$PORTS_LOCALBASE/lib/compat" + if [ -n "$LOCALBASE" ]; then + LOCALBASE_COMPAT="$LOCALBASE/lib/compat" + else + PLB=`pm_make_b -f/usr/share/mk/bsd.port.mk -V LOCALBASE 2>/dev/null` + if [ -n "$PLB" ]; then + LOCALBASE_COMPAT="$PLB/lib/compat" + else + if [ -d /usr/local ]; then + LOCALBASE_COMPAT='/usr/local/lib/compat' + else + fail 'The value of LOCALBASE cannot be empty' + fi + fi + unset PLB + fi export LOCALBASE_COMPAT if [ -n "$INTERACTIVE_UPDATE" ]; then @@ -2762,12 +2783,8 @@ fetch_package () { local do_fetch if [ -z "$ppd" ]; then - # Duplicated from pkg_init() - [ -z "$packages" ] && - packages=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES` - [ -n "$packages" ] || - fail 'The value of PACKAGES cannot be empty' - ppd=$packages/portmaster-download + init_packages_var + ppd=$PACKAGES/portmaster-download export ppd fi @@ -2776,9 +2793,11 @@ fetch_package () { pm_mkdir_s $ppd fi - [ -z "$fetch_args" ] && { - fetch_args=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS`; - export fetch_args; } + if [ -z "$FETCH_ARGS" ]; then + FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null` + [ -n "$FETCH_ARGS" ] || FETCH_ARGS='-ApRr' + export FETCH_ARGS + fi if [ -z "$PM_ALWAYS_FETCH" ]; then if [ -r "${ppd}/${1}.tbz" ]; then @@ -2801,9 +2820,9 @@ fetch_package () { fi fi - fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { + fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { pm_unlink_s ${ppd}/${1}.tbz; - fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } + fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } fi } if [ -z "$PACKAGESITE" ]; then @@ -3175,9 +3194,9 @@ if [ -n "$MAKE_PACKAGE" ]; then echo "===>>> Creating a package for new version $new_port" pm_make_s package >/dev/null || fail "Package creation of $new_port failed" - echo " ===>>> Package saved to $packages/All" ; echo '' + echo " ===>>> Package saved to $PACKAGES/All" ; echo '' else - pm_pkg_create $packages $new_port + pm_pkg_create $PACKAGES $new_port fi fi From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 05:32:00 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55C70106566B; Tue, 2 Mar 2010 05:32:00 +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 EC65D8FC14; Tue, 2 Mar 2010 05:31:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o225UYTD057034; Mon, 1 Mar 2010 22:30:34 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 01 Mar 2010 22:30:49 -0700 (MST) Message-Id: <20100301.223049.864843819497816567.imp@bsdimp.com> To: jmallett@freebsd.org From: "M. Warner Losh" In-Reply-To: <201003010521.o215LZqd002772@svn.freebsd.org> References: <201003010521.o215LZqd002772@svn.freebsd.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r204507 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 05:32:00 -0000 In message: <201003010521.o215LZqd002772@svn.freebsd.org> Juli Mallett writes: : Author: jmallett : Date: Mon Mar 1 05:21:35 2010 : New Revision: 204507 : URL: http://svn.freebsd.org/changeset/base/204507 : : Log: : o) Adjust ptr and register macros for assembly wrt ABI in a way that ought to : work better. Need to check for places where the assembly assumes pointers : are register width, I guess. NetBSD has much better asm.h foo, which I'd hoped to import to help with this problem... Warner : Modified: : user/jmallett/octeon/sys/mips/include/asm.h : user/jmallett/octeon/sys/mips/mips/locore.S : : Modified: user/jmallett/octeon/sys/mips/include/asm.h : ============================================================================== : --- user/jmallett/octeon/sys/mips/include/asm.h Mon Mar 1 04:46:07 2010 (r204506) : +++ user/jmallett/octeon/sys/mips/include/asm.h Mon Mar 1 05:21:35 2010 (r204507) : @@ -362,16 +362,13 @@ _C_LABEL(x): : * ABI calls. : */ : : -#if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 : -/* #if !defined(__mips_n64) */ : +#if !defined(__mips_n32) && !defined(__mips_n64) : #define REG_L lw : #define REG_S sw : #define REG_LI li : #define REG_PROLOGUE .set push : #define REG_EPILOGUE .set pop : #define SZREG 4 : -#define PTR_LA la : -#define PTR_ADDU addu : #else : #define REG_L ld : #define REG_S sd : @@ -379,9 +376,19 @@ _C_LABEL(x): : #define REG_PROLOGUE .set push ; .set mips3 : #define REG_EPILOGUE .set pop : #define SZREG 8 : +#endif : + : +#if !defined(__mips_n64) : +#define PTR_LA la : +#define PTR_ADDU addu : +#define PTR_L lw : +#define PTR_S sw : +#else : #define PTR_LA dla : #define PTR_ADDU daddu : -#endif /* _MIPS_BSD_API */ : +#define PTR_L ld : +#define PTR_S sd : +#endif : : #define mfc0_macro(data, spr) \ : __asm __volatile ("mfc0 %0, $%1" \ : : Modified: user/jmallett/octeon/sys/mips/mips/locore.S : ============================================================================== : --- user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 04:46:07 2010 (r204506) : +++ user/jmallett/octeon/sys/mips/mips/locore.S Mon Mar 1 05:21:35 2010 (r204507) : @@ -178,7 +178,7 @@ VECTOR(_locore, unknown) : nop : : PTR_LA sp, _C_LABEL(thread0) : - REG_L a0, TD_PCB(sp) : + PTR_L a0, TD_PCB(sp) : REG_LI t0, ~7 : and a0, a0, t0 : subu sp, a0, START_FRAME : From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 05:32:43 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7236106566B; Tue, 2 Mar 2010 05:32:43 +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 73C238FC13; Tue, 2 Mar 2010 05:32:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o225QsEb057024; Mon, 1 Mar 2010 22:26:54 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 01 Mar 2010 22:27:08 -0700 (MST) Message-Id: <20100301.222708.986891133540166335.imp@bsdimp.com> To: rdivacky@freebsd.org From: "M. Warner Losh" In-Reply-To: <20100228205005.GA4003@freebsd.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> <20100228205005.GA4003@freebsd.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: src-committers@freebsd.org, svn-src-user@freebsd.org, edwin@freebsd.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 05:32:44 -0000 In message: <20100228205005.GA4003@freebsd.org> Roman Divacky writes: : On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: : > Author: edwin : > Date: Sun Feb 28 20:36:24 2010 : > New Revision: 204479 : > URL: http://svn.freebsd.org/changeset/base/204479 : > : > Log: : > Do some work on ncal while we're at it. : : I have a patch that implementes "cal -3" are you interested in it? I can finally get of my script then :) Warner #!/bin/sh ######## # cal3 - 3-month calendar printer ######## case $# in 0|1) eval `date "+M=${1:-%m} Y=${2:-%Y}"`;; 2) M=$1 Y=$2;; *) echo "Usage: $0 [month [year]]" >&2; exit 2;; esac bc <1) {m-1; y}; if (m==1) {12; y-1} /* prev month */ m; y /* this month */ if (m<12) {m+1; y}; if (m==12) {1; y+1} /* next month */ ! exit 0 From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 05:35:04 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87BEA106564A; Tue, 2 Mar 2010 05:35:04 +0000 (UTC) (envelope-from juli@clockworksquid.com) Received: from qw-out-2122.google.com (qw-out-2122.google.com [74.125.92.26]) by mx1.freebsd.org (Postfix) with ESMTP id 39A3D8FC0A; Tue, 2 Mar 2010 05:35:03 +0000 (UTC) Received: by qw-out-2122.google.com with SMTP id 8so771819qwh.7 for ; Mon, 01 Mar 2010 21:34:55 -0800 (PST) MIME-Version: 1.0 Sender: juli@clockworksquid.com Received: by 10.224.53.80 with SMTP id l16mr2985951qag.345.1267508095109; Mon, 01 Mar 2010 21:34:55 -0800 (PST) In-Reply-To: <20100301.223049.864843819497816567.imp@bsdimp.com> References: <201003010521.o215LZqd002772@svn.freebsd.org> <20100301.223049.864843819497816567.imp@bsdimp.com> From: Juli Mallett Date: Mon, 1 Mar 2010 21:34:35 -0800 X-Google-Sender-Auth: 9a6723f8c02819c6 Message-ID: To: "M. Warner Losh" Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r204507 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 05:35:04 -0000 On Mon, Mar 1, 2010 at 21:30, M. Warner Losh wrote: > In message: <201003010521.o215LZqd002772@svn.freebsd.org> > =A0 =A0 =A0 =A0 =A0 =A0Juli Mallett writes: > : Author: jmallett > : Date: Mon Mar =A01 05:21:35 2010 > : New Revision: 204507 > : URL: http://svn.freebsd.org/changeset/base/204507 > : > : Log: > : =A0 o) Adjust ptr and register macros for assembly wrt ABI in a way tha= t ought to > : =A0 =A0 =A0work better. =A0Need to check for places where the assembly = assumes pointers > : =A0 =A0 =A0are register width, I guess. > > NetBSD has much better asm.h foo, which I'd hoped to import to help > with this problem... I think that's a great idea =97 especially now that they have n32 and n64 support. Likewise for their PIC and GP macros. In general I'd hope to have time to spend cleaning up mips/include =97 I took a swipe at some KSEG related things, for example. There's a lot of duplication and a large number of vestigal interfaces, types and declarations. The duplication is especially worrying as we move towards 64-bit support, where a stray macro in an underused port can be terribly hard to track down as the source of corruption or invalid addresses. Juli. From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 05:40:02 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08A8A106566C; Tue, 2 Mar 2010 05:40:02 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC7458FC1A; Tue, 2 Mar 2010 05:40:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o225e1ai033509; Tue, 2 Mar 2010 05:40:01 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o225e1jx033508; Tue, 2 Mar 2010 05:40:01 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003020540.o225e1jx033508@svn.freebsd.org> From: Juli Mallett Date: Tue, 2 Mar 2010 05:40:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204547 - user/jmallett/octeon/lib/libc/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 05:40:02 -0000 Author: jmallett Date: Tue Mar 2 05:40:01 2010 New Revision: 204547 URL: http://svn.freebsd.org/changeset/base/204547 Log: Revert r204527. Modified: user/jmallett/octeon/lib/libc/mips/SYS.h Modified: user/jmallett/octeon/lib/libc/mips/SYS.h ============================================================================== --- user/jmallett/octeon/lib/libc/mips/SYS.h Tue Mar 2 01:56:55 2010 (r204546) +++ user/jmallett/octeon/lib/libc/mips/SYS.h Tue Mar 2 05:40:01 2010 (r204547) @@ -79,19 +79,10 @@ */ #ifdef __ABICALLS__ .abicalls -#if defined (__mips_n64) || defined(__mips_n32) -# define PIC_PROLOGUE(x,sr) subu sp,sp,8; sd gp, 0(sp); .cpsetup $25, $24, ## x; -# define PIC_RESTORE ld gp, 0(sp); addu sp,sp,8; -# define PIC_CALL(l,sr) la sr, _C_LABEL(l); ld gp, 0(sp); addu sp,sp,8; jr sr -#else -# define PIC_PROLOGUE(x,sr) .set noreorder; .cpload sr; .set reorder -# define PIC_RESTORE +# define PIC_PROLOGUE(x,sr) .set noreorder; .cpload sr; .set reorder # define PIC_CALL(l,sr) la sr, _C_LABEL(l); jr sr -#endif - #else # define PIC_PROLOGUE(x,sr) -# define PIC_RESTORE # define PIC_CALL(l,sr) j _C_LABEL(l) #endif @@ -132,8 +123,6 @@ LEAF(__sys_ ## x); \ PIC_PROLOGUE(x,t9); \ SYSTRAP(x); \ bne a3,zero,err; \ - nop; \ - PIC_RESTORE; \ j ra; \ err: \ PIC_CALL(__cerror,t9); \ From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 06:02:01 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44EDA1065677; Tue, 2 Mar 2010 06:02:01 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 344A88FC1E; Tue, 2 Mar 2010 06:02:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22621rk038443; Tue, 2 Mar 2010 06:02:01 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22621QE038441; Tue, 2 Mar 2010 06:02:01 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201003020602.o22621QE038441@svn.freebsd.org> From: Doug Barton Date: Tue, 2 Mar 2010 06:02:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204550 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 06:02:01 -0000 Author: dougb Date: Tue Mar 2 06:02:01 2010 New Revision: 204550 URL: http://svn.freebsd.org/changeset/base/204550 Log: Next steps in --index-only support: 1. In usage() show that --index and --index-only are mutually exclusive 2. Conditionalize cd'ing to the portdir in a lot more places 3. Add gen_dep_list() to generate a list of dependencies either by using the old method or from parsing the INDEX file and use it when needed. 4. Add use of the INDEX to figure out the "new" version of the port 5. When using --index-only we can find the expected value of PORTSDIR and LOCALBASE from the INDEX file. For the former this requires moving the parsing of the INDEX up above setting PORTSDIR. Other changes: pd and pdb are used too many places to change them all, so introduce tests for PORTSDIR and PKG_DBDIR being set in the environment so that the user can set familiar variables on the rc file. New Feature: Add a --delete-packages option to delete the package after we're done installing it. Bug Fixes: 1. Use pm_cd_pd() more consistently 2. The fetch and pkg_add commands both require $PM_SU_CMD Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Mar 2 05:59:14 2010 (r204549) +++ user/dougb/portmaster/portmaster Tue Mar 2 06:02:01 2010 (r204550) @@ -251,8 +251,8 @@ usage () { echo "Common flags: [--force-config] [-CGHKgntvw B|b f|i D|d]" echo " [[--packages|--packages-only] [-P|-PP] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" - echo " [--local-packagedir=] [--no-confirm] [--no-term-title]" - echo " [--index] [--index-only]" + echo " [--local-packagedir=] [--delete-packages]" + echo " [--no-confirm] [--no-term-title] [--index|--index-only]" echo " [-m ] [-x ]" echo "${0##*/} [Common flags] " echo "${0##*/} [Common flags] " @@ -332,6 +332,7 @@ usage () { echo '--always-fetch fetch package even if it already exists locally' echo '--local-packagedir= where local packages can be found,' echo ' will fall back to fetching if no local version exists' + echo '--delete-packages after installing from a package, delete it' echo '' echo '-l list installed ports by category' echo '-L list installed ports by category, and search for updates' @@ -423,6 +424,8 @@ for var in "$@" ; do export PM_ALWAYS_FETCH ;; --local-packagedir=*) LOCAL_PACKAGEDIR=${var#--local-packagedir=} export LOCAL_PACKAGEDIR ;; + --delete-packages) PM_DELETE_PACKAGES=pm_delete_packages + export PM_DELETE_PACKAGES ;; -[A-Za-z0-9]*) newopts="$newopts $var" ;; --delete-build-only) PM_DEL_BUILD_ONLY=pm_dbo export PM_DEL_BUILD_ONLY ;; @@ -451,42 +454,6 @@ done # Do this here so it can use the fancy functions above, and default values # can be overridden in the rc files if [ "$$" -eq "$PM_PARENT_PID" ]; then - if [ -z "$pd" ]; then - pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null` - [ -n "$pd" -o -n "$PM_INDEX_ONLY" ] || - fail 'The value of PORTSDIR cannot be empty' - fi - if [ -z "$pdb" ]; then - pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` - if [ -z "$pdb" ]; then - if [ -d /var/db/pkg ]; then - pdb='/var/db/pkg' - else - fail 'The value of PKG_DBDIR cannot be empty' - fi - fi - fi - if [ -z "$distdir" -a "$PM_PACKAGES" != only ]; then - distdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V DISTDIR 2>/dev/null` - # In case it is a symlink - distdir="${distdir%/}/" - fi - if [ -z "$port_dbdir" ]; then - port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null` - [ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir='/var/db/ports' - [ -n "$port_dbdir" ] && export port_dbdir - fi - - export pd pdb distdir - - if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then - PM_BUILD_ONLY_LIST=pm_bol - export PM_BUILD_ONLY_LIST - fi - if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then - [ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] && - fail Package installation support requires FreeBSD 6.4 or newer - fi # XXX @@ -520,17 +487,65 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Updating INDEX file" $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 if [ $index_time -ne `stat -f '%Ua' $PM_INDEX` ]; then -#echo '' ; echo "Debug> Updating INDEX" ; echo '' temp_index=`pm_mktemp index` bunzip2 < ${PM_INDEX}.bz2 > $temp_index pm_install_s $temp_index $PM_INDEX unlink $temp_index unset temp_index - else -#echo '' ; echo "Debug> NOT updating INDEX" ; echo '' fi unset index_time fi + + if [ -z "$pd" ]; then + if [ -z "$PORTSDIR" ]; then + pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null` + else + pd=$PORTSDIR + fi + if [ -z "$pd" ]; then + if [ -n "$PM_INDEX_ONLY" ]; then + pd=`head -1 $PM_INDEX | cut -f 2 -d\|` + pd=${pd%/*} + pd=${pd%/*} + fi + fi + [ -z "$pd" ] && fail 'The value of PORTSDIR cannot be empty' + fi + if [ -z "$pdb" ]; then + if [ -z "$PKG_DBDIR" ]; then + pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` + else + pdb=$PKG_DBDIR + fi + if [ -z "$pdb" ]; then + if [ -d /var/db/pkg ]; then + pdb='/var/db/pkg' + else + fail 'The value of PKG_DBDIR cannot be empty' + fi + fi + fi + if [ -z "$distdir" -a "$PM_PACKAGES" != only ]; then + distdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V DISTDIR 2>/dev/null` + # In case it is a symlink + distdir="${distdir%/}/" + fi + if [ -z "$port_dbdir" ]; then + port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null` + [ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir='/var/db/ports' + [ -n "$port_dbdir" ] && export port_dbdir + fi + + export pd pdb distdir + + if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then + PM_BUILD_ONLY_LIST=pm_bol + export PM_BUILD_ONLY_LIST + fi + if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then + [ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] && + fail Package installation support requires FreeBSD 6.4 or newer + fi fi set -- $newopts @@ -1140,9 +1155,7 @@ check_for_updates () { if [ -n "$PM_INDEX" ]; then port_ver=`parse_index $origin name` - check_pkg_version $iport $port_ver || { do_update=update_index ; -#echo ''; echo "Debug> Found one from the INDEX!"; echo ''; -} + check_pkg_version $iport $port_ver || { do_update=update_index ; } fi if [ -d "$pd/$origin" -a -z "$do_update" -a -z "$PM_INDEX_ONLY" ]; then @@ -1406,7 +1419,7 @@ set_distfiles_and_subdir () { [ -z "$dist_list_files" ] && find_dl_distfiles $1 if [ -d "$pd/$1" ]; then - pm_cd $pd/$1 || fail "cd to $pd/$1 failed" + pm_cd_pd $1 else return 1 fi @@ -1802,7 +1815,11 @@ update_build_l () { origin=`origin_from_pdb $1` ;; esac - pm_cd $pd/$origin && new_port=`pm_make -V PKGNAME` + if [ -z "$PM_INDEX_ONLY" ]; then + pm_cd $pd/$origin && new_port=`pm_make -V PKGNAME` + else + new_port=`parse_index $origin name` + fi case `pkg_version -t $iport $new_port 2>/dev/null` in \<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;; @@ -1893,6 +1910,32 @@ clean_build_only_list () { build_only_dl_g=" `uniquify_list $temp_bodlg` " } +gen_dep_list () { + local list + + if [ -z "$PM_INDEX_ONLY" ]; then + pm_cd_pd $portdir + list=`pm_make $1 | sort -u` + else + local temp_list l + + case "$1" in + 'build-depends-list run-depends-list'|all-depends-list) + temp_list="`parse_index $portdir b-deps` `parse_index $portdir r-deps`" ;; + build-depends-list) temp_list=`parse_index $portdir b-deps` ;; + run-depends-list) temp_list=`parse_index $portdir r-deps` ;; + esac + + temp_list=`uniquify_list $temp_list` + + for l in $temp_list ; do + list="$list `grep -m1 ^${l}\| $PM_INDEX | cut -f 2 -d \|`" + done + fi + + echo "$list" +} + dependency_check () { # Global: doing_dep_check # Global: run_dl_g build_only_dl_g @@ -1902,8 +1945,7 @@ dependency_check () { # Print a message here because sometimes list generation takes # a long time to return. echo "===>>> Gathering dependency list for $portdir from ports" - pm_cd_pd $portdir - d_port_list=`pm_make $1 | sort -u` + d_port_list=`gen_dep_list $1` if [ -z "$d_port_list" ]; then echo "===>>> No dependencies for $portdir" @@ -1922,11 +1964,11 @@ dependency_check () { if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then local rundeps dep varname run_dl build_only_dl - rundeps=`pm_make run-depends-list | sort -u` + rundeps=" `gen_dep_list run-depends-list` " for dep in $d_port_list; do case "$rundeps" in - *${dep}*) + *" ${dep} "*) varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'` rundep_list="$rundep_list $varname" eval $varname=\"$portdir \$$varname\" @@ -1941,7 +1983,7 @@ dependency_check () { if [ -z "$RECURSE_THOROUGH" ]; then d_port_list="$build_only_dl $run_dl" else - build_only_dl=`pm_make build-depends-list | sort -u` + build_only_dl=`gen_dep_list build-depends-list` fi run_dl_g="$run_dl_g $run_dl " @@ -1982,24 +2024,26 @@ dependency_check () { [ -z "$URB_YES" ] && case "$CUR_DEPS" in *:${origin}:*) continue ;; esac - conflicts='' - if pm_cd $d_port; then - grep -ql ^CONFLICTS Makefile && - conflicts=`pm_make_b -V CONFLICTS` - else - fail "Cannot cd to $d_port" - fi - for glob in $conflicts; do - confl_p=`pkg_info -I $glob 2>/dev/null` - if [ -n "$confl_p" ]; then - confl_p=${confl_p%% *} - echo '' - echo "===>>> The dependency for ${origin}" - echo " seems to be handled by $confl_p" - echo '' - d_port="$pd/`origin_from_pdb $confl_p`" - fi - done + if [ -z "$PM_INDEX_ONLY" ]; then + conflicts='' + if pm_cd $d_port; then + grep -ql ^CONFLICTS Makefile && + conflicts=`pm_make_b -V CONFLICTS` + else + fail "Cannot cd to $d_port" + fi + for glob in $conflicts; do + confl_p=`pkg_info -I $glob 2>/dev/null` + if [ -n "$confl_p" ]; then + confl_p=${confl_p%% *} + echo '' + echo "===>>> The dependency for ${origin}" + echo " seems to be handled by $confl_p" + echo '' + d_port="$pd/`origin_from_pdb $confl_p`" + fi + done + fi # In case d_port changed above origin="${d_port#$pd/}" ; iport=`iport_from_origin ${origin}` @@ -2275,8 +2319,9 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S if [ -n "$PLB" ]; then LOCALBASE_COMPAT="$PLB/lib/compat" else - if [ -d /usr/local ]; then - LOCALBASE_COMPAT='/usr/local/lib/compat' + PLB=`head -1 $PM_INDEX | cut -f 3 -d\|` + if [ -d "$PLB" ]; then + LOCALBASE_COMPAT="${PLB}/lib/compat" else fail 'The value of LOCALBASE cannot be empty' fi @@ -2519,7 +2564,7 @@ elif [ -z "$portdir" ]; then no_valid_port fi -if [ ! -d "$pd/$portdir" ]; then +if [ ! -d "$pd/$portdir" -a -z "$PM_INDEX_ONLY" ]; then find_moved_port $portdir $upg_port || no_valid_port [ -n "$moved_npd" ] || no_valid_port [ -d "$pd/$moved_npd" ] || no_valid_port @@ -2582,7 +2627,7 @@ fi # Should only be reached for multiport already built as a dependency case "$CONFIG_SEEN_LIST" in *:${portdir}:*) safe_exit ;; esac -pm_cd $pd/$portdir || no_valid_port +[ -z "$PM_INDEX_ONLY" ] && { pm_cd $pd/$portdir || no_valid_port; } if [ -z "$PM_DEPTH" ]; then PM_DEPTH="${upg_port:-$portdir} " @@ -2602,6 +2647,8 @@ fi echo '' [ "$$" -eq "$PM_PARENT_PID" -a -n "$upg_port" ] && echo "===>>> Currently installed version: $upg_port" + +if [ -z "$PM_INDEX_ONLY" ]; then echo "===>>> Port directory: $pd/$portdir" check_state || { @@ -2669,6 +2716,7 @@ dofetch () { echo '' fi fi +fi # [ -z "$PM_INDEX_ONLY" ] if [ -n "$CONFIG_ONLY" ]; then [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && @@ -2743,7 +2791,7 @@ fi [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain -pm_cd_pd $portdir +[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir if [ -n "$PM_BUILD_ONLY_LIST" ]; then case "$build_only_dl_g" in @@ -2765,7 +2813,7 @@ if [ -z "$NO_DEP_UPDATES" ]; then echo "===>>> Starting check for all dependencies" dependency_check all-depends-list fi - cd $pd/$portdir + [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir elif [ -z "$NO_RECURSIVE_CONFIG" -a "$$" -eq "$PM_PARENT_PID" ]; then echo "===>>> All dependencies are up to date" echo '' @@ -2776,7 +2824,13 @@ if [ -n "$NO_ACTION" -a -z "$CONFIG_ONLY safe_exit fi -[ -z "$new_port" ] && new_port=`pm_make -V PKGNAME` +if [ -z "$new_port" ]; then + if [ -z "$PM_INDEX_ONLY" ]; then + new_port=`pm_make -V PKGNAME` + else + new_port=`parse_index $portdir name` + fi +fi if [ -n "$PM_PACKAGES" -o "$PM_PACKAGES_BUILD" = doing_build_only_dep ]; then fetch_package () { @@ -2820,7 +2874,8 @@ fetch_package () { fi fi - fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { + [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Fetching ${1}.tbz" + $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { pm_unlink_s ${ppd}/${1}.tbz; fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } fi @@ -2853,14 +2908,21 @@ fetch_package () { echo "===>>> Checking package repository for latest available version" if [ -n "$LOCAL_PACKAGEDIR" ]; then - s=`pm_make -V LATEST_LINK` - if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.tbz" ]; then - local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.tbz - latest_pv=`readlink ${LOCAL_PACKAGEDIR}/Latest/${s}.tbz` - latest_pv=${latest_pv##*/} + if [ -z "$PM_INDEX_ONLY" ]; then + s=`pm_make -V LATEST_LINK` + if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.tbz" ]; then + local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.tbz + latest_pv=`readlink ${LOCAL_PACKAGEDIR}/Latest/${s}.tbz` + latest_pv=${latest_pv##*/} + else + [ -n "$PM_VERBOSE" ] && + echo "===>>> No local package for $new_port exists, attempting fetch" + fi else - [ -n "$PM_VERBOSE" ] && - echo "===>>> No local package for $new_port exists, attempting fetch" + if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then + local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz + latest_pv=${local_package##*/} + fi fi fi @@ -2913,7 +2975,7 @@ notnewer () { if [ "$latest_pv" = "$new_port" ]; then use_package=up_equal [ -n "$PM_VERBOSE" ] && - echo "===>>> Available package ($latest_pv) matches the ports tree" + echo "===>>> Available package ($latest_pv) matches the current version" elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then if [ -n "$upg_port" ]; then case `pkg_version -t $upg_port $latest_pv` in @@ -3066,13 +3128,13 @@ if [ -n "$upg_port" ]; then [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Running pkg_delete for $upg_port" pm_pkg_delete_s -f $upg_port - cd $pd/$portdir + [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir fi if [ -z "$RECURSE_THOROUGH" -a -z "$NO_DEP_UPDATES" ]; then echo '' ; echo "===>>> Starting check for runtime dependencies" dependency_check run-depends-list - cd $pd/$portdir + [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir fi install_failed () { @@ -3102,8 +3164,13 @@ else [ -n "$local_package" ] && ppd=${local_package%/Latest*}/All echo "===>>> Installing package" - pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz || + if $PM_SU_CMD pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz; then + [ -n "$PM_DELETE_PACKAGES" ] && { + [ -n "$PM_VERBOSE" ] && echo "===>>> Deleting ${latest_pv}.tbz"; + pm_unlink_s ${ppd}/${latest_pv}.tbz; } + else install_failed ${latest_pv}.tbz + fi fi echo '' From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 06:54:15 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0A1E1065672; Tue, 2 Mar 2010 06:54:15 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A67658FC0A; Tue, 2 Mar 2010 06:54:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o226sFx0050065; Tue, 2 Mar 2010 06:54:15 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o226sF5N050063; Tue, 2 Mar 2010 06:54:15 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201003020654.o226sF5N050063@svn.freebsd.org> From: Doug Barton Date: Tue, 2 Mar 2010 06:54:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204551 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 06:54:15 -0000 Author: dougb Date: Tue Mar 2 06:54:15 2010 New Revision: 204551 URL: http://svn.freebsd.org/changeset/base/204551 Log: In init_packages() don't worry about the backup directory if -B In pm_pkg_create() we can't figure out LATEST_LINK without the ports tree, so don't try to create that link For both the Latest link and the link to the category directory ln needs $PM_SU_CMD In gen_dep_list() we need to use $* instead of $1 because the common case is to pass in "build-depends-list run-depends-list" When installing a local package, simplify the setting of $ppd Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Mar 2 06:02:01 2010 (r204550) +++ user/dougb/portmaster/portmaster Tue Mar 2 06:54:15 2010 (r204551) @@ -1255,14 +1255,16 @@ init_packages () { init_packages_var - pbu=$PACKAGES/portmaster-backup + if [ -z "$NO_BACKUP" ]; then + pbu=$PACKAGES/portmaster-backup - if [ ! -d "$pbu" ]; then - [ -n "$PM_SU_VERBOSE" ] && - echo "===>>> Creating $pbu" - pm_mkdir_s $pbu + if [ ! -d "$pbu" ]; then + [ -n "$PM_SU_VERBOSE" ] && + echo "===>>> Creating $pbu" + pm_mkdir_s $pbu + fi + export pbu fi - export pbu } pm_pkg_create () { @@ -1290,15 +1292,19 @@ pm_pkg_create () { NB_DELETE="${NB_DELETE}${pkg} " fi elif [ "$1" = "$PACKAGES" ]; then - local pkg latest_link + local pkg ; pkg=`echo $2.*` + + if [ -z "$PM_INDEX_ONLY" ]; then + local latest_link + + pm_cd_pd $portdir + latest_link=`pm_make -V LATEST_LINK` + cd ${1}/Latest + $PM_SU_CMD ln -sf ../All/$pkg ${latest_link}.tbz + fi - pkg=`echo $2.*` - pm_cd_pd $portdir - latest_link=`pm_make -V LATEST_LINK` - cd ${1}/Latest - ln -sf ../All/$pkg ${latest_link}.tbz cd ${1}/${portdir%/*} - ln -sf ../All/$pkg $pkg + $PM_SU_CMD ln -sf ../All/$pkg $pkg echo " ===>>> Package saved to ${1}/All" ; echo '' fi else @@ -1915,11 +1921,11 @@ gen_dep_list () { if [ -z "$PM_INDEX_ONLY" ]; then pm_cd_pd $portdir - list=`pm_make $1 | sort -u` + list=`pm_make $* | sort -u` else local temp_list l - case "$1" in + case "$*" in 'build-depends-list run-depends-list'|all-depends-list) temp_list="`parse_index $portdir b-deps` `parse_index $portdir r-deps`" ;; build-depends-list) temp_list=`parse_index $portdir b-deps` ;; @@ -3161,7 +3167,7 @@ if [ -z "$use_package" ]; then eval pm_make_s -DNO_DEPENDS install $port_log_args || install_failed $new_port else - [ -n "$local_package" ] && ppd=${local_package%/Latest*}/All + [ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All echo "===>>> Installing package" if $PM_SU_CMD pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz; then From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 07:25:09 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 362AE106566C; Tue, 2 Mar 2010 07:25:09 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from k7.mavetju.org (ppp113-58.static.internode.on.net [150.101.113.58]) by mx1.freebsd.org (Postfix) with ESMTP id D8E9B8FC19; Tue, 2 Mar 2010 07:25:08 +0000 (UTC) Received: by k7.mavetju.org (Postfix, from userid 1001) id 322D3451BA; Tue, 2 Mar 2010 18:23:52 +1100 (EST) Date: Tue, 2 Mar 2010 18:23:52 +1100 From: Edwin Groothuis To: "M. Warner Losh" Message-ID: <20100302072352.GB1761@mavetju.org> References: <201002282036.o1SKaPUI085762@svn.freebsd.org> <20100228205005.GA4003@freebsd.org> <20100301.222708.986891133540166335.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100301.222708.986891133540166335.imp@bsdimp.com> User-Agent: Mutt/1.4.2.3i Cc: rdivacky@freebsd.org, src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r204479 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 07:25:09 -0000 On Mon, Mar 01, 2010 at 10:27:08PM -0700, M. Warner Losh wrote: > In message: <20100228205005.GA4003@freebsd.org> > Roman Divacky writes: > : On Sun, Feb 28, 2010 at 08:36:25PM +0000, Edwin Groothuis wrote: > : > Author: edwin > : > Date: Sun Feb 28 20:36:24 2010 > : > New Revision: 204479 > : > URL: http://svn.freebsd.org/changeset/base/204479 > : > > : > Log: > : > Do some work on ncal while we're at it. > : > : I have a patch that implementes "cal -3" are you interested in it? > > I can finally get of my script then :) Give it a couple of days :-) Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ edwin@mavetju.org Weblog: http://www.mavetju.org/weblog/ From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 08:13:11 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7ECDC1065672; Tue, 2 Mar 2010 08:13:11 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 54CF38FC1A; Tue, 2 Mar 2010 08:13:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o228DB1v067990; Tue, 2 Mar 2010 08:13:11 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o228DBvt067988; Tue, 2 Mar 2010 08:13:11 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003020813.o228DBvt067988@svn.freebsd.org> From: Juli Mallett Date: Tue, 2 Mar 2010 08:13:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204561 - user/jmallett/octeon/libexec/rtld-elf/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 08:13:11 -0000 Author: jmallett Date: Tue Mar 2 08:13:11 2010 New Revision: 204561 URL: http://svn.freebsd.org/changeset/base/204561 Log: Fix whitespace. Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S ============================================================================== --- user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Tue Mar 2 07:48:12 2010 (r204560) +++ user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Tue Mar 2 08:13:11 2010 (r204561) @@ -44,15 +44,15 @@ LEAF(rtld_start) .cprestore 0 /* -> 0(sp) for gp */ /* -> 4(sp) for atexit */ /* -> 8(sp) for obj_main */ - move s0,a0 /* save stack pointer from a0 */ - move s1,a3 /* save ps_strings pointer */ + move s0, a0 /* save stack pointer from a0 */ + move s1, a3 /* save ps_strings pointer */ la a1, 1f bal 1f nop 1: subu a1, ra, a1 /* relocbase */ la t9,_C_LABEL(_rtld_relocate_nonplt_self) - move s2,a1 + move s2, a1 la a0,_DYNAMIC addu t9, a1, t9 jalr t9 @@ -72,8 +72,8 @@ LEAF(rtld_start) lw a1, 4(sp) /* our atexit function */ lw a2, 8(sp) /* obj_main entry */ addu sp, sp, 16 /* readjust stack */ - move t9,v0 - move a2,s1 /* restore ps_strings */ + move t9, v0 + move a2, s1 /* restore ps_strings */ jr t9 /* _start(ap, cleanup, obj, ps_strings); */ nop @@ -91,37 +91,37 @@ _rtld_bind_start: move v1,gp /* save old GP */ add t9,8 /* modify T9 to point at .cpload */ .cpload t9 - subu sp,48 /* save arguments and sp value */ + subu sp, 48 /* save arguments and sp value */ .cprestore 36 - sw a0,16(sp) - sw a1,20(sp) - sw a2,24(sp) - sw a3,28(sp) - sw s0,32(sp) - sw t7,40(sp) - move s0,sp - move a0,v1 /* old GP */ - subu a0,a0,0x7ff0 /* The offset of $gp from the */ + sw a0, 16(sp) + sw a1, 20(sp) + sw a2, 24(sp) + sw a3, 28(sp) + sw s0, 32(sp) + sw t7, 40(sp) + move s0, sp + move a0, v1 /* old GP */ + subu a0, a0,0x7ff0 /* The offset of $gp from the */ /* beginning of the .got section: */ /* $gp = .got + 0x7ff0, so */ /* .got = $gp - 0x7ff0 */ /* Simple math as you can see. */ - lw a0,4(a0) /* object = pltgot[1] & 0x7fffffff */ - and a0,a0,0x7fffffff - move a1,t8 /* symbol index */ + lw a0, 4(a0) /* object = pltgot[1] & 0x7fffffff */ + and a0, a0,0x7fffffff + move a1, t8 /* symbol index */ jal _C_LABEL(_mips_rtld_bind) nop - move sp,s0 - lw ra,40(sp) - lw a0,16(sp) - lw a1,20(sp) - lw a2,24(sp) - lw a3,28(sp) - lw s0,32(sp) - addu sp,48 - move t9,v0 + move sp, s0 + lw ra, 40(sp) + lw a0, 16(sp) + lw a1, 20(sp) + lw a2, 24(sp) + lw a3, 28(sp) + lw s0, 32(sp) + addu sp, 48 + move t9, v0 jr t9 nop .end _rtld_bind_start From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 08:22:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FE0A1065670; Tue, 2 Mar 2010 08:22:48 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7238FC16; Tue, 2 Mar 2010 08:22:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o228MmHJ070138; Tue, 2 Mar 2010 08:22:48 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o228MmxM070136; Tue, 2 Mar 2010 08:22:48 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003020822.o228MmxM070136@svn.freebsd.org> From: Juli Mallett Date: Tue, 2 Mar 2010 08:22:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204562 - user/jmallett/octeon/libexec/rtld-elf/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 08:22:48 -0000 Author: jmallett Date: Tue Mar 2 08:22:48 2010 New Revision: 204562 URL: http://svn.freebsd.org/changeset/base/204562 Log: Bring in some of an n32 and n64 patch from imp@. Fix some comments, whitespace and don't gratuitously adjust the stack. This is incomplete wrt n64 at least, but is enough that n32 gets as far as trying to run libc's .init section and blowing up somewhere after that. Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S ============================================================================== --- user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Tue Mar 2 08:13:11 2010 (r204561) +++ user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S Tue Mar 2 08:22:48 2010 (r204562) @@ -1,5 +1,4 @@ /* $NetBSD: rtld_start.S,v 1.9 2002/10/05 11:59:05 mycroft Exp $ */ -/* $FreeBSD$ */ /* * Copyright 1997 Michael L. Hitch @@ -34,16 +33,32 @@ .globl _C_LABEL(_rtld_relocate_nonplt_self) .globl _C_LABEL(_rtld) +/* + * a0 stack pointer + * a1 rtld cleanup (filled in by dynamic loader) + * a2 rtld object (filled in by dynamic loader) + * a3 ps_strings + */ LEAF(rtld_start) .abicalls .set noreorder +#if defined(__mips_n32) || defined(__mips_n64) + .cpsetup $25, $24, rtld_start +#else .cpload t9 +#endif + addu sp, sp, -16 /* adjust stack pointer */ /* keep it aligned */ + +#if defined(__mips_n32) || defined(__mips_n64) + sw gp, 0(sp) +#else .cprestore 0 /* -> 0(sp) for gp */ - /* -> 4(sp) for atexit */ - /* -> 8(sp) for obj_main */ +#endif + sw a1, 4(sp) /* -> 4(sp) for atexit */ + sw a2, 8(sp) /* -> 8(sp) for obj_main */ move s0, a0 /* save stack pointer from a0 */ move s1, a3 /* save ps_strings pointer */ @@ -51,32 +66,31 @@ LEAF(rtld_start) bal 1f nop 1: subu a1, ra, a1 /* relocbase */ - la t9,_C_LABEL(_rtld_relocate_nonplt_self) + la t9, _C_LABEL(_rtld_relocate_nonplt_self) move s2, a1 - la a0,_DYNAMIC + la a0, _DYNAMIC addu t9, a1, t9 jalr t9 addu a0, a1, a0 /* &_DYNAMIC */ + move a0, s0 /* stack pointer */ + addu a1, sp, 4 /* &exit_proc */ + addu a2, sp, 8 /* &objp */ - move a0, s0 /* stack pointer */ - addu a1, sp, 4 /* &exit_proc */ - addu a2, sp, 8 /* &objp */ - addu sp, sp, -16 /* arguments slot */ - jal _C_LABEL(_rtld) /* v0 = _rtld(sp, exit_proc, objp) */ + jal _C_LABEL(_rtld) /* v0 = _rtld(sp, exit_proc, objp) */ nop - addu sp, sp, 16 - move a0, s0 /* arguments pointer */ - move a3, s1 /* arguments pointer */ lw a1, 4(sp) /* our atexit function */ lw a2, 8(sp) /* obj_main entry */ + addu sp, sp, 16 /* readjust stack */ + move t9, v0 - move a2, s1 /* restore ps_strings */ - jr t9 /* _start(ap, cleanup, obj, ps_strings); */ - nop + move a0, s0 /* restore stack pointer from a0*/ + move a3, s1 /* restore ps_strings */ + jr t9 /* _start(ap, cleanup, obj, ps_strings); */ + nop END(rtld_start) .globl _rtld_bind_start @@ -88,39 +102,73 @@ _rtld_bind_start: */ .frame sp, 0, ra /* satisfy compiler */ - move v1,gp /* save old GP */ - add t9,8 /* modify T9 to point at .cpload */ + move v1, gp /* save old GP */ + +#if defined(__mips_n32) || defined(__mips_n64) + subu sp, 60 /* save arguments and sp value */ + sw gp, 36(sp) + .cpsetup $25, $12, _rtld_bind_start +#else + add t9, 8 /* modify T9 to point at .cpload */ .cpload t9 - subu sp, 48 /* save arguments and sp value */ + subu sp, 44 /* save arguments and sp value */ .cprestore 36 +#endif sw a0, 16(sp) sw a1, 20(sp) sw a2, 24(sp) sw a3, 28(sp) sw s0, 32(sp) +#if defined(__mips_n64) || defined(__mips_n32) + sw t3, 40(sp) + sw a4, 44(sp) + sw a5, 48(sp) + sw a6, 52(sp) + sw a7, 56(sp) +#else sw t7, 40(sp) +#endif move s0, sp move a0, v1 /* old GP */ - subu a0, a0,0x7ff0 /* The offset of $gp from the */ + subu a0, a0, 0x7ff0 /* The offset of $gp from the */ /* beginning of the .got section: */ /* $gp = .got + 0x7ff0, so */ /* .got = $gp - 0x7ff0 */ /* Simple math as you can see. */ - +#if defined(__mips_n64) + ld a0, 8(a0) /* object = pltgot[1] & 0x7fffffff */ +#else lw a0, 4(a0) /* object = pltgot[1] & 0x7fffffff */ - and a0, a0,0x7fffffff +#endif + and a0, a0, 0x7fffffff move a1, t8 /* symbol index */ jal _C_LABEL(_mips_rtld_bind) nop + move sp, s0 + +#if defined(__mips_n64) || defined(__mips_n32) + lw gp, 36(sp) +#endif + lw ra, 40(sp) lw a0, 16(sp) - lw a1, 20(sp) + lw a1, 20(sp) lw a2, 24(sp) lw a3, 28(sp) lw s0, 32(sp) - addu sp, 48 + +#if defined(__mips_n64) || defined(__mips_n32) + lw a4, 44(sp) + lw a5, 48(sp) + lw a6, 52(sp) + lw a7, 56(sp) + addu sp, 60 + +#else + addu sp, 44 +#endif move t9, v0 jr t9 nop From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 20:20:55 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CF08106564A; Tue, 2 Mar 2010 20:20:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 46CDD8FC19; Tue, 2 Mar 2010 20:20:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22KKtpD033196; Tue, 2 Mar 2010 20:20:55 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22KKsVb033161; Tue, 2 Mar 2010 20:20:54 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201003022020.o22KKsVb033161@svn.freebsd.org> From: Warner Losh Date: Tue, 2 Mar 2010 20:20:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204601 - in user/imp/tbemd: . bin/kill bin/pkill bin/sh cddl cddl/lib/drti cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 20:20:55 -0000 Author: imp Date: Tue Mar 2 20:20:53 2010 New Revision: 204601 URL: http://svn.freebsd.org/changeset/base/204601 Log: Merge with latest head. Added: user/imp/tbemd/contrib/dtc/ - copied from r204598, head/contrib/dtc/ user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h - copied unchanged from r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h - copied unchanged from r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.h - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.h user/imp/tbemd/contrib/tzcode/ - copied from r204598, head/contrib/tzcode/ - copied from r204598, head/contrib/tzdata/ user/imp/tbemd/etc/rc.d/hastd - copied unchanged from r204598, head/etc/rc.d/hastd user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh - copied unchanged from r204598, head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh - copied unchanged from r204598, head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh user/imp/tbemd/gnu/usr.bin/dtc/ - copied from r204598, head/gnu/usr.bin/dtc/ user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c - copied unchanged from r204598, head/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c - copied unchanged from r204598, head/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c user/imp/tbemd/lib/libalias/Makefile.inc - copied unchanged from r204598, head/lib/libalias/Makefile.inc user/imp/tbemd/sbin/hastctl/ - copied from r204598, head/sbin/hastctl/ user/imp/tbemd/sbin/hastd/ - copied from r204598, head/sbin/hastd/ user/imp/tbemd/share/examples/hast/ - copied from r204598, head/share/examples/hast/ user/imp/tbemd/share/man/man4/man4.powerpc/smu.4 - copied unchanged from r204598, head/share/man/man4/man4.powerpc/smu.4 user/imp/tbemd/sys/amd64/amd64/atpic_vector.S - copied unchanged from r204598, head/sys/amd64/amd64/atpic_vector.S user/imp/tbemd/sys/contrib/libfdt/ - copied from r204598, head/sys/contrib/libfdt/ user/imp/tbemd/sys/i386/i386/atpic_vector.s - copied unchanged from r204598, head/sys/i386/i386/atpic_vector.s user/imp/tbemd/sys/kern/kern_gzio.c - copied unchanged from r204598, head/sys/kern/kern_gzio.c user/imp/tbemd/sys/kern/subr_hash.c - copied unchanged from r204598, head/sys/kern/subr_hash.c user/imp/tbemd/sys/kern/subr_uio.c - copied unchanged from r204598, head/sys/kern/subr_uio.c user/imp/tbemd/sys/mips/rmi/bus_space_rmi_pci.c - copied unchanged from r204598, head/sys/mips/rmi/bus_space_rmi_pci.c user/imp/tbemd/sys/net/netisr_internal.h - copied unchanged from r204598, head/sys/net/netisr_internal.h user/imp/tbemd/sys/net/zutil.h - copied unchanged from r204598, head/sys/net/zutil.h user/imp/tbemd/sys/netinet/ipfw/dn_heap.c - copied unchanged from r204598, head/sys/netinet/ipfw/dn_heap.c user/imp/tbemd/sys/netinet/ipfw/dn_heap.h - copied unchanged from r204598, head/sys/netinet/ipfw/dn_heap.h user/imp/tbemd/sys/netinet/ipfw/dn_sched.h - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched.h user/imp/tbemd/sys/netinet/ipfw/dn_sched_fifo.c - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_fifo.c user/imp/tbemd/sys/netinet/ipfw/dn_sched_qfq.c - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_qfq.c user/imp/tbemd/sys/netinet/ipfw/dn_sched_rr.c - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_rr.c user/imp/tbemd/sys/netinet/ipfw/dn_sched_wf2q.c - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_wf2q.c user/imp/tbemd/sys/netinet/ipfw/dummynet.txt - copied unchanged from r204598, head/sys/netinet/ipfw/dummynet.txt user/imp/tbemd/sys/netinet/ipfw/ip_dn_glue.c - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_glue.c user/imp/tbemd/sys/netinet/ipfw/ip_dn_io.c - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_io.c user/imp/tbemd/sys/netinet/ipfw/ip_dn_private.h - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_private.h user/imp/tbemd/sys/netinet/ipfw/test/ - copied from r204598, head/sys/netinet/ipfw/test/ user/imp/tbemd/sys/x86/ - copied from r204598, head/sys/x86/ user/imp/tbemd/tools/regression/kthread/ - copied from r204598, head/tools/regression/kthread/ user/imp/tbemd/tools/tools/mcgrab/ - copied from r204598, head/tools/tools/mcgrab/ user/imp/tbemd/usr.bin/csup/README - copied unchanged from r204598, head/usr.bin/csup/README user/imp/tbemd/usr.bin/csup/TODO - copied unchanged from r204598, head/usr.bin/csup/TODO user/imp/tbemd/usr.bin/csup/attrstack.c - copied unchanged from r204598, head/usr.bin/csup/attrstack.c user/imp/tbemd/usr.bin/csup/attrstack.h - copied unchanged from r204598, head/usr.bin/csup/attrstack.h user/imp/tbemd/usr.bin/csup/auth.c - copied unchanged from r204598, head/usr.bin/csup/auth.c user/imp/tbemd/usr.bin/csup/auth.h - copied unchanged from r204598, head/usr.bin/csup/auth.h user/imp/tbemd/usr.bin/csup/config.c - copied unchanged from r204598, head/usr.bin/csup/config.c user/imp/tbemd/usr.bin/csup/config.h - copied unchanged from r204598, head/usr.bin/csup/config.h user/imp/tbemd/usr.bin/csup/cpasswd.1 - copied unchanged from r204598, head/usr.bin/csup/cpasswd.1 user/imp/tbemd/usr.bin/csup/cpasswd.sh - copied unchanged from r204598, head/usr.bin/csup/cpasswd.sh user/imp/tbemd/usr.bin/csup/csup.1 - copied unchanged from r204598, head/usr.bin/csup/csup.1 user/imp/tbemd/usr.bin/csup/detailer.c - copied unchanged from r204598, head/usr.bin/csup/detailer.c user/imp/tbemd/usr.bin/csup/detailer.h - copied unchanged from r204598, head/usr.bin/csup/detailer.h user/imp/tbemd/usr.bin/csup/diff.c - copied unchanged from r204598, head/usr.bin/csup/diff.c user/imp/tbemd/usr.bin/csup/diff.h - copied unchanged from r204598, head/usr.bin/csup/diff.h user/imp/tbemd/usr.bin/csup/fattr.c - copied unchanged from r204598, head/usr.bin/csup/fattr.c user/imp/tbemd/usr.bin/csup/fattr.h - copied unchanged from r204598, head/usr.bin/csup/fattr.h user/imp/tbemd/usr.bin/csup/fattr_bsd.h - copied unchanged from r204598, head/usr.bin/csup/fattr_bsd.h user/imp/tbemd/usr.bin/csup/fattr_posix.h - copied unchanged from r204598, head/usr.bin/csup/fattr_posix.h user/imp/tbemd/usr.bin/csup/fixups.c - copied unchanged from r204598, head/usr.bin/csup/fixups.c user/imp/tbemd/usr.bin/csup/fixups.h - copied unchanged from r204598, head/usr.bin/csup/fixups.h user/imp/tbemd/usr.bin/csup/fnmatch.c - copied unchanged from r204598, head/usr.bin/csup/fnmatch.c user/imp/tbemd/usr.bin/csup/fnmatch.h - copied unchanged from r204598, head/usr.bin/csup/fnmatch.h user/imp/tbemd/usr.bin/csup/globtree.c - copied unchanged from r204598, head/usr.bin/csup/globtree.c user/imp/tbemd/usr.bin/csup/globtree.h - copied unchanged from r204598, head/usr.bin/csup/globtree.h user/imp/tbemd/usr.bin/csup/idcache.c - copied unchanged from r204598, head/usr.bin/csup/idcache.c user/imp/tbemd/usr.bin/csup/idcache.h - copied unchanged from r204598, head/usr.bin/csup/idcache.h user/imp/tbemd/usr.bin/csup/keyword.c - copied unchanged from r204598, head/usr.bin/csup/keyword.c user/imp/tbemd/usr.bin/csup/keyword.h - copied unchanged from r204598, head/usr.bin/csup/keyword.h user/imp/tbemd/usr.bin/csup/lex.rcs.c - copied unchanged from r204598, head/usr.bin/csup/lex.rcs.c user/imp/tbemd/usr.bin/csup/lister.c - copied unchanged from r204598, head/usr.bin/csup/lister.c user/imp/tbemd/usr.bin/csup/lister.h - copied unchanged from r204598, head/usr.bin/csup/lister.h user/imp/tbemd/usr.bin/csup/main.c - copied unchanged from r204598, head/usr.bin/csup/main.c user/imp/tbemd/usr.bin/csup/main.h - copied unchanged from r204598, head/usr.bin/csup/main.h user/imp/tbemd/usr.bin/csup/misc.c - copied unchanged from r204598, head/usr.bin/csup/misc.c user/imp/tbemd/usr.bin/csup/misc.h - copied unchanged from r204598, head/usr.bin/csup/misc.h user/imp/tbemd/usr.bin/csup/mux.c - copied unchanged from r204598, head/usr.bin/csup/mux.c user/imp/tbemd/usr.bin/csup/mux.h - copied unchanged from r204598, head/usr.bin/csup/mux.h user/imp/tbemd/usr.bin/csup/parse.y - copied unchanged from r204598, head/usr.bin/csup/parse.y user/imp/tbemd/usr.bin/csup/pathcomp.c - copied unchanged from r204598, head/usr.bin/csup/pathcomp.c user/imp/tbemd/usr.bin/csup/pathcomp.h - copied unchanged from r204598, head/usr.bin/csup/pathcomp.h user/imp/tbemd/usr.bin/csup/proto.c - copied unchanged from r204598, head/usr.bin/csup/proto.c user/imp/tbemd/usr.bin/csup/proto.h - copied unchanged from r204598, head/usr.bin/csup/proto.h user/imp/tbemd/usr.bin/csup/queue.h - copied unchanged from r204598, head/usr.bin/csup/queue.h user/imp/tbemd/usr.bin/csup/rcsfile.c - copied unchanged from r204598, head/usr.bin/csup/rcsfile.c user/imp/tbemd/usr.bin/csup/rcsfile.h - copied unchanged from r204598, head/usr.bin/csup/rcsfile.h user/imp/tbemd/usr.bin/csup/rcsparse.c - copied unchanged from r204598, head/usr.bin/csup/rcsparse.c user/imp/tbemd/usr.bin/csup/rcsparse.h - copied unchanged from r204598, head/usr.bin/csup/rcsparse.h user/imp/tbemd/usr.bin/csup/rcstokenizer.h - copied unchanged from r204598, head/usr.bin/csup/rcstokenizer.h user/imp/tbemd/usr.bin/csup/rcstokenizer.l - copied unchanged from r204598, head/usr.bin/csup/rcstokenizer.l user/imp/tbemd/usr.bin/csup/rsyncfile.c - copied unchanged from r204598, head/usr.bin/csup/rsyncfile.c user/imp/tbemd/usr.bin/csup/rsyncfile.h - copied unchanged from r204598, head/usr.bin/csup/rsyncfile.h user/imp/tbemd/usr.bin/csup/status.c - copied unchanged from r204598, head/usr.bin/csup/status.c user/imp/tbemd/usr.bin/csup/status.h - copied unchanged from r204598, head/usr.bin/csup/status.h user/imp/tbemd/usr.bin/csup/stream.c - copied unchanged from r204598, head/usr.bin/csup/stream.c user/imp/tbemd/usr.bin/csup/stream.h - copied unchanged from r204598, head/usr.bin/csup/stream.h user/imp/tbemd/usr.bin/csup/threads.c - copied unchanged from r204598, head/usr.bin/csup/threads.c user/imp/tbemd/usr.bin/csup/threads.h - copied unchanged from r204598, head/usr.bin/csup/threads.h user/imp/tbemd/usr.bin/csup/token.h - copied unchanged from r204598, head/usr.bin/csup/token.h user/imp/tbemd/usr.bin/csup/token.l - copied unchanged from r204598, head/usr.bin/csup/token.l user/imp/tbemd/usr.bin/csup/updater.c - copied unchanged from r204598, head/usr.bin/csup/updater.c user/imp/tbemd/usr.bin/csup/updater.h - copied unchanged from r204598, head/usr.bin/csup/updater.h user/imp/tbemd/usr.bin/netstat/netisr.c - copied unchanged from r204598, head/usr.bin/netstat/netisr.c user/imp/tbemd/usr.bin/seq/ - copied from r204598, head/usr.bin/seq/ Directory Properties: user/imp/tbemd/contrib/tzdata/ (props changed) Replaced: user/imp/tbemd/usr.bin/csup/Makefile - copied unchanged from r204598, head/usr.bin/csup/Makefile Deleted: user/imp/tbemd/contrib/bc/ user/imp/tbemd/contrib/csup/ user/imp/tbemd/gnu/usr.bin/bc/ user/imp/tbemd/gnu/usr.bin/dc/ user/imp/tbemd/lib/libc/stdtime/asctime.c user/imp/tbemd/lib/libc/stdtime/ctime.3 user/imp/tbemd/lib/libc/stdtime/difftime.c user/imp/tbemd/lib/libc/stdtime/localtime.c user/imp/tbemd/lib/libc/stdtime/private.h user/imp/tbemd/lib/libc/stdtime/time2posix.3 user/imp/tbemd/lib/libc/stdtime/tzfile.5 user/imp/tbemd/lib/libc/stdtime/tzfile.h user/imp/tbemd/share/zoneinfo/africa user/imp/tbemd/share/zoneinfo/antarctica user/imp/tbemd/share/zoneinfo/asia user/imp/tbemd/share/zoneinfo/australasia user/imp/tbemd/share/zoneinfo/backward user/imp/tbemd/share/zoneinfo/etcetera user/imp/tbemd/share/zoneinfo/europe user/imp/tbemd/share/zoneinfo/factory user/imp/tbemd/share/zoneinfo/leapseconds user/imp/tbemd/share/zoneinfo/northamerica user/imp/tbemd/share/zoneinfo/pacificnew user/imp/tbemd/share/zoneinfo/southamerica user/imp/tbemd/share/zoneinfo/systemv user/imp/tbemd/share/zoneinfo/yearistype.sh user/imp/tbemd/share/zoneinfo/zone.tab user/imp/tbemd/sys/amd64/isa/ user/imp/tbemd/sys/dev/cxgb/common/cxgb_version.h user/imp/tbemd/sys/dev/cxgb/cxgb_config.h user/imp/tbemd/sys/i386/bios/smbios.c user/imp/tbemd/sys/i386/bios/vpd.c user/imp/tbemd/sys/i386/cpufreq/ user/imp/tbemd/sys/i386/isa/atpic.c user/imp/tbemd/sys/i386/isa/atpic_vector.s user/imp/tbemd/sys/i386/isa/clock.c user/imp/tbemd/sys/i386/isa/elcr.c user/imp/tbemd/sys/i386/isa/icu.h user/imp/tbemd/sys/i386/isa/isa.c user/imp/tbemd/sys/i386/isa/isa.h user/imp/tbemd/sys/i386/isa/isa_dma.c user/imp/tbemd/sys/i386/isa/nmi.c user/imp/tbemd/sys/ia64/include/sapicreg.h user/imp/tbemd/sys/ia64/include/sapicvar.h user/imp/tbemd/sys/isa/atrtc.c user/imp/tbemd/sys/isa/orm.c user/imp/tbemd/sys/kern/kern_subr.c user/imp/tbemd/tools/tools/mctest/mcgrab.1 user/imp/tbemd/tools/tools/mctest/mcgrab.cc user/imp/tbemd/usr.sbin/zic/Theory user/imp/tbemd/usr.sbin/zic/ialloc.c user/imp/tbemd/usr.sbin/zic/private.h user/imp/tbemd/usr.sbin/zic/scheck.c user/imp/tbemd/usr.sbin/zic/zdump.8 user/imp/tbemd/usr.sbin/zic/zdump.c user/imp/tbemd/usr.sbin/zic/zic.8 user/imp/tbemd/usr.sbin/zic/zic.c Modified: user/imp/tbemd/MAINTAINERS user/imp/tbemd/ObsoleteFiles.inc user/imp/tbemd/bin/kill/kill.c user/imp/tbemd/bin/pkill/pkill.1 user/imp/tbemd/bin/pkill/pkill.c user/imp/tbemd/bin/sh/parser.c user/imp/tbemd/cddl/Makefile.inc user/imp/tbemd/cddl/lib/drti/Makefile user/imp/tbemd/cddl/lib/libavl/Makefile user/imp/tbemd/cddl/lib/libctf/Makefile user/imp/tbemd/cddl/lib/libdtrace/Makefile user/imp/tbemd/cddl/lib/libnvpair/Makefile user/imp/tbemd/cddl/lib/libumem/Makefile user/imp/tbemd/cddl/lib/libuutil/Makefile user/imp/tbemd/cddl/lib/libzfs/Makefile user/imp/tbemd/cddl/lib/libzpool/Makefile user/imp/tbemd/cddl/sbin/zfs/Makefile user/imp/tbemd/cddl/sbin/zpool/Makefile user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile user/imp/tbemd/cddl/usr.bin/zinject/Makefile user/imp/tbemd/cddl/usr.bin/ztest/Makefile user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile user/imp/tbemd/cddl/usr.sbin/zdb/Makefile user/imp/tbemd/contrib/gcc/config/mips/freebsd.h user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h user/imp/tbemd/etc/defaults/rc.conf user/imp/tbemd/etc/mtree/BSD.usr.dist user/imp/tbemd/etc/rc.d/Makefile user/imp/tbemd/etc/rc.d/rtsold user/imp/tbemd/games/fortune/datfiles/fortunes user/imp/tbemd/games/fortune/fortune/fortune.c user/imp/tbemd/gnu/usr.bin/Makefile user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.mips user/imp/tbemd/gnu/usr.bin/binutils/ld/genscripts.sh user/imp/tbemd/gnu/usr.bin/diff/Makefile user/imp/tbemd/gnu/usr.bin/diff3/Makefile user/imp/tbemd/gnu/usr.bin/gdb/arch/mips/Makefile user/imp/tbemd/gnu/usr.bin/gdb/arch/mips/init.c user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/Makefile user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_mips.c user/imp/tbemd/gnu/usr.bin/sdiff/Makefile user/imp/tbemd/lib/libalias/libalias/Makefile user/imp/tbemd/lib/libarchive/archive_write_disk.3 user/imp/tbemd/lib/libarchive/test/Makefile user/imp/tbemd/lib/libbsnmp/Makefile.inc user/imp/tbemd/lib/libbsnmp/libbsnmp/Makefile user/imp/tbemd/lib/libc/gen/fmtcheck.3 user/imp/tbemd/lib/libc/gen/pause.c user/imp/tbemd/lib/libc/gen/stringlist.3 user/imp/tbemd/lib/libc/gen/sysconf.c user/imp/tbemd/lib/libc/gen/sysctl.3 user/imp/tbemd/lib/libc/gen/sysctl.c user/imp/tbemd/lib/libc/gen/sysctlbyname.c user/imp/tbemd/lib/libc/gen/sysctlnametomib.c user/imp/tbemd/lib/libc/include/reentrant.h user/imp/tbemd/lib/libc/nls/msgcat.c user/imp/tbemd/lib/libc/stdio/mktemp.c user/imp/tbemd/lib/libc/stdlib/malloc.c user/imp/tbemd/lib/libc/stdlib/rb.h user/imp/tbemd/lib/libc/stdtime/Makefile.inc user/imp/tbemd/lib/libc/sys/mlockall.2 user/imp/tbemd/lib/libc/sys/ntp_adjtime.2 user/imp/tbemd/lib/libc/sys/utrace.2 user/imp/tbemd/lib/libdwarf/Makefile user/imp/tbemd/lib/libedit/editline.3 user/imp/tbemd/lib/libedit/editrc.5 user/imp/tbemd/lib/libedit/read.h user/imp/tbemd/lib/libkvm/Makefile user/imp/tbemd/lib/libkvm/kvm.c user/imp/tbemd/lib/libkvm/kvm.h user/imp/tbemd/lib/libkvm/kvm_getpcpu.3 user/imp/tbemd/lib/libkvm/kvm_pcpu.c user/imp/tbemd/lib/libkvm/kvm_private.h user/imp/tbemd/lib/libkvm/kvm_vnet.c user/imp/tbemd/lib/libpam/Makefile.inc user/imp/tbemd/lib/libpam/modules/Makefile.inc user/imp/tbemd/lib/libpam/modules/pam_krb5/Makefile user/imp/tbemd/lib/libproc/Makefile user/imp/tbemd/lib/librt/Makefile user/imp/tbemd/lib/libutil/humanize_number.3 user/imp/tbemd/libexec/rpc.rstatd/Makefile user/imp/tbemd/libexec/rtld-elf/powerpc/reloc.c user/imp/tbemd/libexec/rtld-elf/powerpc/rtld_machdep.h user/imp/tbemd/libexec/rtld-elf/powerpc/rtld_start.S user/imp/tbemd/libexec/ulog-helper/Makefile user/imp/tbemd/sbin/Makefile user/imp/tbemd/sbin/atacontrol/atacontrol.c user/imp/tbemd/sbin/camcontrol/camcontrol.c user/imp/tbemd/sbin/ddb/Makefile user/imp/tbemd/sbin/devfs/devfs.8 user/imp/tbemd/sbin/geom/class/part/Makefile user/imp/tbemd/sbin/ggate/ggatec/ggatec.c user/imp/tbemd/sbin/ggate/ggated/ggated.c user/imp/tbemd/sbin/ggate/ggatel/ggatel.c user/imp/tbemd/sbin/ggate/shared/ggate.c user/imp/tbemd/sbin/ifconfig/Makefile user/imp/tbemd/sbin/ifconfig/ifconfig.8 user/imp/tbemd/sbin/ifconfig/ifconfig.c user/imp/tbemd/sbin/ifconfig/ifvlan.c user/imp/tbemd/sbin/ipf/ipftest/Makefile user/imp/tbemd/sbin/ipfw/altq.c user/imp/tbemd/sbin/ipfw/dummynet.c user/imp/tbemd/sbin/ipfw/ipfw.8 user/imp/tbemd/sbin/ipfw/ipfw2.c user/imp/tbemd/sbin/ipfw/ipfw2.h user/imp/tbemd/sbin/ipfw/main.c user/imp/tbemd/sbin/mount_hpfs/Makefile user/imp/tbemd/sbin/mount_hpfs/mount_hpfs.c user/imp/tbemd/sbin/mount_ntfs/Makefile user/imp/tbemd/sbin/mount_ntfs/mount_ntfs.c user/imp/tbemd/sbin/restore/restore.h user/imp/tbemd/sbin/route/Makefile user/imp/tbemd/sbin/route/route.c user/imp/tbemd/sbin/routed/Makefile user/imp/tbemd/sbin/routed/if.c user/imp/tbemd/sbin/routed/rtquery/Makefile user/imp/tbemd/sbin/rtsol/Makefile user/imp/tbemd/secure/libexec/sftp-server/Makefile user/imp/tbemd/secure/usr.sbin/sshd/Makefile user/imp/tbemd/share/examples/Makefile user/imp/tbemd/share/examples/autofs/driver/Makefile user/imp/tbemd/share/man/man4/Makefile user/imp/tbemd/share/man/man4/ahci.4 user/imp/tbemd/share/man/man4/bwn.4 user/imp/tbemd/share/man/man4/man4.powerpc/Makefile user/imp/tbemd/share/man/man4/msk.4 user/imp/tbemd/share/man/man4/ng_ipfw.4 user/imp/tbemd/share/man/man4/siis.4 user/imp/tbemd/share/man/man5/core.5 user/imp/tbemd/share/man/man5/devfs.rules.5 user/imp/tbemd/share/man/man5/rc.conf.5 user/imp/tbemd/share/man/man9/BUF_ISLOCKED.9 user/imp/tbemd/share/man/man9/BUF_RECURSED.9 user/imp/tbemd/share/man/man9/DEVICE_PROBE.9 user/imp/tbemd/share/man/man9/VOP_LOCK.9 user/imp/tbemd/share/man/man9/devfs_set_cdevpriv.9 user/imp/tbemd/share/man/man9/ieee80211_scan.9 user/imp/tbemd/share/man/man9/namei.9 user/imp/tbemd/share/man/man9/netisr.9 user/imp/tbemd/share/man/man9/vm_page_alloc.9 user/imp/tbemd/share/mk/bsd.cpu.mk user/imp/tbemd/share/mk/bsd.libnames.mk user/imp/tbemd/share/zoneinfo/Makefile user/imp/tbemd/sys/amd64/amd64/busdma_machdep.c user/imp/tbemd/sys/amd64/amd64/exception.S user/imp/tbemd/sys/amd64/amd64/identcpu.c user/imp/tbemd/sys/amd64/amd64/intr_machdep.c user/imp/tbemd/sys/amd64/amd64/machdep.c user/imp/tbemd/sys/amd64/amd64/mca.c user/imp/tbemd/sys/amd64/amd64/nexus.c user/imp/tbemd/sys/amd64/amd64/pmap.c user/imp/tbemd/sys/amd64/amd64/vm_machdep.c user/imp/tbemd/sys/amd64/include/sysarch.h user/imp/tbemd/sys/arm/arm/cpufunc.c user/imp/tbemd/sys/arm/arm/identcpu.c user/imp/tbemd/sys/arm/at91/if_ate.c user/imp/tbemd/sys/arm/conf/BWCT user/imp/tbemd/sys/arm/conf/HL200 user/imp/tbemd/sys/arm/conf/KB920X user/imp/tbemd/sys/arm/include/armreg.h user/imp/tbemd/sys/arm/include/md_var.h user/imp/tbemd/sys/arm/mv/mv_machdep.c user/imp/tbemd/sys/arm/xscale/ixp425/cambria_fled.c user/imp/tbemd/sys/boot/forth/loader.conf user/imp/tbemd/sys/boot/powerpc/ofw/Makefile user/imp/tbemd/sys/boot/powerpc/uboot/Makefile user/imp/tbemd/sys/boot/powerpc/uboot/conf.c user/imp/tbemd/sys/boot/sparc64/loader/main.c user/imp/tbemd/sys/boot/uboot/common/main.c user/imp/tbemd/sys/boot/uboot/lib/disk.c user/imp/tbemd/sys/boot/uboot/lib/time.c user/imp/tbemd/sys/boot/zfs/zfs.c user/imp/tbemd/sys/cam/ata/ata_xpt.c user/imp/tbemd/sys/cam/cam_xpt.c user/imp/tbemd/sys/cam/cam_xpt_internal.h user/imp/tbemd/sys/cam/scsi/scsi_xpt.c user/imp/tbemd/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/imp/tbemd/sys/compat/linux/linux_getcwd.c user/imp/tbemd/sys/compat/linux/linux_stats.c user/imp/tbemd/sys/compat/linux/linux_time.c user/imp/tbemd/sys/conf/NOTES user/imp/tbemd/sys/conf/files user/imp/tbemd/sys/conf/files.amd64 user/imp/tbemd/sys/conf/files.i386 user/imp/tbemd/sys/conf/files.mips user/imp/tbemd/sys/conf/files.pc98 user/imp/tbemd/sys/conf/ldscript.mips.cfe user/imp/tbemd/sys/conf/options user/imp/tbemd/sys/conf/options.mips user/imp/tbemd/sys/dev/aac/aac.c user/imp/tbemd/sys/dev/aac/aac_cam.c user/imp/tbemd/sys/dev/age/if_age.c user/imp/tbemd/sys/dev/alc/if_alc.c user/imp/tbemd/sys/dev/ale/if_ale.c user/imp/tbemd/sys/dev/ata/ata-all.c user/imp/tbemd/sys/dev/ata/ata-pci.c user/imp/tbemd/sys/dev/ata/ata-pci.h user/imp/tbemd/sys/dev/ata/ata-sata.c user/imp/tbemd/sys/dev/ata/chipsets/ata-acerlabs.c user/imp/tbemd/sys/dev/ata/chipsets/ata-intel.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c user/imp/tbemd/sys/dev/ath/if_ath.c user/imp/tbemd/sys/dev/bce/if_bce.c user/imp/tbemd/sys/dev/bge/if_bge.c user/imp/tbemd/sys/dev/bwn/if_bwn.c user/imp/tbemd/sys/dev/bwn/if_bwnvar.h user/imp/tbemd/sys/dev/cm/if_cm_isa.c user/imp/tbemd/sys/dev/cm/smc90cx6.c user/imp/tbemd/sys/dev/cm/smc90cx6reg.h user/imp/tbemd/sys/dev/cm/smc90cx6var.h user/imp/tbemd/sys/dev/cxgb/common/cxgb_common.h user/imp/tbemd/sys/dev/cxgb/common/cxgb_t3_hw.c user/imp/tbemd/sys/dev/cxgb/cxgb_adapter.h user/imp/tbemd/sys/dev/cxgb/cxgb_main.c user/imp/tbemd/sys/dev/cxgb/cxgb_offload.h user/imp/tbemd/sys/dev/cxgb/cxgb_osdep.h user/imp/tbemd/sys/dev/cxgb/cxgb_sge.c user/imp/tbemd/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/imp/tbemd/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c user/imp/tbemd/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c user/imp/tbemd/sys/dev/fb/fb.c user/imp/tbemd/sys/dev/fb/vesa.c user/imp/tbemd/sys/dev/gem/if_gem.c user/imp/tbemd/sys/dev/isp/isp.c user/imp/tbemd/sys/dev/isp/isp_freebsd.c user/imp/tbemd/sys/dev/isp/isp_library.c user/imp/tbemd/sys/dev/isp/isp_library.h user/imp/tbemd/sys/dev/isp/isp_pci.c user/imp/tbemd/sys/dev/isp/isp_target.c user/imp/tbemd/sys/dev/isp/ispmbox.h user/imp/tbemd/sys/dev/isp/ispreg.h user/imp/tbemd/sys/dev/jme/if_jme.c user/imp/tbemd/sys/dev/md/md.c user/imp/tbemd/sys/dev/mfi/mfi_cam.c user/imp/tbemd/sys/dev/mfi/mfi_pci.c user/imp/tbemd/sys/dev/mii/brgphy.c user/imp/tbemd/sys/dev/mii/miidevs user/imp/tbemd/sys/dev/mpt/mpt_raid.c user/imp/tbemd/sys/dev/msk/if_msk.c user/imp/tbemd/sys/dev/msk/if_mskreg.h user/imp/tbemd/sys/dev/mxge/if_mxge.c user/imp/tbemd/sys/dev/ofw/ofw_pci.h user/imp/tbemd/sys/dev/re/if_re.c user/imp/tbemd/sys/dev/sound/pci/hda/hdac.c user/imp/tbemd/sys/dev/stge/if_stge.c user/imp/tbemd/sys/dev/stge/if_stgereg.h user/imp/tbemd/sys/dev/syscons/scvidctl.c user/imp/tbemd/sys/dev/syscons/snake/snake_saver.c user/imp/tbemd/sys/dev/syscons/syscons.c user/imp/tbemd/sys/dev/syscons/syscons.h user/imp/tbemd/sys/dev/uart/uart_bus_pci.c user/imp/tbemd/sys/dev/xen/netfront/netfront.c user/imp/tbemd/sys/fs/ext2fs/ext2_vnops.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_denode.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_fat.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_fileno.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_lookup.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_vfsops.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_vnops.c user/imp/tbemd/sys/fs/msdosfs/msdosfsmount.h user/imp/tbemd/sys/geom/gate/g_gate.c user/imp/tbemd/sys/geom/gate/g_gate.h user/imp/tbemd/sys/geom/geom_subr.c user/imp/tbemd/sys/geom/multipath/g_multipath.c user/imp/tbemd/sys/geom/stripe/g_stripe.c user/imp/tbemd/sys/i386/conf/XEN user/imp/tbemd/sys/i386/i386/exception.s user/imp/tbemd/sys/i386/i386/machdep.c user/imp/tbemd/sys/i386/i386/mca.c user/imp/tbemd/sys/i386/i386/nexus.c user/imp/tbemd/sys/i386/i386/pmap.c user/imp/tbemd/sys/i386/i386/vm_machdep.c user/imp/tbemd/sys/i386/xen/clock.c user/imp/tbemd/sys/i386/xen/pmap.c user/imp/tbemd/sys/i386/xen/xen_machdep.c user/imp/tbemd/sys/ia64/ia64/context.S user/imp/tbemd/sys/ia64/ia64/exception.S user/imp/tbemd/sys/ia64/ia64/interrupt.c user/imp/tbemd/sys/ia64/ia64/locore.S user/imp/tbemd/sys/ia64/ia64/nexus.c user/imp/tbemd/sys/ia64/ia64/pmap.c user/imp/tbemd/sys/ia64/ia64/sapic.c user/imp/tbemd/sys/ia64/ia64/support.S user/imp/tbemd/sys/ia64/ia64/syscall.S user/imp/tbemd/sys/ia64/include/intr.h user/imp/tbemd/sys/ia64/include/pmap.h user/imp/tbemd/sys/kern/imgact_elf.c user/imp/tbemd/sys/kern/kern_conf.c user/imp/tbemd/sys/kern/kern_kthread.c user/imp/tbemd/sys/kern/kern_proc.c user/imp/tbemd/sys/kern/kern_sig.c user/imp/tbemd/sys/kern/kern_thr.c user/imp/tbemd/sys/kern/subr_param.c user/imp/tbemd/sys/kern/uipc_socket.c user/imp/tbemd/sys/kern/uipc_syscalls.c user/imp/tbemd/sys/kern/vfs_default.c user/imp/tbemd/sys/kern/vfs_mount.c user/imp/tbemd/sys/kern/vfs_syscalls.c user/imp/tbemd/sys/mips/alchemy/obio.c user/imp/tbemd/sys/mips/atheros/ar71xxreg.h user/imp/tbemd/sys/mips/cavium/dev/rgmii/octeon_fpa.c user/imp/tbemd/sys/mips/cavium/octeon_machdep.c user/imp/tbemd/sys/mips/cavium/octeon_pcmap_regs.h user/imp/tbemd/sys/mips/conf/ADM5120 user/imp/tbemd/sys/mips/conf/MALTA user/imp/tbemd/sys/mips/conf/MALTA64 user/imp/tbemd/sys/mips/conf/OCTEON1 user/imp/tbemd/sys/mips/conf/OCTEON1-32 user/imp/tbemd/sys/mips/conf/QEMU user/imp/tbemd/sys/mips/conf/SWARM user/imp/tbemd/sys/mips/conf/XLR user/imp/tbemd/sys/mips/include/asm.h user/imp/tbemd/sys/mips/include/bus.h user/imp/tbemd/sys/mips/include/cdefs.h user/imp/tbemd/sys/mips/include/intr_machdep.h user/imp/tbemd/sys/mips/include/ucontext.h user/imp/tbemd/sys/mips/mips/elf_trampoline.c user/imp/tbemd/sys/mips/mips/exception.S user/imp/tbemd/sys/mips/rmi/board.c user/imp/tbemd/sys/mips/rmi/bus_space_rmi.c user/imp/tbemd/sys/mips/rmi/files.xlr user/imp/tbemd/sys/mips/rmi/interrupt.h user/imp/tbemd/sys/mips/rmi/intr_machdep.c user/imp/tbemd/sys/mips/rmi/iodi.c user/imp/tbemd/sys/mips/rmi/pcibus.h user/imp/tbemd/sys/mips/rmi/xlr_pci.c user/imp/tbemd/sys/mips/rmi/xls_ehci.c user/imp/tbemd/sys/modules/Makefile user/imp/tbemd/sys/modules/ath/Makefile user/imp/tbemd/sys/modules/bios/smbios/Makefile user/imp/tbemd/sys/modules/bios/vpd/Makefile user/imp/tbemd/sys/modules/cpufreq/Makefile user/imp/tbemd/sys/modules/cxgb/cxgb/Makefile user/imp/tbemd/sys/net/bpf.c user/imp/tbemd/sys/net/if.c user/imp/tbemd/sys/net/if.h user/imp/tbemd/sys/net/if_bridge.c user/imp/tbemd/sys/net/if_ethersubr.c user/imp/tbemd/sys/net/if_gre.c user/imp/tbemd/sys/net/if_gre.h user/imp/tbemd/sys/net/if_loop.c user/imp/tbemd/sys/net/if_tap.c user/imp/tbemd/sys/net/if_tun.c user/imp/tbemd/sys/net/if_vlan.c user/imp/tbemd/sys/net/netisr.c user/imp/tbemd/sys/net/netisr.h user/imp/tbemd/sys/net/radix.c user/imp/tbemd/sys/net/zlib.h user/imp/tbemd/sys/netinet/in_proto.c user/imp/tbemd/sys/netinet/ip_dummynet.h user/imp/tbemd/sys/netinet/ip_fw.h user/imp/tbemd/sys/netinet/ip_gre.c user/imp/tbemd/sys/netinet/ip_gre.h user/imp/tbemd/sys/netinet/ip_input.c user/imp/tbemd/sys/netinet/ip_mroute.c user/imp/tbemd/sys/netinet/ip_options.c user/imp/tbemd/sys/netinet/ip_var.h user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c user/imp/tbemd/sys/netinet/ipfw/ip_fw2.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_dynamic.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_log.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_pfil.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_private.h user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_table.c user/imp/tbemd/sys/netinet/sctp_input.c user/imp/tbemd/sys/netinet/sctp_output.c user/imp/tbemd/sys/netinet/sctp_output.h user/imp/tbemd/sys/netinet/sctp_usrreq.c user/imp/tbemd/sys/netinet/sctputil.c user/imp/tbemd/sys/netinet/tcp_syncache.c user/imp/tbemd/sys/netinet6/in6_pcb.c user/imp/tbemd/sys/netinet6/nd6.c user/imp/tbemd/sys/netipsec/keydb.h user/imp/tbemd/sys/nfsclient/nfs_kdtrace.c user/imp/tbemd/sys/pc98/pc98/machdep.c user/imp/tbemd/sys/powerpc/aim/machdep.c user/imp/tbemd/sys/powerpc/aim/mmu_oea.c user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c user/imp/tbemd/sys/powerpc/aim/trap.c user/imp/tbemd/sys/powerpc/aim/uma_machdep.c user/imp/tbemd/sys/powerpc/booke/copyinout.c user/imp/tbemd/sys/powerpc/include/pte.h user/imp/tbemd/sys/powerpc/include/sr.h user/imp/tbemd/sys/powerpc/include/vmparam.h user/imp/tbemd/sys/powerpc/powermac/smu.c user/imp/tbemd/sys/powerpc/powerpc/cpu.c user/imp/tbemd/sys/powerpc/powerpc/mem.c user/imp/tbemd/sys/security/mac_biba/mac_biba.c user/imp/tbemd/sys/security/mac_lomac/mac_lomac.c user/imp/tbemd/sys/security/mac_mls/mac_mls.c user/imp/tbemd/sys/sparc64/include/cache.h user/imp/tbemd/sys/sparc64/include/cpu.h user/imp/tbemd/sys/sparc64/include/md_var.h user/imp/tbemd/sys/sparc64/include/pcpu.h user/imp/tbemd/sys/sparc64/include/pmap.h user/imp/tbemd/sys/sparc64/include/smp.h user/imp/tbemd/sys/sparc64/include/tick.h user/imp/tbemd/sys/sparc64/include/ver.h user/imp/tbemd/sys/sparc64/sparc64/cache.c user/imp/tbemd/sys/sparc64/sparc64/cheetah.c user/imp/tbemd/sys/sparc64/sparc64/identcpu.c user/imp/tbemd/sys/sparc64/sparc64/iommu.c user/imp/tbemd/sys/sparc64/sparc64/machdep.c user/imp/tbemd/sys/sparc64/sparc64/mp_locore.S user/imp/tbemd/sys/sparc64/sparc64/mp_machdep.c user/imp/tbemd/sys/sparc64/sparc64/nexus.c user/imp/tbemd/sys/sparc64/sparc64/pmap.c user/imp/tbemd/sys/sparc64/sparc64/spitfire.c user/imp/tbemd/sys/sparc64/sparc64/tick.c user/imp/tbemd/sys/sparc64/sparc64/trap.c user/imp/tbemd/sys/sys/ata.h user/imp/tbemd/sys/sys/eventhandler.h user/imp/tbemd/sys/sys/fbio.h user/imp/tbemd/sys/sys/imgact.h user/imp/tbemd/sys/sys/imgact_aout.h user/imp/tbemd/sys/sys/imgact_elf.h user/imp/tbemd/sys/sys/queue.h user/imp/tbemd/sys/sys/sysctl.h user/imp/tbemd/sys/sys/sysent.h user/imp/tbemd/sys/sys/systm.h user/imp/tbemd/sys/sys/user.h user/imp/tbemd/sys/vm/vm_init.c user/imp/tbemd/sys/vm/vm_page.c user/imp/tbemd/sys/vm/vnode_pager.c user/imp/tbemd/sys/xen/evtchn/evtchn_dev.c user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc user/imp/tbemd/tools/regression/file/closefrom/Makefile user/imp/tbemd/tools/regression/file/flock/Makefile user/imp/tbemd/tools/regression/gaithrstress/Makefile user/imp/tbemd/tools/regression/kgssapi/Makefile user/imp/tbemd/tools/regression/kqueue/Makefile user/imp/tbemd/tools/regression/mqueue/mqtest1/Makefile user/imp/tbemd/tools/regression/mqueue/mqtest2/Makefile user/imp/tbemd/tools/regression/mqueue/mqtest3/Makefile user/imp/tbemd/tools/regression/mqueue/mqtest4/Makefile user/imp/tbemd/tools/regression/mqueue/mqtest5/Makefile user/imp/tbemd/tools/regression/netipx/ipxdgramloopback/Makefile user/imp/tbemd/tools/regression/netipx/spxabort/Makefile user/imp/tbemd/tools/regression/netipx/spxloopback/Makefile user/imp/tbemd/tools/regression/priv/Makefile user/imp/tbemd/tools/regression/pthread/cv_cancel1/Makefile user/imp/tbemd/tools/regression/pthread/mutex_isowned_np/Makefile user/imp/tbemd/tools/regression/rpcsec_gss/Makefile user/imp/tbemd/tools/regression/sigqueue/sigqtest1/Makefile user/imp/tbemd/tools/regression/sigqueue/sigqtest2/Makefile user/imp/tbemd/tools/regression/sockets/sendfile/Makefile user/imp/tbemd/tools/regression/sockets/sendfile/sendfile.c user/imp/tbemd/tools/regression/sockets/unix_gc/Makefile user/imp/tbemd/tools/regression/sockets/unix_sorflush/Makefile user/imp/tbemd/tools/regression/sysvsem/semtest.c user/imp/tbemd/tools/regression/tls/libxx/Makefile user/imp/tbemd/tools/regression/tls/libyy/Makefile user/imp/tbemd/tools/regression/tls/ttls1/Makefile user/imp/tbemd/tools/regression/tls/ttls2/Makefile user/imp/tbemd/tools/regression/tls/ttls4/Makefile user/imp/tbemd/tools/regression/tmpfs/Makefile user/imp/tbemd/tools/tools/ether_reflect/Makefile user/imp/tbemd/tools/tools/mctest/Makefile user/imp/tbemd/tools/tools/mctest/mctest.1 user/imp/tbemd/tools/tools/net80211/stumbler/Makefile user/imp/tbemd/tools/tools/net80211/w00t/Makefile.inc user/imp/tbemd/tools/tools/netrate/http/Makefile user/imp/tbemd/tools/tools/netrate/httpd/Makefile user/imp/tbemd/tools/tools/netrate/juggle/Makefile user/imp/tbemd/tools/tools/netrate/tcpconnect/Makefile user/imp/tbemd/tools/tools/netrate/tcpp/Makefile user/imp/tbemd/tools/tools/netrate/tcpreceive/Makefile user/imp/tbemd/tools/tools/umastat/Makefile user/imp/tbemd/usr.bin/Makefile user/imp/tbemd/usr.bin/cpio/Makefile user/imp/tbemd/usr.bin/cpio/bsdcpio.1 user/imp/tbemd/usr.bin/fetch/Makefile user/imp/tbemd/usr.bin/gcore/Makefile user/imp/tbemd/usr.bin/hexdump/hexdump.1 user/imp/tbemd/usr.bin/hexdump/od.1 user/imp/tbemd/usr.bin/jot/jot.1 user/imp/tbemd/usr.bin/locale/Makefile user/imp/tbemd/usr.bin/netstat/Makefile user/imp/tbemd/usr.bin/netstat/main.c user/imp/tbemd/usr.bin/netstat/netstat.1 user/imp/tbemd/usr.bin/netstat/netstat.h user/imp/tbemd/usr.bin/pr/Makefile user/imp/tbemd/usr.bin/pr/egetopt.c user/imp/tbemd/usr.bin/pr/pr.c user/imp/tbemd/usr.bin/systat/Makefile user/imp/tbemd/usr.bin/tar/Makefile user/imp/tbemd/usr.bin/tar/test/test_option_T.c user/imp/tbemd/usr.bin/tar/test/test_option_s.c user/imp/tbemd/usr.bin/tar/tree.c user/imp/tbemd/usr.bin/unifdef/unifdef.1 user/imp/tbemd/usr.bin/unifdef/unifdef.c user/imp/tbemd/usr.bin/unzip/Makefile user/imp/tbemd/usr.bin/xinstall/xinstall.c user/imp/tbemd/usr.sbin/auditd/Makefile user/imp/tbemd/usr.sbin/bluetooth/bthidd/Makefile user/imp/tbemd/usr.sbin/boot0cfg/Makefile user/imp/tbemd/usr.sbin/bsnmpd/modules/Makefile.inc user/imp/tbemd/usr.sbin/chown/chgrp.1 user/imp/tbemd/usr.sbin/chown/chown.8 user/imp/tbemd/usr.sbin/chown/chown.c user/imp/tbemd/usr.sbin/cxgbtool/cxgbtool.c user/imp/tbemd/usr.sbin/cxgbtool/reg_defs.c user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3.c user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3b.c user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3c.c user/imp/tbemd/usr.sbin/fwcontrol/Makefile user/imp/tbemd/usr.sbin/mfiutil/Makefile user/imp/tbemd/usr.sbin/mptable/mptable.c user/imp/tbemd/usr.sbin/mptutil/Makefile user/imp/tbemd/usr.sbin/mptutil/mpt_cam.c user/imp/tbemd/usr.sbin/mptutil/mpt_show.c user/imp/tbemd/usr.sbin/mtree/mtree.5 user/imp/tbemd/usr.sbin/pmcstat/Makefile user/imp/tbemd/usr.sbin/rtsold/Makefile user/imp/tbemd/usr.sbin/rtsold/dump.c user/imp/tbemd/usr.sbin/rtsold/if.c user/imp/tbemd/usr.sbin/rtsold/rtsock.c user/imp/tbemd/usr.sbin/rtsold/rtsol.c user/imp/tbemd/usr.sbin/rtsold/rtsold.c user/imp/tbemd/usr.sbin/rtsold/rtsold.h user/imp/tbemd/usr.sbin/sysinstall/devices.c user/imp/tbemd/usr.sbin/uhsoctl/Makefile user/imp/tbemd/usr.sbin/zic/zdump/Makefile user/imp/tbemd/usr.sbin/zic/zic/Makefile Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/contrib/tzcode/stdtime/ (props changed) user/imp/tbemd/contrib/tzcode/zic/ (props changed) user/imp/tbemd/lib/libz/ (props changed) Modified: user/imp/tbemd/MAINTAINERS ============================================================================== --- user/imp/tbemd/MAINTAINERS Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/MAINTAINERS Tue Mar 2 20:20:53 2010 (r204601) @@ -125,6 +125,12 @@ gnu/usr.bin/send-pr bugmaster Pre-commit ncurses rafan Heads-up appreciated, try not to break it. *env(3) secteam Due to the problematic security history of this code, please have patches reviewed by secteam. +share/zoneinfo edwin Heads-up appreciated, since our data is coming + from a third party source. +usr.sbin/zic edwin Heads-up appreciated, since this code is + maintained by a third party source. +lib/libc/stdtime edwin Heads-up appreciated, since parts of this code + is maintained by a third party source. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. Modified: user/imp/tbemd/ObsoleteFiles.inc ============================================================================== --- user/imp/tbemd/ObsoleteFiles.inc Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/ObsoleteFiles.inc Tue Mar 2 20:20:53 2010 (r204601) @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100227: [ia64] removed and +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/machine/sapicreg.h +OLD_FILES+=usr/include/machine/sapicvar.h +.endif +# 20100208: man pages moved +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz +OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz +OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz +OLD_FILES+=usr/share/man/man4/i386/scd.4.gz +OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz +.endif # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd OLD_FILES+=usr/share/doc/papers/bc.ascii.gz OLD_FILES+=usr/share/doc/papers/dc.ascii.gz @@ -2275,7 +2290,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" +.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign Modified: user/imp/tbemd/bin/kill/kill.c ============================================================================== --- user/imp/tbemd/bin/kill/kill.c Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/bin/kill/kill.c Tue Mar 2 20:20:53 2010 (r204601) @@ -108,7 +108,7 @@ main(int argc, char *argv[]) numsig = strtol(*argv, &ep, 10); if (!**argv || *ep) errx(1, "illegal signal number: %s", *argv); - if (numsig < 0 || numsig >= sys_nsig) + if (numsig < 0) nosig(*argv); } else nosig(*argv); Modified: user/imp/tbemd/bin/pkill/pkill.1 ============================================================================== --- user/imp/tbemd/bin/pkill/pkill.1 Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/bin/pkill/pkill.1 Tue Mar 2 20:20:53 2010 (r204601) @@ -16,13 +16,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/imp/tbemd/bin/pkill/pkill.c ============================================================================== --- user/imp/tbemd/bin/pkill/pkill.c Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/bin/pkill/pkill.c Tue Mar 2 20:20:53 2010 (r204601) @@ -16,13 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/imp/tbemd/bin/sh/parser.c ============================================================================== --- user/imp/tbemd/bin/sh/parser.c Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/bin/sh/parser.c Tue Mar 2 20:20:53 2010 (r204601) @@ -1641,7 +1641,7 @@ getprompt(void *unused __unused) case 'w': ps[i] = '\0'; getcwd(&ps[i], PROMPTLEN - i); - if (*fmt == 'W') { + if (*fmt == 'W' && ps[i + 1] != '\0') { /* Final path component only. */ trim = 1; for (j = i; ps[j] != '\0'; j++) Modified: user/imp/tbemd/cddl/Makefile.inc ============================================================================== --- user/imp/tbemd/cddl/Makefile.inc Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/Makefile.inc Tue Mar 2 20:20:53 2010 (r204601) @@ -7,4 +7,5 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN +WARNS?= 6 CSTD?= gnu89 Modified: user/imp/tbemd/cddl/lib/drti/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/drti/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/drti/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,8 +1,6 @@ # $FreeBSD$ -.include "../../Makefile.inc" - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} @@ -10,7 +8,6 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -WARNS?= 6 CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/imp/tbemd/cddl/lib/libavl/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libavl/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libavl/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -4,6 +4,7 @@ LIB= avl SRCS= avl.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/imp/tbemd/cddl/lib/libctf/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libctf/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libctf/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,10 +1,10 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf LIB= ctf -SHLIB_MAJOR= 2 - SRCS= ctf_create.c \ ctf_decl.c \ ctf_error.c \ @@ -17,10 +17,7 @@ SRCS= ctf_create.c \ ctf_types.c \ ctf_util.c -.PATH: ${OPENSOLARIS_USR_DISTDIR}/common/ctf -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf - +WARNS?= 0 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/imp/tbemd/cddl/lib/libdtrace/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libdtrace/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libdtrace/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,12 +1,9 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common LIB= dtrace -SHLIB_MAJOR= 2 - -WARNS= 1 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -51,8 +48,7 @@ DSRCS= errno.d \ signal.d \ unistd.d -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common +WARNS?= 1 CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/imp/tbemd/cddl/lib/libnvpair/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libnvpair/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libnvpair/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -10,6 +10,7 @@ SRCS= libnvpair.c \ nvpair_alloc_fixed.c \ nvpair.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/imp/tbemd/cddl/lib/libumem/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libumem/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libumem/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -4,6 +4,7 @@ LIB= umem SRCS= umem.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include Modified: user/imp/tbemd/cddl/lib/libuutil/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libuutil/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libuutil/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -15,6 +15,7 @@ SRCS= avl.c \ uu_pname.c \ uu_strtoint.c +WARNS?= 0 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris Modified: user/imp/tbemd/cddl/lib/libzfs/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libzfs/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libzfs/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -32,6 +32,7 @@ SRCS+= zfs_deleg.c \ libzfs_sendrecv.c \ libzfs_status.c +WARNS?= 0 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem Modified: user/imp/tbemd/cddl/lib/libzpool/Makefile ============================================================================== --- user/imp/tbemd/cddl/lib/libzpool/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/lib/libzpool/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -33,6 +33,7 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/imp/tbemd/cddl/sbin/zfs/Makefile ============================================================================== --- user/imp/tbemd/cddl/sbin/zfs/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/sbin/zfs/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -6,6 +6,7 @@ PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/imp/tbemd/cddl/sbin/zpool/Makefile ============================================================================== --- user/imp/tbemd/cddl/sbin/zpool/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/sbin/zpool/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -7,6 +7,7 @@ PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,13 +1,12 @@ # $FreeBSD$ -.include - -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt DEBUG_FLAGS= -g PROG= ctfconvert - +NO_MAN= SRCS= alist.c \ ctf.c \ ctfconvert.c \ @@ -29,8 +28,6 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ @@ -40,12 +37,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -LDADD+= -lctf -ldwarf -lelf -lz -lthr - -.PATH: ${.CURDIR} -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no +DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} +LDADD= -lctf -ldwarf -lelf -lz -lpthread .include Modified: user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,15 +1,14 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump PROG= ctfdump - +NO_MAN= SRCS= dump.c \ symbol.c \ utils.c -WARNS?= 6 - CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ @@ -19,13 +18,7 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -LDFLAGS+= -pthread - -LDADD+= -lelf -lz - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump - -NO_MAN= +DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} +LDADD= -lpthread -lelf -lz .include Modified: user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,13 +1,10 @@ # $FreeBSD$ -.include - -.include "../../Makefile.inc" - -WARNS= 1 +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfmerge - +NO_MAN= SRCS= alist.c \ barrier.c \ ctf.c \ @@ -26,7 +23,7 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -37,11 +34,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -LDADD+= -lctf -ldwarf -lelf -lz -lthr - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no +DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} +LDADD= -lctf -ldwarf -lelf -lz -lpthread .include Modified: user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,20 +1,17 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl # This program is required as a bootstrap tool for 'make buildworld' PROG= sgsmsg - +NO_MAN= SRCS= avl.c sgsmsg.c string_table.c findprime.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl - -NO_MAN= - .include Modified: user/imp/tbemd/cddl/usr.bin/zinject/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/zinject/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/zinject/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -6,6 +6,7 @@ PROG= zinject SRCS= zinject.c translate.c NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem @@ -19,7 +20,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL} + ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool .include Modified: user/imp/tbemd/cddl/usr.bin/ztest/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.bin/ztest/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.bin/ztest/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -5,6 +5,7 @@ PROG= ztest NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,14 +1,12 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace PROG= dtrace - -BINDIR?= /usr/sbin - SRCS= dtrace.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,20 +16,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace - # Optional debugging stuff... #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -LDFLAGS+= -pthread \ - -L${.OBJDIR}/../../lib/libdtrace \ - -L${.OBJDIR}/../../lib/libproc \ - -L${.OBJDIR}/../../lib/libctf \ - -L${.OBJDIR}/../../../lib/libelf - -LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz - -DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ} +DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} +LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz .include Modified: user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -1,14 +1,13 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat PROG= lockstat - -BINDIR?= /usr/sbin - +NO_MAN= SRCS= lockstat.c sym.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -19,22 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ -I${.CURDIR}/../../../sys -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d -LDFLAGS+= -pthread \ - -L${.OBJDIR}/../../lib/libdtrace \ - -L${.OBJDIR}/../../lib/libproc \ - -L${.OBJDIR}/../../lib/libctf \ - -L${.OBJDIR}/../../../lib/libelf - -LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt - -#DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ} - -NO_MAN= +DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} +LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt .include Modified: user/imp/tbemd/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/imp/tbemd/cddl/usr.sbin/zdb/Makefile Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/cddl/usr.sbin/zdb/Makefile Tue Mar 2 20:20:53 2010 (r204601) @@ -6,6 +6,9 @@ PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c +WARNS?= 0 +CSTD= c99 + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -23,6 +26,5 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LI ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -CSTD= c99 .include Modified: user/imp/tbemd/contrib/gcc/config/mips/freebsd.h ============================================================================== --- user/imp/tbemd/contrib/gcc/config/mips/freebsd.h Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/contrib/gcc/config/mips/freebsd.h Tue Mar 2 20:20:53 2010 (r204601) @@ -130,10 +130,67 @@ Boston, MA 02110-1301, USA. */ if (TARGET_MIPS16) \ builtin_define ("__mips16"); \ \ + if (mips_abi == ABI_N32) \ + { \ + builtin_define ("__mips_n32"); \ + builtin_define ("_ABIN32=2"); \ + builtin_define ("_MIPS_SIM=_ABIN32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else if (mips_abi == ABI_64) \ + { \ + builtin_define ("__mips_n64"); \ + builtin_define ("_ABI64=3"); \ + builtin_define ("_MIPS_SIM=_ABI64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_O64) \ + { \ + builtin_define ("__mips_o64"); \ + builtin_define ("_ABIO64=4"); \ + builtin_define ("_MIPS_SIM=_ABIO64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_EABI) \ + { \ + builtin_define ("__mips_eabi"); \ + builtin_define ("_ABIEMB=5"); \ + builtin_define ("_MIPS_SIM=_ABIEMB"); \ + if (TARGET_LONG64) \ + builtin_define ("_MIPS_SZLONG=64"); \ + else \ + builtin_define ("_MIPS_SZLONG=32"); \ + if (TARGET_64BIT) \ + builtin_define ("_MIPS_SZPTR=64"); \ + else \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else \ + { \ + builtin_define ("__mips_o32"); \ + builtin_define ("_ABIO32=1"); \ + builtin_define ("_MIPS_SIM=_ABIO32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + if (TARGET_FLOAT64) \ + builtin_define ("_MIPS_FPSET=32"); \ + else \ + builtin_define ("_MIPS_FPSET=16"); \ + \ + builtin_define ("_MIPS_SZINT=32"); \ + \ MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info); \ MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info); \ \ - if (ISA_MIPS3) \ + if (ISA_MIPS1) \ + builtin_define ("__mips=1"); \ + else if (ISA_MIPS2) \ + builtin_define ("__mips=2"); \ + else if (ISA_MIPS3) \ builtin_define ("__mips=3"); \ else if (ISA_MIPS4) \ builtin_define ("__mips=4"); \ @@ -152,7 +209,12 @@ Boston, MA 02110-1301, USA. */ builtin_define ("__mips=64"); \ builtin_define ("__mips_isa_rev=1"); \ } \ - \ +/* else if (ISA_MIPS64R2) \ + { \ + builtin_define ("__mips=64"); \ + builtin_define ("__mips_isa_rev=2"); \ + } \ +*/ \ if (TARGET_HARD_FLOAT) \ builtin_define ("__mips_hard_float"); \ else if (TARGET_SOFT_FLOAT) \ @@ -167,18 +229,6 @@ Boston, MA 02110-1301, USA. */ builtin_define ("__MIPSEL__"); \ \ /* No language dialect defines. */ \ - \ - if (mips_abi == ABI_EABI) \ - builtin_define ("__mips_eabi"); \ - else if (mips_abi == ABI_N32) \ - builtin_define ("__mips_n32"); \ - else if (mips_abi == ABI_64) \ - builtin_define ("__mips_n64"); \ - else if (mips_abi == ABI_O64) \ - builtin_define ("__mips_o64"); \ - else \ - builtin_define ("__mips_o32"); \ - \ if (TARGET_ABICALLS) \ builtin_define ("__ABICALLS__"); \ } \ @@ -241,6 +291,15 @@ Boston, MA 02110-1301, USA. */ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." +/* Currently we don't support 128bit long doubles, so for now we force + n32 to be 64bit. */ +#undef LONG_DOUBLE_TYPE_SIZE +#define LONG_DOUBLE_TYPE_SIZE 64 + +#ifdef IN_LIBGCC2 +#undef LIBGCC2_LONG_DOUBLE_TYPE_SIZE +#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 +#endif /************************[ Debugger stuff ]*********************************/ Copied: user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h (from r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h Tue Mar 2 20:20:53 2010 (r204601, copy of r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h) @@ -0,0 +1,48 @@ +/*********************************************************************** +Copyright 2003-2006 Raza Microelectronics, Inc.(RMI). +This is a derived work from software originally provided by the external +entity identified below. The licensing terms and warranties specified in +the header of the original work apply to this derived work. +Contribution by RMI: +*****************************#RMI_1#**********************************/ +/* Native-dependent definitions for NetBSD/mips. + Copyright 2002 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef NM_FBSD_H +#define NM_FBSD_H + +/* Override child_pid_to_exec_file in 'inftarg.c'. */ +#define CHILD_PID_TO_EXEC_FILE + +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE caddr_t + +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS + +/* We can attach and detach. */ +#define ATTACH_DETACH + +/* Shared library support. */ + +#include "solib.h" + +#endif /* NM_FBSD_H */ Copied: user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h (from r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h Tue Mar 2 20:20:53 2010 (r204601, copy of r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h) @@ -0,0 +1,43 @@ +/*********************************************************************** +Copyright 2003-2006 Raza Microelectronics, Inc.(RMI). +This is a derived work from software originally provided by the external +entity identified below. The licensing terms and warranties specified in +the header of the original work apply to this derived work. +Contribution by RMI: +*****************************#RMI_1#**********************************/ +/* Target-dependent definitions for NetBSD/mips. + Copyright 2002 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef TM_FBSD_H +#define TM_FBSD_H + +#include "mips/tm-mips.h" +#include "solib.h" + +/* We don't want to inherit tm-mips.h's shared library trampoline code. */ +#undef IN_SOLIB_CALL_TRAMPOLINE +#undef IN_SOLIB_RETURN_TRAMPOLINE +#undef SKIP_TRAMPOLINE_CODE +#undef IGNORE_HELPER_CALL + +/* XXX undef a bunch of stuff we want to use multi-arch */ +#undef IN_SIGTRAMP +#endif /* TM_FBSD_H */ Modified: user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h ============================================================================== --- user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h Tue Mar 2 19:50:19 2010 (r204600) +++ user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h Tue Mar 2 20:20:53 2010 (r204601) @@ -62,6 +62,17 @@ struct mips_regnum extern const struct mips_regnum *mips_regnum (struct gdbarch *gdbarch); enum { + MIPS_S0_REGNUM = 16, + MIPS_S1_REGNUM = 17, + MIPS_S2_REGNUM = 18, + MIPS_S3_REGNUM = 19, + MIPS_S4_REGNUM = 20, + MIPS_S5_REGNUM = 21, + MIPS_S6_REGNUM = 22, + MIPS_S7_REGNUM = 23, + MIPS_SP_REGNUM = 29, + MIPS_FP_REGNUM = 30, + MIPS_RA_REGNUM = 31, MIPS_EMBED_LO_REGNUM = 33, MIPS_EMBED_HI_REGNUM = 34, MIPS_EMBED_BADVADDR_REGNUM = 35, Copied: user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c (from r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c Tue Mar 2 20:20:53 2010 (r204601, copy of r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c) @@ -0,0 +1,108 @@ +/*********************************************************************** +Copyright 2003-2006 Raza Microelectronics, Inc.(RMI). +This is a derived work from software originally provided by the external +entity identified below. The licensing terms and warranties specified in +the header of the original work apply to this derived work. +Contribution by RMI: +*****************************#RMI_1#**********************************/ +/* Native-dependent code for MIPS systems running NetBSD. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "inferior.h" +#include "regcache.h" + +#include "mipsfbsd-tdep.h" + +#include +#include +#include + +/* Determine if PT_GETREGS fetches this register. */ +static int +getregs_supplies (int regno) +{ + return ((regno) >= ZERO_REGNUM && (regno) <= PC_REGNUM); +} + +void +fetch_inferior_registers (int regno) +{ + if (regno == -1 || getregs_supplies (regno)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + mipsfbsd_supply_reg ((char *) ®s, regno); + if (regno != -1) + return; + } + + if (regno == -1 || regno >= FP0_REGNUM) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + mipsfbsd_supply_fpreg ((char *) &fpregs, regno); + } +} + +void +store_inferior_registers (int regno) +{ + if (regno == -1 || getregs_supplies (regno)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + mipsfbsd_fill_reg ((char *) ®s, regno); + + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't write registers"); + + if (regno != -1) + return; + } + + if (regno == -1 || regno >= FP0_REGNUM) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + mipsfbsd_fill_fpreg ((char *) &fpregs, regno); + + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating point status"); + } +} Copied: user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c (from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c Tue Mar 2 20:20:53 2010 (r204601, copy of r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c) @@ -0,0 +1,579 @@ +/*********************************************************************** +Copyright 2003-2006 Raza Microelectronics, Inc.(RMI). +This is a derived work from software originally provided by the external +entity identified below. The licensing terms and warranties specified in +the header of the original work apply to this derived work. +Contribution by RMI: +*****************************#RMI_1#**********************************/ +/* Target-dependent code for MIPS systems running NetBSD. + Copyright 2002, 2003 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "gdbcore.h" +#include "regcache.h" +#include "target.h" +#include "value.h" +#include "osabi.h" + +#include "nbsd-tdep.h" +#include "mipsfbsd-tdep.h" +#include "mips-tdep.h" + +#include "solib-svr4.h" + +#include +#include "gregset.h" +#include "trad-frame.h" +#include "frame.h" +#include "frame-unwind.h" +#include "bfd.h" +#include "objfiles.h" + +/* Conveniently, GDB uses the same register numbering as the + ptrace register structure used by NetBSD/mips. */ + +void +mipsfbsd_supply_reg (char *regs, int regno) +{ + int i; + + for (i = 0; i <= PC_REGNUM; i++) + { + if (regno == i || regno == -1) + { + if (CANNOT_FETCH_REGISTER (i)) + supply_register (i, NULL); + else + supply_register (i, regs + (i * mips_regsize (current_gdbarch))); + } + } +} +void +supply_gregset (gdb_gregset_t *gregs) +{ + mipsfbsd_supply_reg((char *)gregs, -1); +} + +void +mipsfbsd_fill_reg (char *regs, int regno) +{ + int i; + + for (i = 0; i <= PC_REGNUM; i++) + if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i)) + regcache_collect (i, regs + (i * mips_regsize (current_gdbarch))); +} + +void +fill_gregset (gdb_gregset_t *gregs, int regno) +{ + mipsfbsd_fill_reg ((char *)gregs, regno); +} + +void +mipsfbsd_supply_fpreg (char *fpregs, int regno) +{ + int i; + + for (i = FP0_REGNUM; + i <= mips_regnum (current_gdbarch)->fp_implementation_revision; + i++) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 21:12:07 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CF961065678; Tue, 2 Mar 2010 21:12:07 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BEA58FC1F; Tue, 2 Mar 2010 21:12:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22LC6Dm044726; Tue, 2 Mar 2010 21:12:06 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22LC6TQ044722; Tue, 2 Mar 2010 21:12:06 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003022112.o22LC6TQ044722@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 2 Mar 2010 21:12:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204603 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 21:12:07 -0000 Author: edwin Date: Tue Mar 2 21:12:06 2010 New Revision: 204603 URL: http://svn.freebsd.org/changeset/base/204603 Log: To facilitate the features -3, -A and -B: Rewrite on the way ranges of months are displayed for ncal. (cal still pending). Modified: user/edwin/ncal/Makefile user/edwin/ncal/ncal.1 user/edwin/ncal/ncal.c Modified: user/edwin/ncal/Makefile ============================================================================== --- user/edwin/ncal/Makefile Tue Mar 2 21:10:44 2010 (r204602) +++ user/edwin/ncal/Makefile Tue Mar 2 21:12:06 2010 (r204603) @@ -4,9 +4,10 @@ PROG= ncal DPADD= ${LIBCALENDAR} ${LIBTERMCAP} LDADD= -lcalendar -ltermcap +CFLAGS+= -I/usr/src/contrib/tzcode/libc/ WARNS?= 1 -LINKS= ${BINDIR}/ncal ${BINDIR}/cal +#LINKS= ${BINDIR}/ncal ${BINDIR}/cal MLINKS= ncal.1 cal.1 .include Modified: user/edwin/ncal/ncal.1 ============================================================================== --- user/edwin/ncal/ncal.1 Tue Mar 2 21:10:44 2010 (r204602) +++ user/edwin/ncal/ncal.1 Tue Mar 2 21:12:06 2010 (r204603) @@ -115,6 +115,16 @@ Switch to backwards compatibility mode ( Use .Ar yyyy-mm-dd as the current date (for debugging of highlighting). +.It Fl 3 +Display the previous, current and next month surrounding today. +.It Fl A Ar number +Display the +.Ar number +of months after the current month. +.It Fl B Ar number +Display the +.Ar number +of months before the current month. .El .Pp A single parameter specifies the year (1\(en9999) to be displayed; Modified: user/edwin/ncal/ncal.c ============================================================================== --- user/edwin/ncal/ncal.c Tue Mar 2 21:10:44 2010 (r204602) +++ user/edwin/ncal/ncal.c Tue Mar 2 21:12:06 2010 (r204603) @@ -184,6 +184,8 @@ int sndays(struct date * d); int sndaysb(struct date * d); static void usage(void); int weekdayb(int nd); +void monthrange(int year, int jd_flag, int m, int before, int after); +void monthrangeb(int year, int jd_flag, int m, int before, int after); int main(int argc, char *argv[]) @@ -204,6 +206,7 @@ main(int argc, char *argv[]) char *cp; /* character pointer */ char *flag_month = NULL; /* requested month as string */ char *flag_date = NULL; + int before, after; const char *locale; /* locale to get country code */ char tbuf[1024], cbuf[512], *b; time_t t; @@ -265,8 +268,23 @@ main(int argc, char *argv[]) if (flag_backward) nswitchb = ndaysj(&ukswitch); - while ((ch = getopt(argc, argv, "Jbd:ehjm:ops:wy")) != -1) + before = after = -1; + + while ((ch = getopt(argc, argv, "A:B:3Jbd:ehjm:ops:wy")) != -1) switch (ch) { + case '3': + before = after = 1; + break; + case 'A': + after = strtol(optarg, NULL, 10); + if (after < 0) + errx(1, "Argument to -A must be positive"); + break; + case 'B': + before = strtol(optarg, NULL, 10); + if (before < 0) + errx(1, "Argument to -B must be positive"); + break; case 'J': if (flag_backward) usage(); @@ -343,6 +361,9 @@ main(int argc, char *argv[]) y = atoi(*argv++); if (y < 1 || y > 9999) errx(EX_USAGE, "year %d not in range 1..9999", y); + before = 0; + after = 11; + m = 1; break; case 0: { @@ -353,6 +374,10 @@ main(int argc, char *argv[]) tm = localtime(&t); y = tm->tm_year + 1900; m = tm->tm_mon + 1; + if (before == -1) + before = 0; + if (after == -1) + after = 0; } break; default: @@ -379,17 +404,11 @@ main(int argc, char *argv[]) if (flag_easter) printeaster(y, flag_julian_cal, flag_orthodox); - else if (argc == 1 || flag_hole_year) { - if (flag_backward) - printyearb(y, flag_julian_day); - else - printyear(y, flag_julian_day); - } else + else if (flag_backward) - printmonthb(y, m, flag_julian_day); + monthrangeb(y, flag_julian_day, m, before, after); else - printmonth(y, m, flag_julian_day); - + monthrange(y, flag_julian_day, m, before, after); return (0); } @@ -512,6 +531,113 @@ printmonthb(int y, int m, int jd_flag) } void +monthrangeb(int y, int jd_flag, int m, int before, int after) +{ + printf("BUUURP\n"); +} + +#define DECREASEMONTH(m, y) \ + if (--m == 0) { \ + m = 12; \ + y--; \ + } +#define INCREASEMONTH(m, y) \ + if (++(m) == 13) { \ + (m) = 1; \ + (y)++; \ + } +#define M2Y(m) ((m) / 12) +#define M2M(m) (1 + (m) % 12) +void +monthrange(int y, int jd_flag, int m, int before, int after) +{ + struct monthlines year[12]; + struct weekdays wds; + char s[80], t[80]; + int i, j; + int mpl; + int mw; + int m1, m2; + int prevyear = -1; + int printyearheader; + + mpl = jd_flag ? 3 : 4; + mw = jd_flag ? MONTH_WIDTH_J : MONTH_WIDTH; + + while (before != 0) { + DECREASEMONTH(m, y); + before--; + after++; + } + m1 = y * 12 + m - 1; + m2 = m1 + after; + + mkweekdays(&wds); + + /* + * The year header is printed when there are more than 'mpl' months + * and if the first month is a multitude of 'mpl'. + * If not, it will print the year behind every month. + */ + printyearheader = (after >= mpl - 1) && (M2M(m1) - 1) % mpl == 0; + + m = m1; + while (m <= m2) { + int count = 0; + for (i = 0; i != mpl && m + i <= m2; i++) { + mkmonth(M2Y(m + i), M2M(m + i) - 1, jd_flag, year + i); + count++; + } + +#define MW(mw, ms, ml) \ + strlen(ms) > (ml) ? (mw) + 9 : (mw) + + /* Empty line between two months */ + if (m != m1) + printf("\n"); + + /* Year at the top, only for calendars which start at January */ + if (printyearheader && M2Y(m) != prevyear) { + sprintf(s, "%d", M2Y(m)); + printf("%s\n", center(t, s, mpl * mw)); + prevyear = M2Y(m); + } + + /* Month names */ + wprintf(L" "); + for (i = 0; i < count; i++) + if (printyearheader) + wprintf(L"%-*ls", mw, year[i].name); + else + wprintf(L"%-ls %-*d", year[i].name, + mw - wcslen(year[i].name) - 1, M2Y(m + i)); + printf("\n"); + + for (i = 0; i != 7; i++) { + /* Week day */ + wprintf(L"%.2ls", wds.names[i]); + + /* Full months */ + for (j = 0; j < count; j++) + printf("%-*s", + MW(mw, year[j].lines[i], + year[j].linelen[i]), year[j].lines[i]); + printf("\n"); + } + + if (flag_weeks) { + printf(" "); + for (i = 0; i < count; i++) + printf("%-*s", mw, year[i].weeks); + printf("\n"); + } + + m += mpl; + } + return; +} + +void printyear(int y, int jd_flag) { struct monthlines year[12]; From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 23:49:28 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41536106564A; Tue, 2 Mar 2010 23:49:28 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 308EC8FC15; Tue, 2 Mar 2010 23:49:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22NnSx7079770; Tue, 2 Mar 2010 23:49:28 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22NnS80079768; Tue, 2 Mar 2010 23:49:28 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003022349.o22NnS80079768@svn.freebsd.org> From: Juli Mallett Date: Tue, 2 Mar 2010 23:49:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204609 - user/jmallett/octeon/contrib/gcc/config/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 23:49:28 -0000 Author: jmallett Date: Tue Mar 2 23:49:27 2010 New Revision: 204609 URL: http://svn.freebsd.org/changeset/base/204609 Log: Whoops. Actually merge JC's ABI-related changes. Add ISA checks that are required with Warner's new asm.h. Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h ============================================================================== --- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Tue Mar 2 22:25:50 2010 (r204608) +++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Tue Mar 2 23:49:27 2010 (r204609) @@ -130,29 +130,101 @@ Boston, MA 02110-1301, USA. */ if (TARGET_MIPS16) \ builtin_define ("__mips16"); \ \ + if (mips_abi == ABI_N32) \ + { \ + builtin_define ("__mips_n32"); \ + builtin_define ("_ABIN32=2"); \ + builtin_define ("_MIPS_SIM=_ABIN32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else if (mips_abi == ABI_64) \ + { \ + builtin_define ("__mips_n64"); \ + builtin_define ("_ABI64=3"); \ + builtin_define ("_MIPS_SIM=_ABI64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_O64) \ + { \ + builtin_define ("__mips_o64"); \ + builtin_define ("_ABIO64=4"); \ + builtin_define ("_MIPS_SIM=_ABIO64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_EABI) \ + { \ + builtin_define ("__mips_eabi"); \ + builtin_define ("_ABIEMB=5"); \ + builtin_define ("_MIPS_SIM=_ABIEMB"); \ + if (TARGET_LONG64) \ + builtin_define ("_MIPS_SZLONG=64"); \ + else \ + builtin_define ("_MIPS_SZLONG=32"); \ + if (TARGET_64BIT) \ + builtin_define ("_MIPS_SZPTR=64"); \ + else \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else \ + { \ + builtin_define ("__mips_o32"); \ + builtin_define ("_ABIO32=1"); \ + builtin_define ("_MIPS_SIM=_ABIO32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + if (TARGET_FLOAT64) \ + builtin_define ("_MIPS_FPSET=32"); \ + else \ + builtin_define ("_MIPS_FPSET=16"); \ + \ + builtin_define ("_MIPS_SZINT=32"); \ + \ MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info); \ MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info); \ \ - if (ISA_MIPS3) \ - builtin_define ("__mips=3"); \ + if (ISA_MIPS1) \ + { \ + builtin_define ("__mips=1"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS1"); \ + } \ + else if (ISA_MIPS2) \ + { \ + builtin_define ("__mips=2"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS2"); \ + } \ + else if (ISA_MIPS3) \ + { \ + builtin_define ("__mips=3"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS3"); \ + } \ else if (ISA_MIPS4) \ - builtin_define ("__mips=4"); \ + { \ + builtin_define ("__mips=4"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS4"); \ + } \ else if (ISA_MIPS32) \ { \ builtin_define ("__mips=32"); \ builtin_define ("__mips_isa_rev=1"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32"); \ } \ else if (ISA_MIPS32R2) \ { \ builtin_define ("__mips=32"); \ builtin_define ("__mips_isa_rev=2"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32"); \ } \ else if (ISA_MIPS64) \ { \ builtin_define ("__mips=64"); \ builtin_define ("__mips_isa_rev=1"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS64"); \ } \ - \ + \ if (TARGET_HARD_FLOAT) \ builtin_define ("__mips_hard_float"); \ else if (TARGET_SOFT_FLOAT) \ @@ -167,25 +239,6 @@ Boston, MA 02110-1301, USA. */ builtin_define ("__MIPSEL__"); \ \ /* No language dialect defines. */ \ - \ - if (mips_abi == ABI_EABI) \ - builtin_define ("__mips_eabi"); \ - else if (mips_abi == ABI_N32) { \ - builtin_define ("_ABIN32=2"); \ - builtin_define ("_MIPS_SIM=_ABIN32"); \ - builtin_define ("__mips_n32"); \ - } else if (mips_abi == ABI_64) { \ - builtin_define ("_ABI64=3"); \ - builtin_define ("_MIPS_SIM=_ABI64"); \ - builtin_define ("__mips_n64"); \ - } else if (mips_abi == ABI_O64) \ - builtin_define ("__mips_o64"); \ - else { \ - builtin_define ("_ABIO32=1"); \ - builtin_define ("_MIPS_SIM=_ABIO32"); \ - builtin_define ("__mips_o32"); \ - } \ - \ if (TARGET_ABICALLS) \ builtin_define ("__ABICALLS__"); \ } \ @@ -248,6 +301,5 @@ Boston, MA 02110-1301, USA. */ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." - /************************[ Debugger stuff ]*********************************/ From owner-svn-src-user@FreeBSD.ORG Tue Mar 2 23:53:40 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35CB31065673; Tue, 2 Mar 2010 23:53:40 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 200F08FC14; Tue, 2 Mar 2010 23:53:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22NreVL080785; Tue, 2 Mar 2010 23:53:40 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22NrdQo080734; Tue, 2 Mar 2010 23:53:39 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003022353.o22NrdQo080734@svn.freebsd.org> From: Juli Mallett Date: Tue, 2 Mar 2010 23:53:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204610 - in user/jmallett/octeon: . bin/pkill cddl cddl/lib/drti cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/libzf... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 23:53:40 -0000 Author: jmallett Date: Tue Mar 2 23:53:38 2010 New Revision: 204610 URL: http://svn.freebsd.org/changeset/base/204610 Log: Merge from current. Added: user/jmallett/octeon/contrib/dtc/ - copied from r204608, head/contrib/dtc/ user/jmallett/octeon/gnu/usr.bin/dtc/ - copied from r204608, head/gnu/usr.bin/dtc/ user/jmallett/octeon/lib/libalias/Makefile.inc - copied unchanged from r204608, head/lib/libalias/Makefile.inc user/jmallett/octeon/sys/contrib/libfdt/ - copied from r204608, head/sys/contrib/libfdt/ user/jmallett/octeon/sys/kern/kern_gzio.c - copied unchanged from r204608, head/sys/kern/kern_gzio.c user/jmallett/octeon/sys/net/netisr_internal.h - copied unchanged from r204608, head/sys/net/netisr_internal.h user/jmallett/octeon/sys/net/zutil.h - copied unchanged from r204608, head/sys/net/zutil.h user/jmallett/octeon/sys/netinet/ipfw/dn_heap.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_heap.c user/jmallett/octeon/sys/netinet/ipfw/dn_heap.h - copied unchanged from r204608, head/sys/netinet/ipfw/dn_heap.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched.h - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched_fifo.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_fifo.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_qfq.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_qfq.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_rr.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_rr.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_wf2q.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_wf2q.c user/jmallett/octeon/sys/netinet/ipfw/dummynet.txt - copied unchanged from r204608, head/sys/netinet/ipfw/dummynet.txt user/jmallett/octeon/sys/netinet/ipfw/ip_dn_glue.c - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_glue.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_io.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_private.h user/jmallett/octeon/sys/netinet/ipfw/test/ - copied from r204608, head/sys/netinet/ipfw/test/ user/jmallett/octeon/usr.bin/csup/README - copied unchanged from r204608, head/usr.bin/csup/README user/jmallett/octeon/usr.bin/csup/TODO - copied unchanged from r204608, head/usr.bin/csup/TODO user/jmallett/octeon/usr.bin/csup/attrstack.c - copied unchanged from r204608, head/usr.bin/csup/attrstack.c user/jmallett/octeon/usr.bin/csup/attrstack.h - copied unchanged from r204608, head/usr.bin/csup/attrstack.h user/jmallett/octeon/usr.bin/csup/auth.c - copied unchanged from r204608, head/usr.bin/csup/auth.c user/jmallett/octeon/usr.bin/csup/auth.h - copied unchanged from r204608, head/usr.bin/csup/auth.h user/jmallett/octeon/usr.bin/csup/config.c - copied unchanged from r204608, head/usr.bin/csup/config.c user/jmallett/octeon/usr.bin/csup/config.h - copied unchanged from r204608, head/usr.bin/csup/config.h user/jmallett/octeon/usr.bin/csup/cpasswd.1 - copied unchanged from r204608, head/usr.bin/csup/cpasswd.1 user/jmallett/octeon/usr.bin/csup/cpasswd.sh - copied unchanged from r204608, head/usr.bin/csup/cpasswd.sh user/jmallett/octeon/usr.bin/csup/csup.1 - copied unchanged from r204608, head/usr.bin/csup/csup.1 user/jmallett/octeon/usr.bin/csup/detailer.c - copied unchanged from r204608, head/usr.bin/csup/detailer.c user/jmallett/octeon/usr.bin/csup/detailer.h - copied unchanged from r204608, head/usr.bin/csup/detailer.h user/jmallett/octeon/usr.bin/csup/diff.c - copied unchanged from r204608, head/usr.bin/csup/diff.c user/jmallett/octeon/usr.bin/csup/diff.h - copied unchanged from r204608, head/usr.bin/csup/diff.h user/jmallett/octeon/usr.bin/csup/fattr.c - copied unchanged from r204608, head/usr.bin/csup/fattr.c user/jmallett/octeon/usr.bin/csup/fattr.h - copied unchanged from r204608, head/usr.bin/csup/fattr.h user/jmallett/octeon/usr.bin/csup/fattr_bsd.h - copied unchanged from r204608, head/usr.bin/csup/fattr_bsd.h user/jmallett/octeon/usr.bin/csup/fattr_posix.h - copied unchanged from r204608, head/usr.bin/csup/fattr_posix.h user/jmallett/octeon/usr.bin/csup/fixups.c - copied unchanged from r204608, head/usr.bin/csup/fixups.c user/jmallett/octeon/usr.bin/csup/fixups.h - copied unchanged from r204608, head/usr.bin/csup/fixups.h user/jmallett/octeon/usr.bin/csup/fnmatch.c - copied unchanged from r204608, head/usr.bin/csup/fnmatch.c user/jmallett/octeon/usr.bin/csup/fnmatch.h - copied unchanged from r204608, head/usr.bin/csup/fnmatch.h user/jmallett/octeon/usr.bin/csup/globtree.c - copied unchanged from r204608, head/usr.bin/csup/globtree.c user/jmallett/octeon/usr.bin/csup/globtree.h - copied unchanged from r204608, head/usr.bin/csup/globtree.h user/jmallett/octeon/usr.bin/csup/idcache.c - copied unchanged from r204608, head/usr.bin/csup/idcache.c user/jmallett/octeon/usr.bin/csup/idcache.h - copied unchanged from r204608, head/usr.bin/csup/idcache.h user/jmallett/octeon/usr.bin/csup/keyword.c - copied unchanged from r204608, head/usr.bin/csup/keyword.c user/jmallett/octeon/usr.bin/csup/keyword.h - copied unchanged from r204608, head/usr.bin/csup/keyword.h user/jmallett/octeon/usr.bin/csup/lex.rcs.c - copied unchanged from r204608, head/usr.bin/csup/lex.rcs.c user/jmallett/octeon/usr.bin/csup/lister.c - copied unchanged from r204608, head/usr.bin/csup/lister.c user/jmallett/octeon/usr.bin/csup/lister.h - copied unchanged from r204608, head/usr.bin/csup/lister.h user/jmallett/octeon/usr.bin/csup/main.c - copied unchanged from r204608, head/usr.bin/csup/main.c user/jmallett/octeon/usr.bin/csup/main.h - copied unchanged from r204608, head/usr.bin/csup/main.h user/jmallett/octeon/usr.bin/csup/misc.c - copied unchanged from r204608, head/usr.bin/csup/misc.c user/jmallett/octeon/usr.bin/csup/misc.h - copied unchanged from r204608, head/usr.bin/csup/misc.h user/jmallett/octeon/usr.bin/csup/mux.c - copied unchanged from r204608, head/usr.bin/csup/mux.c user/jmallett/octeon/usr.bin/csup/mux.h - copied unchanged from r204608, head/usr.bin/csup/mux.h user/jmallett/octeon/usr.bin/csup/parse.y - copied unchanged from r204608, head/usr.bin/csup/parse.y user/jmallett/octeon/usr.bin/csup/pathcomp.c - copied unchanged from r204608, head/usr.bin/csup/pathcomp.c user/jmallett/octeon/usr.bin/csup/pathcomp.h - copied unchanged from r204608, head/usr.bin/csup/pathcomp.h user/jmallett/octeon/usr.bin/csup/proto.c - copied unchanged from r204608, head/usr.bin/csup/proto.c user/jmallett/octeon/usr.bin/csup/proto.h - copied unchanged from r204608, head/usr.bin/csup/proto.h user/jmallett/octeon/usr.bin/csup/queue.h - copied unchanged from r204608, head/usr.bin/csup/queue.h user/jmallett/octeon/usr.bin/csup/rcsfile.c - copied unchanged from r204608, head/usr.bin/csup/rcsfile.c user/jmallett/octeon/usr.bin/csup/rcsfile.h - copied unchanged from r204608, head/usr.bin/csup/rcsfile.h user/jmallett/octeon/usr.bin/csup/rcsparse.c - copied unchanged from r204608, head/usr.bin/csup/rcsparse.c user/jmallett/octeon/usr.bin/csup/rcsparse.h - copied unchanged from r204608, head/usr.bin/csup/rcsparse.h user/jmallett/octeon/usr.bin/csup/rcstokenizer.h - copied unchanged from r204608, head/usr.bin/csup/rcstokenizer.h user/jmallett/octeon/usr.bin/csup/rcstokenizer.l - copied unchanged from r204608, head/usr.bin/csup/rcstokenizer.l user/jmallett/octeon/usr.bin/csup/rsyncfile.c - copied unchanged from r204608, head/usr.bin/csup/rsyncfile.c user/jmallett/octeon/usr.bin/csup/rsyncfile.h - copied unchanged from r204608, head/usr.bin/csup/rsyncfile.h user/jmallett/octeon/usr.bin/csup/status.c - copied unchanged from r204608, head/usr.bin/csup/status.c user/jmallett/octeon/usr.bin/csup/status.h - copied unchanged from r204608, head/usr.bin/csup/status.h user/jmallett/octeon/usr.bin/csup/stream.c - copied unchanged from r204608, head/usr.bin/csup/stream.c user/jmallett/octeon/usr.bin/csup/stream.h - copied unchanged from r204608, head/usr.bin/csup/stream.h user/jmallett/octeon/usr.bin/csup/threads.c - copied unchanged from r204608, head/usr.bin/csup/threads.c user/jmallett/octeon/usr.bin/csup/threads.h - copied unchanged from r204608, head/usr.bin/csup/threads.h user/jmallett/octeon/usr.bin/csup/token.h - copied unchanged from r204608, head/usr.bin/csup/token.h user/jmallett/octeon/usr.bin/csup/token.l - copied unchanged from r204608, head/usr.bin/csup/token.l user/jmallett/octeon/usr.bin/csup/updater.c - copied unchanged from r204608, head/usr.bin/csup/updater.c user/jmallett/octeon/usr.bin/csup/updater.h - copied unchanged from r204608, head/usr.bin/csup/updater.h Replaced: user/jmallett/octeon/usr.bin/csup/Makefile - copied unchanged from r204608, head/usr.bin/csup/Makefile Deleted: user/jmallett/octeon/contrib/csup/ user/jmallett/octeon/sys/ia64/include/sapicreg.h user/jmallett/octeon/sys/ia64/include/sapicvar.h Modified: user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/bin/pkill/pkill.1 user/jmallett/octeon/bin/pkill/pkill.c user/jmallett/octeon/cddl/Makefile.inc user/jmallett/octeon/cddl/lib/drti/Makefile user/jmallett/octeon/cddl/lib/libavl/Makefile user/jmallett/octeon/cddl/lib/libctf/Makefile user/jmallett/octeon/cddl/lib/libdtrace/Makefile user/jmallett/octeon/cddl/lib/libnvpair/Makefile user/jmallett/octeon/cddl/lib/libumem/Makefile user/jmallett/octeon/cddl/lib/libuutil/Makefile user/jmallett/octeon/cddl/lib/libzfs/Makefile user/jmallett/octeon/cddl/lib/libzpool/Makefile user/jmallett/octeon/cddl/sbin/zfs/Makefile user/jmallett/octeon/cddl/sbin/zpool/Makefile user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile user/jmallett/octeon/cddl/usr.bin/zinject/Makefile user/jmallett/octeon/cddl/usr.bin/ztest/Makefile user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile user/jmallett/octeon/contrib/tzdata/southamerica user/jmallett/octeon/etc/mtree/BSD.usr.dist user/jmallett/octeon/etc/rc.d/rtsold user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh user/jmallett/octeon/lib/libalias/libalias/Makefile user/jmallett/octeon/lib/libarchive/test/Makefile user/jmallett/octeon/lib/libbsnmp/Makefile.inc user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile user/jmallett/octeon/lib/libc/arm/gen/makecontext.c user/jmallett/octeon/lib/libc/arm/string/bzero.S user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S user/jmallett/octeon/lib/libc/arm/string/memmove.S user/jmallett/octeon/lib/libc/gen/fmtcheck.3 user/jmallett/octeon/lib/libc/gen/stringlist.3 user/jmallett/octeon/lib/libc/include/reentrant.h user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c user/jmallett/octeon/lib/libc/stdio/mktemp.c user/jmallett/octeon/lib/libc/stdlib/malloc.c user/jmallett/octeon/lib/libc/stdlib/rb.h user/jmallett/octeon/lib/libc/sys/mlockall.2 user/jmallett/octeon/lib/libc/sys/ntp_adjtime.2 user/jmallett/octeon/lib/libc/sys/utrace.2 user/jmallett/octeon/lib/libedit/editline.3 user/jmallett/octeon/lib/libedit/editrc.5 user/jmallett/octeon/lib/libedit/read.h user/jmallett/octeon/lib/libkvm/Makefile user/jmallett/octeon/lib/libkvm/kvm.c user/jmallett/octeon/lib/libkvm/kvm.h user/jmallett/octeon/lib/libkvm/kvm_getpcpu.3 user/jmallett/octeon/lib/libkvm/kvm_pcpu.c user/jmallett/octeon/lib/libkvm/kvm_private.h user/jmallett/octeon/lib/libkvm/kvm_vnet.c user/jmallett/octeon/lib/libpam/Makefile.inc user/jmallett/octeon/lib/libpam/modules/Makefile.inc user/jmallett/octeon/lib/libpam/modules/pam_krb5/Makefile user/jmallett/octeon/lib/libutil/humanize_number.3 user/jmallett/octeon/sbin/ddb/Makefile user/jmallett/octeon/sbin/hastctl/Makefile user/jmallett/octeon/sbin/hastd/Makefile user/jmallett/octeon/sbin/ipf/ipftest/Makefile user/jmallett/octeon/sbin/ipfw/Makefile user/jmallett/octeon/sbin/ipfw/altq.c user/jmallett/octeon/sbin/ipfw/dummynet.c user/jmallett/octeon/sbin/ipfw/ipfw.8 user/jmallett/octeon/sbin/ipfw/ipfw2.c user/jmallett/octeon/sbin/ipfw/ipfw2.h user/jmallett/octeon/sbin/ipfw/main.c user/jmallett/octeon/sbin/mount_hpfs/Makefile user/jmallett/octeon/sbin/mount_hpfs/mount_hpfs.c user/jmallett/octeon/sbin/mount_ntfs/Makefile user/jmallett/octeon/sbin/mount_ntfs/mount_ntfs.c user/jmallett/octeon/sbin/route/Makefile user/jmallett/octeon/sbin/route/route.c user/jmallett/octeon/sbin/routed/Makefile user/jmallett/octeon/sbin/routed/if.c user/jmallett/octeon/sbin/routed/rtquery/Makefile user/jmallett/octeon/sbin/rtsol/Makefile user/jmallett/octeon/share/examples/autofs/driver/Makefile user/jmallett/octeon/share/man/man4/ahci.4 user/jmallett/octeon/share/man/man4/ehci.4 user/jmallett/octeon/share/man/man4/gem.4 user/jmallett/octeon/share/man/man4/gre.4 user/jmallett/octeon/share/man/man4/hme.4 user/jmallett/octeon/share/man/man4/man4.sparc64/sbus.4 user/jmallett/octeon/share/man/man4/msk.4 user/jmallett/octeon/share/man/man4/ng_ipfw.4 user/jmallett/octeon/share/man/man4/siis.4 user/jmallett/octeon/share/man/man4/snd_uaudio.4 user/jmallett/octeon/share/man/man4/stge.4 user/jmallett/octeon/share/man/man4/ubsa.4 user/jmallett/octeon/share/man/man4/ucom.4 user/jmallett/octeon/share/man/man4/uftdi.4 user/jmallett/octeon/share/man/man4/ugen.4 user/jmallett/octeon/share/man/man4/uhid.4 user/jmallett/octeon/share/man/man4/ulpt.4 user/jmallett/octeon/share/man/man4/umodem.4 user/jmallett/octeon/share/man/man4/uplcom.4 user/jmallett/octeon/share/man/man4/uvisor.4 user/jmallett/octeon/share/man/man4/uvscom.4 user/jmallett/octeon/share/man/man5/core.5 user/jmallett/octeon/share/man/man9/BUF_ISLOCKED.9 user/jmallett/octeon/share/man/man9/BUF_RECURSED.9 user/jmallett/octeon/share/man/man9/DEVICE_PROBE.9 user/jmallett/octeon/share/man/man9/VOP_LOCK.9 user/jmallett/octeon/share/man/man9/devfs_set_cdevpriv.9 user/jmallett/octeon/share/man/man9/driver.9 user/jmallett/octeon/share/man/man9/kernacc.9 user/jmallett/octeon/share/man/man9/malloc.9 user/jmallett/octeon/share/man/man9/mi_switch.9 user/jmallett/octeon/share/man/man9/physio.9 user/jmallett/octeon/share/man/man9/psignal.9 user/jmallett/octeon/share/man/man9/timeout.9 user/jmallett/octeon/share/man/man9/vm_page_alloc.9 user/jmallett/octeon/share/man/man9/vslock.9 user/jmallett/octeon/share/mk/bsd.cpu.mk user/jmallett/octeon/sys/amd64/amd64/mca.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/arm/at91/if_ate.c user/jmallett/octeon/sys/compat/linux/linux_getcwd.c user/jmallett/octeon/sys/compat/linux/linux_time.c user/jmallett/octeon/sys/conf/NOTES user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/conf/options user/jmallett/octeon/sys/dev/ata/ata-pci.h user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212.h user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/cm/if_cm_isa.c user/jmallett/octeon/sys/dev/cm/smc90cx6.c user/jmallett/octeon/sys/dev/cm/smc90cx6reg.h user/jmallett/octeon/sys/dev/cm/smc90cx6var.h user/jmallett/octeon/sys/dev/isp/isp.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.c user/jmallett/octeon/sys/dev/isp/isp_library.c user/jmallett/octeon/sys/dev/isp/isp_library.h user/jmallett/octeon/sys/dev/isp/isp_pci.c user/jmallett/octeon/sys/dev/isp/isp_target.c user/jmallett/octeon/sys/dev/isp/ispmbox.h user/jmallett/octeon/sys/dev/isp/ispreg.h user/jmallett/octeon/sys/dev/md/md.c user/jmallett/octeon/sys/dev/mfi/mfi_cam.c user/jmallett/octeon/sys/dev/mfi/mfi_pci.c user/jmallett/octeon/sys/dev/msk/if_msk.c user/jmallett/octeon/sys/dev/msk/if_mskreg.h user/jmallett/octeon/sys/dev/ofw/ofw_pci.h user/jmallett/octeon/sys/dev/stge/if_stge.c user/jmallett/octeon/sys/dev/stge/if_stgereg.h user/jmallett/octeon/sys/dev/uart/uart_bus_pci.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_denode.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_fat.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_fileno.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_lookup.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vfsops.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vnops.c user/jmallett/octeon/sys/fs/msdosfs/msdosfsmount.h user/jmallett/octeon/sys/i386/i386/mca.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/ia64/ia64/interrupt.c user/jmallett/octeon/sys/ia64/ia64/nexus.c user/jmallett/octeon/sys/ia64/ia64/sapic.c user/jmallett/octeon/sys/ia64/include/intr.h user/jmallett/octeon/sys/kern/imgact_elf.c user/jmallett/octeon/sys/kern/kern_conf.c user/jmallett/octeon/sys/kern/kern_proc.c user/jmallett/octeon/sys/kern/kern_sig.c user/jmallett/octeon/sys/kern/kern_thr.c user/jmallett/octeon/sys/kern/subr_param.c user/jmallett/octeon/sys/kern/vfs_syscalls.c user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/include/bus.h user/jmallett/octeon/sys/mips/include/cdefs.h user/jmallett/octeon/sys/mips/include/ucontext.h user/jmallett/octeon/sys/mips/rmi/files.xlr user/jmallett/octeon/sys/mips/rmi/iodi.c user/jmallett/octeon/sys/mips/rmi/xlr_pci.c user/jmallett/octeon/sys/mips/rmi/xls_ehci.c user/jmallett/octeon/sys/modules/ath/Makefile user/jmallett/octeon/sys/net/if_bridge.c user/jmallett/octeon/sys/net/if_ethersubr.c user/jmallett/octeon/sys/net/if_gre.c user/jmallett/octeon/sys/net/if_gre.h user/jmallett/octeon/sys/net/if_tap.c user/jmallett/octeon/sys/net/if_tun.c user/jmallett/octeon/sys/net/netisr.c user/jmallett/octeon/sys/net/netisr.h user/jmallett/octeon/sys/net/radix.c user/jmallett/octeon/sys/net/zlib.h user/jmallett/octeon/sys/netinet/ip_dummynet.h user/jmallett/octeon/sys/netinet/ip_fw.h user/jmallett/octeon/sys/netinet/ip_gre.c user/jmallett/octeon/sys/netinet/ip_gre.h user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_pfil.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_fw_sockopt.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_table.c user/jmallett/octeon/sys/netinet6/nd6.c user/jmallett/octeon/sys/security/mac_biba/mac_biba.c user/jmallett/octeon/sys/security/mac_lomac/mac_lomac.c user/jmallett/octeon/sys/security/mac_mls/mac_mls.c user/jmallett/octeon/sys/sys/eventhandler.h user/jmallett/octeon/sys/sys/imgact.h user/jmallett/octeon/sys/sys/imgact_aout.h user/jmallett/octeon/sys/sys/imgact_elf.h user/jmallett/octeon/sys/sys/sysent.h user/jmallett/octeon/sys/sys/systm.h user/jmallett/octeon/sys/vm/vm_page.c user/jmallett/octeon/tools/build/mk/OptionalObsoleteFiles.inc user/jmallett/octeon/tools/regression/kqueue/Makefile user/jmallett/octeon/tools/regression/priv/Makefile user/jmallett/octeon/tools/regression/sockets/unix_gc/Makefile user/jmallett/octeon/tools/regression/sockets/unix_sorflush/Makefile user/jmallett/octeon/tools/regression/sysvsem/semtest.c user/jmallett/octeon/tools/regression/tmpfs/Makefile user/jmallett/octeon/tools/regression/tmpfs/h_funcs.subr user/jmallett/octeon/tools/regression/tmpfs/h_tools.c user/jmallett/octeon/tools/regression/tmpfs/t_create user/jmallett/octeon/tools/regression/tmpfs/t_dots user/jmallett/octeon/tools/regression/tmpfs/t_exec user/jmallett/octeon/tools/regression/tmpfs/t_link user/jmallett/octeon/tools/regression/tmpfs/t_mkdir user/jmallett/octeon/tools/regression/tmpfs/t_mount user/jmallett/octeon/tools/regression/tmpfs/t_pipes user/jmallett/octeon/tools/regression/tmpfs/t_read_write user/jmallett/octeon/tools/regression/tmpfs/t_readdir user/jmallett/octeon/tools/regression/tmpfs/t_remove user/jmallett/octeon/tools/regression/tmpfs/t_rename user/jmallett/octeon/tools/regression/tmpfs/t_rmdir user/jmallett/octeon/tools/regression/tmpfs/t_setattr user/jmallett/octeon/tools/regression/tmpfs/t_sizes user/jmallett/octeon/tools/regression/tmpfs/t_sockets user/jmallett/octeon/tools/regression/tmpfs/t_statvfs user/jmallett/octeon/tools/regression/tmpfs/t_symlink user/jmallett/octeon/tools/regression/tmpfs/t_times user/jmallett/octeon/tools/regression/tmpfs/t_trail_slash user/jmallett/octeon/tools/regression/tmpfs/t_truncate user/jmallett/octeon/tools/regression/tmpfs/t_vnd user/jmallett/octeon/tools/regression/tmpfs/t_vnode_leak user/jmallett/octeon/tools/tools/netrate/http/Makefile user/jmallett/octeon/tools/tools/netrate/httpd/Makefile user/jmallett/octeon/tools/tools/netrate/juggle/Makefile user/jmallett/octeon/tools/tools/netrate/tcpconnect/Makefile user/jmallett/octeon/tools/tools/netrate/tcpp/Makefile user/jmallett/octeon/tools/tools/netrate/tcpreceive/Makefile user/jmallett/octeon/tools/tools/umastat/Makefile user/jmallett/octeon/usr.bin/locale/Makefile user/jmallett/octeon/usr.bin/netstat/main.c user/jmallett/octeon/usr.bin/netstat/netisr.c user/jmallett/octeon/usr.bin/netstat/netstat.h user/jmallett/octeon/usr.sbin/bluetooth/bthidd/Makefile user/jmallett/octeon/usr.sbin/bsnmpd/modules/Makefile.inc user/jmallett/octeon/usr.sbin/fwcontrol/Makefile user/jmallett/octeon/usr.sbin/rtsold/Makefile user/jmallett/octeon/usr.sbin/rtsold/dump.c user/jmallett/octeon/usr.sbin/rtsold/if.c user/jmallett/octeon/usr.sbin/rtsold/rtsock.c user/jmallett/octeon/usr.sbin/rtsold/rtsol.c user/jmallett/octeon/usr.sbin/rtsold/rtsold.c user/jmallett/octeon/usr.sbin/rtsold/rtsold.h user/jmallett/octeon/usr.sbin/uhsoctl/Makefile Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 2 23:53:38 2010 (r204610) @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100227: [ia64] removed and +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/machine/sapicreg.h +OLD_FILES+=usr/include/machine/sapicvar.h +.endif +# 20100208: man pages moved +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz +OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz +OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz +OLD_FILES+=usr/share/man/man4/i386/scd.4.gz +OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz +.endif # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd OLD_FILES+=usr/share/doc/papers/bc.ascii.gz OLD_FILES+=usr/share/doc/papers/dc.ascii.gz Modified: user/jmallett/octeon/bin/pkill/pkill.1 ============================================================================== --- user/jmallett/octeon/bin/pkill/pkill.1 Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/bin/pkill/pkill.1 Tue Mar 2 23:53:38 2010 (r204610) @@ -16,13 +16,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/bin/pkill/pkill.c ============================================================================== --- user/jmallett/octeon/bin/pkill/pkill.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/bin/pkill/pkill.c Tue Mar 2 23:53:38 2010 (r204610) @@ -16,13 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/cddl/Makefile.inc ============================================================================== --- user/jmallett/octeon/cddl/Makefile.inc Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/Makefile.inc Tue Mar 2 23:53:38 2010 (r204610) @@ -7,4 +7,5 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN +WARNS?= 6 CSTD?= gnu89 Modified: user/jmallett/octeon/cddl/lib/drti/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/drti/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/drti/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,8 +1,6 @@ # $FreeBSD$ -.include "../../Makefile.inc" - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} @@ -10,7 +8,6 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -WARNS?= 6 CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libavl/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libavl/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libavl/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -4,6 +4,7 @@ LIB= avl SRCS= avl.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/jmallett/octeon/cddl/lib/libctf/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libctf/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libctf/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,10 +1,10 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf LIB= ctf -SHLIB_MAJOR= 2 - SRCS= ctf_create.c \ ctf_decl.c \ ctf_error.c \ @@ -17,10 +17,7 @@ SRCS= ctf_create.c \ ctf_types.c \ ctf_util.c -.PATH: ${OPENSOLARIS_USR_DISTDIR}/common/ctf -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf - +WARNS?= 0 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libdtrace/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libdtrace/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libdtrace/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,12 +1,9 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common LIB= dtrace -SHLIB_MAJOR= 2 - -WARNS= 1 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -51,8 +48,7 @@ DSRCS= errno.d \ signal.d \ unistd.d -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common +WARNS?= 1 CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libnvpair/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libnvpair/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libnvpair/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -10,6 +10,7 @@ SRCS= libnvpair.c \ nvpair_alloc_fixed.c \ nvpair.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/jmallett/octeon/cddl/lib/libumem/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libumem/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libumem/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -4,6 +4,7 @@ LIB= umem SRCS= umem.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include Modified: user/jmallett/octeon/cddl/lib/libuutil/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libuutil/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libuutil/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -15,6 +15,7 @@ SRCS= avl.c \ uu_pname.c \ uu_strtoint.c +WARNS?= 0 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris Modified: user/jmallett/octeon/cddl/lib/libzfs/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libzfs/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libzfs/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -32,6 +32,7 @@ SRCS+= zfs_deleg.c \ libzfs_sendrecv.c \ libzfs_status.c +WARNS?= 0 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem Modified: user/jmallett/octeon/cddl/lib/libzpool/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libzpool/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libzpool/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -33,6 +33,7 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/sbin/zfs/Makefile ============================================================================== --- user/jmallett/octeon/cddl/sbin/zfs/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/sbin/zfs/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,7 @@ PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/sbin/zpool/Makefile ============================================================================== --- user/jmallett/octeon/cddl/sbin/zpool/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/sbin/zpool/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -7,6 +7,7 @@ PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,13 +1,12 @@ # $FreeBSD$ -.include - -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt DEBUG_FLAGS= -g PROG= ctfconvert - +NO_MAN= SRCS= alist.c \ ctf.c \ ctfconvert.c \ @@ -29,8 +28,6 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ @@ -43,10 +40,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${.CURDIR} -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include Modified: user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,15 +1,14 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump PROG= ctfdump - +NO_MAN= SRCS= dump.c \ symbol.c \ utils.c -WARNS?= 6 - CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ @@ -22,9 +21,4 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} LDADD= -lpthread -lelf -lz -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump - -NO_MAN= - .include Modified: user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,13 +1,10 @@ # $FreeBSD$ -.include - -.include "../../Makefile.inc" - -WARNS= 1 +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfmerge - +NO_MAN= SRCS= alist.c \ barrier.c \ ctf.c \ @@ -26,7 +23,7 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -40,9 +37,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include Modified: user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,20 +1,17 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl # This program is required as a bootstrap tool for 'make buildworld' PROG= sgsmsg - +NO_MAN= SRCS= avl.c sgsmsg.c string_table.c findprime.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl - -NO_MAN= - .include Modified: user/jmallett/octeon/cddl/usr.bin/zinject/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/zinject/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/zinject/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,7 @@ PROG= zinject SRCS= zinject.c translate.c NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.bin/ztest/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ztest/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ztest/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -5,6 +5,7 @@ PROG= ztest NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,14 +1,12 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace PROG= dtrace - -BINDIR?= /usr/sbin - SRCS= dtrace.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,8 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace - # Optional debugging stuff... #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d Modified: user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,14 +1,13 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat PROG= lockstat - -BINDIR?= /usr/sbin - +NO_MAN= SRCS= lockstat.c sym.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -19,8 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ -I${.CURDIR}/../../../sys -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d @@ -28,6 +25,4 @@ CFLAGS+= -DNEED_ERRLOC -g DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -NO_MAN= - .include Modified: user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,9 @@ PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c +WARNS?= 0 +CSTD= c99 + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -23,6 +26,5 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LI ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -CSTD= c99 .include Modified: user/jmallett/octeon/contrib/tzdata/southamerica ============================================================================== --- user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 2 23:53:38 2010 (r204610) @@ -1,5 +1,5 @@ # 
-# @(#)southamerica	8.40
+# @(#)southamerica	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1364,8 +1364,24 @@ Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:
 # Decree 1,867 (2004-03-05)
 # From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13)
 # 
-Rule	Para	2004	max	-	Oct	Sun>=15	0:00	1:00	S
-Rule	Para	2005	max	-	Mar	Sun>=8	0:00	0	-
+Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
+# From Carlos Raul Perasso (2010-02-18):
+# By decree number 3958 issued yesterday (
+# 
+# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf
+# 
+# )
+# Paraguay changes its DST schedule, postponing the March rule to April and
+# modifying the October date. The decree reads:
+# ...
+# Art. 1. It is hereby established that from the second Sunday of the month of
+# April of this year (2010), the official time is to be set back 60 minutes,
+# and that on the first Sunday of the month of October, it is to be set
+# forward 60 minutes, in all the territory of the Paraguayan Republic.
+# ...
+Rule	Para	2010	max	-	Oct	Sun<=7	0:00	1:00	S
+Rule	Para	2010	max	-	Apr	Sun>=8	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890

Modified: user/jmallett/octeon/etc/mtree/BSD.usr.dist
==============================================================================
--- user/jmallett/octeon/etc/mtree/BSD.usr.dist	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/etc/mtree/BSD.usr.dist	Tue Mar  2 23:53:38 2010	(r204610)
@@ -193,8 +193,6 @@
             ..
             IPv6
             ..
-            bc
-            ..
             bootforth
             ..
             cvs

Modified: user/jmallett/octeon/etc/rc.d/rtsold
==============================================================================
--- user/jmallett/octeon/etc/rc.d/rtsold	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/etc/rc.d/rtsold	Tue Mar  2 23:53:38 2010	(r204610)
@@ -6,7 +6,7 @@
 # PROVIDE: rtsold
 # REQUIRE: netif
 # BEFORE: NETWORKING
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Mar  2 23:53:38 2010	(r204610)
@@ -10,9 +10,8 @@ NATIVE_EMULATION=elf${_sz}btsmipn32_fbsd
 NATIVE_EMULATION=elf${_sz}ltsmipn32_fbsd
 .endif
 
-MIPS_ABIS+=elf32btsmip_fbsd elf32ltsmip_fbsd
-MIPS_ABIS+=elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
-MIPS_ABIS+=elf64btsmip_fbsd elf64ltsmip_fbsd
+MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \
+    elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
 .for abi in ${MIPS_ABIS}
 #.if (${abi} != ${NATIVE_EMULATION})
 EMS+= ${abi}

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh	Tue Mar  2 23:53:38 2010	(r204610)
@@ -50,6 +50,7 @@ fi
 if test -d ldscripts; then
   true
 else
+  rm -f ldscripts
   mkdir ldscripts
 fi
 

Copied: user/jmallett/octeon/lib/libalias/Makefile.inc (from r204608, head/lib/libalias/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/lib/libalias/Makefile.inc	Tue Mar  2 23:53:38 2010	(r204610, copy of r204608, head/lib/libalias/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: user/jmallett/octeon/lib/libalias/libalias/Makefile
==============================================================================
--- user/jmallett/octeon/lib/libalias/libalias/Makefile	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libalias/libalias/Makefile	Tue Mar  2 23:53:38 2010	(r204610)
@@ -8,7 +8,6 @@ SHLIB_MAJOR= 7
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
 INCS=	alias.h
-WARNS?=	6
 NO_WERROR=
 
 .include 

Modified: user/jmallett/octeon/lib/libarchive/test/Makefile
==============================================================================
--- user/jmallett/octeon/lib/libarchive/test/Makefile	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libarchive/test/Makefile	Tue Mar  2 23:53:38 2010	(r204610)
@@ -137,7 +137,6 @@ CFLAGS+= -I${LA_SRCDIR} -I.
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-#WARNS=6
 
 # Build libarchive_test and run it.
 check test: libarchive_test

Modified: user/jmallett/octeon/lib/libbsnmp/Makefile.inc
==============================================================================
--- user/jmallett/octeon/lib/libbsnmp/Makefile.inc	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libbsnmp/Makefile.inc	Tue Mar  2 23:53:38 2010	(r204610)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIB_MAJOR=	5
-WARNS?=		6
 NO_WERROR=
 INCSDIR=	${INCLUDEDIR}/bsnmp
+
+.include "../Makefile.inc"

Modified: user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile
==============================================================================
--- user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile	Tue Mar  2 23:53:38 2010	(r204610)
@@ -5,9 +5,8 @@
 CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
 .PATH: ${CONTRIB}
 
-LIB	= bsnmp
-SHLIBDIR ?= /lib
-WARNS	?= 6
+LIB=	bsnmp
+SHLIBDIR?= /lib
 
 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'

Modified: user/jmallett/octeon/lib/libc/arm/gen/makecontext.c
==============================================================================
--- user/jmallett/octeon/lib/libc/arm/gen/makecontext.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/arm/gen/makecontext.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/arm/string/bzero.S
==============================================================================
--- user/jmallett/octeon/lib/libc/arm/string/bzero.S	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/arm/string/bzero.S	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S
==============================================================================
--- user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/arm/string/memmove.S
==============================================================================
--- user/jmallett/octeon/lib/libc/arm/string/memmove.S	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/arm/string/memmove.S	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/gen/fmtcheck.3
==============================================================================
--- user/jmallett/octeon/lib/libc/gen/fmtcheck.3	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/gen/fmtcheck.3	Tue Mar  2 23:53:38 2010	(r204610)
@@ -11,13 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/gen/stringlist.3
==============================================================================
--- user/jmallett/octeon/lib/libc/gen/stringlist.3	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/gen/stringlist.3	Tue Mar  2 23:53:38 2010	(r204610)
@@ -13,13 +13,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/include/reentrant.h
==============================================================================
--- user/jmallett/octeon/lib/libc/include/reentrant.h	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/include/reentrant.h	Tue Mar  2 23:53:38 2010	(r204610)
@@ -13,13 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c
==============================================================================
--- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c
==============================================================================
--- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c
==============================================================================
--- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c
==============================================================================
--- user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c
==============================================================================
--- user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/jmallett/octeon/lib/libc/stdio/mktemp.c
==============================================================================
--- user/jmallett/octeon/lib/libc/stdio/mktemp.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/stdio/mktemp.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -116,6 +116,10 @@ _gettemp(path, doopen, domkdir, slen)
 
 	for (trv = path; *trv != '\0'; ++trv)
 		;
+	if (trv - path >= MAXPATHLEN) {
+		errno = ENAMETOOLONG;
+		return (0);
+	}
 	trv -= slen;
 	suffp = trv;
 	--trv;

Modified: user/jmallett/octeon/lib/libc/stdlib/malloc.c
==============================================================================
--- user/jmallett/octeon/lib/libc/stdlib/malloc.c	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/stdlib/malloc.c	Tue Mar  2 23:53:38 2010	(r204610)
@@ -194,6 +194,7 @@ __FBSDID("$FreeBSD$");
 
 #include "un-namespace.h"
 
+#define	RB_COMPACT
 #include "rb.h"
 #if (defined(MALLOC_TCACHE) && defined(MALLOC_STATS))
 #include "qr.h"
@@ -1746,7 +1747,7 @@ extent_szad_comp(extent_node_t *a, exten
 }
 
 /* Wrap red-black tree macros in functions. */
-rb_wrap(__unused static, extent_tree_szad_, extent_tree_t, extent_node_t,
+rb_gen(__unused static, extent_tree_szad_, extent_tree_t, extent_node_t,
     link_szad, extent_szad_comp)
 #endif
 
@@ -1760,7 +1761,7 @@ extent_ad_comp(extent_node_t *a, extent_
 }
 
 /* Wrap red-black tree macros in functions. */
-rb_wrap(__unused static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad,
+rb_gen(__unused static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad,
     extent_ad_comp)
 
 /*
@@ -2346,7 +2347,7 @@ arena_chunk_comp(arena_chunk_t *a, arena
 }
 
 /* Wrap red-black tree macros in functions. */
-rb_wrap(__unused static, arena_chunk_tree_dirty_, arena_chunk_tree_t,
+rb_gen(__unused static, arena_chunk_tree_dirty_, arena_chunk_tree_t,
     arena_chunk_t, link_dirty, arena_chunk_comp)
 
 static inline int
@@ -2362,7 +2363,7 @@ arena_run_comp(arena_chunk_map_t *a, are
 }
 
 /* Wrap red-black tree macros in functions. */
-rb_wrap(__unused static, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t,
+rb_gen(__unused static, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t,
     link, arena_run_comp)
 
 static inline int
@@ -2394,7 +2395,7 @@ arena_avail_comp(arena_chunk_map_t *a, a
 }
 
 /* Wrap red-black tree macros in functions. */
-rb_wrap(__unused static, arena_avail_tree_, arena_avail_tree_t,
+rb_gen(__unused static, arena_avail_tree_, arena_avail_tree_t,
     arena_chunk_map_t, link, arena_avail_comp)
 
 static inline void
@@ -2824,6 +2825,18 @@ arena_run_alloc(arena_t *arena, size_t s
 	return (run);
 }
 
+#ifdef MALLOC_DEBUG
+static arena_chunk_t *
+chunks_dirty_iter_cb(arena_chunk_tree_t *tree, arena_chunk_t *chunk, void *arg)
+{
+	size_t *ndirty = (size_t *)arg;
+
+	assert(chunk->dirtied);
+	*ndirty += chunk->ndirty;
+	return (NULL);
+}
+#endif
+
 static void
 arena_purge(arena_t *arena)
 {
@@ -2832,11 +2845,8 @@ arena_purge(arena_t *arena)
 #ifdef MALLOC_DEBUG
 	size_t ndirty = 0;
 
-	rb_foreach_begin(arena_chunk_t, link_dirty, &arena->chunks_dirty,
-	    chunk) {
-		assert(chunk->dirtied);
-		ndirty += chunk->ndirty;
-	} rb_foreach_end(arena_chunk_t, link_dirty, &arena->chunks_dirty, chunk)
+	arena_chunk_tree_dirty_iter(&arena->chunks_dirty, NULL,
+	    chunks_dirty_iter_cb, (void *)&ndirty);
 	assert(ndirty == arena->ndirty);
 #endif
 	assert((arena->nactive >> opt_lg_dirty_mult) < arena->ndirty);

Modified: user/jmallett/octeon/lib/libc/stdlib/rb.h
==============================================================================
--- user/jmallett/octeon/lib/libc/stdlib/rb.h	Tue Mar  2 23:49:27 2010	(r204609)
+++ user/jmallett/octeon/lib/libc/stdlib/rb.h	Tue Mar  2 23:53:38 2010	(r204610)
@@ -1,6 +1,7 @@
-/******************************************************************************
+/*-
+ *******************************************************************************
  *
- * Copyright (C) 2008 Jason Evans .
+ * Copyright (C) 2008-2010 Jason Evans .
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,40 +30,23 @@
  *
  ******************************************************************************
  *
- * cpp macro implementation of left-leaning red-black trees.
+ * cpp macro implementation of left-leaning 2-3 red-black trees.  Parent
+ * pointers are not used, and color bits are stored in the least significant
+ * bit of right-child pointers (if RB_COMPACT is defined), thus making node
+ * linkage as compact as is possible for red-black trees.
  *
  * Usage:
  *
- *   (Optional, see assert(3).)
- *   #define NDEBUG
- *
- *   (Required.)
+ *   #include 
+ *   #include 
+ *   #define NDEBUG // (Optional, see assert(3).)
  *   #include 
+ *   #define RB_COMPACT // (Optional, embed color bits in right-child pointers.)
  *   #include 
  *   ...
  *
- * All operations are done non-recursively.  Parent pointers are not used, and
- * color bits are stored in the least significant bit of right-child pointers,
- * thus making node linkage as compact as is possible for red-black trees.
- *
- * Some macros use a comparison function pointer, which is expected to have the
- * following prototype:
- *
- *   int (a_cmp *)(a_type *a_node, a_type *a_other);
- *                         ^^^^^^
- *                      or a_key
- *
- * Interpretation of comparision function return values:
- *
- *   -1 : a_node <  a_other
- *    0 : a_node == a_other
- *    1 : a_node >  a_other
- *
- * In all cases, the a_node or a_key macro argument is the first argument to the
- * comparison function, which makes it possible to write comparison functions
- * that treat the first argument specially.
- *
- ******************************************************************************/
+ *******************************************************************************
+ */
 
 #ifndef RB_H_
 #define	RB_H_
@@ -70,12 +54,21 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#ifdef RB_COMPACT
 /* Node structure. */
 #define	rb_node(a_type)							\
 struct {								\
     a_type *rbn_left;							\
     a_type *rbn_right_red;						\
 }
+#else
+#define	rb_node(a_type)							\
+struct {								\
+    a_type *rbn_left;							\
+    a_type *rbn_right;							\
+    bool rbn_red;							\
+}
+#endif
 
 /* Root structure. */
 #define	rb_tree(a_type)							\
@@ -85,863 +78,925 @@ struct {								\
 }
 
 /* Left accessors. */
-#define	rbp_left_get(a_type, a_field, a_node)				\
+#define	rbtn_left_get(a_type, a_field, a_node)				\
     ((a_node)->a_field.rbn_left)
-#define	rbp_left_set(a_type, a_field, a_node, a_left) do {		\
+#define	rbtn_left_set(a_type, a_field, a_node, a_left) do {		\
     (a_node)->a_field.rbn_left = a_left;				\
 } while (0)
 
+#ifdef RB_COMPACT
 /* Right accessors. */
-#define	rbp_right_get(a_type, a_field, a_node)				\
+#define	rbtn_right_get(a_type, a_field, a_node)				\
     ((a_type *) (((intptr_t) (a_node)->a_field.rbn_right_red)		\
       & ((ssize_t)-2)))
-#define	rbp_right_set(a_type, a_field, a_node, a_right) do {		\
+#define	rbtn_right_set(a_type, a_field, a_node, a_right) do {		\
     (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t) a_right)	\
       | (((uintptr_t) (a_node)->a_field.rbn_right_red) & ((size_t)1)));	\
 } while (0)
 
 /* Color accessors. */
-#define	rbp_red_get(a_type, a_field, a_node)				\
+#define	rbtn_red_get(a_type, a_field, a_node)				\
     ((bool) (((uintptr_t) (a_node)->a_field.rbn_right_red)		\
       & ((size_t)1)))
-#define	rbp_color_set(a_type, a_field, a_node, a_red) do {		\

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

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 00:06:23 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 388F3106566B;
	Wed,  3 Mar 2010 00:06:23 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CB4E38FC13;
	Wed,  3 Mar 2010 00:06:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2306MvD083710;
	Wed, 3 Mar 2010 00:06:22 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2306M3q083705;
	Wed, 3 Mar 2010 00:06:22 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030006.o2306M3q083705@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 00:06:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204612 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 00:06:23 -0000

Author: jmallett
Date: Wed Mar  3 00:06:22 2010
New Revision: 204612
URL: http://svn.freebsd.org/changeset/base/204612

Log:
  Fix build with new : spell START_FRAME as CALLFRAME_SIZ.

Modified:
  user/jmallett/octeon/sys/mips/mips/exception.S
  user/jmallett/octeon/sys/mips/mips/locore.S
  user/jmallett/octeon/sys/mips/mips/machdep.c
  user/jmallett/octeon/sys/mips/mips/mpboot.S

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Tue Mar  2 23:57:42 2010	(r204611)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Wed Mar  3 00:06:22 2010	(r204612)
@@ -1058,7 +1058,7 @@ sys_stk_chk:
 	nop
 
 # stack overflow
-	PTR_LA	a0, _C_LABEL(_start) - START_FRAME - 8  # set sp to a valid place
+	PTR_LA	a0, _C_LABEL(_start) - CALLFRAME_SIZ - 8  # set sp to a valid place
 	sw	sp, 24(a0)
 	move	sp, a0
 	PTR_LA	a0, 1f
@@ -1072,7 +1072,7 @@ sys_stk_chk:
 	jalr	k0
 	mfc0	a3, COP_0_BAD_VADDR
 
-	PTR_LA	sp, _C_LABEL(_start) - START_FRAME  # set sp to a valid place
+	PTR_LA	sp, _C_LABEL(_start) - CALLFRAME_SIZ  # set sp to a valid place
 
 #if !defined(SMP) && defined(DDB)
 	PTR_LA	a0, 2f

Modified: user/jmallett/octeon/sys/mips/mips/locore.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/locore.S	Tue Mar  2 23:57:42 2010	(r204611)
+++ user/jmallett/octeon/sys/mips/mips/locore.S	Wed Mar  3 00:06:22 2010	(r204612)
@@ -166,10 +166,10 @@ VECTOR(_locore, unknown)
 	 * Initialize stack and call machine startup.
 	 */
 	PTR_LA	sp, _C_LABEL(pcpu_space)
-	addiu	sp, (NBPG * 2) - START_FRAME
+	addiu	sp, (NBPG * 2) - CALLFRAME_SIZ
 
-	sw	zero, START_FRAME - 4(sp)	# Zero out old ra for debugger
-	sw	zero, START_FRAME - 8(sp)	# Zero out old fp for debugger
+	sw	zero, CALLFRAME_SIZ - 4(sp)	# Zero out old ra for debugger
+	sw	zero, CALLFRAME_SIZ - 8(sp)	# Zero out old fp for debugger
 
 	PTR_LA	gp, _C_LABEL(_gp)
 
@@ -181,10 +181,10 @@ VECTOR(_locore, unknown)
 	PTR_L	a0, TD_PCB(sp)
 	REG_LI	t0, ~7
 	and	a0, a0, t0
-	subu    sp, a0, START_FRAME
+	subu    sp, a0, CALLFRAME_SIZ
 
 	jal	_C_LABEL(mi_startup)		# mi_startup(frame)
-	sw	zero, START_FRAME - 8(sp)	# Zero out old fp for debugger
+	sw	zero, CALLFRAME_SIZ - 8(sp)	# Zero out old fp for debugger
 
 	PANIC("Startup failed!")
 

Modified: user/jmallett/octeon/sys/mips/mips/machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/machdep.c	Tue Mar  2 23:57:42 2010	(r204611)
+++ user/jmallett/octeon/sys/mips/mips/machdep.c	Wed Mar  3 00:06:22 2010	(r204612)
@@ -118,7 +118,7 @@ vm_offset_t kstack0;
 /*
  * Each entry in the pcpu_space[] array is laid out in the following manner:
  * struct pcpu for cpu 'n'	pcpu_space[n]
- * boot stack for cpu 'n'	pcpu_space[n] + PAGE_SIZE * 2 - START_FRAME
+ * boot stack for cpu 'n'	pcpu_space[n] + PAGE_SIZE * 2 - CALLFRAME_SIZ
  *
  * Note that the boot stack grows downwards and we assume that we never
  * use enough stack space to trample over the 'struct pcpu' that is at

Modified: user/jmallett/octeon/sys/mips/mips/mpboot.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/mpboot.S	Tue Mar  2 23:57:42 2010	(r204611)
+++ user/jmallett/octeon/sys/mips/mips/mpboot.S	Wed Mar  3 00:06:22 2010	(r204612)
@@ -53,13 +53,13 @@ GLOBAL(mpentry)
 	 * Initialize stack and call machine startup
 	 */
 	PTR_LA	sp, _C_LABEL(pcpu_space)
-	addiu	sp, (NBPG * 2) - START_FRAME
+	addiu	sp, (NBPG * 2) - CALLFRAME_SIZ
 	sll	t0, s0, PAGE_SHIFT + 1
 	addu	sp, sp, t0
 
 	/* Zero out old ra and old fp for debugger */
-	sw      zero, START_FRAME - 4(sp)
-	sw      zero, START_FRAME - 8(sp)
+	sw      zero, CALLFRAME_SIZ - 4(sp)
+	sw      zero, CALLFRAME_SIZ - 8(sp)
 
 	PTR_LA	gp, _C_LABEL(_gp)
 

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 00:20:06 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F1071065674;
	Wed,  3 Mar 2010 00:20:06 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EC858FC16;
	Wed,  3 Mar 2010 00:20:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o230K6er086815;
	Wed, 3 Mar 2010 00:20:06 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o230K6Y6086813;
	Wed, 3 Mar 2010 00:20:06 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030020.o230K6Y6086813@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 00:20:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204613 - user/jmallett/octeon/usr.bin/csup
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 00:20:06 -0000

Author: jmallett
Date: Wed Mar  3 00:20:05 2010
New Revision: 204613
URL: http://svn.freebsd.org/changeset/base/204613

Log:
  Don't install to /usr/local/bin since that might not exist, especially since
  BSD.local.dist is no longer part of base.

Modified:
  user/jmallett/octeon/usr.bin/csup/Makefile

Modified: user/jmallett/octeon/usr.bin/csup/Makefile
==============================================================================
--- user/jmallett/octeon/usr.bin/csup/Makefile	Wed Mar  3 00:06:22 2010	(r204612)
+++ user/jmallett/octeon/usr.bin/csup/Makefile	Wed Mar  3 00:20:05 2010	(r204613)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PREFIX?=	/usr/local
-BINDIR?=	${PREFIX}/bin
-MANDIR?=	${PREFIX}/man/man
+#PREFIX?=	/usr/local
+#BINDIR?=	${PREFIX}/bin
+#MANDIR?=	${PREFIX}/man/man
 
 UNAME!=		/usr/bin/uname -s
 

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 01:12:16 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6BB5106566B;
	Wed,  3 Mar 2010 01:12:16 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B59338FC17;
	Wed,  3 Mar 2010 01:12:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o231CGhx098288;
	Wed, 3 Mar 2010 01:12:16 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o231CG6L098285;
	Wed, 3 Mar 2010 01:12:16 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030112.o231CG6L098285@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 01:12:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204614 - in user/jmallett/octeon/lib/libc/mips: . sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 01:12:16 -0000

Author: jmallett
Date: Wed Mar  3 01:12:16 2010
New Revision: 204614
URL: http://svn.freebsd.org/changeset/base/204614

Log:
  Sync with NetBSD.

Modified:
  user/jmallett/octeon/lib/libc/mips/SYS.h
  user/jmallett/octeon/lib/libc/mips/sys/cerror.S

Modified: user/jmallett/octeon/lib/libc/mips/SYS.h
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/SYS.h	Wed Mar  3 00:20:05 2010	(r204613)
+++ user/jmallett/octeon/lib/libc/mips/SYS.h	Wed Mar  3 01:12:16 2010	(r204614)
@@ -1,5 +1,4 @@
-/*	$NetBSD: SYS.h,v 1.18 2003/10/29 12:28:33 pooka Exp $ */
-/* $FreeBSD$ */
+/*	$NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
 
 /*-
  * Copyright (c) 1996 Jonathan Stone
@@ -67,9 +66,9 @@
  */
 
 #include 
-
 #include 
 
+
 /*
  * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops.
  *
@@ -79,14 +78,28 @@
  */
 #ifdef __ABICALLS__
 	.abicalls
-# define PIC_PROLOGUE(x,sr)	.set noreorder; .cpload sr; .set reorder
-# define PIC_CALL(l,sr)		la sr, _C_LABEL(l); jr sr
+# if defined(__mips_o32) || defined(__mips_o64)
+#  define PIC_PROLOGUE(x)	SETUP_GP
+#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); jr t9
+#  define PIC_RETURN()		j ra
+# else
+#  define PIC_PROLOGUE(x)	SETUP_GP64(t3, x)
+#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); RESTORE_GP64; jr t9
+#  define PIC_RETURN()		RESTORE_GP64; j ra
+# endif
 #else
-# define PIC_PROLOGUE(x,sr)
-# define PIC_CALL(l,sr)		j  _C_LABEL(l)
+# define PIC_PROLOGUE(x)
+# define PIC_TAILCALL(l)	j  _C_LABEL(l)
+# define PIC_RETURN()
+#endif /* __ABICALLS__ */
+
+
+#ifdef __STDC__
+# define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
+#else
+# define SYSTRAP(x)	li v0,SYS_/**/x; syscall;
 #endif
 
-# define SYSTRAP(x)	li v0, SYS_ ## x; syscall;
 
 /*
  * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
@@ -106,7 +119,7 @@
  */
 #define PSEUDO_NOERROR(x)						\
 LEAF(__sys_ ## x);							\
-        .weak _C_LABEL(x);						\
+	.weak _C_LABEL(x);						\
 	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
 	.weak _C_LABEL(__CONCAT(_,x));					\
 	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
@@ -116,14 +129,14 @@ LEAF(__sys_ ## x);							\
 
 #define PSEUDO(x)							\
 LEAF(__sys_ ## x);							\
-        .weak _C_LABEL(x);						\
+	.weak _C_LABEL(x);						\
 	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
 	.weak _C_LABEL(__CONCAT(_,x));					\
 	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
-	PIC_PROLOGUE(x,t9);						\
+	PIC_PROLOGUE(x);						\
 	SYSTRAP(x);							\
 	bne a3,zero,err;						\
-	j ra;								\
+	PIC_RETURN();							\
 err:									\
-	PIC_CALL(__cerror,t9);						\
-	END(__sys_ ## x)
+	PIC_TAILCALL(__cerror);						\
+END(__sys_ ## x)

Modified: user/jmallett/octeon/lib/libc/mips/sys/cerror.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/cerror.S	Wed Mar  3 00:20:05 2010	(r204613)
+++ user/jmallett/octeon/lib/libc/mips/sys/cerror.S	Wed Mar  3 01:12:16 2010	(r204614)
@@ -1,4 +1,4 @@
-/*	$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,35 +37,31 @@ __FBSDID("$FreeBSD$");
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
-	ASMSTR("$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $")
+#if 0
+	RCSID("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
+#else
+	RCSID("$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-	.globl  _C_LABEL(__error)
-	.type   _C_LABEL(__error),%function
-
-LEAF(__cerror)
-	.frame sp, CALLFRAME_SIZ, ra
-	PIC_PROLOGUE(__cerror, t9)
-	subu	sp, sp, CALLFRAME_SIZ
+	.globl	_C_LABEL(__error)
+NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	sw	ra, CALLFRAME_RA(sp)
-	sw	v0, 12(sp)		# save errno value
-
-	la	t9, _C_LABEL(__error)	# locate address of errno
-	jalr	t9
-
-	lw	t0, 12(sp)
-	lw	ra, CALLFRAME_RA(sp)
-	sw	t0, 0(v0)		# update errno value
-	addiu	sp, sp, CALLFRAME_SIZ
-	li	v0, -1
-	li	v1, -1
-	j	ra
+	PIC_PROLOGUE(__cerror)
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
+	PTR_S		ra, CALLFRAME_RA(sp)
+	INT_S		v0, CALLFRAME_S0(sp)	# save errno value
+
+	SAVE_GP(CALLFRAME_GP)
+
+	PTR_LA		t9, _C_LABEL(__error)	# locate address of errno
+	jalr		t9
+
+	INT_L		t0, CALLFRAME_S0(sp)
+	PTR_L		ra, CALLFRAME_RA(sp)
+	INT_S		t0, 0(v0)		# update errno value
+	PTR_ADDU	sp, sp, CALLFRAME_SIZ
+	li		v0, -1
+	li		v1, -1
+	PIC_RETURN()
 END(__cerror)

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 05:46:36 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 410B01065673;
	Wed,  3 Mar 2010 05:46:36 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F0FF8FC13;
	Wed,  3 Mar 2010 05:46:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o235ka9i059274;
	Wed, 3 Mar 2010 05:46:36 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o235kaqI059256;
	Wed, 3 Mar 2010 05:46:36 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030546.o235kaqI059256@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 05:46:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204620 - user/jmallett/octeon/libexec/rtld-elf/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 05:46:36 -0000

Author: jmallett
Date: Wed Mar  3 05:46:35 2010
New Revision: 204620
URL: http://svn.freebsd.org/changeset/base/204620

Log:
  Sync with NetBSD (preserving our style, comments and debug statements as much
  as possible.)

Modified:
  user/jmallett/octeon/libexec/rtld-elf/mips/reloc.c
  user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S

Modified: user/jmallett/octeon/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- user/jmallett/octeon/libexec/rtld-elf/mips/reloc.c	Wed Mar  3 05:45:24 2010	(r204619)
+++ user/jmallett/octeon/libexec/rtld-elf/mips/reloc.c	Wed Mar  3 05:46:35 2010	(r204620)
@@ -1,5 +1,4 @@
-/*	$NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $	*/
-/*	$NetBSD: mips_reloc.c,v 1.53 2008/07/24 04:39:25 matt Exp $	*/
+/*	$NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $	*/
 
 /*
  * Copyright 1997 Michael L. Hitch 
@@ -30,69 +29,113 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
-#include 
-#include 
+#ifndef lint
+__RCSID("$NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $");
+#endif /* not lint */
+
+#include 
+#include 
+#include 
 
-#include 
-#include 
 #include 
 #include 
-#include 
+
 #include "debug.h"
 #include "rtld.h"
 
+#ifdef __mips_o32
+#define SUPPORT_OLD_BROKEN_LD
+#endif
+
 void
 init_pltgot(Obj_Entry *obj)
-{       
+{
 	if (obj->pltgot != NULL) {
 		obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start;
+		/* XXX only if obj->pltgot[1] & 0x80000000 ?? */
 		obj->pltgot[1] |= (Elf_Addr) obj;
 	}
 }
 
-int             
+int
 do_copy_relocations(Obj_Entry *dstobj)
 {
 	/* Do nothing */
-	return 0;			     
+	return 0;
 }
 
-void _rtld_bind_start(void);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 
-int open();
-int _open();
-
 /*
  * It is possible for the compiler to emit relocations for unaligned data.
  * We handle this situation with these inlines.
  */
-#define	RELOC_ALIGNED_P(x) \
-	(((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
 
-static __inline Elf_Addr
-load_ptr(void *where)
-{
-	if (__predict_true(RELOC_ALIGNED_P(where)))
-		return *(Elf_Addr *)where;
-	else {
-		Elf_Addr res;
-
-		(void)memcpy(&res, where, sizeof(res));
-		return res;
+#if ELFSIZE == 64
+/*
+ * ELF64 MIPS encodes the relocs uniquely.  The first 32-bits of info contain
+ * the symbol index.  The top 32-bits contain three relocation types encoded
+ * in big-endian integer with first relocation in LSB.  This means for little
+ * endian we have to byte swap that interger (r_type).
+ */
+#define	Elf_Sxword			Elf64_Sxword
+#define	ELF_R_NXTTYPE_64_P(r_type)	((((r_type) >> 8) & 0xff) == R_TYPE(64))
+#if BYTE_ORDER == LITTLE_ENDIAN
+#undef ELF_R_SYM
+#undef ELF_R_TYPE
+#define ELF_R_SYM(r_info)		((r_info) & 0xffffffff)
+#define ELF_R_TYPE(r_info)		bswap32((r_info) >> 32)
+#endif
+#else
+#define	ELF_R_NXTTYPE_64_P(r_type)	(0)
+#define	Elf_Sxword			Elf32_Sword
+#endif
+
+static __inline Elf_Sxword
+load_ptr(void *where, size_t len)
+{
+	Elf_Sxword val;
+
+	if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) {
+#if ELFSIZE == 64
+		if (len == sizeof(Elf_Sxword))
+			return *(Elf_Sxword *)where;
+#endif
+		return *(Elf_Sword *)where;
 	}
+
+	val = 0;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	(void)memcpy(&val, where, len);
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	(void)memcpy((uint8_t *)((&val)+1) - len, where, len);
+#endif
+	return (len == sizeof(Elf_Sxword)) ? val : (Elf_Sword)val;
 }
 
 static __inline void
-store_ptr(void *where, Elf_Addr val)
+store_ptr(void *where, Elf_Sxword val, size_t len)
 {
-	if (__predict_true(RELOC_ALIGNED_P(where)))
-		*(Elf_Addr *)where = val;
-	else
-		(void)memcpy(where, &val, sizeof(val));
+	if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) {
+#if ELFSIZE == 64
+		if (len == sizeof(Elf_Sxword)) {
+			*(Elf_Sxword *)where = val;
+			return;
+		}
+#endif
+		*(Elf_Sword *)where = val;
+		return;
+	}
+#if BYTE_ORDER == LITTLE_ENDIAN
+	(void)memcpy(where, &val, len);
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	(void)memcpy(where, (const uint8_t *)((&val)+1) - len, len);
+#endif
 }
 
+
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
 {
@@ -102,7 +145,7 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr *where;
 	Elf_Addr *got = NULL;
 	Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0;
-	int i;
+	size_t i;
 
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
@@ -134,7 +177,7 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	/* Relocate the local GOT entries */
 	got += i;
 	for (; i < local_gotno; i++) {
-	       *got++ += relocbase;
+		*got++ += relocbase;
 	}
 
 	sym = symtab + gotsym;
@@ -147,19 +190,41 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 
 	rellim = (const Elf_Rel *)((caddr_t)rel + relsz);
 	for (; rel < rellim; rel++) {
+		Elf_Word r_symndx, r_type;
+
 		where = (void *)(relocbase + rel->r_offset);
 
-		switch (ELF_R_TYPE(rel->r_info)) {
-		case R_TYPE(NONE):
-			break;
+		r_symndx = ELF_R_SYM(rel->r_info);
+		r_type = ELF_R_TYPE(rel->r_info);
 
-		case R_TYPE(REL32):
-			assert(ELF_R_SYM(rel->r_info) < gotsym);
-			sym = symtab + ELF_R_SYM(rel->r_info);
+		switch (r_type & 0xff) {
+		case R_TYPE(REL32): {
+			const size_t rlen =
+			    ELF_R_NXTTYPE_64_P(r_type)
+				? sizeof(Elf_Sxword)
+				: sizeof(Elf_Sword);
+			Elf_Sxword old = load_ptr(where, rlen);
+			Elf_Sxword val = old;
+#if ELFSIZE == 64
+			assert(r_type == R_TYPE(REL32)
+			    || r_type == (R_TYPE(REL32)|(R_TYPE(64) << 8)));
+#endif
+			assert(r_symndx < gotsym);
+			sym = symtab + r_symndx;
 			assert(ELF_ST_BIND(sym->st_info) == STB_LOCAL);
-			store_ptr(where, load_ptr(where) + relocbase);
+			val += relocbase;
+			store_ptr(where, val, sizeof(Elf_Sword));
+			dbg("REL32/L(%p) %p -> %p in ",
+			    where, (void *)old, (void *)val);
+			store_ptr(where, val, rlen);
+			break;
+		}
+
+		case R_TYPE(GPREL32):
+		case R_TYPE(NONE):
 			break;
 
+
 		default:
 			abort();
 			break;
@@ -189,9 +254,6 @@ _mips_rtld_bind(Obj_Entry *obj, Elf_Size
 	return (Elf_Addr)target;
 }
 
-/*
- * Process non-PLT relocations
- */
 int
 reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld)
 {
@@ -200,12 +262,24 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	Elf_Addr *got = obj->pltgot;
 	const Elf_Sym *sym, *def;
 	const Obj_Entry *defobj;
-	int i;
+	Elf_Word i;
+#ifdef SUPPORT_OLD_BROKEN_LD
+	int broken;
+#endif
 
 	/* The relocation for the dynamic loader has already been done. */
 	if (obj == obj_rtld)
 		return (0);
 
+#ifdef SUPPORT_OLD_BROKEN_LD
+	broken = 0;
+	sym = obj->symtab;
+	for (i = 1; i < 12; i++)
+		if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE))
+			broken = 1;
+	dbg("%s: broken=%d", obj->path, broken);
+#endif
+
 	i = (got[1] & 0x80000000) ? 2 : 1;
 
 	/* Relocate the local GOT entries */
@@ -213,16 +287,39 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	dbg("got:%p for %d entries adding %x",
 	    got, obj->local_gotno, (uint32_t)obj->relocbase);
 	for (; i < obj->local_gotno; i++) {
-	            *got += (Elf_Addr)obj->relocbase;
-		    got++;
+		*got += (Elf_Addr)obj->relocbase;
+		got++;
 	}
 	sym = obj->symtab + obj->gotsym;
 
-
 	dbg("got:%p for %d entries",
 	    got, obj->symtabno);
 	/* Now do the global GOT entries */
 	for (i = obj->gotsym; i < obj->symtabno; i++) {
+		dbg(" doing got %d sym %p (%s, %lx)", i - obj->gotsym, sym,
+		    sym->st_name + obj->strtab, (u_long) *got);
+
+#ifdef SUPPORT_OLD_BROKEN_LD
+		if (ELF_ST_TYPE(sym->st_info) == STT_FUNC &&
+		    broken && sym->st_shndx == SHN_UNDEF) {
+			/*
+			 * XXX DANGER WILL ROBINSON!
+			 * You might think this is stupid, as it intentionally
+			 * defeats lazy binding -- and you'd be right.
+			 * Unfortunately, for lazy binding to work right, we
+			 * need to a way to force the GOT slots used for
+			 * function pointers to be resolved immediately.  This
+			 * is supposed to be done automatically by the linker,
+			 * by not outputting a PLT slot and setting st_value
+			 * to 0 if there are non-PLT references, but older
+			 * versions of GNU ld do not do this.
+			 */
+			def = find_symdef(i, obj, &defobj, false, NULL);
+			if (def == NULL)
+				return -1;
+			*got = def->st_value + (Elf_Addr)defobj->relocbase;
+		} else
+#endif
 		if (ELF_ST_TYPE(sym->st_info) == STT_FUNC &&
 		    sym->st_value != 0 && sym->st_shndx == SHN_UNDEF) {
 			/*
@@ -242,81 +339,118 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 			 */
 			*got = sym->st_value + (Elf_Addr)obj->relocbase;
 			if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) {
-			  dbg("Warning2, i:%d maps to relocbase address:%x",
-			      i, (uint32_t)obj->relocbase);
+				dbg("Warning2, i:%d maps to relocbase address:%x",
+				    i, (uint32_t)obj->relocbase);
 			}
 
 		} else if (sym->st_info == ELF_ST_INFO(STB_GLOBAL, STT_SECTION)) {
 			/* Symbols with index SHN_ABS are not relocated. */
-		        if (sym->st_shndx != SHN_ABS) {
+			if (sym->st_shndx != SHN_ABS) {
 				*got = sym->st_value +
 				    (Elf_Addr)obj->relocbase;
 				if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) {
-				  dbg("Warning3, i:%d maps to relocbase address:%x",
-				      i, (uint32_t)obj->relocbase);
+					dbg("Warning3, i:%d maps to relocbase address:%x",
+					    i, (uint32_t)obj->relocbase);
 				}
 			}
 		} else {
 			/* TODO: add cache here */
 			def = find_symdef(i, obj, &defobj, false, NULL);
 			if (def == NULL) {
-			  dbg("Warning4, cant find symbole %d", i);
+				dbg("Warning4, cant find symbole %d", i);
 				return -1;
 			}
 			*got = def->st_value + (Elf_Addr)defobj->relocbase;
 			if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) {
-			  dbg("Warning4, i:%d maps to relocbase address:%x",
-			      i, (uint32_t)obj->relocbase);
-			  dbg("via first obj symbol %s",
-			      obj->strtab + obj->symtab[i].st_name);
-			  dbg("found in obj %p:%s",
-			      defobj, defobj->path);
-			} 
+				dbg("Warning4, i:%d maps to relocbase address:%x",
+				    i, (uint32_t)obj->relocbase);
+				dbg("via first obj symbol %s",
+				    obj->strtab + obj->symtab[i].st_name);
+				dbg("found in obj %p:%s",
+				    defobj, defobj->path);
+			}
 		}
+
+		dbg("  --> now %lx", (u_long) *got);
 		++sym;
 		++got;
 	}
+
 	got = obj->pltgot;
 	rellim = (const Elf_Rel *)((caddr_t)obj->rel + obj->relsize);
 	for (rel = obj->rel; rel < rellim; rel++) {
+		Elf_Word	r_symndx, r_type;
 		void		*where;
-		Elf_Addr	 tmp;
-		unsigned long	 symnum;
 
 		where = obj->relocbase + rel->r_offset;
-		symnum = ELF_R_SYM(rel->r_info);
-		switch (ELF_R_TYPE(rel->r_info)) {
+		r_symndx = ELF_R_SYM(rel->r_info);
+		r_type = ELF_R_TYPE(rel->r_info);
+
+		switch (r_type & 0xff) {
 		case R_TYPE(NONE):
 			break;
 
-		case R_TYPE(REL32):
+		case R_TYPE(REL32): {
 			/* 32-bit PC-relative reference */
-			def = obj->symtab + symnum;
-			if (symnum >= obj->gotsym) {
-				tmp = load_ptr(where);
-				tmp += got[obj->local_gotno + symnum - obj->gotsym];
-				store_ptr(where, tmp);
-				break;
+			const size_t rlen =
+			    ELF_R_NXTTYPE_64_P(r_type)
+				? sizeof(Elf_Sxword)
+				: sizeof(Elf_Sword);
+			Elf_Sxword old = load_ptr(where, rlen);
+			Elf_Sxword val = old;
+
+			def = obj->symtab + r_symndx;
+
+			if (r_symndx >= obj->gotsym) {
+				val += got[obj->local_gotno + r_symndx - obj->gotsym];
+				dbg("REL32/G(%p) %p --> %p (%s) in %s",
+				    where, (void *)old, (void *)val,
+				    obj->strtab + def->st_name,
+				    obj->path);
 			} else {
-				tmp = load_ptr(where);
+				/*
+				 * XXX: ABI DIFFERENCE!
+				 *
+				 * Old NetBSD binutils would generate shared
+				 * libs with section-relative relocations being
+				 * already adjusted for the start address of
+				 * the section.
+				 *
+				 * New binutils, OTOH, generate shared libs
+				 * with the same relocations being based at
+				 * zero, so we need to add in the start address
+				 * of the section.
+				 *
+				 * --rkb, Oct 6, 2001
+				 */
 
 				if (def->st_info ==
 				    ELF_ST_INFO(STB_LOCAL, STT_SECTION)
+#ifdef SUPPORT_OLD_BROKEN_LD
+				    && !broken
+#endif
 				    )
-					tmp += (Elf_Addr)def->st_value;
+					val += (Elf_Addr)def->st_value;
+
+				val += (Elf_Addr)obj->relocbase;
 
-				tmp += (Elf_Addr)obj->relocbase;
-				store_ptr(where, tmp);
+				dbg("REL32/L(%p) %p -> %p (%s) in %s",
+				    where, (void *)old, (void *)val,
+				    obj->strtab + def->st_name, obj->path);
 			}
+			store_ptr(where, val, rlen);
 			break;
+		}
+
 		default:
 			dbg("sym = %lu, type = %lu, offset = %p, "
 			    "contents = %p, symbol = %s",
-			    symnum, (u_long)ELF_R_TYPE(rel->r_info),
-			    (void *)rel->r_offset, (void *)load_ptr(where),
-			    obj->strtab + obj->symtab[symnum].st_name);
+			    (u_long)r_symndx, (u_long)ELF_R_TYPE(rel->r_info),
+			    (void *)rel->r_offset,
+			    (void *)load_ptr(where, sizeof(Elf_Sword)),
+			    obj->strtab + obj->symtab[r_symndx].st_name);
 			_rtld_error("%s: Unsupported relocation type %ld "
-			    "in non-PLT relocations\n",
+			    "in non-PLT relocations",
 			    obj->path, (u_long) ELF_R_TYPE(rel->r_info));
 			return -1;
 		}
@@ -331,6 +465,7 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 int
 reloc_plt(Obj_Entry *obj)
 {
+#if 0
 	const Elf_Rel *rellim;
 	const Elf_Rel *rel;
 		
@@ -345,6 +480,8 @@ reloc_plt(Obj_Entry *obj)
 		*where += (Elf_Addr )obj->relocbase;
 	}
 
+#endif
+	/* PLT fixups were done above in the GOT relocation. */
 	return (0);
 }
 

Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S
==============================================================================
--- user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S	Wed Mar  3 05:45:24 2010	(r204619)
+++ user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S	Wed Mar  3 05:46:35 2010	(r204620)
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld_start.S,v 1.9 2002/10/05 11:59:05 mycroft Exp $	*/
+/*	$NetBSD: rtld_start.S,v 1.10 2009/12/14 00:41:19 matt Exp $	*/
 
 /*
  * Copyright 1997 Michael L. Hitch 
@@ -33,6 +33,8 @@
 .globl _C_LABEL(_rtld_relocate_nonplt_self)
 .globl _C_LABEL(_rtld)
 
+#define	PTR_SIZE	(1< 1*PTR_SIZE(sp) for atexit */
+					/* -> 2*PTR_SIZE(sp) for obj_main */
+	move	s0, a0			/* save stack pointer from a0 */
+	move	s3, a3			/* save ps_strings pointer */
 
-#if defined(__mips_n32) || defined(__mips_n64)
-	.cpsetup $25, $24, rtld_start
-#else
-	.cpload t9
-#endif
-
-	addu	sp, sp, -16		/* adjust stack pointer		*/
-					/*	keep it aligned		*/
-
-#if defined(__mips_n32) || defined(__mips_n64)
-	sw	gp, 0(sp)
-#else
-	.cprestore 0			/* -> 0(sp) for gp		*/
-#endif
-	sw	a1, 4(sp)		/* -> 4(sp) for atexit		*/
-	sw	a2, 8(sp)		/* -> 8(sp) for obj_main	*/
-	move	s0, a0			/* save stack pointer from a0	*/
-	move	s1, a3			/* save ps_strings pointer	*/
-
-	la	a1, 1f
+	PTR_LA	a1, 1f
 	bal	1f
-	nop
-1:	subu	a1, ra, a1		/* relocbase */
-	la	t9, _C_LABEL(_rtld_relocate_nonplt_self)
-	move	s2, a1
-	la	a0, _DYNAMIC
-	addu	t9, a1, t9
-	jalr	t9
-	addu	a0, a1, a0		/* &_DYNAMIC */
-
-	move	a0, s0	 		/* stack pointer		*/
-	addu	a1, sp, 4 		/* &exit_proc			*/
-	addu	a2, sp, 8 		/* &objp			*/
-
-	jal	_C_LABEL(_rtld) 	/* v0 = _rtld(sp, exit_proc, objp) */
-	nop
-
-	lw	a1, 4(sp)		/* our atexit function		*/
-	lw	a2, 8(sp)		/* obj_main entry		*/
-
-	addu	sp, sp, 16		/* readjust stack		*/
-
+	 PTR_LA	t0, _C_LABEL(_rtld_relocate_nonplt_self)
+1:	PTR_SUBU a1, ra, a1		/* relocbase */
+	PTR_LA	a0, _DYNAMIC
+	PTR_ADDU t9, a1, t0
+	jalr	t9			/* _rtld_relocate_nonplt_self(dynp, relocabase) */
+	 PTR_ADDU a0, a1, a0		/* &_DYNAMIC */
+
+	move	a0, s0			/* sp */
+	PTR_ADDU a1, sp, 2*PTR_SIZE	/* &our atexit function */
+	PTR_ADDU a2, sp, 3*PTR_SIZE	/* obj_main entry */
+	jal	_C_LABEL(_rtld)		/* v0 = _rtld(sp, cleanup, objp) */
+	 nop
+
+	PTR_L	a1, 2*PTR_SIZE(sp)	/* our atexit function */
+	PTR_L	a2, 3*PTR_SIZE(sp)	/* obj_main entry */
+	PTR_ADDU sp, 4*PTR_SIZE		/* readjust stack */
+	move	a0, s0			/* stack pointer */
 	move	t9, v0
+	jr	t9			/* _start(sp, cleanup, obj); */
+	 move	a3, s3			/* restore ps_strings */
 
-	move	a0, s0			/* restore stack pointer from a0*/
-	move	a3, s1			/* restore ps_strings		*/
-	jr      t9                      /* _start(ap, cleanup, obj, ps_strings);        */
-	nop
 END(rtld_start)
 
+#define	XCALLFRAME_SIZ		(12*SZREG)
+#define	XCALLFRAME_RA		(10*SZREG)
+#define	XCALLFRAME_GP		(9*SZREG)
+#define	XCALLFRAME_S0		(8*SZREG)
+#define	XCALLFRAME_A3		(7*SZREG)
+#define	XCALLFRAME_A2		(6*SZREG)
+#define	XCALLFRAME_A1		(5*SZREG)
+#define	XCALLFRAME_A0		(4*SZREG)
+#if defined(__mips_n32) || defined(__mips_n64)
+#define	XCALLFRAME_A7		(3*SZREG)
+#define	XCALLFRAME_A6		(2*SZREG)
+#define	XCALLFRAME_A5		(1*SZREG)
+#define	XCALLFRAME_A4		(0*SZREG)
+#endif
+
 	.globl	_rtld_bind_start
 	.ent	_rtld_bind_start
 _rtld_bind_start:
-	/* ABI conventions for stubs:
-	 *   t8 contains symbol index 
-	 *   t7 contains return address 
-	 */
-	.frame sp, 0, ra		/* satisfy compiler		*/
-
-	move	v1, gp			/* save old GP			 */
-	
+	.frame	sp, XCALLFRAME_SIZ, $15
+	move	v1, gp			/* save old GP */
+#if defined(__mips_o32) || defined(__mips_o64)
+	PTR_ADDU t9, 8			/* modify T9 to point at .cpload */
+#endif
+	SETUP_GP
+	PTR_SUBU sp, XCALLFRAME_SIZ	/* save arguments and sp value in stack */
+	SETUP_GP64(XCALLFRAME_GP, _rtld_bind_start)
+	SAVE_GP(XCALLFRAME_GP)
 #if defined(__mips_n32) || defined(__mips_n64)
-	subu	sp, 60			/* save arguments and sp value	*/
-	sw	gp, 36(sp)
-	.cpsetup $25, $12, _rtld_bind_start  
-#else
-	add	t9, 8			/* modify T9 to point at .cpload */
-	.cpload	t9
-	subu	sp, 44			/* save arguments and sp value	*/
-	.cprestore 36
-#endif
-	sw	a0, 16(sp)
-	sw	a1, 20(sp)
-	sw	a2, 24(sp)
-	sw	a3, 28(sp)
-	sw	s0, 32(sp)
-#if defined(__mips_n64) || defined(__mips_n32)
-	sw	t3, 40(sp)
-	sw	a4, 44(sp)
-	sw	a5, 48(sp)
-	sw	a6, 52(sp)
-	sw	a7, 56(sp)
-#else
-	sw	t7, 40(sp)
-#endif
+	REG_S	a4,  XCALLFRAME_A4(sp)
+	REG_S	a5,  XCALLFRAME_A5(sp)
+	REG_S	a6,  XCALLFRAME_A6(sp)
+	REG_S	a7,  XCALLFRAME_A7(sp)
+#endif
+	REG_S	a0,  XCALLFRAME_A0(sp)
+	REG_S	a1,  XCALLFRAME_A1(sp)
+	REG_S	a2,  XCALLFRAME_A2(sp)
+	REG_S	a3,  XCALLFRAME_A3(sp)
+	REG_S	$15,  XCALLFRAME_RA(sp)	/* ra is in t7/t3 */
+	REG_S	s0,  XCALLFRAME_S0(sp)
 	move	s0, sp
-	move	a0, v1			/* old GP			*/
+
+	move	a0, v1			/* old GP */
 	subu	a0, a0, 0x7ff0		/* The offset of $gp from the	*/
-					/* beginning of the .got section: */
+       					/* beginning of the .got section: */
 					/* $gp = .got + 0x7ff0, so	*/
 					/* .got = $gp - 0x7ff0		*/
 					/* Simple math as you can see.	*/
-#if defined(__mips_n64) 
+#if defined(__mips_n64)
 	ld	a0, 8(a0)		/* object = pltgot[1] & 0x7fffffff */
 #else
 	lw	a0, 4(a0)		/* object = pltgot[1] & 0x7fffffff */
 #endif
 	and	a0, a0, 0x7fffffff
 	move	a1, t8			/* symbol index */
-					
+
 	jal	_C_LABEL(_mips_rtld_bind)
-	nop
+	 nop
 
 	move	sp, s0
-	
-#if defined(__mips_n64) || defined(__mips_n32)
-	lw	gp, 36(sp)
-#endif
-	
-	lw	ra, 40(sp)
-	lw	a0, 16(sp)
- 	lw	a1, 20(sp)
-	lw	a2, 24(sp)
-	lw	a3, 28(sp)
-	lw	s0, 32(sp)
-	
-#if defined(__mips_n64) || defined(__mips_n32)
-	lw	a4, 44(sp)
-	lw	a5, 48(sp)
-	lw	a6, 52(sp)
-	lw	a7, 56(sp)
-	addu	sp, 60
-	
-#else
-	addu	sp, 44
+	REG_L	ra, XCALLFRAME_RA(sp)		
+	REG_L	s0, XCALLFRAME_S0(sp)
+	REG_L	a0, XCALLFRAME_A0(sp)
+	REG_L	a1, XCALLFRAME_A1(sp)
+	REG_L	a2, XCALLFRAME_A2(sp)
+	REG_L	a3, XCALLFRAME_A3(sp)
+#if defined(__mips_n32) || defined(__mips_n64)
+	REG_L	a4, XCALLFRAME_A4(sp)
+	REG_L	a5, XCALLFRAME_A5(sp)
+	REG_L	a6, XCALLFRAME_A6(sp)
+	REG_L	a7, XCALLFRAME_A7(sp)
 #endif
+	RESTORE_GP64
+	PTR_ADDU sp, XCALLFRAME_SIZ
 	move	t9, v0
 	jr	t9
-	nop
-	.end	_rtld_bind_start
+	 nop
+END(_rtld_bind_start)

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 06:38:29 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E919C106566B;
	Wed,  3 Mar 2010 06:38:28 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8A368FC08;
	Wed,  3 Mar 2010 06:38:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o236cSbd070687;
	Wed, 3 Mar 2010 06:38:28 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o236cSdS070685;
	Wed, 3 Mar 2010 06:38:28 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030638.o236cSdS070685@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 06:38:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204621 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 06:38:29 -0000

Author: edwin
Date: Wed Mar  3 06:38:28 2010
New Revision: 204621
URL: http://svn.freebsd.org/changeset/base/204621

Log:
  Reimplement backwards compatible calendar with the new monthrange approach.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 05:46:35 2010	(r204620)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 06:38:28 2010	(r204621)
@@ -530,12 +530,8 @@ printmonthb(int y, int m, int jd_flag)
 		printf("%s\n", month.lines[i]+1);
 }
 
-void
-monthrangeb(int y, int jd_flag, int m, int before, int after)
-{
-	printf("BUUURP\n");
-}
-
+#define MW(mw, ms, ml) \
+	strlen(ms) > (ml) ? (mw) + 9 : (mw)
 #define	DECREASEMONTH(m, y) 		\
 		if (--m == 0) {		\
 			m = 12;		\
@@ -548,6 +544,93 @@ monthrangeb(int y, int jd_flag, int m, i
 		}
 #define	M2Y(m)	((m) / 12)
 #define	M2M(m)	(1 + (m) % 12) 
+
+void
+monthrangeb(int y, int jd_flag, int m, int before, int after)
+{
+	struct monthlines year[12];
+	struct weekdays wds;
+	char	s[80], t[80];
+	wchar_t	ws[80], wt[80];
+	char	*wdss;
+	int     i, j;
+	int     mpl;
+	int     mw;
+	int	m1, m2;
+	int	printyearheader;
+	int	prevyear = -1;
+
+	mpl = jd_flag ? 2 : 3;
+	mw = jd_flag ? MONTH_WIDTH_B_J : MONTH_WIDTH_B;
+	wdss = (mpl == 2) ? " " : "";
+
+	while (before != 0) {
+		DECREASEMONTH(m, y);
+		before--;
+		after++;
+	}
+	m1 = y * 12 + m - 1;
+	m2 = m1 + after;
+
+	mkweekdays(&wds);
+
+	/*
+	 * The year header is printed when there are more than 'mpl' months
+	 * and if the first month is a multitude of 'mpl'.
+	 * If not, it will print the year behind every month.
+	 */
+	printyearheader = (after >= mpl - 1) && (M2M(m1) - 1) % mpl == 0;
+
+	m = m1;
+	while (m <= m2) {
+		int count = 0;
+		for (i = 0; i != mpl && m + i <= m2; i++) {
+			mkmonthb(M2Y(m + i), M2M(m + i) - 1, jd_flag, year + i);
+			count++;
+		}
+
+		/* Empty line between two rows of months */
+		if (m != m1)
+			printf("\n");
+
+		/* Year at the top */
+		if (printyearheader && M2Y(m) != prevyear) {
+			sprintf(s, "%d", M2Y(m));
+			printf("%s\n", center(t, s, mpl * mw));
+			prevyear = M2Y(m);
+		}
+
+		/* Month names */
+		for (i = 0; i < count; i++)
+			if (printyearheader)
+				wprintf(L"%-*ls  ",
+				    mw, wcenter(ws, year[i].name, mw));
+			else
+				wprintf(L"%-ls %-*d  ",
+				    wcenter(ws, year[i].name, mw - 4),
+				    mw - wcslen(year[i].name) - 1, M2Y(m + i));
+		printf("\n");
+
+		/* Day of the week names */
+		for (i = 0; i < count; i++) {
+			wprintf(L"%s%ls%s%ls%s%ls%s%ls%s%ls%s%ls%s%ls ",
+				wdss, wds.names[6], wdss, wds.names[0],
+				wdss, wds.names[1], wdss, wds.names[2],
+				wdss, wds.names[3], wdss, wds.names[4],
+				wdss, wds.names[5]);
+		}
+		printf("\n");
+
+		for (i = 0; i != 6; i++) {
+			for (j = 0; j < count; j++)
+				printf("%-*s  ", mw, year[j].lines[i]+1);
+			printf("\n");
+		}
+
+		m += mpl;
+	}
+}
+
 void
 monthrange(int y, int jd_flag, int m, int before, int after)
 {
@@ -589,14 +672,11 @@ monthrange(int y, int jd_flag, int m, in
 			count++;
 		}
 
-#define MW(mw, ms, ml) \
-	strlen(ms) > (ml) ? (mw) + 9 : (mw)
-
-		/* Empty line between two months */
+		/* Empty line between two rows of months */
 		if (m != m1)
 			printf("\n");
 
-		/* Year at the top, only for calendars which start at January */
+		/* Year at the top */
 		if (printyearheader && M2Y(m) != prevyear) {
 			sprintf(s, "%d", M2Y(m));
 			printf("%s\n", center(t, s, mpl * mw));

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 06:41:02 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0664B1065688;
	Wed,  3 Mar 2010 06:41:02 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E98738FC18;
	Wed,  3 Mar 2010 06:41:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o236f18D071285;
	Wed, 3 Mar 2010 06:41:01 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o236f1jN071282;
	Wed, 3 Mar 2010 06:41:01 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030641.o236f1jN071282@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 06:41:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204622 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 06:41:02 -0000

Author: edwin
Date: Wed Mar  3 06:41:01 2010
New Revision: 204622
URL: http://svn.freebsd.org/changeset/base/204622

Log:
  Get rid of the old printyear[b] routines.

Modified:
  user/edwin/ncal/Makefile
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/Makefile
==============================================================================
--- user/edwin/ncal/Makefile	Wed Mar  3 06:38:28 2010	(r204621)
+++ user/edwin/ncal/Makefile	Wed Mar  3 06:41:01 2010	(r204622)
@@ -4,7 +4,7 @@ PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
-CFLAGS+= -I/usr/src/contrib/tzcode/libc/
+CFLAGS+= -Wall
 WARNS?=	1
 
 #LINKS=	${BINDIR}/ncal ${BINDIR}/cal

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 06:38:28 2010	(r204621)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 06:41:01 2010	(r204622)
@@ -175,8 +175,6 @@ void    printcc(void);
 void    printeaster(int year, int julian, int orthodox);
 void    printmonth(int year, int month, int jd_flag);
 void    printmonthb(int year, int month, int jd_flag);
-void    printyear(int year, int jd_flag);
-void    printyearb(int year, int jd_flag);
 int	firstday(int y, int m);
 date   *sdate(int ndays, struct date * d);
 date   *sdateb(int ndays, struct date * d);
@@ -551,7 +549,7 @@ monthrangeb(int y, int jd_flag, int m, i
 	struct monthlines year[12];
 	struct weekdays wds;
 	char	s[80], t[80];
-	wchar_t	ws[80], wt[80];
+	wchar_t	ws[80];
 	char	*wdss;
 	int     i, j;
 	int     mpl;
@@ -718,135 +716,6 @@ monthrange(int y, int jd_flag, int m, in
 }
 
 void
-printyear(int y, int jd_flag)
-{
-	struct monthlines year[12];
-	struct weekdays wds;
-	char    s[80], t[80];
-	int     i, j;
-	int     mpl;
-	int     mw;
-
-	for (i = 0; i != 12; i++)
-		mkmonth(y, i, jd_flag, year + i);
-	mkweekdays(&wds);
-	mpl = jd_flag ? 3 : 4;
-	mw = jd_flag ? MONTH_WIDTH_J : MONTH_WIDTH;
-
-	sprintf(s, "%d", y);
-	printf("%s\n", center(t, s, mpl * mw));
-
-#define MW(mw, ms, ml) \
-	strlen(ms) > (ml) ? (mw) + 9 : (mw)
-
-	for (j = 0; j != 12; j += mpl) {
-		wprintf(L"    %-*ls%-*ls",
-		    mw, year[j].name,
-		    mw, year[j + 1].name);
-		if (mpl == 3)
-			printf("%ls\n", year[j + 2].name);
-		else
-			wprintf(L"%-*ls%ls\n",
-		    	    mw, year[j + 2].name,
-		    	    year[j + 3].name);
-		for (i = 0; i != 7; i++) {
-			wprintf(L"%.2ls%-*s%-*s%-*s",
-			    wds.names[i],
-			    MW(mw, year[j].lines[i], year[j].linelen[i]),
-			    year[j].lines[i],
-			    MW(mw, year[j + 1].lines[i],
-				year[j + 1].linelen[i]),
-			    year[j + 1].lines[i],
-			    MW(mw, year[j + 2].lines[i],
-				year[j + 2].linelen[i]),
-			    year[j + 2].lines[i]);
-			if (mpl == 4)
-				printf("%s", year[j + 3].lines[i]);
-			printf("\n");
-		}
-		if (flag_weeks) {
-			if (mpl == 3)
-				printf("  %-*s%-*s%-s\n",
-				    mw, year[j].weeks,
-				    mw, year[j + 1].weeks,
-				    year[j + 2].weeks);
-			else
-				printf("  %-*s%-*s%-*s%-s\n",
-				    mw, year[j].weeks,
-				    mw, year[j + 1].weeks,
-				    mw, year[j + 2].weeks,
-				    year[j + 3].weeks);
-		}
-	}
-}
-
-void
-printyearb(int y, int jd_flag)
-{
-	struct monthlines year[12];
-	struct weekdays wds;
-	char	s[80], t[80];
-	wchar_t	ws[80], wt[80];
-	int     i, j;
-	int     mpl;
-	int     mw;
-
-	for (i = 0; i != 12; i++)
-		mkmonthb(y, i, jd_flag, year + i);
-	mkweekdays(&wds);
-	mpl = jd_flag ? 2 : 3;
-	mw = jd_flag ? MONTH_WIDTH_B_J : MONTH_WIDTH_B;
-
-	sprintf(s, "%d", y);
-	printf("%s\n\n", center(t, s, mw * mpl + mpl));
-
-	for (j = 0; j != 12; j += mpl) {
-		wprintf(L"%-*ls  ", mw, wcenter(ws, year[j].name, mw));
-		if (mpl == 2)
-			printf("%ls\n", wcenter(ws, year[j + 1].name, mw));
-		else
-			wprintf(L"%-*ls  %ls\n", mw,
-			    wcenter(ws, year[j + 1].name, mw),
-			    wcenter(wt, year[j + 2].name, mw));
-
-		if (mpl == 2)
-			wprintf(L" %ls %ls %ls %ls %ls %ls %ls "
-				" %ls %ls %ls %ls %ls %ls %.2ls\n",
-				wds.names[6], wds.names[0], wds.names[1],
-				wds.names[2], wds.names[3], wds.names[4],
-				wds.names[5],
-				wds.names[6], wds.names[0], wds.names[1],
-				wds.names[2], wds.names[3], wds.names[4],
-				wds.names[5]);
-		else
-			wprintf(L"%ls%ls%ls%ls%ls%ls%ls "
-				"%ls%ls%ls%ls%ls%ls%ls "
-				"%ls%ls%ls%ls%ls%ls%.2ls\n",
-				wds.names[6], wds.names[0], wds.names[1],
-				wds.names[2], wds.names[3], wds.names[4],
-				wds.names[5],
-				wds.names[6], wds.names[0], wds.names[1],
-				wds.names[2], wds.names[3], wds.names[4],
-				wds.names[5],
-				wds.names[6], wds.names[0], wds.names[1],
-				wds.names[2], wds.names[3], wds.names[4],
-				wds.names[5]);
-		for (i = 0; i != 6; i++) {
-			if (mpl == 2)
-				printf("%-*s  %s\n",
-			    mw, year[j].lines[i]+1,
-			    year[j + 1].lines[i]+1);
-			else
-				printf("%-*s  %-*s  %s\n",
-			    mw, year[j].lines[i]+1,
-			    mw, year[j + 1].lines[i]+1,
-			    year[j + 2].lines[i]+1);
-
-		}
-	}
-}
-
-void
 mkmonth(int y, int m, int jd_flag, struct monthlines *mlines)
 {
 

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 06:48:06 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0ED2A106566C;
	Wed,  3 Mar 2010 06:48:06 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F23278FC0C;
	Wed,  3 Mar 2010 06:48:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o236m5ks072926;
	Wed, 3 Mar 2010 06:48:05 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o236m506072924;
	Wed, 3 Mar 2010 06:48:05 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030648.o236m506072924@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 06:48:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204623 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 06:48:06 -0000

Author: edwin
Date: Wed Mar  3 06:48:05 2010
New Revision: 204623
URL: http://svn.freebsd.org/changeset/base/204623

Log:
  Remove more old code.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 06:41:01 2010	(r204622)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 06:48:05 2010	(r204623)
@@ -165,25 +165,22 @@ int	nswitchb;		/* switch date for backwa
 const char	*term_so, *term_se;
 int	today;
 
-char   *center(char *s, char *t, int w);
-wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
-void	mkmonth(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkweekdays(struct weekdays * wds);
-int     parsemonth(const char *s, int *m, int *y);
-void    printcc(void);
-void    printeaster(int year, int julian, int orthodox);
-void    printmonth(int year, int month, int jd_flag);
-void    printmonthb(int year, int month, int jd_flag);
-int	firstday(int y, int m);
-date   *sdate(int ndays, struct date * d);
-date   *sdateb(int ndays, struct date * d);
-int     sndays(struct date * d);
-int     sndaysb(struct date * d);
+static char   *center(char *s, char *t, int w);
+static wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
+static void	mkmonth(int year, int month, int jd_flag, struct monthlines * monthl);
+static void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
+static void    mkweekdays(struct weekdays * wds);
+static int     parsemonth(const char *s, int *m, int *y);
+static void    printcc(void);
+static void    printeaster(int year, int julian, int orthodox);
+static int	firstday(int y, int m);
+static date   *sdate(int ndays, struct date * d);
+static date   *sdateb(int ndays, struct date * d);
+static int     sndays(struct date * d);
+static int     sndaysb(struct date * d);
 static void usage(void);
-int     weekdayb(int nd);
-void	monthrange(int year, int jd_flag, int m, int before, int after);
-void	monthrangeb(int year, int jd_flag, int m, int before, int after);
+static void	monthrange(int year, int jd_flag, int m, int before, int after);
+static void	monthrangeb(int year, int jd_flag, int m, int before, int after);
 
 int
 main(int argc, char *argv[])
@@ -476,58 +473,6 @@ printeaster(int y, int julian, int ortho
 	printf("%s\n", buf);
 }
 
-void
-printmonth(int y, int m, int jd_flag)
-{
-	struct monthlines month;
-	struct weekdays wds;
-	int i, len;
-
-	mkmonth(y, m - 1, jd_flag, &month);
-	mkweekdays(&wds);
-	printf("    %ls %d\n", month.name, y);
-	for (i = 0; i != 7; i++) {
-		len = wcslen(wds.names[i]);
-		if (wcswidth(wds.names[i], len) == len)
-			wprintf(L"%.2ls%s\n", wds.names[i], month.lines[i]);
-		else
-			wprintf(L"%.1ls%s\n", wds.names[i], month.lines[i]);
-	}
-	if (flag_weeks)
-		printf("  %s\n", month.weeks);
-}
-
-void
-printmonthb(int y, int m, int jd_flag)
-{
-	struct monthlines month;
-	struct weekdays wds;
-	wchar_t s[MAX_WIDTH], t[MAX_WIDTH];
-	int i;
-	int mw;
-
-	mkmonthb(y, m - 1, jd_flag, &month);
-	mkweekdays(&wds);
-
-	mw = jd_flag ? MONTH_WIDTH_B_J : MONTH_WIDTH_B;
-
-	swprintf(s, MAX_WIDTH, L"%ls %d", month.name, y);
-	wprintf(L"%ls\n", wcenter(t, s, mw));
-
-	if (jd_flag)
-		wprintf(L" %ls %ls %ls %ls %ls %ls %.2ls\n",
-			wds.names[6], wds.names[0],
-			wds.names[1], wds.names[2], wds.names[3],
-			wds.names[4], wds.names[5]);
-	else
-		wprintf(L"%ls%ls%ls%ls%ls%ls%.2ls\n", wds.names[6],
-			wds.names[0], wds.names[1], wds.names[2], wds.names[3],
-			wds.names[4], wds.names[5]);
-
-	for (i = 0; i != 6; i++)
-		printf("%s\n", month.lines[i]+1);
-}
-
 #define MW(mw, ms, ml) \
 	strlen(ms) > (ml) ? (mw) + 9 : (mw)
 #define	DECREASEMONTH(m, y) 		\

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 07:00:08 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87EBC106564A;
	Wed,  3 Mar 2010 07:00:08 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 76EA38FC15;
	Wed,  3 Mar 2010 07:00:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23708vK075624;
	Wed, 3 Mar 2010 07:00:08 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23708nx075622;
	Wed, 3 Mar 2010 07:00:08 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030700.o23708nx075622@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 07:00:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204624 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 07:00:08 -0000

Author: edwin
Date: Wed Mar  3 07:00:08 2010
New Revision: 204624
URL: http://svn.freebsd.org/changeset/base/204624

Log:
  Rename all non backwards compatible functions/variables/constants
  to regular (in other words, add the r prefix)

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 06:48:05 2010	(r204623)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 07:00:08 2010	(r204624)
@@ -45,12 +45,12 @@ static const char rcsid[] =
 #include 
 #undef lines			/* term.h defines this */
 
-/* Width of one month with backward compatibility */
+/* Width of one month with backward compatibility and in regular mode*/
 #define MONTH_WIDTH_B_J 27
 #define MONTH_WIDTH_B 20
 
-#define MONTH_WIDTH_J 24
-#define MONTH_WIDTH 18
+#define MONTH_WIDTH_R_J 24
+#define MONTH_WIDTH_R 18
 
 #define MAX_WIDTH 64
 
@@ -165,22 +165,22 @@ int	nswitchb;		/* switch date for backwa
 const char	*term_so, *term_se;
 int	today;
 
-static char   *center(char *s, char *t, int w);
-static wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
-static void	mkmonth(int year, int month, int jd_flag, struct monthlines * monthl);
-static void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
-static void    mkweekdays(struct weekdays * wds);
-static int     parsemonth(const char *s, int *m, int *y);
-static void    printcc(void);
-static void    printeaster(int year, int julian, int orthodox);
-static int	firstday(int y, int m);
-static date   *sdate(int ndays, struct date * d);
-static date   *sdateb(int ndays, struct date * d);
-static int     sndays(struct date * d);
-static int     sndaysb(struct date * d);
-static void usage(void);
-static void	monthrange(int year, int jd_flag, int m, int before, int after);
-static void	monthrangeb(int year, int jd_flag, int m, int before, int after);
+char	*center(char *s, char *t, int w);
+wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
+void	mkmonthr(int year, int month, int jd_flag, struct monthlines * monthl);
+void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
+void    mkweekdays(struct weekdays * wds);
+int     parsemonth(const char *s, int *m, int *y);
+void    printcc(void);
+void    printeaster(int year, int julian, int orthodox);
+int	firstday(int y, int m);
+date	*sdater(int ndays, struct date * d);
+date	*sdateb(int ndays, struct date * d);
+int     sndaysr(struct date * d);
+int     sndaysb(struct date * d);
+static void	usage(void);
+void	monthranger(int year, int jd_flag, int m, int before, int after);
+void	monthrangeb(int year, int jd_flag, int m, int before, int after);
 
 int
 main(int argc, char *argv[])
@@ -403,7 +403,7 @@ main(int argc, char *argv[])
 		if (flag_backward)
 			monthrangeb(y, flag_julian_day, m, before, after);
 		else
-			monthrange(y, flag_julian_day, m, before, after);
+			monthranger(y, flag_julian_day, m, before, after);
 	return (0);
 }
 
@@ -550,7 +550,7 @@ monthrangeb(int y, int jd_flag, int m, i
 				    mw, wcenter(ws, year[i].name, mw));
 			else
 				wprintf(L"%-ls %-*d  ",
-				    wcenter(ws, year[i].name, mw - 4),
+				    wcenter(ws, year[i].name, mw - 10),
 				    mw - wcslen(year[i].name) - 1, M2Y(m + i));
 		printf("\n");
 
@@ -575,7 +575,7 @@ monthrangeb(int y, int jd_flag, int m, i
 }
 
 void
-monthrange(int y, int jd_flag, int m, int before, int after)
+monthranger(int y, int jd_flag, int m, int before, int after)
 {
 	struct monthlines year[12];
 	struct weekdays wds;
@@ -588,7 +588,7 @@ monthrange(int y, int jd_flag, int m, in
 	int	printyearheader;
 
 	mpl = jd_flag ? 3 : 4;
-	mw = jd_flag ? MONTH_WIDTH_J : MONTH_WIDTH;
+	mw = jd_flag ? MONTH_WIDTH_R_J : MONTH_WIDTH_R;
 
 	while (before != 0) {
 		DECREASEMONTH(m, y);
@@ -611,7 +611,7 @@ monthrange(int y, int jd_flag, int m, in
 	while (m <= m2) {
 		int count = 0;
 		for (i = 0; i != mpl && m + i <= m2; i++) {
-			mkmonth(M2Y(m + i), M2M(m + i) - 1, jd_flag, year + i);
+			mkmonthr(M2Y(m + i), M2M(m + i) - 1, jd_flag, year + i);
 			count++;
 		}
 
@@ -661,7 +661,7 @@ monthrange(int y, int jd_flag, int m, in
 }
 
 void
-mkmonth(int y, int m, int jd_flag, struct monthlines *mlines)
+mkmonthr(int y, int m, int jd_flag, struct monthlines *mlines)
 {
 
 	struct tm tm;		/* for strftime printing local names of
@@ -743,7 +743,7 @@ mkmonth(int y, int m, int jd_flag, struc
 				if (jd_flag)
 					dt.d = j - jan1 + 1;
 				else
-					sdate(j, &dt);
+					sdater(j, &dt);
 				memcpy(mlines->lines[i] + k + l,
 				       ds + dt.d * dw, dw);
 			} else
@@ -914,9 +914,9 @@ firstday(int y, int m)
 	dt.y = y;
 	dt.m = m;
 	dt.d = 1;
-	nd = sndays(&dt);
+	nd = sndaysr(&dt);
 	for (;;) {
-		sdate(nd, &dt);
+		sdater(nd, &dt);
 		if ((dt.m >= m && dt.y == y) || dt.y > y)
 			return (nd);
 		else
@@ -930,7 +930,7 @@ firstday(int y, int m)
  * Julian to Gregorian if specified by the user.
  */
 int
-sndays(struct date *d)
+sndaysr(struct date *d)
 {
 
 	if (nswitch != 0)
@@ -958,7 +958,7 @@ sndaysb(struct date *d)
 
 /* Inverse of sndays */
 struct date *
-sdate(int nd, struct date *d)
+sdater(int nd, struct date *d)
 {
 
 	if (nswitch < nd)

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 07:11:26 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74FB2106564A;
	Wed,  3 Mar 2010 07:11:26 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 644DB8FC15;
	Wed,  3 Mar 2010 07:11:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o237BQP0078138;
	Wed, 3 Mar 2010 07:11:26 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o237BQDr078135;
	Wed, 3 Mar 2010 07:11:26 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030711.o237BQDr078135@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 07:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204625 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 07:11:26 -0000

Author: edwin
Date: Wed Mar  3 07:11:25 2010
New Revision: 204625
URL: http://svn.freebsd.org/changeset/base/204625

Log:
  style cleanup
  double hassling of today variable cleanup.

Modified:
  user/edwin/ncal/Makefile
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/Makefile
==============================================================================
--- user/edwin/ncal/Makefile	Wed Mar  3 07:00:08 2010	(r204624)
+++ user/edwin/ncal/Makefile	Wed Mar  3 07:11:25 2010	(r204625)
@@ -4,7 +4,7 @@ PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
-CFLAGS+= -Wall
+CFLAGS+= -Wall -O0
 WARNS?=	1
 
 #LINKS=	${BINDIR}/ncal ${BINDIR}/cal

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 07:00:08 2010	(r204624)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 07:11:25 2010	(r204625)
@@ -188,6 +188,7 @@ main(int argc, char *argv[])
 	struct  djswitch *p, *q;	/* to search user defined switch date */
 	date	never = {10000, 1, 1};	/* outside valid range of dates */
 	date	ukswitch = {1752, 9, 2};/* switch date for Great Britain */
+	date	dt;
 	int     ch;			/* holds the option character */
 	int     m = 0;			/* month */
 	int	y = 0;			/* year */
@@ -200,28 +201,17 @@ main(int argc, char *argv[])
 	int	flag_easter = 0;	/* use wants easter date */
 	char	*cp;			/* character pointer */
 	char	*flag_month = NULL;	/* requested month as string */
-	char	*flag_date = NULL;
+	char	*flag_highlightdate = NULL;
 	int	before, after;
 	const char    *locale;		/* locale to get country code */
 	char tbuf[1024], cbuf[512], *b;
-	time_t t;
-	struct tm *tm1;
 
+	/* On how to highlight on this terminal */
 	term_se = term_so = NULL;
-	today = 0;
 	if (isatty(STDOUT_FILENO) && tgetent(tbuf, NULL) == 1) {
-		date	dt;		/* handy date */
-
 		b = cbuf;
 		term_so = tgetstr("so", &b);
 		term_se = tgetstr("se", &b);
-		t = time(NULL);
-		tm1 = localtime(&t);
-		dt.y = tm1->tm_year + 1900;
-		dt.m = tm1->tm_mon + 1;
-		dt.d = tm1->tm_mday;
-
-		today = sndaysb(&dt);
 	}
 
 	/*
@@ -290,7 +280,7 @@ main(int argc, char *argv[])
 			flag_backward = 1;
 			break;
 		case 'd':
-			flag_date = optarg;
+			flag_highlightdate = optarg;
 			break;
 		case 'h':
 			term_so = term_se = NULL;
@@ -387,15 +377,21 @@ main(int argc, char *argv[])
 		}
 	}
 
-	if (flag_date != NULL) {
-		date	dt;		/* handy date */
-
-		dt.y = strtol(flag_date, NULL, 10);
-		dt.m = strtol(flag_date + 5, NULL, 10);
-		dt.d = strtol(flag_date + 8, NULL, 10);
+	if (flag_highlightdate != NULL) {
+		dt.y = strtol(flag_highlightdate, NULL, 10);
+		dt.m = strtol(flag_highlightdate + 5, NULL, 10);
+		dt.d = strtol(flag_highlightdate + 8, NULL, 10);
+	} else {
+		time_t t;
+		struct tm *tm1;
 
-		today = sndaysb(&dt);
+		t = time(NULL);
+		tm1 = localtime(&t);
+		dt.y = tm1->tm_year + 1900;
+		dt.m = tm1->tm_mon + 1;
+		dt.d = tm1->tm_mday;
 	}
+	today = sndaysb(&dt);
 
 	if (flag_easter)
 		printeaster(y, flag_julian_cal, flag_orthodox);
@@ -720,7 +716,8 @@ mkmonthr(int y, int m, int jd_flag, stru
 	for (i = 0; i != 7; i++) {
 		l = 0;
 		for (j = firstm + i, k = 0; j < last; j += 7, k += dw) {
-			if (j == today && (term_so != NULL && term_se != NULL)) {
+			if (j == today &&
+			    (term_so != NULL && term_se != NULL)) {
 				l = strlen(term_so);
 				if (jd_flag)
 					dt.d = j - jan1 + 1;
@@ -839,7 +836,8 @@ mkmonthb(int y, int m, int jd_flag, stru
 		l = 0;
 		for (j = firsts + 7 * i, k = 0; j < last && k != dw * 7;
 		    j++, k += dw) { 
-			if (j == today && (term_so != NULL && term_se != NULL)) {
+			if (j == today &&
+			    (term_so != NULL && term_se != NULL)) {
 				l = strlen(term_so);
 				if (jd_flag)
 					dt.d = j - jan1 + 1;

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 07:19:26 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E65D31065672;
	Wed,  3 Mar 2010 07:19:26 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D518F8FC08;
	Wed,  3 Mar 2010 07:19:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o237JQdr079944;
	Wed, 3 Mar 2010 07:19:26 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o237JQ1v079943;
	Wed, 3 Mar 2010 07:19:26 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003030719.o237JQ1v079943@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 07:19:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204626 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 07:19:27 -0000

Author: edwin
Date: Wed Mar  3 07:19:26 2010
New Revision: 204626
URL: http://svn.freebsd.org/changeset/base/204626

Log:
  WARNS=6

Modified:
  user/edwin/ncal/Makefile
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/Makefile
==============================================================================
--- user/edwin/ncal/Makefile	Wed Mar  3 07:11:25 2010	(r204625)
+++ user/edwin/ncal/Makefile	Wed Mar  3 07:19:26 2010	(r204626)
@@ -5,7 +5,7 @@ PROG=	ncal
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
 CFLAGS+= -Wall -O0
-WARNS?=	1
+WARNS?=	6
 
 #LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 07:11:25 2010	(r204625)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 07:19:26 2010	(r204626)
@@ -60,7 +60,7 @@ struct monthlines {
 	wchar_t name[MAX_WIDTH + 1];
 	char lines[7][MAX_WIDTH + 1];
 	char weeks[MAX_WIDTH + 1];
-	int linelen[7];
+	unsigned int linelen[7];
 };
 
 struct weekdays {
@@ -491,7 +491,7 @@ monthrangeb(int y, int jd_flag, int m, i
 	struct weekdays wds;
 	char	s[80], t[80];
 	wchar_t	ws[80];
-	char	*wdss;
+	const char	*wdss;
 	int     i, j;
 	int     mpl;
 	int     mw;

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 09:02:56 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48E521065672;
	Wed,  3 Mar 2010 09:02:56 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3848B8FC17;
	Wed,  3 Mar 2010 09:02:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2392uwC003099;
	Wed, 3 Mar 2010 09:02:56 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2392uhU003095;
	Wed, 3 Mar 2010 09:02:56 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030902.o2392uhU003095@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 09:02:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204630 - user/jmallett/octeon/lib/csu/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 09:02:56 -0000

Author: jmallett
Date: Wed Mar  3 09:02:55 2010
New Revision: 204630
URL: http://svn.freebsd.org/changeset/base/204630

Log:
  Rewrite init and fini stubs to support more ABIs.  Remove cruft from crt1.
  
  Now dynamically-linked n32 programs work.

Modified:
  user/jmallett/octeon/lib/csu/mips/crt1.c
  user/jmallett/octeon/lib/csu/mips/crti.S
  user/jmallett/octeon/lib/csu/mips/crtn.S

Modified: user/jmallett/octeon/lib/csu/mips/crt1.c
==============================================================================
--- user/jmallett/octeon/lib/csu/mips/crt1.c	Wed Mar  3 08:24:15 2010	(r204629)
+++ user/jmallett/octeon/lib/csu/mips/crt1.c	Wed Mar  3 09:02:55 2010	(r204630)
@@ -66,9 +66,6 @@ extern int etext;
 char **environ;
 const char *__progname = "";
 
-void __gccmain(void) {}
-void __main(void) {}
-
 /* The entry function. */
 void
 __start(char **ap,

Modified: user/jmallett/octeon/lib/csu/mips/crti.S
==============================================================================
--- user/jmallett/octeon/lib/csu/mips/crti.S	Wed Mar  3 08:24:15 2010	(r204629)
+++ user/jmallett/octeon/lib/csu/mips/crti.S	Wed Mar  3 09:02:55 2010	(r204630)
@@ -6,32 +6,45 @@ __FBSDID("$FreeBSD$");
 	.globl	_init
 	.type	_init,%function
 _init:
-#ifdef __ABICALLS__
-	.set   noreorder
-	.cpload $25
-	.set   reorder
-	subu	sp, sp, 32
-	.cprestore 16
-	sw	ra, 28(sp)
-
+	.set nreoorder
+#if defined(__ABICALLS__) && (defined(__mips_o32) || defined(__mips_o64))
+	SETUP_GP
+#endif
+	PTR_ADDU sp, sp, -CALLFRAME_SIZ
+	REG_S	ra, CALLFRAME_RA(sp)
+#if defined(__ABICALLS__)
+#if defined(__mips_o32) || defined(__mips_o64)
+	SAVE_GP(CALLFRAME_GP)
 #else
-	subu	sp, sp, 32
-	sw	ra, 28(sp)
+	SETUP_GP64(CALLFRAME_GP, _init)
+#endif
+#else /* __ABICALLS__ */
+#if defined(__mips_n32) || defined(__mips_n64)
+	REG_S	gp, CALLFRAME_GP(sp)
+#endif
 #endif
+	.set reorder
 
 	.section .fini,"ax",%progbits
 	.align 4
 	.globl	_fini
 	.type	_fini,%function
 _fini:
-#ifdef __ABICALLS__
-	.set   noreorder
-	.cpload $25
-	.set   reorder
-	subu	sp, sp, 32
-	.cprestore 16
-	sw	ra, 28(sp)
+	.set noreorder
+#if defined(__ABICALLS__) && (defined(__mips_o32) || defined(__mips_o64))
+	SETUP_GP
+#endif
+	PTR_ADDU sp, sp, -CALLFRAME_SIZ
+	REG_S	ra, CALLFRAME_RA(sp)
+#if defined(__ABICALLS__)
+#if defined(__mips_o32) || defined(__mips_o64)
+	SAVE_GP(CALLFRAME_GP)
 #else
-	subu    sp, sp, 32
-	sw	ra, 28(sp)
+	SETUP_GP64(CALLFRAME_GP, _fini)
+#endif
+#else /* __ABICALLS__ */
+#if defined(__mips_n32) || defined(__mips_n64)
+	REG_S	gp, CALLFRAME_GP(sp)
+#endif
 #endif
+	.set reorder

Modified: user/jmallett/octeon/lib/csu/mips/crtn.S
==============================================================================
--- user/jmallett/octeon/lib/csu/mips/crtn.S	Wed Mar  3 08:24:15 2010	(r204629)
+++ user/jmallett/octeon/lib/csu/mips/crtn.S	Wed Mar  3 09:02:55 2010	(r204630)
@@ -1,15 +1,24 @@
 #include 
 __FBSDID("$FreeBSD$");
+
 	.section .init,"ax",%progbits
-	lw	ra, 28(sp)
-	.set	noreorder
-	j	ra
-	addu	sp, sp, 32
-	.set	reorder
+	.align 4
+	.set noreorder
+#if defined(__ABICALLS__) && (defined(__mips_n32) || defined(__mips_n64))
+	REG_L	gp, CALLFRAME_GP(sp)
+#endif
+	REG_L	ra, CALLFRAME_RA(sp)
+	jr	ra
+	PTR_ADDU sp, sp, CALLFRAME_SIZ
+	.set reorder
 
 	.section .fini,"ax",%progbits
-	lw	ra, 28(sp)
-	.set	noreorder
-	j	ra
-	addu	sp, sp, 32
-	.set	reorder
+	.align 4
+	.set noreorder
+#if defined(__ABICALLS__) && (defined(__mips_n32) || defined(__mips_n64))
+	REG_L	gp, CALLFRAME_GP(sp)
+#endif
+	REG_L	ra, CALLFRAME_RA(sp)
+	jr	ra
+	PTR_ADDU sp, sp, CALLFRAME_SIZ
+	.set reorder

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 09:29:12 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D25341065672;
	Wed,  3 Mar 2010 09:29:12 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C13A48FC0C;
	Wed,  3 Mar 2010 09:29:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o239TCQ3008896;
	Wed, 3 Mar 2010 09:29:12 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o239TCht008889;
	Wed, 3 Mar 2010 09:29:12 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003030929.o239TCht008889@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 09:29:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204631 - user/jmallett/octeon/lib/libc/mips/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 09:29:12 -0000

Author: jmallett
Date: Wed Mar  3 09:29:12 2010
New Revision: 204631
URL: http://svn.freebsd.org/changeset/base/204631

Log:
  Update with ABI/PIC stuff.  Some of these may not be quite right...

Modified:
  user/jmallett/octeon/lib/libc/mips/sys/Ovfork.S
  user/jmallett/octeon/lib/libc/mips/sys/brk.S
  user/jmallett/octeon/lib/libc/mips/sys/exect.S
  user/jmallett/octeon/lib/libc/mips/sys/fork.S
  user/jmallett/octeon/lib/libc/mips/sys/pipe.S
  user/jmallett/octeon/lib/libc/mips/sys/sbrk.S

Modified: user/jmallett/octeon/lib/libc/mips/sys/Ovfork.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/Ovfork.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/Ovfork.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -49,21 +49,16 @@ __FBSDID("$FreeBSD$");
  */
 
 LEAF(__sys_vfork)
-#ifdef __ABICALLS__
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
 	WEAK_ALIAS(vfork, __sys_vfork)
 	WEAK_ALIAS(_vfork, __sys_vfork)
+	PIC_PROLOGUE(__sys_vfork)
 	li	v0, SYS_vfork		# system call number for vfork
 	syscall
 	beq	a3, zero, 1f		# jump if no errors
-	la	t9, __cerror
-	jr	t9
+	PIC_TAILCALL(__cerror)
 1:
 	beq	v1, zero, 2f		# parent process ?
 	move	v0, zero		# return zero in child
 2:
-	j	ra
+	PIC_RETURN()
 END(__sys_vfork)

Modified: user/jmallett/octeon/lib/libc/mips/sys/brk.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/brk.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/brk.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -52,22 +52,19 @@ _C_LABEL(minbrk):
 LEAF(__sys_brk)
 	WEAK_ALIAS(brk, __sys_brk)
 	WEAK_ALIAS(_brk, __sys_brk)
-#ifdef __ABICALLS__
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
-	lw	v0, _C_LABEL(minbrk)
+	PIC_PROLOGUE(__sys_brk)
+	PTR_LA	v0, _C_LABEL(minbrk)
+	PTR_L	v0, 0(v0)
 	bgeu	a0, v0, 1f
 	move	a0, v0		# dont allow break < minbrk
 1:
 	li	v0, SYS_break
 	syscall
 	bne	a3, zero, 2f
-	sw	a0, _C_LABEL(__curbrk)
+	PTR_LA	t0, _C_LABEL(__curbrk)
+	PTR_S	a0, 0(t0)
 	move	v0, zero
-	j	ra
+	PIC_RETURN()
 2:
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(__sys_brk)

Modified: user/jmallett/octeon/lib/libc/mips/sys/exect.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/exect.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/exect.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -41,16 +41,11 @@ __FBSDID("$FreeBSD$");
 #endif /* LIBC_SCCS and not lint */
 
 LEAF(exect)
-#ifdef __ABICALLS__
-	.set    noreorder
-	.cpload t9
-	.set    reorder
-#endif
+	PIC_PROLOGUE(exect)
 	li	v0, SYS_execve
 	syscall
 	bne	a3, zero, 1f
-	j	ra
+	PIC_RETURN()
 1:
-	la      t9, _C_LABEL(__cerror)
-	jr      t9
+	PIC_TAILCALL(__cerror)
 END(exect)

Modified: user/jmallett/octeon/lib/libc/mips/sys/fork.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/fork.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/fork.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -44,20 +44,14 @@ __FBSDID("$FreeBSD$");
 LEAF(__sys_fork)
 	WEAK_ALIAS(fork, __sys_fork)
 	WEAK_ALIAS(_fork, __sys_fork)
-#ifdef __ABICALLS__
-	.set    noreorder
-	.cpload t9
-	.set    reorder
-#endif
-	fork = __sys_fork
+	PIC_PROLOGUE(__sys_fork)
 	li	v0, SYS_fork	# pid = fork()
 	syscall
 	bne	a3, zero, 2f
 	beq	v1, zero, 1f	# v1 == 0 in parent, 1 in child
 	move	v0, zero
 1:
-	j	ra
+	PIC_RETURN()
 2:
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(__sys_fork)

Modified: user/jmallett/octeon/lib/libc/mips/sys/pipe.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/pipe.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/pipe.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -44,19 +44,14 @@ __FBSDID("$FreeBSD$");
 LEAF(__sys_pipe)
 	WEAK_ALIAS(pipe, __sys_pipe)
 	WEAK_ALIAS(_pipe, __sys_pipe)
-#ifdef __ABICALLS__
-	.set    noreorder
-	.cpload t9
-	.set    reorder
-#endif
+	PIC_PROLOGUE(__sys_pipe)
 	li	v0, SYS_pipe	# pipe(fildes) int fildes[2];
 	syscall
 	bne	a3, zero, 1f
 	sw	v0, 0(a0)	# store the two file descriptors
 	sw	v1, 4(a0)
 	move	v0, zero
-	j	ra
+	PIC_RETURN()
 1:
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(__sys_pipe)

Modified: user/jmallett/octeon/lib/libc/mips/sys/sbrk.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/sbrk.S	Wed Mar  3 09:02:55 2010	(r204630)
+++ user/jmallett/octeon/lib/libc/mips/sys/sbrk.S	Wed Mar  3 09:29:12 2010	(r204631)
@@ -52,34 +52,22 @@ _C_LABEL(__curbrk):
 LEAF(__sys_sbrk)
 	WEAK_ALIAS(sbrk, __sys_sbrk)
 	WEAK_ALIAS(_sbrk, __sys_sbrk)
-#ifdef __ABICALLS__
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
-	addu	sp, sp, -16
-	sw	s0, 0(sp)		# Preserve s0 value in stack
-					# it should be the same on return
-					# We can't use v1 as temporary
-					# register since syscall uses it
-					# to return 64-bit values
-	lw	s0, _C_LABEL(__curbrk)
-	li	v0, SYS_break
-	addu	a0, a0, s0		# compute current break
+	PIC_PROLOGUE(__sys_sbrk)
+	PTR_LA	t0, _C_LABEL(__curbrk)
+	PTR_L	t0, 0(t0)
+	PTR_ADDU a0, a0, t0
 
+	li	v0, SYS_break
 	syscall
 
 	bne	a3, zero, 1f
 	nop
-	move	v0, s0			# return old val of curbrk from above
-	lw	s0, 0(sp)
-	addu	sp, sp, 16
-	sw	a0, _C_LABEL(__curbrk)	# save current val of curbrk from above
+	move	v0, t0			# return old val of curbrk from above
+	PTR_LA	t0, _C_LABEL(__curbrk)
+	PTR_S	a0, 0(t0)		# save current val of curbrk from above
+	PIC_RETURN()
 	j	ra
 
 1:
-	lw	s0, 0(sp)
-	addu	sp, sp, 16
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(__sys_sbrk)

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 14:48:12 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59138106564A;
	Wed,  3 Mar 2010 14:48:12 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 429E68FC15;
	Wed,  3 Mar 2010 14:48:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23EmCsb080325;
	Wed, 3 Mar 2010 14:48:12 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23EmBWJ080290;
	Wed, 3 Mar 2010 14:48:11 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201003031448.o23EmBWJ080290@svn.freebsd.org>
From: Luigi Rizzo 
Date: Wed, 3 Mar 2010 14:48:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204634 - in user/luigi/ipfw3-head: . bin/cp bin/csh
	bin/date bin/kill bin/ls bin/pax bin/pkill bin/ps bin/rmail
	bin/sh cddl/usr.bin/ctfconvert cddl/usr.bin/ctfdump
	cddl/usr.bin/ctfmerg...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 14:48:12 -0000

Author: luigi
Date: Wed Mar  3 14:48:08 2010
New Revision: 204634
URL: http://svn.freebsd.org/changeset/base/204634

Log:
  svn merge -r 201486:204591 svn+ssh://svn.freebsd.org/base/head

Added:
  user/luigi/ipfw3-head/contrib/dtc/
     - copied from r204591, head/contrib/dtc/
  user/luigi/ipfw3-head/contrib/gdb/gdb/config/mips/nm-fbsd.h
     - copied unchanged from r204591, head/contrib/gdb/gdb/config/mips/nm-fbsd.h
  user/luigi/ipfw3-head/contrib/gdb/gdb/config/mips/tm-fbsd.h
     - copied unchanged from r204591, head/contrib/gdb/gdb/config/mips/tm-fbsd.h
  user/luigi/ipfw3-head/contrib/gdb/gdb/mipsfbsd-nat.c
     - copied unchanged from r204591, head/contrib/gdb/gdb/mipsfbsd-nat.c
  user/luigi/ipfw3-head/contrib/gdb/gdb/mipsfbsd-tdep.c
     - copied unchanged from r204591, head/contrib/gdb/gdb/mipsfbsd-tdep.c
  user/luigi/ipfw3-head/contrib/gdb/gdb/mipsfbsd-tdep.h
     - copied unchanged from r204591, head/contrib/gdb/gdb/mipsfbsd-tdep.h
  user/luigi/ipfw3-head/contrib/tzcode/
     - copied from r204591, head/contrib/tzcode/
     - copied from r204591, head/contrib/tzdata/
  user/luigi/ipfw3-head/etc/devd/uath.conf
     - copied unchanged from r204591, head/etc/devd/uath.conf
  user/luigi/ipfw3-head/etc/rc.d/hastd
     - copied unchanged from r204591, head/etc/rc.d/hastd
  user/luigi/ipfw3-head/etc/rc.d/rtsold
     - copied unchanged from r204591, head/etc/rc.d/rtsold
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
     - copied unchanged from r204591, head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
     - copied unchanged from r204591, head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
  user/luigi/ipfw3-head/gnu/usr.bin/dtc/
     - copied from r204591, head/gnu/usr.bin/dtc/
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c
     - copied unchanged from r204591, head/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
     - copied unchanged from r204591, head/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
  user/luigi/ipfw3-head/include/semaphore.h
     - copied unchanged from r204591, head/include/semaphore.h
  user/luigi/ipfw3-head/include/utmpx.h
     - copied unchanged from r204591, head/include/utmpx.h
  user/luigi/ipfw3-head/lib/libc/gen/getutxent.3
     - copied unchanged from r204591, head/lib/libc/gen/getutxent.3
  user/luigi/ipfw3-head/lib/libc/gen/getutxent.c
     - copied unchanged from r204591, head/lib/libc/gen/getutxent.c
  user/luigi/ipfw3-head/lib/libc/gen/pututxline.c
     - copied unchanged from r204591, head/lib/libc/gen/pututxline.c
  user/luigi/ipfw3-head/lib/libc/gen/sem_new.c
     - copied unchanged from r204591, head/lib/libc/gen/sem_new.c
  user/luigi/ipfw3-head/lib/libc/gen/utxdb.c
     - copied unchanged from r204591, head/lib/libc/gen/utxdb.c
  user/luigi/ipfw3-head/lib/libc/gen/utxdb.h
     - copied unchanged from r204591, head/lib/libc/gen/utxdb.h
  user/luigi/ipfw3-head/lib/libc/mips/gen/hardfloat/
     - copied from r204591, head/lib/libc/mips/gen/hardfloat/
  user/luigi/ipfw3-head/lib/libc/stdlib/ql.h
     - copied unchanged from r204591, head/lib/libc/stdlib/ql.h
  user/luigi/ipfw3-head/lib/libc/stdlib/qr.h
     - copied unchanged from r204591, head/lib/libc/stdlib/qr.h
  user/luigi/ipfw3-head/lib/libefi/
     - copied from r204591, head/lib/libefi/
  user/luigi/ipfw3-head/lib/libgpib/gpib.3
     - copied unchanged from r204591, head/lib/libgpib/gpib.3
  user/luigi/ipfw3-head/release/scripts/make-memstick.sh
     - copied unchanged from r204591, head/release/scripts/make-memstick.sh
  user/luigi/ipfw3-head/sbin/geom/class/mountver/
     - copied from r204591, head/sbin/geom/class/mountver/
  user/luigi/ipfw3-head/sbin/hastctl/
     - copied from r204591, head/sbin/hastctl/
  user/luigi/ipfw3-head/sbin/hastd/
     - copied from r204591, head/sbin/hastd/
  user/luigi/ipfw3-head/share/doc/usd/05.dc/
     - copied from r204591, head/share/doc/usd/05.dc/
  user/luigi/ipfw3-head/share/doc/usd/06.bc/
     - copied from r204591, head/share/doc/usd/06.bc/
  user/luigi/ipfw3-head/share/examples/hast/
     - copied from r204591, head/share/examples/hast/
  user/luigi/ipfw3-head/share/man/man3/pthread_affinity_np.3
     - copied unchanged from r204591, head/share/man/man3/pthread_affinity_np.3
  user/luigi/ipfw3-head/share/man/man3/pthread_attr_affinity_np.3
     - copied unchanged from r204591, head/share/man/man3/pthread_attr_affinity_np.3
  user/luigi/ipfw3-head/share/man/man4/alpm.4
     - copied unchanged from r204591, head/share/man/man4/alpm.4
  user/luigi/ipfw3-head/share/man/man4/amdpm.4
     - copied unchanged from r204591, head/share/man/man4/amdpm.4
  user/luigi/ipfw3-head/share/man/man4/bwn.4
     - copied unchanged from r204591, head/share/man/man4/bwn.4
  user/luigi/ipfw3-head/share/man/man4/gpib.4
     - copied unchanged from r204591, head/share/man/man4/gpib.4
  user/luigi/ipfw3-head/share/man/man4/ipwfw.4
     - copied unchanged from r204591, head/share/man/man4/ipwfw.4
  user/luigi/ipfw3-head/share/man/man4/iwifw.4
     - copied unchanged from r204591, head/share/man/man4/iwifw.4
  user/luigi/ipfw3-head/share/man/man4/man4.powerpc/smu.4
     - copied unchanged from r204591, head/share/man/man4/man4.powerpc/smu.4
  user/luigi/ipfw3-head/share/man/man4/mcd.4
     - copied unchanged from r204591, head/share/man/man4/mcd.4
  user/luigi/ipfw3-head/share/man/man4/nvram.4
     - copied unchanged from r204591, head/share/man/man4/nvram.4
  user/luigi/ipfw3-head/share/man/man4/padlock.4
     - copied unchanged from r204591, head/share/man/man4/padlock.4
  user/luigi/ipfw3-head/share/man/man4/pcf.4
     - copied unchanged from r204591, head/share/man/man4/pcf.4
  user/luigi/ipfw3-head/share/man/man4/pcii.4
     - copied unchanged from r204591, head/share/man/man4/pcii.4
  user/luigi/ipfw3-head/share/man/man4/run.4
     - copied unchanged from r204591, head/share/man/man4/run.4
  user/luigi/ipfw3-head/share/man/man4/scd.4
     - copied unchanged from r204591, head/share/man/man4/scd.4
  user/luigi/ipfw3-head/share/man/man4/siba.4
     - copied unchanged from r204591, head/share/man/man4/siba.4
  user/luigi/ipfw3-head/share/man/man4/tnt4882.4
     - copied unchanged from r204591, head/share/man/man4/tnt4882.4
  user/luigi/ipfw3-head/share/man/man4/uhso.4
     - copied unchanged from r204591, head/share/man/man4/uhso.4
  user/luigi/ipfw3-head/share/man/man4/viapm.4
     - copied unchanged from r204591, head/share/man/man4/viapm.4
  user/luigi/ipfw3-head/sys/amd64/amd64/atpic_vector.S
     - copied unchanged from r204591, head/sys/amd64/amd64/atpic_vector.S
  user/luigi/ipfw3-head/sys/boot/efi/libefi/efipart.c
     - copied unchanged from r204591, head/sys/boot/efi/libefi/efipart.c
  user/luigi/ipfw3-head/sys/conf/ldscript.mips.mips64
     - copied unchanged from r204591, head/sys/conf/ldscript.mips.mips64
  user/luigi/ipfw3-head/sys/conf/ldscript.mips.octeon1.32
     - copied unchanged from r204591, head/sys/conf/ldscript.mips.octeon1.32
  user/luigi/ipfw3-head/sys/conf/ldscript.mips.octeon1.64
     - copied unchanged from r204591, head/sys/conf/ldscript.mips.octeon1.64
  user/luigi/ipfw3-head/sys/conf/ldscript.mips.octeon1.n32
     - copied unchanged from r204591, head/sys/conf/ldscript.mips.octeon1.n32
  user/luigi/ipfw3-head/sys/contrib/dev/run/
     - copied from r204591, head/sys/contrib/dev/run/
  user/luigi/ipfw3-head/sys/contrib/libfdt/
     - copied from r204591, head/sys/contrib/libfdt/
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285.c
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285.h
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285.ini
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285.ini
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini
     - copied unchanged from r204591, head/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini
  user/luigi/ipfw3-head/sys/dev/bwn/
     - copied from r204591, head/sys/dev/bwn/
  user/luigi/ipfw3-head/sys/dev/cfe/cfe_env.c
     - copied unchanged from r204591, head/sys/dev/cfe/cfe_env.c
  user/luigi/ipfw3-head/sys/dev/drm/drm_hashtab.c
     - copied unchanged from r204591, head/sys/dev/drm/drm_hashtab.c
  user/luigi/ipfw3-head/sys/dev/drm/drm_hashtab.h
     - copied unchanged from r204591, head/sys/dev/drm/drm_hashtab.h
  user/luigi/ipfw3-head/sys/dev/drm/drm_mm.c
     - copied unchanged from r204591, head/sys/dev/drm/drm_mm.c
  user/luigi/ipfw3-head/sys/dev/drm/drm_mm.h
     - copied unchanged from r204591, head/sys/dev/drm/drm_mm.h
  user/luigi/ipfw3-head/sys/dev/drm/drm_sman.c
     - copied unchanged from r204591, head/sys/dev/drm/drm_sman.c
  user/luigi/ipfw3-head/sys/dev/drm/drm_sman.h
     - copied unchanged from r204591, head/sys/dev/drm/drm_sman.h
  user/luigi/ipfw3-head/sys/dev/drm/via_3d_reg.h
     - copied unchanged from r204591, head/sys/dev/drm/via_3d_reg.h
  user/luigi/ipfw3-head/sys/dev/drm/via_dma.c
     - copied unchanged from r204591, head/sys/dev/drm/via_dma.c
  user/luigi/ipfw3-head/sys/dev/drm/via_dmablit.c
     - copied unchanged from r204591, head/sys/dev/drm/via_dmablit.c
  user/luigi/ipfw3-head/sys/dev/drm/via_dmablit.h
     - copied unchanged from r204591, head/sys/dev/drm/via_dmablit.h
  user/luigi/ipfw3-head/sys/dev/drm/via_drm.h
     - copied unchanged from r204591, head/sys/dev/drm/via_drm.h
  user/luigi/ipfw3-head/sys/dev/drm/via_drv.c
     - copied unchanged from r204591, head/sys/dev/drm/via_drv.c
  user/luigi/ipfw3-head/sys/dev/drm/via_drv.h
     - copied unchanged from r204591, head/sys/dev/drm/via_drv.h
  user/luigi/ipfw3-head/sys/dev/drm/via_irq.c
     - copied unchanged from r204591, head/sys/dev/drm/via_irq.c
  user/luigi/ipfw3-head/sys/dev/drm/via_map.c
     - copied unchanged from r204591, head/sys/dev/drm/via_map.c
  user/luigi/ipfw3-head/sys/dev/drm/via_mm.c
     - copied unchanged from r204591, head/sys/dev/drm/via_mm.c
  user/luigi/ipfw3-head/sys/dev/drm/via_verifier.c
     - copied unchanged from r204591, head/sys/dev/drm/via_verifier.c
  user/luigi/ipfw3-head/sys/dev/drm/via_verifier.h
     - copied unchanged from r204591, head/sys/dev/drm/via_verifier.h
  user/luigi/ipfw3-head/sys/dev/drm/via_video.c
     - copied unchanged from r204591, head/sys/dev/drm/via_video.c
  user/luigi/ipfw3-head/sys/dev/flash/mx25l.c
     - copied unchanged from r204591, head/sys/dev/flash/mx25l.c
  user/luigi/ipfw3-head/sys/dev/flash/mx25lreg.h
     - copied unchanged from r204591, head/sys/dev/flash/mx25lreg.h
  user/luigi/ipfw3-head/sys/dev/ieee488/tnt4882.h
     - copied unchanged from r204591, head/sys/dev/ieee488/tnt4882.h
  user/luigi/ipfw3-head/sys/dev/siba/siba_bwn.c
     - copied unchanged from r204591, head/sys/dev/siba/siba_bwn.c
  user/luigi/ipfw3-head/sys/dev/siba/siba_cc.c
     - copied unchanged from r204591, head/sys/dev/siba/siba_cc.c
  user/luigi/ipfw3-head/sys/dev/siba/siba_core.c
     - copied unchanged from r204591, head/sys/dev/siba/siba_core.c
  user/luigi/ipfw3-head/sys/dev/usb/net/uhso.c
     - copied unchanged from r204591, head/sys/dev/usb/net/uhso.c
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_run.c
     - copied unchanged from r204591, head/sys/dev/usb/wlan/if_run.c
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_runreg.h
     - copied unchanged from r204591, head/sys/dev/usb/wlan/if_runreg.h
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_runvar.h
     - copied unchanged from r204591, head/sys/dev/usb/wlan/if_runvar.h
  user/luigi/ipfw3-head/sys/fs/ext2fs/
     - copied from r204591, head/sys/fs/ext2fs/
  user/luigi/ipfw3-head/sys/geom/mountver/
     - copied from r204591, head/sys/geom/mountver/
  user/luigi/ipfw3-head/sys/i386/i386/atpic_vector.s
     - copied unchanged from r204591, head/sys/i386/i386/atpic_vector.s
  user/luigi/ipfw3-head/sys/ia64/ia64/iodev_machdep.c
     - copied unchanged from r204591, head/sys/ia64/ia64/iodev_machdep.c
  user/luigi/ipfw3-head/sys/ia64/include/iodev.h
     - copied unchanged from r204591, head/sys/ia64/include/iodev.h
  user/luigi/ipfw3-head/sys/kern/kern_gzio.c
     - copied unchanged from r204591, head/sys/kern/kern_gzio.c
  user/luigi/ipfw3-head/sys/kern/subr_hash.c
     - copied unchanged from r204591, head/sys/kern/subr_hash.c
  user/luigi/ipfw3-head/sys/kern/subr_uio.c
     - copied unchanged from r204591, head/sys/kern/subr_uio.c
  user/luigi/ipfw3-head/sys/mips/alchemy/
     - copied from r204591, head/sys/mips/alchemy/
  user/luigi/ipfw3-head/sys/mips/atheros/
     - copied from r204591, head/sys/mips/atheros/
  user/luigi/ipfw3-head/sys/mips/cavium/
     - copied from r204591, head/sys/mips/cavium/
  user/luigi/ipfw3-head/sys/mips/conf/ALCHEMY
     - copied unchanged from r204591, head/sys/mips/conf/ALCHEMY
  user/luigi/ipfw3-head/sys/mips/conf/AR71XX
     - copied unchanged from r204591, head/sys/mips/conf/AR71XX
  user/luigi/ipfw3-head/sys/mips/conf/AR71XX.hints
     - copied unchanged from r204591, head/sys/mips/conf/AR71XX.hints
  user/luigi/ipfw3-head/sys/mips/conf/MALTA64
     - copied unchanged from r204591, head/sys/mips/conf/MALTA64
  user/luigi/ipfw3-head/sys/mips/conf/OCTEON1
     - copied unchanged from r204591, head/sys/mips/conf/OCTEON1
  user/luigi/ipfw3-head/sys/mips/conf/OCTEON1-32
     - copied unchanged from r204591, head/sys/mips/conf/OCTEON1-32
  user/luigi/ipfw3-head/sys/mips/conf/OCTEON1.hints
     - copied unchanged from r204591, head/sys/mips/conf/OCTEON1.hints
  user/luigi/ipfw3-head/sys/mips/conf/SWARM
     - copied unchanged from r204591, head/sys/mips/conf/SWARM
  user/luigi/ipfw3-head/sys/mips/conf/SWARM.hints
     - copied unchanged from r204591, head/sys/mips/conf/SWARM.hints
  user/luigi/ipfw3-head/sys/mips/conf/SWARM_SMP
     - copied unchanged from r204591, head/sys/mips/conf/SWARM_SMP
  user/luigi/ipfw3-head/sys/mips/conf/XLR
     - copied unchanged from r204591, head/sys/mips/conf/XLR
  user/luigi/ipfw3-head/sys/mips/include/cdefs.h
     - copied unchanged from r204591, head/sys/mips/include/cdefs.h
  user/luigi/ipfw3-head/sys/mips/include/fls64.h
     - copied unchanged from r204591, head/sys/mips/include/fls64.h
  user/luigi/ipfw3-head/sys/mips/mips/bus_space_generic.c
     - copied unchanged from r204591, head/sys/mips/mips/bus_space_generic.c
  user/luigi/ipfw3-head/sys/mips/mips/elf_trampoline.c
     - copied unchanged from r204591, head/sys/mips/mips/elf_trampoline.c
  user/luigi/ipfw3-head/sys/mips/mips/inckern.S
     - copied unchanged from r204591, head/sys/mips/mips/inckern.S
  user/luigi/ipfw3-head/sys/mips/mips/mpboot.S
     - copied unchanged from r204591, head/sys/mips/mips/mpboot.S
  user/luigi/ipfw3-head/sys/mips/mips/ptrace_machdep.c
     - copied unchanged from r204591, head/sys/mips/mips/ptrace_machdep.c
  user/luigi/ipfw3-head/sys/mips/mips/sys_machdep.c
     - copied unchanged from r204591, head/sys/mips/mips/sys_machdep.c
  user/luigi/ipfw3-head/sys/mips/rmi/
     - copied from r204591, head/sys/mips/rmi/
  user/luigi/ipfw3-head/sys/mips/sibyte/
     - copied from r204591, head/sys/mips/sibyte/
  user/luigi/ipfw3-head/sys/modules/bwn/
     - copied from r204591, head/sys/modules/bwn/
  user/luigi/ipfw3-head/sys/modules/drm/via/
     - copied from r204591, head/sys/modules/drm/via/
  user/luigi/ipfw3-head/sys/modules/epic/
     - copied from r204591, head/sys/modules/epic/
  user/luigi/ipfw3-head/sys/modules/geom/geom_mountver/
     - copied from r204591, head/sys/modules/geom/geom_mountver/
  user/luigi/ipfw3-head/sys/modules/nfs_common/
     - copied from r204591, head/sys/modules/nfs_common/
  user/luigi/ipfw3-head/sys/modules/runfw/
     - copied from r204591, head/sys/modules/runfw/
  user/luigi/ipfw3-head/sys/modules/siba_bwn/
     - copied from r204591, head/sys/modules/siba_bwn/
  user/luigi/ipfw3-head/sys/modules/usb/run/
     - copied from r204591, head/sys/modules/usb/run/
  user/luigi/ipfw3-head/sys/modules/usb/uhso/
     - copied from r204591, head/sys/modules/usb/uhso/
  user/luigi/ipfw3-head/sys/net/netisr_internal.h
     - copied unchanged from r204591, head/sys/net/netisr_internal.h
  user/luigi/ipfw3-head/sys/net/zutil.h
     - copied unchanged from r204591, head/sys/net/zutil.h
  user/luigi/ipfw3-head/sys/sparc64/ebus/epic.c
     - copied unchanged from r204591, head/sys/sparc64/ebus/epic.c
  user/luigi/ipfw3-head/sys/sparc64/include/cmt.h
     - copied unchanged from r204591, head/sys/sparc64/include/cmt.h
  user/luigi/ipfw3-head/sys/sparc64/include/fireplane.h
     - copied unchanged from r204591, head/sys/sparc64/include/fireplane.h
  user/luigi/ipfw3-head/sys/sparc64/include/jbus.h
     - copied unchanged from r204591, head/sys/sparc64/include/jbus.h
  user/luigi/ipfw3-head/sys/sparc64/include/nexusvar.h
     - copied unchanged from r204591, head/sys/sparc64/include/nexusvar.h
  user/luigi/ipfw3-head/sys/sparc64/sparc64/ssm.c
     - copied unchanged from r204591, head/sys/sparc64/sparc64/ssm.c
  user/luigi/ipfw3-head/sys/sun4v/include/cmt.h
     - copied unchanged from r204591, head/sys/sun4v/include/cmt.h
  user/luigi/ipfw3-head/sys/sun4v/include/fireplane.h
     - copied unchanged from r204591, head/sys/sun4v/include/fireplane.h
  user/luigi/ipfw3-head/sys/sun4v/include/jbus.h
     - copied unchanged from r204591, head/sys/sun4v/include/jbus.h
  user/luigi/ipfw3-head/sys/x86/
     - copied from r204591, head/sys/x86/
  user/luigi/ipfw3-head/tools/regression/bin/sh/expansion/arith3.0
     - copied unchanged from r204591, head/tools/regression/bin/sh/expansion/arith3.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/parameters/mail1.0
     - copied unchanged from r204591, head/tools/regression/bin/sh/parameters/mail1.0
  user/luigi/ipfw3-head/tools/regression/bin/sh/parameters/mail2.0
     - copied unchanged from r204591, head/tools/regression/bin/sh/parameters/mail2.0
  user/luigi/ipfw3-head/tools/regression/kthread/
     - copied from r204591, head/tools/regression/kthread/
  user/luigi/ipfw3-head/tools/regression/posixsem2/
     - copied from r204591, head/tools/regression/posixsem2/
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/sysmk/
     - copied from r204591, head/tools/regression/usr.bin/make/sysmk/
  user/luigi/ipfw3-head/tools/regression/usr.bin/pkill/pgrep-q.t
     - copied unchanged from r204591, head/tools/regression/usr.bin/pkill/pgrep-q.t
  user/luigi/ipfw3-head/tools/tools/mcgrab/
     - copied from r204591, head/tools/tools/mcgrab/
  user/luigi/ipfw3-head/usr.bin/bc/
     - copied from r204591, head/usr.bin/bc/
  user/luigi/ipfw3-head/usr.bin/csup/README
     - copied unchanged from r204591, head/usr.bin/csup/README
  user/luigi/ipfw3-head/usr.bin/csup/TODO
     - copied unchanged from r204591, head/usr.bin/csup/TODO
  user/luigi/ipfw3-head/usr.bin/csup/attrstack.c
     - copied unchanged from r204591, head/usr.bin/csup/attrstack.c
  user/luigi/ipfw3-head/usr.bin/csup/attrstack.h
     - copied unchanged from r204591, head/usr.bin/csup/attrstack.h
  user/luigi/ipfw3-head/usr.bin/csup/auth.c
     - copied unchanged from r204591, head/usr.bin/csup/auth.c
  user/luigi/ipfw3-head/usr.bin/csup/auth.h
     - copied unchanged from r204591, head/usr.bin/csup/auth.h
  user/luigi/ipfw3-head/usr.bin/csup/config.c
     - copied unchanged from r204591, head/usr.bin/csup/config.c
  user/luigi/ipfw3-head/usr.bin/csup/config.h
     - copied unchanged from r204591, head/usr.bin/csup/config.h
  user/luigi/ipfw3-head/usr.bin/csup/cpasswd.1
     - copied unchanged from r204591, head/usr.bin/csup/cpasswd.1
  user/luigi/ipfw3-head/usr.bin/csup/cpasswd.sh
     - copied unchanged from r204591, head/usr.bin/csup/cpasswd.sh
  user/luigi/ipfw3-head/usr.bin/csup/csup.1
     - copied unchanged from r204591, head/usr.bin/csup/csup.1
  user/luigi/ipfw3-head/usr.bin/csup/detailer.c
     - copied unchanged from r204591, head/usr.bin/csup/detailer.c
  user/luigi/ipfw3-head/usr.bin/csup/detailer.h
     - copied unchanged from r204591, head/usr.bin/csup/detailer.h
  user/luigi/ipfw3-head/usr.bin/csup/diff.c
     - copied unchanged from r204591, head/usr.bin/csup/diff.c
  user/luigi/ipfw3-head/usr.bin/csup/diff.h
     - copied unchanged from r204591, head/usr.bin/csup/diff.h
  user/luigi/ipfw3-head/usr.bin/csup/fattr.c
     - copied unchanged from r204591, head/usr.bin/csup/fattr.c
  user/luigi/ipfw3-head/usr.bin/csup/fattr.h
     - copied unchanged from r204591, head/usr.bin/csup/fattr.h
  user/luigi/ipfw3-head/usr.bin/csup/fattr_bsd.h
     - copied unchanged from r204591, head/usr.bin/csup/fattr_bsd.h
  user/luigi/ipfw3-head/usr.bin/csup/fattr_posix.h
     - copied unchanged from r204591, head/usr.bin/csup/fattr_posix.h
  user/luigi/ipfw3-head/usr.bin/csup/fixups.c
     - copied unchanged from r204591, head/usr.bin/csup/fixups.c
  user/luigi/ipfw3-head/usr.bin/csup/fixups.h
     - copied unchanged from r204591, head/usr.bin/csup/fixups.h
  user/luigi/ipfw3-head/usr.bin/csup/fnmatch.c
     - copied unchanged from r204591, head/usr.bin/csup/fnmatch.c
  user/luigi/ipfw3-head/usr.bin/csup/fnmatch.h
     - copied unchanged from r204591, head/usr.bin/csup/fnmatch.h
  user/luigi/ipfw3-head/usr.bin/csup/globtree.c
     - copied unchanged from r204591, head/usr.bin/csup/globtree.c
  user/luigi/ipfw3-head/usr.bin/csup/globtree.h
     - copied unchanged from r204591, head/usr.bin/csup/globtree.h
  user/luigi/ipfw3-head/usr.bin/csup/idcache.c
     - copied unchanged from r204591, head/usr.bin/csup/idcache.c
  user/luigi/ipfw3-head/usr.bin/csup/idcache.h
     - copied unchanged from r204591, head/usr.bin/csup/idcache.h
  user/luigi/ipfw3-head/usr.bin/csup/keyword.c
     - copied unchanged from r204591, head/usr.bin/csup/keyword.c
  user/luigi/ipfw3-head/usr.bin/csup/keyword.h
     - copied unchanged from r204591, head/usr.bin/csup/keyword.h
  user/luigi/ipfw3-head/usr.bin/csup/lex.rcs.c
     - copied unchanged from r204591, head/usr.bin/csup/lex.rcs.c
  user/luigi/ipfw3-head/usr.bin/csup/lister.c
     - copied unchanged from r204591, head/usr.bin/csup/lister.c
  user/luigi/ipfw3-head/usr.bin/csup/lister.h
     - copied unchanged from r204591, head/usr.bin/csup/lister.h
  user/luigi/ipfw3-head/usr.bin/csup/main.c
     - copied unchanged from r204591, head/usr.bin/csup/main.c
  user/luigi/ipfw3-head/usr.bin/csup/main.h
     - copied unchanged from r204591, head/usr.bin/csup/main.h
  user/luigi/ipfw3-head/usr.bin/csup/misc.c
     - copied unchanged from r204591, head/usr.bin/csup/misc.c
  user/luigi/ipfw3-head/usr.bin/csup/misc.h
     - copied unchanged from r204591, head/usr.bin/csup/misc.h
  user/luigi/ipfw3-head/usr.bin/csup/mux.c
     - copied unchanged from r204591, head/usr.bin/csup/mux.c
  user/luigi/ipfw3-head/usr.bin/csup/mux.h
     - copied unchanged from r204591, head/usr.bin/csup/mux.h
  user/luigi/ipfw3-head/usr.bin/csup/parse.y
     - copied unchanged from r204591, head/usr.bin/csup/parse.y
  user/luigi/ipfw3-head/usr.bin/csup/pathcomp.c
     - copied unchanged from r204591, head/usr.bin/csup/pathcomp.c
  user/luigi/ipfw3-head/usr.bin/csup/pathcomp.h
     - copied unchanged from r204591, head/usr.bin/csup/pathcomp.h
  user/luigi/ipfw3-head/usr.bin/csup/proto.c
     - copied unchanged from r204591, head/usr.bin/csup/proto.c
  user/luigi/ipfw3-head/usr.bin/csup/proto.h
     - copied unchanged from r204591, head/usr.bin/csup/proto.h
  user/luigi/ipfw3-head/usr.bin/csup/queue.h
     - copied unchanged from r204591, head/usr.bin/csup/queue.h
  user/luigi/ipfw3-head/usr.bin/csup/rcsfile.c
     - copied unchanged from r204591, head/usr.bin/csup/rcsfile.c
  user/luigi/ipfw3-head/usr.bin/csup/rcsfile.h
     - copied unchanged from r204591, head/usr.bin/csup/rcsfile.h
  user/luigi/ipfw3-head/usr.bin/csup/rcsparse.c
     - copied unchanged from r204591, head/usr.bin/csup/rcsparse.c
  user/luigi/ipfw3-head/usr.bin/csup/rcsparse.h
     - copied unchanged from r204591, head/usr.bin/csup/rcsparse.h
  user/luigi/ipfw3-head/usr.bin/csup/rcstokenizer.h
     - copied unchanged from r204591, head/usr.bin/csup/rcstokenizer.h
  user/luigi/ipfw3-head/usr.bin/csup/rcstokenizer.l
     - copied unchanged from r204591, head/usr.bin/csup/rcstokenizer.l
  user/luigi/ipfw3-head/usr.bin/csup/rsyncfile.c
     - copied unchanged from r204591, head/usr.bin/csup/rsyncfile.c
  user/luigi/ipfw3-head/usr.bin/csup/rsyncfile.h
     - copied unchanged from r204591, head/usr.bin/csup/rsyncfile.h
  user/luigi/ipfw3-head/usr.bin/csup/status.c
     - copied unchanged from r204591, head/usr.bin/csup/status.c
  user/luigi/ipfw3-head/usr.bin/csup/status.h
     - copied unchanged from r204591, head/usr.bin/csup/status.h
  user/luigi/ipfw3-head/usr.bin/csup/stream.c
     - copied unchanged from r204591, head/usr.bin/csup/stream.c
  user/luigi/ipfw3-head/usr.bin/csup/stream.h
     - copied unchanged from r204591, head/usr.bin/csup/stream.h
  user/luigi/ipfw3-head/usr.bin/csup/threads.c
     - copied unchanged from r204591, head/usr.bin/csup/threads.c
  user/luigi/ipfw3-head/usr.bin/csup/threads.h
     - copied unchanged from r204591, head/usr.bin/csup/threads.h
  user/luigi/ipfw3-head/usr.bin/csup/token.h
     - copied unchanged from r204591, head/usr.bin/csup/token.h
  user/luigi/ipfw3-head/usr.bin/csup/token.l
     - copied unchanged from r204591, head/usr.bin/csup/token.l
  user/luigi/ipfw3-head/usr.bin/csup/updater.c
     - copied unchanged from r204591, head/usr.bin/csup/updater.c
  user/luigi/ipfw3-head/usr.bin/csup/updater.h
     - copied unchanged from r204591, head/usr.bin/csup/updater.h
  user/luigi/ipfw3-head/usr.bin/dc/
     - copied from r204591, head/usr.bin/dc/
  user/luigi/ipfw3-head/usr.bin/ee/nls/pt_BR.ISO8859-1/
     - copied from r204591, head/usr.bin/ee/nls/pt_BR.ISO8859-1/
  user/luigi/ipfw3-head/usr.bin/netstat/netisr.c
     - copied unchanged from r204591, head/usr.bin/netstat/netisr.c
  user/luigi/ipfw3-head/usr.bin/seq/
     - copied from r204591, head/usr.bin/seq/
  user/luigi/ipfw3-head/usr.bin/tar/err.c
     - copied unchanged from r204591, head/usr.bin/tar/err.c
  user/luigi/ipfw3-head/usr.bin/tar/err.h
     - copied unchanged from r204591, head/usr.bin/tar/err.h
  user/luigi/ipfw3-head/usr.bin/tar/line_reader.c
     - copied unchanged from r204591, head/usr.bin/tar/line_reader.c
  user/luigi/ipfw3-head/usr.bin/tar/line_reader.h
     - copied unchanged from r204591, head/usr.bin/tar/line_reader.h
  user/luigi/ipfw3-head/usr.bin/tar/matching.h
     - copied unchanged from r204591, head/usr.bin/tar/matching.h
  user/luigi/ipfw3-head/usr.bin/tar/pathmatch.c
     - copied unchanged from r204591, head/usr.bin/tar/pathmatch.c
  user/luigi/ipfw3-head/usr.bin/tar/pathmatch.h
     - copied unchanged from r204591, head/usr.bin/tar/pathmatch.h
  user/luigi/ipfw3-head/usr.bin/wtmpcvt/
     - copied from r204591, head/usr.bin/wtmpcvt/
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_annotate.c
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_annotate.c
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_annotate.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_annotate.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_callgraph.c
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_callgraph.c
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_callgraph.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_callgraph.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_calltree.c
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_calltree.c
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_calltree.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_calltree.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_gprof.c
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_gprof.c
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcpl_gprof.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcpl_gprof.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat_log.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcstat_log.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat_top.h
     - copied unchanged from r204591, head/usr.sbin/pmcstat/pmcstat_top.h
  user/luigi/ipfw3-head/usr.sbin/traceroute/findsaddr-udp.c
     - copied unchanged from r204591, head/usr.sbin/traceroute/findsaddr-udp.c
  user/luigi/ipfw3-head/usr.sbin/uhsoctl/
     - copied from r204591, head/usr.sbin/uhsoctl/
Directory Properties:
  user/luigi/ipfw3-head/contrib/tzdata/   (props changed)
Replaced:
  user/luigi/ipfw3-head/usr.bin/csup/Makefile
     - copied unchanged from r204591, head/usr.bin/csup/Makefile
Deleted:
  user/luigi/ipfw3-head/contrib/bc/
  user/luigi/ipfw3-head/contrib/csup/
  user/luigi/ipfw3-head/contrib/one-true-awk/mac.code
  user/luigi/ipfw3-head/gnu/usr.bin/bc/
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/gdb/Makefile.alpha
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/ld/Makefile.alpha
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/libbfd/Makefile.alpha
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
  user/luigi/ipfw3-head/gnu/usr.bin/dc/
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpgetmask.c
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpgetround.c
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpgetsticky.c
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpsetmask.c
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpsetround.c
  user/luigi/ipfw3-head/lib/libc/mips/gen/fpsetsticky.c
  user/luigi/ipfw3-head/lib/libc/stdtime/asctime.c
  user/luigi/ipfw3-head/lib/libc/stdtime/ctime.3
  user/luigi/ipfw3-head/lib/libc/stdtime/difftime.c
  user/luigi/ipfw3-head/lib/libc/stdtime/localtime.c
  user/luigi/ipfw3-head/lib/libc/stdtime/private.h
  user/luigi/ipfw3-head/lib/libc/stdtime/time2posix.3
  user/luigi/ipfw3-head/lib/libc/stdtime/tzfile.5
  user/luigi/ipfw3-head/lib/libc/stdtime/tzfile.h
  user/luigi/ipfw3-head/lib/libulog/ulog_getutxent.3
  user/luigi/ipfw3-head/lib/libulog/ulog_getutxent.c
  user/luigi/ipfw3-head/lib/libulog/ulog_internal.h
  user/luigi/ipfw3-head/lib/libulog/ulog_pututxline.c
  user/luigi/ipfw3-head/lib/libulog/ulog_setutxfile.3
  user/luigi/ipfw3-head/lib/libulog/ulog_util.c
  user/luigi/ipfw3-head/lib/libutil/login.3
  user/luigi/ipfw3-head/lib/libutil/login.c
  user/luigi/ipfw3-head/lib/libutil/logout.3
  user/luigi/ipfw3-head/lib/libutil/logout.c
  user/luigi/ipfw3-head/lib/libutil/logwtmp.3
  user/luigi/ipfw3-head/lib/libutil/logwtmp.c
  user/luigi/ipfw3-head/share/man/man4/man4.i386/alpm.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/amdpm.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/mcd.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/padlock.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/pcf.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/scd.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/viapm.4
  user/luigi/ipfw3-head/share/man/man5/utmp.5
  user/luigi/ipfw3-head/share/zoneinfo/africa
  user/luigi/ipfw3-head/share/zoneinfo/antarctica
  user/luigi/ipfw3-head/share/zoneinfo/asia
  user/luigi/ipfw3-head/share/zoneinfo/australasia
  user/luigi/ipfw3-head/share/zoneinfo/backward
  user/luigi/ipfw3-head/share/zoneinfo/etcetera
  user/luigi/ipfw3-head/share/zoneinfo/europe
  user/luigi/ipfw3-head/share/zoneinfo/factory
  user/luigi/ipfw3-head/share/zoneinfo/leapseconds
  user/luigi/ipfw3-head/share/zoneinfo/northamerica
  user/luigi/ipfw3-head/share/zoneinfo/pacificnew
  user/luigi/ipfw3-head/share/zoneinfo/southamerica
  user/luigi/ipfw3-head/share/zoneinfo/systemv
  user/luigi/ipfw3-head/share/zoneinfo/yearistype.sh
  user/luigi/ipfw3-head/share/zoneinfo/zone.tab
  user/luigi/ipfw3-head/sys/amd64/isa/
  user/luigi/ipfw3-head/sys/boot/efi/libefi/efifs.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h
  user/luigi/ipfw3-head/sys/dev/cxgb/common/cxgb_version.h
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_config.h
  user/luigi/ipfw3-head/sys/gnu/fs/ext2fs/
  user/luigi/ipfw3-head/sys/i386/bios/smbios.c
  user/luigi/ipfw3-head/sys/i386/bios/vpd.c
  user/luigi/ipfw3-head/sys/i386/cpufreq/
  user/luigi/ipfw3-head/sys/i386/isa/atpic.c
  user/luigi/ipfw3-head/sys/i386/isa/atpic_vector.s
  user/luigi/ipfw3-head/sys/i386/isa/clock.c
  user/luigi/ipfw3-head/sys/i386/isa/elcr.c
  user/luigi/ipfw3-head/sys/i386/isa/icu.h
  user/luigi/ipfw3-head/sys/i386/isa/isa.c
  user/luigi/ipfw3-head/sys/i386/isa/isa.h
  user/luigi/ipfw3-head/sys/i386/isa/isa_dma.c
  user/luigi/ipfw3-head/sys/i386/isa/nmi.c
  user/luigi/ipfw3-head/sys/ia64/include/sapicreg.h
  user/luigi/ipfw3-head/sys/ia64/include/sapicvar.h
  user/luigi/ipfw3-head/sys/isa/atrtc.c
  user/luigi/ipfw3-head/sys/isa/orm.c
  user/luigi/ipfw3-head/sys/kern/kern_subr.c
  user/luigi/ipfw3-head/sys/mips/include/bus_octeon.h
  user/luigi/ipfw3-head/sys/mips/include/intr.h
  user/luigi/ipfw3-head/sys/mips/include/pltfm.h
  user/luigi/ipfw3-head/sys/mips/sentry5/siba_cc.c
  user/luigi/ipfw3-head/sys/mips/sentry5/siba_mips.c
  user/luigi/ipfw3-head/sys/mips/sentry5/siba_sdram.c
  user/luigi/ipfw3-head/sys/sys/semaphore.h
  user/luigi/ipfw3-head/tools/tools/mctest/mcgrab.1
  user/luigi/ipfw3-head/tools/tools/mctest/mcgrab.cc
  user/luigi/ipfw3-head/usr.bin/awk/b.c.diff
  user/luigi/ipfw3-head/usr.bin/awk/main.c.diff
  user/luigi/ipfw3-head/usr.bin/awk/run.c.diff
  user/luigi/ipfw3-head/usr.bin/tar/siginfo.c
  user/luigi/ipfw3-head/usr.sbin/zic/Theory
  user/luigi/ipfw3-head/usr.sbin/zic/ialloc.c
  user/luigi/ipfw3-head/usr.sbin/zic/private.h
  user/luigi/ipfw3-head/usr.sbin/zic/scheck.c
  user/luigi/ipfw3-head/usr.sbin/zic/zdump.8
  user/luigi/ipfw3-head/usr.sbin/zic/zdump.c
  user/luigi/ipfw3-head/usr.sbin/zic/zic.8
  user/luigi/ipfw3-head/usr.sbin/zic/zic.c
Modified:
  user/luigi/ipfw3-head/MAINTAINERS
  user/luigi/ipfw3-head/Makefile
  user/luigi/ipfw3-head/Makefile.inc1
  user/luigi/ipfw3-head/ObsoleteFiles.inc
  user/luigi/ipfw3-head/UPDATING
  user/luigi/ipfw3-head/bin/cp/cp.1
  user/luigi/ipfw3-head/bin/cp/cp.c
  user/luigi/ipfw3-head/bin/cp/utils.c
  user/luigi/ipfw3-head/bin/csh/config.h
  user/luigi/ipfw3-head/bin/csh/config_p.h
  user/luigi/ipfw3-head/bin/date/Makefile
  user/luigi/ipfw3-head/bin/date/date.1
  user/luigi/ipfw3-head/bin/date/date.c
  user/luigi/ipfw3-head/bin/kill/kill.c
  user/luigi/ipfw3-head/bin/ls/ls.c
  user/luigi/ipfw3-head/bin/ls/ls.h
  user/luigi/ipfw3-head/bin/ls/print.c
  user/luigi/ipfw3-head/bin/pax/Makefile
  user/luigi/ipfw3-head/bin/pax/cpio.h
  user/luigi/ipfw3-head/bin/pax/gen_subs.c
  user/luigi/ipfw3-head/bin/pax/tar.h
  user/luigi/ipfw3-head/bin/pkill/Makefile
  user/luigi/ipfw3-head/bin/pkill/pkill.1
  user/luigi/ipfw3-head/bin/pkill/pkill.c
  user/luigi/ipfw3-head/bin/ps/ps.c
  user/luigi/ipfw3-head/bin/rmail/Makefile
  user/luigi/ipfw3-head/bin/sh/main.c
  user/luigi/ipfw3-head/bin/sh/parser.c
  user/luigi/ipfw3-head/bin/sh/var.c
  user/luigi/ipfw3-head/cddl/usr.bin/ctfconvert/Makefile
  user/luigi/ipfw3-head/cddl/usr.bin/ctfdump/Makefile
  user/luigi/ipfw3-head/cddl/usr.bin/ctfmerge/Makefile
  user/luigi/ipfw3-head/cddl/usr.bin/zinject/Makefile
  user/luigi/ipfw3-head/cddl/usr.sbin/dtrace/Makefile
  user/luigi/ipfw3-head/cddl/usr.sbin/lockstat/Makefile
  user/luigi/ipfw3-head/contrib/bind9/CHANGES
  user/luigi/ipfw3-head/contrib/bind9/FAQ
  user/luigi/ipfw3-head/contrib/bind9/FAQ.xml
  user/luigi/ipfw3-head/contrib/bind9/bin/dnssec/dnssec-signzone.8
  user/luigi/ipfw3-head/contrib/bind9/bin/dnssec/dnssec-signzone.html
  user/luigi/ipfw3-head/contrib/bind9/bin/named/query.c
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/Bv9ARM.pdf
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.dnssec-signzone.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.named-checkconf.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.named-checkzone.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.named.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.nsupdate.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.rndc-confgen.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.rndc.conf.html
  user/luigi/ipfw3-head/contrib/bind9/doc/arm/man.rndc.html
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/include/dns/db.h
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/include/dns/ncache.h
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/include/dns/types.h
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/rbtdb.c
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/resolver.c
  user/luigi/ipfw3-head/contrib/bind9/lib/dns/validator.c
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_buffer.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_config.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_context.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_gabn.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_gnba.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_noop.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_packet.html
  user/luigi/ipfw3-head/contrib/bind9/lib/lwres/man/lwres_resutil.html
  user/luigi/ipfw3-head/contrib/bind9/version
  user/luigi/ipfw3-head/contrib/gcc/config/mips/freebsd.h
  user/luigi/ipfw3-head/contrib/gdb/gdb/mips-tdep.h
  user/luigi/ipfw3-head/contrib/groff/font/devutf8/R.proto
  user/luigi/ipfw3-head/contrib/groff/tmac/an-old.tmac
  user/luigi/ipfw3-head/contrib/groff/tmac/doc-common
  user/luigi/ipfw3-head/contrib/groff/tmac/doc-old.tmac
  user/luigi/ipfw3-head/contrib/groff/tmac/doc-syms
  user/luigi/ipfw3-head/contrib/groff/tmac/doc.tmac
  user/luigi/ipfw3-head/contrib/groff/tmac/groff_mdoc.man
  user/luigi/ipfw3-head/contrib/libpcap/inet.c
  user/luigi/ipfw3-head/contrib/netcat/FREEBSD-vendor
  user/luigi/ipfw3-head/contrib/netcat/nc.1
  user/luigi/ipfw3-head/contrib/netcat/netcat.c
  user/luigi/ipfw3-head/contrib/one-true-awk/FIXES
  user/luigi/ipfw3-head/contrib/one-true-awk/b.c
  user/luigi/ipfw3-head/contrib/one-true-awk/lib.c
  user/luigi/ipfw3-head/contrib/one-true-awk/main.c
  user/luigi/ipfw3-head/contrib/one-true-awk/makefile
  user/luigi/ipfw3-head/contrib/one-true-awk/maketab.c
  user/luigi/ipfw3-head/contrib/one-true-awk/proctab.c
  user/luigi/ipfw3-head/contrib/one-true-awk/proto.h
  user/luigi/ipfw3-head/contrib/one-true-awk/run.c
  user/luigi/ipfw3-head/contrib/opie/libopie/getutmpentry.c
  user/luigi/ipfw3-head/contrib/opie/libopie/insecure.c
  user/luigi/ipfw3-head/contrib/opie/libopie/login.c
  user/luigi/ipfw3-head/contrib/sendmail/CACerts
  user/luigi/ipfw3-head/contrib/sendmail/FREEBSD-upgrade
  user/luigi/ipfw3-head/contrib/sendmail/LICENSE
  user/luigi/ipfw3-head/contrib/sendmail/PGPKEYS
  user/luigi/ipfw3-head/contrib/sendmail/README
  user/luigi/ipfw3-head/contrib/sendmail/RELEASE_NOTES
  user/luigi/ipfw3-head/contrib/sendmail/cf/README
  user/luigi/ipfw3-head/contrib/sendmail/cf/cf/submit.cf
  user/luigi/ipfw3-head/contrib/sendmail/cf/feature/ldap_routing.m4
  user/luigi/ipfw3-head/contrib/sendmail/cf/m4/cfhead.m4
  user/luigi/ipfw3-head/contrib/sendmail/cf/m4/proto.m4
  user/luigi/ipfw3-head/contrib/sendmail/cf/m4/version.m4
  user/luigi/ipfw3-head/contrib/sendmail/contrib/qtool.pl
  user/luigi/ipfw3-head/contrib/sendmail/contrib/smcontrol.pl
  user/luigi/ipfw3-head/contrib/sendmail/doc/op/op.me
  user/luigi/ipfw3-head/contrib/sendmail/include/libmilter/mfapi.h
  user/luigi/ipfw3-head/contrib/sendmail/include/libmilter/mfdef.h
  user/luigi/ipfw3-head/contrib/sendmail/include/sm/conf.h
  user/luigi/ipfw3-head/contrib/sendmail/include/sm/ldap.h
  user/luigi/ipfw3-head/contrib/sendmail/include/sm/sem.h
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/Makefile.m4
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/comm.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/docs/api.html
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/docs/overview.html
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/docs/smfi_addheader.html
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/docs/smfi_chgheader.html
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/docs/smfi_insheader.html
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/engine.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/example.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/handler.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/libmilter.h
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/listener.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/main.c
  user/luigi/ipfw3-head/contrib/sendmail/libmilter/worker.c
  user/luigi/ipfw3-head/contrib/sendmail/libsm/debug.c
  user/luigi/ipfw3-head/contrib/sendmail/libsm/ldap.c
  user/luigi/ipfw3-head/contrib/sendmail/libsm/mbdb.c
  user/luigi/ipfw3-head/contrib/sendmail/libsm/sem.c
  user/luigi/ipfw3-head/contrib/sendmail/libsm/t-sem.c
  user/luigi/ipfw3-head/contrib/sendmail/libsmdb/smdb1.c
  user/luigi/ipfw3-head/contrib/sendmail/libsmdb/smdb2.c
  user/luigi/ipfw3-head/contrib/sendmail/libsmutil/safefile.c
  user/luigi/ipfw3-head/contrib/sendmail/praliases/praliases.8
  user/luigi/ipfw3-head/contrib/sendmail/praliases/praliases.c
  user/luigi/ipfw3-head/contrib/sendmail/src/Makefile.m4
  user/luigi/ipfw3-head/contrib/sendmail/src/README
  user/luigi/ipfw3-head/contrib/sendmail/src/TRACEFLAGS
  user/luigi/ipfw3-head/contrib/sendmail/src/collect.c
  user/luigi/ipfw3-head/contrib/sendmail/src/conf.c
  user/luigi/ipfw3-head/contrib/sendmail/src/conf.h
  user/luigi/ipfw3-head/contrib/sendmail/src/daemon.c
  user/luigi/ipfw3-head/contrib/sendmail/src/deliver.c
  user/luigi/ipfw3-head/contrib/sendmail/src/envelope.c
  user/luigi/ipfw3-head/contrib/sendmail/src/headers.c
  user/luigi/ipfw3-head/contrib/sendmail/src/main.c
  user/luigi/ipfw3-head/contrib/sendmail/src/map.c
  user/luigi/ipfw3-head/contrib/sendmail/src/milter.c
  user/luigi/ipfw3-head/contrib/sendmail/src/queue.c
  user/luigi/ipfw3-head/contrib/sendmail/src/ratectrl.c
  user/luigi/ipfw3-head/contrib/sendmail/src/readcf.c
  user/luigi/ipfw3-head/contrib/sendmail/src/savemail.c
  user/luigi/ipfw3-head/contrib/sendmail/src/sendmail.8
  user/luigi/ipfw3-head/contrib/sendmail/src/sendmail.h
  user/luigi/ipfw3-head/contrib/sendmail/src/sfsasl.c
  user/luigi/ipfw3-head/contrib/sendmail/src/srvrsmtp.c
  user/luigi/ipfw3-head/contrib/sendmail/src/tls.c
  user/luigi/ipfw3-head/contrib/sendmail/src/usersmtp.c
  user/luigi/ipfw3-head/contrib/sendmail/src/util.c
  user/luigi/ipfw3-head/contrib/sendmail/src/version.c
  user/luigi/ipfw3-head/contrib/sendmail/vacation/vacation.c
  user/luigi/ipfw3-head/contrib/smbfs/smbutil/view.c
  user/luigi/ipfw3-head/contrib/tcp_wrappers/hosts_access.c
  user/luigi/ipfw3-head/contrib/telnet/telnetd/sys_term.c
  user/luigi/ipfw3-head/contrib/telnet/telnetd/telnetd.c
  user/luigi/ipfw3-head/crypto/openssh/config.h
  user/luigi/ipfw3-head/crypto/openssh/defines.h
  user/luigi/ipfw3-head/crypto/openssh/loginrec.c
  user/luigi/ipfw3-head/crypto/openssh/sshd.c
  user/luigi/ipfw3-head/etc/defaults/devfs.rules
  user/luigi/ipfw3-head/etc/defaults/rc.conf
  user/luigi/ipfw3-head/etc/devd/Makefile
  user/luigi/ipfw3-head/etc/etc.amd64/ttys
  user/luigi/ipfw3-head/etc/etc.arm/ttys
  user/luigi/ipfw3-head/etc/etc.i386/ttys
  user/luigi/ipfw3-head/etc/etc.ia64/ttys
  user/luigi/ipfw3-head/etc/etc.mips/ttys
  user/luigi/ipfw3-head/etc/etc.pc98/ttys
  user/luigi/ipfw3-head/etc/etc.powerpc/ttys
  user/luigi/ipfw3-head/etc/etc.sparc64/ttys
  user/luigi/ipfw3-head/etc/mtree/BSD.include.dist
  user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist
  user/luigi/ipfw3-head/etc/namedb/named.conf
  user/luigi/ipfw3-head/etc/network.subr
  user/luigi/ipfw3-head/etc/newsyslog.conf
  user/luigi/ipfw3-head/etc/periodic/monthly/200.accounting
  user/luigi/ipfw3-head/etc/ppp/ppp.conf
  user/luigi/ipfw3-head/etc/rc.d/Makefile
  user/luigi/ipfw3-head/etc/rc.d/cleanvar
  user/luigi/ipfw3-head/etc/rc.d/devfs
  user/luigi/ipfw3-head/etc/rc.d/ipfw
  user/luigi/ipfw3-head/etc/rc.d/ntpdate
  user/luigi/ipfw3-head/etc/rc.d/var
  user/luigi/ipfw3-head/etc/rc.firewall
  user/luigi/ipfw3-head/etc/rc.subr
  user/luigi/ipfw3-head/etc/sendmail/freebsd.mc
  user/luigi/ipfw3-head/etc/sendmail/freebsd.submit.mc
  user/luigi/ipfw3-head/etc/services
  user/luigi/ipfw3-head/etc/termcap.small
  user/luigi/ipfw3-head/games/Makefile.inc
  user/luigi/ipfw3-head/games/bcd/Makefile
  user/luigi/ipfw3-head/games/bcd/bcd.c
  user/luigi/ipfw3-head/games/caesar/Makefile
  user/luigi/ipfw3-head/games/caesar/caesar.c
  user/luigi/ipfw3-head/games/fortune/datfiles/fortunes
  user/luigi/ipfw3-head/games/fortune/datfiles/fortunes-o.real
  user/luigi/ipfw3-head/games/fortune/datfiles/freebsd-tips
  user/luigi/ipfw3-head/games/fortune/fortune/Makefile
  user/luigi/ipfw3-head/games/fortune/fortune/fortune.6
  user/luigi/ipfw3-head/games/fortune/fortune/fortune.c
  user/luigi/ipfw3-head/games/fortune/fortune/pathnames.h
  user/luigi/ipfw3-head/games/fortune/strfile/Makefile
  user/luigi/ipfw3-head/games/fortune/strfile/strfile.8
  user/luigi/ipfw3-head/games/fortune/strfile/strfile.c
  user/luigi/ipfw3-head/games/fortune/strfile/strfile.h
  user/luigi/ipfw3-head/games/fortune/unstr/Makefile
  user/luigi/ipfw3-head/games/fortune/unstr/unstr.c
  user/luigi/ipfw3-head/games/grdc/Makefile
  user/luigi/ipfw3-head/games/grdc/grdc.c
  user/luigi/ipfw3-head/games/morse/Makefile
  user/luigi/ipfw3-head/games/morse/morse.c
  user/luigi/ipfw3-head/games/number/Makefile
  user/luigi/ipfw3-head/games/number/number.c
  user/luigi/ipfw3-head/games/pom/Makefile
  user/luigi/ipfw3-head/games/pom/pom.6
  user/luigi/ipfw3-head/games/pom/pom.c
  user/luigi/ipfw3-head/games/ppt/Makefile
  user/luigi/ipfw3-head/games/ppt/ppt.c
  user/luigi/ipfw3-head/games/primes/pattern.c
  user/luigi/ipfw3-head/games/primes/pr_tbl.c
  user/luigi/ipfw3-head/games/primes/primes.c
  user/luigi/ipfw3-head/games/primes/primes.h
  user/luigi/ipfw3-head/games/random/Makefile
  user/luigi/ipfw3-head/games/random/random.c
  user/luigi/ipfw3-head/gnu/lib/libgcc/Makefile
  user/luigi/ipfw3-head/gnu/lib/libstdc++/Makefile
  user/luigi/ipfw3-head/gnu/lib/libsupc++/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/Makefile.inc
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/Makefile.inc0
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/ld/Makefile.mips
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/ld/genscripts.sh
  user/luigi/ipfw3-head/gnu/usr.bin/binutils/libbfd/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/cc/Makefile.tgt
  user/luigi/ipfw3-head/gnu/usr.bin/diff/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/diff3/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/arch/ia64/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/arch/ia64/init.c
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/arch/mips/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/arch/mips/init.c
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/gdbserver/Makefile
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/kgdb/kthr.c
  user/luigi/ipfw3-head/gnu/usr.bin/gdb/kgdb/trgt_mips.c
  user/luigi/ipfw3-head/gnu/usr.bin/groff/tmac/mdoc.local
  user/luigi/ipfw3-head/gnu/usr.bin/sdiff/Makefile
  user/luigi/ipfw3-head/include/Makefile
  user/luigi/ipfw3-head/include/_ctype.h
  user/luigi/ipfw3-head/include/a.out.h
  user/luigi/ipfw3-head/include/ar.h
  user/luigi/ipfw3-head/include/arpa/ftp.h
  user/luigi/ipfw3-head/include/arpa/inet.h
  user/luigi/ipfw3-head/include/arpa/nameser.h
  user/luigi/ipfw3-head/include/arpa/nameser_compat.h
  user/luigi/ipfw3-head/include/arpa/telnet.h
  user/luigi/ipfw3-head/include/arpa/tftp.h
  user/luigi/ipfw3-head/include/assert.h
  user/luigi/ipfw3-head/include/ctype.h
  user/luigi/ipfw3-head/include/db.h
  user/luigi/ipfw3-head/include/dirent.h
  user/luigi/ipfw3-head/include/dlfcn.h
  user/luigi/ipfw3-head/include/err.h
  user/luigi/ipfw3-head/include/fnmatch.h
  user/luigi/ipfw3-head/include/fstab.h
  user/luigi/ipfw3-head/include/fts.h
  user/luigi/ipfw3-head/include/getopt.h
  user/luigi/ipfw3-head/include/glob.h
  user/luigi/ipfw3-head/include/grp.h
  user/luigi/ipfw3-head/include/hesiod.h
  user/luigi/ipfw3-head/include/limits.h
  user/luigi/ipfw3-head/include/locale.h
  user/luigi/ipfw3-head/include/memory.h
  user/luigi/ipfw3-head/include/mpool.h
  user/luigi/ipfw3-head/include/ndbm.h
  user/luigi/ipfw3-head/include/netdb.h
  user/luigi/ipfw3-head/include/nl_types.h
  user/luigi/ipfw3-head/include/nlist.h
  user/luigi/ipfw3-head/include/nsswitch.h
  user/luigi/ipfw3-head/include/paths.h
  user/luigi/ipfw3-head/include/protocols/dumprestore.h
  user/luigi/ipfw3-head/include/protocols/routed.h
  user/luigi/ipfw3-head/include/protocols/rwhod.h
  user/luigi/ipfw3-head/include/protocols/talkd.h
  user/luigi/ipfw3-head/include/protocols/timed.h
  user/luigi/ipfw3-head/include/pwd.h
  user/luigi/ipfw3-head/include/ranlib.h
  user/luigi/ipfw3-head/include/regex.h
  user/luigi/ipfw3-head/include/regexp.h
  user/luigi/ipfw3-head/include/resolv.h
  user/luigi/ipfw3-head/include/runetype.h
  user/luigi/ipfw3-head/include/setjmp.h
  user/luigi/ipfw3-head/include/signal.h
  user/luigi/ipfw3-head/include/stab.h
  user/luigi/ipfw3-head/include/stddef.h
  user/luigi/ipfw3-head/include/stdio.h
  user/luigi/ipfw3-head/include/stdlib.h
  user/luigi/ipfw3-head/include/string.h
  user/luigi/ipfw3-head/include/strings.h
  user/luigi/ipfw3-head/include/sysexits.h
  user/luigi/ipfw3-head/include/tar.h
  user/luigi/ipfw3-head/include/termios.h
  user/luigi/ipfw3-head/include/time.h
  user/luigi/ipfw3-head/include/timeconv.h
  user/luigi/ipfw3-head/include/ttyent.h
  user/luigi/ipfw3-head/include/unistd.h
  user/luigi/ipfw3-head/include/utime.h
  user/luigi/ipfw3-head/include/utmp.h
  user/luigi/ipfw3-head/include/vis.h
  user/luigi/ipfw3-head/include/wchar.h
  user/luigi/ipfw3-head/kerberos5/usr.bin/kdestroy/Makefile
  user/luigi/ipfw3-head/kerberos5/usr.bin/kpasswd/Makefile
  user/luigi/ipfw3-head/lib/Makefile
  user/luigi/ipfw3-head/lib/bind/dns/code.h
  user/luigi/ipfw3-head/lib/bind/dns/dns/enumclass.h
  user/luigi/ipfw3-head/lib/bind/dns/dns/enumtype.h
  user/luigi/ipfw3-head/lib/bind/dns/dns/rdatastruct.h
  user/luigi/ipfw3-head/lib/libarchive/archive_entry_link_resolver.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_disk_entry_from_file.c
  user/luigi/ipfw3-head/lib/libarchive/archive_read_support_format_iso9660.c
  user/luigi/ipfw3-head/lib/libarchive/archive_write_disk.3
  user/luigi/ipfw3-head/lib/libarchive/archive_write_set_format_zip.c
  user/luigi/ipfw3-head/lib/libbsnmp/Makefile.inc
  user/luigi/ipfw3-head/lib/libbsnmp/libbsnmp/Makefile
  user/luigi/ipfw3-head/lib/libc/Makefile
  user/luigi/ipfw3-head/lib/libc/gen/Makefile.inc
  user/luigi/ipfw3-head/lib/libc/gen/Symbol.map
  user/luigi/ipfw3-head/lib/libc/gen/_pthread_stubs.c
  user/luigi/ipfw3-head/lib/libc/gen/devname.c
  user/luigi/ipfw3-head/lib/libc/gen/fmtcheck.3
  user/luigi/ipfw3-head/lib/libc/gen/getttyent.3
  user/luigi/ipfw3-head/lib/libc/gen/getttyent.c
  user/luigi/ipfw3-head/lib/libc/gen/opendir.c
  user/luigi/ipfw3-head/lib/libc/gen/pause.c
  user/luigi/ipfw3-head/lib/libc/gen/rand48.3
  user/luigi/ipfw3-head/lib/libc/gen/scandir.3
  user/luigi/ipfw3-head/lib/libc/gen/scandir.c
  user/luigi/ipfw3-head/lib/libc/gen/sem.c
  user/luigi/ipfw3-head/lib/libc/gen/sem_init.3
  user/luigi/ipfw3-head/lib/libc/gen/sem_open.3
  user/luigi/ipfw3-head/lib/libc/gen/stringlist.3
  user/luigi/ipfw3-head/lib/libc/gen/sysconf.c
  user/luigi/ipfw3-head/lib/libc/gen/sysctl.3
  user/luigi/ipfw3-head/lib/libc/gen/sysctl.c
  user/luigi/ipfw3-head/lib/libc/gen/sysctlbyname.c
  user/luigi/ipfw3-head/lib/libc/gen/sysctlnametomib.c
  user/luigi/ipfw3-head/lib/libc/gen/tls.c
  user/luigi/ipfw3-head/lib/libc/gen/ttyname.3
  user/luigi/ipfw3-head/lib/libc/gen/ttyslot.c
  user/luigi/ipfw3-head/lib/libc/include/libc_private.h
  user/luigi/ipfw3-head/lib/libc/include/reentrant.h
  user/luigi/ipfw3-head/lib/libc/mips/Symbol.map
  user/luigi/ipfw3-head/lib/libc/mips/sys/brk.S
  user/luigi/ipfw3-head/lib/libc/mips/sys/ptrace.S
  user/luigi/ipfw3-head/lib/libc/net/sctp_bindx.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_connectx.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_getaddrlen.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_getassocid.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_getpaddrs.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_opt_info.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_recvmsg.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_send.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_sendmsg.3
  user/luigi/ipfw3-head/lib/libc/net/sctp_sys_calls.c
  user/luigi/ipfw3-head/lib/libc/nls/gl_ES.ISO8859-1.msg
  user/luigi/ipfw3-head/lib/libc/nls/msgcat.c
  user/luigi/ipfw3-head/lib/libc/posix1e/mac.3
  user/luigi/ipfw3-head/lib/libc/rpc/getnetpath.c
  user/luigi/ipfw3-head/lib/libc/rpc/svc_auth_des.c
  user/luigi/ipfw3-head/lib/libc/stdio/fread.c
  user/luigi/ipfw3-head/lib/libc/stdio/fwrite.c
  user/luigi/ipfw3-head/lib/libc/stdio/getc.3
  user/luigi/ipfw3-head/lib/libc/stdio/mktemp.c
  user/luigi/ipfw3-head/lib/libc/stdio/printf.3
  user/luigi/ipfw3-head/lib/libc/stdlib/malloc.3
  user/luigi/ipfw3-head/lib/libc/stdlib/malloc.c
  user/luigi/ipfw3-head/lib/libc/stdlib/rb.h
  user/luigi/ipfw3-head/lib/libc/stdlib/strfmon.c
  user/luigi/ipfw3-head/lib/libc/stdtime/Makefile.inc
  user/luigi/ipfw3-head/lib/libc/stdtime/strptime.3
  user/luigi/ipfw3-head/lib/libc/string/memccpy.3
  user/luigi/ipfw3-head/lib/libc/string/memchr.3
  user/luigi/ipfw3-head/lib/libc/string/memcmp.3
  user/luigi/ipfw3-head/lib/libc/string/memset.3
  user/luigi/ipfw3-head/lib/libc/string/strndup.c
  user/luigi/ipfw3-head/lib/libc/string/strsignal.c
  user/luigi/ipfw3-head/lib/libc/sys/cpuset.2
  user/luigi/ipfw3-head/lib/libc/sys/cpuset_getaffinity.2
  user/luigi/ipfw3-head/lib/libc/sys/mlockall.2
  user/luigi/ipfw3-head/lib/libc/sys/mount.2
  user/luigi/ipfw3-head/lib/libc/sys/ntp_adjtime.2
  user/luigi/ipfw3-head/lib/libc/sys/ptrace.2
  user/luigi/ipfw3-head/lib/libc/sys/sctp_generic_recvmsg.2
  user/luigi/ipfw3-head/lib/libc/sys/sctp_generic_sendmsg.2
  user/luigi/ipfw3-head/lib/libc/sys/sctp_peeloff.2
  user/luigi/ipfw3-head/lib/libc/sys/sendfile.2
  user/luigi/ipfw3-head/lib/libc/sys/shm_open.2
  user/luigi/ipfw3-head/lib/libc/sys/unlink.2
  user/luigi/ipfw3-head/lib/libc/sys/utrace.2
  user/luigi/ipfw3-head/lib/libc/sys/wait.2
  user/luigi/ipfw3-head/lib/libc_r/Makefile
  user/luigi/ipfw3-head/lib/libdwarf/Makefile
  user/luigi/ipfw3-head/lib/libedit/editline.3
  user/luigi/ipfw3-head/lib/libedit/editrc.5
  user/luigi/ipfw3-head/lib/libedit/read.h
  user/luigi/ipfw3-head/lib/libelf/elf.3
  user/luigi/ipfw3-head/lib/libfetch/Makefile
  user/luigi/ipfw3-head/lib/libfetch/fetch.3
  user/luigi/ipfw3-head/lib/libfetch/http.c
  user/luigi/ipfw3-head/lib/libgeom/geom_util.c
  user/luigi/ipfw3-head/lib/libgeom/geom_xml2tree.c
  user/luigi/ipfw3-head/lib/libgeom/libgeom.3
  user/luigi/ipfw3-head/lib/libgeom/libgeom.h
  user/luigi/ipfw3-head/lib/libgpib/Makefile
  user/luigi/ipfw3-head/lib/libgssapi/gss_accept_sec_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_acquire_cred.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_add_cred.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_add_oid_set_member.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_canonicalize_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_compare_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_context_time.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_create_empty_oid_set.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_delete_sec_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_display_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_display_status.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_duplicate_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_export_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_export_sec_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_get_mic.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_import_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_import_sec_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_indicate_mechs.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_init_sec_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_inquire_context.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_inquire_cred.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_inquire_cred_by_mech.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_inquire_mechs_for_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_inquire_names_for_mech.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_process_context_token.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_release_buffer.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_release_cred.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_release_name.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_release_oid_set.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_test_oid_set_member.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_unwrap.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_verify_mic.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_wrap.3
  user/luigi/ipfw3-head/lib/libgssapi/gss_wrap_size_limit.3
  user/luigi/ipfw3-head/lib/libgssapi/gssapi.3
  user/luigi/ipfw3-head/lib/libgssapi/mech.5
  user/luigi/ipfw3-head/lib/libjail/jail.c
  user/luigi/ipfw3-head/lib/libkse/Makefile
  user/luigi/ipfw3-head/lib/libkvm/Makefile
  user/luigi/ipfw3-head/lib/libkvm/kvm.c
  user/luigi/ipfw3-head/lib/libkvm/kvm.h
  user/luigi/ipfw3-head/lib/libkvm/kvm_getpcpu.3
  user/luigi/ipfw3-head/lib/libkvm/kvm_pcpu.c
  user/luigi/ipfw3-head/lib/libkvm/kvm_private.h
  user/luigi/ipfw3-head/lib/libkvm/kvm_vnet.c
  user/luigi/ipfw3-head/lib/libopie/Makefile
  user/luigi/ipfw3-head/lib/libopie/config.h
  user/luigi/ipfw3-head/lib/libpam/modules/pam_echo/pam_echo.8
  user/luigi/ipfw3-head/lib/libpam/modules/pam_krb5/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/Makefile
  user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.8
  user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.c
  user/luigi/ipfw3-head/lib/libpam/modules/pam_unix/pam_unix.c
  user/luigi/ipfw3-head/lib/libpmc/libpmc.c
  user/luigi/ipfw3-head/lib/libproc/Makefile
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_get_error.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_get_mech_info.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_get_principal_name.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_get_versions.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_getcred.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_is_installed.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_max_data_length.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_qop_to_num.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_seccreate.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_set_callback.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_set_defaults.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_set_svc_name.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
  user/luigi/ipfw3-head/lib/librpcsec_gss/rpcsec_gss.3
  user/luigi/ipfw3-head/lib/librt/Makefile
  user/luigi/ipfw3-head/lib/libstand/bzipfs.c
  user/luigi/ipfw3-head/lib/libstand/dosfs.c
  user/luigi/ipfw3-head/lib/libtacplus/taclib.c
  user/luigi/ipfw3-head/lib/libthr/arch/mips/include/pthread_md.h
  user/luigi/ipfw3-head/lib/libthr/pthread.map
  user/luigi/ipfw3-head/lib/libthr/thread/thr_init.c
  user/luigi/ipfw3-head/lib/libthr/thread/thr_private.h
  user/luigi/ipfw3-head/lib/libthr/thread/thr_sem.c
  user/luigi/ipfw3-head/lib/libufs/cgroup.c
  user/luigi/ipfw3-head/lib/libufs/sblock.c
  user/luigi/ipfw3-head/lib/libulog/Makefile
  user/luigi/ipfw3-head/lib/libulog/Symbol.map
  user/luigi/ipfw3-head/lib/libulog/ulog.h
  user/luigi/ipfw3-head/lib/libulog/ulog_login.3
  user/luigi/ipfw3-head/lib/libulog/ulog_login.c
  user/luigi/ipfw3-head/lib/libulog/ulog_login_pseudo.c
  user/luigi/ipfw3-head/lib/libulog/utempter.c
  user/luigi/ipfw3-head/lib/libulog/utempter_add_record.3
  user/luigi/ipfw3-head/lib/libusb/libusb.h
  user/luigi/ipfw3-head/lib/libusb/libusb10.c
  user/luigi/ipfw3-head/lib/libusb/libusb10_desc.c
  user/luigi/ipfw3-head/lib/libusb/libusb10_io.c
  user/luigi/ipfw3-head/lib/libusb/libusb20.3
  user/luigi/ipfw3-head/lib/libusb/libusb20.c
  user/luigi/ipfw3-head/lib/libusb/libusb20.h
  user/luigi/ipfw3-head/lib/libusb/libusb20_compat01.c
  user/luigi/ipfw3-head/lib/libusb/libusb20_desc.c
  user/luigi/ipfw3-head/lib/libusb/libusb20_int.h
  user/luigi/ipfw3-head/lib/libusb/libusb20_ugen20.c
  user/luigi/ipfw3-head/lib/libusb/usb.h
  user/luigi/ipfw3-head/lib/libutil/Makefile
  user/luigi/ipfw3-head/lib/libutil/humanize_number.3
  user/luigi/ipfw3-head/lib/libutil/libutil.h
  user/luigi/ipfw3-head/lib/libutil/login_tty.c
  user/luigi/ipfw3-head/lib/msun/amd64/fenv.c
  user/luigi/ipfw3-head/lib/msun/amd64/fenv.h
  user/luigi/ipfw3-head/lib/msun/i387/fenv.c
  user/luigi/ipfw3-head/lib/msun/i387/fenv.h
  user/luigi/ipfw3-head/libexec/comsat/comsat.8
  user/luigi/ipfw3-head/libexec/comsat/comsat.c
  user/luigi/ipfw3-head/libexec/ftpd/ftpd.8
  user/luigi/ipfw3-head/libexec/ftpd/ftpd.c
  user/luigi/ipfw3-head/libexec/ftpd/logwtmp.c
  user/luigi/ipfw3-head/libexec/getty/ttys.5
  user/luigi/ipfw3-head/libexec/rlogind/rlogind.c
  user/luigi/ipfw3-head/libexec/rpc.rstatd/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rusersd/Makefile
  user/luigi/ipfw3-head/libexec/rpc.rusersd/rusers_proc.c
  user/luigi/ipfw3-head/libexec/rtld-elf/arm/rtld_start.S
  user/luigi/ipfw3-head/libexec/rtld-elf/powerpc/reloc.c
  user/luigi/ipfw3-head/libexec/rtld-elf/powerpc/rtld_machdep.h
  user/luigi/ipfw3-head/libexec/rtld-elf/powerpc/rtld_start.S
  user/luigi/ipfw3-head/libexec/rtld-elf/rtld.c
  user/luigi/ipfw3-head/libexec/talkd/Makefile
  user/luigi/ipfw3-head/libexec/talkd/process.c
  user/luigi/ipfw3-head/libexec/ulog-helper/Makefile
  user/luigi/ipfw3-head/release/amd64/boot_crunch.conf
  user/luigi/ipfw3-head/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/luigi/ipfw3-head/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/luigi/ipfw3-head/release/doc/share/misc/dev.archlist.txt
  user/luigi/ipfw3-head/release/i386/boot_crunch.conf
  user/luigi/ipfw3-head/release/i386/fixit_crunch.conf
  user/luigi/ipfw3-head/release/pc98/boot_crunch.conf
  user/luigi/ipfw3-head/release/pc98/fixit-small_crunch.conf
  user/luigi/ipfw3-head/release/pc98/fixit_crunch.conf
  user/luigi/ipfw3-head/release/picobsd/build/picobsd
  user/luigi/ipfw3-head/release/picobsd/qemu/crunch.conf
  user/luigi/ipfw3-head/release/picobsd/tinyware/login/pico-login.c
  user/luigi/ipfw3-head/release/powerpc/boot_crunch.conf
  user/luigi/ipfw3-head/release/sparc64/boot_crunch.conf
  user/luigi/ipfw3-head/release/sun4v/boot_crunch.conf
  user/luigi/ipfw3-head/rescue/rescue/Makefile
  user/luigi/ipfw3-head/sbin/Makefile
  user/luigi/ipfw3-head/sbin/adjkerntz/Makefile
  user/luigi/ipfw3-head/sbin/atacontrol/atacontrol.c
  user/luigi/ipfw3-head/sbin/camcontrol/camcontrol.8
  user/luigi/ipfw3-head/sbin/camcontrol/camcontrol.c
  user/luigi/ipfw3-head/sbin/ddb/Makefile
  user/luigi/ipfw3-head/sbin/devd/Makefile
  user/luigi/ipfw3-head/sbin/devfs/Makefile
  user/luigi/ipfw3-head/sbin/devfs/devfs.8
  user/luigi/ipfw3-head/sbin/dump/itime.c
  user/luigi/ipfw3-head/sbin/dump/main.c
  user/luigi/ipfw3-head/sbin/dumpfs/dumpfs.c
  user/luigi/ipfw3-head/sbin/ffsinfo/Makefile
  user/luigi/ipfw3-head/sbin/fsck_ffs/fsutil.c
  user/luigi/ipfw3-head/sbin/fsck_ffs/main.c
  user/luigi/ipfw3-head/sbin/fsck_ffs/pass1.c
  user/luigi/ipfw3-head/sbin/fsck_ffs/pass2.c
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/boot.c
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/check.c
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/dir.c
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/dosfs.h
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/ext.h
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/fat.c
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/fsck_msdosfs.8
  user/luigi/ipfw3-head/sbin/fsck_msdosfs/main.c
  user/luigi/ipfw3-head/sbin/gbde/Makefile
  user/luigi/ipfw3-head/sbin/geom/class/Makefile
  user/luigi/ipfw3-head/sbin/geom/class/multipath/geom_multipath.c
  user/luigi/ipfw3-head/sbin/geom/class/part/Makefile
  user/luigi/ipfw3-head/sbin/geom/class/raid3/geom_raid3.c
  user/luigi/ipfw3-head/sbin/geom/class/raid3/graid3.8
  user/luigi/ipfw3-head/sbin/geom/class/stripe/geom_stripe.c
  user/luigi/ipfw3-head/sbin/geom/core/geom.8
  user/luigi/ipfw3-head/sbin/geom/core/geom.c
  user/luigi/ipfw3-head/sbin/ggate/ggatec/ggatec.c
  user/luigi/ipfw3-head/sbin/ggate/ggated/ggated.c
  user/luigi/ipfw3-head/sbin/ggate/ggatel/ggatel.c
  user/luigi/ipfw3-head/sbin/ggate/shared/ggate.c
  user/luigi/ipfw3-head/sbin/growfs/growfs.c
  user/luigi/ipfw3-head/sbin/ifconfig/Makefile
  user/luigi/ipfw3-head/sbin/ifconfig/af_inet.c
  user/luigi/ipfw3-head/sbin/ifconfig/ifcarp.c
  user/luigi/ipfw3-head/sbin/ifconfig/ifconfig.8
  user/luigi/ipfw3-head/sbin/ifconfig/ifconfig.c
  user/luigi/ipfw3-head/sbin/ifconfig/ifieee80211.c
  user/luigi/ipfw3-head/sbin/ifconfig/ifvlan.c
  user/luigi/ipfw3-head/sbin/init/Makefile
  user/luigi/ipfw3-head/sbin/init/init.8
  user/luigi/ipfw3-head/sbin/init/init.c
  user/luigi/ipfw3-head/sbin/ipf/ipftest/Makefile
  user/luigi/ipfw3-head/sbin/iscontrol/iscontrol.h
  user/luigi/ipfw3-head/sbin/iscontrol/pdu.c
  user/luigi/ipfw3-head/sbin/kldconfig/Makefile
  user/luigi/ipfw3-head/sbin/kldload/Makefile
  user/luigi/ipfw3-head/sbin/kldstat/Makefile
  user/luigi/ipfw3-head/sbin/mdconfig/Makefile
  user/luigi/ipfw3-head/sbin/mdconfig/mdconfig.c
  user/luigi/ipfw3-head/sbin/mknod/Makefile
  user/luigi/ipfw3-head/sbin/mknod/mknod.8
  user/luigi/ipfw3-head/sbin/mknod/mknod.c
  user/luigi/ipfw3-head/sbin/mount/mount.8
  user/luigi/ipfw3-head/sbin/mount_hpfs/Makefile
  user/luigi/ipfw3-head/sbin/mount_hpfs/mount_hpfs.c
  user/luigi/ipfw3-head/sbin/mount_nfs/mount_nfs.8
  user/luigi/ipfw3-head/sbin/mount_nfs/mount_nfs.c
  user/luigi/ipfw3-head/sbin/mount_ntfs/Makefile
  user/luigi/ipfw3-head/sbin/mount_ntfs/mount_ntfs.c
  user/luigi/ipfw3-head/sbin/mount_std/Makefile
  user/luigi/ipfw3-head/sbin/natd/Makefile
  user/luigi/ipfw3-head/sbin/natd/natd.c
  user/luigi/ipfw3-head/sbin/newfs/Makefile
  user/luigi/ipfw3-head/sbin/newfs/mkfs.c
  user/luigi/ipfw3-head/sbin/newfs/newfs.c
  user/luigi/ipfw3-head/sbin/newfs/newfs.h
  user/luigi/ipfw3-head/sbin/newfs_msdos/newfs_msdos.8
  user/luigi/ipfw3-head/sbin/newfs_msdos/newfs_msdos.c
  user/luigi/ipfw3-head/sbin/reboot/Makefile
  user/luigi/ipfw3-head/sbin/reboot/reboot.8
  user/luigi/ipfw3-head/sbin/reboot/reboot.c
  user/luigi/ipfw3-head/sbin/restore/Makefile
  user/luigi/ipfw3-head/sbin/restore/dirs.c
  user/luigi/ipfw3-head/sbin/restore/extern.h
  user/luigi/ipfw3-head/sbin/restore/interactive.c
  user/luigi/ipfw3-head/sbin/restore/restore.h
  user/luigi/ipfw3-head/sbin/restore/tape.c
  user/luigi/ipfw3-head/sbin/route/Makefile
  user/luigi/ipfw3-head/sbin/route/route.c
  user/luigi/ipfw3-head/sbin/routed/Makefile
  user/luigi/ipfw3-head/sbin/routed/if.c
  user/luigi/ipfw3-head/sbin/routed/rtquery/Makefile
  user/luigi/ipfw3-head/sbin/rtsol/Makefile
  user/luigi/ipfw3-head/sbin/setkey/setkey.8
  user/luigi/ipfw3-head/sbin/sunlabel/Makefile
  user/luigi/ipfw3-head/sbin/swapon/Makefile
  user/luigi/ipfw3-head/sbin/sysctl/Makefile
  user/luigi/ipfw3-head/sbin/sysctl/sysctl.8
  user/luigi/ipfw3-head/sbin/sysctl/sysctl.c
  user/luigi/ipfw3-head/sbin/tunefs/Makefile
  user/luigi/ipfw3-head/sbin/tunefs/tunefs.c
  user/luigi/ipfw3-head/sbin/umount/umount.c
  user/luigi/ipfw3-head/secure/libexec/sftp-server/Makefile
  user/luigi/ipfw3-head/secure/usr.sbin/sshd/Makefile
  user/luigi/ipfw3-head/share/doc/usd/Makefile
  user/luigi/ipfw3-head/share/examples/Makefile
  user/luigi/ipfw3-head/share/examples/autofs/driver/Makefile
  user/luigi/ipfw3-head/share/examples/kld/cdev/test/Makefile
  user/luigi/ipfw3-head/share/examples/kld/cdev/test/testcdev.c
  user/luigi/ipfw3-head/share/examples/kld/firmware/fwconsumer/fw_consumer.c
  user/luigi/ipfw3-head/share/examples/kld/syscall/test/Makefile
  user/luigi/ipfw3-head/share/examples/kld/syscall/test/call.c
  user/luigi/ipfw3-head/share/man/man3/Makefile
  user/luigi/ipfw3-head/share/man/man3/pthread.3
  user/luigi/ipfw3-head/share/man/man3/pthread_attr.3
  user/luigi/ipfw3-head/share/man/man3/pthread_join.3
  user/luigi/ipfw3-head/share/man/man3/sysexits.3
  user/luigi/ipfw3-head/share/man/man4/Makefile
  user/luigi/ipfw3-head/share/man/man4/acpi.4
  user/luigi/ipfw3-head/share/man/man4/acpi_asus.4
  user/luigi/ipfw3-head/share/man/man4/acpi_fujitsu.4
  user/luigi/ipfw3-head/share/man/man4/acpi_hp.4
  user/luigi/ipfw3-head/share/man/man4/acpi_ibm.4
  user/luigi/ipfw3-head/share/man/man4/acpi_panasonic.4
  user/luigi/ipfw3-head/share/man/man4/acpi_sony.4
  user/luigi/ipfw3-head/share/man/man4/acpi_toshiba.4
  user/luigi/ipfw3-head/share/man/man4/acpi_wmi.4
  user/luigi/ipfw3-head/share/man/man4/ahci.4
  user/luigi/ipfw3-head/share/man/man4/ath.4
  user/luigi/ipfw3-head/share/man/man4/aue.4
  user/luigi/ipfw3-head/share/man/man4/axe.4
  user/luigi/ipfw3-head/share/man/man4/bridge.4
  user/luigi/ipfw3-head/share/man/man4/carp.4
  user/luigi/ipfw3-head/share/man/man4/cdce.4
  user/luigi/ipfw3-head/share/man/man4/cpufreq.4
  user/luigi/ipfw3-head/share/man/man4/dc.4
  user/luigi/ipfw3-head/share/man/man4/epair.4
  user/luigi/ipfw3-head/share/man/man4/faith.4
  user/luigi/ipfw3-head/share/man/man4/gif.4
  user/luigi/ipfw3-head/share/man/man4/hme.4
  user/luigi/ipfw3-head/share/man/man4/io.4
  user/luigi/ipfw3-head/share/man/man4/iwn.4
  user/luigi/ipfw3-head/share/man/man4/iwnfw.4
  user/luigi/ipfw3-head/share/man/man4/lge.4
  user/luigi/ipfw3-head/share/man/man4/linux.4
  user/luigi/ipfw3-head/share/man/man4/mac.4
  user/luigi/ipfw3-head/share/man/man4/man4.i386/Makefile
  user/luigi/ipfw3-head/share/man/man4/man4.i386/vpd.4
  user/luigi/ipfw3-head/share/man/man4/man4.powerpc/Makefile
  user/luigi/ipfw3-head/share/man/man4/man4.sparc64/ebus.4
  user/luigi/ipfw3-head/share/man/man4/mpt.4
  user/luigi/ipfw3-head/share/man/man4/msk.4
  user/luigi/ipfw3-head/share/man/man4/ndis.4
  user/luigi/ipfw3-head/share/man/man4/netintro.4
  user/luigi/ipfw3-head/share/man/man4/ng_ipfw.4
  user/luigi/ipfw3-head/share/man/man4/nge.4
  user/luigi/ipfw3-head/share/man/man4/pcm.4
  user/luigi/ipfw3-head/share/man/man4/pcn.4
  user/luigi/ipfw3-head/share/man/man4/psm.4
  user/luigi/ipfw3-head/share/man/man4/pts.4
  user/luigi/ipfw3-head/share/man/man4/ral.4
  user/luigi/ipfw3-head/share/man/man4/re.4
  user/luigi/ipfw3-head/share/man/man4/rl.4
  user/luigi/ipfw3-head/share/man/man4/rue.4
  user/luigi/ipfw3-head/share/man/man4/rum.4
  user/luigi/ipfw3-head/share/man/man4/sctp.4
  user/luigi/ipfw3-head/share/man/man4/sf.4
  user/luigi/ipfw3-head/share/man/man4/siis.4
  user/luigi/ipfw3-head/share/man/man4/sis.4
  user/luigi/ipfw3-head/share/man/man4/sk.4
  user/luigi/ipfw3-head/share/man/man4/smbus.4
  user/luigi/ipfw3-head/share/man/man4/snd_hda.4
  user/luigi/ipfw3-head/share/man/man4/snd_uaudio.4
  user/luigi/ipfw3-head/share/man/man4/ste.4
  user/luigi/ipfw3-head/share/man/man4/sysmouse.4
  user/luigi/ipfw3-head/share/man/man4/targ.4
  user/luigi/ipfw3-head/share/man/man4/uart.4
  user/luigi/ipfw3-head/share/man/man4/udav.4
  user/luigi/ipfw3-head/share/man/man4/ural.4
  user/luigi/ipfw3-head/share/man/man4/urio.4
  user/luigi/ipfw3-head/share/man/man4/urtw.4
  user/luigi/ipfw3-head/share/man/man4/vge.4
  user/luigi/ipfw3-head/share/man/man4/vr.4
  user/luigi/ipfw3-head/share/man/man4/wi.4
  user/luigi/ipfw3-head/share/man/man4/wlan.4
  user/luigi/ipfw3-head/share/man/man5/Makefile
  user/luigi/ipfw3-head/share/man/man5/devfs.rules.5
  user/luigi/ipfw3-head/share/man/man5/rc.conf.5
  user/luigi/ipfw3-head/share/man/man5/src.conf.5
  user/luigi/ipfw3-head/share/man/man5/tmpfs.5
  user/luigi/ipfw3-head/share/man/man7/hier.7
  user/luigi/ipfw3-head/share/man/man7/release.7
  user/luigi/ipfw3-head/share/man/man7/security.7
  user/luigi/ipfw3-head/share/man/man8/rc.subr.8
  user/luigi/ipfw3-head/share/man/man9/BUF_ISLOCKED.9
  user/luigi/ipfw3-head/share/man/man9/BUF_RECURSED.9
  user/luigi/ipfw3-head/share/man/man9/DEVICE_PROBE.9
  user/luigi/ipfw3-head/share/man/man9/Makefile
  user/luigi/ipfw3-head/share/man/man9/VFS.9
  user/luigi/ipfw3-head/share/man/man9/VFS_CHECKEXP.9
  user/luigi/ipfw3-head/share/man/man9/VFS_FHTOVP.9
  user/luigi/ipfw3-head/share/man/man9/VOP_LOCK.9
  user/luigi/ipfw3-head/share/man/man9/alloc_unr.9
  user/luigi/ipfw3-head/share/man/man9/devfs_set_cdevpriv.9
  user/luigi/ipfw3-head/share/man/man9/ieee80211_scan.9
  user/luigi/ipfw3-head/share/man/man9/ifnet.9
  user/luigi/ipfw3-head/share/man/man9/kthread.9
  user/luigi/ipfw3-head/share/man/man9/locking.9
  user/luigi/ipfw3-head/share/man/man9/mac.9
  user/luigi/ipfw3-head/share/man/man9/mtx_pool.9
  user/luigi/ipfw3-head/share/man/man9/namei.9
  user/luigi/ipfw3-head/share/man/man9/netisr.9
  user/luigi/ipfw3-head/share/man/man9/pci.9
  user/luigi/ipfw3-head/share/man/man9/sleepqueue.9
  user/luigi/ipfw3-head/share/man/man9/sysctl.9
  user/luigi/ipfw3-head/share/man/man9/vm_page_alloc.9
  user/luigi/ipfw3-head/share/man/man9/vm_page_bits.9
  user/luigi/ipfw3-head/share/man/man9/vnode.9
  user/luigi/ipfw3-head/share/misc/committers-doc.dot
  user/luigi/ipfw3-head/share/misc/committers-ports.dot
  user/luigi/ipfw3-head/share/misc/committers-src.dot
  user/luigi/ipfw3-head/share/mk/bsd.cpu.mk
  user/luigi/ipfw3-head/share/mk/bsd.dep.mk
  user/luigi/ipfw3-head/share/mk/bsd.lib.mk
  user/luigi/ipfw3-head/share/mk/bsd.libnames.mk
  user/luigi/ipfw3-head/share/mk/bsd.own.mk
  user/luigi/ipfw3-head/share/mk/bsd.prog.mk
  user/luigi/ipfw3-head/share/mk/bsd.sys.mk
  user/luigi/ipfw3-head/share/mk/sys.mk
  user/luigi/ipfw3-head/share/security/lomac-policy.contexts
  user/luigi/ipfw3-head/share/syscons/keymaps/fr.dvorak.acc.kbd
  user/luigi/ipfw3-head/share/termcap/termcap.src
  user/luigi/ipfw3-head/share/zoneinfo/Makefile
  user/luigi/ipfw3-head/sys/amd64/amd64/amd64_mem.c
  user/luigi/ipfw3-head/sys/amd64/amd64/busdma_machdep.c
  user/luigi/ipfw3-head/sys/amd64/amd64/exception.S
  user/luigi/ipfw3-head/sys/amd64/amd64/identcpu.c
  user/luigi/ipfw3-head/sys/amd64/amd64/intr_machdep.c
  user/luigi/ipfw3-head/sys/amd64/amd64/io.c
  user/luigi/ipfw3-head/sys/amd64/amd64/local_apic.c
  user/luigi/ipfw3-head/sys/amd64/amd64/machdep.c
  user/luigi/ipfw3-head/sys/amd64/amd64/mca.c
  user/luigi/ipfw3-head/sys/amd64/amd64/mp_machdep.c
  user/luigi/ipfw3-head/sys/amd64/amd64/msi.c
  user/luigi/ipfw3-head/sys/amd64/amd64/nexus.c
  user/luigi/ipfw3-head/sys/amd64/amd64/pmap.c
  user/luigi/ipfw3-head/sys/amd64/amd64/sys_machdep.c
  user/luigi/ipfw3-head/sys/amd64/amd64/trap.c
  user/luigi/ipfw3-head/sys/amd64/amd64/vm_machdep.c
  user/luigi/ipfw3-head/sys/amd64/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/amd64/conf/GENERIC
  user/luigi/ipfw3-head/sys/amd64/conf/Makefile
  user/luigi/ipfw3-head/sys/amd64/conf/NOTES
  user/luigi/ipfw3-head/sys/amd64/conf/XENHVM
  user/luigi/ipfw3-head/sys/amd64/ia32/ia32_reg.c
  user/luigi/ipfw3-head/sys/amd64/ia32/ia32_syscall.c
  user/luigi/ipfw3-head/sys/amd64/include/apicvar.h
  user/luigi/ipfw3-head/sys/amd64/include/iodev.h
  user/luigi/ipfw3-head/sys/amd64/include/sysarch.h
  user/luigi/ipfw3-head/sys/arm/arm/busdma_machdep.c
  user/luigi/ipfw3-head/sys/arm/arm/cpufunc.c
  user/luigi/ipfw3-head/sys/arm/arm/db_trace.c
  user/luigi/ipfw3-head/sys/arm/arm/identcpu.c
  user/luigi/ipfw3-head/sys/arm/arm/pmap.c
  user/luigi/ipfw3-head/sys/arm/arm/support.S
  user/luigi/ipfw3-head/sys/arm/at91/if_ate.c
  user/luigi/ipfw3-head/sys/arm/conf/AVILA
  user/luigi/ipfw3-head/sys/arm/conf/BWCT
  user/luigi/ipfw3-head/sys/arm/conf/CAMBRIA
  user/luigi/ipfw3-head/sys/arm/conf/CNS11XXNAS
  user/luigi/ipfw3-head/sys/arm/conf/CRB
  user/luigi/ipfw3-head/sys/arm/conf/DB-78XXX
  user/luigi/ipfw3-head/sys/arm/conf/DB-88F5XXX
  user/luigi/ipfw3-head/sys/arm/conf/DB-88F6XXX
  user/luigi/ipfw3-head/sys/arm/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/arm/conf/EP80219
  user/luigi/ipfw3-head/sys/arm/conf/GUMSTIX
  user/luigi/ipfw3-head/sys/arm/conf/HL200
  user/luigi/ipfw3-head/sys/arm/conf/IQ31244
  user/luigi/ipfw3-head/sys/arm/conf/KB920X
  user/luigi/ipfw3-head/sys/arm/conf/NSLU
  user/luigi/ipfw3-head/sys/arm/conf/SIMICS
  user/luigi/ipfw3-head/sys/arm/conf/SKYEYE
  user/luigi/ipfw3-head/sys/arm/include/_inttypes.h
  user/luigi/ipfw3-head/sys/arm/include/_stdint.h
  user/luigi/ipfw3-head/sys/arm/include/armreg.h
  user/luigi/ipfw3-head/sys/arm/include/bus.h
  user/luigi/ipfw3-head/sys/arm/include/bus_dma.h
  user/luigi/ipfw3-head/sys/arm/include/md_var.h
  user/luigi/ipfw3-head/sys/arm/include/ucontext.h
  user/luigi/ipfw3-head/sys/arm/mv/mv_machdep.c
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0.c
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_dmacreg.h
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_gpioreg.h
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_irq.S
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_irqhandler.c
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_ostreg.h
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_ppcreg.h
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_reg.h
  user/luigi/ipfw3-head/sys/arm/sa11x0/sa11x0_var.h
  user/luigi/ipfw3-head/sys/arm/xscale/ixp425/cambria_fled.c
  user/luigi/ipfw3-head/sys/boot/common/bootstrap.h
  user/luigi/ipfw3-head/sys/boot/common/dev_net.c
  user/luigi/ipfw3-head/sys/boot/efi/include/efilib.h
  user/luigi/ipfw3-head/sys/boot/efi/libefi/Makefile
  user/luigi/ipfw3-head/sys/boot/forth/loader.conf
  user/luigi/ipfw3-head/sys/boot/ia64/efi/conf.c
  user/luigi/ipfw3-head/sys/boot/ia64/efi/main.c
  user/luigi/ipfw3-head/sys/boot/ia64/efi/version
  user/luigi/ipfw3-head/sys/boot/powerpc/ofw/Makefile
  user/luigi/ipfw3-head/sys/boot/powerpc/uboot/Makefile
  user/luigi/ipfw3-head/sys/boot/powerpc/uboot/conf.c
  user/luigi/ipfw3-head/sys/boot/sparc64/loader/Makefile
  user/luigi/ipfw3-head/sys/boot/sparc64/loader/main.c
  user/luigi/ipfw3-head/sys/boot/uboot/common/main.c
  user/luigi/ipfw3-head/sys/boot/uboot/lib/disk.c
  user/luigi/ipfw3-head/sys/boot/uboot/lib/time.c
  user/luigi/ipfw3-head/sys/boot/zfs/zfs.c
  user/luigi/ipfw3-head/sys/boot/zfs/zfsimpl.c
  user/luigi/ipfw3-head/sys/cam/ata/ata_all.c
  user/luigi/ipfw3-head/sys/cam/ata/ata_da.c
  user/luigi/ipfw3-head/sys/cam/ata/ata_pmp.c
  user/luigi/ipfw3-head/sys/cam/ata/ata_xpt.c
  user/luigi/ipfw3-head/sys/cam/cam.c
  user/luigi/ipfw3-head/sys/cam/cam.h
  user/luigi/ipfw3-head/sys/cam/cam_ccb.h
  user/luigi/ipfw3-head/sys/cam/cam_periph.c
  user/luigi/ipfw3-head/sys/cam/cam_periph.h
  user/luigi/ipfw3-head/sys/cam/cam_queue.h
  user/luigi/ipfw3-head/sys/cam/cam_sim.c
  user/luigi/ipfw3-head/sys/cam/cam_xpt.c
  user/luigi/ipfw3-head/sys/cam/cam_xpt.h
  user/luigi/ipfw3-head/sys/cam/cam_xpt_internal.h
  user/luigi/ipfw3-head/sys/cam/cam_xpt_periph.h
  user/luigi/ipfw3-head/sys/cam/cam_xpt_sim.h
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_all.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_cd.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_ch.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_da.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_low.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_pass.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_ses.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_targ_bh.c
  user/luigi/ipfw3-head/sys/cam/scsi/scsi_xpt.c
  user/luigi/ipfw3-head/sys/cddl/boot/zfs/zfsimpl.h
  user/luigi/ipfw3-head/sys/cddl/boot/zfs/zfssubr.c
  user/luigi/ipfw3-head/sys/cddl/compat/opensolaris/sys/time.h
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/luigi/ipfw3-head/sys/compat/freebsd32/syscalls.master
  user/luigi/ipfw3-head/sys/compat/linux/linux_file.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_futex.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_getcwd.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_ioctl.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_ioctl.h
  user/luigi/ipfw3-head/sys/compat/linux/linux_misc.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_socket.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_stats.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_time.c
  user/luigi/ipfw3-head/sys/compat/linux/linux_uid16.c
  user/luigi/ipfw3-head/sys/compat/svr4/svr4_misc.c
  user/luigi/ipfw3-head/sys/compat/svr4/syscalls.master
  user/luigi/ipfw3-head/sys/conf/Makefile.mips
  user/luigi/ipfw3-head/sys/conf/NOTES
  user/luigi/ipfw3-head/sys/conf/files
  user/luigi/ipfw3-head/sys/conf/files.amd64
  user/luigi/ipfw3-head/sys/conf/files.i386
  user/luigi/ipfw3-head/sys/conf/files.ia64
  user/luigi/ipfw3-head/sys/conf/files.mips
  user/luigi/ipfw3-head/sys/conf/files.pc98
  user/luigi/ipfw3-head/sys/conf/files.sparc64
  user/luigi/ipfw3-head/sys/conf/kern.mk
  user/luigi/ipfw3-head/sys/conf/kmod.mk
  user/luigi/ipfw3-head/sys/conf/ldscript.mips
  user/luigi/ipfw3-head/sys/conf/ldscript.mips.cfe
  user/luigi/ipfw3-head/sys/conf/makeLINT.mk
  user/luigi/ipfw3-head/sys/conf/options
  user/luigi/ipfw3-head/sys/conf/options.i386
  user/luigi/ipfw3-head/sys/conf/options.mips
  user/luigi/ipfw3-head/sys/conf/options.pc98
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/changes.txt
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/adfile.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/adisasm.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/adwalk.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/dmextern.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/dmrestag.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/dmtable.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/dmtbdump.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/common/getopt.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcompiler.l
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcompiler.y
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asldefine.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslerror.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslfiles.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslfold.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asllength.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asllisting.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslload.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asllookup.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslmain.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslmap.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asloperands.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslopt.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslresource.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslrestype1.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslrestype2.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asltransform.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asltree.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/asltypes.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbcmds.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbdisply.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbexec.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbfileio.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbhistry.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbinput.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbstats.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmbuffer.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmnames.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmobject.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmopcode.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmresrc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmresrcl.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmresrcs.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmwalk.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsfield.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsinit.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsmethod.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsmthdat.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsobject.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsopcode.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dswexec.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dswload.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dswscope.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dswstate.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evevent.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evgpe.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evgpeblk.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evmisc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evregion.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evrgnini.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evsci.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxfevnt.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxfregn.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exconfig.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exconvrt.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/excreate.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exdump.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exfield.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exfldio.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exmisc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exmutex.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exnames.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exoparg1.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exoparg2.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exoparg3.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exoparg6.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exprep.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exregion.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exresnte.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exresolv.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exresop.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exstore.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exstoren.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exstorob.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exsystem.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwacpi.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwgpe.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwregs.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwsleep.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwtimer.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwvalid.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/hardware/hwxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acapps.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/accommon.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acconfig.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acdebug.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acdisasm.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acdispat.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acevents.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acexcep.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acglobal.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/achware.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acinterp.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/aclocal.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acmacros.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acnames.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acnamesp.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acobject.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acopcode.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acoutput.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acparser.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acpi.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acpiosxf.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acpixf.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acpredef.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acresrc.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acrestyp.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acstruct.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/actables.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/actbl.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/actbl1.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/actbl2.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/actypes.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acutils.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/amlcode.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/amlresrc.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/platform/acenv.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/platform/acgcc.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsaccess.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsalloc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsdump.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsdumpdv.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nseval.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsinit.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsload.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsnames.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsobject.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsparse.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nspredef.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsrepair.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsrepair2.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nssearch.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nswalk.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfeval.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfname.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfobj.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/osunixxf.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psargs.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psloop.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psopcode.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psparse.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psscope.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/pstree.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/pswalk.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsaddr.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rscalc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rscreate.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsdump.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsinfo.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsio.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsirq.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rslist.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsmemory.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsmisc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbfadt.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbfind.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbinstal.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbutils.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tables/tbxfroot.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utalloc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utcache.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utcopy.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utdebug.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utdelete.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/uteval.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utglobal.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utids.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utinit.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utlock.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utmath.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utmisc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utmutex.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utobject.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utresrc.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utstate.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/uttrack.c
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utxface.c
  user/luigi/ipfw3-head/sys/contrib/dev/uath/ar5523.bin.uu
  user/luigi/ipfw3-head/sys/contrib/ngatm/netnatm/api/cc_conn.c
  user/luigi/ipfw3-head/sys/ddb/db_ps.c
  user/luigi/ipfw3-head/sys/ddb/db_thread.c
  user/luigi/ipfw3-head/sys/dev/aac/aac.c
  user/luigi/ipfw3-head/sys/dev/aac/aac_cam.c
  user/luigi/ipfw3-head/sys/dev/aac/aac_pci.c
  user/luigi/ipfw3-head/sys/dev/aac/aacreg.h
  user/luigi/ipfw3-head/sys/dev/aac/aacvar.h
  user/luigi/ipfw3-head/sys/dev/acpi_support/acpi_asus.c
  user/luigi/ipfw3-head/sys/dev/acpi_support/acpi_ibm.c
  user/luigi/ipfw3-head/sys/dev/acpi_support/acpi_panasonic.c
  user/luigi/ipfw3-head/sys/dev/acpi_support/acpi_sony.c
  user/luigi/ipfw3-head/sys/dev/acpi_support/acpi_wmi.c
  user/luigi/ipfw3-head/sys/dev/acpica/Osd/OsdHardware.c
  user/luigi/ipfw3-head/sys/dev/acpica/Osd/OsdSchedule.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_cpu.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_ec.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_hpet.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_if.m
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_package.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_powerres.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_smbat.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpi_video.c
  user/luigi/ipfw3-head/sys/dev/acpica/acpivar.h
  user/luigi/ipfw3-head/sys/dev/ae/if_ae.c
  user/luigi/ipfw3-head/sys/dev/age/if_age.c
  user/luigi/ipfw3-head/sys/dev/agp/agp.c
  user/luigi/ipfw3-head/sys/dev/ahci/ahci.c
  user/luigi/ipfw3-head/sys/dev/ahci/ahci.h
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aic79xx_osm.c
  user/luigi/ipfw3-head/sys/dev/aic7xxx/aic79xx_pci.c
  user/luigi/ipfw3-head/sys/dev/alc/if_alc.c
  user/luigi/ipfw3-head/sys/dev/ale/if_ale.c
  user/luigi/ipfw3-head/sys/dev/amd/amd.c
  user/luigi/ipfw3-head/sys/dev/amr/amr.c
  user/luigi/ipfw3-head/sys/dev/arcmsr/arcmsr.c
  user/luigi/ipfw3-head/sys/dev/asr/asr.c
  user/luigi/ipfw3-head/sys/dev/ata/ata-all.c
  user/luigi/ipfw3-head/sys/dev/ata/ata-all.h
  user/luigi/ipfw3-head/sys/dev/ata/ata-pci.c
  user/luigi/ipfw3-head/sys/dev/ata/ata-pci.h
  user/luigi/ipfw3-head/sys/dev/ata/ata-raid.c
  user/luigi/ipfw3-head/sys/dev/ata/ata-sata.c
  user/luigi/ipfw3-head/sys/dev/ata/ata_if.m
  user/luigi/ipfw3-head/sys/dev/ata/atapi-cam.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-acerlabs.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-ahci.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-ati.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-intel.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-marvell.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-netcell.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-promise.c
  user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-siliconimage.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ah.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ah_eeprom_v14.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212_power.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5212/ar5212reg.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416desc.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9280.h
  user/luigi/ipfw3-head/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c
  user/luigi/ipfw3-head/sys/dev/ath/if_ath.c
  user/luigi/ipfw3-head/sys/dev/ath/if_athvar.h
  user/luigi/ipfw3-head/sys/dev/bce/if_bce.c
  user/luigi/ipfw3-head/sys/dev/bce/if_bcereg.h
  user/luigi/ipfw3-head/sys/dev/bge/if_bge.c
  user/luigi/ipfw3-head/sys/dev/bge/if_bgereg.h
  user/luigi/ipfw3-head/sys/dev/bktr/bktr_i2c.c
  user/luigi/ipfw3-head/sys/dev/cardbus/cardbus.c
  user/luigi/ipfw3-head/sys/dev/cfe/cfe_api.c
  user/luigi/ipfw3-head/sys/dev/cfe/cfe_console.c
  user/luigi/ipfw3-head/sys/dev/ciss/ciss.c
  user/luigi/ipfw3-head/sys/dev/cm/if_cm_isa.c
  user/luigi/ipfw3-head/sys/dev/cm/smc90cx6.c
  user/luigi/ipfw3-head/sys/dev/cm/smc90cx6reg.h
  user/luigi/ipfw3-head/sys/dev/cm/smc90cx6var.h
  user/luigi/ipfw3-head/sys/dev/cs/if_cs.c
  user/luigi/ipfw3-head/sys/dev/cs/if_csreg.h
  user/luigi/ipfw3-head/sys/dev/ct/ct_isa.c
  user/luigi/ipfw3-head/sys/dev/cxgb/common/cxgb_common.h
  user/luigi/ipfw3-head/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_adapter.h
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_main.c
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_offload.h
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_osdep.h
  user/luigi/ipfw3-head/sys/dev/cxgb/cxgb_sge.c
  user/luigi/ipfw3-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  user/luigi/ipfw3-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
  user/luigi/ipfw3-head/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
  user/luigi/ipfw3-head/sys/dev/de/if_de.c
  user/luigi/ipfw3-head/sys/dev/dpt/dpt.h
  user/luigi/ipfw3-head/sys/dev/dpt/dpt_scsi.c
  user/luigi/ipfw3-head/sys/dev/drm/drmP.h
  user/luigi/ipfw3-head/sys/dev/drm/drm_linux_list.h
  user/luigi/ipfw3-head/sys/dev/drm/drm_memory.c
  user/luigi/ipfw3-head/sys/dev/drm/i915_drv.c
  user/luigi/ipfw3-head/sys/dev/drm/i915_drv.h
  user/luigi/ipfw3-head/sys/dev/e1000/LICENSE
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_80003es2lan.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82540.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82541.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82542.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82543.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82571.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82575.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_82575.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_api.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_api.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_defines.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_hw.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_ich8lan.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_ich8lan.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_mac.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_mac.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_manage.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_osdep.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_phy.c
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_phy.h
  user/luigi/ipfw3-head/sys/dev/e1000/e1000_regs.h
  user/luigi/ipfw3-head/sys/dev/e1000/if_em.c
  user/luigi/ipfw3-head/sys/dev/e1000/if_em.h
  user/luigi/ipfw3-head/sys/dev/e1000/if_igb.c
  user/luigi/ipfw3-head/sys/dev/e1000/if_igb.h
  user/luigi/ipfw3-head/sys/dev/ep/if_ep.c
  user/luigi/ipfw3-head/sys/dev/ex/if_ex.c
  user/luigi/ipfw3-head/sys/dev/fatm/if_fatm.c
  user/luigi/ipfw3-head/sys/dev/fb/fb.c
  user/luigi/ipfw3-head/sys/dev/fb/vesa.c
  user/luigi/ipfw3-head/sys/dev/firewire/sbp.c
  user/luigi/ipfw3-head/sys/dev/gem/if_gem.c
  user/luigi/ipfw3-head/sys/dev/hatm/if_hatm.c
  user/luigi/ipfw3-head/sys/dev/hptiop/hptiop.c
  user/luigi/ipfw3-head/sys/dev/hptmv/entry.c
  user/luigi/ipfw3-head/sys/dev/hptrr/hptrr_osm_bsd.c
  user/luigi/ipfw3-head/sys/dev/hptrr/os_bsd.h
  user/luigi/ipfw3-head/sys/dev/ic/ns16550.h
  user/luigi/ipfw3-head/sys/dev/ichwd/ichwd.c
  user/luigi/ipfw3-head/sys/dev/ichwd/ichwd.h
  user/luigi/ipfw3-head/sys/dev/ieee488/ibfoo.c
  user/luigi/ipfw3-head/sys/dev/ieee488/pcii.c
  user/luigi/ipfw3-head/sys/dev/ieee488/tnt4882.c
  user/luigi/ipfw3-head/sys/dev/ieee488/upd7210.c
  user/luigi/ipfw3-head/sys/dev/ieee488/upd7210.h
  user/luigi/ipfw3-head/sys/dev/if_ndis/if_ndis.c
  user/luigi/ipfw3-head/sys/dev/if_ndis/if_ndis_usb.c
  user/luigi/ipfw3-head/sys/dev/iir/iir.c
  user/luigi/ipfw3-head/sys/dev/iir/iir_pci.c
  user/luigi/ipfw3-head/sys/dev/io/iodev.c
  user/luigi/ipfw3-head/sys/dev/iscsi/initiator/isc_sm.c
  user/luigi/ipfw3-head/sys/dev/isp/isp.c
  user/luigi/ipfw3-head/sys/dev/isp/isp_freebsd.c
  user/luigi/ipfw3-head/sys/dev/isp/isp_library.c
  user/luigi/ipfw3-head/sys/dev/isp/isp_library.h
  user/luigi/ipfw3-head/sys/dev/isp/isp_pci.c
  user/luigi/ipfw3-head/sys/dev/isp/isp_sbus.c
  user/luigi/ipfw3-head/sys/dev/isp/isp_target.c
  user/luigi/ipfw3-head/sys/dev/isp/ispmbox.h
  user/luigi/ipfw3-head/sys/dev/isp/ispreg.h
  user/luigi/ipfw3-head/sys/dev/isp/ispvar.h
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwn.c
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwnreg.h
  user/luigi/ipfw3-head/sys/dev/iwn/if_iwnvar.h
  user/luigi/ipfw3-head/sys/dev/ixgbe/ixgbe.c
  user/luigi/ipfw3-head/sys/dev/jme/if_jme.c
  user/luigi/ipfw3-head/sys/dev/lmc/if_lmc.c
  user/luigi/ipfw3-head/sys/dev/malo/if_malo.c
  user/luigi/ipfw3-head/sys/dev/md/md.c
  user/luigi/ipfw3-head/sys/dev/mfi/mfi_cam.c
  user/luigi/ipfw3-head/sys/dev/mfi/mfi_pci.c
  user/luigi/ipfw3-head/sys/dev/mge/if_mge.c
  user/luigi/ipfw3-head/sys/dev/mii/brgphy.c
  user/luigi/ipfw3-head/sys/dev/mii/miidevs
  user/luigi/ipfw3-head/sys/dev/mly/mly.c
  user/luigi/ipfw3-head/sys/dev/mpt/mpt_cam.c
  user/luigi/ipfw3-head/sys/dev/mpt/mpt_cam.h
  user/luigi/ipfw3-head/sys/dev/mpt/mpt_raid.c
  user/luigi/ipfw3-head/sys/dev/msk/if_msk.c
  user/luigi/ipfw3-head/sys/dev/msk/if_mskreg.h
  user/luigi/ipfw3-head/sys/dev/mxge/eth_z8e.h
  user/luigi/ipfw3-head/sys/dev/mxge/ethp_z8e.h
  user/luigi/ipfw3-head/sys/dev/mxge/if_mxge.c
  user/luigi/ipfw3-head/sys/dev/mxge/rss_eth_z8e.h
  user/luigi/ipfw3-head/sys/dev/mxge/rss_ethp_z8e.h
  user/luigi/ipfw3-head/sys/dev/nve/if_nve.c
  user/luigi/ipfw3-head/sys/dev/ofw/ofw_pci.h
  user/luigi/ipfw3-head/sys/dev/patm/if_patm_intr.c
  user/luigi/ipfw3-head/sys/dev/pci/pci.c
  user/luigi/ipfw3-head/sys/dev/pci/pci_private.h
  user/luigi/ipfw3-head/sys/dev/pci/pcireg.h
  user/luigi/ipfw3-head/sys/dev/pci/pcivar.h
  user/luigi/ipfw3-head/sys/dev/pdq/if_fea.c
  user/luigi/ipfw3-head/sys/dev/ppbus/vpo.c
  user/luigi/ipfw3-head/sys/dev/re/if_re.c
  user/luigi/ipfw3-head/sys/dev/safe/safe.c
  user/luigi/ipfw3-head/sys/dev/siba/siba.c
  user/luigi/ipfw3-head/sys/dev/siba/siba_ids.h
  user/luigi/ipfw3-head/sys/dev/siba/siba_pcib.c
  user/luigi/ipfw3-head/sys/dev/siba/sibareg.h
  user/luigi/ipfw3-head/sys/dev/siba/sibavar.h
  user/luigi/ipfw3-head/sys/dev/siis/siis.c
  user/luigi/ipfw3-head/sys/dev/siis/siis.h
  user/luigi/ipfw3-head/sys/dev/sound/pci/hda/hdac.c
  user/luigi/ipfw3-head/sys/dev/sound/pci/hda/hdac_private.h
  user/luigi/ipfw3-head/sys/dev/sound/pci/maestro3.c
  user/luigi/ipfw3-head/sys/dev/sound/pcm/dsp.c
  user/luigi/ipfw3-head/sys/dev/sound/pcm/mixer.c
  user/luigi/ipfw3-head/sys/dev/sound/pcm/sndstat.c
  user/luigi/ipfw3-head/sys/dev/sound/pcm/sndstat.h
  user/luigi/ipfw3-head/sys/dev/sound/usb/uaudio.c
  user/luigi/ipfw3-head/sys/dev/sound/usb/uaudioreg.h
  user/luigi/ipfw3-head/sys/dev/ste/if_ste.c
  user/luigi/ipfw3-head/sys/dev/stge/if_stge.c
  user/luigi/ipfw3-head/sys/dev/stge/if_stgereg.h
  user/luigi/ipfw3-head/sys/dev/syscons/scvidctl.c
  user/luigi/ipfw3-head/sys/dev/syscons/snake/snake_saver.c
  user/luigi/ipfw3-head/sys/dev/syscons/syscons.c
  user/luigi/ipfw3-head/sys/dev/syscons/syscons.h
  user/luigi/ipfw3-head/sys/dev/trm/trm.c
  user/luigi/ipfw3-head/sys/dev/twa/tw_osl_cam.c
  user/luigi/ipfw3-head/sys/dev/uart/uart_bus_pci.c
  user/luigi/ipfw3-head/sys/dev/usb/controller/ehci.c
  user/luigi/ipfw3-head/sys/dev/usb/controller/ehci.h
  user/luigi/ipfw3-head/sys/dev/usb/controller/ehci_pci.c
  user/luigi/ipfw3-head/sys/dev/usb/controller/musb_otg.c
  user/luigi/ipfw3-head/sys/dev/usb/controller/uhci.c
  user/luigi/ipfw3-head/sys/dev/usb/input/ukbd.c
  user/luigi/ipfw3-head/sys/dev/usb/quirk/usb_quirk.c
  user/luigi/ipfw3-head/sys/dev/usb/quirk/usb_quirk.h
  user/luigi/ipfw3-head/sys/dev/usb/serial/u3g.c
  user/luigi/ipfw3-head/sys/dev/usb/serial/uftdi.c
  user/luigi/ipfw3-head/sys/dev/usb/serial/umodem.c
  user/luigi/ipfw3-head/sys/dev/usb/storage/umass.c
  user/luigi/ipfw3-head/sys/dev/usb/usb_device.c
  user/luigi/ipfw3-head/sys/dev/usb/usb_msctest.c
  user/luigi/ipfw3-head/sys/dev/usb/usb_msctest.h
  user/luigi/ipfw3-head/sys/dev/usb/usbdevs
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_rum.c
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_uath.c
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_urtw.c
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_urtwvar.h
  user/luigi/ipfw3-head/sys/dev/usb/wlan/if_zyd.c
  user/luigi/ipfw3-head/sys/dev/xen/netfront/netfront.c
  user/luigi/ipfw3-head/sys/fs/cd9660/cd9660_vfsops.c
  user/luigi/ipfw3-head/sys/fs/cd9660/cd9660_vnops.c
  user/luigi/ipfw3-head/sys/fs/devfs/devfs_devs.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/bootsect.h
  user/luigi/ipfw3-head/sys/fs/msdosfs/bpb.h
  user/luigi/ipfw3-head/sys/fs/msdosfs/denode.h
  user/luigi/ipfw3-head/sys/fs/msdosfs/direntry.h
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_conv.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_denode.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_fat.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_fileno.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_lookup.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_vfsops.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfs_vnops.c
  user/luigi/ipfw3-head/sys/fs/msdosfs/msdosfsmount.h
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs.h
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clbio.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clnfsiod.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clsubs.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clvfsops.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfs_clvnops.c
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfsmount.h
  user/luigi/ipfw3-head/sys/fs/nfsclient/nfsnode.h
  user/luigi/ipfw3-head/sys/fs/nfsserver/nfs_nfsdcache.c
  user/luigi/ipfw3-head/sys/fs/nfsserver/nfs_nfsdstate.c
  user/luigi/ipfw3-head/sys/fs/nwfs/nwfs_node.c
  user/luigi/ipfw3-head/sys/fs/nwfs/nwfs_vnops.c
  user/luigi/ipfw3-head/sys/fs/procfs/procfs_status.c
  user/luigi/ipfw3-head/sys/fs/pseudofs/pseudofs_vnops.c
  user/luigi/ipfw3-head/sys/fs/smbfs/smbfs_smb.c
  user/luigi/ipfw3-head/sys/fs/tmpfs/tmpfs.h
  user/luigi/ipfw3-head/sys/fs/tmpfs/tmpfs_subr.c
  user/luigi/ipfw3-head/sys/fs/tmpfs/tmpfs_vfsops.c
  user/luigi/ipfw3-head/sys/geom/eli/g_eli_key.c
  user/luigi/ipfw3-head/sys/geom/gate/g_gate.c
  user/luigi/ipfw3-head/sys/geom/gate/g_gate.h
  user/luigi/ipfw3-head/sys/geom/geom_dump.c
  user/luigi/ipfw3-head/sys/geom/geom_redboot.c
  user/luigi/ipfw3-head/sys/geom/geom_slice.c
  user/luigi/ipfw3-head/sys/geom/geom_subr.c
  user/luigi/ipfw3-head/sys/geom/mirror/g_mirror.c
  user/luigi/ipfw3-head/sys/geom/multipath/g_multipath.c
  user/luigi/ipfw3-head/sys/geom/part/g_part.c
  user/luigi/ipfw3-head/sys/geom/part/g_part_bsd.c
  user/luigi/ipfw3-head/sys/geom/part/g_part_gpt.c
  user/luigi/ipfw3-head/sys/geom/part/g_part_vtoc8.c
  user/luigi/ipfw3-head/sys/geom/raid3/g_raid3.c
  user/luigi/ipfw3-head/sys/geom/stripe/g_stripe.c
  user/luigi/ipfw3-head/sys/geom/uzip/g_uzip.c
  user/luigi/ipfw3-head/sys/geom/vinum/geom_vinum.c
  user/luigi/ipfw3-head/sys/geom/vinum/geom_vinum_create.c
  user/luigi/ipfw3-head/sys/geom/virstor/g_virstor.c
  user/luigi/ipfw3-head/sys/gnu/fs/reiserfs/reiserfs_fs.h
  user/luigi/ipfw3-head/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  user/luigi/ipfw3-head/sys/i386/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/i386/conf/GENERIC
  user/luigi/ipfw3-head/sys/i386/conf/Makefile
  user/luigi/ipfw3-head/sys/i386/conf/NOTES
  user/luigi/ipfw3-head/sys/i386/conf/PAE
  user/luigi/ipfw3-head/sys/i386/conf/XEN
  user/luigi/ipfw3-head/sys/i386/i386/exception.s
  user/luigi/ipfw3-head/sys/i386/i386/i686_mem.c
  user/luigi/ipfw3-head/sys/i386/i386/io.c
  user/luigi/ipfw3-head/sys/i386/i386/local_apic.c
  user/luigi/ipfw3-head/sys/i386/i386/locore.s
  user/luigi/ipfw3-head/sys/i386/i386/machdep.c
  user/luigi/ipfw3-head/sys/i386/i386/mca.c
  user/luigi/ipfw3-head/sys/i386/i386/msi.c
  user/luigi/ipfw3-head/sys/i386/i386/nexus.c
  user/luigi/ipfw3-head/sys/i386/i386/pmap.c
  user/luigi/ipfw3-head/sys/i386/i386/trap.c
  user/luigi/ipfw3-head/sys/i386/i386/vm_machdep.c
  user/luigi/ipfw3-head/sys/i386/ibcs2/ibcs2_misc.c
  user/luigi/ipfw3-head/sys/i386/ibcs2/syscalls.master
  user/luigi/ipfw3-head/sys/i386/include/apicvar.h
  user/luigi/ipfw3-head/sys/i386/include/iodev.h
  user/luigi/ipfw3-head/sys/i386/include/pmap.h
  user/luigi/ipfw3-head/sys/i386/xen/clock.c
  user/luigi/ipfw3-head/sys/i386/xen/locore.s
  user/luigi/ipfw3-head/sys/i386/xen/mp_machdep.c
  user/luigi/ipfw3-head/sys/i386/xen/pmap.c
  user/luigi/ipfw3-head/sys/i386/xen/xen_machdep.c
  user/luigi/ipfw3-head/sys/ia64/acpica/madt.c
  user/luigi/ipfw3-head/sys/ia64/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/ia64/conf/GENERIC
  user/luigi/ipfw3-head/sys/ia64/conf/Makefile
  user/luigi/ipfw3-head/sys/ia64/ia64/bus_machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/context.S
  user/luigi/ipfw3-head/sys/ia64/ia64/efi.c
  user/luigi/ipfw3-head/sys/ia64/ia64/exception.S
  user/luigi/ipfw3-head/sys/ia64/ia64/interrupt.c
  user/luigi/ipfw3-head/sys/ia64/ia64/locore.S
  user/luigi/ipfw3-head/sys/ia64/ia64/machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/mp_machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/nexus.c
  user/luigi/ipfw3-head/sys/ia64/ia64/pmap.c
  user/luigi/ipfw3-head/sys/ia64/ia64/sapic.c
  user/luigi/ipfw3-head/sys/ia64/ia64/support.S
  user/luigi/ipfw3-head/sys/ia64/ia64/sys_machdep.c
  user/luigi/ipfw3-head/sys/ia64/ia64/syscall.S
  user/luigi/ipfw3-head/sys/ia64/ia64/trap.c
  user/luigi/ipfw3-head/sys/ia64/include/bus.h
  user/luigi/ipfw3-head/sys/ia64/include/efi.h
  user/luigi/ipfw3-head/sys/ia64/include/intr.h
  user/luigi/ipfw3-head/sys/ia64/include/md_var.h
  user/luigi/ipfw3-head/sys/ia64/include/pci_cfgreg.h
  user/luigi/ipfw3-head/sys/ia64/include/pmap.h
  user/luigi/ipfw3-head/sys/ia64/include/sysarch.h
  user/luigi/ipfw3-head/sys/ia64/include/vmparam.h
  user/luigi/ipfw3-head/sys/ia64/pci/pci_cfgreg.c
  user/luigi/ipfw3-head/sys/isa/pnp.c
  user/luigi/ipfw3-head/sys/kern/imgact_elf.c
  user/luigi/ipfw3-head/sys/kern/kern_clock.c
  user/luigi/ipfw3-head/sys/kern/kern_conf.c
  user/luigi/ipfw3-head/sys/kern/kern_cpu.c
  user/luigi/ipfw3-head/sys/kern/kern_environment.c
  user/luigi/ipfw3-head/sys/kern/kern_event.c
  user/luigi/ipfw3-head/sys/kern/kern_fail.c
  user/luigi/ipfw3-head/sys/kern/kern_intr.c
  user/luigi/ipfw3-head/sys/kern/kern_jail.c
  user/luigi/ipfw3-head/sys/kern/kern_kthread.c
  user/luigi/ipfw3-head/sys/kern/kern_lock.c
  user/luigi/ipfw3-head/sys/kern/kern_mib.c
  user/luigi/ipfw3-head/sys/kern/kern_mutex.c
  user/luigi/ipfw3-head/sys/kern/kern_proc.c
  user/luigi/ipfw3-head/sys/kern/kern_prot.c
  user/luigi/ipfw3-head/sys/kern/kern_shutdown.c
  user/luigi/ipfw3-head/sys/kern/kern_sig.c
  user/luigi/ipfw3-head/sys/kern/kern_thr.c
  user/luigi/ipfw3-head/sys/kern/kern_umtx.c
  user/luigi/ipfw3-head/sys/kern/link_elf_obj.c
  user/luigi/ipfw3-head/sys/kern/makesyscalls.sh
  user/luigi/ipfw3-head/sys/kern/sched_4bsd.c
  user/luigi/ipfw3-head/sys/kern/sched_ule.c
  user/luigi/ipfw3-head/sys/kern/subr_acl_nfs4.c
  user/luigi/ipfw3-head/sys/kern/subr_bus.c
  user/luigi/ipfw3-head/sys/kern/subr_firmware.c
  user/luigi/ipfw3-head/sys/kern/subr_param.c
  user/luigi/ipfw3-head/sys/kern/subr_sleepqueue.c
  user/luigi/ipfw3-head/sys/kern/subr_turnstile.c
  user/luigi/ipfw3-head/sys/kern/sys_process.c
  user/luigi/ipfw3-head/sys/kern/syscalls.master
  user/luigi/ipfw3-head/sys/kern/tty.c
  user/luigi/ipfw3-head/sys/kern/tty_compat.c
  user/luigi/ipfw3-head/sys/kern/tty_inq.c
  user/luigi/ipfw3-head/sys/kern/tty_outq.c
  user/luigi/ipfw3-head/sys/kern/tty_pts.c
  user/luigi/ipfw3-head/sys/kern/uipc_sem.c
  user/luigi/ipfw3-head/sys/kern/uipc_socket.c
  user/luigi/ipfw3-head/sys/kern/uipc_syscalls.c
  user/luigi/ipfw3-head/sys/kern/vfs_default.c
  user/luigi/ipfw3-head/sys/kern/vfs_lookup.c
  user/luigi/ipfw3-head/sys/kern/vfs_mount.c
  user/luigi/ipfw3-head/sys/kern/vfs_subr.c
  user/luigi/ipfw3-head/sys/kern/vfs_syscalls.c
  user/luigi/ipfw3-head/sys/mips/adm5120/adm5120_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/files.adm5120   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/obio.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/uart_cpu_adm5120.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/ADM5120   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/DEFAULTS   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/IDT   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/MALTA   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/QEMU   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/conf/SENTRY5   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/idt/files.idt   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/idt/idt_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/idt/obio.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/idt/uart_bus_rc32434.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/idt/uart_cpu_rc32434.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/_align.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/_bus.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/_types.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/asm.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/atomic.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/bus.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cache.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cache_mipsNN.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cpu.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cpufunc.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cpuinfo.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/cpuregs.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/db_machdep.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/elf.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/endian.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/float.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/hwfunc.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/intr_machdep.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/kdb.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/locore.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/md_var.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/param.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/pcb.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/pcpu.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/pmap.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/proc.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/profile.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/psl.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/pte.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/regdef.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/regnum.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/smp.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/sysarch.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/trap.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/include/ucontext.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/files.malta   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/gt_pci.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/malta_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/maltareg.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/obio.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/std.malta   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/uart_bus_maltausart.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/uart_cpu_maltausart.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/malta/yamon.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/busdma_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/cache.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/cache_mipsNN.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/copystr.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/cpu.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/db_trace.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/elf_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/exception.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/fp.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/gdb_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/genassym.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/in_cksum.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/intr_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/locore.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/mainbus.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/mem.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/mp_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/nexus.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/pm_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/pmap.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/psraccess.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/support.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/swtch.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/tick.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/tlb.S   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/trap.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/mips/vm_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/files.sentry5   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/obio.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/s5_machdep.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/uart_bus_sbusart.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/uart_cpu_sbusart.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/modules/Makefile
  user/luigi/ipfw3-head/sys/modules/ath/Makefile
  user/luigi/ipfw3-head/sys/modules/bios/smbios/Makefile
  user/luigi/ipfw3-head/sys/modules/bios/vpd/Makefile
  user/luigi/ipfw3-head/sys/modules/cpufreq/Makefile
  user/luigi/ipfw3-head/sys/modules/crypto/Makefile
  user/luigi/ipfw3-head/sys/modules/cxgb/cxgb/Makefile
  user/luigi/ipfw3-head/sys/modules/drm/Makefile
  user/luigi/ipfw3-head/sys/modules/drm/drm/Makefile
  user/luigi/ipfw3-head/sys/modules/ext2fs/Makefile
  user/luigi/ipfw3-head/sys/modules/geom/Makefile
  user/luigi/ipfw3-head/sys/modules/nfsclient/Makefile
  user/luigi/ipfw3-head/sys/modules/nfsserver/Makefile
  user/luigi/ipfw3-head/sys/modules/usb/Makefile
  user/luigi/ipfw3-head/sys/net/bpf.c
  user/luigi/ipfw3-head/sys/net/flowtable.c
  user/luigi/ipfw3-head/sys/net/if.c
  user/luigi/ipfw3-head/sys/net/if.h
  user/luigi/ipfw3-head/sys/net/if_bridge.c
  user/luigi/ipfw3-head/sys/net/if_epair.c
  user/luigi/ipfw3-head/sys/net/if_gre.c
  user/luigi/ipfw3-head/sys/net/if_gre.h
  user/luigi/ipfw3-head/sys/net/if_lagg.c
  user/luigi/ipfw3-head/sys/net/if_lagg.h
  user/luigi/ipfw3-head/sys/net/if_loop.c
  user/luigi/ipfw3-head/sys/net/if_tap.c
  user/luigi/ipfw3-head/sys/net/if_tun.c
  user/luigi/ipfw3-head/sys/net/if_var.h
  user/luigi/ipfw3-head/sys/net/if_vlan.c
  user/luigi/ipfw3-head/sys/net/netisr.c
  user/luigi/ipfw3-head/sys/net/netisr.h
  user/luigi/ipfw3-head/sys/net/radix.c
  user/luigi/ipfw3-head/sys/net/vnet.c
  user/luigi/ipfw3-head/sys/net/vnet.h
  user/luigi/ipfw3-head/sys/net/zlib.h
  user/luigi/ipfw3-head/sys/net80211/ieee80211.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_adhoc.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_crypto_tkip.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_freebsd.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_hostap.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_ioctl.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_mesh.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_mesh.h
  user/luigi/ipfw3-head/sys/net80211/ieee80211_node.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_sta.c
  user/luigi/ipfw3-head/sys/net80211/ieee80211_var.h
  user/luigi/ipfw3-head/sys/net80211/ieee80211_wds.c
  user/luigi/ipfw3-head/sys/netgraph/ng_eiface.c
  user/luigi/ipfw3-head/sys/netgraph/ng_ether.c
  user/luigi/ipfw3-head/sys/netgraph/ng_fec.c
  user/luigi/ipfw3-head/sys/netinet/if_ether.c
  user/luigi/ipfw3-head/sys/netinet/in.c
  user/luigi/ipfw3-head/sys/netinet/in_pcb.c
  user/luigi/ipfw3-head/sys/netinet/in_proto.c
  user/luigi/ipfw3-head/sys/netinet/ip_carp.c
  user/luigi/ipfw3-head/sys/netinet/ip_gre.c
  user/luigi/ipfw3-head/sys/netinet/ip_gre.h
  user/luigi/ipfw3-head/sys/netinet/ip_input.c
  user/luigi/ipfw3-head/sys/netinet/ip_mroute.c
  user/luigi/ipfw3-head/sys/netinet/ip_options.c
  user/luigi/ipfw3-head/sys/netinet/ip_var.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_qfq.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dummynet.txt
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_glue.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/Makefile   (contents, props changed)
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/dn_test.h   (contents, props changed)
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/main.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/mylist.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/test_dn_heap.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/test_dn_sched.c   (contents, props changed)
  user/luigi/ipfw3-head/sys/netinet/libalias/alias_db.c
  user/luigi/ipfw3-head/sys/netinet/libalias/alias_mod.c
  user/luigi/ipfw3-head/sys/netinet/sctp_asconf.c
  user/luigi/ipfw3-head/sys/netinet/sctp_auth.c
  user/luigi/ipfw3-head/sys/netinet/sctp_auth.h
  user/luigi/ipfw3-head/sys/netinet/sctp_constants.h
  user/luigi/ipfw3-head/sys/netinet/sctp_header.h
  user/luigi/ipfw3-head/sys/netinet/sctp_indata.c
  user/luigi/ipfw3-head/sys/netinet/sctp_indata.h
  user/luigi/ipfw3-head/sys/netinet/sctp_input.c
  user/luigi/ipfw3-head/sys/netinet/sctp_os_bsd.h
  user/luigi/ipfw3-head/sys/netinet/sctp_output.c
  user/luigi/ipfw3-head/sys/netinet/sctp_output.h
  user/luigi/ipfw3-head/sys/netinet/sctp_pcb.c
  user/luigi/ipfw3-head/sys/netinet/sctp_structs.h
  user/luigi/ipfw3-head/sys/netinet/sctp_sysctl.c
  user/luigi/ipfw3-head/sys/netinet/sctp_uio.h
  user/luigi/ipfw3-head/sys/netinet/sctp_usrreq.c
  user/luigi/ipfw3-head/sys/netinet/sctputil.c
  user/luigi/ipfw3-head/sys/netinet/tcp_hostcache.c
  user/luigi/ipfw3-head/sys/netinet/tcp_syncache.c
  user/luigi/ipfw3-head/sys/netinet/tcp_var.h
  user/luigi/ipfw3-head/sys/netinet6/icmp6.c
  user/luigi/ipfw3-head/sys/netinet6/in6_pcb.c
  user/luigi/ipfw3-head/sys/netinet6/in6_proto.c
  user/luigi/ipfw3-head/sys/netinet6/in6_src.c
  user/luigi/ipfw3-head/sys/netinet6/ip6_input.c
  user/luigi/ipfw3-head/sys/netinet6/nd6.c
  user/luigi/ipfw3-head/sys/netinet6/nd6_rtr.c
  user/luigi/ipfw3-head/sys/netipsec/keydb.h
  user/luigi/ipfw3-head/sys/nfs/nfs_common.c
  user/luigi/ipfw3-head/sys/nfs/nfs_common.h
  user/luigi/ipfw3-head/sys/nfsclient/bootp_subr.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs.h
  user/luigi/ipfw3-head/sys/nfsclient/nfs_bio.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_kdtrace.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_krpc.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_nfsiod.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_subs.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_vfsops.c
  user/luigi/ipfw3-head/sys/nfsclient/nfs_vnops.c
  user/luigi/ipfw3-head/sys/nfsclient/nfsmount.h
  user/luigi/ipfw3-head/sys/nfsclient/nfsnode.h
  user/luigi/ipfw3-head/sys/nfsserver/nfs.h
  user/luigi/ipfw3-head/sys/nfsserver/nfs_fha.c
  user/luigi/ipfw3-head/sys/nfsserver/nfs_srvkrpc.c
  user/luigi/ipfw3-head/sys/nfsserver/nfs_srvsubs.c
  user/luigi/ipfw3-head/sys/opencrypto/cryptosoft.c
  user/luigi/ipfw3-head/sys/pc98/cbus/clock.c
  user/luigi/ipfw3-head/sys/pc98/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/pc98/conf/GENERIC
  user/luigi/ipfw3-head/sys/pc98/conf/Makefile
  user/luigi/ipfw3-head/sys/pc98/pc98/machdep.c
  user/luigi/ipfw3-head/sys/pci/if_rlreg.h
  user/luigi/ipfw3-head/sys/pci/ncr.c
  user/luigi/ipfw3-head/sys/pci/nfsmb.c
  user/luigi/ipfw3-head/sys/powerpc/aim/machdep.c
  user/luigi/ipfw3-head/sys/powerpc/aim/mmu_oea.c
  user/luigi/ipfw3-head/sys/powerpc/aim/mmu_oea64.c
  user/luigi/ipfw3-head/sys/powerpc/aim/trap.c
  user/luigi/ipfw3-head/sys/powerpc/aim/uma_machdep.c
  user/luigi/ipfw3-head/sys/powerpc/booke/copyinout.c
  user/luigi/ipfw3-head/sys/powerpc/booke/machdep.c
  user/luigi/ipfw3-head/sys/powerpc/booke/pmap.c
  user/luigi/ipfw3-head/sys/powerpc/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/powerpc/conf/GENERIC
  user/luigi/ipfw3-head/sys/powerpc/conf/MPC85XX
  user/luigi/ipfw3-head/sys/powerpc/conf/Makefile
  user/luigi/ipfw3-head/sys/powerpc/include/pte.h
  user/luigi/ipfw3-head/sys/powerpc/include/sr.h
  user/luigi/ipfw3-head/sys/powerpc/include/vmparam.h
  user/luigi/ipfw3-head/sys/powerpc/mpc85xx/pci_ocp.c
  user/luigi/ipfw3-head/sys/powerpc/powermac/smu.c
  user/luigi/ipfw3-head/sys/powerpc/powerpc/cpu.c
  user/luigi/ipfw3-head/sys/powerpc/powerpc/mem.c
  user/luigi/ipfw3-head/sys/rpc/authunix_prot.c
  user/luigi/ipfw3-head/sys/rpc/clnt_dg.c
  user/luigi/ipfw3-head/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
  user/luigi/ipfw3-head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
  user/luigi/ipfw3-head/sys/security/audit/audit_arg.c
  user/luigi/ipfw3-head/sys/security/audit/audit_bsm.c
  user/luigi/ipfw3-head/sys/security/mac_biba/mac_biba.c
  user/luigi/ipfw3-head/sys/security/mac_lomac/mac_lomac.c
  user/luigi/ipfw3-head/sys/security/mac_mls/mac_mls.c
  user/luigi/ipfw3-head/sys/sparc64/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/sparc64/conf/GENERIC
  user/luigi/ipfw3-head/sys/sparc64/conf/Makefile
  user/luigi/ipfw3-head/sys/sparc64/conf/NOTES
  user/luigi/ipfw3-head/sys/sparc64/include/asi.h
  user/luigi/ipfw3-head/sys/sparc64/include/asmacros.h
  user/luigi/ipfw3-head/sys/sparc64/include/cache.h
  user/luigi/ipfw3-head/sys/sparc64/include/cpu.h
  user/luigi/ipfw3-head/sys/sparc64/include/ktr.h
  user/luigi/ipfw3-head/sys/sparc64/include/md_var.h
  user/luigi/ipfw3-head/sys/sparc64/include/pcpu.h
  user/luigi/ipfw3-head/sys/sparc64/include/pmap.h
  user/luigi/ipfw3-head/sys/sparc64/include/smp.h
  user/luigi/ipfw3-head/sys/sparc64/include/tick.h
  user/luigi/ipfw3-head/sys/sparc64/include/upa.h
  user/luigi/ipfw3-head/sys/sparc64/include/ver.h
  user/luigi/ipfw3-head/sys/sparc64/pci/fire.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/cache.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/cheetah.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/genassym.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/identcpu.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/iommu.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/locore.S
  user/luigi/ipfw3-head/sys/sparc64/sparc64/machdep.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/mp_locore.S
  user/luigi/ipfw3-head/sys/sparc64/sparc64/mp_machdep.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/nexus.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/pmap.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/spitfire.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/swtch.S
  user/luigi/ipfw3-head/sys/sparc64/sparc64/tick.c
  user/luigi/ipfw3-head/sys/sparc64/sparc64/trap.c
  user/luigi/ipfw3-head/sys/sun4v/conf/DEFAULTS
  user/luigi/ipfw3-head/sys/sun4v/conf/GENERIC
  user/luigi/ipfw3-head/sys/sun4v/conf/Makefile
  user/luigi/ipfw3-head/sys/sun4v/include/asi.h
  user/luigi/ipfw3-head/sys/sun4v/include/bus.h
  user/luigi/ipfw3-head/sys/sun4v/sun4v/bus_machdep.c
  user/luigi/ipfw3-head/sys/sys/_semaphore.h
  user/luigi/ipfw3-head/sys/sys/ata.h
  user/luigi/ipfw3-head/sys/sys/cdefs.h
  user/luigi/ipfw3-head/sys/sys/eventhandler.h
  user/luigi/ipfw3-head/sys/sys/fbio.h
  user/luigi/ipfw3-head/sys/sys/imgact.h
  user/luigi/ipfw3-head/sys/sys/imgact_aout.h
  user/luigi/ipfw3-head/sys/sys/imgact_elf.h
  user/luigi/ipfw3-head/sys/sys/jail.h
  user/luigi/ipfw3-head/sys/sys/kthread.h
  user/luigi/ipfw3-head/sys/sys/param.h
  user/luigi/ipfw3-head/sys/sys/priv.h
  user/luigi/ipfw3-head/sys/sys/proc.h
  user/luigi/ipfw3-head/sys/sys/ptrace.h
  user/luigi/ipfw3-head/sys/sys/queue.h
  user/luigi/ipfw3-head/sys/sys/signalvar.h
  user/luigi/ipfw3-head/sys/sys/sleepqueue.h
  user/luigi/ipfw3-head/sys/sys/socket.h
  user/luigi/ipfw3-head/sys/sys/sockio.h
  user/luigi/ipfw3-head/sys/sys/syscallsubr.h
  user/luigi/ipfw3-head/sys/sys/sysctl.h
  user/luigi/ipfw3-head/sys/sys/sysent.h
  user/luigi/ipfw3-head/sys/sys/systm.h
  user/luigi/ipfw3-head/sys/sys/timeb.h
  user/luigi/ipfw3-head/sys/sys/tty.h
  user/luigi/ipfw3-head/sys/sys/user.h
  user/luigi/ipfw3-head/sys/sys/vnode.h
  user/luigi/ipfw3-head/sys/teken/teken_scs.h
  user/luigi/ipfw3-head/sys/ufs/ffs/ffs_alloc.c
  user/luigi/ipfw3-head/sys/ufs/ffs/ffs_snapshot.c
  user/luigi/ipfw3-head/sys/ufs/ffs/ffs_vfsops.c
  user/luigi/ipfw3-head/sys/ufs/ffs/fs.h
  user/luigi/ipfw3-head/sys/ufs/ufs/ufs_acl.c
  user/luigi/ipfw3-head/sys/ufs/ufs/ufs_dirhash.c
  user/luigi/ipfw3-head/sys/ufs/ufs/ufs_lookup.c
  user/luigi/ipfw3-head/sys/ufs/ufs/ufs_vnops.c
  user/luigi/ipfw3-head/sys/vm/vm_init.c
  user/luigi/ipfw3-head/sys/vm/vm_map.c
  user/luigi/ipfw3-head/sys/vm/vm_page.c
  user/luigi/ipfw3-head/sys/vm/vm_pageout.c
  user/luigi/ipfw3-head/sys/vm/vnode_pager.c
  user/luigi/ipfw3-head/sys/xen/evtchn/evtchn_dev.c
  user/luigi/ipfw3-head/sys/xen/xenbus/xenbus_probe.c
  user/luigi/ipfw3-head/tools/build/mk/OptionalObsoleteFiles.inc
  user/luigi/ipfw3-head/tools/make_libdeps.sh
  user/luigi/ipfw3-head/tools/regression/bin/sh/expansion/arith2.0
  user/luigi/ipfw3-head/tools/regression/file/closefrom/Makefile
  user/luigi/ipfw3-head/tools/regression/file/flock/Makefile
  user/luigi/ipfw3-head/tools/regression/file/newfileops_on_fork/newfileops_on_fork.c
  user/luigi/ipfw3-head/tools/regression/gaithrstress/Makefile
  user/luigi/ipfw3-head/tools/regression/gaithrstress/gaithrstress.c
  user/luigi/ipfw3-head/tools/regression/kgssapi/Makefile
  user/luigi/ipfw3-head/tools/regression/kqueue/Makefile
  user/luigi/ipfw3-head/tools/regression/mqueue/mqtest1/Makefile
  user/luigi/ipfw3-head/tools/regression/mqueue/mqtest2/Makefile
  user/luigi/ipfw3-head/tools/regression/mqueue/mqtest3/Makefile
  user/luigi/ipfw3-head/tools/regression/mqueue/mqtest4/Makefile
  user/luigi/ipfw3-head/tools/regression/mqueue/mqtest5/Makefile
  user/luigi/ipfw3-head/tools/regression/netipx/ipxdgramloopback/Makefile
  user/luigi/ipfw3-head/tools/regression/netipx/spxabort/Makefile
  user/luigi/ipfw3-head/tools/regression/netipx/spxloopback/Makefile
  user/luigi/ipfw3-head/tools/regression/priv/Makefile
  user/luigi/ipfw3-head/tools/regression/pthread/cv_cancel1/Makefile
  user/luigi/ipfw3-head/tools/regression/pthread/mutex_isowned_np/Makefile
  user/luigi/ipfw3-head/tools/regression/rpcsec_gss/Makefile
  user/luigi/ipfw3-head/tools/regression/sigqueue/sigqtest1/Makefile
  user/luigi/ipfw3-head/tools/regression/sigqueue/sigqtest2/Makefile
  user/luigi/ipfw3-head/tools/regression/sockets/sendfile/Makefile
  user/luigi/ipfw3-head/tools/regression/sockets/sendfile/sendfile.c
  user/luigi/ipfw3-head/tools/regression/sockets/unix_gc/Makefile
  user/luigi/ipfw3-head/tools/regression/sockets/unix_sorflush/Makefile
  user/luigi/ipfw3-head/tools/regression/sysvsem/semtest.c
  user/luigi/ipfw3-head/tools/regression/tls/libxx/Makefile
  user/luigi/ipfw3-head/tools/regression/tls/libyy/Makefile
  user/luigi/ipfw3-head/tools/regression/tls/ttls1/Makefile
  user/luigi/ipfw3-head/tools/regression/tls/ttls2/Makefile
  user/luigi/ipfw3-head/tools/regression/tls/ttls4/Makefile
  user/luigi/ipfw3-head/tools/regression/tmpfs/Makefile
  user/luigi/ipfw3-head/tools/regression/usr.bin/calendar/regress.sh
  user/luigi/ipfw3-head/tools/regression/usr.bin/env/Makefile
  user/luigi/ipfw3-head/tools/regression/usr.bin/make/common.sh
  user/luigi/ipfw3-head/tools/regression/usr.bin/pkill/pgrep-t.t
  user/luigi/ipfw3-head/tools/regression/usr.bin/pkill/pkill-t.t
  user/luigi/ipfw3-head/tools/regression/usr.bin/sed/multitest.t
  user/luigi/ipfw3-head/tools/tools/ath/athdecode/main.c
  user/luigi/ipfw3-head/tools/tools/ether_reflect/Makefile
  user/luigi/ipfw3-head/tools/tools/mctest/Makefile
  user/luigi/ipfw3-head/tools/tools/mctest/mctest.1
  user/luigi/ipfw3-head/tools/tools/mctest/mctest.cc
  user/luigi/ipfw3-head/tools/tools/net80211/stumbler/Makefile
  user/luigi/ipfw3-head/tools/tools/net80211/w00t/Makefile.inc
  user/luigi/ipfw3-head/tools/tools/netrate/http/Makefile
  user/luigi/ipfw3-head/tools/tools/netrate/http/http.c
  user/luigi/ipfw3-head/tools/tools/netrate/httpd/Makefile
  user/luigi/ipfw3-head/tools/tools/netrate/httpd/httpd.c
  user/luigi/ipfw3-head/tools/tools/netrate/juggle/Makefile
  user/luigi/ipfw3-head/tools/tools/netrate/juggle/juggle.c
  user/luigi/ipfw3-head/tools/tools/netrate/tcpconnect/Makefile
  user/luigi/ipfw3-head/tools/tools/netrate/tcpp/Makefile
  user/luigi/ipfw3-head/tools/tools/netrate/tcpreceive/Makefile
  user/luigi/ipfw3-head/tools/tools/umastat/Makefile
  user/luigi/ipfw3-head/usr.bin/Makefile
  user/luigi/ipfw3-head/usr.bin/at/at.man
  user/luigi/ipfw3-head/usr.bin/awk/Makefile
  user/luigi/ipfw3-head/usr.bin/brandelf/brandelf.1
  user/luigi/ipfw3-head/usr.bin/calendar/calendars/calendar.freebsd
  user/luigi/ipfw3-head/usr.bin/catman/catman.c
  user/luigi/ipfw3-head/usr.bin/chpass/chpass.1
  user/luigi/ipfw3-head/usr.bin/cpio/Makefile
  user/luigi/ipfw3-head/usr.bin/cpio/bsdcpio.1
  user/luigi/ipfw3-head/usr.bin/cpio/cmdline.c
  user/luigi/ipfw3-head/usr.bin/cpio/cpio.c
  user/luigi/ipfw3-head/usr.bin/cpio/cpio.h
  user/luigi/ipfw3-head/usr.bin/ctags/Makefile
  user/luigi/ipfw3-head/usr.bin/ctags/ctags.c
  user/luigi/ipfw3-head/usr.bin/ctags/fortran.c
  user/luigi/ipfw3-head/usr.bin/ee/Makefile
  user/luigi/ipfw3-head/usr.bin/elf2aout/elf2aout.1
  user/luigi/ipfw3-head/usr.bin/elf2aout/elf2aout.c
  user/luigi/ipfw3-head/usr.bin/elfdump/elfdump.1
  user/luigi/ipfw3-head/usr.bin/fetch/Makefile
  user/luigi/ipfw3-head/usr.bin/find/Makefile
  user/luigi/ipfw3-head/usr.bin/find/extern.h
  user/luigi/ipfw3-head/usr.bin/find/function.c
  user/luigi/ipfw3-head/usr.bin/find/getdate.y
  user/luigi/ipfw3-head/usr.bin/finger/Makefile
  user/luigi/ipfw3-head/usr.bin/finger/finger.1
  user/luigi/ipfw3-head/usr.bin/finger/finger.c
  user/luigi/ipfw3-head/usr.bin/finger/lprint.c
  user/luigi/ipfw3-head/usr.bin/finger/net.c
  user/luigi/ipfw3-head/usr.bin/finger/sprint.c
  user/luigi/ipfw3-head/usr.bin/finger/util.c
  user/luigi/ipfw3-head/usr.bin/gcore/Makefile
  user/luigi/ipfw3-head/usr.bin/gcore/extern.h
  user/luigi/ipfw3-head/usr.bin/gcore/gcore.c
  user/luigi/ipfw3-head/usr.bin/gencat/gencat.c
  user/luigi/ipfw3-head/usr.bin/getent/getent.1
  user/luigi/ipfw3-head/usr.bin/getent/getent.c
  user/luigi/ipfw3-head/usr.bin/hexdump/hexdump.1
  user/luigi/ipfw3-head/usr.bin/hexdump/od.1
  user/luigi/ipfw3-head/usr.bin/jot/jot.1
  user/luigi/ipfw3-head/usr.bin/kdump/kdump.c
  user/luigi/ipfw3-head/usr.bin/last/last.1
  user/luigi/ipfw3-head/usr.bin/last/last.c
  user/luigi/ipfw3-head/usr.bin/lastcomm/lastcomm.c
  user/luigi/ipfw3-head/usr.bin/locale/Makefile
  user/luigi/ipfw3-head/usr.bin/make/dir.c
  user/luigi/ipfw3-head/usr.bin/make/dir.h
  user/luigi/ipfw3-head/usr.bin/make/job.c
  user/luigi/ipfw3-head/usr.bin/make/main.c
  user/luigi/ipfw3-head/usr.bin/make/make.1
  user/luigi/ipfw3-head/usr.bin/makewhatis/makewhatis.c
  user/luigi/ipfw3-head/usr.bin/ncplist/ncplist.1
  user/luigi/ipfw3-head/usr.bin/netstat/Makefile
  user/luigi/ipfw3-head/usr.bin/netstat/if.c
  user/luigi/ipfw3-head/usr.bin/netstat/main.c
  user/luigi/ipfw3-head/usr.bin/netstat/netstat.1
  user/luigi/ipfw3-head/usr.bin/netstat/netstat.h
  user/luigi/ipfw3-head/usr.bin/nl/nl.1
  user/luigi/ipfw3-head/usr.bin/nl/nl.c
  user/luigi/ipfw3-head/usr.bin/pr/Makefile
  user/luigi/ipfw3-head/usr.bin/pr/egetopt.c
  user/luigi/ipfw3-head/usr.bin/pr/pr.c
  user/luigi/ipfw3-head/usr.bin/procstat/procstat.1
  user/luigi/ipfw3-head/usr.bin/stat/stat.1
  user/luigi/ipfw3-head/usr.bin/stat/stat.c
  user/luigi/ipfw3-head/usr.bin/systat/Makefile
  user/luigi/ipfw3-head/usr.bin/systat/vmstat.c
  user/luigi/ipfw3-head/usr.bin/talk/talk.1
  user/luigi/ipfw3-head/usr.bin/tar/Makefile
  user/luigi/ipfw3-head/usr.bin/tar/bsdtar.c
  user/luigi/ipfw3-head/usr.bin/tar/bsdtar.h
  user/luigi/ipfw3-head/usr.bin/tar/bsdtar_platform.h
  user/luigi/ipfw3-head/usr.bin/tar/cmdline.c
  user/luigi/ipfw3-head/usr.bin/tar/config_freebsd.h
  user/luigi/ipfw3-head/usr.bin/tar/getdate.c
  user/luigi/ipfw3-head/usr.bin/tar/matching.c
  user/luigi/ipfw3-head/usr.bin/tar/read.c
  user/luigi/ipfw3-head/usr.bin/tar/subst.c
  user/luigi/ipfw3-head/usr.bin/tar/test/test_option_T.c
  user/luigi/ipfw3-head/usr.bin/tar/test/test_option_s.c
  user/luigi/ipfw3-head/usr.bin/tar/tree.c
  user/luigi/ipfw3-head/usr.bin/tar/util.c
  user/luigi/ipfw3-head/usr.bin/tar/write.c
  user/luigi/ipfw3-head/usr.bin/tcopy/tcopy.c
  user/luigi/ipfw3-head/usr.bin/truss/mips-fbsd.c
  user/luigi/ipfw3-head/usr.bin/uname/uname.1
  user/luigi/ipfw3-head/usr.bin/uname/uname.c
  user/luigi/ipfw3-head/usr.bin/unifdef/unifdef.1
  user/luigi/ipfw3-head/usr.bin/unifdef/unifdef.c
  user/luigi/ipfw3-head/usr.bin/unifdef/unifdefall.sh
  user/luigi/ipfw3-head/usr.bin/unzip/Makefile
  user/luigi/ipfw3-head/usr.bin/unzip/unzip.1
  user/luigi/ipfw3-head/usr.bin/unzip/unzip.c
  user/luigi/ipfw3-head/usr.bin/usbhidaction/usbhidaction.1
  user/luigi/ipfw3-head/usr.bin/usbhidaction/usbhidaction.c
  user/luigi/ipfw3-head/usr.bin/usbhidctl/usbhid.c
  user/luigi/ipfw3-head/usr.bin/usbhidctl/usbhidctl.1
  user/luigi/ipfw3-head/usr.bin/users/Makefile
  user/luigi/ipfw3-head/usr.bin/users/users.1
  user/luigi/ipfw3-head/usr.bin/users/users.c
  user/luigi/ipfw3-head/usr.bin/w/Makefile
  user/luigi/ipfw3-head/usr.bin/w/w.1
  user/luigi/ipfw3-head/usr.bin/w/w.c
  user/luigi/ipfw3-head/usr.bin/wall/Makefile
  user/luigi/ipfw3-head/usr.bin/wall/wall.c
  user/luigi/ipfw3-head/usr.bin/who/Makefile
  user/luigi/ipfw3-head/usr.bin/who/who.1
  user/luigi/ipfw3-head/usr.bin/who/who.c
  user/luigi/ipfw3-head/usr.bin/whois/whois.1
  user/luigi/ipfw3-head/usr.bin/whois/whois.c
  user/luigi/ipfw3-head/usr.bin/write/Makefile
  user/luigi/ipfw3-head/usr.bin/write/write.c
  user/luigi/ipfw3-head/usr.bin/xinstall/xinstall.c
  user/luigi/ipfw3-head/usr.bin/xlint/lint1/makeman
  user/luigi/ipfw3-head/usr.bin/xlint/xlint/Makefile
  user/luigi/ipfw3-head/usr.bin/xlint/xlint/xlint.c
  user/luigi/ipfw3-head/usr.sbin/Makefile
  user/luigi/ipfw3-head/usr.sbin/ac/ac.8
  user/luigi/ipfw3-head/usr.sbin/ac/ac.c
  user/luigi/ipfw3-head/usr.sbin/acpi/acpidb/acpidb.c
  user/luigi/ipfw3-head/usr.sbin/adduser/adduser.sh
  user/luigi/ipfw3-head/usr.sbin/arp/arp.c
  user/luigi/ipfw3-head/usr.sbin/auditd/Makefile
  user/luigi/ipfw3-head/usr.sbin/boot0cfg/Makefile
  user/luigi/ipfw3-head/usr.sbin/bootparamd/bootparamd/bootparamd.c
  user/luigi/ipfw3-head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
  user/luigi/ipfw3-head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
  user/luigi/ipfw3-head/usr.sbin/burncd/burncd.c
  user/luigi/ipfw3-head/usr.sbin/cdcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/cdcontrol/cdcontrol.c
  user/luigi/ipfw3-head/usr.sbin/chown/chgrp.1
  user/luigi/ipfw3-head/usr.sbin/chown/chown.8
  user/luigi/ipfw3-head/usr.sbin/chown/chown.c
  user/luigi/ipfw3-head/usr.sbin/ctm/ctm_smail/ctm_smail.c
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/Makefile
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/cxgbtool.c
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/reg_defs.c
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/reg_defs_t3.c
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/reg_defs_t3b.c
  user/luigi/ipfw3-head/usr.sbin/cxgbtool/reg_defs_t3c.c
  user/luigi/ipfw3-head/usr.sbin/eeprom/eeprom.8
  user/luigi/ipfw3-head/usr.sbin/eeprom/eeprom.c
  user/luigi/ipfw3-head/usr.sbin/extattr/rmextattr.c
  user/luigi/ipfw3-head/usr.sbin/faithd/faithd.8
  user/luigi/ipfw3-head/usr.sbin/ftp-proxy/Makefile.inc
  user/luigi/ipfw3-head/usr.sbin/fwcontrol/Makefile
  user/luigi/ipfw3-head/usr.sbin/jail/jail.8
  user/luigi/ipfw3-head/usr.sbin/lastlogin/Makefile
  user/luigi/ipfw3-head/usr.sbin/lastlogin/lastlogin.8
  user/luigi/ipfw3-head/usr.sbin/lastlogin/lastlogin.c
  user/luigi/ipfw3-head/usr.sbin/lpr/common_source/lp.h
  user/luigi/ipfw3-head/usr.sbin/lpr/common_source/rmjob.c
  user/luigi/ipfw3-head/usr.sbin/makefs/compat/pwcache.c
  user/luigi/ipfw3-head/usr.sbin/makefs/compat/strsuftoll.c
  user/luigi/ipfw3-head/usr.sbin/makefs/getid.c
  user/luigi/ipfw3-head/usr.sbin/makefs/makefs.8
  user/luigi/ipfw3-head/usr.sbin/mergemaster/mergemaster.8
  user/luigi/ipfw3-head/usr.sbin/mergemaster/mergemaster.sh
  user/luigi/ipfw3-head/usr.sbin/mfiutil/Makefile
  user/luigi/ipfw3-head/usr.sbin/mptable/mptable.c
  user/luigi/ipfw3-head/usr.sbin/mptutil/Makefile
  user/luigi/ipfw3-head/usr.sbin/mptutil/mpt_cam.c
  user/luigi/ipfw3-head/usr.sbin/mptutil/mpt_show.c
  user/luigi/ipfw3-head/usr.sbin/mtree/mtree.5
  user/luigi/ipfw3-head/usr.sbin/newsyslog/newsyslog.8
  user/luigi/ipfw3-head/usr.sbin/newsyslog/newsyslog.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/lib/lib.h
  user/luigi/ipfw3-head/usr.sbin/pkg_install/updating/main.c
  user/luigi/ipfw3-head/usr.sbin/pkg_install/updating/pkg_updating.1
  user/luigi/ipfw3-head/usr.sbin/pmcstat/Makefile
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat.8
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat.c
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat.h
  user/luigi/ipfw3-head/usr.sbin/pmcstat/pmcstat_log.c
  user/luigi/ipfw3-head/usr.sbin/powerd/Makefile
  user/luigi/ipfw3-head/usr.sbin/powerd/powerd.c
  user/luigi/ipfw3-head/usr.sbin/ppp/Makefile
  user/luigi/ipfw3-head/usr.sbin/ppp/id.c
  user/luigi/ipfw3-head/usr.sbin/ppp/id.h
  user/luigi/ipfw3-head/usr.sbin/ppp/physical.c
  user/luigi/ipfw3-head/usr.sbin/ppp/physical.h
  user/luigi/ipfw3-head/usr.sbin/rpcbind/rpcb_svc_com.c
  user/luigi/ipfw3-head/usr.sbin/rpcbind/rpcbind.c
  user/luigi/ipfw3-head/usr.sbin/rpcbind/rpcbind.h
  user/luigi/ipfw3-head/usr.sbin/rpcbind/util.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/Makefile
  user/luigi/ipfw3-head/usr.sbin/rtsold/dump.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/if.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/probe.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/rtsock.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/rtsol.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/rtsold.c
  user/luigi/ipfw3-head/usr.sbin/rtsold/rtsold.h
  user/luigi/ipfw3-head/usr.sbin/rwhod/Makefile
  user/luigi/ipfw3-head/usr.sbin/rwhod/rwhod.8
  user/luigi/ipfw3-head/usr.sbin/rwhod/rwhod.c
  user/luigi/ipfw3-head/usr.sbin/smbmsg/smbmsg.8
  user/luigi/ipfw3-head/usr.sbin/sysinstall/devices.c
  user/luigi/ipfw3-head/usr.sbin/sysinstall/dist.c
  user/luigi/ipfw3-head/usr.sbin/sysinstall/package.c
  user/luigi/ipfw3-head/usr.sbin/syslogd/Makefile
  user/luigi/ipfw3-head/usr.sbin/syslogd/syslogd.c
  user/luigi/ipfw3-head/usr.sbin/timed/timed/master.c
  user/luigi/ipfw3-head/usr.sbin/timed/timed/slave.c
  user/luigi/ipfw3-head/usr.sbin/traceroute/Makefile
  user/luigi/ipfw3-head/usr.sbin/usbconfig/Makefile
  user/luigi/ipfw3-head/usr.sbin/usbconfig/dump.c
  user/luigi/ipfw3-head/usr.sbin/usbconfig/dump.h
  user/luigi/ipfw3-head/usr.sbin/usbconfig/usbconfig.8
  user/luigi/ipfw3-head/usr.sbin/usbconfig/usbconfig.c
  user/luigi/ipfw3-head/usr.sbin/usbdevs/usbdevs.8
  user/luigi/ipfw3-head/usr.sbin/usbdevs/usbdevs.c
  user/luigi/ipfw3-head/usr.sbin/wake/Makefile
  user/luigi/ipfw3-head/usr.sbin/wake/wake.8
  user/luigi/ipfw3-head/usr.sbin/wake/wake.c
  user/luigi/ipfw3-head/usr.sbin/yppoll/yppoll.8
  user/luigi/ipfw3-head/usr.sbin/ypserv/yp_main.c
  user/luigi/ipfw3-head/usr.sbin/zic/zdump/Makefile
  user/luigi/ipfw3-head/usr.sbin/zic/zic/Makefile
Directory Properties:
  user/luigi/ipfw3-head/   (props changed)
  user/luigi/ipfw3-head/cddl/contrib/opensolaris/   (props changed)
  user/luigi/ipfw3-head/contrib/bind9/   (props changed)
  user/luigi/ipfw3-head/contrib/cpio/   (props changed)
  user/luigi/ipfw3-head/contrib/ee/   (props changed)
  user/luigi/ipfw3-head/contrib/expat/   (props changed)
  user/luigi/ipfw3-head/contrib/file/   (props changed)
  user/luigi/ipfw3-head/contrib/gdb/   (props changed)
  user/luigi/ipfw3-head/contrib/gdtoa/   (props changed)
  user/luigi/ipfw3-head/contrib/groff/   (props changed)
  user/luigi/ipfw3-head/contrib/less/   (props changed)
  user/luigi/ipfw3-head/contrib/libpcap/   (props changed)
  user/luigi/ipfw3-head/contrib/ncurses/   (props changed)
  user/luigi/ipfw3-head/contrib/netcat/   (props changed)
  user/luigi/ipfw3-head/contrib/ntp/   (props changed)
  user/luigi/ipfw3-head/contrib/one-true-awk/   (props changed)
  user/luigi/ipfw3-head/contrib/openbsm/   (props changed)
  user/luigi/ipfw3-head/contrib/openpam/   (props changed)
  user/luigi/ipfw3-head/contrib/pf/   (props changed)
  user/luigi/ipfw3-head/contrib/sendmail/   (props changed)
  user/luigi/ipfw3-head/contrib/tcpdump/   (props changed)
  user/luigi/ipfw3-head/contrib/tcsh/   (props changed)
  user/luigi/ipfw3-head/contrib/top/   (props changed)
  user/luigi/ipfw3-head/contrib/top/install-sh   (props changed)
  user/luigi/ipfw3-head/contrib/tzcode/stdtime/   (props changed)
  user/luigi/ipfw3-head/contrib/tzcode/zic/   (props changed)
  user/luigi/ipfw3-head/contrib/wpa/   (props changed)
  user/luigi/ipfw3-head/crypto/openssh/   (props changed)
  user/luigi/ipfw3-head/crypto/openssl/   (props changed)
  user/luigi/ipfw3-head/etc/rc.d/static_arp   (props changed)
  user/luigi/ipfw3-head/lib/libc/   (props changed)
  user/luigi/ipfw3-head/lib/libc/stdtime/   (props changed)
  user/luigi/ipfw3-head/lib/libutil/   (props changed)
  user/luigi/ipfw3-head/lib/libz/   (props changed)
  user/luigi/ipfw3-head/sbin/   (props changed)
  user/luigi/ipfw3-head/sbin/ipfw/   (props changed)
  user/luigi/ipfw3-head/share/zoneinfo/   (props changed)
  user/luigi/ipfw3-head/sys/   (props changed)
  user/luigi/ipfw3-head/sys/amd64/include/xen/   (props changed)
  user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/   (props changed)
  user/luigi/ipfw3-head/sys/contrib/dev/acpica/   (props changed)
  user/luigi/ipfw3-head/sys/contrib/pf/   (props changed)
  user/luigi/ipfw3-head/sys/dev/xen/xenpci/   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/adm5120reg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/admpci.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/console.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/if_admsw.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/if_admswreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/if_admswvar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/obiovar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/std.adm5120   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/uart_bus_adm5120.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/uart_dev_adm5120.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/adm5120/uart_dev_adm5120.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/conf/.cvsignore   (props changed)
  user/luigi/ipfw3-head/sys/mips/conf/ADM5120.hints   (props changed)
  user/luigi/ipfw3-head/sys/mips/conf/IDT.hints   (props changed)
  user/luigi/ipfw3-head/sys/mips/conf/MALTA.hints   (props changed)
  user/luigi/ipfw3-head/sys/mips/conf/SENTRY5.hints   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/idtpci.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/idtreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/if_kr.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/if_krreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/obiovar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/idt/std.idt   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/_bus_octeon.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/_inttypes.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/_limits.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/_stdint.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/archtype.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/asmacros.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/bootinfo.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/bswap.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/bus_dma.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/cache_r4k.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/clock.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/clockvar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/cputypes.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/defs.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/exec.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/floatingpoint.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/fpu.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/frame.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/gdb_machdep.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/ieee.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/ieeefp.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/in_cksum.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/iodev.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/limits.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/memdev.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/metadata.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/minidump.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/mips_opcode.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/mp_watchdog.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/mutex.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/pci_cfgreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/pmc_mdep.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/ppireg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/ptrace.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/queue.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/reg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/reloc.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/resource.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/rm7000.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/runq.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/segments.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/setjmp.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/sf_buf.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/sigframe.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/signal.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/stdarg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/timerreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/varargs.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/include/vmparam.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/malta/gt.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/malta/gtreg.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/malta/gtvar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/malta/obiovar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/malta/yamon.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/autoconf.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/db_disasm.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/db_interface.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/dump_machdep.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/elf64_machdep.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/stack_machdep.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/mips/uio_machdep.c   (props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/obiovar.h   (props changed)
  user/luigi/ipfw3-head/sys/mips/sentry5/s5reg.h   (props changed)
  user/luigi/ipfw3-head/sys/netinet/ipfw/test/   (props changed)
  user/luigi/ipfw3-head/usr.bin/csup/   (props changed)
  user/luigi/ipfw3-head/usr.bin/procstat/   (props changed)
  user/luigi/ipfw3-head/usr.sbin/zic/   (props changed)

Modified: user/luigi/ipfw3-head/MAINTAINERS
==============================================================================
--- user/luigi/ipfw3-head/MAINTAINERS	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/MAINTAINERS	Wed Mar  3 14:48:08 2010	(r204634)
@@ -125,6 +125,12 @@ gnu/usr.bin/send-pr	bugmaster	Pre-commit
 ncurses		rafan	Heads-up appreciated, try not to break it.
 *env(3)		secteam	Due to the problematic security history of this
 			code, please have patches reviewed by secteam.
+share/zoneinfo		edwin	Heads-up appreciated, since our data is coming
+				from a third party source.
+usr.sbin/zic		edwin   Heads-up appreciated, since this code is
+				maintained by a third party source.
+lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
+				is maintained by a third party source.
 
 Following are the entries from the Makefiles, and a few other sources.
 Please remove stale entries from both their origin, and this file.

Modified: user/luigi/ipfw3-head/Makefile
==============================================================================
--- user/luigi/ipfw3-head/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -278,7 +278,7 @@ tinderbox:
 # with a reasonable chance of success, regardless of how old your
 # existing system is.
 #
-.if make(universe) || make(tinderbox)
+.if make(universe) || make(universe_kernels) || make(tinderbox)
 TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
 
 .if defined(DOING_TINDERBOX)
@@ -297,10 +297,6 @@ universe_prologue:
 	rm -f ${FAILFILE}
 .endif
 .for target in ${TARGETS}
-KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
-		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
-		! -name DEFAULTS ! -name LINT
-KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
 .ORDER: universe_prologue universe_${target} universe_epilogue
 universe_${target}:
@@ -320,16 +316,26 @@ universe_${target}:
 	    (echo "${target} 'make LINT' failed," \
 	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
 .endif
+	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
+	    universe_kernels
+	@echo ">> ${target} completed on `LC_ALL=C date`"
+.endfor
+universe_kernels: universe_kernconfs
+.if !defined(TARGET)
+TARGET!=	uname -m
+.endif
+KERNCONFS!=	cd ${.CURDIR}/sys/${TARGET}/conf && \
+		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
+		! -name DEFAULTS ! -name NOTES
+universe_kernconfs:
 .for kernel in ${KERNCONFS}
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${MAKE} ${JFLAG} buildkernel \
-	    TARGET=${target} \
+	    TARGET=${TARGET} \
 	    KERNCONF=${kernel} \
-	    > _.${target}.${kernel} 2>&1 || \
-	    (echo "${target} ${kernel} kernel failed," \
-	    "check _.${target}.${kernel} for details"| ${MAKEFAIL}))
-.endfor
-	@echo ">> ${target} completed on `LC_ALL=C date`"
+	    > _.${TARGET}.${kernel} 2>&1 || \
+	    (echo "${TARGET} ${kernel} kernel failed," \
+	    "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
 .endfor
 universe: universe_epilogue
 universe_epilogue:

Modified: user/luigi/ipfw3-head/Makefile.inc1
==============================================================================
--- user/luigi/ipfw3-head/Makefile.inc1	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/Makefile.inc1	Wed Mar  3 14:48:08 2010	(r204634)
@@ -1105,19 +1105,19 @@ _startup_libs+=	lib/libc
 
 gnu/lib/libgcc__L: lib/libc__L
 
-_prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
-		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
-		${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
-		lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+_prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
+		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
+		${_kerberos5_lib_libroken} \
+		lib/libbz2 lib/libcom_err lib/libcrypt \
 		lib/libexpat \
-		${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
+		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
-		lib/libradius lib/libsbuf lib/libtacplus lib/libulog \
+		lib/libradius lib/libsbuf lib/libtacplus \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl} lib/libdwarf lib/libproc
+		${_secure_lib_libssl}
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
@@ -1139,18 +1139,20 @@ lib/libradius__L secure/lib/libssl__L: s
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
+.if ${MK_KERBEROS_SUPPORT} != "no"
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
-    lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
-    lib/libcrypt__L
-secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
+    lib/libmd__L kerberos5/lib/libroken__L
 .endif
 .endif
 .endif
 _secure_lib=	secure/lib
 .endif
 
+.if ${MK_GSSAPI} != "no"
+_lib_libgssapi=	lib/libgssapi
+.endif
+
 .if ${MK_IPX} != "no"
 _lib_libipx=	lib/libipx
 .endif
@@ -1162,8 +1164,6 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
-_lib_libgssapi=	lib/libgssapi
 .endif
 
 .if ${MK_NIS} != "no"
@@ -1266,7 +1266,7 @@ delete-old-files:
 		fi; \
 	done
 # Remove catpages without corresponding manpages.
-	@3<&0; \
+	@exec 3<&0; \
 	find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \

Modified: user/luigi/ipfw3-head/ObsoleteFiles.inc
==============================================================================
--- user/luigi/ipfw3-head/ObsoleteFiles.inc	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/ObsoleteFiles.inc	Wed Mar  3 14:48:08 2010	(r204634)
@@ -14,6 +14,50 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100227: [ia64] removed  and 
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/sapicreg.h
+OLD_FILES+=usr/include/machine/sapicvar.h
+.endif
+# 20100208: man pages moved
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
+OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
+OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
+OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
+OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
+OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
+OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
+.endif
+# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
+OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
+OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
+# 20100120: replacing GNU bc/dc with BSDL versions
+OLD_FILES+=usr/share/examples/bc/ckbook.b
+OLD_FILES+=usr/share/examples/bc/pi.b
+OLD_FILES+=usr/share/examples/bc/primes.b
+OLD_FILES+=usr/share/examples/bc/twins.b
+OLD_FILES+=usr/share/info/dc.info.gz
+OLD_DIRS+=usr/share/examples/bc
+# 20100114: removal of ttyslot(3)
+OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
+# 20100113: remove utmp.h, replace it by utmpx.h
+OLD_FILES+=usr/share/man/man3/login.3.gz
+OLD_FILES+=usr/share/man/man3/logout.3.gz
+OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
+OLD_FILES+=usr/share/man/man5/lastlog.5.gz
+OLD_FILES+=usr/share/man/man5/utmp.5.gz
+OLD_FILES+=usr/share/man/man5/wtmp.5.gz
+OLD_LIBS+=lib/libutil.so.8
+# 20100105: new userland semaphore implementation
+OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
@@ -2246,7 +2290,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
-.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc"
+.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign

Modified: user/luigi/ipfw3-head/UPDATING
==============================================================================
--- user/luigi/ipfw3-head/UPDATING	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/UPDATING	Wed Mar  3 14:48:08 2010	(r204634)
@@ -22,6 +22,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20100113:
+	The utmp user accounting database has been replaced with utmpx,
+	the user accounting interface standardized by POSIX.
+	Unfortunately the semantics of utmp and utmpx don't match,
+	making it practically impossible to support both interfaces.
+	The user accounting database is used by tools like finger(1),
+	last(1), talk(1), w(1) and ac(8).
+
+	All applications in the base system use utmpx.  This means only
+	local binaries (e.g. from the ports tree) may still use these
+	utmp database files.  These applications must be rebuilt to make
+	use of utmpx.
+
+	After the system has been upgraded, it is safe to remove the old
+	log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*),
+	assuming their contents is of no importance anymore.  Old wtmp
+	databases can only be used by last(1) and ac(8) after they have
+	been converted to the new format using wtmpcvt(1).
+
+20100108:
+	Introduce the kernel thread "deadlock resolver" (which can be enabled
+	via the DEADLKRES option, see NOTES for more details) and the
+	sleepq_type() function for sleepqueues.
+
 20091202:
 	The rc.firewall and rc.firewall6 were unified, and
 	rc.firewall6 and rc.d/ip6fw were removed.

Modified: user/luigi/ipfw3-head/bin/cp/cp.1
==============================================================================
--- user/luigi/ipfw3-head/bin/cp/cp.1	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/cp/cp.1	Wed Mar  3 14:48:08 2010	(r204634)
@@ -32,7 +32,7 @@
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd October 27, 2006
+.Dd January 17, 2010
 .Dt CP 1
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl alpv
+.Op Fl alpvx
 .Ar source_file target_file
 .Nm
 .Oo
@@ -53,7 +53,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl alpv
+.Op Fl alpvx
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
@@ -183,6 +183,8 @@ permissions.
 Cause
 .Nm
 to be verbose, showing files as they are copied.
+.It Fl x
+File system mount points are not traversed.
 .El
 .Pp
 For each destination file that already exists, its contents are

Modified: user/luigi/ipfw3-head/bin/cp/cp.c
==============================================================================
--- user/luigi/ipfw3-head/bin/cp/cp.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/cp/cp.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -101,8 +101,9 @@ main(int argc, char *argv[])
 	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
 	char *target;
 
+	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1)
+	while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -150,6 +151,9 @@ main(int argc, char *argv[])
 		case 'v':
 			vflag = 1;
 			break;
+		case 'x':
+			fts_options |= FTS_XDEV;
+			break;
 		default:
 			usage();
 			break;
@@ -160,7 +164,6 @@ main(int argc, char *argv[])
 	if (argc < 2)
 		usage();
 
-	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
 	if (Rflag && rflag)
 		errx(1, "the -R and -r options may not be specified together");
 	if (rflag)

Modified: user/luigi/ipfw3-head/bin/cp/utils.c
==============================================================================
--- user/luigi/ipfw3-head/bin/cp/utils.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/cp/utils.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -518,8 +518,8 @@ usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file",
-"       cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... "
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file",
+"       cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... "
 "target_directory");
 	exit(EX_USAGE);
 }

Modified: user/luigi/ipfw3-head/bin/csh/config.h
==============================================================================
--- user/luigi/ipfw3-head/bin/csh/config.h	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/csh/config.h	Wed Mar  3 14:48:08 2010	(r204634)
@@ -54,7 +54,7 @@
 #define HAVE_GETPWENT 1
 
 /* Define to 1 if you have the `getutent' function. */
-/* #undef HAVE_GETUTENT */
+#define HAVE_GETUTENT 1
 
 /* Define if you have the iconv() function. */
 /* #undef HAVE_ICONV */
@@ -130,10 +130,10 @@
 #define HAVE_STRUCT_UTMP_UT_HOST 1
 
 /* Define to 1 if `ut_tv' is member of `struct utmp'. */
-/* #undef HAVE_STRUCT_UTMP_UT_TV */
+#define HAVE_STRUCT_UTMP_UT_TV 1
 
 /* Define to 1 if `ut_user' is member of `struct utmp'. */
-/* #undef HAVE_STRUCT_UTMP_UT_USER */
+#define HAVE_STRUCT_UTMP_UT_USER 1
 
 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */
 /* #undef HAVE_STRUCT_UTMP_UT_XTIME */
@@ -159,10 +159,10 @@
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the  header file. */
-/* #undef HAVE_UTMPX_H */
+#define HAVE_UTMPX_H 1
 
 /* Define to 1 if you have the  header file. */
-#define HAVE_UTMP_H 1
+/* #undef HAVE_UTMP_H */
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_WCHAR_H 1

Modified: user/luigi/ipfw3-head/bin/csh/config_p.h
==============================================================================
--- user/luigi/ipfw3-head/bin/csh/config_p.h	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/csh/config_p.h	Wed Mar  3 14:48:08 2010	(r204634)
@@ -85,6 +85,7 @@
 /* Use LC_MESSAGES locale category to open the message catalog */
 #define MCLoadBySet NL_CAT_LOCALE
 #define BUFSIZE 8192
+#define UTMPX_FILE "/var/run/utx.active"
 #endif
 
 #if defined(__bsdi__)

Modified: user/luigi/ipfw3-head/bin/date/Makefile
==============================================================================
--- user/luigi/ipfw3-head/bin/date/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/date/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -3,7 +3,5 @@
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
-DPADD=	${LIBULOG}
-LDADD=	-lulog
 
 .include 

Modified: user/luigi/ipfw3-head/bin/date/date.1
==============================================================================
--- user/luigi/ipfw3-head/bin/date/date.1	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/date/date.1	Wed Mar  3 14:48:08 2010	(r204634)
@@ -299,7 +299,7 @@ for more information.
 .El
 .Sh FILES
 .Bl -tag -width /var/log/messages -compact
-.It Pa /var/log/wtmp
+.It Pa /var/log/utx.log
 record of date resets and time changes
 .It Pa /var/log/messages
 record of the user setting the time
@@ -406,9 +406,9 @@ fails.
 .Sh SEE ALSO
 .Xr locale 1 ,
 .Xr gettimeofday 2 ,
+.Xr getutxent 3 ,
 .Xr strftime 3 ,
 .Xr strptime 3 ,
-.Xr utmp 5 ,
 .Xr timed 8
 .Rs
 .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"

Modified: user/luigi/ipfw3-head/bin/date/date.c
==============================================================================
--- user/luigi/ipfw3-head/bin/date/date.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/date/date.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -52,9 +52,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#define	_ULOG_POSIX_NAMES
-#include 
 #include 
+#include 
 
 #include "extern.h"
 #include "vary.h"

Modified: user/luigi/ipfw3-head/bin/kill/kill.c
==============================================================================
--- user/luigi/ipfw3-head/bin/kill/kill.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/kill/kill.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
 			numsig = strtol(*argv, &ep, 10);
 			if (!**argv || *ep)
 				errx(1, "illegal signal number: %s", *argv);
-			if (numsig < 0 || numsig >= sys_nsig)
+			if (numsig < 0)
 				nosig(*argv);
 		} else
 			nosig(*argv);

Modified: user/luigi/ipfw3-head/bin/ls/ls.c
==============================================================================
--- user/luigi/ipfw3-head/bin/ls/ls.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/ls/ls.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -113,6 +113,7 @@ static int f_listdir;		/* list actual di
 static int f_listdot;		/* list files beginning with . */
 static int f_noautodot;		/* do not automatically enable -A for root */
        int f_longform;		/* long listing format */
+static int f_nofollow;		/* don't follow symbolic link arguments */
        int f_nonprint;		/* show unprintables as ? */
 static int f_nosort;		/* don't sort output */
        int f_notabs;		/* don't use tab-separated multi-col output */
@@ -234,6 +235,7 @@ main(int argc, char *argv[])
 			break;
 		case 'H':
 			fts_options |= FTS_COMFOLLOW;
+			f_nofollow = 0;
 			break;
 		case 'G':
 			setenv("CLICOLOR", "", 1);
@@ -241,11 +243,13 @@ main(int argc, char *argv[])
 		case 'L':
 			fts_options &= ~FTS_PHYSICAL;
 			fts_options |= FTS_LOGICAL;
+			f_nofollow = 0;
 			break;
 		case 'P':
 			fts_options &= ~FTS_COMFOLLOW;
 			fts_options &= ~FTS_LOGICAL;
 			fts_options |= FTS_PHYSICAL;
+			f_nofollow = 1;
 			break;
 		case 'R':
 			f_recursive = 1;
@@ -396,10 +400,10 @@ main(int argc, char *argv[])
 		fts_options |= FTS_NOSTAT;
 
 	/*
-	 * If not -F, -d or -l options, follow any symbolic links listed on
+	 * If not -F, -P, -d or -l options, follow any symbolic links listed on
 	 * the command line.
 	 */
-	if (!f_longform && !f_listdir && (!f_type || f_slash))
+	if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash))
 		fts_options |= FTS_COMFOLLOW;
 
 	/*
@@ -508,7 +512,7 @@ traverse(int argc, char *argv[], int opt
 			break;
 		case FTS_DNR:
 		case FTS_ERR:
-			warnx("%s: %s", p->fts_name, strerror(p->fts_errno));
+			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
 			rval = 1;
 			break;
 		case FTS_D:
@@ -559,7 +563,8 @@ display(const FTSENT *p, FTSENT *list, i
 	long maxblock;
 	u_long btotal, labelstrlen, maxinode, maxlen, maxnlink;
 	u_long maxlabelstr;
-	int bcfile, maxflags;
+	u_int devstrlen;
+	int maxflags;
 	gid_t maxgroup;
 	uid_t maxuser;
 	size_t flen, ulen, glen;
@@ -651,7 +656,7 @@ display(const FTSENT *p, FTSENT *list, i
 		MAKENINES(maxsize);
 		free(jinitmax);
 	}
-	bcfile = 0;
+	devstrlen = 0;
 	flags = NULL;
 	for (cur = list, entries = 0; cur; cur = cur->fts_link) {
 		if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) {
@@ -791,9 +796,15 @@ label_out:
 				np->group = &np->data[ulen + 1];
 				(void)strcpy(np->group, group);
 
-				if (S_ISCHR(sp->st_mode) ||
-				    S_ISBLK(sp->st_mode))
-					bcfile = 1;
+				if ((S_ISCHR(sp->st_mode) ||
+				    S_ISBLK(sp->st_mode)) &&
+				    devstrlen < DEVSTR_HEX_LEN) {
+					if (minor(sp->st_rdev) > 255 ||
+					    minor(sp->st_rdev) < 0)
+						devstrlen = DEVSTR_HEX_LEN;
+					else
+						devstrlen = DEVSTR_LEN;
+				}
 
 				if (f_flags) {
 					np->flags = &np->data[ulen + glen + 2];
@@ -825,7 +836,6 @@ label_out:
 	d.entries = entries;
 	d.maxlen = maxlen;
 	if (needstats) {
-		d.bcfile = bcfile;
 		d.btotal = btotal;
 		(void)snprintf(buf, sizeof(buf), "%lu", maxblock);
 		d.s_block = strlen(buf);
@@ -836,8 +846,14 @@ label_out:
 		d.s_inode = strlen(buf);
 		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
 		d.s_nlink = strlen(buf);
-		(void)snprintf(buf, sizeof(buf), "%ju", maxsize);
-		d.s_size = strlen(buf);
+		if (f_humanval)
+			d.s_size = HUMANVALSTR_LEN;
+		else {
+			(void)snprintf(buf, sizeof(buf), "%ju", maxsize);
+			d.s_size = strlen(buf);
+		}
+		if (d.s_size < devstrlen)
+			d.s_size = devstrlen;
 		d.s_user = maxuser;
 	}
 	printfcn(&d);

Modified: user/luigi/ipfw3-head/bin/ls/ls.h
==============================================================================
--- user/luigi/ipfw3-head/bin/ls/ls.h	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/ls/ls.h	Wed Mar  3 14:48:08 2010	(r204634)
@@ -35,6 +35,10 @@
 
 #define NO_PRINT	1
 
+#define HUMANVALSTR_LEN	5
+#define DEVSTR_LEN	8
+#define DEVSTR_HEX_LEN	15
+
 extern long blocksize;		/* block size units */
 
 extern int f_accesstime;	/* use time of last access */
@@ -62,7 +66,6 @@ extern int f_color;		/* add type in colo
 typedef struct {
 	FTSENT *list;
 	u_long btotal;
-	int bcfile;
 	int entries;
 	int maxlen;
 	u_int s_block;

Modified: user/luigi/ipfw3-head/bin/ls/print.c
==============================================================================
--- user/luigi/ipfw3-head/bin/ls/print.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/ls/print.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 
 static int	printaname(const FTSENT *, u_long, u_long);
+static void	printdev(size_t, dev_t);
 static void	printlink(const FTSENT *);
 static void	printtime(time_t);
 static int	printtype(u_int);
@@ -165,16 +166,7 @@ printlong(const DISPLAY *dp)
 		if (f_label)
 			(void)printf("%-*s ", dp->s_label, np->label);
 		if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
-			if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0)
-				(void)printf("%3d, 0x%08x ",
-				    major(sp->st_rdev),
-				    (u_int)minor(sp->st_rdev));
-			else
-				(void)printf("%3d, %3d ",
-				    major(sp->st_rdev), minor(sp->st_rdev));
-		else if (dp->bcfile)
-			(void)printf("%*s%*jd ",
-			    8 - dp->s_size, "", dp->s_size, sp->st_size);
+			printdev(dp->s_size, sp->st_rdev);
 		else
 			printsize(dp->s_size, sp->st_size);
 		if (f_accesstime)
@@ -353,6 +345,24 @@ printaname(const FTSENT *p, u_long inode
 	return (chcnt);
 }
 
+/*
+ * Print device special file major and minor numbers.
+ */
+static void
+printdev(size_t width, dev_t dev)
+{
+	char buf[DEVSTR_HEX_LEN + 1];
+
+	if (minor(dev) > 255 || minor(dev) < 0)
+		(void)snprintf(buf, sizeof(buf), "%3d, 0x%08x",
+		    major(dev), (u_int)minor(dev));
+	else
+		(void)snprintf(buf, sizeof(buf), "%3d, %3d",
+		    major(dev), minor(dev));
+
+	(void)printf("%*s ", (u_int)width, buf);
+}
+
 static void
 printtime(time_t ftime)
 {
@@ -592,11 +602,15 @@ printsize(size_t width, off_t bytes)
 {
 
 	if (f_humanval) {
-		char buf[5];
+		/*
+		 * Reserve one space before the size and allocate room for
+		 * the trailing '\0'.
+		 */
+		char buf[HUMANVALSTR_LEN - 1 + 1];
 
 		humanize_number(buf, sizeof(buf), (int64_t)bytes, "",
 		    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
-		(void)printf("%5s ", buf);
+		(void)printf("%*s ", (u_int)width, buf);
 	} else
 		(void)printf("%*jd ", (u_int)width, bytes);
 }

Modified: user/luigi/ipfw3-head/bin/pax/Makefile
==============================================================================
--- user/luigi/ipfw3-head/bin/pax/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pax/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -33,8 +33,4 @@ SRCS=	ar_io.c ar_subs.c buf_subs.c cache
 #MAN=	pax.1 tar.1 cpio.1
 #LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
-.if ${MACHINE_ARCH} == "arm"
-WARNS?=	3
-.endif
-
 .include 

Modified: user/luigi/ipfw3-head/bin/pax/cpio.h
==============================================================================
--- user/luigi/ipfw3-head/bin/pax/cpio.h	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pax/cpio.h	Wed Mar  3 14:48:08 2010	(r204634)
@@ -67,7 +67,7 @@ typedef struct {
 	char	c_mtime[11];		/* modification time */
 	char	c_namesize[6];		/* length of pathname */
 	char	c_filesize[11];		/* length of file in bytes */
-} HD_CPIO;
+} HD_CPIO __aligned(1);
 
 #define	MAGIC		070707		/* transportable archive id */
 
@@ -98,7 +98,7 @@ typedef struct {
 	u_char	h_namesize[2];
 	u_char	h_filesize_1[2];
 	u_char	h_filesize_2[2];
-} HD_BCPIO;
+} HD_BCPIO __aligned(1);
 
 #ifdef _PAX_
 /*
@@ -136,7 +136,7 @@ typedef struct {
 	char	c_rmin[8];		/* special file minor # */
 	char	c_namesize[8];		/* length of pathname */
 	char	c_chksum[8];		/* 0 OR CRC of bytes of FILE data */
-} HD_VCPIO;
+} HD_VCPIO __aligned(1);
 
 #define	VMAGIC		070701		/* sVr4 new portable archive id */
 #define	VCMAGIC		070702		/* sVr4 new portable archive id CRC */

Modified: user/luigi/ipfw3-head/bin/pax/gen_subs.c
==============================================================================
--- user/luigi/ipfw3-head/bin/pax/gen_subs.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pax/gen_subs.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -66,10 +65,6 @@ __FBSDID("$FreeBSD$");
 #define OLDFRMTM	"%b %e  %Y"
 #define CURFRMTD	"%e %b %H:%M"
 #define OLDFRMTD	"%e %b  %Y"
-#ifndef UT_NAMESIZE
-#define UT_NAMESIZE	8
-#endif
-#define UT_GRPSIZE	6
 
 static int d_first = -1;
 
@@ -116,9 +111,8 @@ ls_list(ARCHD *arcn, time_t now, FILE *f
 	 */
 	if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0)
 		f_date[0] = '\0';
-	(void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink,
-		UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE,
-		name_gid(sbp->st_gid, 1));
+	(void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink,
+		name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1));
 
 	/*
 	 * print device id's for devices, or sizes for other nodes

Modified: user/luigi/ipfw3-head/bin/pax/tar.h
==============================================================================
--- user/luigi/ipfw3-head/bin/pax/tar.h	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pax/tar.h	Wed Mar  3 14:48:08 2010	(r204634)
@@ -96,7 +96,7 @@ typedef struct {
 	char chksum[CHK_LEN];		/* checksum */
 	char linkflag;			/* norm, hard, or sym. */
 	char linkname[TNMSZ];		/* linked to name */
-} HD_TAR;
+} HD_TAR __aligned(1);
 
 #ifdef _PAX_
 /*
@@ -142,4 +142,4 @@ typedef struct {
 	char devmajor[8];		/* major device number */
 	char devminor[8];		/* minor device number */
 	char prefix[TPFSZ];		/* linked to name */
-} HD_USTAR;
+} HD_USTAR __aligned(1);

Modified: user/luigi/ipfw3-head/bin/pkill/Makefile
==============================================================================
--- user/luigi/ipfw3-head/bin/pkill/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pkill/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	pkill
-WARNS?=	5
 
 DPADD=	${LIBKVM}
 LDADD=	-lkvm

Modified: user/luigi/ipfw3-head/bin/pkill/pkill.1
==============================================================================
--- user/luigi/ipfw3-head/bin/pkill/pkill.1	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pkill/pkill.1	Wed Mar  3 14:48:08 2010	(r204634)
@@ -16,13 +16,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 16, 2009
+.Dd February 11, 2010
 .Dt PKILL 1
 .Os
 .Sh NAME
@@ -44,7 +37,7 @@
 .Nd find or signal processes by name
 .Sh SYNOPSIS
 .Nm pgrep
-.Op Fl LSafilnovx
+.Op Fl LSafilnoqvx
 .Op Fl F Ar pidfile
 .Op Fl G Ar gid
 .Op Fl M Ar core
@@ -175,6 +168,8 @@ command.
 Select only the newest (most recently started) of the matching processes.
 .It Fl o
 Select only the oldest (least recently started) of the matching processes.
+.It Fl q
+Do not write anything to standard output.
 .It Fl s Ar sid
 Restrict matches to processes with a session ID in the comma-separated
 list

Modified: user/luigi/ipfw3-head/bin/pkill/pkill.c
==============================================================================
--- user/luigi/ipfw3-head/bin/pkill/pkill.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/pkill/pkill.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -16,13 +16,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -49,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -110,6 +104,7 @@ static int	matchargs;
 static int	fullmatch;
 static int	kthreads;
 static int	cflags = REG_EXTENDED;
+static int	quiet;
 static kvm_t	*kd;
 static pid_t	mypid;
 
@@ -180,9 +175,11 @@ main(int argc, char **argv)
 	debug_opt = 0;
 	pidfile = NULL;
 	pidfilelock = 0;
-	execf = coref = _PATH_DEVNULL;
+	quiet = 0;
+	execf = NULL;
+	coref = _PATH_DEVNULL;
 
-	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1)
+	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnoqs:t:u:vx")) != -1)
 		switch (ch) {
 		case 'D':
 			debug_opt++;
@@ -257,6 +254,11 @@ main(int argc, char **argv)
 			oldest = 1;
 			criteria = 1;
 			break;
+		case 'q':
+			if (!pgrep)
+				usage();
+			quiet = 1;
+			break;
 		case 's':
 			makelist(&sidlist, LT_SID, optarg);
 			criteria = 1;
@@ -548,7 +550,7 @@ usage(void)
 	const char *ustr;
 
 	if (pgrep)
-		ustr = "[-LSfilnovx] [-d delim]";
+		ustr = "[-LSfilnoqvx] [-d delim]";
 	else
 		ustr = "[-signal] [-ILfinovx]";
 
@@ -566,6 +568,10 @@ show_process(const struct kinfo_proc *kp
 {
 	char **argv;
 
+	if (quiet) {
+		assert(pgrep);
+		return;
+	}
 	if ((longfmt || !pgrep) && matchargs &&
 	    (argv = kvm_getargv(kd, kp, 0)) != NULL) {
 		printf("%d ", (int)kp->ki_pid);
@@ -622,7 +628,8 @@ grepact(const struct kinfo_proc *kp)
 {
 
 	show_process(kp);
-	printf("%s", delim);
+	if (!quiet)
+		printf("%s", delim);
 	return (1);
 }
 
@@ -670,6 +677,20 @@ makelist(struct listhead *head, enum lis
 				if (li->li_number == 0)
 					li->li_number = -1;	/* any jail */
 				break;
+			case LT_TTY:
+				if (li->li_number < 0)
+					errx(STATUS_BADUSAGE,
+					     "Negative /dev/pts tty `%s'", sp);
+				snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s",
+				    sp);
+				if (stat(buf, &st) != -1)
+					goto foundtty;
+				if (errno == ENOENT)
+					errx(STATUS_BADUSAGE, "No such tty: `"
+					    _PATH_DEV "pts/%s'", sp);
+				err(STATUS_ERROR, "Cannot access `"
+				    _PATH_DEV "pts/%s'", sp);
+				break;
 			default:
 				break;
 			}
@@ -705,10 +726,6 @@ makelist(struct listhead *head, enum lis
 			if (stat(buf, &st) != -1)
 				goto foundtty;
 
-			snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s", cp);
-			if (stat(buf, &st) != -1)
-				goto foundtty;
-
 			if (errno == ENOENT)
 				errx(STATUS_BADUSAGE, "No such tty: `%s'", sp);
 			err(STATUS_ERROR, "Cannot access `%s'", sp);

Modified: user/luigi/ipfw3-head/bin/ps/ps.c
==============================================================================
--- user/luigi/ipfw3-head/bin/ps/ps.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/ps/ps.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -212,7 +212,8 @@ main(int argc, char *argv[])
 	init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id");
 	init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty");
 	init_list(&uidlist, addelem_uid, sizeof(uid_t), "user");
-	memf = nlistf = _PATH_DEVNULL;
+	memf = _PATH_DEVNULL;
+	nlistf = NULL;
 	while ((ch = getopt(argc, argv, PS_ARGS)) != -1)
 		switch (ch) {
 		case 'A':

Modified: user/luigi/ipfw3-head/bin/rmail/Makefile
==============================================================================
--- user/luigi/ipfw3-head/bin/rmail/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/rmail/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -11,7 +11,7 @@ PROG=	rmail
 SRCS=	rmail.c
 MAN=	rmail.8
 
-WARNS?=	0
+WARNS?=	2
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm

Modified: user/luigi/ipfw3-head/bin/sh/main.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/main.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/sh/main.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -157,6 +157,8 @@ main(int argc, char *argv[])
 		out2fmt_flush("sh: cannot determine working directory\n");
 	if (getpwd() != NULL)
 		setvar ("PWD", getpwd(), VEXPORT);
+	if (iflag)
+		chkmail(1);
 	if (argv[0] && argv[0][0] == '-') {
 		state = 1;
 		read_profile("/etc/profile");

Modified: user/luigi/ipfw3-head/bin/sh/parser.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/parser.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/sh/parser.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -1641,7 +1641,7 @@ getprompt(void *unused __unused)
 			case 'w':
 				ps[i] = '\0';
 				getcwd(&ps[i], PROMPTLEN - i);
-				if (*fmt == 'W') {
+				if (*fmt == 'W' && ps[i + 1] != '\0') {
 					/* Final path component only. */
 					trim = 1;
 					for (j = i; ps[j] != '\0'; j++)

Modified: user/luigi/ipfw3-head/bin/sh/var.c
==============================================================================
--- user/luigi/ipfw3-head/bin/sh/var.c	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/bin/sh/var.c	Wed Mar  3 14:48:08 2010	(r204634)
@@ -337,8 +337,13 @@ setvareq(char *s, int flags)
 			/*
 			 * We could roll this to a function, to handle it as
 			 * a regular variable function callback, but why bother?
+			 *
+			 * Note: this assumes iflag is not set to 1 initially.
+			 * As part of init(), this is called before arguments
+			 * are looked at.
 			 */
-			if (vp == &vmpath || (vp == &vmail && ! mpathset()))
+			if ((vp == &vmpath || (vp == &vmail && ! mpathset())) &&
+			    iflag == 1)
 				chkmail(1);
 			if ((vp->flags & VEXPORT) && localevar(s)) {
 				change_env(s, 1);

Modified: user/luigi/ipfw3-head/cddl/usr.bin/ctfconvert/Makefile
==============================================================================
--- user/luigi/ipfw3-head/cddl/usr.bin/ctfconvert/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/cddl/usr.bin/ctfconvert/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -40,7 +40,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz -lthr
+DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common

Modified: user/luigi/ipfw3-head/cddl/usr.bin/ctfdump/Makefile
==============================================================================
--- user/luigi/ipfw3-head/cddl/usr.bin/ctfdump/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/cddl/usr.bin/ctfdump/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -19,9 +19,8 @@ CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
-LDADD+=		-lelf -lz
+DPADD=		${LIBPTHREAD} ${LIBELF} ${LIBZ}
+LDADD=		-lpthread -lelf -lz
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump

Modified: user/luigi/ipfw3-head/cddl/usr.bin/ctfmerge/Makefile
==============================================================================
--- user/luigi/ipfw3-head/cddl/usr.bin/ctfmerge/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/cddl/usr.bin/ctfmerge/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -37,7 +37,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz -lthr
+DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt

Modified: user/luigi/ipfw3-head/cddl/usr.bin/zinject/Makefile
==============================================================================
--- user/luigi/ipfw3-head/cddl/usr.bin/zinject/Makefile	Wed Mar  3 13:29:39 2010	(r204633)
+++ user/luigi/ipfw3-head/cddl/usr.bin/zinject/Makefile	Wed Mar  3 14:48:08 2010	(r204634)
@@ -19,7 +19,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 

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

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 21:14:12 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8263106566C;
	Wed,  3 Mar 2010 21:14:12 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B84738FC0A;
	Wed,  3 Mar 2010 21:14:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23LECg5067349;
	Wed, 3 Mar 2010 21:14:12 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23LECr2067347;
	Wed, 3 Mar 2010 21:14:12 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003032114.o23LECr2067347@svn.freebsd.org>
From: Edwin Groothuis 
Date: Wed, 3 Mar 2010 21:14:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204663 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 21:14:12 -0000

Author: edwin
Date: Wed Mar  3 21:14:12 2010
New Revision: 204663
URL: http://svn.freebsd.org/changeset/base/204663

Log:
  Fix the center alignment of month heading in the backwards compatibility mode.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 21:10:13 2010	(r204662)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 21:14:12 2010	(r204663)
@@ -490,7 +490,7 @@ monthrangeb(int y, int jd_flag, int m, i
 	struct monthlines year[12];
 	struct weekdays wds;
 	char	s[80], t[80];
-	wchar_t	ws[80];
+	wchar_t	ws[80], ws1[80];
 	const char	*wdss;
 	int     i, j;
 	int     mpl;
@@ -544,10 +544,11 @@ monthrangeb(int y, int jd_flag, int m, i
 			if (printyearheader)
 				wprintf(L"%-*ls  ",
 				    mw, wcenter(ws, year[i].name, mw));
-			else
-				wprintf(L"%-ls %-*d  ",
-				    wcenter(ws, year[i].name, mw - 10),
-				    mw - wcslen(year[i].name) - 1, M2Y(m + i));
+			else {
+				swprintf(ws, sizeof(ws), L"%-ls %d",
+				    year[i].name, M2Y(m + i));
+				wprintf(L"%-*ls  ", mw, wcenter(ws1, ws, mw));
+			}
 		printf("\n");
 
 		/* Day of the week names */

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 21:34:21 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 752B5106564A;
	Wed,  3 Mar 2010 21:34:21 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 64F2A8FC18;
	Wed,  3 Mar 2010 21:34:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23LYLkB072067;
	Wed, 3 Mar 2010 21:34:21 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23LYL0U072065;
	Wed, 3 Mar 2010 21:34:21 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032134.o23LYL0U072065@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 21:34:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204667 - user/jmallett/octeon/lib/libc/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 21:34:21 -0000

Author: jmallett
Date: Wed Mar  3 21:34:21 2010
New Revision: 204667
URL: http://svn.freebsd.org/changeset/base/204667

Log:
  In the PIC prologue for syscalls, use the address of the syscall leaf, not one
  of the weak symbols for it, as the function.  This unbreaks at least lseek and
  anything else where libc overrides the weak symbol.

Modified:
  user/jmallett/octeon/lib/libc/mips/SYS.h

Modified: user/jmallett/octeon/lib/libc/mips/SYS.h
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/SYS.h	Wed Mar  3 21:28:55 2010	(r204666)
+++ user/jmallett/octeon/lib/libc/mips/SYS.h	Wed Mar  3 21:34:21 2010	(r204667)
@@ -133,7 +133,7 @@ LEAF(__sys_ ## x);							\
 	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
 	.weak _C_LABEL(__CONCAT(_,x));					\
 	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
-	PIC_PROLOGUE(x);						\
+	PIC_PROLOGUE(__sys_ ## x);					\
 	SYSTRAP(x);							\
 	bne a3,zero,err;						\
 	PIC_RETURN();							\

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 21:39:49 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A0911106564A;
	Wed,  3 Mar 2010 21:39:49 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75E8D8FC0C;
	Wed,  3 Mar 2010 21:39:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23Ldnss073369;
	Wed, 3 Mar 2010 21:39:49 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23LdnGt073368;
	Wed, 3 Mar 2010 21:39:49 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032139.o23LdnGt073368@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 21:39:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204668 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 21:39:49 -0000

Author: jmallett
Date: Wed Mar  3 21:39:49 2010
New Revision: 204668
URL: http://svn.freebsd.org/changeset/base/204668

Log:
  Remove unused NetBSD compat file.

Deleted:
  user/jmallett/octeon/lib/libc/mips/gen/longjmp.c

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 22:42:16 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0416A106566B;
	Wed,  3 Mar 2010 22:42:16 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5B418FC08;
	Wed,  3 Mar 2010 22:42:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23MgF05087613;
	Wed, 3 Mar 2010 22:42:15 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23MgFsW087589;
	Wed, 3 Mar 2010 22:42:15 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032242.o23MgFsW087589@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 22:42:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204676 - in user/jmallett/octeon: lib/libc/mips/gen
	sys/mips/include
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 22:42:16 -0000

Author: jmallett
Date: Wed Mar  3 22:42:15 2010
New Revision: 204676
URL: http://svn.freebsd.org/changeset/base/204676

Log:
  o) Store gp in the jmpbuf for n32 and n64.
  o) Attempt to make PIC- and N32-friendly *setjmp.

Modified:
  user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S
  user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
  user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S
  user/jmallett/octeon/sys/mips/include/asm.h
  user/jmallett/octeon/sys/mips/include/setjmp.h

Modified: user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S	Wed Mar  3 21:59:45 2010	(r204675)
+++ user/jmallett/octeon/lib/libc/mips/gen/_setjmp.S	Wed Mar  3 22:42:15 2010	(r204676)
@@ -1,4 +1,4 @@
-/*	$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $	*/
+/*	$NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -36,14 +36,15 @@
 __FBSDID("$FreeBSD$");
 #include 
 
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $")
-#endif /* LIBC_SCCS and not lint */
+#include "SYS.h"
 
-#ifdef __ABICALLS__
-	.abicalls
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+	RCSID("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
+#else
+	RCSID("$NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $")
 #endif
+#endif /* LIBC_SCCS and not lint */
 
 /*
  * C library -- _setjmp, _longjmp
@@ -56,15 +57,11 @@ __FBSDID("$FreeBSD$");
  * The previous signal state is NOT restored.
  */
 
+	.set	noreorder
 
 LEAF(_setjmp)
-#ifdef __ABICALLS__ 
-	.set	noreorder
-	.cpload t9
-	subu	sp, sp, CALLFRAME_SIZ	# allocate stack frame
-	.cprestore 16
-#endif
-	li	v0, _JB_MAGIC__SETJMP
+	REG_PROLOGUE
+	REG_LI	v0, _JB_MAGIC__SETJMP
 	REG_S	v0, (_JB_MAGIC  * SZREG)(a0)
 	REG_S	ra, (_JB_REG_RA * SZREG)(a0)
 	REG_S	s0, (_JB_REG_S0 * SZREG)(a0)
@@ -76,42 +73,57 @@ LEAF(_setjmp)
 	REG_S	s6, (_JB_REG_S6 * SZREG)(a0)
 	REG_S	s7, (_JB_REG_S7 * SZREG)(a0)
 	REG_S	s8, (_JB_REG_S8 * SZREG)(a0)
-#ifdef __ABICALLS__
-	addu	sp, sp, CALLFRAME_SIZ	# un-allocate the stack frame
-#endif	
+#if defined(__mips_n32) || defined(__mips_n64)
+	REG_S	gp, (_JB_REG_GP * SZREG)(a0)	# newabi gp is callee-saved
+#endif
 	REG_S	sp, (_JB_REG_SP * SZREG)(a0)
+	REG_EPILOGUE
+
 	j	ra
 	move	v0, zero
 END(_setjmp)
 
 LEAF(_longjmp)
-#ifdef __ABICALLS__ 
-	.set	noreorder
-	.cpload t9
-	subu	sp, sp, CALLFRAME_SIZ	# allocate stack frame
-	.cprestore 16
-#endif  
-	REG_L	v0, (_JB_MAGIC  * SZREG)(a0)
-	REG_L	ra, (_JB_REG_RA * SZREG)(a0)
-	li	t0, _JB_MAGIC__SETJMP
-	bne	v0, t0, botch		# jump if error
-	REG_L	s0, (_JB_REG_S0 * SZREG)(a0)
-	REG_L	s1, (_JB_REG_S1 * SZREG)(a0)
-	REG_L	s2, (_JB_REG_S2 * SZREG)(a0)
-	REG_L	s3, (_JB_REG_S3 * SZREG)(a0)
-	REG_L	s4, (_JB_REG_S4 * SZREG)(a0)
-	REG_L	s5, (_JB_REG_S5 * SZREG)(a0)
-	REG_L	s6, (_JB_REG_S6 * SZREG)(a0)
-	REG_L	s7, (_JB_REG_S7 * SZREG)(a0)
-	REG_L	sp, (_JB_REG_SP * SZREG)(a0)
-	REG_L	s8, (_JB_REG_S8 * SZREG)(a0)
+	PIC_PROLOGUE(_longjmp)
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
+	SAVE_GP(CALLFRAME_GP)
+
+	REG_PROLOGUE
+	REG_L		v0, (_JB_MAGIC  * SZREG)(a0)	# get magic number
+	REG_L		ra, (_JB_REG_RA * SZREG)(a0)
+	REG_LI		t0, _JB_MAGIC__SETJMP
+	bne		v0, t0, botch		# jump if error
+	PTR_ADDU	sp, sp, CALLFRAME_SIZ	# does not matter, sanity
+	REG_L		s0, (_JB_REG_S0 * SZREG)(a0)
+	REG_L		s1, (_JB_REG_S1 * SZREG)(a0)
+	REG_L		s2, (_JB_REG_S2 * SZREG)(a0)
+	REG_L		s3, (_JB_REG_S3 * SZREG)(a0)
+	REG_L		s4, (_JB_REG_S4 * SZREG)(a0)
+	REG_L		s5, (_JB_REG_S5 * SZREG)(a0)
+	REG_L		s6, (_JB_REG_S6 * SZREG)(a0)
+	REG_L		s7, (_JB_REG_S7 * SZREG)(a0)
+#if defined(__mips_n32) || defined(__mips_n64)
+	REG_L		gp, (_JB_REG_GP * SZREG)(a0)
+#endif
+	REG_L		sp, (_JB_REG_SP * SZREG)(a0)
+	REG_L		s8, (_JB_REG_S8 * SZREG)(a0)
 
+	REG_EPILOGUE
+	move	v0, a1			# get return value in 1st arg
 	j	ra
-	move	v0, a1
+	nop
 
 botch:
-	jal	_C_LABEL(longjmperror)
+	/*
+	 * We know we aren't returning so we don't care about restoring
+	 * our caller's GP.
+	 */
+	PTR_LA	t9, _C_LABEL(longjmperror)
+	jalr	t9
 	nop
-	jal	_C_LABEL(abort)
+
+	PIC_TAILCALL(abort)
+	PTR_LA	t9, _C_LABEL(abort)
+	jal	t9
 	nop
 END(_longjmp)

Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 21:59:45 2010	(r204675)
+++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 22:42:15 2010	(r204676)
@@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$");
 	ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
 
+#include "SYS.h"
+
 #ifdef __ABICALLS__
 	.abicalls
 #endif
@@ -61,30 +63,28 @@ __FBSDID("$FreeBSD$");
 
 NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	.set	noreorder
-#ifdef __ABICALLS__
-	.cpload	t9
-#endif
-	subu	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
-#ifdef __ABICALLS__
-	.cprestore 16
-#endif
+	SETUP_GP
+	PTR_SUBU sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
+	SAVE_GP(CALLFRAME_GP)
+	SETUP_GP64(CALLFRAME_GP, setjmp)
+
 	REG_S	ra, CALLFRAME_RA(sp)		# save RA
 	REG_S	a0, CALLFRAME_SIZ(sp)		# store env
 
 	/* Get the signal mask. */
-	addu	a2, a0, _JB_SIGMASK * SZREG	# &oenv
+	PTR_ADDU a2, a0, _JB_SIGMASK * SZREG	# &oenv
 	li	a0, 1				# SIG_SETBLOCK
 	move	a1, zero			# &env == 0
-	la	t9, _C_LABEL(sigprocmask)	# get current signal mask
-	jal	t9
-	nop
+	PTR_LA	t9, _C_LABEL(sigprocmask)	# get current signal mask
+	jalr	t9
 
+	RESTORE_GP64
 	REG_L	a0, CALLFRAME_SIZ(sp)		# restore env pointer
 	REG_L	ra, CALLFRAME_RA(sp)		# restore RA
-	addu	sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
+	PTR_ADDU sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
 
-	li	v0, _JB_MAGIC_SETJMP
+	REG_PROLOGUE
+	REG_LI	v0, _JB_MAGIC_SETJMP
 	REG_S	v0, (_JB_MAGIC  * SZREG)(a0)
 	REG_S	ra, (_JB_REG_RA * SZREG)(a0)
 	REG_S	s0, (_JB_REG_S0 * SZREG)(a0)
@@ -97,26 +97,23 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 	REG_S	s7, (_JB_REG_S7 * SZREG)(a0)
 	REG_S	sp, (_JB_REG_SP * SZREG)(a0)
 	REG_S	s8, (_JB_REG_S8 * SZREG)(a0)
+	REG_S	gp, (_JB_REG_GP * SZREG)(a0)
+	REG_EPILOGUE
 
 	move	v0, zero
-	j	ra
 END(setjmp)
 
 #define LONGJMP_FRAME_SIZE	(CALLFRAME_SIZ + (SZREG * 2))
 
 NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	.set	noreorder
-#ifdef __ABICALLS__
-	.cpload	t9
-#endif
-	subu	sp, sp, LONGJMP_FRAME_SIZE	# allocate stack frame
-#ifdef __ABICALLS__
-	.cprestore 16
-#endif
+	PIC_PROLOGUE(longjmp)
+	PTR_SUBU sp, sp, LONGJMP_FRAME_SIZE	# allocate stack frame
+	SAVE_GP(CALLFRAME_GP)
+
 	REG_S	ra, CALLFRAME_RA(sp)		# save RA
 	REG_L	v0, (_JB_MAGIC  * SZREG)(a0)
-	li	t0, _JB_MAGIC_SETJMP
+	REG_LI	t0, _JB_MAGIC_SETJMP
 	bne	v0, t0, botch		# jump if error
 	nop
 
@@ -124,16 +121,17 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	REG_S	a1, (CALLFRAME_SIZ + SZREG)(sp)	# save return value
 
 	# set sigmask
-	addu	a1, a0, _JB_SIGMASK * SZREG	# &set
+	PTR_ADDU a1, a0, _JB_SIGMASK * SZREG	# &set
 	move	a2, zero			# &oset == NULL
 	li	a0, 3				# SIG_SETMASK
-	la	t9,_C_LABEL(sigprocmask)	# set current signal mask
+	PTR_LA	t9,_C_LABEL(sigprocmask)	# set current signal mask
 	jal	t9
 	nop
 
 	REG_L	a0, CALLFRAME_SIZ(sp)		# restore env
 	REG_L	a1, (CALLFRAME_SIZ + SZREG)(sp)	# restore return value
 
+	REG_PROLOGUE
 	REG_L	ra, (_JB_REG_RA * SZREG)(a0)
 	REG_L	s0, (_JB_REG_S0 * SZREG)(a0)
 	REG_L	s1, (_JB_REG_S1 * SZREG)(a0)
@@ -145,16 +143,24 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	REG_L	s7, (_JB_REG_S7 * SZREG)(a0)
 	REG_L	sp, (_JB_REG_SP * SZREG)(a0)
 	REG_L	s8, (_JB_REG_S8 * SZREG)(a0)
+	REG_L	gp, (_JB_REG_GP * SZREG)(a0)
+
+	REG_EPILOGUE
 	move	v0, a1
 	j	ra
 	nop
 
 botch:
-	la	t9, _C_LABEL(longjmperror)
-	jal	t9
+	/*
+	 * We know we aren't returning so we don't care about restoring
+	 * our caller's GP.
+	 */
+	PTR_LA	t9, _C_LABEL(longjmperror)
+	jalr	t9
 	nop
 
-	la	t9, _C_LABEL(abort)
+	PIC_TAILCALL(abort)
+	PTR_LA	t9, _C_LABEL(abort)
 	jal	t9
 	nop
 END(longjmp)

Modified: user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S	Wed Mar  3 21:59:45 2010	(r204675)
+++ user/jmallett/octeon/lib/libc/mips/gen/sigsetjmp.S	Wed Mar  3 22:42:15 2010	(r204676)
@@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$");
 	ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
 
+#include "SYS.h"
+
 #ifdef __ABICALLS__
 	.abicalls
 #endif
@@ -57,30 +59,19 @@ __FBSDID("$FreeBSD$");
  */
 
 LEAF(sigsetjmp)
-#ifdef __ABICALLS__
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
+	PIC_PROLOGUE(sigsetjmp)
+
 	bne	a1, 0x0, 1f			# do saving of signal mask?
-	la	t9, _setjmp
-	jr	t9
+	PIC_TAILCALL(_setjmp)
 
-1:	la	t9, setjmp
-	jr	t9
+1:	PIC_TAILCALL(setjmp)
 END(sigsetjmp)
 
 LEAF(siglongjmp)
-#ifdef __ABICALLS__
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
+	PIC_PROLOGUE(siglongjmp)
 	REG_L	t0, (_JB_MAGIC  * SZREG)(a0)
-	li	t1, _JB_MAGIC__SETJMP
+	REG_LI	t1, _JB_MAGIC__SETJMP
 	bne	t0, t1, 1f			# setjmp or _setjmp magic?
-	la	t9, _longjmp
-	jr	t9
-1:	la	t9, longjmp
-	jr	t9
+	PIC_TAILCALL(_longjmp)
+1:	PIC_TAILCALL(longjmp)
 END(siglongjmp)

Modified: user/jmallett/octeon/sys/mips/include/asm.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/asm.h	Wed Mar  3 21:59:45 2010	(r204675)
+++ user/jmallett/octeon/sys/mips/include/asm.h	Wed Mar  3 22:42:15 2010	(r204676)
@@ -782,10 +782,11 @@ _C_LABEL(x):
  *       9	S7
  *       10	SP
  *       11	S8
- *       12	signal mask	(dependant on magic)
- *       13	(con't)
+ *       12	GP		(dependent on ABI)
+ *       13	signal mask	(dependant on magic)
  *       14	(con't)
  *       15	(con't)
+ *       16	(con't)
  *
  * The magic number number identifies the jmp_buf and
  * how the buffer was created as well as providing
@@ -810,9 +811,12 @@ _C_LABEL(x):
 #define _JB_REG_S7		9
 #define _JB_REG_SP		10
 #define _JB_REG_S8		11
+#if defined(__mips_n32) || defined(__mips_n64)
+#define	_JB_REG_GP		12
+#endif
 
 /* Only valid with the _JB_MAGIC_SETJMP magic */
 
-#define _JB_SIGMASK		12
+#define _JB_SIGMASK		13
 
 #endif /* !_MACHINE_ASM_H_ */

Modified: user/jmallett/octeon/sys/mips/include/setjmp.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/setjmp.h	Wed Mar  3 21:59:45 2010	(r204675)
+++ user/jmallett/octeon/sys/mips/include/setjmp.h	Wed Mar  3 22:42:15 2010	(r204676)
@@ -39,7 +39,7 @@
 
 #include 
 
-#define	_JBLEN	95		/* size, in longs, of a jmp_buf */
+#define	_JBLEN	95		/* size, in longs (or long longs), of a jmp_buf */
 
 /*
  * jmp_buf and sigjmp_buf are encapsulated in different structs to force

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 23:27:31 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20BDD1065673;
	Wed,  3 Mar 2010 23:27:31 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1029A8FC1C;
	Wed,  3 Mar 2010 23:27:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23NRUl7097775;
	Wed, 3 Mar 2010 23:27:30 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23NRUx9097773;
	Wed, 3 Mar 2010 23:27:30 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032327.o23NRUx9097773@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 23:27:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204678 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 23:27:31 -0000

Author: jmallett
Date: Wed Mar  3 23:27:30 2010
New Revision: 204678
URL: http://svn.freebsd.org/changeset/base/204678

Log:
  Fix return from setjmp.

Modified:
  user/jmallett/octeon/lib/libc/mips/gen/setjmp.S

Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 23:11:14 2010	(r204677)
+++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 23:27:30 2010	(r204678)
@@ -101,6 +101,7 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 	REG_EPILOGUE
 
 	move	v0, zero
+	jr	ra
 END(setjmp)
 
 #define LONGJMP_FRAME_SIZE	(CALLFRAME_SIZ + (SZREG * 2))

From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 23:37:53 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2DE21065675;
	Wed,  3 Mar 2010 23:37:53 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A255F8FC20;
	Wed,  3 Mar 2010 23:37:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23Nbr0q000176;
	Wed, 3 Mar 2010 23:37:53 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23NbrLW000173;
	Wed, 3 Mar 2010 23:37:53 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003032337.o23NbrLW000173@svn.freebsd.org>
From: Juli Mallett 
Date: Wed, 3 Mar 2010 23:37:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204679 - user/jmallett/octeon/sys/mips/conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 03 Mar 2010 23:37:53 -0000

Author: jmallett
Date: Wed Mar  3 23:37:53 2010
New Revision: 204679
URL: http://svn.freebsd.org/changeset/base/204679

Log:
  Turn off verbose sysinit and bpf.

Modified:
  user/jmallett/octeon/sys/mips/conf/OCTEON1
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1	Wed Mar  3 23:27:30 2010	(r204678)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1	Wed Mar  3 23:37:53 2010	(r204679)
@@ -84,8 +84,9 @@ device		md
 device		uart
 nodevice	uart_ns8250
 device		rgmii
-options 	VERBOSE_SYSINIT
+#options 	VERBOSE_SYSINIT
 
+device		bpf
 
 #
 # Use the following for  Compact Flash file-system

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Wed Mar  3 23:27:30 2010	(r204678)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Wed Mar  3 23:37:53 2010	(r204679)
@@ -75,8 +75,9 @@ device		md
 device		uart
 nodevice	uart_ns8250
 device		rgmii
-options 	VERBOSE_SYSINIT
+#options 	VERBOSE_SYSINIT
 
+device		bpf
 
 #
 # Use the following for  Compact Flash file-system

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 00:40:54 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15075106566B;
	Thu,  4 Mar 2010 00:40:54 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ECA608FC16;
	Thu,  4 Mar 2010 00:40:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o240erMI014073;
	Thu, 4 Mar 2010 00:40:53 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o240erSc014069;
	Thu, 4 Mar 2010 00:40:53 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003040040.o240erSc014069@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 00:40:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204680 - in user/jmallett/octeon/sys/mips: cavium conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 00:40:54 -0000

Author: jmallett
Date: Thu Mar  4 00:40:53 2010
New Revision: 204680
URL: http://svn.freebsd.org/changeset/base/204680

Log:
  Switch to CF root, add /dev/random support (SSH works!) and let Octeon go to
  multi-user as long as it's not O32.
  
  Sponsored by:	Packet Forensics

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
  user/jmallett/octeon/sys/mips/conf/OCTEON1
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Thu Mar  4 00:40:53 2010	(r204680)
@@ -730,7 +730,9 @@ platform_start(__register_t a0, __regist
 {
 	uint64_t platform_counter_freq;
 
+#if defined(__mips_o32)
 	boothowto |= RB_SINGLE;
+#endif
 
 	/* Initialize pcpu stuff */
 	mips_pcpu0_init();

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1	Thu Mar  4 00:40:53 2010	(r204680)
@@ -44,7 +44,6 @@ hints		"OCTEON1.hints"		#Default places 
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-#XXXimp: Need to make work with 64-bit too
 options 	ISA_MIPS64
 
 options		DDB
@@ -59,10 +58,10 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Po
 #options	ROOTDEVNAME=\"ufs:ad0s1a\"	# Original
 options		NO_SWAPPING
 
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_COMPAT
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_COMPAT
 
 options         FFS                     #Berkeley Fast Filesystem
 options         SOFTUPDATES             #Enable FFS soft updates support
@@ -87,11 +86,12 @@ device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf
+device		random
 
 #
 # Use the following for  Compact Flash file-system
 device 		cf
-#options         ROOTDEVNAME = \"ufs:cf0s2\"	# Unmask if compact flash is needed as RFS
+options 	ROOTDEVNAME=\"ufs:cf0s1\"
 
 #
 # Use the following for RFS in mem-device

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Thu Mar  4 00:40:53 2010	(r204680)
@@ -50,10 +50,10 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Po
 #options	ROOTDEVNAME=\"ufs:ad0s1a\"	# Original
 options		NO_SWAPPING
 
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_COMPAT
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_COMPAT
 
 options         FFS                     #Berkeley Fast Filesystem
 options         SOFTUPDATES             #Enable FFS soft updates support
@@ -78,11 +78,12 @@ device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf
+device		random
 
 #
 # Use the following for  Compact Flash file-system
 device 		cf
-#options 	ROOTDEVNAME=\"ufs:cf0s1\"
+options 	ROOTDEVNAME=\"ufs:cf0s1\"
 
 #
 # Use the following for RFS in mem-device

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 02:24:14 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD601106564A;
	Thu,  4 Mar 2010 02:24:14 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BCA6C8FC16;
	Thu,  4 Mar 2010 02:24:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o242OEdI036980;
	Thu, 4 Mar 2010 02:24:14 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o242OERw036978;
	Thu, 4 Mar 2010 02:24:14 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003040224.o242OERw036978@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 02:24:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204682 - user/jmallett/octeon/lib/libc/mips/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 02:24:14 -0000

Author: jmallett
Date: Thu Mar  4 02:24:14 2010
New Revision: 204682
URL: http://svn.freebsd.org/changeset/base/204682

Log:
  Attempt to make new ABI friendly, etc.  Now gdb panics the kernel, perhaps some
  lingering N32-related issues in kernel side of ptrace.

Modified:
  user/jmallett/octeon/lib/libc/mips/sys/ptrace.S

Modified: user/jmallett/octeon/lib/libc/mips/sys/ptrace.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Thu Mar  4 00:47:24 2010	(r204681)
+++ user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Thu Mar  4 02:24:14 2010	(r204682)
@@ -41,32 +41,27 @@ __FBSDID("$FreeBSD$");
 	ASMSTR("$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-LEAF(ptrace)
-	.frame	sp, 40, ra
-	.mask	0x80000000, -8
-#ifdef __ABICALLS__
-	.set    noreorder
-	.cpload t9
-	.set    reorder
-#endif
-	subu	sp, sp, 40
-	sw	ra,  32(sp)
-#ifdef __ABICALLS__
-	.cprestore 16
-#endif
-	la	t9, _C_LABEL(__error)	# locate address of errno
+NESTED_NOPROFILE(ptrace, CALLFRAME_SIZ, ra)
+	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
+	PIC_PROLOGUE(ptrace)
+	PTR_SUBU sp, sp, CALLFRAME_SP
+	REG_S	ra, CALLFRAME_RA(sp)
+
+	SAVE_GP(CALLFRAME_GP)
+
+	PTR_LA	t9, _C_LABEL(__error)	# locate address of errno
 	jalr	t9
-#ifdef __ABICALLS__
-	lw	gp, 16(sp)
-#endif
-	sw	zero, 0(v0)
-	lw	ra, 32(sp)
-	addu	sp, sp, 40
+
+	INT_S	zero, 0(v0)
+
+	REG_L	ra, CALLFRAME_RA(sp)
+	PTR_ADDU sp, sp, CALLFRAME_SIZ
+
 	li	v0, SYS_ptrace
 	syscall
+
 	bne	a3, zero, 1f
-	j	ra
+	PIC_RETURN()
 1:
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(ptrace)

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 02:32:46 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3B62106564A;
	Thu,  4 Mar 2010 02:32:46 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E90E8FC0A;
	Thu,  4 Mar 2010 02:32:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o242WkcM038897;
	Thu, 4 Mar 2010 02:32:46 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o242WkMG038885;
	Thu, 4 Mar 2010 02:32:46 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003040232.o242WkMG038885@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 02:32:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204683 - in user/jmallett/octeon: . contrib/bind9
	contrib/bind9/bin/check contrib/bind9/bin/dig
	contrib/bind9/bin/dnssec contrib/bind9/bin/named
	contrib/bind9/bin/named/include/named c...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 02:32:46 -0000

Author: jmallett
Date: Thu Mar  4 02:32:45 2010
New Revision: 204683
URL: http://svn.freebsd.org/changeset/base/204683

Log:
  Merge from head.

Added:
  user/jmallett/octeon/lib/libpmc/pmc.mips.3
     - copied unchanged from r204682, head/lib/libpmc/pmc.mips.3
  user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mips.c
     - copied unchanged from r204682, head/sys/dev/hwpmc/hwpmc_mips.c
  user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mips24k.c
     - copied unchanged from r204682, head/sys/dev/hwpmc/hwpmc_mips24k.c
  user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mips24k.h
     - copied unchanged from r204682, head/sys/dev/hwpmc/hwpmc_mips24k.h
Deleted:
  user/jmallett/octeon/include/utmp.h
Modified:
  user/jmallett/octeon/Makefile
  user/jmallett/octeon/ObsoleteFiles.inc
  user/jmallett/octeon/contrib/bind9/CHANGES
  user/jmallett/octeon/contrib/bind9/COPYRIGHT
  user/jmallett/octeon/contrib/bind9/FAQ
  user/jmallett/octeon/contrib/bind9/FAQ.xml
  user/jmallett/octeon/contrib/bind9/NSEC3-NOTES
  user/jmallett/octeon/contrib/bind9/README
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.8
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.html
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkzone.8
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkzone.c
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkzone.docbook
  user/jmallett/octeon/contrib/bind9/bin/check/named-checkzone.html
  user/jmallett/octeon/contrib/bind9/bin/dig/dig.1
  user/jmallett/octeon/contrib/bind9/bin/dig/dig.html
  user/jmallett/octeon/contrib/bind9/bin/dig/dighost.c
  user/jmallett/octeon/contrib/bind9/bin/dig/host.1
  user/jmallett/octeon/contrib/bind9/bin/dig/host.c
  user/jmallett/octeon/contrib/bind9/bin/dig/host.html
  user/jmallett/octeon/contrib/bind9/bin/dig/nslookup.1
  user/jmallett/octeon/contrib/bind9/bin/dig/nslookup.c
  user/jmallett/octeon/contrib/bind9/bin/dig/nslookup.html
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keygen.8
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keygen.c
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-keygen.html
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-signzone.8
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-signzone.c
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssec-signzone.html
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssectool.c
  user/jmallett/octeon/contrib/bind9/bin/dnssec/dnssectool.h
  user/jmallett/octeon/contrib/bind9/bin/named/control.c
  user/jmallett/octeon/contrib/bind9/bin/named/include/named/server.h
  user/jmallett/octeon/contrib/bind9/bin/named/lwresd.8
  user/jmallett/octeon/contrib/bind9/bin/named/lwresd.html
  user/jmallett/octeon/contrib/bind9/bin/named/named.8
  user/jmallett/octeon/contrib/bind9/bin/named/named.conf.5
  user/jmallett/octeon/contrib/bind9/bin/named/named.conf.html
  user/jmallett/octeon/contrib/bind9/bin/named/named.docbook
  user/jmallett/octeon/contrib/bind9/bin/named/named.html
  user/jmallett/octeon/contrib/bind9/bin/named/query.c
  user/jmallett/octeon/contrib/bind9/bin/named/server.c
  user/jmallett/octeon/contrib/bind9/bin/named/statschannel.c
  user/jmallett/octeon/contrib/bind9/bin/named/update.c
  user/jmallett/octeon/contrib/bind9/bin/nsupdate/nsupdate.1
  user/jmallett/octeon/contrib/bind9/bin/nsupdate/nsupdate.html
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc-confgen.8
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc-confgen.html
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc.8
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc.conf.5
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc.conf.html
  user/jmallett/octeon/contrib/bind9/bin/rndc/rndc.html
  user/jmallett/octeon/contrib/bind9/config.h.in
  user/jmallett/octeon/contrib/bind9/configure.in
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM-book.xml
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.html
  user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.pdf
  user/jmallett/octeon/contrib/bind9/doc/arm/man.dig.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keygen.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-signzone.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.host.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkconf.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkzone.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.named.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.nsupdate.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc-confgen.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.conf.html
  user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.html
  user/jmallett/octeon/contrib/bind9/doc/misc/Makefile.in
  user/jmallett/octeon/contrib/bind9/lib/dns/api
  user/jmallett/octeon/contrib/bind9/lib/dns/db.c
  user/jmallett/octeon/contrib/bind9/lib/dns/dispatch.c
  user/jmallett/octeon/contrib/bind9/lib/dns/dnssec.c
  user/jmallett/octeon/contrib/bind9/lib/dns/dst_api.c
  user/jmallett/octeon/contrib/bind9/lib/dns/dst_internal.h
  user/jmallett/octeon/contrib/bind9/lib/dns/dst_parse.c
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/db.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/dnssec.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/journal.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/keyvalues.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/name.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/ncache.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/nsec3.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/rbt.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/types.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/zone.h
  user/jmallett/octeon/contrib/bind9/lib/dns/include/dst/dst.h
  user/jmallett/octeon/contrib/bind9/lib/dns/journal.c
  user/jmallett/octeon/contrib/bind9/lib/dns/masterdump.c
  user/jmallett/octeon/contrib/bind9/lib/dns/message.c
  user/jmallett/octeon/contrib/bind9/lib/dns/nsec3.c
  user/jmallett/octeon/contrib/bind9/lib/dns/opensslrsa_link.c
  user/jmallett/octeon/contrib/bind9/lib/dns/rbt.c
  user/jmallett/octeon/contrib/bind9/lib/dns/rbtdb.c
  user/jmallett/octeon/contrib/bind9/lib/dns/rcode.c
  user/jmallett/octeon/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  user/jmallett/octeon/contrib/bind9/lib/dns/resolver.c
  user/jmallett/octeon/contrib/bind9/lib/dns/sdb.c
  user/jmallett/octeon/contrib/bind9/lib/dns/sdlz.c
  user/jmallett/octeon/contrib/bind9/lib/dns/spnego.c
  user/jmallett/octeon/contrib/bind9/lib/dns/validator.c
  user/jmallett/octeon/contrib/bind9/lib/dns/view.c
  user/jmallett/octeon/contrib/bind9/lib/dns/zone.c
  user/jmallett/octeon/contrib/bind9/lib/isc/api
  user/jmallett/octeon/contrib/bind9/lib/isc/base32.c
  user/jmallett/octeon/contrib/bind9/lib/isc/base64.c
  user/jmallett/octeon/contrib/bind9/lib/isc/heap.c
  user/jmallett/octeon/contrib/bind9/lib/isc/httpd.c
  user/jmallett/octeon/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  user/jmallett/octeon/contrib/bind9/lib/isc/include/isc/entropy.h
  user/jmallett/octeon/contrib/bind9/lib/isc/include/isc/netscope.h
  user/jmallett/octeon/contrib/bind9/lib/isc/include/isc/portset.h
  user/jmallett/octeon/contrib/bind9/lib/isc/include/isc/sha2.h
  user/jmallett/octeon/contrib/bind9/lib/isc/include/isc/util.h
  user/jmallett/octeon/contrib/bind9/lib/isc/inet_ntop.c
  user/jmallett/octeon/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  user/jmallett/octeon/contrib/bind9/lib/isc/random.c
  user/jmallett/octeon/contrib/bind9/lib/isc/sha2.c
  user/jmallett/octeon/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  user/jmallett/octeon/contrib/bind9/lib/isc/unix/socket.c
  user/jmallett/octeon/contrib/bind9/lib/isccc/api
  user/jmallett/octeon/contrib/bind9/lib/isccfg/aclconf.c
  user/jmallett/octeon/contrib/bind9/lib/isccfg/api
  user/jmallett/octeon/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  user/jmallett/octeon/contrib/bind9/lib/lwres/api
  user/jmallett/octeon/contrib/bind9/lib/lwres/context.c
  user/jmallett/octeon/contrib/bind9/lib/lwres/getipnode.c
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_buffer.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_buffer.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_config.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_config.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_context.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_context.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gabn.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gabn.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gnba.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gnba.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_noop.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_noop.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_packet.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_packet.html
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_resutil.3
  user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_resutil.html
  user/jmallett/octeon/contrib/bind9/version
  user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
  user/jmallett/octeon/include/Makefile
  user/jmallett/octeon/lib/bind/config.h
  user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_extern.h
  user/jmallett/octeon/lib/libc/stdlib/reallocf.c
  user/jmallett/octeon/lib/libpmc/libpmc.c
  user/jmallett/octeon/sbin/gvinum/gvinum.c
  user/jmallett/octeon/sbin/newfs/Makefile
  user/jmallett/octeon/sbin/newfs/mkfs.c
  user/jmallett/octeon/sbin/newfs/newfs.c
  user/jmallett/octeon/sbin/newfs/newfs.h
  user/jmallett/octeon/share/man/man4/ata.4
  user/jmallett/octeon/share/man/man9/driver.9
  user/jmallett/octeon/sys/amd64/amd64/local_apic.c
  user/jmallett/octeon/sys/amd64/include/_inttypes.h
  user/jmallett/octeon/sys/amd64/include/apicvar.h
  user/jmallett/octeon/sys/conf/NOTES
  user/jmallett/octeon/sys/conf/files
  user/jmallett/octeon/sys/conf/files.mips
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_debug.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_decode.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_devid.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_eeprom.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_eeprom_v1.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_eeprom_v1.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_eeprom_v3.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_internal.h
  user/jmallett/octeon/sys/dev/ath/ath_hal/ah_soc.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_power.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210desc.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210phy.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210reg.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_power.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211desc.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211phy.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211reg.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/boss.ini   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212.ini   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212desc.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212phy.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5311reg.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_power.c   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312phy.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312reg.h   (contents, props changed)
  user/jmallett/octeon/sys/dev/bwn/if_bwn.c
  user/jmallett/octeon/sys/dev/ciss/ciss.c
  user/jmallett/octeon/sys/dev/ciss/cissvar.h
  user/jmallett/octeon/sys/dev/hme/if_hme_sbus.c
  user/jmallett/octeon/sys/dev/hme/if_hmereg.h
  user/jmallett/octeon/sys/dev/hme/if_hmevar.h
  user/jmallett/octeon/sys/dev/hwpmc/pmc_events.h
  user/jmallett/octeon/sys/dev/le/am79900var.h
  user/jmallett/octeon/sys/dev/le/am7990var.h
  user/jmallett/octeon/sys/dev/le/if_le_ledma.c
  user/jmallett/octeon/sys/dev/le/lancevar.h
  user/jmallett/octeon/sys/dev/mii/bmtphyreg.h
  user/jmallett/octeon/sys/dev/mii/e1000phy.c
  user/jmallett/octeon/sys/dev/mii/icsphyreg.h
  user/jmallett/octeon/sys/dev/mii/lxtphyreg.h
  user/jmallett/octeon/sys/dev/mii/mii.c
  user/jmallett/octeon/sys/dev/mii/mii_physubr.c
  user/jmallett/octeon/sys/dev/mii/miidevs
  user/jmallett/octeon/sys/dev/mii/miivar.h
  user/jmallett/octeon/sys/dev/mii/nsphyreg.h
  user/jmallett/octeon/sys/dev/mii/nsphyterreg.h
  user/jmallett/octeon/sys/dev/mii/qsphyreg.h
  user/jmallett/octeon/sys/dev/mii/ukphy_subr.c
  user/jmallett/octeon/sys/dev/siba/siba_bwn.c
  user/jmallett/octeon/sys/dev/siba/siba_core.c
  user/jmallett/octeon/sys/dev/usb/controller/ehci.h
  user/jmallett/octeon/sys/dev/usb/controller/ehci_pci.c
  user/jmallett/octeon/sys/dev/usb/controller/ehcireg.h
  user/jmallett/octeon/sys/dev/usb/controller/ohci.h
  user/jmallett/octeon/sys/dev/usb/controller/ohci_pci.c
  user/jmallett/octeon/sys/dev/usb/controller/ohcireg.h
  user/jmallett/octeon/sys/dev/usb/controller/uhci.h
  user/jmallett/octeon/sys/dev/usb/controller/uhci_pci.c
  user/jmallett/octeon/sys/dev/usb/controller/uhcireg.h
  user/jmallett/octeon/sys/dev/usb/input/uhid.c
  user/jmallett/octeon/sys/dev/usb/input/ukbd.c
  user/jmallett/octeon/sys/dev/usb/input/ums.c
  user/jmallett/octeon/sys/dev/usb/serial/uftdi.c
  user/jmallett/octeon/sys/dev/usb/serial/ugensa.c
  user/jmallett/octeon/sys/dev/usb/serial/uipaq.c
  user/jmallett/octeon/sys/dev/usb/serial/ulpt.c
  user/jmallett/octeon/sys/dev/usb/serial/uvisor.c
  user/jmallett/octeon/sys/dev/usb/usb_cdc.h
  user/jmallett/octeon/sys/dev/usb/usb_hid.c
  user/jmallett/octeon/sys/dev/usb/usbdevs
  user/jmallett/octeon/sys/fs/msdosfs/msdosfs_lookup.c
  user/jmallett/octeon/sys/i386/i386/local_apic.c
  user/jmallett/octeon/sys/i386/include/_inttypes.h
  user/jmallett/octeon/sys/i386/include/apicvar.h
  user/jmallett/octeon/sys/ia64/include/_inttypes.h
  user/jmallett/octeon/sys/kern/kern_resource.c
  user/jmallett/octeon/sys/kern/ksched.c
  user/jmallett/octeon/sys/kern/subr_param.c
  user/jmallett/octeon/sys/kern/vfs_syscalls.c
  user/jmallett/octeon/sys/mips/include/_inttypes.h
  user/jmallett/octeon/sys/mips/include/cpufunc.h
  user/jmallett/octeon/sys/mips/include/pmc_mdep.h
  user/jmallett/octeon/sys/mips/malta/gtreg.h
  user/jmallett/octeon/sys/mips/mips/support.S
  user/jmallett/octeon/sys/mips/rmi/ehcireg.h
  user/jmallett/octeon/sys/mips/rmi/ehcivar.h
  user/jmallett/octeon/sys/mips/rmi/xls_ehci.c
  user/jmallett/octeon/sys/modules/ath/Makefile
  user/jmallett/octeon/sys/powerpc/aim/ofwmagic.S
  user/jmallett/octeon/sys/powerpc/fpu/fpu_extern.h
  user/jmallett/octeon/sys/powerpc/include/_inttypes.h
  user/jmallett/octeon/sys/powerpc/include/intr.h
  user/jmallett/octeon/sys/powerpc/include/spr.h
  user/jmallett/octeon/sys/sparc64/include/_inttypes.h
  user/jmallett/octeon/sys/sparc64/sbus/lsi64854reg.h
  user/jmallett/octeon/sys/sparc64/sbus/lsi64854var.h
  user/jmallett/octeon/sys/sparc64/sbus/ofw_sbus.h
  user/jmallett/octeon/sys/sun4v/include/_inttypes.h
  user/jmallett/octeon/sys/sys/clock.h
  user/jmallett/octeon/sys/sys/pmc.h
  user/jmallett/octeon/sys/sys/systm.h
  user/jmallett/octeon/sys/x86/isa/clock.c
  user/jmallett/octeon/tools/regression/lib/libc/resolv/resolv.c
  user/jmallett/octeon/tools/regression/sysvmsg/msgtest.c
  user/jmallett/octeon/tools/regression/sysvshm/shmtest.c
  user/jmallett/octeon/usr.bin/csup/Makefile
  user/jmallett/octeon/usr.bin/csup/auth.c
  user/jmallett/octeon/usr.bin/truncate/Makefile
  user/jmallett/octeon/usr.bin/truncate/truncate.c
  user/jmallett/octeon/usr.sbin/jail/jail.8
Directory Properties:
  user/jmallett/octeon/   (props changed)
  user/jmallett/octeon/contrib/bind9/   (props changed)

Modified: user/jmallett/octeon/Makefile
==============================================================================
--- user/jmallett/octeon/Makefile	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/Makefile	Thu Mar  4 02:32:45 2010	(r204683)
@@ -15,6 +15,7 @@
 # reinstallkernel     - Reinstall the kernel and the kernel-modules.
 # reinstallkernel.debug
 # kernel              - buildkernel + installkernel.
+# kernel-toolchain    - Builds the subset of world necessary to build a kernel
 # doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree (cvs).
 # check-old           - List obsolete directories/files/libraries.

Modified: user/jmallett/octeon/ObsoleteFiles.inc
==============================================================================
--- user/jmallett/octeon/ObsoleteFiles.inc	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/ObsoleteFiles.inc	Thu Mar  4 02:32:45 2010	(r204683)
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100303: actual removal of utmp.h
+OLD_FILES+=usr/include/utmp.h
 # 20100227: [ia64] removed  and 
 .if ${TARGET_ARCH} == "ia64"
 OLD_FILES+=usr/include/machine/sapicreg.h

Modified: user/jmallett/octeon/contrib/bind9/CHANGES
==============================================================================
--- user/jmallett/octeon/contrib/bind9/CHANGES	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/CHANGES	Thu Mar  4 02:32:45 2010	(r204683)
@@ -1,4 +1,27 @@
-	--- 9.6.1-P3 released ---
+
+	--- 9.6.2 released ---
+
+2850.	[bug]		If isc_heap_insert() failed due to memory shortage
+			the heap would have corrupted entries. [RT #20951]
+
+2849.	[bug]		Don't treat errors from the xml2 library as fatal.
+			[RT #20945]
+
+2846.	[bug]		EOF on unix domain sockets was not being handled
+			correctly. [RT #20731]
+
+2844.	[doc]		notify-delay default in ARM was wrong.  It should have
+			been five (5) seconds.
+
+	--- 9.6.2rc1 released ---
+
+2838.	[func]		Backport support for SHA-2 DNSSEC algorithms,
+			RSASHA256 and RSASHA512, from BIND 9.7.  (This
+			incorporates changes 2726 and 2738 from that
+			release branch.) [RT #20871]
+
+2837.	[port]		Prevent Linux spurious warnings about fwrite().
+			[RT #20812]
 
 2831.	[security]	Do not attempt to validate or cache
 			out-of-bailiwick data returned with a secure
@@ -10,21 +33,286 @@
 
 2827.	[security]	Bogus NXDOMAIN could be cached as if valid. [RT #20712]
 
-	--- 9.6.1-P2 released ---
+2825.	[bug]		Changing the setting of OPTOUT in a NSEC3 chain that
+			was in the process of being created was not properly
+			recorded in the zone. [RT #20786]
+
+2823.	[bug]		rbtdb.c:getsigningtime() was missing locks. [RT #20781]
+
+2819.	[cleanup]	Removed unnecessary DNS_POINTER_MAXHOPS define
+			[RT #20771]
+
+2818.	[cleanup]	rndc could return an incorrect error code 
+			when a zone was not found. [RT #20767]
+
+2815.	[bug]		Exclusively lock the task when freezing a zone.
+			[RT #19838]
+
+2814.	[func]		Provide a definitive error message when a master
+			zone is not loaded. [RT #20757]
+
+	--- 9.6.2b1 released ---
+
+2797.	[bug]		Don't decrement the dispatch manager's maxbuffers.
+			[RT #20613]
+
+2790.	[bug]		Handle DS queries to stub zones. [RT #20440]
+
+2789.   [bug]           Fixed an INSIST in dispatch.c [RT #20576]
+
+2786.	[bug]		Additional could be promoted to answer. [RT #20663]
+
+2784.	[bug]		TC was not always being set when required glue was
+			dropped. [RT #20655]
+
+2783.	[func]		Return minimal responses to EDNS/UDP queries with a UDP
+			buffer size of 512 or less.  [RT #20654]
+
+2782.	[port]		win32: use getaddrinfo() for hostname lookups.
+			[RT #20650]
+
+2777.	[contrib]	DLZ MYSQL auto reconnect support discovery was wrong.
 
 2772.	[security]	When validating, track whether pending data was from
 			the additional section or not and only return it if
 			validates as secure. [RT #20438]
 
-	--- 9.6.1-P1 released ---
+2765.	[bug]		Skip masters for which the TSIG key cannot be found.
+			[RT #20595]
+
+2760.	[cleanup]	Corrected named-compilezone usage summary. [RT #20533]
+
+2759.	[doc]		Add information about .jbk/.jnw files to
+			the ARM. [RT #20303]
+
+2758.	[bug]		win32: Added a workaround for a windows 2008 bug
+			that could cause the UDP client handler to shut
+			down. [RT #19176]
+
+2757.	[bug]		dig: assertion failure could occur in connect
+			timeout. [RT #20599]
+
+2755.	[doc]		Clarify documentation of keyset- files in
+			dnssec-signzone man page. [RT #19810]
+
+2754.	[bug]		Secure-to-insecure transitions failed when zone
+			was signed with NSEC3. [RT #20587]
+
+2750.	[bug]		dig: assertion failure could occur when a server
+			didn't have an address. [RT #20579]
+
+2749.	[bug]		ixfr-from-differences generated a non-minimal ixfr
+			for NSEC3 signed zones. [RT #20452]
+
+2747.	[bug]		Journal roll forwards failed to set the re-signing
+			time of RRSIGs correctly. [RT #20541]
+
+2743.	[bug]		RRSIG could be incorrectly set in the NSEC3 record
+			for a insecure delegation.
+
+2729.	[func]		When constructing a CNAME from a DNAME use the DNAME
+			TTL. [RT #20451]
+
+2723.	[bug]		isc_base32_totext(), isc_base32hex_totext(), and
+			isc_base64_totext(), didn't always mark regions of
+			memory as fully consumed after conversion.  [RT #20445]
+
+2722.	[bug]		Ensure that the memory associated with the name of
+			a node in a rbt tree is not altered during the life
+			of the node. [RT #20431]
+
+2721.	[port]		Have dst__entropy_status() prime the random number
+			generator. [RT #20369]
+
+2718.	[bug]		The space calculations in opensslrsa_todns() were
+			incorrect. [RT #20394]
+
+2716.	[bug]		nslookup debug mode didn't return the ttl. [RT #20414]
+
+2715.	[bug]		Require OpenSSL support to be explicitly disabled.
+			[RT #20288]
+
+2714.	[port]		aix/powerpc: 'asm("ics");' needs non standard assembler
+			flags.
+
+2713.	[bug]		powerpc: atomic operations missing asm("ics") /
+			__isync() calls.
+
+2706.	[bug]		Loading a zone with a very large NSEC3 salt could
+			trigger an assert. [RT #20368]
+
+2705.	[bug]		Reconcile the XML stats version number with a later
+                        BIND9 release, by adding a "name" attribute to
+                        "cache" elements and increasing the version number
+                        to 2.2.  (This is a minor version change, but may
+                        affect XML parsers if they assume the cache element
+                        doesn't take an attribute.)
+
+2704.	[bug]		Serial of dynamic and stub zones could be inconsistent
+			with their SOA serial.  [RT #19387]
+
+2701.	[doc]		Correction to ARM: hmac-md5 is no longer the only
+			supported TSIG key algorithm. [RT #18046]
+
+2700.	[doc]		The match-mapped-addresses option is discouraged.
+			[RT #12252]
+
+2699.	[bug]		Missing lock in rbtdb.c. [RT #20037]
+
+2697.	[port]		win32: ensure that S_IFMT, S_IFDIR, S_IFCHR and
+			S_IFREG are defined after including .
+			[RT #20309]
+
+2696.	[bug]		named failed to successfully process some valid
+			acl constructs. [RT #20308]
+
+2692.	[port]		win32: 32/64 bit cleanups. [RT #20335]
+
+2690.	[bug]		win32: fix isc_thread_key_getspecific() prototype.
+			[RT #20315]
+
+2689.	[bug]		Correctly handle snprintf result. [RT #20306]
+
+2688.	[bug]		Use INTERFACE_F_POINTTOPOINT, not IFF_POINTOPOINT,
+			to decide to fetch the destination address. [RT #20305]
+
+2686.	[bug]		dnssec-signzone should clean the old NSEC chain when
+			signing with NSEC3 and vice versa. [RT #20301]
+
+2683.	[bug]		dnssec-signzone should clean out old NSEC3 chains when
+			the NSEC3 parameters used to sign the zone change.
+			[RT #20246]
+
+2681.	[bug]		IPSECKEY RR of gateway type 3 was not correctly
+			decoded. [RT #20269]
+
+2678.	[func]		Treat DS queries as if "minimal-response yes;"
+			was set. [RT #20258]
+
+2672.	[bug]		Don't enable searching in 'host' when doing reverse
+			lookups. [RT #20218]
+
+2670.	[bug]		Unexpected connect failures failed to log enough
+			information to be useful. [RT #20205]
+
+2663.	[func]		win32:  allow named to run as a service using
+			"NT AUTHORITY\LocalService" as the account. [RT #19977]
+
+2662.	[bug]		lwres_getipnodebyname() and lwres_getipnodebyaddr()
+			returned a misleading error code when lwresd was
+			down. [RT #20028]
+
+2661.	[bug]		Check whether socket fd exceeds FD_SETSIZE when
+			creating lwres context. [RT #20029]
+
+2659.	[doc]		Clarify dnssec-keygen doc: key name must match zone
+			name for DNSSEC keys. [RT #19938]
+
+2656.	[func]		win32: add a "tools only" check box to the installer
+			which causes it to only install dig, host, nslookup,
+			nsupdate and relevant DLLs.  [RT #19998]
+
+2655.	[doc]		Document that key-directory does not affect
+			rndc.key.  [RT #20155]
+
+2653.	[bug]		Treat ENGINE_load_private_key() failures as key
+			not found rather than out of memory.  [RT #18033]
+
+2649.	[bug]		Set the domain for forward only zones. [RT #19944]
+
+2648.	[port]		win32: isc_time_seconds() was broken. [RT #19900]
+
+2647.	[bug]		Remove unnecessary SOA updates when a new KSK is
+			added. [RT #19913]
+
+2646.	[bug]		Incorrect cleanup on error in socket.c. [RT #19987]
+
+2645.	[port]		"gcc -m32" didn't work on amd64 and x86_64 platforms
+			which default to 64 bits. [RT #19927]
+
+2643.	[bug]		Stub zones interacted badly with NSEC3 support.
+			[RT #19777]
+
+2642.	[bug]		nsupdate could dump core on solaris when reading
+			improperly formatted key files.  [RT #20015]
 
 2640.	[security]	A specially crafted update packet will cause named
 			to exit. [RT #20000]
 
+2639.	[bug]		Silence compiler warnings in gssapi code. [RT #19954]
+
+2637.	[func]		Rationalize dnssec-signzone's signwithkey() calling.
+			[RT #19959]
+
+2635.	[bug]		isc_inet_ntop() incorrectly handled 0.0/16 addresses.
+			[RT #19716]
+
+2633.	[bug]		Handle 15 bit rand() functions. [RT #19783]
+
+2632.	[func]		util/kit.sh: warn if documentation appears to be out of
+			date.  [RT #19922]
+
+2625.	[bug]		Missing UNLOCK in rbtdb.c. [RT #19865]
+
+2623.	[bug]		Named started seaches for DS non-optimally. [RT #19915]
+
+2621.	[doc]		Made copyright boilterplate consistent.  [RT #19833]
+
+2920.	[bug]		Delay thawing the zone until the reload of it has
+			completed successfully.  [RT #19750]
+
+2618.	[bug]		The sdb and sdlz db_interator_seek() methods could
+			loop infinitely. [RT #19847]
+
+2617.	[bug]		ifconfig.sh failed to emit an error message when
+			run from the wrong location. [RT #19375]
+
+2616.	[bug]		'host' used the nameservers from resolv.conf even
+			when a explicit nameserver was specified. [RT #19852]
+
+2615.	[bug]		"__attribute__((unused))" was in the wrong place
+			for ia64 gcc builds. [RT #19854]
+
+2614.	[port]		win32: 'named -v' should automatically be executed
+			in the foreground. [RT #19844]
+
+2613.	[bug]		Option argument validation was missing for
+			dnssec-dsfromkey. [RT #19828]
+
+2610.	[port]		sunos: Change #2363 was not complete. [RT #19796]
+
+2608.	[func]		Perform post signing verification checks in
+			dnssec-signzone.  These can be disabled with -P.
+
+			The post sign verification test ensures that for each
+			algorithm in use there is at least one non revoked
+			self signed KSK key.  That all revoked KSK keys are
+			self signed.  That all records in the zone are signed
+			by the algorithm.  [RT #19653]
+
+2601.	[doc]		Mention file creation mode mask in the
+			named manual page.
+
+2593.	[bug]		Improve a corner source of SERVFAILs [RT #19632]
+
+2589.	[bug]		dns_db_unregister() failed to clear '*dbimp'.
+			[RT #19626]
+
+2581.	[contrib]	dlz/mysql set MYSQL_OPT_RECONNECT option on connection.
+			Requires MySQL 5.0.19 or later. [RT #19084]
+
+2580.	[bug]		UpdateRej statistics counter could be incremented twice
+			for one rejection. [RT #19476]
+
+2533.	[doc]		ARM: document @ (at-sign). [RT #17144]
+
+2500.	[contrib]	contrib/sdb/pgsql/zonetodb.c called non-existent
+			function. [RT #18582]
+
 	--- 9.6.1 released ---
 
 2607.	[bug]		named could incorrectly delete NSEC3 records for
-			empty nodes when processing a update request.  
+			empty nodes when processing a update request.
 			[RT #19749]
 
 2606.	[bug]		"delegation-only" was not being accepted in
@@ -78,7 +366,7 @@
 			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]
+			remove non-existent journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
@@ -136,7 +424,7 @@
 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]
 
@@ -185,7 +473,7 @@
 2536.	[cleanup]	Silence some warnings when -Werror=format-security is
 			specified. [RT #19083]
 
-2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+2535.	[bug]		dig +showsearch 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]
@@ -198,8 +486,8 @@
 2529.	[cleanup]	Upgrade libtool to silence complaints from recent
 			version of autoconf. [RT #18657]
 
-2528.   [cleanup]       Silence spurious configure warning about
-                        --datarootdir [RT #19096]
+2528.   [cleanup]	Silence spurious configure warning about
+			--datarootdir [RT #19096]
 
 2527.	[bug]		named could reuse cache on reload with
 			enabling/disabling validation. [RT #19119]
@@ -222,7 +510,7 @@
 			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.
+			nameserver address of the excluded address type.
 			[RT #18843]
 
 2516.	[bug]		glue sort for responses was performed even when not
@@ -235,7 +523,7 @@
 2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
 			[RT #18885]
 
-2506.	[port]		solaris: Check at configure time if 
+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
@@ -258,7 +546,7 @@
 2515.	[port]		win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
 			[RT #19063]
 
-2513	[bug]		Fix windows cli build. [RT #19062]
+2513.	[bug]		Fix windows cli build. [RT #19062]
 
 2510.	[bug]		"dig +sigchase" could trigger REQUIRE failures.
 			[RT #19033]
@@ -343,7 +631,7 @@
 
 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]
@@ -359,7 +647,7 @@
 
 2473.	[port]		linux: raise the limit on open files to the possible
 			maximum value before spawning threads; 'files'
-		        specified in named.conf doesn't seem to work with
+			specified in named.conf doesn't seem to work with
 			threads as expected. [RT #18784]
 
 2472.	[port]		linux: check the number of available cpu's before
@@ -388,7 +676,7 @@
 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
+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
@@ -418,7 +706,7 @@
 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]
 
@@ -458,7 +746,7 @@
 
 2442.	[bug]		A lock could be destroyed twice. [RT# 18626]
 
-2441.   [bug]           isc_radix_insert() could copy radix tree nodes
+2441.	[bug]		isc_radix_insert() could copy radix tree nodes
 			incompletely. [RT #18573]
 
 2440.   [bug]		named-checkconf used an incorrect test to determine
@@ -515,7 +803,7 @@
 			implementation.  Allow the use of kqueue,
 			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,
@@ -583,9 +871,9 @@
 
 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.
+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.
 
@@ -661,7 +949,7 @@
 2380.	[bug]		dns_view_find() was not returning NXDOMAIN/NXRRSET
 			proofs which, in turn, caused validation failures
 			for insecure zones immediately below a secure zone
-			the server was authoritative for. [RT #18112] 
+			the server was authoritative for. [RT #18112]
 
 2379.	[contrib]	queryperf/gen-data-queryperf.py: removed redundant
 			TLDs and supported RRs with TTLs [RT #17972]
@@ -709,7 +997,7 @@
 2363.	[port]		sunos: pre-set "lt_cv_sys_max_cmd_len=4096;".
 			[RT #17513]
 
-2362.   [cleanup]	Make "rrset-order fixed" a compile-time option.
+2362.	[cleanup]	Make "rrset-order fixed" a compile-time option.
 			settable by "./configure --enable-fixed-rrset".
 			Disabled by default. [RT #17977]
 
@@ -792,12 +1080,12 @@
 			interfaces if there are not listen-on-v6 clauses in
 			named.conf.  [RT #17581]
 
-2335.	[port]		sunos:  libbind and *printf() support for long long. 
+2335.	[port]		sunos:  libbind and *printf() support for long long.
 			[RT #17513]
 
 2334.	[bug]		Bad REQUIRES in fromstruct_in_naptr(),  off by one
 			bug in fromstruct_txt(). [RT #17609]
-			
+
 2333.	[bug]		Fix off by one error in isc_time_nowplusinterval().
 			[RT #17608]
 
@@ -842,7 +1130,7 @@
 2320.	[func]		Make statistics counters thread-safe for platforms
 			that support certain atomic operations. [RT #17466]
 
-2319.	[bug]		Silence Coverity warnings in 
+2319.	[bug]		Silence Coverity warnings in
 			lib/dns/rdata/in_1/apl_42.c. [RT #17469]
 
 2318.	[port]		sunos fixes for libbind.  [RT #17514]
@@ -894,7 +1182,7 @@
 2301.	[bug]		Remove resource leak and fix error messages in
 			bin/tests/system/lwresd/lwtest.c. [RT #17474]
 
-2300.	[bug]		Fixed failure to close open file in 
+2300.	[bug]		Fixed failure to close open file in
 			bin/tests/names/t_names.c. [RT #17473]
 
 2299.	[bug]		Remove unnecessary NULL check in
@@ -1017,7 +1305,7 @@
 2261.   [bug]           Fix memory leak with "any" and "none" ACLs [RT #17272]
 
 2260.	[bug]		Reported wrong clients-per-query when increasing the
-                        value. [RT #17236]
+			value. [RT #17236]
 
 2259.	[placeholder]
 
@@ -1039,10 +1327,10 @@
 			intermediate values as timer->idle was reset by
 			isc_timer_touch(). [RT #17243]
 
-2253.	[func]	 	"max-cache-size" defaults to 32M.
+2253.	[func]		"max-cache-size" defaults to 32M.
 			"max-acache-size" defaults to 16M.
 
-2252.   [bug]           Fixed errors in sortlist code [RT #17216]
+2252.	[bug]		Fixed errors in sortlist code [RT #17216]
 
 2251.	[placeholder]
 
@@ -1050,11 +1338,11 @@
 			memory statistics file should be written or not.
 			Additionally named's -m option will cause the
 			statistics file to be written. [RT #17113]
-			
-2249.   [bug]           Only set Authentic Data bit if client requested
-                        DNSSEC, per RFC 3655 [RT #17175]
 
-2248.   [cleanup]       Fix several errors reported by Coverity. [RT #17160]
+2249.	[bug]		Only set Authentic Data bit if client requested
+			DNSSEC, per RFC 3655 [RT #17175]
+
+2248.	[cleanup]	Fix several errors reported by Coverity. [RT #17160]
 
 2247.	[doc]		Sort doc/misc/options. [RT #17067]
 
@@ -1095,11 +1383,11 @@
 
 2235.	[bug]		 was not being installed. [RT #17135]
 
-2234.   [port]          Correct some compiler warnings on SCO OSr5 [RT #17134]
-  
-2233.   [func]          Add support for O(1) ACL processing, based on
-                        radix tree code originally written by Kevin
-                        Brintnall. [RT #16288]
+2234.	[port]		Correct some compiler warnings on SCO OSr5 [RT #17134]
+
+2233.	[func]		Add support for O(1) ACL processing, based on
+			radix tree code originally written by Kevin
+			Brintnall. [RT #16288]
 
 2232.	[bug]		dns_adb_findaddrinfo() could fail and return
 			ISC_R_SUCCESS. [RT #17137]
@@ -1120,7 +1408,7 @@
 2226.	[placeholder]
 
 2225.	[bug]		More support for systems with no IPv4 addresses.
-		        [RT #17111]
+			[RT #17111]
 
 2224.	[bug]		Defer journal compaction if a xfrin is in progress.
 			[RT #17119]
@@ -1128,7 +1416,7 @@
 2223.	[bug]		Make a new journal when compacting. [RT #17119]
 
 2222.	[func]		named-checkconf now checks server key references.
-		        [RT #17097]
+			[RT #17097]
 
 2221.	[bug]		Set the event result code to reflect the actual
 			record turned to caller when a cache update is
@@ -1137,7 +1425,7 @@
 
 2220.	[bug]		win32: Address a race condition in final shutdown of
 			the Windows socket code. [RT #17028]
-			
+
 2219.	[bug]		Apply zone consistency checks to additions, not
 			removals, when updating. [RT #17049]
 
@@ -1147,7 +1435,7 @@
 2217.	[func]		Adjust update log levels. [RT #17092]
 
 2216.	[cleanup]	Fix a number of errors reported by Coverity.
-		        [RT #17094]
+			[RT #17094]
 
 2215.	[bug]		Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094]
 
@@ -1193,7 +1481,7 @@
 			localhost;) is used.
 
 			[RT #16987]
-	
+
 2205.	[bug]		libbind: change #2119 broke thread support. [RT #16982]
 
 2204.	[bug]		"rndc flushanme name unknown-view" caused named
@@ -1332,7 +1620,7 @@
 			allow-query-on, allow-recursion-on and
 			allow-query-cache-on. [RT #16291]
 
-2164.	[bug]		The code to determine how named-checkzone / 
+2164.	[bug]		The code to determine how named-checkzone /
 			named-compilezone was called failed under windows.
 			[RT #16764]
 
@@ -1539,14 +1827,14 @@
 
 2095.	[port]		libbind: alway prototype inet_cidr_ntop_ipv6() and
 			net_cidr_ntop_ipv6(). [RT #16388]
- 
+
 2094.	[contrib]	Update named-bootconf.  [RT# 16404]
 
 2093.	[bug]		named-checkzone -s was broken.
 
 2092.	[bug]		win32: dig, host, nslookup.  Use registry config
 			if resolv.conf does not exist or no nameservers
-			listed. [RT #15877] 
+			listed. [RT #15877]
 
 2091.	[port]		dighost.c: race condition on cleanup. [RT #16417]
 
@@ -1950,7 +2238,7 @@
 
 1964.	[func]		Separate out MX and SRV to CNAME checks. [RT #15723]
 
-1963.	[port]		Tru64 4.0E doesn't support send() and recv(). 
+1963.	[port]		Tru64 4.0E doesn't support send() and recv().
 			[RT #15586]
 
 1962.	[bug]		Named failed to clear old update-policy when it
@@ -1993,7 +2281,7 @@
 1951.	[security]	Drop queries from particular well known ports.
 			Don't return FORMERR to queries from particular
 			well known ports.  [RT #15636]
-			
+
 1950.	[port]		Solaris 2.5.1 and earlier cannot bind() then connect()
 			a TCP socket. This prevents the source address being
 			set for TCP connections. [RT #15628]
@@ -2015,7 +2303,7 @@
 1945.	[cleanup]	dnssec-keygen: RSA (RSAMD5) is no longer recommended.
 			To generate a RSAMD5 key you must explicitly request
 			RSAMD5. [RT #13780]
-			
+
 1944.	[cleanup]	isc_hash_create() does not need a read/write lock.
 			[RT #15522]
 
@@ -2127,7 +2415,7 @@
 			[RT #15034]
 
 1905.	[bug]		Strings returned from cfg_obj_asstring() should be
-			treated as read-only.  The prototype for 
+			treated as read-only.  The prototype for
 			cfg_obj_asstring() has been updated to reflect this.
 			[RT #15256]
 
@@ -2259,10 +2547,10 @@
 1863.	[bug]		rrset-order "fixed" error messages not complete.
 
 1862.	[func]		Add additional zone data constancy checks.
-			named-checkzone has extended checking of NS, MX and 
+			named-checkzone has extended checking of NS, MX and
 			SRV record and the hosts they reference.
 			named has extended post zone load checks.
-			New zone options: check-mx and integrity-check. 
+			New zone options: check-mx and integrity-check.
 			[RT #4940]
 
 1861.	[bug]		dig could trigger a INSIST on certain malformed
@@ -2305,9 +2593,9 @@
 1848.	[bug]		Improve SMF integration. [RT #13238]
 
 1847.	[bug]		isc_ondestroy_init() is called too late in
-			dns_rbtdb_create()/dns_rbtdb64_create(). 
+			dns_rbtdb_create()/dns_rbtdb64_create().
 			[RT #13661]
-			
+
 1846.	[contrib]	query-loc-0.3.0 from Stephane Bortzmeyer
 			.
 
@@ -2599,7 +2887,7 @@
 			[RT #12866]
 
 1748.	[func]		dig now returns the byte count for axfr/ixfr.
-			
+
 1747.	[bug]		BIND 8 compatibility: named/named-checkconf failed
 			to parse "host-statistics-max" in named.conf.
 
@@ -2617,7 +2905,7 @@
 			requested number of worker threads then destruction
 			of the manager would trigger an INSIST() failure.
 			[RT #12790]
-			
+
 1742.	[bug]		Deleting all records at a node then adding a
 			previously existing record, in a single UPDATE
 			transaction, failed to leave / regenerate the
@@ -2628,7 +2916,7 @@
 
 1740.	[bug]		Replace rbt's hash algorithm as it performed badly
 			with certain zones. [RT #12729]
-			
+
 			NOTE: a hash context now needs to be established
 			via isc_hash_create() if the application was not
 			already doing this.
@@ -2643,7 +2931,7 @@
 
 1736.	[bug]		dst_key_fromnamedfile() could fail to read a
 			public key. [RT #12687]
-			
+
 1735.	[bug]		'dig +sigtrace' could die with a REQUIRE failure.
 			[RE #12688]
 
@@ -2820,7 +3108,7 @@
 
 1675.	[bug]		named would sometimes add extra NSEC records to
 			the authority section.
-			
+
 1674.	[port]		linux: increase buffer size used to scan
 			/proc/net/if_inet6.
 
@@ -2894,7 +3182,7 @@
 
 1648.	[func]		Update dnssec-lookaside named.conf syntax to support
 			multiple dnssec-lookaside namespaces (not yet
-			implemented).  
+			implemented).
 
 1647.	[bug]		It was possible trigger a INSIST when chasing a DS
 			record that required walking back over a empty node.
@@ -2924,7 +3212,7 @@
 
 1638.	[bug]		"ixfr-from-differences" could generate a REQUIRE
 			failure if the journal open failed. [RT #11347]
-			
+
 1637.	[bug]		Node reference leak on error in addnoqname().
 
 1636.	[bug]		The dump done callback could get ISC_R_SUCCESS even if
@@ -3018,21 +3306,21 @@
 1607.	[bug]		dig, host and nslookup were still using random()
 			to generate query ids. [RT# 11013]
 
-1606.	[bug]	 	DLV insecurity proof was failing.
+1606.	[bug]		DLV insecurity proof was failing.
 
 1605.	[func]		New dns_db_find() option DNS_DBFIND_COVERINGNSEC.
 
 1604.	[bug]		A xfrout_ctx_create() failure would result in
 			xfrout_ctx_destroy() being called with a
 			partially initialized structure.
-			
+
 1603.	[bug]		nsupdate: set interactive based on isatty().
 			[RT# 10929]
 
 1602.	[bug]		Logging to a file failed unless a size was specified.
 			[RT# 10925]
 
-1601.	[bug]		Silence spurious warning 'both "recursion no;" and 
+1601.	[bug]		Silence spurious warning 'both "recursion no;" and
 			"allow-recursion" active' warning from view "_bind".
 			[RT# 10920]
 

Modified: user/jmallett/octeon/contrib/bind9/COPYRIGHT
==============================================================================
--- user/jmallett/octeon/contrib/bind9/COPYRIGHT	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/COPYRIGHT	Thu Mar  4 02:32:45 2010	(r204683)
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.14.176.1 2009/01/05 23:47:22 tbox Exp $
+$Id: COPYRIGHT,v 1.14.176.2 2010/01/07 23:47:36 tbox Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 

Modified: user/jmallett/octeon/contrib/bind9/FAQ
==============================================================================
--- user/jmallett/octeon/contrib/bind9/FAQ	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/FAQ	Thu Mar  4 02:32:45 2010	(r204683)
@@ -1,6 +1,6 @@
 Frequently Asked Questions about BIND 9
 
-Copyright © 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+Copyright © 2004-2010 Internet Systems Consortium, Inc. ("ISC")
 
 Copyright © 2000-2003 Internet Software Consortium.
 
@@ -784,6 +784,22 @@ A: Red Hat Security Enhanced Linux (SELi
    See these man-pages for more information : selinux(8), named_selinux
    (8), chcon(1), setsebool(8)
 
+Q: I'm running BIND on Ubuntu -
+
+   Why can't named update slave zone database files?
+
+   Why can't named create DDNS journal files or update the master zones
+   from journals?
+
+   Why can't named create custom log files?
+
+A: Ubuntu uses AppArmor  in
+   addition to normal file system permissions to protect the system.
+
+   Adjust the paths to use those specified in /etc/apparmor.d/
+   usr.sbin.named or adjust /etc/apparmor.d/usr.sbin.named to allow named
+   to write at the location specified in named.conf.
+
 Q: Listening on individual IPv6 interfaces does not work.
 
 A: This is usually due to "/proc/net/if_inet6" not being available in the

Modified: user/jmallett/octeon/contrib/bind9/FAQ.xml
==============================================================================
--- user/jmallett/octeon/contrib/bind9/FAQ.xml	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/FAQ.xml	Thu Mar  4 02:32:45 2010	(r204683)
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 

   Frequently Asked Questions about BIND 9
@@ -29,6 +29,7 @@
       2007
       2008
       2009
+      2010
       Internet Systems Consortium, Inc. ("ISC")
     
     
@@ -1385,6 +1386,36 @@ named_cache_t: for files modifiable by n
     
       
 	
+	   I'm running BIND on Ubuntu -
+	
+	
+	  Why can't named update slave zone database files?
+	
+	
+	  Why can't named create DDNS journal files or update
+	  the master zones from journals?
+	
+	
+	  Why can't named create custom log files?
+	
+      
+      
+	
+	  Ubuntu uses AppArmor 
+          <http://en.wikipedia.org/wiki/AppArmor> in
+	  addition to normal file system permissions to protect the system.
+	
+	
+	  Adjust the paths to use those specified in /etc/apparmor.d/usr.sbin.named
+	  or adjust /etc/apparmor.d/usr.sbin.named to allow named to write at the
+	  location specified in named.conf.
+	
+      
+    
+
+    
+      
+	
 	  Listening on individual IPv6 interfaces does not work.
 	
       

Modified: user/jmallett/octeon/contrib/bind9/NSEC3-NOTES
==============================================================================
--- user/jmallett/octeon/contrib/bind9/NSEC3-NOTES	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/NSEC3-NOTES	Thu Mar  4 02:32:45 2010	(r204683)
@@ -35,7 +35,7 @@ will not be completely signed until name
 zone and generate the NSEC and RRSIG records.  Initially the NSEC
 record at the zone apex will have the OPT bit set.  When the NSEC
 chain is complete the OPT bit will be cleared.  Additionally when
-the zone is fully signed the private type (default TYPE65535) records
+the zone is fully signed the private type (default TYPE65534) records
 will have a non zero value for the final octet. 
 
 The private type record has 5 octets.
@@ -45,7 +45,7 @@ The private type record has 5 octets.
 	complete flag (octet 5)
 
 If you wish to go straight to a secure zone using NSEC3 you should
-also add a NSECPARAM record to the update request with the flags
+also add a NSEC3PARAM record to the update request with the flags
 field set to indicate whether the NSEC3 chain will have the OPTOUT
 bit set or not.
 

Modified: user/jmallett/octeon/contrib/bind9/README
==============================================================================
--- user/jmallett/octeon/contrib/bind9/README	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/README	Thu Mar  4 02:32:45 2010	(r204683)
@@ -42,6 +42,29 @@ BIND 9
 		Stichting NLnet - NLnet Foundation
 		Nominum, Inc.
 
+BIND 9.6.2
+
+	BIND 9.6.2 is a maintenance release, fixing bugs in 9.6.1.
+        It also introduces support for the SHA-2 DNSSEC algorithms,
+        RSASHA256 and RSASHA512.
+
+        Known issues in this release:
+
+        - A validating resolver that has been incorrectly configured with
+          an invalid trust anchor will be unable to resolve names covered
+          by that trust anchor.  In all current versions of BIND 9, such a
+          resolver will also generate significant unnecessary DNS traffic
+          while trying to validate.  The latter problem will be addressed
+          in future BIND 9 releases.  In the meantime, to avoid these
+          problems, exercise caution when configuring "trusted-keys":
+          make sure all keys are correct and current when you add them,
+          and update your configuration in a timely manner when keys
+          roll over.
+
+BIND 9.6.1
+
+	BIND 9.6.1 is a maintenance release, fixing bugs in 9.6.0.
+
 BIND 9.6.0
 
         BIND 9.6.0 includes a number of changes from BIND 9.5 and earlier

Modified: user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.8
==============================================================================
--- user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.8	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.8	Thu Mar  4 02:32:45 2010	(r204683)
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2002 Internet Software Consortium.
 .\" 
-.\" Permission to use, copy, modify, and distribute this software for any
+.\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\" 
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkconf.8,v 1.30 2007/06/20 02:27:32 marka Exp $
+.\" $Id: named-checkconf.8,v 1.30.334.1 2009/07/11 01:55:20 tbox Exp $
 .\"
 .hy 0
 .ad l

Modified: user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.html
==============================================================================
--- user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.html	Thu Mar  4 02:24:14 2010	(r204682)
+++ user/jmallett/octeon/contrib/bind9/bin/check/named-checkconf.html	Thu Mar  4 02:32:45 2010	(r204683)
@@ -2,7 +2,7 @@
  - Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002 Internet Software Consortium.
  - 
- - Permission to use, copy, modify, and distribute this software for any
+ - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
  - copyright notice and this permission notice appear in all copies.
  - 
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

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

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 02:52:17 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4453B106566B;
	Thu,  4 Mar 2010 02:52:17 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 283C98FC08;
	Thu,  4 Mar 2010 02:52:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o242qHW4043265;
	Thu, 4 Mar 2010 02:52:17 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o242qHCC043262;
	Thu, 4 Mar 2010 02:52:17 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003040252.o242qHCC043262@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 02:52:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204684 - in user/jmallett/octeon: lib/libc/mips
	sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 02:52:17 -0000

Author: jmallett
Date: Thu Mar  4 02:52:16 2010
New Revision: 204684
URL: http://svn.freebsd.org/changeset/base/204684

Log:
  Reduce gratuitous diffs with head.

Modified:
  user/jmallett/octeon/lib/libc/mips/SYS.h
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h

Modified: user/jmallett/octeon/lib/libc/mips/SYS.h
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/SYS.h	Thu Mar  4 02:32:45 2010	(r204683)
+++ user/jmallett/octeon/lib/libc/mips/SYS.h	Thu Mar  4 02:52:16 2010	(r204684)
@@ -1,4 +1,5 @@
 /*	$NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1996 Jonathan Stone
@@ -66,8 +67,8 @@
  */
 
 #include 
-#include 
 
+#include 
 
 /*
  * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops.

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 02:32:45 2010	(r204683)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 02:52:16 2010	(r204684)
@@ -94,19 +94,19 @@ extern struct pcpu *cpuid_to_pcpu[];
 
 static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
-    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
     *ptr = val64;
 }
 
 static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i)
 {
-    volatile int64_t *ptr = (volatile int64_t *)(intptr_t)csr_addr;
+    volatile int64_t *ptr = (volatile int64_t *) csr_addr;
     *ptr = val64i;
 }
 
 static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
 {
-    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
     *ptr = (uint64_t) val8;
 }
 
@@ -127,32 +127,32 @@ static inline void oct_write32 (uint64_t
 
 static inline uint8_t oct_read8 (uint64_t csr_addr)
 {
-    volatile uint8_t *ptr = (volatile uint8_t *)(intptr_t)csr_addr;
+    volatile uint8_t *ptr = (volatile uint8_t *) csr_addr;
     return (*ptr);
 }
 
 static inline uint8_t oct_read16 (uint64_t csr_addr)
 {
-    volatile uint16_t *ptr = (volatile uint16_t *)(intptr_t)csr_addr;
+    volatile uint16_t *ptr = (volatile uint16_t *) csr_addr;
     return (*ptr);
 }
 
 
 static inline uint32_t oct_read32 (uint64_t csr_addr)
 {
-    volatile uint32_t *ptr = (volatile uint32_t *)(intptr_t)csr_addr;
+    volatile uint32_t *ptr = (volatile uint32_t *) csr_addr;
     return (*ptr);
 }
 
 static inline uint64_t oct_read64 (uint64_t csr_addr)
 {
-    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
     return (*ptr);
 }
 
 static inline int32_t oct_readint32 (uint64_t csr_addr)
 {
-    volatile int32_t *ptr = (volatile int32_t *)(intptr_t)csr_addr;
+    volatile int32_t *ptr = (volatile int32_t *) csr_addr;
     return (*ptr);
 }
 

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 04:33:57 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C81A91065673;
	Thu,  4 Mar 2010 04:33:57 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E26C8FC22;
	Thu,  4 Mar 2010 04:33:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o244XvTX066006;
	Thu, 4 Mar 2010 04:33:57 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o244XvML066005;
	Thu, 4 Mar 2010 04:33:57 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201003040433.o244XvML066005@svn.freebsd.org>
From: Lawrence Stewart 
Date: Thu, 4 Mar 2010 04:33:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204686 - user/lstewart/alq_varlen_head
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 04:33:57 -0000

Author: lstewart
Date: Thu Mar  4 04:33:57 2010
New Revision: 204686
URL: http://svn.freebsd.org/changeset/base/204686

Log:
  - Fresh place to work on the ALQ patches to prep them for commit to head.
  
  Sponsored by:	FreeBSD Foundation

Added:
     - copied from r204685, head/
Directory Properties:
  user/lstewart/alq_varlen_head/   (props changed)

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 05:19:46 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7260E106564A;
	Thu,  4 Mar 2010 05:19:46 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6121F8FC0A;
	Thu,  4 Mar 2010 05:19:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o245Jk4T076100;
	Thu, 4 Mar 2010 05:19:46 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o245Jkst076096;
	Thu, 4 Mar 2010 05:19:46 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201003040519.o245Jkst076096@svn.freebsd.org>
From: Lawrence Stewart 
Date: Thu, 4 Mar 2010 05:19:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204688 - in user/lstewart/alq_varlen_head/sys: kern
	modules modules/alq
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 05:19:46 -0000

Author: lstewart
Date: Thu Mar  4 05:19:46 2010
New Revision: 204688
URL: http://svn.freebsd.org/changeset/base/204688

Log:
  - Import alqkld_9.x.r198700.patch
  
  Sponsored by:	FreeBSD Foundation

Added:
  user/lstewart/alq_varlen_head/sys/modules/alq/
  user/lstewart/alq_varlen_head/sys/modules/alq/Makefile   (contents, props changed)
Modified:
  user/lstewart/alq_varlen_head/sys/kern/kern_alq.c
  user/lstewart/alq_varlen_head/sys/modules/Makefile

Modified: user/lstewart/alq_varlen_head/sys/kern/kern_alq.c
==============================================================================
--- user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Thu Mar  4 04:53:05 2010	(r204687)
+++ user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Thu Mar  4 05:19:46 2010	(r204688)
@@ -1,7 +1,13 @@
 /*-
  * Copyright (c) 2002, Jeffrey Roberson 
+ * Copyright (c) 2008-2009, Lawrence Stewart 
+ * Copyright (c) 2009, The FreeBSD Foundation
  * All rights reserved.
  *
+ * Portions of this software were developed at the Centre for Advanced
+ * Internet Architectures, Swinburne University of Technology, Melbourne,
+ * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -27,8 +33,13 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#include "opt_mac.h"
+
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,12 +47,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
+#include 
 
 #include 
 
@@ -78,7 +85,6 @@ static struct mtx ald_mtx;
 static LIST_HEAD(, alq) ald_queues;
 static LIST_HEAD(, alq) ald_active;
 static int ald_shutingdown = 0;
-struct thread *ald_thread;
 static struct proc *ald_proc;
 
 #define	ALD_LOCK()	mtx_lock(&ald_mtx)
@@ -172,16 +178,21 @@ ald_daemon(void)
 	int needwakeup;
 	struct alq *alq;
 
-	ald_thread = FIRST_THREAD_IN_PROC(ald_proc);
-
 	EVENTHANDLER_REGISTER(shutdown_pre_sync, ald_shutdown, NULL,
 	    SHUTDOWN_PRI_FIRST);
 
 	ALD_LOCK();
 
 	for (;;) {
-		while ((alq = LIST_FIRST(&ald_active)) == NULL)
-			msleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
+		while ((alq = LIST_FIRST(&ald_active)) == NULL &&
+		    !ald_shutingdown)
+			mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
+
+		/* Don't shutdown until all active ALQs are flushed. */
+		if (ald_shutingdown && alq == NULL) {
+			ALD_UNLOCK();
+			break;
+		}
 
 		ALQ_LOCK(alq);
 		ald_deactivate(alq);
@@ -189,9 +200,11 @@ ald_daemon(void)
 		needwakeup = alq_doio(alq);
 		ALQ_UNLOCK(alq);
 		if (needwakeup)
-			wakeup(alq);
+			wakeup_one(alq);
 		ALD_LOCK();
 	}
+
+	kproc_exit(0);
 }
 
 static void
@@ -200,14 +213,29 @@ ald_shutdown(void *arg, int howto)
 	struct alq *alq;
 
 	ALD_LOCK();
+
+	/* Ensure no new queues can be created. */
 	ald_shutingdown = 1;
 
+	/* Shutdown all ALQs prior to terminating the ald_daemon. */
 	while ((alq = LIST_FIRST(&ald_queues)) != NULL) {
 		LIST_REMOVE(alq, aq_link);
 		ALD_UNLOCK();
 		alq_shutdown(alq);
 		ALD_LOCK();
 	}
+
+	/* At this point, all ALQs are flushed and shutdown. */
+
+	/*
+	 * Wake ald_daemon so that it exits. It won't be able to do
+	 * anything until we mtx_sleep because we hold the ald_mtx.
+	 */
+	wakeup(&ald_active);
+
+	/* Wait for ald_daemon to exit. */
+	mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
+
 	ALD_UNLOCK();
 }
 
@@ -220,14 +248,13 @@ alq_shutdown(struct alq *alq)
 	alq->aq_flags |= AQ_SHUTDOWN;
 
 	/* Drain IO */
-	while (alq->aq_flags & (AQ_FLUSHING|AQ_ACTIVE)) {
+	while (alq->aq_flags & AQ_ACTIVE) {
 		alq->aq_flags |= AQ_WANTED;
 		msleep_spin(alq, &alq->aq_mtx, "aldclose", 0);
 	}
 	ALQ_UNLOCK(alq);
 
-	vn_close(alq->aq_vp, FWRITE, alq->aq_cred,
-	    curthread);
+	vn_close(alq->aq_vp, FWRITE, alq->aq_cred, curthread);
 	crfree(alq->aq_cred);
 }
 
@@ -317,9 +344,9 @@ alq_doio(struct alq *alq)
 }
 
 static struct kproc_desc ald_kp = {
-        "ALQ Daemon",
-        ald_daemon,
-        &ald_proc
+	"ALQ Daemon",
+	ald_daemon,
+	&ald_proc
 };
 
 SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &ald_kp);
@@ -431,6 +458,15 @@ alq_get(struct alq *alq, int waitok)
 		msleep_spin(alq, &alq->aq_mtx, "alqget", 0);
 	}
 
+	/*
+	 * We need to serialise wakups to ensure records remain in order...
+	 * Therefore, wakeup the next thread in the queue waiting for
+	 * ALQ resources to be available.
+	 * (Technically this is only required if we actually entered the above
+	 * while loop.)
+	 */
+	wakeup_one(alq);
+
 	if (ale != NULL) {
 		aln = ale->ae_next;
 		if ((aln->ae_flags & AE_VALID) == 0)
@@ -484,7 +520,7 @@ alq_flush(struct alq *alq)
 	ALQ_UNLOCK(alq);
 
 	if (needwakeup)
-		wakeup(alq);
+		wakeup_one(alq);
 }
 
 /*
@@ -510,3 +546,46 @@ alq_close(struct alq *alq)
 	free(alq->aq_entbuf, M_ALD);
 	free(alq, M_ALD);
 }
+
+static int
+alq_load_handler(module_t mod, int what, void *arg)
+{
+	int ret = 0;
+
+	switch(what) {
+		case MOD_LOAD:
+		case MOD_UNLOAD:
+		case MOD_SHUTDOWN:
+			break;
+		
+		case MOD_QUIESCE:
+			ALD_LOCK();
+			/* Only allow unload if there are no open queues. */
+			if (LIST_FIRST(&ald_queues) == NULL) {
+				ald_shutingdown = 1;
+				ALD_UNLOCK();
+				ald_shutdown(NULL, 0);
+				mtx_destroy(&ald_mtx);
+			} else {
+				ALD_UNLOCK();
+				ret = EBUSY;
+			}
+			break;
+		
+		default:
+			ret = EINVAL;
+			break;
+	}
+
+	return (ret);
+}
+
+static moduledata_t alq_mod =
+{
+	"alq",
+	alq_load_handler,
+	NULL
+};
+
+DECLARE_MODULE(alq, alq_mod, SI_SUB_SMP, SI_ORDER_ANY);
+MODULE_VERSION(alq, 1);

Modified: user/lstewart/alq_varlen_head/sys/modules/Makefile
==============================================================================
--- user/lstewart/alq_varlen_head/sys/modules/Makefile	Thu Mar  4 04:53:05 2010	(r204687)
+++ user/lstewart/alq_varlen_head/sys/modules/Makefile	Thu Mar  4 05:19:46 2010	(r204688)
@@ -23,6 +23,7 @@ SUBDIR=	${_3dfx} \
 	${_amd} \
 	${_amdsbwd} \
 	${_amdtemp} \
+	alq \
 	amr \
 	${_an} \
 	${_aout} \

Added: user/lstewart/alq_varlen_head/sys/modules/alq/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/lstewart/alq_varlen_head/sys/modules/alq/Makefile	Thu Mar  4 05:19:46 2010	(r204688)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include 
+
+.PATH:  ${.CURDIR}/../../kern
+KMOD=	alq
+SRCS=	opt_mac.h vnode_if.h kern_alq.c
+
+.include 

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 06:36:49 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 057841065679;
	Thu,  4 Mar 2010 06:36:49 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA09F8FC12;
	Thu,  4 Mar 2010 06:36:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o246am7G093357;
	Thu, 4 Mar 2010 06:36:48 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o246amm7093355;
	Thu, 4 Mar 2010 06:36:48 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003040636.o246amm7093355@svn.freebsd.org>
From: Edwin Groothuis 
Date: Thu, 4 Mar 2010 06:36:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204693 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 06:36:49 -0000

Author: edwin
Date: Thu Mar  4 06:36:48 2010
New Revision: 204693
URL: http://svn.freebsd.org/changeset/base/204693

Log:
  Replace random constant line lengths with #define constants.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Thu Mar  4 06:36:00 2010	(r204692)
+++ user/edwin/ncal/ncal.c	Thu Mar  4 06:36:48 2010	(r204693)
@@ -444,7 +444,7 @@ printeaster(int y, int julian, int ortho
 {
 	date    dt;
 	struct tm tm;
-	char    buf[80];
+	char    buf[MAX_WIDTH];
 	static int d_first = -1;
 
 	if (d_first < 0)
@@ -489,8 +489,8 @@ monthrangeb(int y, int jd_flag, int m, i
 {
 	struct monthlines year[12];
 	struct weekdays wds;
-	char	s[80], t[80];
-	wchar_t	ws[80], ws1[80];
+	char	s[MAX_WIDTH], t[MAX_WIDTH];
+	wchar_t	ws[MAX_WIDTH], ws1[MAX_WIDTH];
 	const char	*wdss;
 	int     i, j;
 	int     mpl;
@@ -576,7 +576,7 @@ monthranger(int y, int jd_flag, int m, i
 {
 	struct monthlines year[12];
 	struct weekdays wds;
-	char    s[80], t[80];
+	char    s[MAX_WIDTH], t[MAX_WIDTH];
 	int     i, j;
 	int     mpl;
 	int     mw;
@@ -981,7 +981,7 @@ sdateb(int nd, struct date *d)
 char *
 center(char *s, char *t, int w)
 {
-	char blanks[80];
+	char blanks[MAX_WIDTH];
 
 	memset(blanks, ' ', sizeof(blanks));
 	sprintf(s, "%.*s%s", (int)(w - strlen(t)) / 2, blanks, t);
@@ -992,7 +992,7 @@ center(char *s, char *t, int w)
 wchar_t *
 wcenter(wchar_t *s, wchar_t *t, int w)
 {
-	char blanks[80];
+	char blanks[MAX_WIDTH];
 
 	memset(blanks, ' ', sizeof(blanks));
 	swprintf(s, MAX_WIDTH, L"%.*s%ls", (int)(w - wcslen(t)) / 2, blanks, t);

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 06:43:42 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4ECF1106568A;
	Thu,  4 Mar 2010 06:43:42 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A5418FC0A;
	Thu,  4 Mar 2010 06:43:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o246hgFk094969;
	Thu, 4 Mar 2010 06:43:42 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o246hfsC094957;
	Thu, 4 Mar 2010 06:43:41 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003040643.o246hfsC094957@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 06:43:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204695 - in user/imp/tbemd: . contrib/bind9
	contrib/bind9/bin/check contrib/bind9/bin/dig
	contrib/bind9/bin/dnssec contrib/bind9/bin/named
	contrib/bind9/bin/named/include/named contrib...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 06:43:42 -0000

Author: imp
Date: Thu Mar  4 06:43:41 2010
New Revision: 204695
URL: http://svn.freebsd.org/changeset/base/204695

Log:
  Merge from head

Added:
  user/imp/tbemd/lib/libpmc/pmc.mips.3
     - copied unchanged from r204693, head/lib/libpmc/pmc.mips.3
  user/imp/tbemd/sys/dev/hwpmc/hwpmc_mips.c
     - copied unchanged from r204693, head/sys/dev/hwpmc/hwpmc_mips.c
  user/imp/tbemd/sys/dev/hwpmc/hwpmc_mips24k.c
     - copied unchanged from r204693, head/sys/dev/hwpmc/hwpmc_mips24k.c
  user/imp/tbemd/sys/dev/hwpmc/hwpmc_mips24k.h
     - copied unchanged from r204693, head/sys/dev/hwpmc/hwpmc_mips24k.h
Deleted:
  user/imp/tbemd/include/utmp.h
Modified:
  user/imp/tbemd/Makefile
  user/imp/tbemd/ObsoleteFiles.inc
  user/imp/tbemd/contrib/bind9/CHANGES
  user/imp/tbemd/contrib/bind9/COPYRIGHT
  user/imp/tbemd/contrib/bind9/FAQ
  user/imp/tbemd/contrib/bind9/FAQ.xml
  user/imp/tbemd/contrib/bind9/NSEC3-NOTES
  user/imp/tbemd/contrib/bind9/README
  user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.8
  user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.html
  user/imp/tbemd/contrib/bind9/bin/check/named-checkzone.8
  user/imp/tbemd/contrib/bind9/bin/check/named-checkzone.c
  user/imp/tbemd/contrib/bind9/bin/check/named-checkzone.docbook
  user/imp/tbemd/contrib/bind9/bin/check/named-checkzone.html
  user/imp/tbemd/contrib/bind9/bin/dig/dig.1
  user/imp/tbemd/contrib/bind9/bin/dig/dig.html
  user/imp/tbemd/contrib/bind9/bin/dig/dighost.c
  user/imp/tbemd/contrib/bind9/bin/dig/host.1
  user/imp/tbemd/contrib/bind9/bin/dig/host.c
  user/imp/tbemd/contrib/bind9/bin/dig/host.html
  user/imp/tbemd/contrib/bind9/bin/dig/nslookup.1
  user/imp/tbemd/contrib/bind9/bin/dig/nslookup.c
  user/imp/tbemd/contrib/bind9/bin/dig/nslookup.html
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keygen.8
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keygen.c
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-keygen.html
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-signzone.8
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-signzone.c
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssec-signzone.html
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssectool.c
  user/imp/tbemd/contrib/bind9/bin/dnssec/dnssectool.h
  user/imp/tbemd/contrib/bind9/bin/named/control.c
  user/imp/tbemd/contrib/bind9/bin/named/include/named/server.h
  user/imp/tbemd/contrib/bind9/bin/named/lwresd.8
  user/imp/tbemd/contrib/bind9/bin/named/lwresd.html
  user/imp/tbemd/contrib/bind9/bin/named/named.8
  user/imp/tbemd/contrib/bind9/bin/named/named.conf.5
  user/imp/tbemd/contrib/bind9/bin/named/named.conf.html
  user/imp/tbemd/contrib/bind9/bin/named/named.docbook
  user/imp/tbemd/contrib/bind9/bin/named/named.html
  user/imp/tbemd/contrib/bind9/bin/named/query.c
  user/imp/tbemd/contrib/bind9/bin/named/server.c
  user/imp/tbemd/contrib/bind9/bin/named/statschannel.c
  user/imp/tbemd/contrib/bind9/bin/named/update.c
  user/imp/tbemd/contrib/bind9/bin/nsupdate/nsupdate.1
  user/imp/tbemd/contrib/bind9/bin/nsupdate/nsupdate.html
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc-confgen.8
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc-confgen.html
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc.8
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc.conf.5
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc.conf.html
  user/imp/tbemd/contrib/bind9/bin/rndc/rndc.html
  user/imp/tbemd/contrib/bind9/config.h.in
  user/imp/tbemd/contrib/bind9/configure.in
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM-book.xml
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.html
  user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.pdf
  user/imp/tbemd/contrib/bind9/doc/arm/man.dig.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-keygen.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-signzone.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.host.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.named-checkconf.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.named-checkzone.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.named.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.nsupdate.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.rndc-confgen.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.rndc.conf.html
  user/imp/tbemd/contrib/bind9/doc/arm/man.rndc.html
  user/imp/tbemd/contrib/bind9/doc/misc/Makefile.in
  user/imp/tbemd/contrib/bind9/lib/dns/api
  user/imp/tbemd/contrib/bind9/lib/dns/db.c
  user/imp/tbemd/contrib/bind9/lib/dns/dispatch.c
  user/imp/tbemd/contrib/bind9/lib/dns/dnssec.c
  user/imp/tbemd/contrib/bind9/lib/dns/dst_api.c
  user/imp/tbemd/contrib/bind9/lib/dns/dst_internal.h
  user/imp/tbemd/contrib/bind9/lib/dns/dst_parse.c
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/db.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/dnssec.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/journal.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/keyvalues.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/name.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/ncache.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/nsec3.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/rbt.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/types.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dns/zone.h
  user/imp/tbemd/contrib/bind9/lib/dns/include/dst/dst.h
  user/imp/tbemd/contrib/bind9/lib/dns/journal.c
  user/imp/tbemd/contrib/bind9/lib/dns/masterdump.c
  user/imp/tbemd/contrib/bind9/lib/dns/message.c
  user/imp/tbemd/contrib/bind9/lib/dns/nsec3.c
  user/imp/tbemd/contrib/bind9/lib/dns/opensslrsa_link.c
  user/imp/tbemd/contrib/bind9/lib/dns/rbt.c
  user/imp/tbemd/contrib/bind9/lib/dns/rbtdb.c
  user/imp/tbemd/contrib/bind9/lib/dns/rcode.c
  user/imp/tbemd/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  user/imp/tbemd/contrib/bind9/lib/dns/resolver.c
  user/imp/tbemd/contrib/bind9/lib/dns/sdb.c
  user/imp/tbemd/contrib/bind9/lib/dns/sdlz.c
  user/imp/tbemd/contrib/bind9/lib/dns/spnego.c
  user/imp/tbemd/contrib/bind9/lib/dns/validator.c
  user/imp/tbemd/contrib/bind9/lib/dns/view.c
  user/imp/tbemd/contrib/bind9/lib/dns/zone.c
  user/imp/tbemd/contrib/bind9/lib/isc/api
  user/imp/tbemd/contrib/bind9/lib/isc/base32.c
  user/imp/tbemd/contrib/bind9/lib/isc/base64.c
  user/imp/tbemd/contrib/bind9/lib/isc/heap.c
  user/imp/tbemd/contrib/bind9/lib/isc/httpd.c
  user/imp/tbemd/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  user/imp/tbemd/contrib/bind9/lib/isc/include/isc/entropy.h
  user/imp/tbemd/contrib/bind9/lib/isc/include/isc/netscope.h
  user/imp/tbemd/contrib/bind9/lib/isc/include/isc/portset.h
  user/imp/tbemd/contrib/bind9/lib/isc/include/isc/sha2.h
  user/imp/tbemd/contrib/bind9/lib/isc/include/isc/util.h
  user/imp/tbemd/contrib/bind9/lib/isc/inet_ntop.c
  user/imp/tbemd/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  user/imp/tbemd/contrib/bind9/lib/isc/random.c
  user/imp/tbemd/contrib/bind9/lib/isc/sha2.c
  user/imp/tbemd/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  user/imp/tbemd/contrib/bind9/lib/isc/unix/socket.c
  user/imp/tbemd/contrib/bind9/lib/isccc/api
  user/imp/tbemd/contrib/bind9/lib/isccfg/aclconf.c
  user/imp/tbemd/contrib/bind9/lib/isccfg/api
  user/imp/tbemd/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  user/imp/tbemd/contrib/bind9/lib/lwres/api
  user/imp/tbemd/contrib/bind9/lib/lwres/context.c
  user/imp/tbemd/contrib/bind9/lib/lwres/getipnode.c
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_buffer.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_buffer.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_config.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_config.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_context.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_context.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gabn.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gabn.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gnba.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gnba.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_noop.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_noop.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_packet.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_packet.html
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_resutil.3
  user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_resutil.html
  user/imp/tbemd/contrib/bind9/version
  user/imp/tbemd/contrib/gcc/config/mips/freebsd.h
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
  user/imp/tbemd/include/Makefile
  user/imp/tbemd/lib/bind/config.h
  user/imp/tbemd/lib/csu/mips/crt1.c
  user/imp/tbemd/lib/csu/mips/crti.S
  user/imp/tbemd/lib/csu/mips/crtn.S
  user/imp/tbemd/lib/libc/arm/gen/makecontext.c
  user/imp/tbemd/lib/libc/arm/string/bzero.S
  user/imp/tbemd/lib/libc/arm/string/memcpy_arm.S
  user/imp/tbemd/lib/libc/arm/string/memmove.S
  user/imp/tbemd/lib/libc/powerpc/gen/fpgetmask.c
  user/imp/tbemd/lib/libc/powerpc/gen/fpgetround.c
  user/imp/tbemd/lib/libc/powerpc/gen/fpgetsticky.c
  user/imp/tbemd/lib/libc/powerpc/gen/fpsetmask.c
  user/imp/tbemd/lib/libc/powerpc/gen/fpsetround.c
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_extern.h
  user/imp/tbemd/lib/libc/stdlib/reallocf.c
  user/imp/tbemd/lib/libpmc/libpmc.c
  user/imp/tbemd/lib/libsm/Makefile
  user/imp/tbemd/libexec/rtld-elf/mips/reloc.c
  user/imp/tbemd/libexec/rtld-elf/mips/rtld_start.S
  user/imp/tbemd/sbin/gvinum/gvinum.c
  user/imp/tbemd/sbin/newfs/Makefile
  user/imp/tbemd/sbin/newfs/mkfs.c
  user/imp/tbemd/sbin/newfs/newfs.c
  user/imp/tbemd/sbin/newfs/newfs.h
  user/imp/tbemd/share/man/man4/ata.4
  user/imp/tbemd/share/man/man4/ehci.4
  user/imp/tbemd/share/man/man4/gem.4
  user/imp/tbemd/share/man/man4/gre.4
  user/imp/tbemd/share/man/man4/hme.4
  user/imp/tbemd/share/man/man4/man4.sparc64/sbus.4
  user/imp/tbemd/share/man/man4/snd_uaudio.4
  user/imp/tbemd/share/man/man4/stge.4
  user/imp/tbemd/share/man/man4/ubsa.4
  user/imp/tbemd/share/man/man4/ucom.4
  user/imp/tbemd/share/man/man4/uftdi.4
  user/imp/tbemd/share/man/man4/ugen.4
  user/imp/tbemd/share/man/man4/uhid.4
  user/imp/tbemd/share/man/man4/ulpt.4
  user/imp/tbemd/share/man/man4/umodem.4
  user/imp/tbemd/share/man/man4/uplcom.4
  user/imp/tbemd/share/man/man4/uvisor.4
  user/imp/tbemd/share/man/man4/uvscom.4
  user/imp/tbemd/share/man/man9/driver.9
  user/imp/tbemd/share/man/man9/kernacc.9
  user/imp/tbemd/share/man/man9/malloc.9
  user/imp/tbemd/share/man/man9/mi_switch.9
  user/imp/tbemd/share/man/man9/physio.9
  user/imp/tbemd/share/man/man9/psignal.9
  user/imp/tbemd/share/man/man9/timeout.9
  user/imp/tbemd/share/man/man9/vslock.9
  user/imp/tbemd/sys/amd64/amd64/local_apic.c
  user/imp/tbemd/sys/amd64/include/_inttypes.h
  user/imp/tbemd/sys/amd64/include/apicvar.h
  user/imp/tbemd/sys/conf/NOTES
  user/imp/tbemd/sys/conf/files
  user/imp/tbemd/sys/conf/files.mips
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_debug.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_decode.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_devid.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v1.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v1.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v3.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_internal.h
  user/imp/tbemd/sys/dev/ath/ath_hal/ah_soc.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210_power.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210desc.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210phy.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210reg.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211_power.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211desc.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211phy.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211reg.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/boss.ini   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212.ini   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212desc.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212phy.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5311reg.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312_power.c   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312phy.h   (contents, props changed)
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5312/ar5312reg.h   (contents, props changed)
  user/imp/tbemd/sys/dev/bwn/if_bwn.c
  user/imp/tbemd/sys/dev/ciss/ciss.c
  user/imp/tbemd/sys/dev/ciss/cissvar.h
  user/imp/tbemd/sys/dev/hme/if_hme_sbus.c
  user/imp/tbemd/sys/dev/hme/if_hmereg.h
  user/imp/tbemd/sys/dev/hme/if_hmevar.h
  user/imp/tbemd/sys/dev/hwpmc/pmc_events.h
  user/imp/tbemd/sys/dev/le/am79900var.h
  user/imp/tbemd/sys/dev/le/am7990var.h
  user/imp/tbemd/sys/dev/le/if_le_ledma.c
  user/imp/tbemd/sys/dev/le/lancevar.h
  user/imp/tbemd/sys/dev/mii/bmtphyreg.h
  user/imp/tbemd/sys/dev/mii/e1000phy.c
  user/imp/tbemd/sys/dev/mii/icsphyreg.h
  user/imp/tbemd/sys/dev/mii/lxtphyreg.h
  user/imp/tbemd/sys/dev/mii/mii.c
  user/imp/tbemd/sys/dev/mii/mii_physubr.c
  user/imp/tbemd/sys/dev/mii/miidevs
  user/imp/tbemd/sys/dev/mii/miivar.h
  user/imp/tbemd/sys/dev/mii/nsphyreg.h
  user/imp/tbemd/sys/dev/mii/nsphyterreg.h
  user/imp/tbemd/sys/dev/mii/qsphyreg.h
  user/imp/tbemd/sys/dev/mii/ukphy_subr.c
  user/imp/tbemd/sys/dev/siba/siba_bwn.c
  user/imp/tbemd/sys/dev/siba/siba_core.c
  user/imp/tbemd/sys/dev/usb/controller/ehci.h
  user/imp/tbemd/sys/dev/usb/controller/ehci_pci.c
  user/imp/tbemd/sys/dev/usb/controller/ehcireg.h
  user/imp/tbemd/sys/dev/usb/controller/ohci.h
  user/imp/tbemd/sys/dev/usb/controller/ohci_pci.c
  user/imp/tbemd/sys/dev/usb/controller/ohcireg.h
  user/imp/tbemd/sys/dev/usb/controller/uhci.h
  user/imp/tbemd/sys/dev/usb/controller/uhci_pci.c
  user/imp/tbemd/sys/dev/usb/controller/uhcireg.h
  user/imp/tbemd/sys/dev/usb/input/uhid.c
  user/imp/tbemd/sys/dev/usb/input/ukbd.c
  user/imp/tbemd/sys/dev/usb/input/ums.c
  user/imp/tbemd/sys/dev/usb/serial/uftdi.c
  user/imp/tbemd/sys/dev/usb/serial/ugensa.c
  user/imp/tbemd/sys/dev/usb/serial/uipaq.c
  user/imp/tbemd/sys/dev/usb/serial/ulpt.c
  user/imp/tbemd/sys/dev/usb/serial/uvisor.c
  user/imp/tbemd/sys/dev/usb/usb_cdc.h
  user/imp/tbemd/sys/dev/usb/usb_hid.c
  user/imp/tbemd/sys/dev/usb/usbdevs
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_lookup.c
  user/imp/tbemd/sys/i386/i386/local_apic.c
  user/imp/tbemd/sys/i386/include/_inttypes.h
  user/imp/tbemd/sys/i386/include/apicvar.h
  user/imp/tbemd/sys/ia64/include/_inttypes.h
  user/imp/tbemd/sys/kern/kern_resource.c
  user/imp/tbemd/sys/kern/ksched.c
  user/imp/tbemd/sys/kern/subr_param.c
  user/imp/tbemd/sys/kern/vfs_syscalls.c
  user/imp/tbemd/sys/mips/include/_inttypes.h
  user/imp/tbemd/sys/mips/include/cpufunc.h
  user/imp/tbemd/sys/mips/include/cpuinfo.h
  user/imp/tbemd/sys/mips/include/pmc_mdep.h
  user/imp/tbemd/sys/mips/malta/gtreg.h
  user/imp/tbemd/sys/mips/mips/busdma_machdep.c
  user/imp/tbemd/sys/mips/mips/cpu.c
  user/imp/tbemd/sys/mips/mips/exception.S
  user/imp/tbemd/sys/mips/mips/locore.S
  user/imp/tbemd/sys/mips/mips/mpboot.S
  user/imp/tbemd/sys/mips/mips/support.S
  user/imp/tbemd/sys/mips/rmi/ehcireg.h
  user/imp/tbemd/sys/mips/rmi/ehcivar.h
  user/imp/tbemd/sys/mips/rmi/xls_ehci.c
  user/imp/tbemd/sys/mips/sibyte/sb_machdep.c
  user/imp/tbemd/sys/modules/ath/Makefile
  user/imp/tbemd/sys/powerpc/aim/ofwmagic.S
  user/imp/tbemd/sys/powerpc/fpu/fpu_extern.h
  user/imp/tbemd/sys/powerpc/include/_inttypes.h
  user/imp/tbemd/sys/powerpc/include/intr.h
  user/imp/tbemd/sys/powerpc/include/spr.h
  user/imp/tbemd/sys/powerpc/powermac/smu.c
  user/imp/tbemd/sys/sparc64/include/_inttypes.h
  user/imp/tbemd/sys/sparc64/sbus/lsi64854reg.h
  user/imp/tbemd/sys/sparc64/sbus/lsi64854var.h
  user/imp/tbemd/sys/sparc64/sbus/ofw_sbus.h
  user/imp/tbemd/sys/sun4v/include/_inttypes.h
  user/imp/tbemd/sys/sys/clock.h
  user/imp/tbemd/sys/sys/pmc.h
  user/imp/tbemd/sys/sys/systm.h
  user/imp/tbemd/sys/x86/isa/clock.c
  user/imp/tbemd/tools/regression/lib/libc/resolv/resolv.c
  user/imp/tbemd/tools/regression/sysvmsg/msgtest.c
  user/imp/tbemd/tools/regression/sysvshm/shmtest.c
  user/imp/tbemd/tools/regression/tmpfs/h_funcs.subr
  user/imp/tbemd/tools/regression/tmpfs/h_tools.c
  user/imp/tbemd/tools/regression/tmpfs/t_create
  user/imp/tbemd/tools/regression/tmpfs/t_dots
  user/imp/tbemd/tools/regression/tmpfs/t_exec
  user/imp/tbemd/tools/regression/tmpfs/t_link
  user/imp/tbemd/tools/regression/tmpfs/t_mkdir
  user/imp/tbemd/tools/regression/tmpfs/t_mount
  user/imp/tbemd/tools/regression/tmpfs/t_pipes
  user/imp/tbemd/tools/regression/tmpfs/t_read_write
  user/imp/tbemd/tools/regression/tmpfs/t_readdir
  user/imp/tbemd/tools/regression/tmpfs/t_remove
  user/imp/tbemd/tools/regression/tmpfs/t_rename
  user/imp/tbemd/tools/regression/tmpfs/t_rmdir
  user/imp/tbemd/tools/regression/tmpfs/t_setattr
  user/imp/tbemd/tools/regression/tmpfs/t_sizes
  user/imp/tbemd/tools/regression/tmpfs/t_sockets
  user/imp/tbemd/tools/regression/tmpfs/t_statvfs
  user/imp/tbemd/tools/regression/tmpfs/t_symlink
  user/imp/tbemd/tools/regression/tmpfs/t_times
  user/imp/tbemd/tools/regression/tmpfs/t_trail_slash
  user/imp/tbemd/tools/regression/tmpfs/t_truncate
  user/imp/tbemd/tools/regression/tmpfs/t_vnd
  user/imp/tbemd/tools/regression/tmpfs/t_vnode_leak
  user/imp/tbemd/usr.bin/csup/Makefile
  user/imp/tbemd/usr.bin/csup/auth.c
  user/imp/tbemd/usr.bin/truncate/Makefile
  user/imp/tbemd/usr.bin/truncate/truncate.c
  user/imp/tbemd/usr.sbin/jail/jail.8
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/contrib/bind9/   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/contrib/tzdata/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)

Modified: user/imp/tbemd/Makefile
==============================================================================
--- user/imp/tbemd/Makefile	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/Makefile	Thu Mar  4 06:43:41 2010	(r204695)
@@ -15,6 +15,7 @@
 # reinstallkernel     - Reinstall the kernel and the kernel-modules.
 # reinstallkernel.debug
 # kernel              - buildkernel + installkernel.
+# kernel-toolchain    - Builds the subset of world necessary to build a kernel
 # doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree (cvs).
 # check-old           - List obsolete directories/files/libraries.

Modified: user/imp/tbemd/ObsoleteFiles.inc
==============================================================================
--- user/imp/tbemd/ObsoleteFiles.inc	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/ObsoleteFiles.inc	Thu Mar  4 06:43:41 2010	(r204695)
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100303: actual removal of utmp.h
+OLD_FILES+=usr/include/utmp.h
 # 20100227: [ia64] removed  and 
 .if ${TARGET_ARCH} == "ia64"
 OLD_FILES+=usr/include/machine/sapicreg.h

Modified: user/imp/tbemd/contrib/bind9/CHANGES
==============================================================================
--- user/imp/tbemd/contrib/bind9/CHANGES	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/CHANGES	Thu Mar  4 06:43:41 2010	(r204695)
@@ -1,4 +1,27 @@
-	--- 9.6.1-P3 released ---
+
+	--- 9.6.2 released ---
+
+2850.	[bug]		If isc_heap_insert() failed due to memory shortage
+			the heap would have corrupted entries. [RT #20951]
+
+2849.	[bug]		Don't treat errors from the xml2 library as fatal.
+			[RT #20945]
+
+2846.	[bug]		EOF on unix domain sockets was not being handled
+			correctly. [RT #20731]
+
+2844.	[doc]		notify-delay default in ARM was wrong.  It should have
+			been five (5) seconds.
+
+	--- 9.6.2rc1 released ---
+
+2838.	[func]		Backport support for SHA-2 DNSSEC algorithms,
+			RSASHA256 and RSASHA512, from BIND 9.7.  (This
+			incorporates changes 2726 and 2738 from that
+			release branch.) [RT #20871]
+
+2837.	[port]		Prevent Linux spurious warnings about fwrite().
+			[RT #20812]
 
 2831.	[security]	Do not attempt to validate or cache
 			out-of-bailiwick data returned with a secure
@@ -10,21 +33,286 @@
 
 2827.	[security]	Bogus NXDOMAIN could be cached as if valid. [RT #20712]
 
-	--- 9.6.1-P2 released ---
+2825.	[bug]		Changing the setting of OPTOUT in a NSEC3 chain that
+			was in the process of being created was not properly
+			recorded in the zone. [RT #20786]
+
+2823.	[bug]		rbtdb.c:getsigningtime() was missing locks. [RT #20781]
+
+2819.	[cleanup]	Removed unnecessary DNS_POINTER_MAXHOPS define
+			[RT #20771]
+
+2818.	[cleanup]	rndc could return an incorrect error code 
+			when a zone was not found. [RT #20767]
+
+2815.	[bug]		Exclusively lock the task when freezing a zone.
+			[RT #19838]
+
+2814.	[func]		Provide a definitive error message when a master
+			zone is not loaded. [RT #20757]
+
+	--- 9.6.2b1 released ---
+
+2797.	[bug]		Don't decrement the dispatch manager's maxbuffers.
+			[RT #20613]
+
+2790.	[bug]		Handle DS queries to stub zones. [RT #20440]
+
+2789.   [bug]           Fixed an INSIST in dispatch.c [RT #20576]
+
+2786.	[bug]		Additional could be promoted to answer. [RT #20663]
+
+2784.	[bug]		TC was not always being set when required glue was
+			dropped. [RT #20655]
+
+2783.	[func]		Return minimal responses to EDNS/UDP queries with a UDP
+			buffer size of 512 or less.  [RT #20654]
+
+2782.	[port]		win32: use getaddrinfo() for hostname lookups.
+			[RT #20650]
+
+2777.	[contrib]	DLZ MYSQL auto reconnect support discovery was wrong.
 
 2772.	[security]	When validating, track whether pending data was from
 			the additional section or not and only return it if
 			validates as secure. [RT #20438]
 
-	--- 9.6.1-P1 released ---
+2765.	[bug]		Skip masters for which the TSIG key cannot be found.
+			[RT #20595]
+
+2760.	[cleanup]	Corrected named-compilezone usage summary. [RT #20533]
+
+2759.	[doc]		Add information about .jbk/.jnw files to
+			the ARM. [RT #20303]
+
+2758.	[bug]		win32: Added a workaround for a windows 2008 bug
+			that could cause the UDP client handler to shut
+			down. [RT #19176]
+
+2757.	[bug]		dig: assertion failure could occur in connect
+			timeout. [RT #20599]
+
+2755.	[doc]		Clarify documentation of keyset- files in
+			dnssec-signzone man page. [RT #19810]
+
+2754.	[bug]		Secure-to-insecure transitions failed when zone
+			was signed with NSEC3. [RT #20587]
+
+2750.	[bug]		dig: assertion failure could occur when a server
+			didn't have an address. [RT #20579]
+
+2749.	[bug]		ixfr-from-differences generated a non-minimal ixfr
+			for NSEC3 signed zones. [RT #20452]
+
+2747.	[bug]		Journal roll forwards failed to set the re-signing
+			time of RRSIGs correctly. [RT #20541]
+
+2743.	[bug]		RRSIG could be incorrectly set in the NSEC3 record
+			for a insecure delegation.
+
+2729.	[func]		When constructing a CNAME from a DNAME use the DNAME
+			TTL. [RT #20451]
+
+2723.	[bug]		isc_base32_totext(), isc_base32hex_totext(), and
+			isc_base64_totext(), didn't always mark regions of
+			memory as fully consumed after conversion.  [RT #20445]
+
+2722.	[bug]		Ensure that the memory associated with the name of
+			a node in a rbt tree is not altered during the life
+			of the node. [RT #20431]
+
+2721.	[port]		Have dst__entropy_status() prime the random number
+			generator. [RT #20369]
+
+2718.	[bug]		The space calculations in opensslrsa_todns() were
+			incorrect. [RT #20394]
+
+2716.	[bug]		nslookup debug mode didn't return the ttl. [RT #20414]
+
+2715.	[bug]		Require OpenSSL support to be explicitly disabled.
+			[RT #20288]
+
+2714.	[port]		aix/powerpc: 'asm("ics");' needs non standard assembler
+			flags.
+
+2713.	[bug]		powerpc: atomic operations missing asm("ics") /
+			__isync() calls.
+
+2706.	[bug]		Loading a zone with a very large NSEC3 salt could
+			trigger an assert. [RT #20368]
+
+2705.	[bug]		Reconcile the XML stats version number with a later
+                        BIND9 release, by adding a "name" attribute to
+                        "cache" elements and increasing the version number
+                        to 2.2.  (This is a minor version change, but may
+                        affect XML parsers if they assume the cache element
+                        doesn't take an attribute.)
+
+2704.	[bug]		Serial of dynamic and stub zones could be inconsistent
+			with their SOA serial.  [RT #19387]
+
+2701.	[doc]		Correction to ARM: hmac-md5 is no longer the only
+			supported TSIG key algorithm. [RT #18046]
+
+2700.	[doc]		The match-mapped-addresses option is discouraged.
+			[RT #12252]
+
+2699.	[bug]		Missing lock in rbtdb.c. [RT #20037]
+
+2697.	[port]		win32: ensure that S_IFMT, S_IFDIR, S_IFCHR and
+			S_IFREG are defined after including .
+			[RT #20309]
+
+2696.	[bug]		named failed to successfully process some valid
+			acl constructs. [RT #20308]
+
+2692.	[port]		win32: 32/64 bit cleanups. [RT #20335]
+
+2690.	[bug]		win32: fix isc_thread_key_getspecific() prototype.
+			[RT #20315]
+
+2689.	[bug]		Correctly handle snprintf result. [RT #20306]
+
+2688.	[bug]		Use INTERFACE_F_POINTTOPOINT, not IFF_POINTOPOINT,
+			to decide to fetch the destination address. [RT #20305]
+
+2686.	[bug]		dnssec-signzone should clean the old NSEC chain when
+			signing with NSEC3 and vice versa. [RT #20301]
+
+2683.	[bug]		dnssec-signzone should clean out old NSEC3 chains when
+			the NSEC3 parameters used to sign the zone change.
+			[RT #20246]
+
+2681.	[bug]		IPSECKEY RR of gateway type 3 was not correctly
+			decoded. [RT #20269]
+
+2678.	[func]		Treat DS queries as if "minimal-response yes;"
+			was set. [RT #20258]
+
+2672.	[bug]		Don't enable searching in 'host' when doing reverse
+			lookups. [RT #20218]
+
+2670.	[bug]		Unexpected connect failures failed to log enough
+			information to be useful. [RT #20205]
+
+2663.	[func]		win32:  allow named to run as a service using
+			"NT AUTHORITY\LocalService" as the account. [RT #19977]
+
+2662.	[bug]		lwres_getipnodebyname() and lwres_getipnodebyaddr()
+			returned a misleading error code when lwresd was
+			down. [RT #20028]
+
+2661.	[bug]		Check whether socket fd exceeds FD_SETSIZE when
+			creating lwres context. [RT #20029]
+
+2659.	[doc]		Clarify dnssec-keygen doc: key name must match zone
+			name for DNSSEC keys. [RT #19938]
+
+2656.	[func]		win32: add a "tools only" check box to the installer
+			which causes it to only install dig, host, nslookup,
+			nsupdate and relevant DLLs.  [RT #19998]
+
+2655.	[doc]		Document that key-directory does not affect
+			rndc.key.  [RT #20155]
+
+2653.	[bug]		Treat ENGINE_load_private_key() failures as key
+			not found rather than out of memory.  [RT #18033]
+
+2649.	[bug]		Set the domain for forward only zones. [RT #19944]
+
+2648.	[port]		win32: isc_time_seconds() was broken. [RT #19900]
+
+2647.	[bug]		Remove unnecessary SOA updates when a new KSK is
+			added. [RT #19913]
+
+2646.	[bug]		Incorrect cleanup on error in socket.c. [RT #19987]
+
+2645.	[port]		"gcc -m32" didn't work on amd64 and x86_64 platforms
+			which default to 64 bits. [RT #19927]
+
+2643.	[bug]		Stub zones interacted badly with NSEC3 support.
+			[RT #19777]
+
+2642.	[bug]		nsupdate could dump core on solaris when reading
+			improperly formatted key files.  [RT #20015]
 
 2640.	[security]	A specially crafted update packet will cause named
 			to exit. [RT #20000]
 
+2639.	[bug]		Silence compiler warnings in gssapi code. [RT #19954]
+
+2637.	[func]		Rationalize dnssec-signzone's signwithkey() calling.
+			[RT #19959]
+
+2635.	[bug]		isc_inet_ntop() incorrectly handled 0.0/16 addresses.
+			[RT #19716]
+
+2633.	[bug]		Handle 15 bit rand() functions. [RT #19783]
+
+2632.	[func]		util/kit.sh: warn if documentation appears to be out of
+			date.  [RT #19922]
+
+2625.	[bug]		Missing UNLOCK in rbtdb.c. [RT #19865]
+
+2623.	[bug]		Named started seaches for DS non-optimally. [RT #19915]
+
+2621.	[doc]		Made copyright boilterplate consistent.  [RT #19833]
+
+2920.	[bug]		Delay thawing the zone until the reload of it has
+			completed successfully.  [RT #19750]
+
+2618.	[bug]		The sdb and sdlz db_interator_seek() methods could
+			loop infinitely. [RT #19847]
+
+2617.	[bug]		ifconfig.sh failed to emit an error message when
+			run from the wrong location. [RT #19375]
+
+2616.	[bug]		'host' used the nameservers from resolv.conf even
+			when a explicit nameserver was specified. [RT #19852]
+
+2615.	[bug]		"__attribute__((unused))" was in the wrong place
+			for ia64 gcc builds. [RT #19854]
+
+2614.	[port]		win32: 'named -v' should automatically be executed
+			in the foreground. [RT #19844]
+
+2613.	[bug]		Option argument validation was missing for
+			dnssec-dsfromkey. [RT #19828]
+
+2610.	[port]		sunos: Change #2363 was not complete. [RT #19796]
+
+2608.	[func]		Perform post signing verification checks in
+			dnssec-signzone.  These can be disabled with -P.
+
+			The post sign verification test ensures that for each
+			algorithm in use there is at least one non revoked
+			self signed KSK key.  That all revoked KSK keys are
+			self signed.  That all records in the zone are signed
+			by the algorithm.  [RT #19653]
+
+2601.	[doc]		Mention file creation mode mask in the
+			named manual page.
+
+2593.	[bug]		Improve a corner source of SERVFAILs [RT #19632]
+
+2589.	[bug]		dns_db_unregister() failed to clear '*dbimp'.
+			[RT #19626]
+
+2581.	[contrib]	dlz/mysql set MYSQL_OPT_RECONNECT option on connection.
+			Requires MySQL 5.0.19 or later. [RT #19084]
+
+2580.	[bug]		UpdateRej statistics counter could be incremented twice
+			for one rejection. [RT #19476]
+
+2533.	[doc]		ARM: document @ (at-sign). [RT #17144]
+
+2500.	[contrib]	contrib/sdb/pgsql/zonetodb.c called non-existent
+			function. [RT #18582]
+
 	--- 9.6.1 released ---
 
 2607.	[bug]		named could incorrectly delete NSEC3 records for
-			empty nodes when processing a update request.  
+			empty nodes when processing a update request.
 			[RT #19749]
 
 2606.	[bug]		"delegation-only" was not being accepted in
@@ -78,7 +366,7 @@
 			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]
+			remove non-existent journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
@@ -136,7 +424,7 @@
 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]
 
@@ -185,7 +473,7 @@
 2536.	[cleanup]	Silence some warnings when -Werror=format-security is
 			specified. [RT #19083]
 
-2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+2535.	[bug]		dig +showsearch 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]
@@ -198,8 +486,8 @@
 2529.	[cleanup]	Upgrade libtool to silence complaints from recent
 			version of autoconf. [RT #18657]
 
-2528.   [cleanup]       Silence spurious configure warning about
-                        --datarootdir [RT #19096]
+2528.   [cleanup]	Silence spurious configure warning about
+			--datarootdir [RT #19096]
 
 2527.	[bug]		named could reuse cache on reload with
 			enabling/disabling validation. [RT #19119]
@@ -222,7 +510,7 @@
 			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.
+			nameserver address of the excluded address type.
 			[RT #18843]
 
 2516.	[bug]		glue sort for responses was performed even when not
@@ -235,7 +523,7 @@
 2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
 			[RT #18885]
 
-2506.	[port]		solaris: Check at configure time if 
+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
@@ -258,7 +546,7 @@
 2515.	[port]		win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
 			[RT #19063]
 
-2513	[bug]		Fix windows cli build. [RT #19062]
+2513.	[bug]		Fix windows cli build. [RT #19062]
 
 2510.	[bug]		"dig +sigchase" could trigger REQUIRE failures.
 			[RT #19033]
@@ -343,7 +631,7 @@
 
 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]
@@ -359,7 +647,7 @@
 
 2473.	[port]		linux: raise the limit on open files to the possible
 			maximum value before spawning threads; 'files'
-		        specified in named.conf doesn't seem to work with
+			specified in named.conf doesn't seem to work with
 			threads as expected. [RT #18784]
 
 2472.	[port]		linux: check the number of available cpu's before
@@ -388,7 +676,7 @@
 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
+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
@@ -418,7 +706,7 @@
 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]
 
@@ -458,7 +746,7 @@
 
 2442.	[bug]		A lock could be destroyed twice. [RT# 18626]
 
-2441.   [bug]           isc_radix_insert() could copy radix tree nodes
+2441.	[bug]		isc_radix_insert() could copy radix tree nodes
 			incompletely. [RT #18573]
 
 2440.   [bug]		named-checkconf used an incorrect test to determine
@@ -515,7 +803,7 @@
 			implementation.  Allow the use of kqueue,
 			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,
@@ -583,9 +871,9 @@
 
 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.
+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.
 
@@ -661,7 +949,7 @@
 2380.	[bug]		dns_view_find() was not returning NXDOMAIN/NXRRSET
 			proofs which, in turn, caused validation failures
 			for insecure zones immediately below a secure zone
-			the server was authoritative for. [RT #18112] 
+			the server was authoritative for. [RT #18112]
 
 2379.	[contrib]	queryperf/gen-data-queryperf.py: removed redundant
 			TLDs and supported RRs with TTLs [RT #17972]
@@ -709,7 +997,7 @@
 2363.	[port]		sunos: pre-set "lt_cv_sys_max_cmd_len=4096;".
 			[RT #17513]
 
-2362.   [cleanup]	Make "rrset-order fixed" a compile-time option.
+2362.	[cleanup]	Make "rrset-order fixed" a compile-time option.
 			settable by "./configure --enable-fixed-rrset".
 			Disabled by default. [RT #17977]
 
@@ -792,12 +1080,12 @@
 			interfaces if there are not listen-on-v6 clauses in
 			named.conf.  [RT #17581]
 
-2335.	[port]		sunos:  libbind and *printf() support for long long. 
+2335.	[port]		sunos:  libbind and *printf() support for long long.
 			[RT #17513]
 
 2334.	[bug]		Bad REQUIRES in fromstruct_in_naptr(),  off by one
 			bug in fromstruct_txt(). [RT #17609]
-			
+
 2333.	[bug]		Fix off by one error in isc_time_nowplusinterval().
 			[RT #17608]
 
@@ -842,7 +1130,7 @@
 2320.	[func]		Make statistics counters thread-safe for platforms
 			that support certain atomic operations. [RT #17466]
 
-2319.	[bug]		Silence Coverity warnings in 
+2319.	[bug]		Silence Coverity warnings in
 			lib/dns/rdata/in_1/apl_42.c. [RT #17469]
 
 2318.	[port]		sunos fixes for libbind.  [RT #17514]
@@ -894,7 +1182,7 @@
 2301.	[bug]		Remove resource leak and fix error messages in
 			bin/tests/system/lwresd/lwtest.c. [RT #17474]
 
-2300.	[bug]		Fixed failure to close open file in 
+2300.	[bug]		Fixed failure to close open file in
 			bin/tests/names/t_names.c. [RT #17473]
 
 2299.	[bug]		Remove unnecessary NULL check in
@@ -1017,7 +1305,7 @@
 2261.   [bug]           Fix memory leak with "any" and "none" ACLs [RT #17272]
 
 2260.	[bug]		Reported wrong clients-per-query when increasing the
-                        value. [RT #17236]
+			value. [RT #17236]
 
 2259.	[placeholder]
 
@@ -1039,10 +1327,10 @@
 			intermediate values as timer->idle was reset by
 			isc_timer_touch(). [RT #17243]
 
-2253.	[func]	 	"max-cache-size" defaults to 32M.
+2253.	[func]		"max-cache-size" defaults to 32M.
 			"max-acache-size" defaults to 16M.
 
-2252.   [bug]           Fixed errors in sortlist code [RT #17216]
+2252.	[bug]		Fixed errors in sortlist code [RT #17216]
 
 2251.	[placeholder]
 
@@ -1050,11 +1338,11 @@
 			memory statistics file should be written or not.
 			Additionally named's -m option will cause the
 			statistics file to be written. [RT #17113]
-			
-2249.   [bug]           Only set Authentic Data bit if client requested
-                        DNSSEC, per RFC 3655 [RT #17175]
 
-2248.   [cleanup]       Fix several errors reported by Coverity. [RT #17160]
+2249.	[bug]		Only set Authentic Data bit if client requested
+			DNSSEC, per RFC 3655 [RT #17175]
+
+2248.	[cleanup]	Fix several errors reported by Coverity. [RT #17160]
 
 2247.	[doc]		Sort doc/misc/options. [RT #17067]
 
@@ -1095,11 +1383,11 @@
 
 2235.	[bug]		 was not being installed. [RT #17135]
 
-2234.   [port]          Correct some compiler warnings on SCO OSr5 [RT #17134]
-  
-2233.   [func]          Add support for O(1) ACL processing, based on
-                        radix tree code originally written by Kevin
-                        Brintnall. [RT #16288]
+2234.	[port]		Correct some compiler warnings on SCO OSr5 [RT #17134]
+
+2233.	[func]		Add support for O(1) ACL processing, based on
+			radix tree code originally written by Kevin
+			Brintnall. [RT #16288]
 
 2232.	[bug]		dns_adb_findaddrinfo() could fail and return
 			ISC_R_SUCCESS. [RT #17137]
@@ -1120,7 +1408,7 @@
 2226.	[placeholder]
 
 2225.	[bug]		More support for systems with no IPv4 addresses.
-		        [RT #17111]
+			[RT #17111]
 
 2224.	[bug]		Defer journal compaction if a xfrin is in progress.
 			[RT #17119]
@@ -1128,7 +1416,7 @@
 2223.	[bug]		Make a new journal when compacting. [RT #17119]
 
 2222.	[func]		named-checkconf now checks server key references.
-		        [RT #17097]
+			[RT #17097]
 
 2221.	[bug]		Set the event result code to reflect the actual
 			record turned to caller when a cache update is
@@ -1137,7 +1425,7 @@
 
 2220.	[bug]		win32: Address a race condition in final shutdown of
 			the Windows socket code. [RT #17028]
-			
+
 2219.	[bug]		Apply zone consistency checks to additions, not
 			removals, when updating. [RT #17049]
 
@@ -1147,7 +1435,7 @@
 2217.	[func]		Adjust update log levels. [RT #17092]
 
 2216.	[cleanup]	Fix a number of errors reported by Coverity.
-		        [RT #17094]
+			[RT #17094]
 
 2215.	[bug]		Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094]
 
@@ -1193,7 +1481,7 @@
 			localhost;) is used.
 
 			[RT #16987]
-	
+
 2205.	[bug]		libbind: change #2119 broke thread support. [RT #16982]
 
 2204.	[bug]		"rndc flushanme name unknown-view" caused named
@@ -1332,7 +1620,7 @@
 			allow-query-on, allow-recursion-on and
 			allow-query-cache-on. [RT #16291]
 
-2164.	[bug]		The code to determine how named-checkzone / 
+2164.	[bug]		The code to determine how named-checkzone /
 			named-compilezone was called failed under windows.
 			[RT #16764]
 
@@ -1539,14 +1827,14 @@
 
 2095.	[port]		libbind: alway prototype inet_cidr_ntop_ipv6() and
 			net_cidr_ntop_ipv6(). [RT #16388]
- 
+
 2094.	[contrib]	Update named-bootconf.  [RT# 16404]
 
 2093.	[bug]		named-checkzone -s was broken.
 
 2092.	[bug]		win32: dig, host, nslookup.  Use registry config
 			if resolv.conf does not exist or no nameservers
-			listed. [RT #15877] 
+			listed. [RT #15877]
 
 2091.	[port]		dighost.c: race condition on cleanup. [RT #16417]
 
@@ -1950,7 +2238,7 @@
 
 1964.	[func]		Separate out MX and SRV to CNAME checks. [RT #15723]
 
-1963.	[port]		Tru64 4.0E doesn't support send() and recv(). 
+1963.	[port]		Tru64 4.0E doesn't support send() and recv().
 			[RT #15586]
 
 1962.	[bug]		Named failed to clear old update-policy when it
@@ -1993,7 +2281,7 @@
 1951.	[security]	Drop queries from particular well known ports.
 			Don't return FORMERR to queries from particular
 			well known ports.  [RT #15636]
-			
+
 1950.	[port]		Solaris 2.5.1 and earlier cannot bind() then connect()
 			a TCP socket. This prevents the source address being
 			set for TCP connections. [RT #15628]
@@ -2015,7 +2303,7 @@
 1945.	[cleanup]	dnssec-keygen: RSA (RSAMD5) is no longer recommended.
 			To generate a RSAMD5 key you must explicitly request
 			RSAMD5. [RT #13780]
-			
+
 1944.	[cleanup]	isc_hash_create() does not need a read/write lock.
 			[RT #15522]
 
@@ -2127,7 +2415,7 @@
 			[RT #15034]
 
 1905.	[bug]		Strings returned from cfg_obj_asstring() should be
-			treated as read-only.  The prototype for 
+			treated as read-only.  The prototype for
 			cfg_obj_asstring() has been updated to reflect this.
 			[RT #15256]
 
@@ -2259,10 +2547,10 @@
 1863.	[bug]		rrset-order "fixed" error messages not complete.
 
 1862.	[func]		Add additional zone data constancy checks.
-			named-checkzone has extended checking of NS, MX and 
+			named-checkzone has extended checking of NS, MX and
 			SRV record and the hosts they reference.
 			named has extended post zone load checks.
-			New zone options: check-mx and integrity-check. 
+			New zone options: check-mx and integrity-check.
 			[RT #4940]
 
 1861.	[bug]		dig could trigger a INSIST on certain malformed
@@ -2305,9 +2593,9 @@
 1848.	[bug]		Improve SMF integration. [RT #13238]
 
 1847.	[bug]		isc_ondestroy_init() is called too late in
-			dns_rbtdb_create()/dns_rbtdb64_create(). 
+			dns_rbtdb_create()/dns_rbtdb64_create().
 			[RT #13661]
-			
+
 1846.	[contrib]	query-loc-0.3.0 from Stephane Bortzmeyer
 			.
 
@@ -2599,7 +2887,7 @@
 			[RT #12866]
 
 1748.	[func]		dig now returns the byte count for axfr/ixfr.
-			
+
 1747.	[bug]		BIND 8 compatibility: named/named-checkconf failed
 			to parse "host-statistics-max" in named.conf.
 
@@ -2617,7 +2905,7 @@
 			requested number of worker threads then destruction
 			of the manager would trigger an INSIST() failure.
 			[RT #12790]
-			
+
 1742.	[bug]		Deleting all records at a node then adding a
 			previously existing record, in a single UPDATE
 			transaction, failed to leave / regenerate the
@@ -2628,7 +2916,7 @@
 
 1740.	[bug]		Replace rbt's hash algorithm as it performed badly
 			with certain zones. [RT #12729]
-			
+
 			NOTE: a hash context now needs to be established
 			via isc_hash_create() if the application was not
 			already doing this.
@@ -2643,7 +2931,7 @@
 
 1736.	[bug]		dst_key_fromnamedfile() could fail to read a
 			public key. [RT #12687]
-			
+
 1735.	[bug]		'dig +sigtrace' could die with a REQUIRE failure.
 			[RE #12688]
 
@@ -2820,7 +3108,7 @@
 
 1675.	[bug]		named would sometimes add extra NSEC records to
 			the authority section.
-			
+
 1674.	[port]		linux: increase buffer size used to scan
 			/proc/net/if_inet6.
 
@@ -2894,7 +3182,7 @@
 
 1648.	[func]		Update dnssec-lookaside named.conf syntax to support
 			multiple dnssec-lookaside namespaces (not yet
-			implemented).  
+			implemented).
 
 1647.	[bug]		It was possible trigger a INSIST when chasing a DS
 			record that required walking back over a empty node.
@@ -2924,7 +3212,7 @@
 
 1638.	[bug]		"ixfr-from-differences" could generate a REQUIRE
 			failure if the journal open failed. [RT #11347]
-			
+
 1637.	[bug]		Node reference leak on error in addnoqname().
 
 1636.	[bug]		The dump done callback could get ISC_R_SUCCESS even if
@@ -3018,21 +3306,21 @@
 1607.	[bug]		dig, host and nslookup were still using random()
 			to generate query ids. [RT# 11013]
 
-1606.	[bug]	 	DLV insecurity proof was failing.
+1606.	[bug]		DLV insecurity proof was failing.
 
 1605.	[func]		New dns_db_find() option DNS_DBFIND_COVERINGNSEC.
 
 1604.	[bug]		A xfrout_ctx_create() failure would result in
 			xfrout_ctx_destroy() being called with a
 			partially initialized structure.
-			
+
 1603.	[bug]		nsupdate: set interactive based on isatty().
 			[RT# 10929]
 
 1602.	[bug]		Logging to a file failed unless a size was specified.
 			[RT# 10925]
 
-1601.	[bug]		Silence spurious warning 'both "recursion no;" and 
+1601.	[bug]		Silence spurious warning 'both "recursion no;" and
 			"allow-recursion" active' warning from view "_bind".
 			[RT# 10920]
 

Modified: user/imp/tbemd/contrib/bind9/COPYRIGHT
==============================================================================
--- user/imp/tbemd/contrib/bind9/COPYRIGHT	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/COPYRIGHT	Thu Mar  4 06:43:41 2010	(r204695)
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.14.176.1 2009/01/05 23:47:22 tbox Exp $
+$Id: COPYRIGHT,v 1.14.176.2 2010/01/07 23:47:36 tbox Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 

Modified: user/imp/tbemd/contrib/bind9/FAQ
==============================================================================
--- user/imp/tbemd/contrib/bind9/FAQ	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/FAQ	Thu Mar  4 06:43:41 2010	(r204695)
@@ -1,6 +1,6 @@
 Frequently Asked Questions about BIND 9
 
-Copyright © 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+Copyright © 2004-2010 Internet Systems Consortium, Inc. ("ISC")
 
 Copyright © 2000-2003 Internet Software Consortium.
 
@@ -784,6 +784,22 @@ A: Red Hat Security Enhanced Linux (SELi
    See these man-pages for more information : selinux(8), named_selinux
    (8), chcon(1), setsebool(8)
 
+Q: I'm running BIND on Ubuntu -
+
+   Why can't named update slave zone database files?
+
+   Why can't named create DDNS journal files or update the master zones
+   from journals?
+
+   Why can't named create custom log files?
+
+A: Ubuntu uses AppArmor  in
+   addition to normal file system permissions to protect the system.
+
+   Adjust the paths to use those specified in /etc/apparmor.d/
+   usr.sbin.named or adjust /etc/apparmor.d/usr.sbin.named to allow named
+   to write at the location specified in named.conf.
+
 Q: Listening on individual IPv6 interfaces does not work.
 
 A: This is usually due to "/proc/net/if_inet6" not being available in the

Modified: user/imp/tbemd/contrib/bind9/FAQ.xml
==============================================================================
--- user/imp/tbemd/contrib/bind9/FAQ.xml	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/FAQ.xml	Thu Mar  4 06:43:41 2010	(r204695)
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 

   Frequently Asked Questions about BIND 9
@@ -29,6 +29,7 @@
       2007
       2008
       2009
+      2010
       Internet Systems Consortium, Inc. ("ISC")
     
     
@@ -1385,6 +1386,36 @@ named_cache_t: for files modifiable by n
     
       
 	
+	   I'm running BIND on Ubuntu -
+	
+	
+	  Why can't named update slave zone database files?
+	
+	
+	  Why can't named create DDNS journal files or update
+	  the master zones from journals?
+	
+	
+	  Why can't named create custom log files?
+	
+      
+      
+	
+	  Ubuntu uses AppArmor 
+          <http://en.wikipedia.org/wiki/AppArmor> in
+	  addition to normal file system permissions to protect the system.
+	
+	
+	  Adjust the paths to use those specified in /etc/apparmor.d/usr.sbin.named
+	  or adjust /etc/apparmor.d/usr.sbin.named to allow named to write at the
+	  location specified in named.conf.
+	
+      
+    
+
+    
+      
+	
 	  Listening on individual IPv6 interfaces does not work.
 	
       

Modified: user/imp/tbemd/contrib/bind9/NSEC3-NOTES
==============================================================================
--- user/imp/tbemd/contrib/bind9/NSEC3-NOTES	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/NSEC3-NOTES	Thu Mar  4 06:43:41 2010	(r204695)
@@ -35,7 +35,7 @@ will not be completely signed until name
 zone and generate the NSEC and RRSIG records.  Initially the NSEC
 record at the zone apex will have the OPT bit set.  When the NSEC
 chain is complete the OPT bit will be cleared.  Additionally when
-the zone is fully signed the private type (default TYPE65535) records
+the zone is fully signed the private type (default TYPE65534) records
 will have a non zero value for the final octet. 
 
 The private type record has 5 octets.
@@ -45,7 +45,7 @@ The private type record has 5 octets.
 	complete flag (octet 5)
 
 If you wish to go straight to a secure zone using NSEC3 you should
-also add a NSECPARAM record to the update request with the flags
+also add a NSEC3PARAM record to the update request with the flags
 field set to indicate whether the NSEC3 chain will have the OPTOUT
 bit set or not.
 

Modified: user/imp/tbemd/contrib/bind9/README
==============================================================================
--- user/imp/tbemd/contrib/bind9/README	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/README	Thu Mar  4 06:43:41 2010	(r204695)
@@ -42,6 +42,29 @@ BIND 9
 		Stichting NLnet - NLnet Foundation
 		Nominum, Inc.
 
+BIND 9.6.2
+
+	BIND 9.6.2 is a maintenance release, fixing bugs in 9.6.1.
+        It also introduces support for the SHA-2 DNSSEC algorithms,
+        RSASHA256 and RSASHA512.
+
+        Known issues in this release:
+
+        - A validating resolver that has been incorrectly configured with
+          an invalid trust anchor will be unable to resolve names covered
+          by that trust anchor.  In all current versions of BIND 9, such a
+          resolver will also generate significant unnecessary DNS traffic
+          while trying to validate.  The latter problem will be addressed
+          in future BIND 9 releases.  In the meantime, to avoid these
+          problems, exercise caution when configuring "trusted-keys":
+          make sure all keys are correct and current when you add them,
+          and update your configuration in a timely manner when keys
+          roll over.
+
+BIND 9.6.1
+
+	BIND 9.6.1 is a maintenance release, fixing bugs in 9.6.0.
+
 BIND 9.6.0
 
         BIND 9.6.0 includes a number of changes from BIND 9.5 and earlier

Modified: user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.8
==============================================================================
--- user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.8	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.8	Thu Mar  4 06:43:41 2010	(r204695)
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2002 Internet Software Consortium.
 .\" 
-.\" Permission to use, copy, modify, and distribute this software for any
+.\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\" 
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkconf.8,v 1.30 2007/06/20 02:27:32 marka Exp $
+.\" $Id: named-checkconf.8,v 1.30.334.1 2009/07/11 01:55:20 tbox Exp $
 .\"
 .hy 0
 .ad l

Modified: user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.html
==============================================================================
--- user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.html	Thu Mar  4 06:39:58 2010	(r204694)
+++ user/imp/tbemd/contrib/bind9/bin/check/named-checkconf.html	Thu Mar  4 06:43:41 2010	(r204695)
@@ -2,7 +2,7 @@
  - Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002 Internet Software Consortium.
  - 
- - Permission to use, copy, modify, and distribute this software for any
+ - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
  - copyright notice and this permission notice appear in all copies.
  - 
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

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

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 06:55:10 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD0F51065672;
	Thu,  4 Mar 2010 06:55:10 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACDDD8FC15;
	Thu,  4 Mar 2010 06:55:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o246tArR097646;
	Thu, 4 Mar 2010 06:55:10 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o246tAUI097643;
	Thu, 4 Mar 2010 06:55:10 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003040655.o246tAUI097643@svn.freebsd.org>
From: Edwin Groothuis 
Date: Thu, 4 Mar 2010 06:55:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204696 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 06:55:10 -0000

Author: edwin
Date: Thu Mar  4 06:55:10 2010
New Revision: 204696
URL: http://svn.freebsd.org/changeset/base/204696

Log:
  Remove my chanes to the Makefile, not needed anymore.
  Cleanup prototypes.

Modified:
  user/edwin/ncal/Makefile
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/Makefile
==============================================================================
--- user/edwin/ncal/Makefile	Thu Mar  4 06:43:41 2010	(r204695)
+++ user/edwin/ncal/Makefile	Thu Mar  4 06:55:10 2010	(r204696)
@@ -4,10 +4,9 @@ PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
-CFLAGS+= -Wall -O0
 WARNS?=	6
 
-#LINKS=	${BINDIR}/ncal ${BINDIR}/cal
+LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1
 
 .include 

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Thu Mar  4 06:43:41 2010	(r204695)
+++ user/edwin/ncal/ncal.c	Thu Mar  4 06:55:10 2010	(r204696)
@@ -168,16 +168,16 @@ int	today;
 char	*center(char *s, char *t, int w);
 wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
 void	mkmonthr(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkweekdays(struct weekdays * wds);
-int     parsemonth(const char *s, int *m, int *y);
-void    printcc(void);
-void    printeaster(int year, int julian, int orthodox);
+void	mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
+void	mkweekdays(struct weekdays * wds);
+int	parsemonth(const char *s, int *m, int *y);
+void	printcc(void);
+void	printeaster(int year, int julian, int orthodox);
 int	firstday(int y, int m);
 date	*sdater(int ndays, struct date * d);
 date	*sdateb(int ndays, struct date * d);
-int     sndaysr(struct date * d);
-int     sndaysb(struct date * d);
+int	sndaysr(struct date * d);
+int	sndaysb(struct date * d);
 static void	usage(void);
 void	monthranger(int year, int jd_flag, int m, int before, int after);
 void	monthrangeb(int year, int jd_flag, int m, int before, int after);

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 07:07:23 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 734CA1065673;
	Thu,  4 Mar 2010 07:07:23 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 497418FC1A;
	Thu,  4 Mar 2010 07:07:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2477MUK000663;
	Thu, 4 Mar 2010 07:07:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2477MIk000661;
	Thu, 4 Mar 2010 07:07:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003040707.o2477MIk000661@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 07:07:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204698 - user/imp/tbemd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 07:07:23 -0000

Author: imp
Date: Thu Mar  4 07:07:22 2010
New Revision: 204698
URL: http://svn.freebsd.org/changeset/base/204698

Log:
  don't want rescue yet: binutils is busted still for it.

Modified:
  user/imp/tbemd/Makefile.inc1

Modified: user/imp/tbemd/Makefile.inc1
==============================================================================
--- user/imp/tbemd/Makefile.inc1	Thu Mar  4 07:04:27 2010	(r204697)
+++ user/imp/tbemd/Makefile.inc1	Thu Mar  4 07:07:22 2010	(r204698)
@@ -31,7 +31,7 @@
 .include 
 
 .if ${MACHINE_CPUARCH} == "mips"
-#MK_RESCUE=no	# not yet
+MK_RESCUE=no	# not yet
 .endif
 
 # We must do share/info early so that installation of info `dir'

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 16:54:16 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 727B7106567C;
	Thu,  4 Mar 2010 16:54:16 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4992C8FC18;
	Thu,  4 Mar 2010 16:54:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24GsGJn032042;
	Thu, 4 Mar 2010 16:54:16 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24GsGeR032041;
	Thu, 4 Mar 2010 16:54:16 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201003041654.o24GsGeR032041@svn.freebsd.org>
From: Hiroki Sato 
Date: Thu, 4 Mar 2010 16:54:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204715 - user/hrs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 16:54:16 -0000

Author: hrs
Date: Thu Mar  4 16:54:16 2010
New Revision: 204715
URL: http://svn.freebsd.org/changeset/base/204715

Log:
  Add my directory.

Added:
  user/hrs/

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 17:58:51 2010
Return-Path: 
Delivered-To: svn-src-user@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D5551065672;
	Thu,  4 Mar 2010 17:58:51 +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 1E2948FC1E;
	Thu,  4 Mar 2010 17:58:51 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o24Hm8bB003383;
	Thu, 4 Mar 2010 10:48:08 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Thu, 04 Mar 2010 10:48:25 -0700 (MST)
Message-Id: <20100304.104825.338122493920759591.imp@bsdimp.com>
To: jmallett@FreeBSD.org
From: "M. Warner Losh" 
In-Reply-To: <201003032327.o23NRUx9097773@svn.freebsd.org>
References: <201003032327.o23NRUx9097773@svn.freebsd.org>
X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org
Subject: Re: svn commit: r204678 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 17:58:51 -0000

In message: <201003032327.o23NRUx9097773@svn.freebsd.org>
            Juli Mallett  writes:
: Author: jmallett
: Date: Wed Mar  3 23:27:30 2010
: New Revision: 204678
: URL: http://svn.freebsd.org/changeset/base/204678
: 
: Log:
:   Fix return from setjmp.
: 
: Modified:
:   user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
: 
: Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
: ==============================================================================
: --- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 23:11:14 2010	(r204677)
: +++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Wed Mar  3 23:27:30 2010	(r204678)
: @@ -101,6 +101,7 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
:  	REG_EPILOGUE
:  
:  	move	v0, zero
: +	jr	ra

wouldn't it be more efficient to swap these two lines?

Warner

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 19:56:08 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE82D1065675;
	Thu,  4 Mar 2010 19:56:08 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A00CC8FC1A;
	Thu,  4 Mar 2010 19:56:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24Ju8Oa072705;
	Thu, 4 Mar 2010 19:56:08 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24Ju8am072701;
	Thu, 4 Mar 2010 19:56:08 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003041956.o24Ju8am072701@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 19:56:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204726 - user/imp/tbemd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 19:56:09 -0000

Author: imp
Date: Thu Mar  4 19:56:08 2010
New Revision: 204726
URL: http://svn.freebsd.org/changeset/base/204726

Log:
  Rather than having an ifdef for mips in the top level makefile, create
  a generic mechanism for us to tweak the build.
  
  # I'm debating having a bsd.own.$ARCH.mk for really global level things on
  # a per architecture basis, but that may be overkill.

Added:
  user/imp/tbemd/Makefile.mips
Modified:
  user/imp/tbemd/Makefile.inc1

Modified: user/imp/tbemd/Makefile.inc1
==============================================================================
--- user/imp/tbemd/Makefile.inc1	Thu Mar  4 19:38:24 2010	(r204725)
+++ user/imp/tbemd/Makefile.inc1	Thu Mar  4 19:56:08 2010	(r204726)
@@ -29,10 +29,7 @@
 #		obj depend all install clean cleandepend cleanobj
 
 .include 
-
-.if ${MACHINE_CPUARCH} == "mips"
-MK_RESCUE=no	# not yet
-.endif
+.include 
 
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to

Added: user/imp/tbemd/Makefile.mips
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/Makefile.mips	Thu Mar  4 19:56:08 2010	(r204726)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+MK_RESCUE=no

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 19:57:02 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A77FA10656F1;
	Thu,  4 Mar 2010 19:57:02 +0000 (UTC)
	(envelope-from juli@clockworksquid.com)
Received: from mail-bw0-f228.google.com (mail-bw0-f228.google.com
	[209.85.218.228])
	by mx1.freebsd.org (Postfix) with ESMTP id 16A808FC1D;
	Thu,  4 Mar 2010 19:57:01 +0000 (UTC)
Received: by bwz28 with SMTP id 28so421704bwz.14
	for ; Thu, 04 Mar 2010 11:56:56 -0800 (PST)
MIME-Version: 1.0
Sender: juli@clockworksquid.com
Received: by 10.102.129.7 with SMTP id b7mr318792mud.11.1267732616182; Thu, 04 
	Mar 2010 11:56:56 -0800 (PST)
In-Reply-To: <20100304.104825.338122493920759591.imp@bsdimp.com>
References: <201003032327.o23NRUx9097773@svn.freebsd.org>
	<20100304.104825.338122493920759591.imp@bsdimp.com>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 11:56:36 -0800
X-Google-Sender-Auth: f249caa371d59b8a
Message-ID: 
To: "M. Warner Losh" 
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r204678 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 19:57:02 -0000

On Thu, Mar 4, 2010 at 09:48, M. Warner Losh  wrote:
> : @@ -101,6 +101,7 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
> : =A0 =A0 =A0 REG_EPILOGUE
> :
> : =A0 =A0 =A0 move =A0 =A0v0, zero
> : + =A0 =A0 jr =A0 =A0 =A0ra
>
> wouldn't it be more efficient to swap these two lines?

Not in a function that's not '.set noreorder' :P

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 20:41:11 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D66981065675;
	Thu,  4 Mar 2010 20:41:11 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C16F08FC18;
	Thu,  4 Mar 2010 20:41:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24KfBTi083061;
	Thu, 4 Mar 2010 20:41:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24KfBKK083037;
	Thu, 4 Mar 2010 20:41:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003042041.o24KfBKK083037@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 20:41:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204732 - in user/imp/tbemd: bin/ed sbin/ipfw
	share/man/man4 sys/netinet/ipfw sys/powerpc/aim
	usr.bin/chpass usr.bin/ncal usr.sbin usr.sbin/mount_nwfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 20:41:11 -0000

Author: imp
Date: Thu Mar  4 20:41:11 2010
New Revision: 204732
URL: http://svn.freebsd.org/changeset/base/204732

Log:
  Merge through 204723 plus changes to usr.sbin to move to the Makefile.arch setup

Added:
  user/imp/tbemd/usr.sbin/Makefile.amd64
  user/imp/tbemd/usr.sbin/Makefile.arm
  user/imp/tbemd/usr.sbin/Makefile.i386
  user/imp/tbemd/usr.sbin/Makefile.ia64
  user/imp/tbemd/usr.sbin/Makefile.mips
  user/imp/tbemd/usr.sbin/Makefile.powerpc
  user/imp/tbemd/usr.sbin/Makefile.sparc64
Modified:
  user/imp/tbemd/bin/ed/Makefile
  user/imp/tbemd/bin/ed/main.c
  user/imp/tbemd/sbin/ipfw/dummynet.c
  user/imp/tbemd/sbin/ipfw/ipfw2.c
  user/imp/tbemd/sbin/ipfw/main.c
  user/imp/tbemd/share/man/man4/ada.4
  user/imp/tbemd/share/man/man4/ahci.4
  user/imp/tbemd/share/man/man4/cd.4
  user/imp/tbemd/share/man/man4/ch.4
  user/imp/tbemd/share/man/man4/da.4
  user/imp/tbemd/share/man/man4/pass.4
  user/imp/tbemd/share/man/man4/pt.4
  user/imp/tbemd/share/man/man4/sa.4
  user/imp/tbemd/share/man/man4/scsi.4
  user/imp/tbemd/share/man/man4/siis.4
  user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c
  user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c
  user/imp/tbemd/usr.bin/chpass/Makefile
  user/imp/tbemd/usr.bin/ncal/Makefile
  user/imp/tbemd/usr.bin/ncal/ncal.1
  user/imp/tbemd/usr.bin/ncal/ncal.c
  user/imp/tbemd/usr.sbin/Makefile
  user/imp/tbemd/usr.sbin/mount_nwfs/Makefile
  user/imp/tbemd/usr.sbin/mount_nwfs/mount_nwfs.c
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/contrib/tzdata/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)

Modified: user/imp/tbemd/bin/ed/Makefile
==============================================================================
--- user/imp/tbemd/bin/ed/Makefile	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/bin/ed/Makefile	Thu Mar  4 20:41:11 2010	(r204732)
@@ -4,7 +4,6 @@
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
-WARNS?=	2
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 

Modified: user/imp/tbemd/bin/ed/main.c
==============================================================================
--- user/imp/tbemd/bin/ed/main.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/bin/ed/main.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -103,15 +103,10 @@ const char usage[] = "usage: %s [-] [-sx
 
 /* ed: line editor */
 int
-main(int argc, char *argv[])
+main(volatile int argc, char ** volatile argv)
 {
 	int c, n;
 	long status = 0;
-#if __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &argc;
-	(void) &argv;
-#endif
 
 	(void)setlocale(LC_ALL, "");
 

Modified: user/imp/tbemd/sbin/ipfw/dummynet.c
==============================================================================
--- user/imp/tbemd/sbin/ipfw/dummynet.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sbin/ipfw/dummynet.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -10,8 +10,6 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * NEW command line interface for IP firewall facility
- *
  * $FreeBSD$
  *
  * dummynet support
@@ -1243,8 +1241,8 @@ dummynet_flush(void)
 void
 dummynet_list(int ac, char *av[], int show_counters)
 {
-	struct dn_id oid, *x;
-	int ret, l = sizeof(oid);
+	struct dn_id oid, *x = NULL;
+	int ret, i, l = sizeof(oid);
 
 	oid_fill(&oid, l, DN_CMD_GET, DN_API_VERSION);
 	switch (co.do_pipe) {
@@ -1258,14 +1256,29 @@ dummynet_list(int ac, char *av[], int sh
 		oid.subtype = DN_SCH;	/* list sched */
 		break;
 	}
+
+	/* Request the buffer size (in oid.id)*/
 	ret = do_cmd(-IP_DUMMYNET3, &oid, (uintptr_t)&l);
 	// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
 	if (ret != 0 || oid.id <= sizeof(oid))
 		return;
-	l = oid.id;
-	x = safe_calloc(1, l);
+
+	/* Try max 10 times
+	 * Buffer is correct if l != 0.
+	 * If l == 0 no buffer is sent, maybe because kernel requires 
+	 * a greater buffer, so try with the new size in x->id.
+	 */
+	for (i = 0, l = oid.id; i < 10; i++, l = x->id) {
+		x = safe_realloc(x, l);
 	*x = oid;
 	ret = do_cmd(-IP_DUMMYNET3, x, (uintptr_t)&l);
+
+		if (ret != 0 || x->id <= sizeof(oid))
+			return;
+
+		if (l != 0)
+			break; /* ok */
+	}
 	// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
 	// XXX filter on ac, av
 	list_pipes(x, O_NEXT(x, l));

Modified: user/imp/tbemd/sbin/ipfw/ipfw2.c
==============================================================================
--- user/imp/tbemd/sbin/ipfw/ipfw2.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sbin/ipfw/ipfw2.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -1625,13 +1625,21 @@ ipfw_sets_handler(char *av[])
 	if (av[0] == NULL)
 		errx(EX_USAGE, "set needs command");
 	if (_substrcmp(*av, "show") == 0) {
-		void *data;
+		void *data = NULL;
 		char const *msg;
+		int nalloc;
 
-		nbytes = sizeof(struct ip_fw);
+		nalloc = nbytes = sizeof(struct ip_fw);
+		while (nbytes >= nalloc) {
+			if (data)
+				free(data);
+			nalloc = nalloc * 2 + 200;
+			nbytes = nalloc;
 		data = safe_calloc(1, nbytes);
 		if (do_cmd(IP_FW_GET, data, (uintptr_t)&nbytes) < 0)
 			err(EX_OSERR, "getsockopt(IP_FW_GET)");
+		}
+
 		bcopy(&((struct ip_fw *)data)->next_rule,
 			&set_disable, sizeof(set_disable));
 
@@ -1661,7 +1669,7 @@ ipfw_sets_handler(char *av[])
 		i = do_cmd(IP_FW_DEL, masks, sizeof(uint32_t));
 	} else if (_substrcmp(*av, "move") == 0) {
 		av++;
-		if (!av[0] && _substrcmp(*av, "rule") == 0) {
+		if (av[0] && _substrcmp(*av, "rule") == 0) {
 			cmd = 2;
 			av++;
 		} else
@@ -1685,7 +1693,7 @@ ipfw_sets_handler(char *av[])
 		av++;
 		masks[0] = masks[1] = 0;
 
-		while (!av[0]) {
+		while (av[0]) {
 			if (isdigit(**av)) {
 				i = atoi(*av);
 				if (i < 0 || i > RESVD_SET)

Modified: user/imp/tbemd/sbin/ipfw/main.c
==============================================================================
--- user/imp/tbemd/sbin/ipfw/main.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sbin/ipfw/main.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -583,6 +583,20 @@ ipfw_readfile(int ac, char *av[])
 int
 main(int ac, char *av[])
 {
+#if defined(_WIN32) && defined(TCC)
+	{
+		WSADATA wsaData;
+		int ret=0;
+		unsigned short wVersionRequested = MAKEWORD(2, 2);
+		ret = WSAStartup(wVersionRequested, &wsaData);
+		if (ret != 0) {
+			/* Tell the user that we could not find a usable */
+			/* Winsock DLL.                                  */
+			printf("WSAStartup failed with error: %d\n", ret);
+			return 1;
+		}
+	}
+#endif
 	/*
 	 * If the last argument is an absolute pathname, interpret it
 	 * as a file to be preprocessed.

Modified: user/imp/tbemd/share/man/man4/ada.4
==============================================================================
--- user/imp/tbemd/share/man/man4/ada.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/ada.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -127,6 +127,7 @@ ATA device nodes
 .Sh SEE ALSO
 .Xr ad 4 ,
 .Xr ahci 4 ,
+.Xr cam 4 ,
 .Xr da 4 ,
 .Xr siis 4
 .Sh HISTORY

Modified: user/imp/tbemd/share/man/man4/ahci.4
==============================================================================
--- user/imp/tbemd/share/man/man4/ahci.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/ahci.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -139,10 +139,10 @@ such as JMicron JMB36x and Marvell 88SX6
 .Sh SEE ALSO
 .Xr ada 4 ,
 .Xr ata 4 ,
+.Xr cam 4 ,
 .Xr cd 4 ,
 .Xr da 4 ,
-.Xr sa 4 ,
-.Xr scsi 4
+.Xr sa 4
 .Sh HISTORY
 The
 .Nm

Modified: user/imp/tbemd/share/man/man4/cd.4
==============================================================================
--- user/imp/tbemd/share/man/man4/cd.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/cd.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -496,8 +496,8 @@ devices
 .Sh DIAGNOSTICS
 None.
 .Sh SEE ALSO
+.Xr cam 4 ,
 .Xr da 4 ,
-.Xr scsi 4 ,
 .Xr disklabel 5 ,
 .Xr disklabel 8 ,
 .Xr cd 9

Modified: user/imp/tbemd/share/man/man4/ch.4
==============================================================================
--- user/imp/tbemd/share/man/man4/ch.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/ch.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -325,6 +325,7 @@ If the media changer does not support fe
 driver, it will produce both console error messages and failure return
 codes to the ioctls described here.
 .Sh SEE ALSO
+.Xr cam 4 ,
 .Xr chio 1 ,
 .Xr cd 4 ,
 .Xr da 4 ,

Modified: user/imp/tbemd/share/man/man4/da.4
==============================================================================
--- user/imp/tbemd/share/man/man4/da.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/da.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -196,6 +196,7 @@ SCSI disk device nodes
 None.
 .Sh SEE ALSO
 .Xr ad 4 ,
+.Xr cam 4 ,
 .Xr geom 4 ,
 .Xr bsdlabel 8 ,
 .Xr fdisk 8

Modified: user/imp/tbemd/share/man/man4/pass.4
==============================================================================
--- user/imp/tbemd/share/man/man4/pass.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/pass.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -104,6 +104,7 @@ CAM subsystem.
 None.
 .Sh SEE ALSO
 .Xr cam 3 ,
+.Xr cam 4 ,
 .Xr cam_cdbparse 3 ,
 .Xr xpt 4 ,
 .Xr camcontrol 8

Modified: user/imp/tbemd/share/man/man4/pt.4
==============================================================================
--- user/imp/tbemd/share/man/man4/pt.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/pt.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -84,7 +84,7 @@ the
 .Ar N Ns th processor device.
 .El
 .Sh SEE ALSO
-.Xr scsi 4
+.Xr cam 4
 .Sh HISTORY
 The
 .Nm

Modified: user/imp/tbemd/share/man/man4/sa.4
==============================================================================
--- user/imp/tbemd/share/man/man4/sa.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/sa.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -200,8 +200,8 @@ accessing the device, e.g.).
 .Sh DIAGNOSTICS
 None.
 .Sh SEE ALSO
-.Xr mt 1 ,
-.Xr scsi 4
+.Xr cam 4 ,
+.Xr mt 1
 .Sh AUTHORS
 .An -nosplit
 The

Modified: user/imp/tbemd/share/man/man4/scsi.4
==============================================================================
--- user/imp/tbemd/share/man/man4/scsi.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/scsi.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -24,15 +24,15 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd October 15, 1998
-.Dt SCSI 4
+.Dd March 4, 2010
+.Dt CAM 4
 .Os
 .Sh NAME
-.Nm SCSI ,
 .Nm CAM
-.Nd CAM SCSI subsystem
+.Nd Common Access Method SCSI/ATA subsystem
 .Sh SYNOPSIS
 .Cd "device scbus"
+.Cd "device ada"
 .Cd "device cd"
 .Cd "device ch"
 .Cd "device da"
@@ -49,31 +49,32 @@
 .Cd "options SCSI_NO_OP_STRINGS"
 .Cd "options SCSI_DELAY=8000"
 .Sh DESCRIPTION
-The CAM
-.Tn SCSI
+The
+.Nm
 subsystem provides a uniform and modular system for the implementation
 of drivers to control various
 .Tn SCSI
+and
+.Tn ATA
 devices, and to utilize different
 .Tn SCSI
+and
+.Tn ATA
 host adapters through host adapter drivers.
-When the system probes the
-.Tn SCSI
-busses, it attaches any devices it finds to the appropriate
-drivers.
+When the system probes busses, it attaches any devices it finds to the
+appropriate drivers.
 The
 .Xr pass 4
-driver, if it is configured in the kernel, will attach to all
-.Tn SCSI
-devices.
+driver, if it is configured in the kernel, will attach to all devices.
 .Sh KERNEL CONFIGURATION
 There are a number of generic kernel configuration options for the
-CAM
-.Tn SCSI
+.Nm
 subsystem:
 .Bl -tag -width SCSI_NO_SENSE_STRINGS
 .It Dv CAMDEBUG
-This option enables the CAM debugging printf code.
+This option enables the
+.Nm
+debugging printf code.
 This will not actually
 cause any debugging information to be printed out when included by itself.
 Enabling printouts requires additional configuration.
@@ -82,12 +83,11 @@ See below for details.
 This sets the maximum allowable number of concurrent "high power" commands.
 A "high power" command is a command that takes more electrical power than
 most to complete.
-An example of this (and the only command currently
-tagged as "high power") is the
+An example of this is the
 .Tn SCSI
 START UNIT command.
-Starting a SCSI disk often takes significantly more
-electrical power than normal operation of the disk.
+Starting a disk often takes significantly more electrical power than normal
+operation.
 This option allows the
 user to specify how many concurrent high power commands may be outstanding
 without overloading the power supply on his computer.
@@ -120,7 +120,9 @@ problems.
 This is the
 .Tn SCSI
 "bus settle delay."
-In CAM, it is specified in
+In
+.Nm ,
+it is specified in
 .Em milliseconds ,
 not seconds like the old
 .Tn SCSI
@@ -148,7 +150,7 @@ In that case, the
 will be reset to 100ms.
 .El
 .Pp
-All devices and the SCSI busses support boot time allocation so that
+All devices and busses support dynamic allocation so that
 an upper number of devices and controllers does not need to be configured;
 .Cd "device da"
 will suffice for any number of disk drivers.
@@ -204,7 +206,9 @@ hint.da.0.unit="0"
 This assigns
 .Em da0
 to target 0, unit (lun) 0 of scbus 0.
-Omitting the target or unit hints will instruct CAM to treat them as wildcards
+Omitting the target or unit hints will instruct
+.Nm
+to treat them as wildcards
 and use the first respective counted instances.
 These examples can be combined together to allow a peripheral device to be
 wired to any particular controller, bus, target, and/or unit instance.
@@ -221,7 +225,9 @@ The system allows common device drivers 
 types of adapters.
 The adapters take requests from the upper layers and do
 all IO between the
-.Em SCSI
+.Tn SCSI
+or
+.Tn ATA
 bus and the system.
 The maximum size of a transfer is governed by the
 adapter.
@@ -233,7 +239,8 @@ Some adapters support
 in which the system is capable of operating as a device, responding to
 operations initiated by another system.
 Target mode is supported for
-some adapters, but is not yet complete for this version of the CAM
+some adapters, but is not yet complete for this version of the
+.Nm
 .Tn SCSI
 subsystem.
 .Sh FILES
@@ -278,7 +285,9 @@ Users can enable debugging from their ke
 the following kernel config options:
 .Bl -tag -width CAM_DEBUG_TARGET
 .It Dv CAMDEBUG
-This enables CAM debugging.
+This enables
+.Nm
+debugging.
 Without this option, users will not even be able
 to turn on debugging from userland via
 .Xr camcontrol 8 .
@@ -313,9 +322,12 @@ See
 .Xr camcontrol 8
 for details.
 .Sh SEE ALSO
+.Xr ada 4 ,
 .Xr aha 4 ,
 .Xr ahb 4 ,
 .Xr ahc 4 ,
+.Xr ahci 4 ,
+.Xr ata 4 ,
 .Xr bt 4 ,
 .Xr cd 4 ,
 .Xr ch 4 ,
@@ -326,15 +338,26 @@ for details.
 .Xr xpt 4 ,
 .Xr camcontrol 8
 .Sh HISTORY
-The CAM
+The
+.Nm
 .Tn SCSI
 subsystem first appeared in
 .Fx 3.0 .
+The
+.Nm
+ATA support was added in
+.Fx 8.0 .
 .Sh AUTHORS
 .An -nosplit
-The CAM
+The
+.Nm
 .Tn SCSI
 subsystem was written by
 .An Justin Gibbs
 and
 .An Kenneth Merry .
+The
+.Nm
+.Tn ATA
+support was added by
+.An Alexander Motin Aq mav@FreeBSD.org .

Modified: user/imp/tbemd/share/man/man4/siis.4
==============================================================================
--- user/imp/tbemd/share/man/man4/siis.4	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/share/man/man4/siis.4	Thu Mar  4 20:41:11 2010	(r204732)
@@ -113,10 +113,10 @@ SiI3531
 .Sh SEE ALSO
 .Xr ada 4 ,
 .Xr ata 4 ,
+.Xr cam 4 ,
 .Xr cd 4 ,
 .Xr da 4 ,
-.Xr sa 4 ,
-.Xr scsi 4
+.Xr sa 4
 .Sh HISTORY
 The
 .Nm

Modified: user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -1690,8 +1690,8 @@ compute_space(struct dn_id *cmd, int *to
 	 *                             link, scheduler template, flowset
 	 *                             integrated in scheduler and header
 	 *                             for flowset list
-	 *   (NSI)*(dn_flow + dn_queue) all scheduler instance + one
-	 *                              queue per instance
+	 *   (NSI)*(dn_flow) all scheduler instance (includes
+	 *                              the queue instance)
 	 * - ipfw sched show
 	 *   (NP/2)*(dn_link + dn_sch + dn_id + dn_fs) only half scheduler
 	 *                             link, scheduler template, flowset
@@ -1708,11 +1708,13 @@ compute_space(struct dn_id *cmd, int *to
 	default:
 		return -1;
 	/* XXX where do LINK and SCH differ ? */
+	/* 'ipfw sched show' could list all queues associated to
+	 * a scheduler. This feature for now is disabled
+	 */
 	case DN_LINK:	/* pipe show */
 		x = DN_C_LINK | DN_C_SCH | DN_C_FLOW;
 		need += dn_cfg.schk_count *
 			(sizeof(struct dn_fs) + profile_size) / 2;
-		need += dn_cfg.si_count * sizeof(struct dn_queue);
 		need += dn_cfg.fsk_count * sizeof(uint32_t);
 		break;
 	case DN_SCH:	/* sched show */
@@ -2072,11 +2074,12 @@ ip_dn_init(void)
 static void
 ip_dn_destroy(void)
 {
+	callout_drain(&dn_timeout);
+
 	DN_BH_WLOCK();
 	ip_dn_ctl_ptr = NULL;
 	ip_dn_io_ptr = NULL;
 
-	callout_stop(&dn_timeout);
 	dummynet_flush();
 	DN_BH_WUNLOCK();
 	taskqueue_drain(dn_tq, &dn_task);

Modified: user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c
==============================================================================
--- user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -1212,6 +1212,13 @@ convert_rule_to_7(struct ip_fw *rule)
 		ccmdlen = F_LEN(ccmd);
 
 		bcopy(ccmd, dst, F_LEN(ccmd)*sizeof(uint32_t));
+
+		if (dst->opcode > O_NAT)
+			/* O_REASS doesn't exists in 7.2 version, so
+			 * decrement opcode if it is after O_REASS
+			 */
+			dst->opcode--;
+
 		if (ccmdlen > ll) {
 			printf("ipfw: opcode %d size truncated\n",
 				ccmd->opcode);
@@ -1246,6 +1253,13 @@ convert_rule_to_8(struct ip_fw *rule)
 		ccmdlen = F_LEN(ccmd);
 		
 		bcopy(ccmd, dst, F_LEN(ccmd)*sizeof(uint32_t));
+
+		if (dst->opcode > O_NAT)
+			/* O_REASS doesn't exists in 7.2 version, so
+			 * increment opcode if it is after O_REASS
+			 */
+			dst->opcode++;
+
 		if (ccmdlen > ll) {
 			printf("ipfw: opcode %d size truncated\n",
 			    ccmd->opcode);

Modified: user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -327,7 +327,6 @@ SYSCTL_INT(_machdep, OID_AUTO, moea64_pv
     &moea64_pvo_remove_calls, 0, "");
 
 vm_offset_t	moea64_scratchpage_va[2];
-struct	pvo_entry *moea64_scratchpage_pvo[2];
 struct	lpte 	*moea64_scratchpage_pte[2];
 struct	mtx	moea64_scratchpage_mtx;
 
@@ -965,22 +964,36 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o
 	PMAP_UNLOCK(kernel_pmap);
 
 	/*
-	 * Allocate some things for page zeroing
+	 * Allocate some things for page zeroing. We put this directly
+	 * in the page table, marked with LPTE_LOCKED, to avoid any
+	 * of the PVO book-keeping or other parts of the VM system
+	 * from even knowing that this hack exists.
 	 */
 
 	mtx_init(&moea64_scratchpage_mtx, "pvo zero page", NULL, MTX_DEF);
 	for (i = 0; i < 2; i++) {
+		struct lpte pt;
+		uint64_t vsid;
+		int pteidx, ptegidx;
+
 		moea64_scratchpage_va[i] = (virtual_end+1) - PAGE_SIZE;
 		virtual_end -= PAGE_SIZE;
 
-		moea64_kenter(mmup,moea64_scratchpage_va[i],0);
-
 		LOCK_TABLE();
-		moea64_scratchpage_pvo[i] = moea64_pvo_find_va(kernel_pmap,
-		    moea64_scratchpage_va[i],&j);
-		moea64_scratchpage_pte[i] = moea64_pvo_to_pte(
-		    moea64_scratchpage_pvo[i],j);
-		moea64_scratchpage_pte[i]->pte_hi |= LPTE_LOCKED;
+		
+		vsid = va_to_vsid(kernel_pmap, moea64_scratchpage_va[i]);
+		moea64_pte_create(&pt, vsid, moea64_scratchpage_va[i],
+		    LPTE_NOEXEC);
+		pt.pte_hi |= LPTE_LOCKED;
+
+		ptegidx = va_to_pteg(vsid, moea64_scratchpage_va[i]);
+		pteidx = moea64_pte_insert(ptegidx, &pt);
+		if (pt.pte_hi & LPTE_HID)
+			ptegidx ^= moea64_pteg_mask;
+
+		moea64_scratchpage_pte[i] =
+		    &moea64_pteg_table[ptegidx].pt[pteidx];
+
 		UNLOCK_TABLE();
 	}
 
@@ -1088,18 +1101,16 @@ moea64_change_wiring(mmu_t mmu, pmap_t p
 
 static __inline
 void moea64_set_scratchpage_pa(int which, vm_offset_t pa) {
-	mtx_assert(&moea64_scratchpage_mtx, MA_OWNED);
 
-	moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo &= 
-	    ~(LPTE_WIMG | LPTE_RPGN);
-	moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo |= 
-	    moea64_calc_wimg(pa) | (uint64_t)pa;
+	mtx_assert(&moea64_scratchpage_mtx, MA_OWNED);
 
 	moea64_scratchpage_pte[which]->pte_hi &= ~LPTE_VALID;
 	TLBIE(kernel_pmap, moea64_scratchpage_va[which]);
 	
-	moea64_scratchpage_pte[which]->pte_lo = 
-	    moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo;
+	moea64_scratchpage_pte[which]->pte_lo &= 
+	    ~(LPTE_WIMG | LPTE_RPGN);
+	moea64_scratchpage_pte[which]->pte_lo |=
+	    moea64_calc_wimg(pa) | (uint64_t)pa;
 	EIEIO();
 
 	moea64_scratchpage_pte[which]->pte_hi |= LPTE_VALID;
@@ -1496,11 +1507,11 @@ moea64_remove_write(mmu_t mmu, vm_page_t
 		return;
 	lo = moea64_attr_fetch(m);
 	SYNC();
+	LOCK_TABLE();
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) {
 		pmap = pvo->pvo_pmap;
 		PMAP_LOCK(pmap);
 		if ((pvo->pvo_pte.lpte.pte_lo & LPTE_PP) != LPTE_BR) {
-			LOCK_TABLE();
 			pt = moea64_pvo_to_pte(pvo, -1);
 			pvo->pvo_pte.lpte.pte_lo &= ~LPTE_PP;
 			pvo->pvo_pte.lpte.pte_lo |= LPTE_BR;
@@ -1511,10 +1522,10 @@ moea64_remove_write(mmu_t mmu, vm_page_t
 				moea64_pte_change(pt, &pvo->pvo_pte.lpte,
 				    pvo->pvo_pmap, PVO_VADDR(pvo));
 			}
-			UNLOCK_TABLE();
 		}
 		PMAP_UNLOCK(pmap);
 	}
+	UNLOCK_TABLE();
 	if ((lo & LPTE_CHG) != 0) {
 		moea64_attr_clear(m, LPTE_CHG);
 		vm_page_dirty(m);
@@ -1651,12 +1662,16 @@ moea64_page_exists_quick(mmu_t mmu, pmap
                 return FALSE;
 
 	loops = 0;
+	LOCK_TABLE();
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) {
-		if (pvo->pvo_pmap == pmap)
+		if (pvo->pvo_pmap == pmap) {
+			UNLOCK_TABLE();
 			return (TRUE);
+		}
 		if (++loops >= 16)
 			break;
 	}
+	UNLOCK_TABLE();
 
 	return (FALSE);
 }
@@ -1675,9 +1690,11 @@ moea64_page_wired_mappings(mmu_t mmu, vm
 	if (!moea64_initialized || (m->flags & PG_FICTITIOUS) != 0)
 		return (count);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	LOCK_TABLE();
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink)
 		if ((pvo->pvo_vaddr & PVO_WIRED) != 0)
 			count++;
+	UNLOCK_TABLE();
 	return (count);
 }
 
@@ -1896,6 +1913,7 @@ moea64_remove_all(mmu_t mmu, vm_page_t m
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 
 	pvo_head = vm_page_to_pvoh(m);
+	LOCK_TABLE();
 	for (pvo = LIST_FIRST(pvo_head); pvo != NULL; pvo = next_pvo) {
 		next_pvo = LIST_NEXT(pvo, pvo_vlink);
 
@@ -1905,6 +1923,7 @@ moea64_remove_all(mmu_t mmu, vm_page_t m
 		moea64_pvo_remove(pvo, -1);
 		PMAP_UNLOCK(pmap);
 	}
+	UNLOCK_TABLE();
 	if ((m->flags & PG_WRITEABLE) && moea64_is_modified(mmu, m)) {
 		moea64_attr_clear(m, LPTE_CHG);
 		vm_page_dirty(m);
@@ -2046,7 +2065,7 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t z
 		bootstrap = 1;
 	} else {
 		/*
-		 * Note: drop the table around the UMA allocation in
+		 * Note: drop the table lock around the UMA allocation in
 		 * case the UMA allocator needs to manipulate the page
 		 * table. The mapping we are working with is already
 		 * protected by the PMAP lock.
@@ -2130,7 +2149,6 @@ moea64_pvo_remove(struct pvo_entry *pvo,
 	} else {
 		moea64_pte_overflow--;
 	}
-	UNLOCK_TABLE();
 
 	/*
 	 * Update our statistics.
@@ -2162,9 +2180,12 @@ moea64_pvo_remove(struct pvo_entry *pvo,
 	 * if we aren't going to reuse it.
 	 */
 	LIST_REMOVE(pvo, pvo_olink);
+	UNLOCK_TABLE();
+
 	if (!(pvo->pvo_vaddr & PVO_BOOTSTRAP))
 		uma_zfree((pvo->pvo_vaddr & PVO_MANAGED) ? moea64_mpvo_zone :
 		    moea64_upvo_zone, pvo);
+
 	moea64_pvo_entries--;
 	moea64_pvo_remove_calls++;
 }
@@ -2313,6 +2334,7 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 	if (moea64_attr_fetch(m) & ptebit)
 		return (TRUE);
 
+	LOCK_TABLE();
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) {
 		MOEA_PVO_CHECK(pvo);	/* sanity check */
 
@@ -2322,6 +2344,7 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 		 */
 		if (pvo->pvo_pte.lpte.pte_lo & ptebit) {
 			moea64_attr_save(m, ptebit);
+			UNLOCK_TABLE();
 			MOEA_PVO_CHECK(pvo);	/* sanity check */
 			return (TRUE);
 		}
@@ -2341,7 +2364,6 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 		 * REF/CHG bits from the valid PTE.  If the appropriate
 		 * ptebit is set, cache it and return success.
 		 */
-		LOCK_TABLE();
 		pt = moea64_pvo_to_pte(pvo, -1);
 		if (pt != NULL) {
 			moea64_pte_synch(pt, &pvo->pvo_pte.lpte);
@@ -2353,8 +2375,8 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 				return (TRUE);
 			}
 		}
-		UNLOCK_TABLE();
 	}
+	UNLOCK_TABLE();
 
 	return (FALSE);
 }
@@ -2387,10 +2409,10 @@ moea64_clear_bit(vm_page_t m, u_int64_t 
 	 * valid pte clear the ptebit from the valid pte.
 	 */
 	count = 0;
+	LOCK_TABLE();
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) {
 		MOEA_PVO_CHECK(pvo);	/* sanity check */
 
-		LOCK_TABLE();
 		pt = moea64_pvo_to_pte(pvo, -1);
 		if (pt != NULL) {
 			moea64_pte_synch(pt, &pvo->pvo_pte.lpte);
@@ -2399,11 +2421,11 @@ moea64_clear_bit(vm_page_t m, u_int64_t 
 				moea64_pte_clear(pt, pvo->pvo_pmap, PVO_VADDR(pvo), ptebit);
 			}
 		}
-		UNLOCK_TABLE();
 		rv |= pvo->pvo_pte.lpte.pte_lo;
 		pvo->pvo_pte.lpte.pte_lo &= ~ptebit;
 		MOEA_PVO_CHECK(pvo);	/* sanity check */
 	}
+	UNLOCK_TABLE();
 
 	if (origbit != NULL) {
 		*origbit = rv;

Modified: user/imp/tbemd/usr.bin/chpass/Makefile
==============================================================================
--- user/imp/tbemd/usr.bin/chpass/Makefile	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/usr.bin/chpass/Makefile	Thu Mar  4 20:41:11 2010	(r204732)
@@ -43,7 +43,7 @@ beforeinstall:
 
 .if !defined(NO_FSCHG)
 afterinstall:
-	chflags schg ${DESTDIR}${BINDIR}/chpass
+	-chflags schg ${DESTDIR}${BINDIR}/chpass
 .endif
 
 .include 

Modified: user/imp/tbemd/usr.bin/ncal/Makefile
==============================================================================
--- user/imp/tbemd/usr.bin/ncal/Makefile	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/usr.bin/ncal/Makefile	Thu Mar  4 20:41:11 2010	(r204732)
@@ -4,7 +4,6 @@ PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
-WARNS?=	1
 
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1

Modified: user/imp/tbemd/usr.bin/ncal/ncal.1
==============================================================================
--- user/imp/tbemd/usr.bin/ncal/ncal.1	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/usr.bin/ncal/ncal.1	Thu Mar  4 20:41:11 2010	(r204732)
@@ -109,6 +109,22 @@ Britain and her colonies switched to the
 Print the number of the week below each week column.
 .It Fl y
 Display a calendar for the specified year.
+.It Fl b
+Switch to backwards compatibility mode (for debugging).
+.It Fl d Ar yyyy-mm-dd
+Use
+.Ar yyyy-mm-dd
+as the current date (for debugging of highlighting).
+.It Fl 3
+Display the previous, current and next month surrounding today.
+.It Fl A Ar number
+Display the
+.Ar number
+of months after the current month.
+.It Fl B Ar number
+Display the
+.Ar number
+of months before the current month.
 .El
 .Pp
 A single parameter specifies the year (1\(en9999) to be displayed;
@@ -116,12 +132,13 @@ note the year must be fully specified:
 .Dq Li cal 89
 will
 .Em not
-display a calendar for 1989.
-Two parameters denote the month and year; the month is either a number between
-1 and 12, or a full or abbreviated name as specified by the current locale.
-Month and year default to those of the current system clock and time zone (so
+display a calendar for 1989.  Two parameters denote the month and
+year; the month is either a number between 1 and 12, or a full or
+abbreviated name as specified by the current locale.  Month and
+year default to those of the current system clock and time zone (so
 .Dq Li cal -m 8
-will display a calendar for the month of August in the current year).
+will display a calendar for the month of August in the current
+year).
 .Pp
 A year starts on January 1.
 .Sh SEE ALSO
@@ -142,5 +159,5 @@ The
 command and manual were written by
 .An Wolfgang Helbig Aq helbig@FreeBSD.org .
 .Sh BUGS
-The assignment of Julian\(enGregorian switching dates to
-country codes is historically naive for many countries.
+The assignment of Julian\(enGregorian switching dates to country
+codes is historically naive for many countries.

Modified: user/imp/tbemd/usr.bin/ncal/ncal.c
==============================================================================
--- user/imp/tbemd/usr.bin/ncal/ncal.c	Thu Mar  4 20:31:49 2010	(r204731)
+++ user/imp/tbemd/usr.bin/ncal/ncal.c	Thu Mar  4 20:41:11 2010	(r204732)
@@ -45,12 +45,12 @@ static const char rcsid[] =
 #include 
 #undef lines			/* term.h defines this */
 
-/* Width of one month with backward compatibility */
+/* Width of one month with backward compatibility and in regular mode*/
 #define MONTH_WIDTH_B_J 27
 #define MONTH_WIDTH_B 20
 
-#define MONTH_WIDTH_J 24
-#define MONTH_WIDTH 18
+#define MONTH_WIDTH_R_J 24
+#define MONTH_WIDTH_R 18
 
 #define MAX_WIDTH 64
 
@@ -60,6 +60,7 @@ struct monthlines {
 	wchar_t name[MAX_WIDTH + 1];
 	char lines[7][MAX_WIDTH + 1];
 	char weeks[MAX_WIDTH + 1];
+	unsigned int linelen[7];
 };
 
 struct weekdays {
@@ -164,25 +165,22 @@ int	nswitchb;		/* switch date for backwa
 const char	*term_so, *term_se;
 int	today;
 
-char   *center(char *s, char *t, int w);
+char	*center(char *s, char *t, int w);
 wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
-void	mkmonth(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkweekdays(struct weekdays * wds);
-int     parsemonth(const char *s, int *m, int *y);
-void    printcc(void);
-void    printeaster(int year, int julian, int orthodox);
-void    printmonth(int year, int month, int jd_flag);
-void    printmonthb(int year, int month, int jd_flag);
-void    printyear(int year, int jd_flag);
-void    printyearb(int year, int jd_flag);
+void	mkmonthr(int year, int month, int jd_flag, struct monthlines * monthl);
+void	mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
+void	mkweekdays(struct weekdays * wds);
+int	parsemonth(const char *s, int *m, int *y);
+void	printcc(void);
+void	printeaster(int year, int julian, int orthodox);
 int	firstday(int y, int m);
-date   *sdate(int ndays, struct date * d);
-date   *sdateb(int ndays, struct date * d);
-int     sndays(struct date * d);
-int     sndaysb(struct date * d);
-static void usage(void);
-int     weekdayb(int nd);
+date	*sdater(int ndays, struct date * d);
+date	*sdateb(int ndays, struct date * d);
+int	sndaysr(struct date * d);
+int	sndaysb(struct date * d);
+static void	usage(void);
+void	monthranger(int year, int jd_flag, int m, int before, int after);
+void	monthrangeb(int year, int jd_flag, int m, int before, int after);
 
 int
 main(int argc, char *argv[])
@@ -190,6 +188,7 @@ main(int argc, char *argv[])
 	struct  djswitch *p, *q;	/* to search user defined switch date */
 	date	never = {10000, 1, 1};	/* outside valid range of dates */
 	date	ukswitch = {1752, 9, 2};/* switch date for Great Britain */
+	date	dt;
 	int     ch;			/* holds the option character */
 	int     m = 0;			/* month */
 	int	y = 0;			/* year */
@@ -202,26 +201,17 @@ main(int argc, char *argv[])
 	int	flag_easter = 0;	/* use wants easter date */
 	char	*cp;			/* character pointer */
 	char	*flag_month = NULL;	/* requested month as string */
+	char	*flag_highlightdate = NULL;
+	int	before, after;
 	const char    *locale;		/* locale to get country code */
 	char tbuf[1024], cbuf[512], *b;
-	time_t t;
-	struct tm *tm1;
 
+	/* On how to highlight on this terminal */
 	term_se = term_so = NULL;
-	today = 0;
 	if (isatty(STDOUT_FILENO) && tgetent(tbuf, NULL) == 1) {
-		date	dt;		/* handy date */
-
 		b = cbuf;
 		term_so = tgetstr("so", &b);
 		term_se = tgetstr("se", &b);
-		t = time(NULL);
-		tm1 = localtime(&t);
-		dt.y = tm1->tm_year + 1900;
-		dt.m = tm1->tm_mon + 1;
-		dt.d = tm1->tm_mday;
-
-		today = sndaysb(&dt);
 	}
 
 	/*
@@ -263,14 +253,35 @@ main(int argc, char *argv[])
 	if (flag_backward)
 		nswitchb = ndaysj(&ukswitch);
 
-	while ((ch = getopt(argc, argv, "Jehjm:ops:wy")) != -1)
+	before = after = -1;
+
+	while ((ch = getopt(argc, argv, "A:B:3Jbd:ehjm:ops:wy")) != -1)
 		switch (ch) {
+		case '3':
+			before = after = 1;
+			break;
+		case 'A':
+			after = strtol(optarg, NULL, 10);
+			if (after < 0)
+				errx(1, "Argument to -A must be positive");
+			break;
+		case 'B':
+			before = strtol(optarg, NULL, 10);
+			if (before < 0)
+				errx(1, "Argument to -B must be positive");
+			break;
 		case 'J':
 			if (flag_backward)
 				usage();
 			nswitch = ndaysj(&never);
 			flag_julian_cal = 1;
 			break;
+		case 'b':
+			flag_backward = 1;
+			break;
+		case 'd':
+			flag_highlightdate = optarg;
+			break;
 		case 'h':
 			term_so = term_se = NULL;
 			break;
@@ -335,6 +346,9 @@ main(int argc, char *argv[])
 		y = atoi(*argv++);
 		if (y < 1 || y > 9999)
 			errx(EX_USAGE, "year %d not in range 1..9999", y);
+		before = 0;
+		after = 11;
+		m = 1;
 		break;
 	case 0:
 		{
@@ -345,6 +359,10 @@ main(int argc, char *argv[])
 			tm = localtime(&t);
 			y = tm->tm_year + 1900;
 			m = tm->tm_mon + 1;
+			if (before == -1)
+				before = 0;
+			if (after == -1)
+				after = 0;
 		}
 		break;
 	default:
@@ -359,21 +377,29 @@ main(int argc, char *argv[])
 		}
 	}
 
+	if (flag_highlightdate != NULL) {
+		dt.y = strtol(flag_highlightdate, NULL, 10);
+		dt.m = strtol(flag_highlightdate + 5, NULL, 10);
+		dt.d = strtol(flag_highlightdate + 8, NULL, 10);
+	} else {
+		time_t t;

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

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 20:52:15 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFA791065672;
	Thu,  4 Mar 2010 20:52:15 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D3838FC21;
	Thu,  4 Mar 2010 20:52:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24KqFYK085559;
	Thu, 4 Mar 2010 20:52:15 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24KqFvn085551;
	Thu, 4 Mar 2010 20:52:15 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003042052.o24KqFvn085551@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 20:52:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204733 - user/imp/tbemd/usr.bin
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 20:52:15 -0000

Author: imp
Date: Thu Mar  4 20:52:15 2010
New Revision: 204733
URL: http://svn.freebsd.org/changeset/base/204733

Log:
  Move to Makefile.arch for usr.bin

Added:
  user/imp/tbemd/usr.bin/Makefile.amd64
  user/imp/tbemd/usr.bin/Makefile.arm
  user/imp/tbemd/usr.bin/Makefile.i386
  user/imp/tbemd/usr.bin/Makefile.ia64
  user/imp/tbemd/usr.bin/Makefile.powerpc
  user/imp/tbemd/usr.bin/Makefile.sparc64
Modified:
  user/imp/tbemd/usr.bin/Makefile

Modified: user/imp/tbemd/usr.bin/Makefile
==============================================================================
--- user/imp/tbemd/usr.bin/Makefile	Thu Mar  4 20:41:11 2010	(r204732)
+++ user/imp/tbemd/usr.bin/Makefile	Thu Mar  4 20:52:15 2010	(r204733)
@@ -11,47 +11,28 @@
 
 SUBDIR=	alias \
 	apply \
-	${_ar} \
 	asa \
-	${_at} \
-	${_atm} \
 	awk \
 	banner \
 	basename \
-	${_bc} \
-	${_biff} \
-	${_bluetooth} \
 	brandelf \
 	bsdiff \
 	bzip2 \
 	bzip2recover \
-	${_c89} \
-	${_c99} \
-	${_calendar} \
 	cap_mkdb \
-	${_catman} \
 	chat \
-	${_checknr} \
-	${_chkey} \
 	chpass \
 	cksum \
 	cmp \
 	col \
-	${_colcrt} \
 	colldef \
 	colrm \
 	column \
 	comm \
-	${_compile_et} \
 	compress \
-	${_cpio} \
 	cpuset \
 	csplit \
-	${_csup} \
-	${_ctags} \
 	cut \
-	${_dc} \
-	${_dig} \
 	dirname \
 	du \
 	ee \
@@ -63,12 +44,10 @@ SUBDIR=	alias \
 	false \
 	fetch \
 	file \
-	${_file2c} \
 	find \
 	finger \
 	fmt \
 	fold \
-	${_from} \
 	fstat \
 	fsync \
 	ftp \
@@ -77,14 +56,10 @@ SUBDIR=	alias \
 	getconf \
 	getent \
 	getopt \
-	${_gprof} \
 	gzip \
 	head \
-	${_hesinfo} \
 	hexdump \
-	${_host} \
 	id \
-	${_indent} \
 	ipcrm \
 	ipcs \
 	join \
@@ -103,10 +78,8 @@ SUBDIR=	alias \
 	less \
 	lessecho \
 	lesskey \
-	${_lex} \
 	limits \
 	locale \
-	${_locate} \
 	lock \
 	lockf \
 	logger \
@@ -117,8 +90,6 @@ SUBDIR=	alias \
 	lorder \
 	lsvfs \
 	m4 \
-	${_mail} \
-	${_make} \
 	makewhatis \
 	mesg \
 	minigzip \
@@ -126,24 +97,16 @@ SUBDIR=	alias \
 	mkdep \
 	mkfifo \
 	mklocale \
-	${_mkstr} \
 	mktemp \
 	mkuzip \
-	${_msgs} \
 	mt \
-	${_nc} \
 	ncal \
-	${_ncplist} \
-	${_ncplogin} \
 	netstat \
 	newgrp \
-	${_newkey} \
 	nfsstat \
 	nice \
 	nl \
 	nohup \
-	${_nslookup} \
-	${_nsupdate} \
 	opieinfo \
 	opiekey \
 	opiepasswd \
@@ -156,26 +119,19 @@ SUBDIR=	alias \
 	printenv \
 	printf \
 	procstat \
-	${_quota} \
 	renice \
 	rev \
 	revoke \
-	${_rlogin} \
-	${_rpcgen} \
 	rpcinfo \
 	rs \
-	${_rsh} \
 	rup \
-	${_ruptime} \
 	rusers \
 	rwall \
-	${_rwho} \
 	script \
 	sed \
 	seq \
 	shar \
 	showmount \
-	${_smbutil} \
 	sockstat \
 	split \
 	stat \
@@ -187,7 +143,6 @@ SUBDIR=	alias \
 	tar \
 	tcopy \
 	tee \
-	${_telnet} \
 	tftp \
 	time \
 	tip \
@@ -197,25 +152,19 @@ SUBDIR=	alias \
 	tr \
 	true \
 	truncate \
-	${_truss} \
+	truss \
 	tset \
 	tsort \
 	tty \
-	${_ul} \
 	uname \
 	unexpand \
-	${_unifdef} \
 	uniq \
 	unzip \
 	units \
 	unvis \
-	${_usbhidaction} \
-	${_usbhidctl} \
 	users \
 	uudecode \
 	uuencode \
-	${_vacation} \
-	${_vgrind} \
 	vi \
 	vis \
 	vmstat \
@@ -231,167 +180,133 @@ SUBDIR=	alias \
 	wtmpcvt \
 	xargs \
 	xinstall \
-	${_xlint} \
-	${_xstr} \
-	${_yacc} \
-	yes \
-	${_ypcat} \
-	${_ypmatch} \
-	${_ypwhich}
-
-.if ${MACHINE_CPUARCH} != "arm"
-_truss=		truss
-.endif
+	yes
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AT} != "no"
-_at=		at
+SUBDIR+=	at
 .endif
 
 .if ${MK_ATM} != "no"
-_atm=		atm
+SUBDIR+=	atm
 .endif
 
 .if ${MK_MAN} != "no"
-_catman=	catman
+SUBDIR+=	catman
 .endif
 
 .if ${MK_BIND_UTILS} != "no"
-_dig=		dig
-_host=		host
-_nslookup=	nslookup
-_nsupdate=	nsupdate
+SUBDIR+=	dig
+SUBDIR+=	host
+SUBDIR+=	nslookup
+SUBDIR+=	nsupdate
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
-_bluetooth=	bluetooth
+SUBDIR+=	bluetooth
 .endif
 
 .if ${MK_BSD_CPIO} != "no"
-_cpio=		cpio
+SUBDIR+=	cpio
 .endif
 
 .if ${MK_CALENDAR} != "no"
-_calendar=	calendar
+SUBDIR+=	calendar
 .endif
 
 .if ${MK_HESIOD} != "no"
-_hesinfo=	hesinfo
+SUBDIR+=	hesinfo
 .endif
 
 .if ${MK_OPENSSL} != "no"
-_bc=		bc
-_chkey=		chkey
-_dc=		dc
-_newkey=	newkey
+SUBDIR+=	bc
+SUBDIR+=	chkey
+SUBDIR+=	dc
+SUBDIR+=	newkey
 .if ${MK_LIBTHR} != "no"
-_csup=		csup
+SUBDIR+=	csup
 .endif
 .endif
 
 .if ${MK_LOCATE} != "no"
-_locate=	locate
+SUBDIR+=	locate
 .endif
 
 # XXX msgs?
 .if ${MK_MAIL} != "no"
-_biff=		biff
-_from=		from
-_mail=		mail
-_msgs=		msgs
+SUBDIR+=	biff
+SUBDIR+=	from
+SUBDIR+=	mail
+SUBDIR+=	msgs
 .endif
 
 .if ${MK_MAKE} != "no"
-_make=		make
+SUBDIR+=	make
 .endif
 
 .if ${MK_NETCAT} != "no"
-_nc=		nc
+SUBDIR+=	nc
 .endif
 
 .if ${MK_NIS} != "no"
-_ypcat=		ypcat
-_ypmatch=	ypmatch
-_ypwhich=	ypwhich
+SUBDIR+=	ypcat
+SUBDIR+=	ypmatch
+SUBDIR+=	ypwhich
 .endif
 
 .if ${MK_QUOTAS} != "no"
-_quota=		quota
+SUBDIR+=	quota
 .endif
 
 .if ${MK_RCMDS} != "no"
-_rlogin=	rlogin
-_rsh=		rsh
-_ruptime=	ruptime
-_rwho=		rwho
+SUBDIR+=	rlogin
+SUBDIR+=	rsh
+SUBDIR+=	ruptime
+SUBDIR+=	rwho
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-_vacation=	vacation
+SUBDIR+=	vacation
 .endif
 
 .if ${MK_TELNET} != "no"
-_telnet=	telnet
+SUBDIR+=	telnet
 .endif
 
 .if ${MK_TEXTPROC} != "no"
-_checknr=	checknr
-_colcrt=	colcrt
-_ul=		ul
+SUBDIR+=	checknr
+SUBDIR+=	colcrt
+SUBDIR+=	ul
 .endif
 
 .if ${MK_TOOLCHAIN} != "no"
-_ar=		ar
-_c89=		c89
-_c99=		c99
-_compile_et=	compile_et
-_ctags=		ctags
-_file2c=	file2c
-_gprof=		gprof
-_indent=	indent
-_lex=		lex
-_mkstr=		mkstr
-_rpcgen=	rpcgen
-_unifdef=	unifdef
-_xlint=		xlint
-_xstr=		xstr
+SUBDIR+=	ar
+SUBDIR+=	c89
+SUBDIR+=	c99
+SUBDIR+=	compile_et
+SUBDIR+=	ctags
+SUBDIR+=	file2c
+SUBDIR+=	gprof
+SUBDIR+=	indent
+SUBDIR+=	lex
+SUBDIR+=	mkstr
+SUBDIR+=	rpcgen
+SUBDIR+=	unifdef
+SUBDIR+=	xlint
+SUBDIR+=	xstr
 # XXX maybe under textproc?
-_vgrind=	vgrind
-_yacc=		yacc
+SUBDIR+=	vgrind
+SUBDIR+=	yacc
 .endif
 
 .if ${MK_USB} != "no"
-_usbhidaction=	usbhidaction
-_usbhidctl=	usbhidctl
-.endif
-
-.if ${MACHINE_CPUARCH} == "i386"
-.if ${MK_NCP} != "no"
-_ncplist=	ncplist
-_ncplogin=	ncplogin
-.endif
-_smbutil=	smbutil
-.endif
-
-.if ${MACHINE_CPUARCH} == "ia64"
-_smbutil=	smbutil
-.endif
-
-.if ${MACHINE_CPUARCH} == "amd64"
-.if ${MK_NCP} != "no"
-_ncplist=	ncplist
-_ncplogin=	ncplogin
-.endif
-_smbutil=	smbutil
+SUBDIR+=	usbhidaction
+SUBDIR+=	usbhidctl
 .endif
 
-.if ${MACHINE_CPUARCH} == "powerpc"
-_smbutil=	smbutil
-.endif
+.include 
 
-.if ${MACHINE_CPUARCH} == "sparc64"
-_smbutil=	smbutil
-.endif
+SUBDIR:=	${SUBDIR:O}
 
 .include 

Added: user/imp/tbemd/usr.bin/Makefile.amd64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.amd64	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.if ${MK_NCP} != "no"
+SUBDIR+=	ncplist
+SUBDIR+=	ncplogin
+.endif
+SUBDIR+=	smbutil

Added: user/imp/tbemd/usr.bin/Makefile.arm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.arm	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR:=	${SUBDIR:Ntruss}

Added: user/imp/tbemd/usr.bin/Makefile.i386
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.i386	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.if ${MK_NCP} != "no"
+SUBDIR+=	ncplist
+SUBDIR+=	ncplogin
+.endif
+SUBDIR+=	smbutil

Added: user/imp/tbemd/usr.bin/Makefile.ia64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.ia64	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=	smbutil

Added: user/imp/tbemd/usr.bin/Makefile.powerpc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.powerpc	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=	smbutil

Added: user/imp/tbemd/usr.bin/Makefile.sparc64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/usr.bin/Makefile.sparc64	Thu Mar  4 20:52:15 2010	(r204733)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=	smbutil

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 20:55:26 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE8191065677;
	Thu,  4 Mar 2010 20:55:26 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DD85B8FC16;
	Thu,  4 Mar 2010 20:55:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24KtQgm086333;
	Thu, 4 Mar 2010 20:55:26 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24KtQqY086331;
	Thu, 4 Mar 2010 20:55:26 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003042055.o24KtQqY086331@svn.freebsd.org>
From: Warner Losh 
Date: Thu, 4 Mar 2010 20:55:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204734 - user/imp/tbemd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 20:55:27 -0000

Author: imp
Date: Thu Mar  4 20:55:26 2010
New Revision: 204734
URL: http://svn.freebsd.org/changeset/base/204734

Log:
  Update what this branch is about

Modified:
  user/imp/tbemd/README-BRANCH

Modified: user/imp/tbemd/README-BRANCH
==============================================================================
--- user/imp/tbemd/README-BRANCH	Thu Mar  4 20:52:15 2010	(r204733)
+++ user/imp/tbemd/README-BRANCH	Thu Mar  4 20:55:26 2010	(r204734)
@@ -22,3 +22,8 @@ ARM have multiple ABIs, and we'll need s
 and different CPUs within a family might have different defaults.
 Etc.  Plus there's t he need for multilib.  However, issues like this
 are beyond the scope of this branch.
+
+In addition, this branch starts to move away from having if this
+machine compile this, if that machine compile that lists in the Makefiles,
+but moves them to a Makefile.$ARCH where $ARCH is $MACHINE_CPUARCH,
+$MACHINE_ARCH or $MACHINE, tried in that order.

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 22:39:24 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D986E1065670;
	Thu,  4 Mar 2010 22:39:24 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C73FC8FC08;
	Thu,  4 Mar 2010 22:39:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24MdO9w009653;
	Thu, 4 Mar 2010 22:39:24 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24MdO9g009651;
	Thu, 4 Mar 2010 22:39:24 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003042239.o24MdO9g009651@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 22:39:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204740 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 22:39:24 -0000

Author: jmallett
Date: Thu Mar  4 22:39:24 2010
New Revision: 204740
URL: http://svn.freebsd.org/changeset/base/204740

Log:
  Make oct_* take advantage of 64-bit registers in n32.  Update comment about
  what to do for o32.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 22:06:57 2010	(r204739)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 22:39:24 2010	(r204740)
@@ -160,13 +160,14 @@ static inline int32_t oct_readint32 (uin
 
 #elif defined(__mips_n32)
 
-
 /*
  * XXX
- * These cannot possibly work unless the exception handlers in an o32 kernel
- * are careful to not trash the upper 32 bits of saved/restored registers, or
- * actually save and restore them as 64-bit quantities, which seems possible
- * but is quite ugly.
+ * Add o32 variants that load the address into a register and the result out
+ * of a register properly, and simply disable interrupts before and after and
+ * hope that we don't need to refill or modify the TLB to access the address.
+ * I'd be a lot happier if csr_addr were a physical address and we mapped it
+ * into XKPHYS here so that we could guarantee that interrupts were the only
+ * kind of exception we needed to worry about.
  */
 
 /*
@@ -174,61 +175,26 @@ static inline int32_t oct_readint32 (uin
  */
 static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
-    uint32_t csr_addrh = csr_addr >> 32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t valh = (uint64_t)val64 >> 32;
-    uint32_t vall = val64;
-    uint32_t tmp1;
-    uint32_t tmp2;
-    uint32_t tmp3;
-
     __asm __volatile (
+	    ".set push\n"
             ".set mips64\n"
-            "dsll   %0, %3, 32\n"
-            "dsll   %1, %5, 32\n"
-            "dsll   %2, %4, 32\n"
-            "dsrl   %2, %2, 32\n"
-            "or     %0, %0, %2\n"
-            "dsll   %2, %6, 32\n"
-            "dsrl   %2, %2, 32\n"
-            "or     %1, %1, %2\n"
             "sd     %0, 0(%1)\n"
-            ".set mips0\n"
-            : "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)
-            : "r" (valh), "r" (vall),
-              "r" (csr_addrh), "r" (csr_addrl)
-        );
+            ".set pop\n"
+            :
+	    : "r"(val64), "r"(csr_addr));
 }
 
 static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i)
 {
-    uint32_t csr_addrh = csr_addr >> 32;
-    uint32_t csr_addrl = csr_addr;
-    int32_t valh = (uint64_t)val64i >> 32;
-    int32_t vall = val64i;
-    uint32_t tmp1;
-    uint32_t tmp2;
-    uint32_t tmp3;
-
     __asm __volatile (
+	    ".set push\n"
             ".set mips64\n"
-            "dsll   %0, %3, 32\n"
-            "dsll   %1, %5, 32\n"
-            "dsll   %2, %4, 32\n"
-            "dsrl   %2, %2, 32\n"
-            "or     %0, %0, %2\n"
-            "dsll   %2, %6, 32\n"
-            "dsrl   %2, %2, 32\n"
-            "or     %1, %1, %2\n"
             "sd     %0, 0(%1)\n"
-            ".set mips0\n"
-            : "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)
-            : "r" (valh), "r" (vall),
-              "r" (csr_addrh), "r" (csr_addrl)
-        );
+            ".set pop\n"
+            :
+	    : "r"(val64i), "r"(csr_addr));
 }
 
-
 /*
  * oct_write8_x8
  *
@@ -236,21 +202,13 @@ static inline void oct_write64_int64 (ui
  */
 static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
 {
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1;
-    uint32_t tmp2;
-
     __asm __volatile (
-        ".set mips64\n"
-        "dsll   %0, %3, 32\n"
-        "dsll   %1, %4, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "sb     %2, 0(%0)\n"
-	".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (val8), "r" (csr_addrh), "r" (csr_addrl) );
+	    ".set push\n"
+            ".set mips64\n"
+            "sb    %0, 0(%1)\n"
+            ".set pop\n"
+            :
+	    : "r"(val8), "r"(csr_addr));
 }
 
 /*
@@ -260,183 +218,83 @@ static inline void oct_write8_x8 (uint64
  */
 static inline void oct_write8 (uint64_t csr_addr, uint8_t val8)
 {
-#if 1
     oct_write64(csr_addr, (uint64_t) val8);
-#else
-
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1;
-    uint32_t tmp2;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "dsll   %0, %3, 32\n"
-        "dsll   %1, %4, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "sb     %2, 0(%0)\n"
-        ".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (val8), "r" (csr_addrh), "r" (csr_addrl) );
-#endif
 }
 
 static inline void oct_write16 (uint64_t csr_addr, uint16_t val16)
 {
-#if 1
     oct_write64(csr_addr, (uint64_t) val16);
-
-#else
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1;
-    uint32_t tmp2;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "dsll   %0, %3, 32\n"
-        "dsll   %1, %4, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "sh     %2, 0(%0)\n"
-	".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (val16), "r" (csr_addrh), "r" (csr_addrl) );
-#endif
 }
 
 static inline void oct_write32 (uint64_t csr_addr, uint32_t val32)
 {
-#if 1
     oct_write64(csr_addr, (uint64_t) val32);
-#else
-
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1;
-    uint32_t tmp2;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "dsll   %0, %3, 32\n"
-        "dsll   %1, %4, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "sw     %2, 0(%0)\n"
-	".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (val32), "r" (csr_addrh), "r" (csr_addrl) );
-#endif
 }
 
-
-
 static inline uint8_t oct_read8 (uint64_t csr_addr)
 {
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1, tmp2;
+    uint64_t tmp;
 
     __asm __volatile (
         ".set mips64\n"
-        "dsll   %1, %2, 32\n"
-        "dsll   %0, %3, 32\n"
-        "dsrl   %0, %0, 32\n"
-        "or     %1, %1, %0\n"
-        "lb     %1, 0(%1)\n"
+        "lb     %0, 0(%1)\n"
         ".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (csr_addrh), "r" (csr_addrl) );
-    return ((uint8_t) tmp2);
+        : "=r"(tmp)
+        : "r"(csr_addr));
+    return ((uint8_t) tmp);
 }
 
-static inline uint8_t oct_read16 (uint64_t csr_addr)
+static inline uint16_t oct_read16 (uint64_t csr_addr)
 {
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t tmp1, tmp2;
+    uint64_t tmp;
 
     __asm __volatile (
         ".set mips64\n"
-        "dsll   %1, %2, 32\n"
-        "dsll   %0, %3, 32\n"
-        "dsrl   %0, %0, 32\n"
-        "or     %1, %1, %0\n"
-        "lh     %1, 0(%1)\n"
+        "lh     %0, 0(%1)\n"
         ".set mips0\n"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (csr_addrh), "r" (csr_addrl) );
-    return ((uint16_t) tmp2);
+        : "=r"(tmp)
+        : "r"(csr_addr));
+    return ((uint16_t) tmp);
 }
 
-
 static inline uint32_t oct_read32 (uint64_t csr_addr)
 {
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t val32;
-    uint32_t tmp;
+    uint64_t tmp;
 
     __asm __volatile (
         ".set mips64\n"
-        "dsll   %0, %2, 32\n"
-        "dsll   %1, %3, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "lw    %0, 0(%0)\n"
+        "lw     %0, 0(%1)\n"
         ".set mips0\n"
-        : "=&r" (val32), "=&r" (tmp)
-        : "r" (csr_addrh), "r" (csr_addrl) );
-    return (val32);
+        : "=r"(tmp)
+        : "r"(csr_addr));
+    return ((uint32_t) tmp);
 }
 
-
 static inline uint64_t oct_read64 (uint64_t csr_addr)
 {
-    uint32_t csr_addrh = csr_addr >> 32;
-    uint32_t csr_addrl = csr_addr;
-    uint32_t valh;
-    uint32_t vall;
+    uint64_t tmp;
 
     __asm __volatile (
         ".set mips64\n"
-        "dsll   %0, %2, 32\n"
-        "dsll   %1, %3, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "ld     %1, 0(%0)\n"
-        "dsrl   %0, %1, 32\n"
-        "dsll   %1, %1, 32\n"
-        "dsrl   %1, %1, 32\n"
+        "ld     %0, 0(%1)\n"
         ".set mips0\n"
-        : "=&r" (valh), "=&r" (vall)
-        : "r" (csr_addrh), "r" (csr_addrl)
-        );
-    return ((uint64_t)valh << 32) | vall;
+        : "=r"(tmp)
+        : "r"(csr_addr));
+    return (tmp);
 }
 
-
 static inline int32_t oct_readint32 (uint64_t csr_addr)
 {
-    uint32_t csr_addrh = csr_addr>>32;
-    uint32_t csr_addrl = csr_addr;
-    int32_t val32;
-    uint32_t tmp;
+    int32_t tmp;
 
     __asm __volatile (
         ".set mips64\n"
-        "dsll   %0, %2, 32\n"
-        "dsll   %1, %3, 32\n"
-        "dsrl   %1, %1, 32\n"
-        "or     %0, %0, %1\n"
-        "lw    %0, 0(%0)\n"
-        : "=&r" (val32), "=&r" (tmp)
-        : "r" (csr_addrh), "r" (csr_addrl) );
-    return (val32);
+        "lw     %0, 0(%1)\n"
+        ".set mips0\n"
+        : "=r"(tmp)
+        : "r"(csr_addr));
+    return ((int32_t) tmp);
 }
-
-
 #endif
 
 

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 22:42:36 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE8F9106566B;
	Thu,  4 Mar 2010 22:42:36 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE1308FC0A;
	Thu,  4 Mar 2010 22:42:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24MgaHW010411;
	Thu, 4 Mar 2010 22:42:36 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24MgaGo010409;
	Thu, 4 Mar 2010 22:42:36 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003042242.o24MgaGo010409@svn.freebsd.org>
From: Juli Mallett 
Date: Thu, 4 Mar 2010 22:42:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204741 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 22:42:37 -0000

Author: jmallett
Date: Thu Mar  4 22:42:36 2010
New Revision: 204741
URL: http://svn.freebsd.org/changeset/base/204741

Log:
  Fix the return type of read16 in the n64 case.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 22:39:24 2010	(r204740)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Thu Mar  4 22:42:36 2010	(r204741)
@@ -131,7 +131,7 @@ static inline uint8_t oct_read8 (uint64_
     return (*ptr);
 }
 
-static inline uint8_t oct_read16 (uint64_t csr_addr)
+static inline uint16_t oct_read16 (uint64_t csr_addr)
 {
     volatile uint16_t *ptr = (volatile uint16_t *) csr_addr;
     return (*ptr);

From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 23:30:57 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAC901065674;
	Thu,  4 Mar 2010 23:30:57 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A16E58FC17;
	Thu,  4 Mar 2010 23:30:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24NUvoU021635;
	Thu, 4 Mar 2010 23:30:57 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24NUvne021634;
	Thu, 4 Mar 2010 23:30:57 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201003042330.o24NUvne021634@svn.freebsd.org>
From: Kip Macy 
Date: Thu, 4 Mar 2010 23:30:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204742 - user/kmacy/head_page_lock
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 04 Mar 2010 23:30:57 -0000

Author: kmacy
Date: Thu Mar  4 23:30:57 2010
New Revision: 204742
URL: http://svn.freebsd.org/changeset/base/204742

Log:
  create branch for integrating page lock in to HEAD

Added:
     - copied from r204741, head/
Directory Properties:
  user/kmacy/head_page_lock/   (props changed)

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 00:54:29 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26403106564A;
	Fri,  5 Mar 2010 00:54:29 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 16B0D8FC18;
	Fri,  5 Mar 2010 00:54:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o250sSEe040405;
	Fri, 5 Mar 2010 00:54:28 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o250sS7E040401;
	Fri, 5 Mar 2010 00:54:28 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003050054.o250sS7E040401@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 00:54:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204746 - in user/jmallett/octeon/sys/mips: include mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 00:54:29 -0000

Author: jmallett
Date: Fri Mar  5 00:54:28 2010
New Revision: 204746
URL: http://svn.freebsd.org/changeset/base/204746

Log:
  o) Make SEGSHIFT users use consistent macros instead, so we can mask off the
     sign-extended bits (which is all we have since we don't use XKSEG, etc.,
     yet) and get reasonable values for e.g. nkpt.
  o) Use two pages for pgtab.  This is probably wrong, but since pointers double
     in size with n64, we need more space...though I suppose we could just store
     the 32-bit addresses.

Modified:
  user/jmallett/octeon/sys/mips/include/pmap.h
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/include/pmap.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/pmap.h	Fri Mar  5 00:33:05 2010	(r204745)
+++ user/jmallett/octeon/sys/mips/include/pmap.h	Fri Mar  5 00:54:28 2010	(r204746)
@@ -57,9 +57,6 @@
 #define	NKPDE		255	/* addressable number of page tables/pde's */
 #endif
 
-#define	KPTDI		(VM_MIN_KERNEL_ADDRESS >> SEGSHIFT)
-#define	NUSERPGTBLS	(VM_MAXUSER_ADDRESS >> SEGSHIFT)
-
 #ifndef LOCORE
 
 #include 

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Fri Mar  5 00:33:05 2010	(r204745)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Fri Mar  5 00:54:28 2010	(r204746)
@@ -117,8 +117,10 @@ __FBSDID("$FreeBSD$");
 /*
  * Get PDEs and PTEs for user/kernel address space
  */
-#define	pmap_pde(m, v)	       (&((m)->pm_segtab[(vm_offset_t)(v) >> SEGSHIFT]))
-#define	segtab_pde(m, v)	(m[(vm_offset_t)(v) >> SEGSHIFT])
+#define	pmap_segshift(v)	((uintptr_t)(((v) & 0xffffffffu) >> SEGSHIFT))
+#define	pmap_segbase(v)		((vm_offset_t)(intptr_t)(int32_t)((v) << SEGSHIFT))
+#define	pmap_pde(m, v)		(&((m)->pm_segtab[pmap_segshift((v))]))
+#define	segtab_pde(m, v)	((m)[pmap_segshift((v))])
 
 #define	pmap_pte_w(pte)		((*(int *)pte & PTE_W) != 0)
 #define	pmap_pde_v(pte)		((*(int *)pte) != 0)
@@ -128,6 +130,7 @@ __FBSDID("$FreeBSD$");
 #define	pmap_pte_set_w(pte, v)	((v)?(*(int *)pte |= PTE_W):(*(int *)pte &= ~PTE_W))
 #define	pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v)))
 
+#define	NUSERPGTBLS		(pmap_segshift(VM_MAXUSER_ADDRESS))
 #define	MIPS_SEGSIZE		(1L << SEGSHIFT)
 #define	mips_segtrunc(va)	((va) & ~(MIPS_SEGSIZE-1))
 #define	pmap_TLB_invalidate_all() MIPS_TBIAP()
@@ -217,7 +220,7 @@ pd_entry_t
 pmap_segmap(pmap_t pmap, vm_offset_t va)
 {
 	if (pmap->pm_segtab)
-		return (pmap->pm_segtab[((vm_offset_t)(va) >> SEGSHIFT)]);
+		return (*pmap_pde(pmap, va));
 	else
 		return ((pd_entry_t)0);
 }
@@ -418,9 +421,9 @@ again:
 		 * be somewhere above 0xC0000000 - 0xFFFFFFFF which results
 		 * in about 256 entries or so instead of the 120.
 		 */
-		nkpt = (PAGE_SIZE / sizeof(pd_entry_t)) - (virtual_avail >> SEGSHIFT);
+		nkpt = ((PAGE_SIZE * 2) / sizeof(pd_entry_t)) - pmap_segshift(virtual_avail);
 	}
-	pgtab = (pt_entry_t *)pmap_steal_memory(PAGE_SIZE * nkpt);
+	pgtab = (pt_entry_t *)pmap_steal_memory((PAGE_SIZE * 2) * nkpt);
 
 	/*
 	 * The R[4-7]?00 stores only one copy of the Global bit in the
@@ -436,7 +439,7 @@ again:
 	 * The segment table contains the KVA of the pages in the second
 	 * level page table.
 	 */
-	for (i = 0, j = (virtual_avail >> SEGSHIFT); i < nkpt; i++, j++)
+	for (i = 0, j = pmap_segshift(virtual_avail); i < nkpt; i++, j++)
 		kernel_segmap[j] = (pd_entry_t)(pgtab + (i * NPTEPG));
 
 	/*
@@ -988,7 +991,7 @@ pmap_unuse_pt(pmap_t pmap, vm_offset_t v
 		return (0);
 
 	if (mpte == NULL) {
-		ptepindex = (va >> SEGSHIFT);
+		ptepindex = pmap_segshift(va);
 		if (pmap->pm_ptphint &&
 		    (pmap->pm_ptphint->pindex == ptepindex)) {
 			mpte = pmap->pm_ptphint;
@@ -1150,7 +1153,7 @@ pmap_allocpte(pmap_t pmap, vm_offset_t v
 	/*
 	 * Calculate pagetable page index
 	 */
-	ptepindex = va >> SEGSHIFT;
+	ptepindex = pmap_segshift(va);
 retry:
 	/*
 	 * Get the page directory entry
@@ -2009,7 +2012,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 		/*
 		 * Calculate pagetable page index
 		 */
-		ptepindex = va >> SEGSHIFT;
+		ptepindex = pmap_segshift(va);
 		if (mpte && (mpte->pindex == ptepindex)) {
 			mpte->wire_count++;
 		} else {
@@ -3047,7 +3050,7 @@ pmap_pid_dump(int pid)
 			for (i = 0; i < NUSERPGTBLS; i++) {
 				pd_entry_t *pde;
 				pt_entry_t *pte;
-				unsigned base = i << SEGSHIFT;
+				unsigned base = pmap_segbase(i);
 
 				pde = &pmap->pm_segtab[i];
 				if (pde && pmap_pde_v(pde)) {
@@ -3107,7 +3110,7 @@ pads(pmap_t pm)
 	for (i = 0; i < NPTEPG; i++)
 		if (pm->pm_segtab[i])
 			for (j = 0; j < NPTEPG; j++) {
-				va = (i << SEGSHIFT) + (j << PAGE_SHIFT);
+				va = pmap_segbase(i) + (j << PAGE_SHIFT);
 				if (pm == kernel_pmap && va < KERNBASE)
 					continue;
 				if (pm != kernel_pmap &&

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 02:52:24 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9DD2106564A;
	Fri,  5 Mar 2010 02:52:23 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D84FD8FC16;
	Fri,  5 Mar 2010 02:52:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o252qNxe066635;
	Fri, 5 Mar 2010 02:52:23 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o252qNLM066598;
	Fri, 5 Mar 2010 02:52:23 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003050252.o252qNLM066598@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 02:52:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204747 - in user/jmallett/octeon/sys: conf mips/cavium
	mips/conf mips/include mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 02:52:24 -0000

Author: jmallett
Date: Fri Mar  5 02:52:23 2010
New Revision: 204747
URL: http://svn.freebsd.org/changeset/base/204747

Log:
  Make o32 work on my branch again.  Most importantly:
  o) Refactor octeon_pcmap_regs.h to reduce the number of functions written for
     each ABI/ISA, and use macros to write the trivial ones for different types.

Added:
  user/jmallett/octeon/sys/mips/conf/OCTEON1-o32
Modified:
  user/jmallett/octeon/sys/conf/Makefile.mips
  user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
  user/jmallett/octeon/sys/mips/include/_bus.h
  user/jmallett/octeon/sys/mips/mips/bus_space_generic.c

Modified: user/jmallett/octeon/sys/conf/Makefile.mips
==============================================================================
--- user/jmallett/octeon/sys/conf/Makefile.mips	Fri Mar  5 00:54:28 2010	(r204746)
+++ user/jmallett/octeon/sys/conf/Makefile.mips	Fri Mar  5 02:52:23 2010	(r204747)
@@ -61,6 +61,9 @@ HACK_EXTRA_FLAGS+=-Wl,-m,elf64btsmip_fbs
 .if defined(TARGET_N32)
 SYSTEM_LD+=-m elf32btsmipn32_fbsd
 HACK_EXTRA_FLAGS+=-Wl,-m,elf32btsmipn32_fbsd
+.else
+SYSTEM_LD+=-m elf32btsmip_fbsd
+HACK_EXTRA_FLAGS+=-Wl,-m,elf32btsmip_fbsd
 .endif
 .else
 CFLAGS+=-EL
@@ -75,6 +78,9 @@ HACK_EXTRA_FLAGS+=-Wl,-m,elf64ltsmip_fbs
 .if defined(TARGET_N32)
 SYSTEM_LD+=-m elf32ltsmipn32_fbsd
 HACK_EXTRA_FLAGS+=-Wl,-m,elf32ltsmipn32_fbsd
+.else
+SYSTEM_LD+=-m elf32ltsmip_fbsd
+HACK_EXTRA_FLAGS+=-Wl,-m,elf32ltsmip_fbsd
 .endif
 .endif
 

Modified: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32
==============================================================================
--- user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32	Fri Mar  5 00:54:28 2010	(r204746)
+++ user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32	Fri Mar  5 02:52:23 2010	(r204747)
@@ -1,13 +1,13 @@
-/*
- *    This product includes software developed by the University of
- *    California, Berkeley and its contributors."
-*/
+TARGET(elf32-tradbigmips)
 OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
+   __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
 
 SECTIONS {
 	. = KERNLOADADDR + SIZEOF_HEADERS;
+
 	.text . : {
 	    	*(.text)
 		*(.dynamic)

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Fri Mar  5 00:54:28 2010	(r204746)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Fri Mar  5 02:52:23 2010	(r204747)
@@ -91,74 +91,65 @@ extern struct pcpu *cpuid_to_pcpu[];
 #define OCTEON_SYNCWS	__asm __volatile (".word  0x14f" : : )
 
 #if defined(__mips_n64)
+#define	oct_write64(a, v)	(*(volatile uint64_t *)(a) = (uint64_t)(v))
+#define	oct_write8_x8(a, v)	(*(volatile uint8_t *)(a) = (uint8_t)(v))
 
-static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
-{
-    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
-    *ptr = val64;
-}
+#define	OCT_READ(n, t)							\
+static inline t oct_read ## n(uintptr_t a)				\
+{									\
+	volatile t *p = (volatile t *)a;				\
+	return (*p);							\
+}
+
+OCT_READ(8, uint8_t);
+OCT_READ(16, uint16_t);
+OCT_READ(32, uint32_t);
+OCT_READ(64, uint64_t);
 
-static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i)
+#elif defined(__mips_n32) || defined(__mips_o32)
+#if defined(__mips_n32)
+static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
-    volatile int64_t *ptr = (volatile int64_t *) csr_addr;
-    *ptr = val64i;
+    __asm __volatile (
+	    ".set push\n"
+            ".set mips64\n"
+            "sd     %0, 0(%1)\n"
+            ".set pop\n"
+            :
+	    : "r"(val64), "r"(csr_addr));
 }
 
 static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
 {
-    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
-    *ptr = (uint64_t) val8;
-}
-
-static inline void oct_write8 (uint64_t csr_addr, uint8_t val8)
-{
-    oct_write64(csr_addr, (uint64_t) val8);
-}
-
-static inline void oct_write16 (uint64_t csr_addr, uint16_t val16)
-{
-    oct_write64(csr_addr, (uint64_t) val16);
-}
-
-static inline void oct_write32 (uint64_t csr_addr, uint32_t val32)
-{
-    oct_write64(csr_addr, (uint64_t) val32);
-}
-
-static inline uint8_t oct_read8 (uint64_t csr_addr)
-{
-    volatile uint8_t *ptr = (volatile uint8_t *) csr_addr;
-    return (*ptr);
-}
-
-static inline uint16_t oct_read16 (uint64_t csr_addr)
-{
-    volatile uint16_t *ptr = (volatile uint16_t *) csr_addr;
-    return (*ptr);
-}
-
-
-static inline uint32_t oct_read32 (uint64_t csr_addr)
-{
-    volatile uint32_t *ptr = (volatile uint32_t *) csr_addr;
-    return (*ptr);
-}
-
-static inline uint64_t oct_read64 (uint64_t csr_addr)
-{
-    volatile uint64_t *ptr = (volatile uint64_t *) csr_addr;
-    return (*ptr);
-}
-
-static inline int32_t oct_readint32 (uint64_t csr_addr)
-{
-    volatile int32_t *ptr = (volatile int32_t *) csr_addr;
-    return (*ptr);
+    __asm __volatile (
+	    ".set push\n"
+            ".set mips64\n"
+            "sb    %0, 0(%1)\n"
+            ".set pop\n"
+            :
+	    : "r"(val8), "r"(csr_addr));
 }
 
-
-
-#elif defined(__mips_n32)
+#define	OCT_READ(n, t, insn)						\
+static inline t oct_read ## n(uint64_t a)				\
+{									\
+    uint64_t tmp;							\
+									\
+    __asm __volatile (							\
+	".set push\n"							\
+        ".set mips64\n"							\
+        insn "\t%0, 0(%1)\n"						\
+        ".set pop\n"							\
+        : "=r"(tmp)							\
+        : "r"(a));							\
+    return ((t)tmp);							\
+}
+
+OCT_READ(8, uint8_t, "lb");
+OCT_READ(16, uint16_t, "lh");
+OCT_READ(32, uint32_t, "lw");
+OCT_READ(64, uint64_t, "ld");
+#else
 
 /*
  * XXX
@@ -169,52 +160,117 @@ static inline int32_t oct_readint32 (uin
  * into XKPHYS here so that we could guarantee that interrupts were the only
  * kind of exception we needed to worry about.
  */
-
-/*
- * Read/write functions
- */
 static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
-    __asm __volatile (
+	uint32_t csr_addrh = csr_addr >> 32;
+	uint32_t csr_addrl = csr_addr;
+	uint32_t valh = val64 >> 32;
+	uint32_t vall = val64;
+	uint32_t tmp1;
+	uint32_t tmp2;
+	uint32_t tmp3;
+
+	__asm __volatile (
 	    ".set push\n"
             ".set mips64\n"
-            "sd     %0, 0(%1)\n"
+	    ".set noreorder\n"
+	    ".set noat\n"
+	    "dsll   %0, %3, 32\n"
+	    "dsll   %1, %5, 32\n"
+	    "dsll   %2, %4, 32\n"
+	    "dsrl   %2, %2, 32\n"
+	    "or     %0, %0, %2\n"
+	    "dsll   %2, %6, 32\n"
+	    "dsrl   %2, %2, 32\n"
+	    "or     %1, %1, %2\n"
+	    "sd     %0, 0(%1)\n"
             ".set pop\n"
-            :
-	    : "r"(val64), "r"(csr_addr));
+	    : "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)
+	    : "r" (valh), "r" (vall), "r" (csr_addrh), "r" (csr_addrl));
 }
 
-static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i)
+static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
 {
-    __asm __volatile (
+	uint32_t csr_addrh = csr_addr >> 32;
+	uint32_t csr_addrl = csr_addr;
+	uint32_t tmp1;
+	uint32_t tmp2;
+
+	__asm __volatile (
 	    ".set push\n"
             ".set mips64\n"
-            "sd     %0, 0(%1)\n"
+	    ".set noreorder\n"
+	    ".set noat\n"
+	    "dsll   %0, %3, 32\n"
+	    "dsll   %1, %4, 32\n"
+	    "dsrl   %1, %1, 32\n"
+	    "or     %0, %0, %1\n"
+	    "sb     %2, 0(%0)\n"
             ".set pop\n"
-            :
-	    : "r"(val64i), "r"(csr_addr));
+	    : "=&r" (tmp1), "=&r" (tmp2)
+	    : "r" (val8), "r" (csr_addrh), "r" (csr_addrl));
 }
 
-/*
- * oct_write8_x8
- *
- * 8 bit data write into IO Space. Written using an 8 bit bus io transaction
- */
-static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
+#define	OCT_READ(n, t, insn)						\
+static inline t oct_read ## n(uint64_t csr_addr)			\
+{									\
+	uint32_t csr_addrh = csr_addr >> 32;				\
+	uint32_t csr_addrl = csr_addr;					\
+	uint32_t tmp1, tmp2;						\
+									\
+	__asm __volatile (						\
+	    ".set push\n"						\
+            ".set mips64\n"						\
+	    ".set noreorder\n"						\
+	    ".set noat\n"						\
+	    "dsll   %1, %2, 32\n"					\
+	    "dsll   %0, %3, 32\n"					\
+	    "dsrl   %0, %0, 32\n"					\
+	    "or     %1, %1, %0\n"					\
+	    "lb     %1, 0(%1)\n"					\
+	    ".set pop\n"						\
+	    : "=&r" (tmp1), "=&r" (tmp2)				\
+	    : "r" (csr_addrh), "r" (csr_addrl));			\
+	return ((t)tmp2);						\
+}
+
+OCT_READ(8, uint8_t, "lb");
+OCT_READ(16, uint16_t, "lh");
+OCT_READ(32, uint32_t, "lw");
+
+static inline uint64_t oct_read64 (uint64_t csr_addr)
 {
-    __asm __volatile (
+	uint32_t csr_addrh = csr_addr >> 32;
+	uint32_t csr_addrl = csr_addr;
+	uint32_t valh;
+	uint32_t vall;
+
+	__asm __volatile (
 	    ".set push\n"
             ".set mips64\n"
-            "sb    %0, 0(%1)\n"
-            ".set pop\n"
-            :
-	    : "r"(val8), "r"(csr_addr));
+	    ".set noreorder\n"
+	    ".set noat\n"
+	    "dsll   %0, %2, 32\n"
+	    "dsll   %1, %3, 32\n"
+	    "dsrl   %1, %1, 32\n"
+	    "or     %0, %0, %1\n"
+	    "ld     %1, 0(%0)\n"
+	    "dsrl   %0, %1, 32\n"
+	    "dsll   %1, %1, 32\n"
+	    "dsrl   %1, %1, 32\n"
+	    ".set pop\n"
+	    : "=&r" (valh), "=&r" (vall)
+	    : "r" (csr_addrh), "r" (csr_addrl));
+	return ((uint64_t)valh << 32) | vall;
 }
+#endif
+
+#endif
+
+#define	oct_write64_int64(a, v)	(oct_write64(a, (int64_t)(v)))
 
 /*
- * oct_write8
- *
- * 8 bit data write into IO Space. Written using a 64 bit bus io transaction
+ * Most write bus transactions are actually 64-bit on Octeon.
  */
 static inline void oct_write8 (uint64_t csr_addr, uint8_t val8)
 {
@@ -231,72 +287,7 @@ static inline void oct_write32 (uint64_t
     oct_write64(csr_addr, (uint64_t) val32);
 }
 
-static inline uint8_t oct_read8 (uint64_t csr_addr)
-{
-    uint64_t tmp;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "lb     %0, 0(%1)\n"
-        ".set mips0\n"
-        : "=r"(tmp)
-        : "r"(csr_addr));
-    return ((uint8_t) tmp);
-}
-
-static inline uint16_t oct_read16 (uint64_t csr_addr)
-{
-    uint64_t tmp;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "lh     %0, 0(%1)\n"
-        ".set mips0\n"
-        : "=r"(tmp)
-        : "r"(csr_addr));
-    return ((uint16_t) tmp);
-}
-
-static inline uint32_t oct_read32 (uint64_t csr_addr)
-{
-    uint64_t tmp;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "lw     %0, 0(%1)\n"
-        ".set mips0\n"
-        : "=r"(tmp)
-        : "r"(csr_addr));
-    return ((uint32_t) tmp);
-}
-
-static inline uint64_t oct_read64 (uint64_t csr_addr)
-{
-    uint64_t tmp;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "ld     %0, 0(%1)\n"
-        ".set mips0\n"
-        : "=r"(tmp)
-        : "r"(csr_addr));
-    return (tmp);
-}
-
-static inline int32_t oct_readint32 (uint64_t csr_addr)
-{
-    int32_t tmp;
-
-    __asm __volatile (
-        ".set mips64\n"
-        "lw     %0, 0(%1)\n"
-        ".set mips0\n"
-        : "=r"(tmp)
-        : "r"(csr_addr));
-    return ((int32_t) tmp);
-}
-#endif
-
+#define	oct_readint32(a)	((int32_t)oct_read32((a)))
 
 #define OCTEON_HW_BASE		((volatile uint64_t *) 0L)
 #define OCTEON_REG_OFFSET	(-4 * 1024ll)  /* local scratchpad reg base */
@@ -452,7 +443,7 @@ typedef enum {
 
 /*  PTR_SIZE == sizeof(uint32_t)  */
 
-#ifdef __mips_n32
+#if defined(__mips_n32) || defined(__mips_o32)
 #define mipsx_addr_size				uint32_t	// u_int64
 #define MIPSX_ADDR_SIZE_KSEGX_BIT_SHIFT		30		// 62
 #define MIPSX_ADDR_SIZE_KSEGX_MASK_REMOVED	0x1fffffff	// 0x1fffffff

Added: user/jmallett/octeon/sys/mips/conf/OCTEON1-o32
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-o32	Fri Mar  5 02:52:23 2010	(r204747)
@@ -0,0 +1,94 @@
+# OCTEON1 -- Configuration kernel for all Octeon1 SoCs from Cavium Networks
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
+#
+# $FreeBSD: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 204680 2010-03-04 00:40:53Z jmallett $
+
+machine		mips
+cpu		CPU_MIPS4KC
+ident		OCTEON1
+
+# Don't build any modules yet.
+makeoptions	MODULES_OVERRIDE=""
+makeoptions     TARGET_BIG_ENDIAN=defined
+makeoptions	ARCH_FLAGS="-march=mips64 -mabi=32"
+makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.32
+
+makeoptions	KERNLOADADDR=0xffffffff81000000
+
+include		"../cavium/std.octeon1"
+
+hints		"OCTEON1.hints"		#Default places to look for devices.
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+
+options 	ISA_MIPS32
+
+options		DDB
+options		KDB
+
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		NFSCLIENT		#Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options         PSEUDOFS		#Pseudo-filesystem framework
+options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+#options	ROOTDEVNAME=\"ufs:ad0s1a\"	# Original
+options		NO_SWAPPING
+
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_COMPAT
+
+options         FFS                     #Berkeley Fast Filesystem
+options         SOFTUPDATES             #Enable FFS soft updates support
+options         UFS_ACL                 #Support for access control lists
+options         UFS_DIRHASH             #Improve performance on big directories
+
+
+# Debugging for use in -current
+#options		DEADLKRES	#Enable the deadlock resolver
+options		INVARIANTS		#Enable calls of extra sanity checking
+options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+#options		WITNESS			#Enable checks to detect deadlocks and cycles
+#options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+
+#XXXimp device		genclock
+device		loop
+device		ether
+device		md
+device		uart
+nodevice	uart_ns8250
+device		rgmii
+#options 	VERBOSE_SYSINIT
+
+device		bpf
+device		random
+
+#
+# Use the following for  Compact Flash file-system
+device 		cf
+options 	ROOTDEVNAME=\"ufs:cf0s1\"
+
+#
+# Use the following for RFS in mem-device
+#options         MD_ROOT
+#options         ROOTDEVNAME = \"ufs:md0\"
+
+#options         MD_ROOT_SIZE = 21264
+#XXX: Bring up UP first, then generalize.
+#options		SMP

Modified: user/jmallett/octeon/sys/mips/include/_bus.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/_bus.h	Fri Mar  5 00:54:28 2010	(r204746)
+++ user/jmallett/octeon/sys/mips/include/_bus.h	Fri Mar  5 02:52:23 2010	(r204747)
@@ -35,7 +35,7 @@
  * Bus address and size types
  */
 #include "opt_cputype.h" 
-#if defined(TARGET_OCTEON) && defined(__mips_n32)
+#if defined(TARGET_OCTEON) && (defined(__mips_n32) || defined(__mips_o32))
 typedef uint64_t bus_addr_t;
 #else
 typedef uintptr_t bus_addr_t;

Modified: user/jmallett/octeon/sys/mips/mips/bus_space_generic.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Fri Mar  5 00:54:28 2010	(r204746)
+++ user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Fri Mar  5 02:52:23 2010	(r204747)
@@ -198,7 +198,7 @@ static struct bus_space generic_space = 
 
 /* Ultra-gross kludge */
 #include "opt_cputype.h"
-#if defined(TARGET_OCTEON) && defined(__mips_n32)
+#if defined(TARGET_OCTEON) && (defined(__mips_n32) || defined(__mips_o32))
 #include 
 #define rd8(a) oct_read8(a)
 #define rd16(a) oct_read16(a)

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 04:26:30 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A34DA1065673;
	Fri,  5 Mar 2010 04:26:30 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91FE28FC19;
	Fri,  5 Mar 2010 04:26:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o254QUGs087896;
	Fri, 5 Mar 2010 04:26:30 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o254QUn0087894;
	Fri, 5 Mar 2010 04:26:30 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201003050426.o254QUn0087894@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 5 Mar 2010 04:26:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204749 - user/lstewart/alq_varlen_head/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 04:26:30 -0000

Author: lstewart
Date: Fri Mar  5 04:26:30 2010
New Revision: 204749
URL: http://svn.freebsd.org/changeset/base/204749

Log:
  A few niggling bits of cleanup:
  - Factor the ALQ destroy code out into a new function.
  - Ensure cleanup occurs if alq_open() fails to add the new ALQ to the ALD list.
  - Remove some gratuitous goto usage.
  - Ensure the module can't be forcibly unloaded if there are active ALQs.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  user/lstewart/alq_varlen_head/sys/kern/kern_alq.c

Modified: user/lstewart/alq_varlen_head/sys/kern/kern_alq.c
==============================================================================
--- user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Fri Mar  5 03:37:42 2010	(r204748)
+++ user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Fri Mar  5 04:26:30 2010	(r204749)
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2002, Jeffrey Roberson 
  * Copyright (c) 2008-2009, Lawrence Stewart 
- * Copyright (c) 2009, The FreeBSD Foundation
+ * Copyright (c) 2009-2010, The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed at the Centre for Advanced
@@ -101,6 +101,7 @@ static void ald_deactivate(struct alq *)
 
 /* Internal queue functions */
 static void alq_shutdown(struct alq *);
+static void alq_destroy(struct alq *);
 static int alq_doio(struct alq *);
 
 
@@ -113,14 +114,11 @@ ald_add(struct alq *alq)
 	int error;
 
 	error = 0;
-
 	ALD_LOCK();
-	if (ald_shutingdown) {
+	if (ald_shutingdown)
 		error = EBUSY;
-		goto done;
-	}
-	LIST_INSERT_HEAD(&ald_queues, alq, aq_link);
-done:
+	else
+		LIST_INSERT_HEAD(&ald_queues, alq, aq_link);
 	ALD_UNLOCK();
 	return (error);
 }
@@ -135,14 +133,11 @@ ald_rem(struct alq *alq)
 	int error;
 
 	error = 0;
-
 	ALD_LOCK();
-	if (ald_shutingdown) {
+	if (ald_shutingdown)
 		error = EBUSY;
-		goto done;
-	}
-	LIST_REMOVE(alq, aq_link);
-done:
+	else
+		LIST_REMOVE(alq, aq_link);
 	ALD_UNLOCK();
 	return (error);
 }
@@ -258,6 +253,18 @@ alq_shutdown(struct alq *alq)
 	crfree(alq->aq_cred);
 }
 
+void
+alq_destroy(struct alq *alq)
+{
+	/* Drain all pending IO. */
+	alq_shutdown(alq);
+
+	mtx_destroy(&alq->aq_mtx);
+	free(alq->aq_first, M_ALD);
+	free(alq->aq_entbuf, M_ALD);
+	free(alq, M_ALD);
+}
+
 /*
  * Flush all pending data to disk.  This operation will block.
  */
@@ -415,8 +422,11 @@ alq_open(struct alq **alqp, const char *
 
 	alp->ae_next = alq->aq_first;
 
-	if ((error = ald_add(alq)) != 0)
+	if ((error = ald_add(alq)) != 0) {
+		alq_destroy(alq);
 		return (error);
+	}
+
 	*alqp = alq;
 
 	return (0);
@@ -507,7 +517,9 @@ alq_post(struct alq *alq, struct ale *al
 void
 alq_flush(struct alq *alq)
 {
-	int needwakeup = 0;
+	int needwakeup;
+
+	needwakeup = 0;
 
 	ALD_LOCK();
 	ALQ_LOCK(alq);
@@ -529,35 +541,24 @@ alq_flush(struct alq *alq)
 void
 alq_close(struct alq *alq)
 {
-	/*
-	 * If we're already shuting down someone else will flush and close
-	 * the vnode.
-	 */
-	if (ald_rem(alq) != 0)
-		return;
-
-	/*
-	 * Drain all pending IO.
-	 */
-	alq_shutdown(alq);
-
-	mtx_destroy(&alq->aq_mtx);
-	free(alq->aq_first, M_ALD);
-	free(alq->aq_entbuf, M_ALD);
-	free(alq, M_ALD);
+	/* Only flush and destroy alq if not already shutting down. */
+	if (ald_rem(alq) == 0)
+		alq_destroy(alq);
 }
 
 static int
 alq_load_handler(module_t mod, int what, void *arg)
 {
-	int ret = 0;
+	int ret;
+	
+	ret = 0;
 
 	switch(what) {
 		case MOD_LOAD:
-		case MOD_UNLOAD:
 		case MOD_SHUTDOWN:
 			break;
-		
+
+		case MOD_UNLOAD:
 		case MOD_QUIESCE:
 			ALD_LOCK();
 			/* Only allow unload if there are no open queues. */

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 04:39:35 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 901CB106564A;
	Fri,  5 Mar 2010 04:39:35 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EC988FC23;
	Fri,  5 Mar 2010 04:39:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o254dZ0B090786;
	Fri, 5 Mar 2010 04:39:35 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o254dZkL090784;
	Fri, 5 Mar 2010 04:39:35 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003050439.o254dZkL090784@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 04:39:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204750 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 04:39:35 -0000

Author: jmallett
Date: Fri Mar  5 04:39:35 2010
New Revision: 204750
URL: http://svn.freebsd.org/changeset/base/204750

Log:
  Fix for o32.

Modified:
  user/jmallett/octeon/lib/libc/mips/gen/setjmp.S

Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Fri Mar  5 04:26:30 2010	(r204749)
+++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Fri Mar  5 04:39:35 2010	(r204750)
@@ -97,7 +97,9 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 	REG_S	s7, (_JB_REG_S7 * SZREG)(a0)
 	REG_S	sp, (_JB_REG_SP * SZREG)(a0)
 	REG_S	s8, (_JB_REG_S8 * SZREG)(a0)
+#if defined(__mips_n32) || defined(__mips_n64)
 	REG_S	gp, (_JB_REG_GP * SZREG)(a0)
+#endif
 	REG_EPILOGUE
 
 	move	v0, zero
@@ -144,7 +146,9 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	REG_L	s7, (_JB_REG_S7 * SZREG)(a0)
 	REG_L	sp, (_JB_REG_SP * SZREG)(a0)
 	REG_L	s8, (_JB_REG_S8 * SZREG)(a0)
+#if defined(__mips_n32) || defined(__mips_n64)
 	REG_L	gp, (_JB_REG_GP * SZREG)(a0)
+#endif
 
 	REG_EPILOGUE
 	move	v0, a1

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 05:01:07 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F27EB1065672;
	Fri,  5 Mar 2010 05:01:07 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E10258FC1A;
	Fri,  5 Mar 2010 05:01:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o25517Vq095610;
	Fri, 5 Mar 2010 05:01:07 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o255177S095608;
	Fri, 5 Mar 2010 05:01:07 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201003050501.o255177S095608@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 5 Mar 2010 05:01:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204751 - user/lstewart/alq_varlen_head/sys/modules
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 05:01:08 -0000

Author: lstewart
Date: Fri Mar  5 05:01:07 2010
New Revision: 204751
URL: http://svn.freebsd.org/changeset/base/204751

Log:
  Correct the alphabetical ordering of modules in the Makefile.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  user/lstewart/alq_varlen_head/sys/modules/Makefile

Modified: user/lstewart/alq_varlen_head/sys/modules/Makefile
==============================================================================
--- user/lstewart/alq_varlen_head/sys/modules/Makefile	Fri Mar  5 04:39:35 2010	(r204750)
+++ user/lstewart/alq_varlen_head/sys/modules/Makefile	Fri Mar  5 05:01:07 2010	(r204751)
@@ -20,10 +20,10 @@ SUBDIR=	${_3dfx} \
 	aio \
 	alc \
 	ale \
+	alq \
 	${_amd} \
 	${_amdsbwd} \
 	${_amdtemp} \
-	alq \
 	amr \
 	${_an} \
 	${_aout} \

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 06:06:21 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F4B0106564A;
	Fri,  5 Mar 2010 06:06:21 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AE9B8FC14;
	Fri,  5 Mar 2010 06:06:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2566Lm3010313;
	Fri, 5 Mar 2010 06:06:21 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2566LD2010306;
	Fri, 5 Mar 2010 06:06:21 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003050606.o2566LD2010306@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 06:06:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204752 - in user/jmallett/octeon:
	contrib/gcc/config/mips gnu/lib/libgcc
	gnu/usr.bin/binutils/ld lib/libc lib/libc/mips share/mk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 06:06:21 -0000

Author: jmallett
Date: Fri Mar  5 06:06:20 2010
New Revision: 204752
URL: http://svn.freebsd.org/changeset/base/204752

Log:
  Remove N32-related things that prevent building O32 world.  Commits to come to
  add support for setting the default ABI.

Modified:
  user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
  user/jmallett/octeon/gnu/lib/libgcc/Makefile
  user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
  user/jmallett/octeon/lib/libc/Makefile
  user/jmallett/octeon/lib/libc/mips/Makefile.inc
  user/jmallett/octeon/share/mk/bsd.cpu.mk

Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
==============================================================================
--- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Fri Mar  5 06:06:20 2010	(r204752)
@@ -307,7 +307,6 @@ Boston, MA 02110-1301, USA.  */
 #undef  LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX "."
 
-#if 0
 /* Currently we don't support 128bit long doubles, so for now we force
    n32 to be 64bit.  */
 #undef	LONG_DOUBLE_TYPE_SIZE
@@ -317,7 +316,6 @@ Boston, MA 02110-1301, USA.  */
 #undef	LIBGCC2_LONG_DOUBLE_TYPE_SIZE
 #define	LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64
 #endif
-#endif
 
 /************************[  Debugger stuff  ]*********************************/
 

Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/lib/libgcc/Makefile	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/gnu/lib/libgcc/Makefile	Fri Mar  5 06:06:20 2010	(r204752)
@@ -90,11 +90,6 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsu
     _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \
     _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf
 
-.if ${TARGET_ARCH} == "mips"
-FPBIT_FUNCS += _sf_to_tf
-DPBIT_FUNCS += _df_to_tf
-.endif
-
 # These might cause a divide overflow trap and so are compiled with
 # unwinder info.
 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
@@ -121,8 +116,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns
 .endif
 
 .if ${TARGET_ARCH} == "mips"
-CFLAGS+=	-D__LDBL_MANT_DIG__=113
-#LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
+LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 .endif
 
 .if ${TARGET_ARCH} == "ia64"
@@ -189,7 +183,7 @@ OBJ_GRPS =	STD DIV
 #
 # Floating point emulation functions
 #
-.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \
+.if ${TARGET_ARCH} == "armNOT_YET" || \
     ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 
 FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
@@ -201,14 +195,6 @@ DPBIT_CFILE =	config/fp-bit.c
 OBJ_GRPS +=	FPBIT DPBIT
 .endif
 
-.if ${TARGET_ARCH} == "mips"
-TPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DTFLOAT
-
-TPBIT_CFILE =	config/fp-bit.c
-
-OBJ_GRPS +=	TPBIT
-.endif
-
 #-----------------------------------------------------------------------
 #
 # Generic build rules for object groups defined above

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Fri Mar  5 06:06:20 2010	(r204752)
@@ -5,9 +5,9 @@
 # of mipsel and mips.
 _sz?=32
 .if defined(TARGET_BIG_ENDIAN)
-NATIVE_EMULATION=elf${_sz}btsmipn32_fbsd
+NATIVE_EMULATION=elf${_sz}btsmip_fbsd
 .else
-NATIVE_EMULATION=elf${_sz}ltsmipn32_fbsd
+NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
 .endif
 
 MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \

Modified: user/jmallett/octeon/lib/libc/Makefile
==============================================================================
--- user/jmallett/octeon/lib/libc/Makefile	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/lib/libc/Makefile	Fri Mar  5 06:06:20 2010	(r204752)
@@ -65,7 +65,8 @@ NOASM=
 .include "${.CURDIR}/rpc/Makefile.inc"
 .include "${.CURDIR}/uuid/Makefile.inc"
 .include "${.CURDIR}/xdr/Makefile.inc"
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_ARCH} == "arm" || \
+    ${MACHINE_ARCH} == "mips"
 .include "${.CURDIR}/softfloat/Makefile.inc"
 .endif
 .if ${MK_NIS} != "no"

Modified: user/jmallett/octeon/lib/libc/mips/Makefile.inc
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/Makefile.inc	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/lib/libc/mips/Makefile.inc	Fri Mar  5 06:06:20 2010	(r204752)
@@ -1,5 +1,9 @@
 #	$NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $
 # $FreeBSD$
 
+SOFTFLOAT_BITS=32
+
+CFLAGS+=-DSOFTFLOAT
+
 MDSRCS+= machdep_ldisd.c
 SYM_MAPS+= ${.CURDIR}/mips/Symbol.map

Modified: user/jmallett/octeon/share/mk/bsd.cpu.mk
==============================================================================
--- user/jmallett/octeon/share/mk/bsd.cpu.mk	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/share/mk/bsd.cpu.mk	Fri Mar  5 06:06:20 2010	(r204752)
@@ -208,7 +208,6 @@ LD += -EB
 CFLAGS += -EL
 LD += -EL
 . endif
-CFLAGS += -mabi=n32
 CFLAGS += -G0
 .endif
 

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 20:31:30 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74284106564A;
	Fri,  5 Mar 2010 20:31:29 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 756BB8FC23;
	Fri,  5 Mar 2010 20:31:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o25KVTun004339;
	Fri, 5 Mar 2010 20:31:29 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25KVTPI004337;
	Fri, 5 Mar 2010 20:31:29 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003052031.o25KVTPI004337@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 20:31:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204768 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 20:31:30 -0000

Author: jmallett
Date: Fri Mar  5 20:31:29 2010
New Revision: 204768
URL: http://svn.freebsd.org/changeset/base/204768

Log:
  Disable and restore interrupts around the times when there may be 64 significant
  bits in registers.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Fri Mar  5 20:00:43 2010	(r204767)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Fri Mar  5 20:31:29 2010	(r204768)
@@ -159,6 +159,8 @@ OCT_READ(64, uint64_t, "ld");
  * I'd be a lot happier if csr_addr were a physical address and we mapped it
  * into XKPHYS here so that we could guarantee that interrupts were the only
  * kind of exception we needed to worry about.
+ *
+ * Also, some of this inline assembly is needlessly verbose.  Oh, well.
  */
 static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
@@ -169,6 +171,9 @@ static inline void oct_write64 (uint64_t
 	uint32_t tmp1;
 	uint32_t tmp2;
 	uint32_t tmp3;
+	register_t sr;
+
+	sr = intr_disable();
 
 	__asm __volatile (
 	    ".set push\n"
@@ -187,6 +192,8 @@ static inline void oct_write64 (uint64_t
             ".set pop\n"
 	    : "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)
 	    : "r" (valh), "r" (vall), "r" (csr_addrh), "r" (csr_addrl));
+
+	intr_restore(sr);
 }
 
 static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
@@ -195,6 +202,9 @@ static inline void oct_write8_x8 (uint64
 	uint32_t csr_addrl = csr_addr;
 	uint32_t tmp1;
 	uint32_t tmp2;
+	register_t sr;
+
+	sr = intr_disable();
 
 	__asm __volatile (
 	    ".set push\n"
@@ -209,6 +219,8 @@ static inline void oct_write8_x8 (uint64
             ".set pop\n"
 	    : "=&r" (tmp1), "=&r" (tmp2)
 	    : "r" (val8), "r" (csr_addrh), "r" (csr_addrl));
+
+	intr_restore(sr);
 }
 
 #define	OCT_READ(n, t, insn)						\
@@ -217,6 +229,9 @@ static inline t oct_read ## n(uint64_t c
 	uint32_t csr_addrh = csr_addr >> 32;				\
 	uint32_t csr_addrl = csr_addr;					\
 	uint32_t tmp1, tmp2;						\
+	register_t sr;							\
+									\
+	sr = intr_disable();						\
 									\
 	__asm __volatile (						\
 	    ".set push\n"						\
@@ -231,6 +246,9 @@ static inline t oct_read ## n(uint64_t c
 	    ".set pop\n"						\
 	    : "=&r" (tmp1), "=&r" (tmp2)				\
 	    : "r" (csr_addrh), "r" (csr_addrl));			\
+									\
+	intr_restore(sr);						\
+									\
 	return ((t)tmp2);						\
 }
 
@@ -244,6 +262,9 @@ static inline uint64_t oct_read64 (uint6
 	uint32_t csr_addrl = csr_addr;
 	uint32_t valh;
 	uint32_t vall;
+	register_t sr;
+
+	sr = intr_disable();
 
 	__asm __volatile (
 	    ".set push\n"
@@ -261,6 +282,9 @@ static inline uint64_t oct_read64 (uint6
 	    ".set pop\n"
 	    : "=&r" (valh), "=&r" (vall)
 	    : "r" (csr_addrh), "r" (csr_addrl));
+
+	intr_restore(sr);
+
 	return ((uint64_t)valh << 32) | vall;
 }
 #endif

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 20:51:41 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C4D36106566C;
	Fri,  5 Mar 2010 20:51:41 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99C628FC1C;
	Fri,  5 Mar 2010 20:51:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o25Kpf6K008927;
	Fri, 5 Mar 2010 20:51:41 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25KpeTJ008896;
	Fri, 5 Mar 2010 20:51:40 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003052051.o25KpeTJ008896@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 20:51:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204769 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 20:51:41 -0000

Author: jmallett
Date: Fri Mar  5 20:51:40 2010
New Revision: 204769
URL: http://svn.freebsd.org/changeset/base/204769

Log:
  o) Add back old ABI support for syscalls.
  o) Zero args before use so that they aren't filled with garbage if something
     goes wrong in the syscall handling.

Modified:
  user/jmallett/octeon/sys/mips/mips/trap.c

Modified: user/jmallett/octeon/sys/mips/mips/trap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/trap.c	Fri Mar  5 20:31:29 2010	(r204768)
+++ user/jmallett/octeon/sys/mips/mips/trap.c	Fri Mar  5 20:51:40 2010	(r204769)
@@ -608,6 +608,8 @@ dofault:
 			int nargs, nsaved;
 			register_t args[8];
 
+			bzero(args, sizeof args);
+
 			/*
 			 * note: PCPU_LAZY_INC() can only be used if we can
 			 * afford occassional inaccuracy in the count.
@@ -630,9 +632,17 @@ dofault:
 			code = locr0->v0;
 
 			switch (code) {
-			case SYS_syscall:
+#if defined(__mips_n32) || defined(__mips_n64)
 			case SYS___syscall:
 				/*
+				 * Quads fit in a single register in
+				 * new ABIs.
+				 *
+				 * XXX o64?
+				 */
+#endif
+			case SYS_syscall:
+				/*
 				 * Code is first argument, followed by
 				 * actual args.
 				 */
@@ -640,23 +650,47 @@ dofault:
 				args[0] = locr0->a1;
 				args[1] = locr0->a2;
 				args[2] = locr0->a3;
+				nsaved = 3;
+#if defined(__mips_n32) || defined(__mips_n64)
 				args[3] = locr0->t4;
 				args[4] = locr0->t5;
 				args[5] = locr0->t6;
 				args[6] = locr0->t7;
-				nsaved = 7;
+				nsaved += 4;
+#endif
+				break;
+
+#if defined(__mips_o32)
+			case SYS___syscall:
+				/*
+				 * Like syscall, but code is a quad, so as
+				 * to maintain quad alignment for the rest
+				 * of the arguments.
+				 */
+				if (_QUAD_LOWWORD == 0) {
+					code = locr0->a0;
+				} else {
+					code = locr0->a1;
+				}
+				args[0] = locr0->a2;
+				args[1] = locr0->a3;
+				nsaved = 2;
 				break;
+#endif
 
 			default:
 				args[0] = locr0->a0;
 				args[1] = locr0->a1;
 				args[2] = locr0->a2;
 				args[3] = locr0->a3;
+				nsaved = 4;
+#if defined (__mips_n32) || defined(__mips_n64)
 				args[4] = locr0->t4;
 				args[5] = locr0->t5;
 				args[6] = locr0->t6;
 				args[7] = locr0->t7;
-				nsaved = 8;
+				nsaved += 4;
+#endif
 			}
 #ifdef TRAP_DEBUG
 			printf("SYSCALL #%d pid:%u\n", code, p->p_pid);
@@ -673,6 +707,15 @@ dofault:
 			nargs = callp->sy_narg;
 
 			if (nargs > nsaved) {
+#if defined(__mips_n32) || defined(__mips_n64)
+				/*
+				 * XXX
+				 * Is this right for new ABIs?  I think the 4 there
+				 * should be 8, size there are 8 registers to skip,
+				 * not 4, but I'm not certain.
+				 */
+				printf("SYSCALL #%u pid:%u, nargs > nsaved.\n", code, p->p_pid);
+#endif
 				i = copyin((caddr_t)(intptr_t)(locr0->sp +
 				    4 * sizeof(register_t)), (caddr_t)&args[nsaved],
 				    (u_int)(nargs - nsaved) * sizeof(register_t));

From owner-svn-src-user@FreeBSD.ORG  Fri Mar  5 23:14:02 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 444791065673;
	Fri,  5 Mar 2010 23:14:02 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F4528FC14;
	Fri,  5 Mar 2010 23:14:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o25NE2U2041991;
	Fri, 5 Mar 2010 23:14:02 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25NE1Cx041951;
	Fri, 5 Mar 2010 23:14:01 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003052314.o25NE1Cx041951@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 5 Mar 2010 23:14:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204784 - in user/jmallett/octeon: bin/ed bin/ps
	contrib/gcc/config/mips etc/defaults etc/rc.d
	gnu/usr.bin/binutils/ld gnu/usr.bin/cc gnu/usr.bin/dtc lib
	lib/csu lib/csu/amd64 lib/csu/a...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 05 Mar 2010 23:14:02 -0000

Author: jmallett
Date: Fri Mar  5 23:14:01 2010
New Revision: 204784
URL: http://svn.freebsd.org/changeset/base/204784

Log:
  Merge from head.

Added:
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslpredef.c
     - copied unchanged from r204782, head/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exdebug.c
     - copied unchanged from r204782, head/sys/contrib/dev/acpica/executer/exdebug.c
  user/jmallett/octeon/tools/regression/usr.bin/apply/
     - copied from r204782, head/tools/regression/usr.bin/apply/
Modified:
  user/jmallett/octeon/bin/ed/Makefile
  user/jmallett/octeon/bin/ed/main.c
  user/jmallett/octeon/bin/ps/ps.1
  user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
  user/jmallett/octeon/etc/defaults/rc.conf
  user/jmallett/octeon/etc/rc.d/jail
  user/jmallett/octeon/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
  user/jmallett/octeon/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
  user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc
  user/jmallett/octeon/gnu/usr.bin/dtc/Makefile
  user/jmallett/octeon/lib/Makefile
  user/jmallett/octeon/lib/csu/Makefile.inc
  user/jmallett/octeon/lib/csu/amd64/crt1.c
  user/jmallett/octeon/lib/csu/arm/Makefile
  user/jmallett/octeon/lib/csu/arm/crt1.c
  user/jmallett/octeon/lib/csu/ia64/Makefile
  user/jmallett/octeon/lib/csu/mips/Makefile
  user/jmallett/octeon/lib/csu/mips/crt1.c
  user/jmallett/octeon/lib/csu/powerpc/Makefile
  user/jmallett/octeon/lib/csu/powerpc/crt1.c
  user/jmallett/octeon/lib/csu/sparc64/crt1.c
  user/jmallett/octeon/lib/libc/posix1e/acl_add_flag_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_clear_flags_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_delete_flag_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_get_brand_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_get_entry_type_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_get_flag_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_get_flagset_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_set_entry_type_np.3
  user/jmallett/octeon/lib/libc/posix1e/acl_set_flagset_np.3
  user/jmallett/octeon/lib/libsm/Makefile
  user/jmallett/octeon/libexec/rtld-elf/mips/reloc.c
  user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S
  user/jmallett/octeon/sbin/geom/class/cache/gcache.8
  user/jmallett/octeon/sbin/geom/class/mountver/gmountver.8
  user/jmallett/octeon/sbin/ipfw/dummynet.c
  user/jmallett/octeon/sbin/ipfw/ipfw.8
  user/jmallett/octeon/sbin/ipfw/ipfw2.c
  user/jmallett/octeon/sbin/ipfw/main.c
  user/jmallett/octeon/share/man/man4/ada.4
  user/jmallett/octeon/share/man/man4/ahci.4
  user/jmallett/octeon/share/man/man4/cd.4
  user/jmallett/octeon/share/man/man4/ch.4
  user/jmallett/octeon/share/man/man4/da.4
  user/jmallett/octeon/share/man/man4/ohci.4
  user/jmallett/octeon/share/man/man4/pass.4
  user/jmallett/octeon/share/man/man4/pt.4
  user/jmallett/octeon/share/man/man4/sa.4
  user/jmallett/octeon/share/man/man4/scsi.4
  user/jmallett/octeon/share/man/man4/siis.4
  user/jmallett/octeon/share/man/man4/udbp.4
  user/jmallett/octeon/share/man/man4/uhci.4
  user/jmallett/octeon/share/man/man4/ukbd.4
  user/jmallett/octeon/share/man/man4/umass.4
  user/jmallett/octeon/share/man/man4/ums.4
  user/jmallett/octeon/share/man/man4/usb.4
  user/jmallett/octeon/share/man/man5/rc.conf.5
  user/jmallett/octeon/sys/arm/mv/common.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/kirkwood.c
  user/jmallett/octeon/sys/conf/files
  user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32   (contents, props changed)
  user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64   (contents, props changed)
  user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.n32   (contents, props changed)
  user/jmallett/octeon/sys/contrib/dev/acpica/changes.txt
  user/jmallett/octeon/sys/contrib/dev/acpica/common/dmextern.c
  user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtable.c
  user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbdump.c
  user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslmain.c
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslmap.c
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltypes.h
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsfield.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmethod.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmthdat.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsobject.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsopcode.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dswexec.c
  user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dswstate.c
  user/jmallett/octeon/sys/contrib/dev/acpica/events/evevent.c
  user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpe.c
  user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeblk.c
  user/jmallett/octeon/sys/contrib/dev/acpica/events/evmisc.c
  user/jmallett/octeon/sys/contrib/dev/acpica/events/evxface.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exconvrt.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/excreate.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exfield.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exfldio.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exmisc.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exmutex.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exnames.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg1.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg2.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg3.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg6.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exprep.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exregion.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exresnte.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exresolv.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exresop.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exstore.c
  user/jmallett/octeon/sys/contrib/dev/acpica/executer/exsystem.c
  user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwregs.c
  user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwsleep.c
  user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwvalid.c
  user/jmallett/octeon/sys/contrib/dev/acpica/include/acdisasm.h
  user/jmallett/octeon/sys/contrib/dev/acpica/include/acglobal.h
  user/jmallett/octeon/sys/contrib/dev/acpica/include/acinterp.h
  user/jmallett/octeon/sys/contrib/dev/acpica/include/acoutput.h
  user/jmallett/octeon/sys/contrib/dev/acpica/include/acpixf.h
  user/jmallett/octeon/sys/contrib/dev/acpica/include/actbl2.h
  user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsaccess.c
  user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsdump.c
  user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsnames.c
  user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nssearch.c
  user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsutils.c
  user/jmallett/octeon/sys/contrib/dev/acpica/parser/psargs.c
  user/jmallett/octeon/sys/contrib/dev/acpica/parser/psloop.c
  user/jmallett/octeon/sys/contrib/dev/acpica/resources/rscreate.c
  user/jmallett/octeon/sys/contrib/dev/acpica/resources/rslist.c
  user/jmallett/octeon/sys/contrib/dev/acpica/resources/rsmisc.c
  user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbfadt.c
  user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbutils.c
  user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbxfroot.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utalloc.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utdelete.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/uteval.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utmisc.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utmutex.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utobject.c
  user/jmallett/octeon/sys/contrib/dev/acpica/utilities/uttrack.c
  user/jmallett/octeon/sys/dev/acpica/acpi.c
  user/jmallett/octeon/sys/dev/ispfw/ispfw.c
  user/jmallett/octeon/sys/kern/imgact_elf.c
  user/jmallett/octeon/sys/mips/include/cpuinfo.h
  user/jmallett/octeon/sys/mips/mips/busdma_machdep.c
  user/jmallett/octeon/sys/mips/mips/cpu.c
  user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_fw_sockopt.c
  user/jmallett/octeon/sys/netinet/ipfw/test/dn_test.h
  user/jmallett/octeon/sys/netinet/ipfw/test/mylist.h
  user/jmallett/octeon/sys/netinet/ipfw/test/test_dn_sched.c
  user/jmallett/octeon/sys/pc98/cbus/clock.c
  user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c
  user/jmallett/octeon/sys/powerpc/powermac/smu.c
  user/jmallett/octeon/tools/regression/usr.bin/Makefile
  user/jmallett/octeon/usr.bin/apply/Makefile
  user/jmallett/octeon/usr.bin/apply/apply.c
  user/jmallett/octeon/usr.bin/chpass/Makefile
  user/jmallett/octeon/usr.bin/ncal/Makefile
  user/jmallett/octeon/usr.bin/ncal/ncal.1
  user/jmallett/octeon/usr.bin/ncal/ncal.c
  user/jmallett/octeon/usr.sbin/Makefile
  user/jmallett/octeon/usr.sbin/acpi/acpidb/Makefile
  user/jmallett/octeon/usr.sbin/acpi/iasl/Makefile
  user/jmallett/octeon/usr.sbin/mount_nwfs/Makefile
  user/jmallett/octeon/usr.sbin/mount_nwfs/mount_nwfs.c
Directory Properties:
  user/jmallett/octeon/   (props changed)
  user/jmallett/octeon/sys/contrib/dev/acpica/   (props changed)

Modified: user/jmallett/octeon/bin/ed/Makefile
==============================================================================
--- user/jmallett/octeon/bin/ed/Makefile	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/bin/ed/Makefile	Fri Mar  5 23:14:01 2010	(r204784)
@@ -4,7 +4,6 @@
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
-WARNS?=	2
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 

Modified: user/jmallett/octeon/bin/ed/main.c
==============================================================================
--- user/jmallett/octeon/bin/ed/main.c	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/bin/ed/main.c	Fri Mar  5 23:14:01 2010	(r204784)
@@ -103,15 +103,10 @@ const char usage[] = "usage: %s [-] [-sx
 
 /* ed: line editor */
 int
-main(int argc, char *argv[])
+main(volatile int argc, char ** volatile argv)
 {
 	int c, n;
 	long status = 0;
-#if __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &argc;
-	(void) &argv;
-#endif
 
 	(void)setlocale(LC_ALL, "");
 

Modified: user/jmallett/octeon/bin/ps/ps.1
==============================================================================
--- user/jmallett/octeon/bin/ps/ps.1	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/bin/ps/ps.1	Fri Mar  5 23:14:01 2010	(r204784)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2009
+.Dd March 5, 2010
 .Dt PS 1
 .Os
 .Sh NAME
@@ -284,11 +284,10 @@ The percentage of real memory used by th
 The flags associated with the process as in
 the include file
 .In sys/proc.h :
-.Bl -column P_STOPPED_SINGLE 0x4000000
+.Bl -column P_SINGLE_BOUNDARY 0x40000000
 .It Dv "P_ADVLOCK" Ta No "0x00001	Process may hold a POSIX advisory lock"
 .It Dv "P_CONTROLT" Ta No "0x00002	Has a controlling terminal"
 .It Dv "P_KTHREAD" Ta No "0x00004	Kernel thread"
-.It Dv "P_NOLOAD" Ta No "0x00008	Ignore during load avg calculations"
 .It Dv "P_PPWAIT" Ta No "0x00010	Parent is waiting for child to exec/exit"
 .It Dv "P_PROFIL" Ta No "0x00020	Has started profiling"
 .It Dv "P_STOPPROF" Ta No "0x00040	Has thread in requesting to stop prof"
@@ -305,8 +304,14 @@ the include file
 .It Dv "P_STOPPED_SINGLE" Ta No "0x80000	Only one thread can continue"
 .It Dv "P_PROTECTED" Ta No "0x100000	Do not kill on memory overcommit"
 .It Dv "P_SIGEVENT" Ta No "0x200000	Process pending signals changed"
+.It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000	Threads should suspend at user boundary"
+.It Dv "P_HWPMC" Ta No "0x800000	Process is using HWPMCs"
 .It Dv "P_JAILED" Ta No "0x1000000	Process is in jail"
 .It Dv "P_INEXEC" Ta No "0x4000000	Process is in execve()"
+.It Dv "P_STATCHILD" Ta No "0x8000000	Child process stopped or exited"
+.It Dv "P_INMEM" Ta No "0x10000000	Loaded into memory"
+.It Dv "P_SWAPPINGOUT" Ta No "0x20000000	Process is being swapped out"
+.It Dv "P_SWAPPINGIN" Ta No "0x40000000	Process is being swapped in"
 .El
 .It Cm label
 The MAC label of the process.
@@ -615,6 +620,13 @@ wait channel (as a symbolic name)
 .It Cm xstat
 exit or stop status (valid only for stopped or zombie process)
 .El
+.Pp
+Note that the
+.Cm pending
+column displays bitmask of signals pending in the process queue when
+.Fl H
+option is not specified, otherwise the per-thread queue of pending signals
+is shown.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :

Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
==============================================================================
--- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Fri Mar  5 23:14:01 2010	(r204784)
@@ -65,19 +65,23 @@ Boston, MA 02110-1301, USA.  */
 
 #undef	LINK_SPEC
 #define LINK_SPEC "\
-    %{G*} %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips32r2} %{mips64} \
+    %{EB} %{EL} %(endian_spec) \
+    %{G*} %{mips1} %{mips2} %{mips3} %{mips4} \
+    %{mips32} %{mips32r2} %{mips64} %{mips64r2} \
     %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
-    %(fbsd_link_spec) "
-#if 0
-    %(endian_spec)
-#endif
+    %{mabi=32:-melf32%{EB:b}%{EL:l}tsmip_fbsd} \
+    %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32_fbsd} \
+    %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \
+    %{mabi=o64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \
+    %(fbsd_link_spec)"
+
     
 /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
    but trashed by config/mips/elf.h.  */
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC	FBSD_STARTFILE_SPEC
 
-/* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  */
+/* Provide an ENDFILE_SPEC appropriate for FreeBSD/mips.  */
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC	FBSD_ENDFILE_SPEC
 
@@ -250,12 +254,28 @@ Boston, MA 02110-1301, USA.  */
     }								\
   while (0)
 
-/* Default to the mips32 ISA */
-#undef  DRIVER_SELF_SPECS
+/* Default ABI and ISA */
+#undef DRIVER_SELF_SPECS
+#if MIPS_ABI_DEFAULT == ABI_N32
 #define DRIVER_SELF_SPECS \
-  "%{!march=*: -march=mips32}"
-#if 0
-  "%{!EB:%{!EL:%(endian_spec)}}", 
+	"%{!EB:%{!EL:%(endian_spec)}}", \
+	"%{!march=*: -march=mips64}",   \
+	"%{!mabi=*: -mabi=n32}"
+#elif MIPS_ABI_DEFAULT == ABI_64
+#define DRIVER_SELF_SPECS \
+	"%{!EB:%{!EL:%(endian_spec)}}", \
+	"%{!march=*: -march=mips64}",   \
+	"%{!mabi=*: -mabi=64}"
+#elif MIPS_ABI_DEFAULT == ABI_O64
+#define DRIVER_SELF_SPECS \
+	"%{!EB:%{!EL:%(endian_spec)}}", \
+	"%{!march=*: -march=mips64}",   \
+	"%{!mabi=*: -mabi=o64}"
+#else /* default to o32 */
+#define DRIVER_SELF_SPECS \
+	"%{!EB:%{!EL:%(endian_spec)}}", \
+	"%{!march=*: -march=mips32}",   \
+	"%{!mabi=*: -mabi=32}"
 #endif
 
 #if 0

Modified: user/jmallett/octeon/etc/defaults/rc.conf
==============================================================================
--- user/jmallett/octeon/etc/defaults/rc.conf	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/etc/defaults/rc.conf	Fri Mar  5 23:14:01 2010	(r204784)
@@ -637,6 +637,7 @@ mixer_enable="YES"	# Run the sound mixer
 ### Jail Configuration #######################################
 ##############################################################
 jail_enable="NO"	# Set to NO to disable starting of any jails
+jail_parallel_start="NO"	# Start jails in the background
 jail_list=""		# Space separated list of names of jails
 jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
 jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail

Modified: user/jmallett/octeon/etc/rc.d/jail
==============================================================================
--- user/jmallett/octeon/etc/rc.d/jail	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/etc/rc.d/jail	Fri Mar  5 23:14:01 2010	(r204784)
@@ -636,7 +636,8 @@ jail_start()
 		done
 
 		eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \
-			\"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1
+			\"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1 \
+			
-#ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $");
-#endif /* not lint */
+__FBSDID("$FreeBSD$");
 
 #include 
 #include 
@@ -43,10 +41,6 @@ __RCSID("$NetBSD: mips_reloc.c,v 1.58 20
 #include "debug.h"
 #include "rtld.h"
 
-#ifdef __mips_o32
-#define SUPPORT_OLD_BROKEN_LD
-#endif
-
 void
 init_pltgot(Obj_Entry *obj)
 {
@@ -70,7 +64,6 @@ void _rtld_relocate_nonplt_self(Elf_Dyn 
  * It is possible for the compiler to emit relocations for unaligned data.
  * We handle this situation with these inlines.
  */
-
 #if ELFSIZE == 64
 /*
  * ELF64 MIPS encodes the relocs uniquely.  The first 32-bits of info contain
@@ -135,7 +128,6 @@ store_ptr(void *where, Elf_Sxword val, s
 #endif
 }
 
-
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
 {

Modified: user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S
==============================================================================
--- user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/libexec/rtld-elf/mips/rtld_start.S	Fri Mar  5 23:14:01 2010	(r204784)
@@ -26,6 +26,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #include 
@@ -138,7 +140,7 @@ _rtld_bind_start:
 	 nop
 
 	move	sp, s0
-	REG_L	ra, XCALLFRAME_RA(sp)		
+	REG_L	ra, XCALLFRAME_RA(sp)
 	REG_L	s0, XCALLFRAME_S0(sp)
 	REG_L	a0, XCALLFRAME_A0(sp)
 	REG_L	a1, XCALLFRAME_A1(sp)

Modified: user/jmallett/octeon/sbin/geom/class/cache/gcache.8
==============================================================================
--- user/jmallett/octeon/sbin/geom/class/cache/gcache.8	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/sbin/geom/class/cache/gcache.8	Fri Mar  5 23:14:01 2010	(r204784)
@@ -14,14 +14,14 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"

Modified: user/jmallett/octeon/sbin/geom/class/mountver/gmountver.8
==============================================================================
--- user/jmallett/octeon/sbin/geom/class/mountver/gmountver.8	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/sbin/geom/class/mountver/gmountver.8	Fri Mar  5 23:14:01 2010	(r204784)
@@ -14,14 +14,14 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"

Modified: user/jmallett/octeon/sbin/ipfw/dummynet.c
==============================================================================
--- user/jmallett/octeon/sbin/ipfw/dummynet.c	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/sbin/ipfw/dummynet.c	Fri Mar  5 23:14:01 2010	(r204784)
@@ -10,8 +10,6 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * NEW command line interface for IP firewall facility
- *
  * $FreeBSD$
  *
  * dummynet support
@@ -1243,8 +1241,8 @@ dummynet_flush(void)
 void
 dummynet_list(int ac, char *av[], int show_counters)
 {
-	struct dn_id oid, *x;
-	int ret, l = sizeof(oid);
+	struct dn_id oid, *x = NULL;
+	int ret, i, l = sizeof(oid);
 
 	oid_fill(&oid, l, DN_CMD_GET, DN_API_VERSION);
 	switch (co.do_pipe) {
@@ -1258,14 +1256,29 @@ dummynet_list(int ac, char *av[], int sh
 		oid.subtype = DN_SCH;	/* list sched */
 		break;
 	}
+
+	/* Request the buffer size (in oid.id)*/
 	ret = do_cmd(-IP_DUMMYNET3, &oid, (uintptr_t)&l);
 	// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
 	if (ret != 0 || oid.id <= sizeof(oid))
 		return;
-	l = oid.id;
-	x = safe_calloc(1, l);
+
+	/* Try max 10 times
+	 * Buffer is correct if l != 0.
+	 * If l == 0 no buffer is sent, maybe because kernel requires 
+	 * a greater buffer, so try with the new size in x->id.
+	 */
+	for (i = 0, l = oid.id; i < 10; i++, l = x->id) {
+		x = safe_realloc(x, l);
 	*x = oid;
 	ret = do_cmd(-IP_DUMMYNET3, x, (uintptr_t)&l);
+
+		if (ret != 0 || x->id <= sizeof(oid))
+			return;
+
+		if (l != 0)
+			break; /* ok */
+	}
 	// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
 	// XXX filter on ac, av
 	list_pipes(x, O_NEXT(x, l));

Modified: user/jmallett/octeon/sbin/ipfw/ipfw.8
==============================================================================
--- user/jmallett/octeon/sbin/ipfw/ipfw.8	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/sbin/ipfw/ipfw.8	Fri Mar  5 23:14:01 2010	(r204784)
@@ -1404,7 +1404,7 @@ If not found, the match fails.
 Otherwise, the match succeeds and
 .Cm tablearg
 is set to the value extracted from the table.
-.Br
+.Pp
 This option can be useful to quickly dispatch traffic based on
 certain packet fields.
 See the
@@ -1847,7 +1847,7 @@ is also the user interface for the
 .Nm dummynet
 traffic shaper, packet scheduler and network emulator, a subsystem that
 can artificially queue, delay or drop packets
-emulator the behaviour of certain network links
+emulating the behaviour of certain network links
 or queueing systems.
 .Pp
 .Nm dummynet
@@ -1859,26 +1859,33 @@ Matching packets are then passed to eith
 different objects, which implement the traffic regulation:
 .Bl -hang -offset XXXX
 .It Em pipe
-A pipe emulates a link with given bandwidth, propagation delay,
+A
+.Em pipe
+emulates a
+.Em link
+with given bandwidth and propagation delay,
+driven by a FIFO scheduler and a single queue with programmable
 queue size and packet loss rate.
-Packets are queued in front of the pipe as they come out from the classifier,
-and then transferred to the pipe according to the pipe's parameters.
+Packets are appended to the queue as they come out from
+.Nm ipfw ,
+and then transferred in FIFO order to the link at the desired rate.
 .It Em queue
-A queue
+A
+.Em queue
 is an abstraction used to implement packet scheduling
 using one of several packet scheduling algorithms.
-.Pp
-The queue associates a
-.Em weight
-and a reference scheduler to each flow (a flow is a set of packets
-with the same addresses and ports after masking).
-A scheduler in turn is connected to a pipe, and arbitrates
-the pipe's bandwidth among backlogged flows according to
+Packets sent to a
+.Em queue
+are first grouped into flows according to a mask on the 5-tuple.
+Flows are then passed to the scheduler associated to the
+.Em queue ,
+and each flow uses scheduling parameters (weight and others)
+as configured in the
+.Em queue
+itself.
+A scheduler in turn is connected to an emulated link,
+and arbitrates the link's bandwidth among backlogged flows according to
 weights and to the features of the scheduling algorithm in use.
-.Pp
-Note that weights are not priorities; a flow with a lower weight
-is still guaranteed to get its fraction of the bandwidth even if a
-flow with a higher weight is permanently backlogged.
 .El
 .Pp
 In practice,
@@ -1887,6 +1894,52 @@ can be used to set hard limits to the ba
 .Em queues
 can be used to determine how different flows share the available bandwidth.
 .Pp
+A graphical representation of the binding of queues,
+flows, schedulers and links is below.
+.Bd -literal -offset indent
+                 (flow_mask|sched_mask)  sched_mask
+         +---------+   weight Wx  +-------------+
+         |         |->-[flow]-->--|             |-+
+    -->--| QUEUE x |   ...        |             | |
+         |         |->-[flow]-->--| SCHEDuler N | |
+         +---------+              |             | |
+             ...                  |             +--[LINK N]-->--
+         +---------+   weight Wy  |             | +--[LINK N]-->--
+         |         |->-[flow]-->--|             | |
+    -->--| QUEUE y |   ...        |             | |
+         |         |->-[flow]-->--|             | |
+         +---------+              +-------------+ |
+                                    +-------------+
+.Ed
+It is important to understand the role of the SCHED_MASK
+and FLOW_MASK, which are configured through the commands
+.Dl "ipfw sched N config mask SCHED_MASK ..."
+and
+.Dl "ipfw queue X config mask FLOW_MASK ..." .
+.Pp
+The SCHED_MASK is used to assign flows to one or more
+scheduler instances, one for each
+value of the packet's 5-fuple after applying SCHED_MASK.
+As an example, using ``src-ip 0xffffff00'' creates one instance
+for each /24 destination subnet.
+.Pp
+The FLOW_MASK, together with the SCHED_MASK, is used to split
+packets into flows. As an example, using
+``src-ip 0x000000ff''
+together with the previous SCHED_MASK makes a flow for
+each individual source address. In turn, flows for each /24
+subnet will be sent to the same scheduler instance.
+.Pp
+The above diagram holds even for the
+.Em pipe
+case, with the only restriction that a
+.Em pipe
+only supports a SCHED_MASK, and forces the use of a FIFO
+scheduler (these are for backward compatibility reasons;
+in fact, internally, a
+.Nm dummynet's
+pipe is implemented exactly as above).
+.Pp
 There are two modes of
 .Nm dummynet
 operation:
@@ -2087,9 +2140,36 @@ The following parameters can be configur
 .Pp
 .Bl -tag -width indent -compact
 .It Cm type Ar {fifo | wf2qp | rr | qfq}
+specifies the scheduling algorithm to use.
+.Bl -tag -width indent -compact
+.It cm fifo
+is just a FIFO scheduler (which means that all packets
+are stored in the same queue as they arrive to the scheduler).
+FIFO has O(1) per-packet time complexity, with very low
+constants (estimate 60-80ns on a 2Ghz desktop machine)
+but gives no service guarantees.
+.It Cm wf2qp
+implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
+algorithm which permits flows to share bandwidth according to
+their weights. Note that weights are not priorities; even a flow
+with a minuscule weight will never starve.
+WF2Q+ has O(log N) per-packet processing cost, where N is the number
+of flows, and is the default algorithm used by previous versions
+dummynet's queues.
+.It Cm rr
+implements the Deficit Round Robin algorithm, which has O(1) processing
+costs (roughly, 100-150ns per packet)
+and permits bandwidth allocation according to weights, but
+with poor service guarantees.
+.It Cm qfq
+implements the QFQ algorithm, which is a very fast variant of
+WF2Q+, with similar service guarantees and O(1) processing
+costs (roughly, 200-250ns per packet).
+.El
 .El
 .Pp
-plus all the parameters allowed for a pipe.
+In addition to the type, all parameters allowed for a pipe can also
+be specified for a scheduler.
 .Pp
 Finally, the following parameters can be configured for both
 pipes and queues:

Modified: user/jmallett/octeon/sbin/ipfw/ipfw2.c
==============================================================================
--- user/jmallett/octeon/sbin/ipfw/ipfw2.c	Fri Mar  5 23:08:19 2010	(r204783)
+++ user/jmallett/octeon/sbin/ipfw/ipfw2.c	Fri Mar  5 23:14:01 2010	(r204784)
@@ -1625,13 +1625,21 @@ ipfw_sets_handler(char *av[])
 	if (av[0] == NULL)
 		errx(EX_USAGE, "set needs command");
 	if (_substrcmp(*av, "show") == 0) {
-		void *data;
+		void *data = NULL;
 		char const *msg;
+		int nalloc;
 
-		nbytes = sizeof(struct ip_fw);
+		nalloc = nbytes = sizeof(struct ip_fw);
+		while (nbytes >= nalloc) {
+			if (data)
+				free(data);

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

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 00:45:36 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D1FD106567C;
	Sat,  6 Mar 2010 00:45:36 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 71C188FC0C;
	Sat,  6 Mar 2010 00:45:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o260jamF063191;
	Sat, 6 Mar 2010 00:45:36 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o260jaHZ063189;
	Sat, 6 Mar 2010 00:45:36 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003060045.o260jaHZ063189@svn.freebsd.org>
From: Juli Mallett 
Date: Sat, 6 Mar 2010 00:45:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204785 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 00:45:36 -0000

Author: jmallett
Date: Sat Mar  6 00:45:36 2010
New Revision: 204785
URL: http://svn.freebsd.org/changeset/base/204785

Log:
  Check for device faults and for failures to set DRQ when expected, rather
  than spinning forever.  This fixes booting with CF ejected.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c	Fri Mar  5 23:14:01 2010	(r204784)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c	Sat Mar  6 00:45:36 2010	(r204785)
@@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$");
 /* Status Register */
 #define STATUS_BSY		0x80	/* Drive is busy */
 #define STATUS_RDY		0x40	/* Drive is ready */
+#define STATUS_DF		0x20	/* Device fault */
 #define STATUS_DRQ		0x08	/* Data can be transferred */
 
 /* Miscelaneous */
@@ -153,11 +154,11 @@ static int	cf_attach(device_t);
 static int	cf_attach_geom(void *, int);
 
 /* ATA methods */
-static void	cf_cmd_identify(void);
-static void	cf_cmd_write(uint32_t, uint32_t, void *);
-static void	cf_cmd_read(uint32_t, uint32_t, void *);
-static void	cf_wait_busy(void);
-static void	cf_send_cmd(uint32_t, uint8_t);
+static int	cf_cmd_identify(void);
+static int	cf_cmd_write(uint32_t, uint32_t, void *);
+static int	cf_cmd_read(uint32_t, uint32_t, void *);
+static int	cf_wait_busy(void);
+static int	cf_send_cmd(uint32_t, uint8_t);
 static void	cf_attach_geom_proxy(void *arg, int flag);
 
 /* Miscelenous */
@@ -183,6 +184,8 @@ static int cf_access (struct g_provider 
  * ------------------------------------------------------------------- */
 static void cf_start (struct bio *bp)
 {
+	int error;
+
 	/*
 	* Handle actual I/O requests. The request is passed down through
 	* the bio struct.
@@ -200,12 +203,19 @@ static void cf_start (struct bio *bp)
 	if ((bp->bio_cmd & (BIO_READ | BIO_WRITE))) {
 
 		if (bp->bio_cmd & BIO_READ) {
-			cf_cmd_read(bp->bio_length / drive_param.sector_size,
-					bp->bio_offset / drive_param.sector_size, bp->bio_data);
-
+			error = cf_cmd_read(bp->bio_length / drive_param.sector_size,
+			    bp->bio_offset / drive_param.sector_size, bp->bio_data);
 		} else if (bp->bio_cmd & BIO_WRITE) {
-			cf_cmd_write(bp->bio_length / drive_param.sector_size,
-					bp->bio_offset/drive_param.sector_size, bp->bio_data);
+			error = cf_cmd_write(bp->bio_length / drive_param.sector_size,
+			    bp->bio_offset/drive_param.sector_size, bp->bio_data);
+		} else {
+			printf("%s: unrecognized bio_cmd %x.\n", __func__, bp->bio_cmd);
+			error = ENOTSUP;
+		}
+
+		if (error != 0) {
+			g_io_deliver(bp, error);
+			return;
 		}
 
 		bp->bio_resid = 0;
@@ -227,12 +237,13 @@ static int cf_ioctl (struct g_provider *
  *
  *  Read nr_sectors from the device starting from start_sector.
  */
-static void cf_cmd_read (uint32_t nr_sectors, uint32_t start_sector, void *buf)
+static int cf_cmd_read (uint32_t nr_sectors, uint32_t start_sector, void *buf)
 {
 	unsigned long lba;
 	uint32_t count;
 	uint16_t *ptr_16;
 	uint8_t  *ptr_8;
+	int error;
 
 //#define OCTEON_VISUAL_CF_0 1
 #ifdef OCTEON_VISUAL_CF_0
@@ -244,8 +255,11 @@ static void cf_cmd_read (uint32_t nr_sec
 
 
 	while (nr_sectors--) {
-
-		cf_send_cmd(lba, CMD_READ_SECTOR);
+		error = cf_send_cmd(lba, CMD_READ_SECTOR);
+		if (error != 0) {
+			printf("%s: cf_send_cmd(CMD_READ_SECTOR) failed: %d\n", __func__, error);
+			return (error);
+		}
 
 		if (bus_width == 8) {
 			volatile uint8_t *task_file = (volatile uint8_t*)base_addr;
@@ -270,6 +284,7 @@ static void cf_cmd_read (uint32_t nr_sec
 #ifdef OCTEON_VISUAL_CF_0
         octeon_led_write_char(0, ' ');
 #endif
+	return (0);
 }
 
 
@@ -279,12 +294,13 @@ static void cf_cmd_read (uint32_t nr_sec
  *
  * Write nr_sectors to the device starting from start_sector.
  */
-static void cf_cmd_write (uint32_t nr_sectors, uint32_t start_sector, void *buf)
+static int cf_cmd_write (uint32_t nr_sectors, uint32_t start_sector, void *buf)
 {
 	uint32_t lba;
 	uint32_t count;
 	uint16_t *ptr_16;
 	uint8_t  *ptr_8;
+	int error;
 	
 //#define OCTEON_VISUAL_CF_1 1
 #ifdef OCTEON_VISUAL_CF_1
@@ -295,8 +311,11 @@ static void cf_cmd_write (uint32_t nr_se
 	ptr_16 = (uint16_t*)buf;
 
 	while (nr_sectors--) {
-
-		cf_send_cmd(lba, CMD_WRITE_SECTOR);
+		error = cf_send_cmd(lba, CMD_WRITE_SECTOR);
+		if (error != 0) {
+			printf("%s: cf_send_cmd(CMD_WRITE_SECTOR) failed: %d\n", __func__, error);
+			return (error);
+		}
 
 		if (bus_width == 8) {
 			volatile uint8_t *task_file;
@@ -324,6 +343,7 @@ static void cf_cmd_write (uint32_t nr_se
 #ifdef OCTEON_VISUAL_CF_1
         octeon_led_write_char(1, ' ');
 #endif
+	return (0);
 }
 
 
@@ -335,10 +355,11 @@ static void cf_cmd_write (uint32_t nr_se
  * it in the drive_param structure
  *
  */
-static void cf_cmd_identify (void)
+static int cf_cmd_identify (void)
 {
 	int count;
 	uint8_t status;
+	int error;
 
 	if (bus_width == 8) {
         	volatile uint8_t *task_file;
@@ -356,11 +377,11 @@ static void cf_cmd_identify (void)
         	task_file[TF_DRV_HEAD] = 0;
         	task_file[TF_COMMAND]  = CMD_IDENTIFY;
 
-		cf_wait_busy();
-
-        	for (count = 0; count < SECTOR_SIZE; count++) 
-               	 	drive_param.u.buf[count] = task_file[TF_DATA];
-
+		error = cf_wait_busy();
+		if (error == 0) {
+			for (count = 0; count < SECTOR_SIZE; count++) 
+				drive_param.u.buf[count] = task_file[TF_DATA];
+		}
 	} else {
 		volatile uint16_t *task_file;
 
@@ -374,17 +395,22 @@ static void cf_cmd_identify (void)
 		task_file[TF_CYL_LSB/2]  = 0; /* this includes TF_CYL_MSB */
 		task_file[TF_DRV_HEAD/2] = 0 | (CMD_IDENTIFY<<8); /* this includes TF_COMMAND */
 
-		cf_wait_busy();
-
-		for (count = 0; count < SECTOR_SIZE; count+=2) {
-			uint16_t temp;
-			temp = task_file[TF_DATA];
-			
-			/* endianess will be swapped below */
-			drive_param.u.buf[count]   = (temp & 0xff);
-			drive_param.u.buf[count+1] = (temp & 0xff00)>>8;
+		error = cf_wait_busy();
+		if (error == 0) {
+			for (count = 0; count < SECTOR_SIZE; count+=2) {
+				uint16_t temp;
+				temp = task_file[TF_DATA];
+				
+				/* endianess will be swapped below */
+				drive_param.u.buf[count]   = (temp & 0xff);
+				drive_param.u.buf[count+1] = (temp & 0xff00)>>8;
+			}
 		}
 	}
+	if (error != 0) {
+		printf("%s: identify failed: %d\n", __func__, error);
+		return (error);
+	}
 
 	cf_swap_ascii(drive_param.u.driveid.model, drive_param.model);
 
@@ -394,6 +420,7 @@ static void cf_cmd_identify (void)
 	drive_param.sec_track   =  SWAP_SHORT (drive_param.u.driveid.cur_sectors);
 	drive_param.nr_sectors  =  SWAP_LONG  (drive_param.u.driveid.lba_capacity);
 
+	return (0);
 }
 
 
@@ -404,7 +431,7 @@ static void cf_cmd_identify (void)
  * Send command to read/write one sector specified by lba.
  *
  */
-static void cf_send_cmd (uint32_t lba, uint8_t cmd)
+static int cf_send_cmd (uint32_t lba, uint8_t cmd)
 {
 	uint8_t status;
 
@@ -439,7 +466,7 @@ static void cf_send_cmd (uint32_t lba, u
 
 	}
 
-	cf_wait_busy();
+	return (cf_wait_busy());
 }
 
 /* ------------------------------------------------------------------- *
@@ -448,12 +475,16 @@ static void cf_send_cmd (uint32_t lba, u
  *
  * Wait until the drive finishes a given command and data is
  * ready to be transferred. This is done by repeatedly checking 
- * the BSY and DRQ bits of the status register. When the controller
- * is ready for data transfer, it clears the BSY bit and sets the 
- * DRQ bit.
+ * the BSY bit of the status register. When the controller is ready for
+ * data transfer, it clears the BSY bit and sets the DRQ bit.
+ *
+ * If the DF bit is ever set, we return error.
  *
+ * This code originally spun on DRQ.  If that behavior turns out to be
+ * necessary, a flag can be added or this function can be called
+ * repeatedly as long as it is returning ENXIO.
  */
-static void cf_wait_busy (void)
+static int cf_wait_busy (void)
 {
 	uint8_t status;
 
@@ -469,7 +500,11 @@ static void cf_wait_busy (void)
 		task_file = (volatile uint8_t *)base_addr;
 
 		status = task_file[TF_STATUS];	
-		while ((status & STATUS_BSY) == STATUS_BSY || (status & STATUS_DRQ) != STATUS_DRQ ) {
+		while ((status & STATUS_BSY) == STATUS_BSY) {
+			if ((status & STATUS_DF) != 0) {
+				printf("%s: device fault (status=%x)\n", __func__, status);
+				return (EIO);
+			}
 			DELAY(WAIT_DELAY);
 			status = task_file[TF_STATUS];
 		}
@@ -478,15 +513,24 @@ static void cf_wait_busy (void)
 		task_file = (volatile uint16_t *)base_addr;
 
 		status = task_file[TF_STATUS/2]>>8;	
-		while ((status & STATUS_BSY) == STATUS_BSY || (status & STATUS_DRQ) != STATUS_DRQ ) {
+		while ((status & STATUS_BSY) == STATUS_BSY) {
+			if ((status & STATUS_DF) != 0) {
+				printf("%s: device fault (status=%x)\n", __func__, status);
+				return (EIO);
+			}
 			DELAY(WAIT_DELAY);
 			status = (uint8_t)(task_file[TF_STATUS/2]>>8);
 		}
 	}
+	if ((status & STATUS_DRQ) == 0) {
+		printf("%s: device not ready (status=%x)\n", __func__, status);
+		return (ENXIO);
+	}
 
 #ifdef OCTEON_VISUAL_CF_2
         octeon_led_write_char(2, ' ');
 #endif
+	return (0);
 }
 
 /* ------------------------------------------------------------------- *
@@ -522,9 +566,7 @@ static int cf_probe (device_t dev)
 
         device_set_desc(dev, "Octeon Compact Flash Driver");
 
-	cf_cmd_identify();
-
-        return (0);
+	return (cf_cmd_identify());
 }
 
 /* ------------------------------------------------------------------- *
@@ -543,7 +585,6 @@ static void cf_identify (driver_t *drv, 
 	int count = 0;
         octeon_mio_boot_reg_cfgx_t cfg;
 
-
     	if (!octeon_board_real())
 		return;
 

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 00:54:58 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C94BA106564A;
	Sat,  6 Mar 2010 00:54:58 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B898A8FC17;
	Sat,  6 Mar 2010 00:54:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o260swFP065289;
	Sat, 6 Mar 2010 00:54:58 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o260swnp065287;
	Sat, 6 Mar 2010 00:54:58 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003060054.o260swnp065287@svn.freebsd.org>
From: Juli Mallett 
Date: Sat, 6 Mar 2010 00:54:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204786 - user/jmallett/octeon/sys/mips/cavium/dev/rgmii
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 00:54:58 -0000

Author: jmallett
Date: Sat Mar  6 00:54:58 2010
New Revision: 204786
URL: http://svn.freebsd.org/changeset/base/204786

Log:
  Remove some chattiness from the rgmx driver.

Modified:
  user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c

Modified: user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Sat Mar  6 00:45:36 2010	(r204785)
+++ user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Sat Mar  6 00:54:58 2010	(r204786)
@@ -1682,10 +1682,7 @@ static int octeon_rgmx_ioctl (struct ifn
                          * Restart or Start now, if driver is not running currently.
                          */
                         if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
-                            printf(" SIOCSTIFFLAGS  UP/Not-running\n"); break;
                             octeon_rgmx_init(sc);
-                        } else {
-                            printf(" SIOCSTIFFLAGS  UP/Running\n"); break;
                         }
                     } else {
                         /*
@@ -1693,10 +1690,7 @@ static int octeon_rgmx_ioctl (struct ifn
                          * Stop & shut it down now, if driver is running currently.
                          */
                         if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
-                            printf(" SIOCSTIFFLAGS  Down/Running\n"); break;
                             octeon_rgmx_stop(sc);
-                        } else {
-                            printf(" SIOCSTIFFLAGS  Down/Not-Running\n"); break;
                         }
                     }
                     break;

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 01:00:11 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E659106567B;
	Sat,  6 Mar 2010 01:00:11 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 592BA8FC2A;
	Sat,  6 Mar 2010 01:00:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2610BHs066551;
	Sat, 6 Mar 2010 01:00:11 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2610BDK066549;
	Sat, 6 Mar 2010 01:00:11 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003060100.o2610BDK066549@svn.freebsd.org>
From: Juli Mallett 
Date: Sat, 6 Mar 2010 01:00:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204787 - user/jmallett/octeon/lib/libc/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 01:00:11 -0000

Author: jmallett
Date: Sat Mar  6 01:00:11 2010
New Revision: 204787
URL: http://svn.freebsd.org/changeset/base/204787

Log:
  Reduce diffs with head.

Modified:
  user/jmallett/octeon/lib/libc/mips/SYS.h

Modified: user/jmallett/octeon/lib/libc/mips/SYS.h
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/SYS.h	Sat Mar  6 00:54:58 2010	(r204786)
+++ user/jmallett/octeon/lib/libc/mips/SYS.h	Sat Mar  6 01:00:11 2010	(r204787)
@@ -94,13 +94,7 @@
 # define PIC_RETURN()
 #endif /* __ABICALLS__ */
 
-
-#ifdef __STDC__
 # define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
-#else
-# define SYSTRAP(x)	li v0,SYS_/**/x; syscall;
-#endif
-
 
 /*
  * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 12:47:50 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8BB2106566B;
	Sat,  6 Mar 2010 12:47:50 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ADBC68FC0A;
	Sat,  6 Mar 2010 12:47:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26ClowN026415;
	Sat, 6 Mar 2010 12:47:50 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26CloMw026414;
	Sat, 6 Mar 2010 12:47:50 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201003061247.o26CloMw026414@svn.freebsd.org>
From: Hiroki Sato 
Date: Sat, 6 Mar 2010 12:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204797 - user/hrs/ipv6
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 12:47:50 -0000

Author: hrs
Date: Sat Mar  6 12:47:50 2010
New Revision: 204797
URL: http://svn.freebsd.org/changeset/base/204797

Log:
  Create playground for IPv6-related work.

Added:
  user/hrs/ipv6/
     - copied from r204795, head/

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 16:27:43 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 748071065672;
	Sat,  6 Mar 2010 16:27:43 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 63B278FC21;
	Sat,  6 Mar 2010 16:27:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26GRhB4075152;
	Sat, 6 Mar 2010 16:27:43 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26GRhYG075141;
	Sat, 6 Mar 2010 16:27:43 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201003061627.o26GRhYG075141@svn.freebsd.org>
From: Hiroki Sato 
Date: Sat, 6 Mar 2010 16:27:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204798 - in user/hrs/ipv6: sbin/ifconfig sys/netinet6
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 16:27:43 -0000

Author: hrs
Date: Sat Mar  6 16:27:43 2010
New Revision: 204798
URL: http://svn.freebsd.org/changeset/base/204798

Log:
  Summary:
  
   - Accept Router Advertisement messages even when
     net.inet6.ip6.forwarding=1.
  
   - A new per-interface knob: IPV6CTL_DEFROUTE_RTADV.  This controls
     if accepting a route in an RA message as the default route.
  
   - A new sysctl: net.inet6.ip6.disable_isrouter_rtadvif.  This
     controls if setting R-bit in NA on RA accepting interfaces.  The
     default is 0 (R-bit is set based on net.inet6.ip6.forwarding).
  
  Background:
  
   IPv6 host/router model suggests a router sends an RA and a host
   accepts it for router discovery.  Because of that, KAME
   implementation does not allow accepting RAs when
   net.inet6.ip6.forwarding=1.  Accepting RAs on a router can make the
   routing table confused since it can change the default router
   unintentionally.
  
   However, in practice there are cases where we cannot distinguish a
   host from a router clearly.  For example, a customer edge router
   often works as a host against the ISP, and as a router against the
   LAN at the same time.  Another example is a complex network
   configurations like an L2TP tunnel for IPv6 connection to Internet
   over an Ethernet link with another native IPv6 subnet.  In this case,
   the physical interface for the native IPv6 subnet works as a host,
   and the pseudo-interface for L2TP works as the default IP forwarding
   route.
  
  Problems:
  
   When processing RA messages is limited when
   net.inet6.ip6.forwarding=1, the following issues are typical:
  
   - A router cannot perform SLAAC.  It becomes a problem if a box has
     multiple interfaces and you want to use SLAAC on some of them, for
     example.  A customer edge router for IPv6 Internet access service
     using an IPv6-over-IPv6 tunnel sometimes needs SLAAC on the
     physical interface for administration purpose; updating firmware
     and so on (link-local addresses can be used there, but GUAs by
     SLAAC are often used for scalability).
  
   - When a box has multiple IPv6 interfaces and it receives multiple
     RAs on them, controlling the default route is difficult.  Router
     preferences defined in RFC 4191 works only when the routers are
     under your control.
  
  Details of Implementation Changes:
  
   Router Advertisement messages will be accepted even when
   net.inet6.ip6.forwarding=1.  More precisely, the conditions are as
   follow:
  
      (ACCEPT_RTADV && DEFROUTE_RTADV)
         => Normal RA processing (as IPv6 host)
  
      (ACCEPT_RTADV && !DEFROUTE_RTADV)
         => Accept RA but add the router to the defroute list with
            rtlifetime=0 unconditionally.  This effectively prevents
            from setting the received router address as the box's
            default route.
  
      (!ACCEPT_RTADV && DEFROUTE_RTADV)
         => No RA processing
  
   ACCEPT_RTADV and DEFROUTE_RTADV are per-interface knob.
  
   R-bit in NA on the RA accepting interfaces is set based on
   net.inet6.ip6.forwarding.  While an on-going discussion on
   draft-ietf-v6ops-ipv6-cpe-router suggests R-bit can be disabled
   completely even when net.inet6.ip6.forwarding=1, I believe there is
   no technical reason with disabling it.  This behavior can be set by a
   new sysctl net.inet6.ip6.disable_isrouter_rtadvif (the default is 0).
  
  Usage:
  
   # ifconfig fxp0 inet6 accept_rtadv
  
     => accept RA on fxp0
  
   # ifconfig fxp0 inet6 accept_rtadv -defroute_rtadv
  
     => accept RA but ignore default route information on fxp0.
  
     The default value of defroute_rtadv flag can be set by
     net.inet6.ip6.defroute_rtadv (the default is 1).
  
   # sysctl net.inet6.ip6.disable_isrouter_rtadvif=1
  
     => R-bit in NAs on RA accepting interfaces will always be set as 0.
  
  Reviewed by:	bz

Modified:
  user/hrs/ipv6/sbin/ifconfig/af_inet6.c
  user/hrs/ipv6/sbin/ifconfig/af_nd6.c
  user/hrs/ipv6/sys/netinet6/in6.h
  user/hrs/ipv6/sys/netinet6/in6_proto.c
  user/hrs/ipv6/sys/netinet6/ip6_input.c
  user/hrs/ipv6/sys/netinet6/ip6_var.h
  user/hrs/ipv6/sys/netinet6/nd6.c
  user/hrs/ipv6/sys/netinet6/nd6.h
  user/hrs/ipv6/sys/netinet6/nd6_nbr.c
  user/hrs/ipv6/sys/netinet6/nd6_rtr.c

Modified: user/hrs/ipv6/sbin/ifconfig/af_inet6.c
==============================================================================
--- user/hrs/ipv6/sbin/ifconfig/af_inet6.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sbin/ifconfig/af_inet6.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -498,6 +498,8 @@ static struct cmd inet6_cmds[] = {
 	DEF_CMD("-autoconf",	-IN6_IFF_AUTOCONF,	setip6flags),
 	DEF_CMD("accept_rtadv",	ND6_IFF_ACCEPT_RTADV,	setnd6flags),
 	DEF_CMD("-accept_rtadv",-ND6_IFF_ACCEPT_RTADV,	setnd6flags),
+	DEF_CMD("defroute_rtadv",ND6_IFF_DEFROUTE_RTADV,setnd6flags),
+	DEF_CMD("-defroute_rtadv",-ND6_IFF_DEFROUTE_RTADV,setnd6flags),
 	DEF_CMD("defaultif",	1,			setnd6defif),
 	DEF_CMD("-defaultif",	-1,			setnd6defif),
 	DEF_CMD("ifdisabled",	ND6_IFF_IFDISABLED,	setnd6flags),

Modified: user/hrs/ipv6/sbin/ifconfig/af_nd6.c
==============================================================================
--- user/hrs/ipv6/sbin/ifconfig/af_nd6.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sbin/ifconfig/af_nd6.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -58,7 +58,7 @@ static const char rcsid[] =
 #define	MAX_SYSCTL_TRY	5
 #define	ND6BITS	"\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
 		"\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
-		"\020DEFAULTIF"
+		"\007DEFROUTE_RTADV\020DEFAULTIF"
 
 static int isnd6defif(int);
 void setnd6flags(const char *, int, int, const struct afswtch *);

Modified: user/hrs/ipv6/sys/netinet6/in6.h
==============================================================================
--- user/hrs/ipv6/sys/netinet6/in6.h	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/in6.h	Sat Mar  6 16:27:43 2010	(r204798)
@@ -611,7 +611,10 @@ struct ip6_mtuinfo {
 #define IPV6CTL_STEALTH		45
 
 #define	ICMPV6CTL_ND6_ONLINKNSRFC4861	47
-#define IPV6CTL_MAXID		48
+#define	IPV6CTL_DEFROUTE_RTADV	48	/* Add a route in RA to defroute list.*/
+#define	IPV6CTL_DISABLE_ISROUTER_RTADVIF 49	/* Disable R-bit in NA on RA
+						 * receiving IF. */
+#define IPV6CTL_MAXID		50
 #endif /* __BSD_VISIBLE */
 
 /*

Modified: user/hrs/ipv6/sys/netinet6/in6_proto.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/in6_proto.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/in6_proto.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -383,6 +383,8 @@ VNET_DEFINE(int, ip6_sendredirects);
 VNET_DEFINE(int, ip6_defhlim);
 VNET_DEFINE(int, ip6_defmcasthlim);
 VNET_DEFINE(int, ip6_accept_rtadv);
+VNET_DEFINE(int, ip6_defroute_rtadv);
+VNET_DEFINE(int, ip6_disable_isrouter_rtadvif);
 VNET_DEFINE(int, ip6_maxfragpackets);
 VNET_DEFINE(int, ip6_maxfrags);
 VNET_DEFINE(int, ip6_log_interval);
@@ -499,6 +501,16 @@ SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_
 	CTLFLAG_RW, &VNET_NAME(ip6_accept_rtadv), 0,
 	"Default value of per-interface flag for accepting ICMPv6 Router"
 	"Advertisement messages");
+SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_DEFROUTE_RTADV, defroute_rtadv,
+	CTLFLAG_RW, &VNET_NAME(ip6_defroute_rtadv), 0,
+	"Default value of per-interface flag to control whether routers "
+	"sending ICMPv6 RA messages on that interface are added into the "
+	"default router list.");
+SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_DISABLE_ISROUTER_RTADVIF,
+	disable_isrouter_rtadvif, CTLFLAG_RW,
+	&VNET_NAME(ip6_disable_isrouter_rtadvif), 0,
+	"Always set 0 to R flag in ICMPv6 NA messages when accepting RA"
+	" on the interface.");
 SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_KEEPFAITH, keepfaith, CTLFLAG_RW,
 	&VNET_NAME(ip6_keepfaith), 0, "");
 SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_LOG_INTERVAL, log_interval,

Modified: user/hrs/ipv6/sys/netinet6/ip6_input.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/ip6_input.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/ip6_input.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -197,6 +197,8 @@ ip6_init(void)
 	V_ip6_defhlim = IPV6_DEFHLIM;
 	V_ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
 	V_ip6_accept_rtadv = 0;
+	V_ip6_defroute_rtadv = 1;
+	V_ip6_disable_isrouter_rtadvif = 0;
 	V_ip6_log_interval = 5;
 	V_ip6_hdrnestlimit = 15; /* How many header options will we process? */
 	V_ip6_dad_count = 1;	 /* DupAddrDetectionTransmits */

Modified: user/hrs/ipv6/sys/netinet6/ip6_var.h
==============================================================================
--- user/hrs/ipv6/sys/netinet6/ip6_var.h	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/ip6_var.h	Sat Mar  6 16:27:43 2010	(r204798)
@@ -308,6 +308,9 @@ VNET_DECLARE(int, ip6_maxfragpackets);	/
 VNET_DECLARE(int, ip6_maxfrags);	/* Maximum fragments in reassembly
 					 * queue */
 VNET_DECLARE(int, ip6_accept_rtadv);	/* Acts as a host not a router */
+VNET_DECLARE(int, ip6_defroute_rtadv);	/* Add a route in RA to defroute list.*/
+VNET_DECLARE(int, ip6_disable_isrouter_rtadvif); /* Disable R-bit in NA on RA
+						  * receiving IF. */
 VNET_DECLARE(int, ip6_keepfaith);	/* Firewall Aided Internet Translator */
 VNET_DECLARE(int, ip6_log_interval);
 VNET_DECLARE(time_t, ip6_log_time);
@@ -344,6 +347,8 @@ VNET_DECLARE(int, ip6_use_defzone);	/* W
 #define	V_ip6_maxfragpackets		VNET(ip6_maxfragpackets)
 #define	V_ip6_maxfrags			VNET(ip6_maxfrags)
 #define	V_ip6_accept_rtadv		VNET(ip6_accept_rtadv)
+#define	V_ip6_defroute_rtadv		VNET(ip6_defroute_rtadv)
+#define	V_ip6_disable_isrouter_rtadvif	VNET(ip6_disable_isrouter_rtadvif)
 #define	V_ip6_keepfaith			VNET(ip6_keepfaith)
 #define	V_ip6_log_interval		VNET(ip6_log_interval)
 #define	V_ip6_log_time			VNET(ip6_log_time)

Modified: user/hrs/ipv6/sys/netinet6/nd6.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/nd6.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/nd6.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -223,6 +223,8 @@ nd6_ifattach(struct ifnet *ifp)
 	/* A loopback interface does not need to accept RTADV. */
 	if (V_ip6_accept_rtadv && !(ifp->if_flags & IFF_LOOPBACK))
 		nd->flags |= ND6_IFF_ACCEPT_RTADV;
+	if (V_ip6_defroute_rtadv && !(ifp->if_flags & IFF_LOOPBACK))
+		nd->flags |= ND6_IFF_DEFROUTE_RTADV;
 
 	/* XXX: we cannot call nd6_setmtu since ifp is not fully initialized */
 	nd6_setmtu0(ifp, nd);
@@ -848,7 +850,7 @@ nd6_purge(struct ifnet *ifp)
 	if (V_nd6_defifindex == ifp->if_index)
 		nd6_setdefaultiface(0);
 
-	if (!V_ip6_forwarding && ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV) {
+	if (ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV) {
 		/* Refresh default router list. */
 		defrouter_select();
 	}
@@ -982,10 +984,9 @@ nd6_is_new_addr_neighbor(struct sockaddr
 	/*
 	 * If the default router list is empty, all addresses are regarded
 	 * as on-link, and thus, as a neighbor.
-	 * XXX: we restrict the condition to hosts, because routers usually do
-	 * not have the "default router list".
 	 */
-	if (!V_ip6_forwarding && TAILQ_FIRST(&V_nd_defrouter) == NULL &&
+	if (ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV &&
+	    TAILQ_FIRST(&V_nd_defrouter) == NULL &&
 	    V_nd6_defifindex == ifp->if_index) {
 		return (1);
 	}
@@ -1042,7 +1043,7 @@ nd6_free(struct llentry *ln, int gc)
 	/* cancel timer */
 	nd6_llinfo_settimer(ln, -1);
 
-	if (!V_ip6_forwarding) {
+	if (ND_IFINFO(ln->lle_tbl->llt_ifp)->flags & ND6_IFF_ACCEPT_RTADV) {
 		int s;
 		s = splnet();
 		dr = defrouter_lookup(&L3_ADDR_SIN6(ln)->sin6_addr, ln->lle_tbl->llt_ifp);
@@ -1720,7 +1721,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
 	 * for those are not autoconfigured hosts, we explicitly avoid such
 	 * cases for safety.
 	 */
-	if (do_update && router && !V_ip6_forwarding &&
+	if (do_update && router &&
 	    ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV) {
 		/*
 		 * guaranteed recursion

Modified: user/hrs/ipv6/sys/netinet6/nd6.h
==============================================================================
--- user/hrs/ipv6/sys/netinet6/nd6.h	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/nd6.h	Sat Mar  6 16:27:43 2010	(r204798)
@@ -85,6 +85,7 @@ struct nd_ifinfo {
 				     */
 #define ND6_IFF_DONT_SET_IFROUTE	0x10
 #define ND6_IFF_AUTO_LINKLOCAL	0x20
+#define ND6_IFF_DEFROUTE_RTADV	0x40
 
 #define	ND6_CREATE		LLE_CREATE
 #define	ND6_EXCLUSIVE		LLE_EXCLUSIVE

Modified: user/hrs/ipv6/sys/netinet6/nd6_nbr.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/nd6_nbr.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/nd6_nbr.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -116,10 +116,15 @@ nd6_ns_input(struct mbuf *m, int off, in
 	int lladdrlen = 0;
 	int anycast = 0, proxy = 0, tentative = 0;
 	int tlladdr;
+	int rflag;
 	union nd_opts ndopts;
 	struct sockaddr_dl *proxydl = NULL;
 	char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
 
+	rflag = (V_ip6_forwarding) ? ND_NA_FLAG_ROUTER : 0;
+	if (ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV &&
+	    V_ip6_disable_isrouter_rtadvif)
+		rflag = 0;
 #ifndef PULLDOWN_TEST
 	IP6_EXTHDR_CHECK(m, off, icmp6len,);
 	nd_ns = (struct nd_neighbor_solicit *)((caddr_t)ip6 + off);
@@ -340,8 +345,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 			goto bad;
 		nd6_na_output(ifp, &in6_all, &taddr6,
 		    ((anycast || proxy || !tlladdr) ? 0 : ND_NA_FLAG_OVERRIDE) |
-		    (V_ip6_forwarding ? ND_NA_FLAG_ROUTER : 0),
-		    tlladdr, (struct sockaddr *)proxydl);
+		    rflag, tlladdr, (struct sockaddr *)proxydl);
 		goto freeit;
 	}
 
@@ -350,8 +354,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 
 	nd6_na_output(ifp, &saddr6, &taddr6,
 	    ((anycast || proxy || !tlladdr) ? 0 : ND_NA_FLAG_OVERRIDE) |
-	    (V_ip6_forwarding ? ND_NA_FLAG_ROUTER : 0) | ND_NA_FLAG_SOLICITED,
-	    tlladdr, (struct sockaddr *)proxydl);
+	    rflag | ND_NA_FLAG_SOLICITED, tlladdr, (struct sockaddr *)proxydl);
  freeit:
 	if (ifa != NULL)
 		ifa_free(ifa);
@@ -848,7 +851,8 @@ nd6_na_input(struct mbuf *m, int off, in
 			dr = defrouter_lookup(in6, ln->lle_tbl->llt_ifp);
 			if (dr)
 				defrtrlist_del(dr);
-			else if (!V_ip6_forwarding) {
+			else if (ND_IFINFO(ln->lle_tbl->llt_ifp)->flags &
+			    ND6_IFF_ACCEPT_RTADV) {
 				/*
 				 * Even if the neighbor is not in the default
 				 * router list, the neighbor may be used

Modified: user/hrs/ipv6/sys/netinet6/nd6_rtr.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/nd6_rtr.c	Sat Mar  6 12:47:50 2010	(r204797)
+++ user/hrs/ipv6/sys/netinet6/nd6_rtr.c	Sat Mar  6 16:27:43 2010	(r204798)
@@ -125,8 +125,11 @@ nd6_rs_input(struct mbuf *m, int off, in
 	union nd_opts ndopts;
 	char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
 
-	/* If I'm not a router, ignore it. */
-	if (!V_ip6_forwarding)
+	/*
+	 * Accept RS only when V_ip6_forwarding=1 and the interface has
+	 * no ND6_IFF_ACCEPT_RTADV.
+	 */
+	if (!V_ip6_forwarding || ND_IFINFO(ifp)->flags & ND6_IFF_ACCEPT_RTADV)
 		goto freeit;
 
 	/* Sanity checks */
@@ -211,11 +214,10 @@ nd6_ra_input(struct mbuf *m, int off, in
 	char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
 
 	/*
-	 * We only accept RAs only when
-	 * the node is not a router and
-	 * per-interface variable allows RAs on the receiving interface.
+	 * We only accept RAs only when the per-interface flag
+	 * ND6_IFF_ACCEPT_RTADV is on the receiving interface.
 	 */
-	if (V_ip6_forwarding || !(ndi->flags & ND6_IFF_ACCEPT_RTADV))
+	if (!(ndi->flags & ND6_IFF_ACCEPT_RTADV))
 		goto freeit;
 
 	if (ip6->ip6_hlim != 255) {
@@ -264,7 +266,14 @@ nd6_ra_input(struct mbuf *m, int off, in
 	bzero(&dr0, sizeof(dr0));
 	dr0.rtaddr = saddr6;
 	dr0.flags  = nd_ra->nd_ra_flags_reserved;
-	dr0.rtlifetime = ntohs(nd_ra->nd_ra_router_lifetime);
+	/*
+	 * Effectively-disable the route in the RA packet
+	 * when !ND6_IFF_DEFROUTE_RTADV on the receiving interface.
+	 */
+	if (ndi->flags & ND6_IFF_DEFROUTE_RTADV)
+		dr0.rtlifetime = ntohs(nd_ra->nd_ra_router_lifetime);
+	else
+		dr0.rtlifetime = 0;
 	dr0.expire = time_second + dr0.rtlifetime;
 	dr0.ifp = ifp;
 	/* unspecified or not? (RFC 2461 6.3.4) */
@@ -555,7 +564,7 @@ defrtrlist_del(struct nd_defrouter *dr)
 	 * Flush all the routing table entries that use the router
 	 * as a next hop.
 	 */
-	if (!V_ip6_forwarding)
+	if (ND_IFINFO(dr->ifp)->flags & ND6_IFF_ACCEPT_RTADV)
 		rt6_flush(&dr->rtaddr, dr->ifp);
 
 	if (dr->installed) {
@@ -614,20 +623,6 @@ defrouter_select(void)
 	struct llentry *ln = NULL;
 
 	/*
-	 * This function should be called only when acting as an autoconfigured
-	 * host.  Although the remaining part of this function is not effective
-	 * if the node is not an autoconfigured host, we explicitly exclude
-	 * such cases here for safety.
-	 */
-	if (V_ip6_forwarding) {
-		nd6log((LOG_WARNING,
-		    "defrouter_select: called unexpectedly (forwarding=%d)\n",
-		    V_ip6_forwarding));
-		splx(s);
-		return;
-	}
-
-	/*
 	 * Let's handle easy case (3) first:
 	 * If default router list is empty, there's nothing to be done.
 	 */

From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 23:01:11 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CC7E106564A;
	Sat,  6 Mar 2010 23:01:11 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C2008FC14;
	Sat,  6 Mar 2010 23:01:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26N1Bgo063229;
	Sat, 6 Mar 2010 23:01:11 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26N1BAE063226;
	Sat, 6 Mar 2010 23:01:11 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003062301.o26N1BAE063226@svn.freebsd.org>
From: Edwin Groothuis 
Date: Sat, 6 Mar 2010 23:01:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204812 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 06 Mar 2010 23:01:11 -0000

Author: edwin
Date: Sat Mar  6 23:01:10 2010
New Revision: 204812
URL: http://svn.freebsd.org/changeset/base/204812

Log:
  Fix the -y option
  In the Julian day format, properly highlight the current day
  Update the manpage with -3, -A and -B

Modified:
  user/edwin/ncal/ncal.1
  user/edwin/ncal/ncal.c
Directory Properties:
  user/edwin/ncal/   (props changed)

Modified: user/edwin/ncal/ncal.1
==============================================================================
--- user/edwin/ncal/ncal.1	Sat Mar  6 22:38:38 2010	(r204811)
+++ user/edwin/ncal/ncal.1	Sat Mar  6 23:01:10 2010	(r204812)
@@ -33,24 +33,32 @@
 .Nd displays a calendar and the date of Easter
 .Sh SYNOPSIS
 .Nm
-.Op Fl hjy
+.Op Fl 3hjy
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Oo
 .Op Ar month
 .Ar year
 .Oc
 .Nm
-.Op Fl hj
+.Op Fl 3hj
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Fl m Ar month
 .Op Ar year
 .Nm ncal
-.Op Fl hjJpwy
+.Op Fl 3hjJpwy
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Op Fl s Ar country_code
 .Oo
 .Op Ar month
 .Ar year
 .Oc
 .Nm ncal
-.Op Fl hJeo
+.Op Fl 3hJeo
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Op Ar year
 .Sh DESCRIPTION
 The

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Sat Mar  6 22:38:38 2010	(r204811)
+++ user/edwin/ncal/ncal.c	Sat Mar  6 23:01:10 2010	(r204812)
@@ -369,6 +369,12 @@ main(int argc, char *argv[])
 		usage();
 	}
 
+	if (flag_hole_year) {
+		m = 1;
+		before = 0;
+		after = 11;
+	}
+
 	if (flag_month != NULL) {
 		if (parsemonth(flag_month, &m, &y)) {
 			errx(EX_USAGE,
@@ -723,7 +729,7 @@ mkmonthr(int y, int m, int jd_flag, stru
 				if (jd_flag)
 					dt.d = j - jan1 + 1;
 				else
-					sdateb(j, &dt);
+					sdater(j, &dt);
 				/* separator */
 				mlines->lines[i][k] = ' ';
 				/* the actual text */