svn commit: r189988 - in user/thompsa/vaptq: . bin/cat bin/sh cddl cddl/lib/libzpool cddl/usr.bin/ztest cddl/usr.sbin/zdb contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gcc contrib/gc...

Andrew Thompson thompsa at FreeBSD.org
Wed Mar 18 14:33:58 PDT 2009


Author: thompsa
Date: Wed Mar 18 21:33:53 2009
New Revision: 189988
URL: http://svn.freebsd.org/changeset/base/189988

Log:
  MFH r189129-189985

Added:
  user/thompsa/vaptq/contrib/wpa/   (props changed)
     - copied from r189985, head/contrib/wpa/
  user/thompsa/vaptq/lib/libusb/   (props changed)
     - copied from r189985, head/lib/libusb/
  user/thompsa/vaptq/sys/amd64/include/xen/   (props changed)
     - copied from r189985, head/sys/amd64/include/xen/
  user/thompsa/vaptq/sys/dev/amdtemp/
     - copied from r189985, head/sys/dev/amdtemp/
  user/thompsa/vaptq/sys/dev/xen/xenpci/   (props changed)
     - copied from r189985, head/sys/dev/xen/xenpci/
  user/thompsa/vaptq/sys/modules/amdtemp/
     - copied from r189985, head/sys/modules/amdtemp/
  user/thompsa/vaptq/tools/regression/mac/mac_portacl/
     - copied from r189985, head/tools/regression/mac/mac_portacl/
  user/thompsa/vaptq/tools/tools/ath/athdecode/
     - copied from r189985, head/tools/tools/ath/athdecode/
  user/thompsa/vaptq/tools/tools/ath/athpoke/
     - copied from r189985, head/tools/tools/ath/athpoke/
  user/thompsa/vaptq/tools/tools/netrate/tcpp/
     - copied from r189985, head/tools/tools/netrate/tcpp/
Replaced:
  user/thompsa/vaptq/lib/libc/stdio/asprintf.c
     - copied unchanged from r189985, head/lib/libc/stdio/asprintf.c
Deleted:
  user/thompsa/vaptq/contrib/gdtoa/test/
  user/thompsa/vaptq/contrib/gdtoa/xsum0.out
  user/thompsa/vaptq/contrib/hostapd/
  user/thompsa/vaptq/contrib/top/install
  user/thompsa/vaptq/contrib/wpa_supplicant/
  user/thompsa/vaptq/lib/libarchive/test/test_compat_gtar_1.tgz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu
  user/thompsa/vaptq/lib/libthread_db/arch/amd64/libc_r_md.c
  user/thompsa/vaptq/lib/libthread_db/arch/i386/libc_r_md.c
  user/thompsa/vaptq/lib/libthread_db/arch/ia64/libc_r_md.c
  user/thompsa/vaptq/lib/libthread_db/arch/powerpc/libc_r_md.c
  user/thompsa/vaptq/lib/libthread_db/arch/sparc64/libc_r_md.c
  user/thompsa/vaptq/lib/libthread_db/libc_r_db.c
  user/thompsa/vaptq/lib/libusb20/
  user/thompsa/vaptq/share/man/man4/k8temp.4
  user/thompsa/vaptq/share/man/man4/usb2_bluetooth.4
  user/thompsa/vaptq/share/man/man4/usb2_controller.4
  user/thompsa/vaptq/share/man/man4/usb2_ethernet.4
  user/thompsa/vaptq/share/man/man4/usb2_image.4
  user/thompsa/vaptq/share/man/man4/usb2_input.4
  user/thompsa/vaptq/share/man/man4/usb2_misc.4
  user/thompsa/vaptq/share/man/man4/usb2_ndis.4
  user/thompsa/vaptq/share/man/man4/usb2_quirk.4
  user/thompsa/vaptq/share/man/man4/usb2_serial.4
  user/thompsa/vaptq/share/man/man4/usb2_sound.4
  user/thompsa/vaptq/share/man/man4/usb2_storage.4
  user/thompsa/vaptq/share/man/man4/usb2_wlan.4
  user/thompsa/vaptq/sys/dev/k8temp/
  user/thompsa/vaptq/sys/modules/k8temp/
  user/thompsa/vaptq/tools/regression/usr.bin/pkill/pgrep-G.t
  user/thompsa/vaptq/tools/regression/usr.bin/pkill/pgrep-S.t
  user/thompsa/vaptq/tools/regression/usr.bin/pkill/pkill-G.t
  user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs.h
  user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs_5210.c
  user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs_5211.c
  user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs_5212.c
  user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs_5416.c
  user/thompsa/vaptq/usr.bin/tar/getdate.y
  user/thompsa/vaptq/usr.bin/tar/test/test_patterns_2.tgz.uu
  user/thompsa/vaptq/usr.bin/tar/test/test_patterns_3.tgz.uu
Modified:
  user/thompsa/vaptq/   (props changed)
  user/thompsa/vaptq/MAINTAINERS
  user/thompsa/vaptq/Makefile
  user/thompsa/vaptq/Makefile.inc1
  user/thompsa/vaptq/ObsoleteFiles.inc
  user/thompsa/vaptq/UPDATING
  user/thompsa/vaptq/bin/cat/Makefile
  user/thompsa/vaptq/bin/sh/miscbltin.c
  user/thompsa/vaptq/cddl/Makefile.inc
  user/thompsa/vaptq/cddl/lib/libzpool/Makefile
  user/thompsa/vaptq/cddl/usr.bin/ztest/Makefile
  user/thompsa/vaptq/cddl/usr.sbin/zdb/Makefile
  user/thompsa/vaptq/contrib/bind9/   (props changed)
  user/thompsa/vaptq/contrib/cpio/   (props changed)
  user/thompsa/vaptq/contrib/csup/   (props changed)
  user/thompsa/vaptq/contrib/csup/updater.c
  user/thompsa/vaptq/contrib/file/   (props changed)
  user/thompsa/vaptq/contrib/gcc/c-cppbuiltin.c
  user/thompsa/vaptq/contrib/gcc/c-decl.c
  user/thompsa/vaptq/contrib/gcc/c-opts.c
  user/thompsa/vaptq/contrib/gcc/c-tree.h
  user/thompsa/vaptq/contrib/gcc/c-typeck.c
  user/thompsa/vaptq/contrib/gcc/doc/extend.texi
  user/thompsa/vaptq/contrib/gdtoa/   (props changed)
  user/thompsa/vaptq/contrib/less/line.c
  user/thompsa/vaptq/contrib/libpcap/savefile.c
  user/thompsa/vaptq/contrib/ncurses/   (props changed)
  user/thompsa/vaptq/contrib/netcat/   (props changed)
  user/thompsa/vaptq/contrib/ntp/   (props changed)
  user/thompsa/vaptq/contrib/openbsm/   (props changed)
  user/thompsa/vaptq/contrib/openbsm/CREDITS
  user/thompsa/vaptq/contrib/openbsm/NEWS
  user/thompsa/vaptq/contrib/openbsm/README
  user/thompsa/vaptq/contrib/openbsm/VERSION
  user/thompsa/vaptq/contrib/openbsm/bin/audit/audit.8
  user/thompsa/vaptq/contrib/openbsm/bin/audit/audit.c
  user/thompsa/vaptq/contrib/openbsm/bin/auditd/audit_warn.c
  user/thompsa/vaptq/contrib/openbsm/bin/auditd/auditd.c
  user/thompsa/vaptq/contrib/openbsm/bin/auditd/auditd.h
  user/thompsa/vaptq/contrib/openbsm/bsm/libbsm.h
  user/thompsa/vaptq/contrib/openbsm/config/config.h
  user/thompsa/vaptq/contrib/openbsm/configure
  user/thompsa/vaptq/contrib/openbsm/configure.ac
  user/thompsa/vaptq/contrib/openbsm/etc/audit_control
  user/thompsa/vaptq/contrib/openbsm/etc/audit_event
  user/thompsa/vaptq/contrib/openbsm/libbsm/au_control.3
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_control.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_io.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_token.c
  user/thompsa/vaptq/contrib/openbsm/man/audit_control.5
  user/thompsa/vaptq/contrib/openbsm/man/auditon.2
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit.h
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit_kevents.h
  user/thompsa/vaptq/contrib/openbsm/tools/audump.c
  user/thompsa/vaptq/contrib/openpam/   (props changed)
  user/thompsa/vaptq/contrib/pf/   (props changed)
  user/thompsa/vaptq/contrib/sendmail/   (props changed)
  user/thompsa/vaptq/contrib/top/   (props changed)
  user/thompsa/vaptq/crypto/openssh/   (props changed)
  user/thompsa/vaptq/crypto/openssl/   (props changed)
  user/thompsa/vaptq/etc/defaults/rc.conf
  user/thompsa/vaptq/etc/network.subr
  user/thompsa/vaptq/games/fortune/datfiles/fortunes
  user/thompsa/vaptq/gnu/usr.bin/cc/Makefile.inc
  user/thompsa/vaptq/gnu/usr.bin/groff/tmac/mdoc.local
  user/thompsa/vaptq/include/arpa/inet.h
  user/thompsa/vaptq/include/ctype.h
  user/thompsa/vaptq/include/db.h
  user/thompsa/vaptq/include/grp.h
  user/thompsa/vaptq/include/ndbm.h
  user/thompsa/vaptq/include/netdb.h
  user/thompsa/vaptq/include/pthread.h
  user/thompsa/vaptq/include/pwd.h
  user/thompsa/vaptq/include/setjmp.h
  user/thompsa/vaptq/include/signal.h
  user/thompsa/vaptq/include/stdio.h
  user/thompsa/vaptq/include/stdlib.h
  user/thompsa/vaptq/include/string.h
  user/thompsa/vaptq/include/strings.h
  user/thompsa/vaptq/include/unistd.h
  user/thompsa/vaptq/include/wchar.h
  user/thompsa/vaptq/lib/Makefile
  user/thompsa/vaptq/lib/libarchive/Makefile
  user/thompsa/vaptq/lib/libarchive/archive.h
  user/thompsa/vaptq/lib/libarchive/archive_check_magic.c
  user/thompsa/vaptq/lib/libarchive/archive_endian.h
  user/thompsa/vaptq/lib/libarchive/archive_entry.c
  user/thompsa/vaptq/lib/libarchive/archive_entry_copy_stat.c
  user/thompsa/vaptq/lib/libarchive/archive_entry_stat.c
  user/thompsa/vaptq/lib/libarchive/archive_platform.h
  user/thompsa/vaptq/lib/libarchive/archive_private.h
  user/thompsa/vaptq/lib/libarchive/archive_read.c
  user/thompsa/vaptq/lib/libarchive/archive_read_open_filename.c
  user/thompsa/vaptq/lib/libarchive/archive_read_private.h
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_all.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_bzip2.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_compress.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_gzip.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_program.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_ar.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_cpio.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_empty.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_iso9660.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_mtree.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_tar.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_zip.c
  user/thompsa/vaptq/lib/libarchive/archive_string.c
  user/thompsa/vaptq/lib/libarchive/archive_string.h
  user/thompsa/vaptq/lib/libarchive/archive_string_sprintf.c
  user/thompsa/vaptq/lib/libarchive/archive_util.c
  user/thompsa/vaptq/lib/libarchive/archive_virtual.c
  user/thompsa/vaptq/lib/libarchive/archive_write.c
  user/thompsa/vaptq/lib/libarchive/archive_write_disk.c
  user/thompsa/vaptq/lib/libarchive/archive_write_private.h
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_bzip2.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_gzip.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_program.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_ar.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_cpio.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_cpio_newc.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_mtree.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_pax.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_shar.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_ustar.c
  user/thompsa/vaptq/lib/libarchive/config_freebsd.h
  user/thompsa/vaptq/lib/libarchive/test/   (props changed)
  user/thompsa/vaptq/lib/libarchive/test/Makefile
  user/thompsa/vaptq/lib/libarchive/test/main.c
  user/thompsa/vaptq/lib/libarchive/test/read_open_memory.c
  user/thompsa/vaptq/lib/libarchive/test/test.h
  user/thompsa/vaptq/lib/libarchive/test/test_acl_freebsd.c
  user/thompsa/vaptq/lib/libarchive/test/test_acl_pax.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_bzip2.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_gtar.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_gzip.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_zip.c
  user/thompsa/vaptq/lib/libarchive/test/test_empty_write.c
  user/thompsa/vaptq/lib/libarchive/test/test_entry.c
  user/thompsa/vaptq/lib/libarchive/test/test_fuzz.c
  user/thompsa/vaptq/lib/libarchive/test/test_pax_filename_encoding.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_compress_program.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_extract.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_Z.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_empty.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_sparse.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_iso_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_isorr_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_pax_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tar.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tbz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tgz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_zip.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_large.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_pax_truncated.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_position.c
  user/thompsa/vaptq/lib/libarchive/test/test_tar_large.c
  user/thompsa/vaptq/lib/libarchive/test/test_ustar_filenames.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_program.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_disk.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_disk_hardlink.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_disk_perms.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_disk_secure.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_ar.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_cpio_newc.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_cpio_odc.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_tar.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_tar_empty.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_tar_ustar.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_open_memory.c
  user/thompsa/vaptq/lib/libbluetooth/Makefile
  user/thompsa/vaptq/lib/libbluetooth/bluetooth.3
  user/thompsa/vaptq/lib/libbluetooth/bluetooth.c
  user/thompsa/vaptq/lib/libbluetooth/bluetooth.h
  user/thompsa/vaptq/lib/libc/   (props changed)
  user/thompsa/vaptq/lib/libc/Makefile
  user/thompsa/vaptq/lib/libc/db/btree/bt_close.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_conv.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_debug.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_delete.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_get.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_open.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_overflow.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_page.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_put.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_search.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_seq.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_split.c
  user/thompsa/vaptq/lib/libc/db/btree/bt_utils.c
  user/thompsa/vaptq/lib/libc/db/btree/btree.h
  user/thompsa/vaptq/lib/libc/db/db/db.c
  user/thompsa/vaptq/lib/libc/db/hash/hash.c
  user/thompsa/vaptq/lib/libc/db/hash/hash.h
  user/thompsa/vaptq/lib/libc/db/hash/hash_bigkey.c
  user/thompsa/vaptq/lib/libc/db/hash/hash_buf.c
  user/thompsa/vaptq/lib/libc/db/hash/hash_log2.c
  user/thompsa/vaptq/lib/libc/db/hash/hash_page.c
  user/thompsa/vaptq/lib/libc/db/hash/page.h
  user/thompsa/vaptq/lib/libc/db/mpool/mpool.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_close.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_delete.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_get.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_open.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_put.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_search.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_seq.c
  user/thompsa/vaptq/lib/libc/db/recno/rec_utils.c
  user/thompsa/vaptq/lib/libc/gen/fts.c
  user/thompsa/vaptq/lib/libc/gen/lockf.3
  user/thompsa/vaptq/lib/libc/gen/lockf.c
  user/thompsa/vaptq/lib/libc/net/rcmd.3
  user/thompsa/vaptq/lib/libc/net/sourcefilter.3
  user/thompsa/vaptq/lib/libc/net/sourcefilter.c
  user/thompsa/vaptq/lib/libc/nls/Makefile.inc
  user/thompsa/vaptq/lib/libc/softfloat/fpgetmask.c
  user/thompsa/vaptq/lib/libc/softfloat/fpgetround.c
  user/thompsa/vaptq/lib/libc/softfloat/fpgetsticky.c
  user/thompsa/vaptq/lib/libc/softfloat/fpsetmask.c
  user/thompsa/vaptq/lib/libc/softfloat/fpsetround.c
  user/thompsa/vaptq/lib/libc/softfloat/fpsetsticky.c
  user/thompsa/vaptq/lib/libc/stdio/Makefile.inc
  user/thompsa/vaptq/lib/libc/stdio/Symbol.map
  user/thompsa/vaptq/lib/libc/stdio/fgetln.3
  user/thompsa/vaptq/lib/libc/stdio/fgets.3
  user/thompsa/vaptq/lib/libc/stdio/findfp.c
  user/thompsa/vaptq/lib/libc/stdio/printf-pos.c
  user/thompsa/vaptq/lib/libc/stdio/printf.3
  user/thompsa/vaptq/lib/libc/stdio/printflocal.h
  user/thompsa/vaptq/lib/libc/stdio/stdio.3
  user/thompsa/vaptq/lib/libc/stdio/vfprintf.c
  user/thompsa/vaptq/lib/libc/stdio/vfwprintf.c
  user/thompsa/vaptq/lib/libc/stdlib/atol.3
  user/thompsa/vaptq/lib/libc/stdtime/   (props changed)
  user/thompsa/vaptq/lib/libc/string/Makefile.inc
  user/thompsa/vaptq/lib/libc/string/Symbol.map
  user/thompsa/vaptq/lib/libc/string/ffsll.c   (props changed)
  user/thompsa/vaptq/lib/libc/string/flsll.c   (props changed)
  user/thompsa/vaptq/lib/libc/string/stpcpy.c
  user/thompsa/vaptq/lib/libc/string/strcpy.3
  user/thompsa/vaptq/lib/libc/string/strlcat.c
  user/thompsa/vaptq/lib/libc/string/strlcpy.3
  user/thompsa/vaptq/lib/libc/string/strlcpy.c
  user/thompsa/vaptq/lib/libc/string/strlen.3
  user/thompsa/vaptq/lib/libc/string/wmemchr.3
  user/thompsa/vaptq/lib/libc/sys/open.2
  user/thompsa/vaptq/lib/libc/sys/shmctl.2
  user/thompsa/vaptq/lib/libelf/Makefile
  user/thompsa/vaptq/lib/libthr/Makefile
  user/thompsa/vaptq/lib/libthr/thread/thr_syscalls.c
  user/thompsa/vaptq/lib/libutil/   (props changed)
  user/thompsa/vaptq/lib/msun/src/math.h
  user/thompsa/vaptq/lib/msun/src/math_private.h
  user/thompsa/vaptq/lib/msun/src/s_cimag.c
  user/thompsa/vaptq/lib/msun/src/s_cimagf.c
  user/thompsa/vaptq/lib/msun/src/s_cimagl.c
  user/thompsa/vaptq/libexec/rtld-elf/map_object.c
  user/thompsa/vaptq/libexec/rtld-elf/rtld.c
  user/thompsa/vaptq/libexec/rtld-elf/rtld.h
  user/thompsa/vaptq/release/amd64/boot_crunch.conf
  user/thompsa/vaptq/release/doc/share/misc/dev.archlist.txt
  user/thompsa/vaptq/release/i386/boot_crunch.conf
  user/thompsa/vaptq/release/ia64/boot_crunch.conf
  user/thompsa/vaptq/release/picobsd/bridge/PICOBSD
  user/thompsa/vaptq/release/picobsd/build/picobsd
  user/thompsa/vaptq/release/picobsd/tinyware/simple_httpd/Makefile
  user/thompsa/vaptq/release/picobsd/tinyware/simple_httpd/simple_httpd.c
  user/thompsa/vaptq/release/powerpc/boot_crunch.conf
  user/thompsa/vaptq/release/sparc64/boot_crunch.conf
  user/thompsa/vaptq/release/sun4v/boot_crunch.conf
  user/thompsa/vaptq/sbin/   (props changed)
  user/thompsa/vaptq/sbin/devd/devd.conf.5
  user/thompsa/vaptq/sbin/dump/optr.c
  user/thompsa/vaptq/sbin/ifconfig/ifclone.c
  user/thompsa/vaptq/sbin/ifconfig/ifconfig.c
  user/thompsa/vaptq/sbin/ifconfig/ifgroup.c
  user/thompsa/vaptq/sbin/ipfw/altq.c
  user/thompsa/vaptq/sbin/ipfw/main.c
  user/thompsa/vaptq/sbin/ipfw/nat.c
  user/thompsa/vaptq/sbin/mount/mount.8
  user/thompsa/vaptq/sbin/mount/mount.c
  user/thompsa/vaptq/sbin/recoverdisk/recoverdisk.1
  user/thompsa/vaptq/sbin/recoverdisk/recoverdisk.c
  user/thompsa/vaptq/share/man/man4/Makefile
  user/thompsa/vaptq/share/man/man4/altq.4
  user/thompsa/vaptq/share/man/man4/crypto.4
  user/thompsa/vaptq/share/man/man4/ip.4
  user/thompsa/vaptq/share/man/man4/lo.4
  user/thompsa/vaptq/share/man/man4/multicast.4
  user/thompsa/vaptq/share/man/man4/pccbb.4
  user/thompsa/vaptq/share/man/man4/txp.4
  user/thompsa/vaptq/share/man/man4/uplcom.4
  user/thompsa/vaptq/share/man/man5/rc.conf.5
  user/thompsa/vaptq/share/man/man7/tuning.7
  user/thompsa/vaptq/share/man/man8/diskless.8
  user/thompsa/vaptq/share/man/man8/nanobsd.8
  user/thompsa/vaptq/share/man/man9/Makefile
  user/thompsa/vaptq/share/man/man9/VOP_VPTOCNP.9
  user/thompsa/vaptq/share/man/man9/vfs_getopt.9
  user/thompsa/vaptq/share/misc/committers-src.dot
  user/thompsa/vaptq/share/misc/iso3166
  user/thompsa/vaptq/share/mk/bsd.sys.mk
  user/thompsa/vaptq/share/termcap/termcap.src
  user/thompsa/vaptq/share/zoneinfo/   (props changed)
  user/thompsa/vaptq/share/zoneinfo/northamerica
  user/thompsa/vaptq/sys/   (props changed)
  user/thompsa/vaptq/sys/amd64/acpica/acpi_machdep.c
  user/thompsa/vaptq/sys/amd64/acpica/acpi_wakeup.c
  user/thompsa/vaptq/sys/amd64/acpica/madt.c
  user/thompsa/vaptq/sys/amd64/amd64/amd64_mem.c
  user/thompsa/vaptq/sys/amd64/amd64/apic_vector.S
  user/thompsa/vaptq/sys/amd64/amd64/cpu_switch.S
  user/thompsa/vaptq/sys/amd64/amd64/db_trace.c
  user/thompsa/vaptq/sys/amd64/amd64/elf_machdep.c
  user/thompsa/vaptq/sys/amd64/amd64/fpu.c
  user/thompsa/vaptq/sys/amd64/amd64/genassym.c
  user/thompsa/vaptq/sys/amd64/amd64/machdep.c
  user/thompsa/vaptq/sys/amd64/amd64/mp_machdep.c
  user/thompsa/vaptq/sys/amd64/amd64/pmap.c
  user/thompsa/vaptq/sys/amd64/amd64/trap.c
  user/thompsa/vaptq/sys/amd64/amd64/vm_machdep.c
  user/thompsa/vaptq/sys/amd64/conf/NOTES
  user/thompsa/vaptq/sys/amd64/ia32/ia32_signal.c
  user/thompsa/vaptq/sys/amd64/include/apicvar.h
  user/thompsa/vaptq/sys/amd64/include/elf.h
  user/thompsa/vaptq/sys/amd64/include/fpu.h
  user/thompsa/vaptq/sys/amd64/include/pcb.h
  user/thompsa/vaptq/sys/amd64/include/pcpu.h
  user/thompsa/vaptq/sys/amd64/include/smp.h
  user/thompsa/vaptq/sys/amd64/linux32/linux.h
  user/thompsa/vaptq/sys/amd64/linux32/linux32_sysvec.c
  user/thompsa/vaptq/sys/arm/arm/elf_machdep.c
  user/thompsa/vaptq/sys/arm/conf/AVILA
  user/thompsa/vaptq/sys/arm/conf/CAMBRIA
  user/thompsa/vaptq/sys/arm/conf/CAMBRIA.hints
  user/thompsa/vaptq/sys/arm/include/elf.h
  user/thompsa/vaptq/sys/arm/xscale/ixp425/avila_machdep.c
  user/thompsa/vaptq/sys/arm/xscale/ixp425/files.ixp425
  user/thompsa/vaptq/sys/arm/xscale/ixp425/if_npe.c
  user/thompsa/vaptq/sys/arm/xscale/ixp425/ixp425.c
  user/thompsa/vaptq/sys/arm/xscale/ixp425/ixp425_pci.c
  user/thompsa/vaptq/sys/arm/xscale/ixp425/ixp425reg.h
  user/thompsa/vaptq/sys/boot/forth/loader.conf
  user/thompsa/vaptq/sys/boot/i386/boot2/Makefile
  user/thompsa/vaptq/sys/boot/i386/boot2/boot1.S
  user/thompsa/vaptq/sys/boot/i386/libi386/Makefile
  user/thompsa/vaptq/sys/boot/i386/libi386/bioscd.c
  user/thompsa/vaptq/sys/boot/i386/libi386/biosdisk.c
  user/thompsa/vaptq/sys/boot/i386/libi386/devicename.c
  user/thompsa/vaptq/sys/boot/i386/libi386/libi386.h
  user/thompsa/vaptq/sys/boot/i386/loader/Makefile
  user/thompsa/vaptq/sys/boot/i386/loader/main.c
  user/thompsa/vaptq/sys/bsm/audit.h
  user/thompsa/vaptq/sys/bsm/audit_kevents.h
  user/thompsa/vaptq/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  user/thompsa/vaptq/sys/cddl/compat/opensolaris/sys/sysmacros.h
  user/thompsa/vaptq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  user/thompsa/vaptq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/thompsa/vaptq/sys/compat/freebsd32/freebsd32_misc.c
  user/thompsa/vaptq/sys/compat/ia32/ia32_sysvec.c
  user/thompsa/vaptq/sys/compat/linux/linux_emul.h
  user/thompsa/vaptq/sys/compat/linux/linux_futex.c
  user/thompsa/vaptq/sys/compat/linux/linux_futex.h
  user/thompsa/vaptq/sys/compat/linux/linux_misc.c
  user/thompsa/vaptq/sys/compat/linux/linux_misc.h
  user/thompsa/vaptq/sys/compat/ndis/kern_ndis.c
  user/thompsa/vaptq/sys/compat/ndis/kern_windrv.c
  user/thompsa/vaptq/sys/compat/ndis/ndis_var.h
  user/thompsa/vaptq/sys/compat/ndis/ntoskrnl_var.h
  user/thompsa/vaptq/sys/compat/ndis/pe_var.h
  user/thompsa/vaptq/sys/compat/ndis/resource_var.h
  user/thompsa/vaptq/sys/compat/ndis/subr_hal.c
  user/thompsa/vaptq/sys/compat/ndis/subr_ndis.c
  user/thompsa/vaptq/sys/compat/ndis/subr_ntoskrnl.c
  user/thompsa/vaptq/sys/compat/ndis/subr_pe.c
  user/thompsa/vaptq/sys/compat/ndis/subr_usbd.c
  user/thompsa/vaptq/sys/compat/ndis/usbd_var.h
  user/thompsa/vaptq/sys/compat/svr4/svr4_sysvec.c
  user/thompsa/vaptq/sys/conf/NOTES
  user/thompsa/vaptq/sys/conf/files
  user/thompsa/vaptq/sys/conf/files.amd64
  user/thompsa/vaptq/sys/conf/files.i386
  user/thompsa/vaptq/sys/conf/files.ia64
  user/thompsa/vaptq/sys/conf/files.mips
  user/thompsa/vaptq/sys/conf/files.pc98
  user/thompsa/vaptq/sys/conf/files.powerpc
  user/thompsa/vaptq/sys/conf/files.sparc64
  user/thompsa/vaptq/sys/conf/files.sun4v
  user/thompsa/vaptq/sys/conf/kern.mk
  user/thompsa/vaptq/sys/conf/options
  user/thompsa/vaptq/sys/conf/options.amd64
  user/thompsa/vaptq/sys/conf/options.arm
  user/thompsa/vaptq/sys/contrib/pf/   (props changed)
  user/thompsa/vaptq/sys/ddb/db_expr.c
  user/thompsa/vaptq/sys/dev/acpica/acpi.c
  user/thompsa/vaptq/sys/dev/acpica/acpi_ec.c
  user/thompsa/vaptq/sys/dev/agp/agp.c
  user/thompsa/vaptq/sys/dev/agp/agp_amd64.c
  user/thompsa/vaptq/sys/dev/agp/agp_i810.c
  user/thompsa/vaptq/sys/dev/agp/agp_intel.c
  user/thompsa/vaptq/sys/dev/agp/agp_via.c
  user/thompsa/vaptq/sys/dev/agp/agppriv.h
  user/thompsa/vaptq/sys/dev/aic7xxx/ahc_pci.c
  user/thompsa/vaptq/sys/dev/aic7xxx/ahd_pci.c
  user/thompsa/vaptq/sys/dev/ale/if_ale.c
  user/thompsa/vaptq/sys/dev/ata/ata-all.c
  user/thompsa/vaptq/sys/dev/ata/ata-all.h
  user/thompsa/vaptq/sys/dev/ata/ata-card.c
  user/thompsa/vaptq/sys/dev/ata/ata-cbus.c
  user/thompsa/vaptq/sys/dev/ata/ata-isa.c
  user/thompsa/vaptq/sys/dev/ata/ata-pci.c
  user/thompsa/vaptq/sys/dev/ata/ata-queue.c
  user/thompsa/vaptq/sys/dev/ata/ata-raid.c
  user/thompsa/vaptq/sys/dev/ata/ata-usb.c   (contents, props changed)
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-acerlabs.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-ahci.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-intel.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-marvell.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-nvidia.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-promise.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-siliconimage.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-sis.c
  user/thompsa/vaptq/sys/dev/ata/chipsets/ata-via.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ah.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416.h
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c
  user/thompsa/vaptq/sys/dev/ath/if_ath.c
  user/thompsa/vaptq/sys/dev/ath/if_ath_pci.c
  user/thompsa/vaptq/sys/dev/ath/if_athvar.h
  user/thompsa/vaptq/sys/dev/atkbdc/psm.c
  user/thompsa/vaptq/sys/dev/bce/if_bce.c
  user/thompsa/vaptq/sys/dev/bce/if_bcefw.h
  user/thompsa/vaptq/sys/dev/bce/if_bcereg.h
  user/thompsa/vaptq/sys/dev/cardbus/cardbus.c
  user/thompsa/vaptq/sys/dev/cardbus/cardbus_cis.c
  user/thompsa/vaptq/sys/dev/cfi/cfi_core.c
  user/thompsa/vaptq/sys/dev/cfi/cfi_dev.c
  user/thompsa/vaptq/sys/dev/cfi/cfi_var.h
  user/thompsa/vaptq/sys/dev/cxgb/bin2h.pl
  user/thompsa/vaptq/sys/dev/cxgb/common/cxgb_ael1002.c
  user/thompsa/vaptq/sys/dev/cxgb/common/cxgb_common.h
  user/thompsa/vaptq/sys/dev/cxgb/common/cxgb_t3_cpl.h
  user/thompsa/vaptq/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/thompsa/vaptq/sys/dev/cxgb/common/cxgb_xgmac.c
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_adapter.h
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_ioctl.h
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_main.c
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_multiq.c
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_sge.c
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_t3fw.c
  user/thompsa/vaptq/sys/dev/cxgb/cxgb_t3fw.h
  user/thompsa/vaptq/sys/dev/dc/if_dc.c
  user/thompsa/vaptq/sys/dev/dcons/dcons_os.c
  user/thompsa/vaptq/sys/dev/drm/drmP.h
  user/thompsa/vaptq/sys/dev/drm/drm_bufs.c
  user/thompsa/vaptq/sys/dev/drm/drm_drv.c
  user/thompsa/vaptq/sys/dev/drm/drm_irq.c
  user/thompsa/vaptq/sys/dev/drm/drm_linux_list.h
  user/thompsa/vaptq/sys/dev/drm/drm_lock.c
  user/thompsa/vaptq/sys/dev/drm/drm_pci.c
  user/thompsa/vaptq/sys/dev/drm/drm_pciids.h
  user/thompsa/vaptq/sys/dev/drm/drm_scatter.c
  user/thompsa/vaptq/sys/dev/drm/drm_sysctl.c
  user/thompsa/vaptq/sys/dev/drm/drm_vm.c
  user/thompsa/vaptq/sys/dev/drm/i915_dma.c
  user/thompsa/vaptq/sys/dev/drm/i915_drv.c
  user/thompsa/vaptq/sys/dev/drm/i915_drv.h
  user/thompsa/vaptq/sys/dev/drm/i915_irq.c
  user/thompsa/vaptq/sys/dev/drm/mach64_drv.c
  user/thompsa/vaptq/sys/dev/drm/mach64_drv.h
  user/thompsa/vaptq/sys/dev/drm/mach64_irq.c
  user/thompsa/vaptq/sys/dev/drm/mga_dma.c
  user/thompsa/vaptq/sys/dev/drm/mga_drv.c
  user/thompsa/vaptq/sys/dev/drm/mga_irq.c
  user/thompsa/vaptq/sys/dev/drm/r128_drv.c
  user/thompsa/vaptq/sys/dev/drm/r128_drv.h
  user/thompsa/vaptq/sys/dev/drm/r128_irq.c
  user/thompsa/vaptq/sys/dev/drm/radeon_cp.c
  user/thompsa/vaptq/sys/dev/drm/radeon_drm.h
  user/thompsa/vaptq/sys/dev/drm/radeon_drv.c
  user/thompsa/vaptq/sys/dev/drm/radeon_drv.h
  user/thompsa/vaptq/sys/dev/drm/radeon_irq.c
  user/thompsa/vaptq/sys/dev/drm/radeon_state.c
  user/thompsa/vaptq/sys/dev/drm/savage_drv.c
  user/thompsa/vaptq/sys/dev/drm/sis_drv.c
  user/thompsa/vaptq/sys/dev/drm/tdfx_drv.c
  user/thompsa/vaptq/sys/dev/ed/if_ed_pccard.c
  user/thompsa/vaptq/sys/dev/exca/exca.c
  user/thompsa/vaptq/sys/dev/fe/if_fe_pccard.c
  user/thompsa/vaptq/sys/dev/firewire/firewire.c
  user/thompsa/vaptq/sys/dev/firewire/fwohci_pci.c
  user/thompsa/vaptq/sys/dev/fxp/if_fxp.c
  user/thompsa/vaptq/sys/dev/ichwd/ichwd.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndis.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_pccard.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_pci.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_usb.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndisvar.h
  user/thompsa/vaptq/sys/dev/ipw/if_ipw.c
  user/thompsa/vaptq/sys/dev/malo/if_malo_pci.c
  user/thompsa/vaptq/sys/dev/md/md.c
  user/thompsa/vaptq/sys/dev/mii/ip1000phy.c
  user/thompsa/vaptq/sys/dev/mii/ip1000phyreg.h
  user/thompsa/vaptq/sys/dev/mmc/mmc.c
  user/thompsa/vaptq/sys/dev/pccard/card_if.m
  user/thompsa/vaptq/sys/dev/pccard/pccard.c
  user/thompsa/vaptq/sys/dev/pccard/pccard_cis.c
  user/thompsa/vaptq/sys/dev/pccard/pccarddevs
  user/thompsa/vaptq/sys/dev/pccard/pccardvar.h
  user/thompsa/vaptq/sys/dev/pccard/pccardvarp.h
  user/thompsa/vaptq/sys/dev/pccbb/pccbb.c
  user/thompsa/vaptq/sys/dev/pci/pci.c
  user/thompsa/vaptq/sys/dev/pci/pci_pci.c
  user/thompsa/vaptq/sys/dev/pci/pci_private.h
  user/thompsa/vaptq/sys/dev/pci/pcib_private.h
  user/thompsa/vaptq/sys/dev/pci/pcireg.h
  user/thompsa/vaptq/sys/dev/pci/vga_pci.c
  user/thompsa/vaptq/sys/dev/ppbus/lpbb.c
  user/thompsa/vaptq/sys/dev/puc/puc_pci.c
  user/thompsa/vaptq/sys/dev/puc/pucdata.c
  user/thompsa/vaptq/sys/dev/ral/if_ral_pci.c
  user/thompsa/vaptq/sys/dev/re/if_re.c
  user/thompsa/vaptq/sys/dev/sio/sio_pci.c
  user/thompsa/vaptq/sys/dev/smbus/smbus.c
  user/thompsa/vaptq/sys/dev/smbus/smbus.h
  user/thompsa/vaptq/sys/dev/sound/pci/emu10k1.c
  user/thompsa/vaptq/sys/dev/sound/pci/emu10kx.c
  user/thompsa/vaptq/sys/dev/sound/pci/hda/hdac.c
  user/thompsa/vaptq/sys/dev/sound/usb/uaudio.c   (contents, props changed)
  user/thompsa/vaptq/sys/dev/sound/usb/uaudio.h   (props changed)
  user/thompsa/vaptq/sys/dev/sound/usb/uaudio_pcm.c   (props changed)
  user/thompsa/vaptq/sys/dev/sound/usb/uaudioreg.h   (props changed)
  user/thompsa/vaptq/sys/dev/syscons/syscons.c
  user/thompsa/vaptq/sys/dev/syscons/syscons.h
  user/thompsa/vaptq/sys/dev/txp/if_txp.c
  user/thompsa/vaptq/sys/dev/txp/if_txpreg.h
  user/thompsa/vaptq/sys/dev/uart/uart_bus_pci.c
  user/thompsa/vaptq/sys/dev/usb/bluetooth/ng_ubt.c
  user/thompsa/vaptq/sys/dev/usb/bluetooth/ubtbcmfw.c
  user/thompsa/vaptq/sys/dev/usb/controller/atmegadci.c
  user/thompsa/vaptq/sys/dev/usb/controller/atmegadci.h
  user/thompsa/vaptq/sys/dev/usb/controller/atmegadci_atmelarm.c
  user/thompsa/vaptq/sys/dev/usb/controller/ehci.c
  user/thompsa/vaptq/sys/dev/usb/controller/ehci.h
  user/thompsa/vaptq/sys/dev/usb/controller/ehci_ixp4xx.c
  user/thompsa/vaptq/sys/dev/usb/controller/ehci_pci.c
  user/thompsa/vaptq/sys/dev/usb/controller/musb_otg_atmelarm.c
  user/thompsa/vaptq/sys/dev/usb/controller/ohci_pci.c
  user/thompsa/vaptq/sys/dev/usb/controller/uhci_pci.c
  user/thompsa/vaptq/sys/dev/usb/controller/usb_controller.c
  user/thompsa/vaptq/sys/dev/usb/image/uscanner.c
  user/thompsa/vaptq/sys/dev/usb/input/uhid.c
  user/thompsa/vaptq/sys/dev/usb/input/ukbd.c
  user/thompsa/vaptq/sys/dev/usb/input/ums.c
  user/thompsa/vaptq/sys/dev/usb/misc/udbp.c
  user/thompsa/vaptq/sys/dev/usb/misc/ufm.c
  user/thompsa/vaptq/sys/dev/usb/net/if_aue.c
  user/thompsa/vaptq/sys/dev/usb/net/if_axe.c
  user/thompsa/vaptq/sys/dev/usb/net/if_cdce.c
  user/thompsa/vaptq/sys/dev/usb/net/if_cue.c
  user/thompsa/vaptq/sys/dev/usb/net/if_kue.c
  user/thompsa/vaptq/sys/dev/usb/net/if_rue.c
  user/thompsa/vaptq/sys/dev/usb/net/if_udav.c
  user/thompsa/vaptq/sys/dev/usb/net/usb_ethernet.c
  user/thompsa/vaptq/sys/dev/usb/net/usb_ethernet.h
  user/thompsa/vaptq/sys/dev/usb/serial/u3g.c
  user/thompsa/vaptq/sys/dev/usb/serial/uark.c
  user/thompsa/vaptq/sys/dev/usb/serial/ubsa.c
  user/thompsa/vaptq/sys/dev/usb/serial/ubser.c
  user/thompsa/vaptq/sys/dev/usb/serial/uchcom.c
  user/thompsa/vaptq/sys/dev/usb/serial/ucycom.c
  user/thompsa/vaptq/sys/dev/usb/serial/ufoma.c
  user/thompsa/vaptq/sys/dev/usb/serial/uftdi.c
  user/thompsa/vaptq/sys/dev/usb/serial/ugensa.c
  user/thompsa/vaptq/sys/dev/usb/serial/uipaq.c
  user/thompsa/vaptq/sys/dev/usb/serial/ulpt.c
  user/thompsa/vaptq/sys/dev/usb/serial/umct.c
  user/thompsa/vaptq/sys/dev/usb/serial/umodem.c
  user/thompsa/vaptq/sys/dev/usb/serial/umoscom.c
  user/thompsa/vaptq/sys/dev/usb/serial/uplcom.c
  user/thompsa/vaptq/sys/dev/usb/serial/uslcom.c
  user/thompsa/vaptq/sys/dev/usb/serial/uvisor.c
  user/thompsa/vaptq/sys/dev/usb/serial/uvscom.c
  user/thompsa/vaptq/sys/dev/usb/storage/umass.c
  user/thompsa/vaptq/sys/dev/usb/storage/urio.c
  user/thompsa/vaptq/sys/dev/usb/storage/ustorage_fs.c
  user/thompsa/vaptq/sys/dev/usb/usb.h   (props changed)
  user/thompsa/vaptq/sys/dev/usb/usb_compat_linux.c
  user/thompsa/vaptq/sys/dev/usb/usb_core.h
  user/thompsa/vaptq/sys/dev/usb/usb_dev.c
  user/thompsa/vaptq/sys/dev/usb/usb_dev.h
  user/thompsa/vaptq/sys/dev/usb/usb_device.c
  user/thompsa/vaptq/sys/dev/usb/usb_device.h
  user/thompsa/vaptq/sys/dev/usb/usb_hid.c
  user/thompsa/vaptq/sys/dev/usb/usb_hid.h
  user/thompsa/vaptq/sys/dev/usb/usb_hub.c
  user/thompsa/vaptq/sys/dev/usb/usb_if.m   (props changed)
  user/thompsa/vaptq/sys/dev/usb/usbdevs   (contents, props changed)
  user/thompsa/vaptq/sys/dev/usb/usbhid.h   (props changed)
  user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c
  user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c
  user/thompsa/vaptq/sys/dev/usb/wlan/if_zyd.c
  user/thompsa/vaptq/sys/dev/vge/if_vge.c
  user/thompsa/vaptq/sys/dev/xen/balloon/balloon.c
  user/thompsa/vaptq/sys/dev/xen/blkfront/blkfront.c
  user/thompsa/vaptq/sys/dev/xen/console/console.c
  user/thompsa/vaptq/sys/dev/xen/console/xencons_ring.c
  user/thompsa/vaptq/sys/dev/xen/netfront/   (props changed)
  user/thompsa/vaptq/sys/dev/xen/netfront/netfront.c
  user/thompsa/vaptq/sys/dev/xl/if_xl.c
  user/thompsa/vaptq/sys/fs/cd9660/cd9660_vfsops.c
  user/thompsa/vaptq/sys/fs/devfs/devfs_vnops.c
  user/thompsa/vaptq/sys/fs/nullfs/null_vnops.c
  user/thompsa/vaptq/sys/fs/procfs/procfs_dbregs.c
  user/thompsa/vaptq/sys/fs/procfs/procfs_fpregs.c
  user/thompsa/vaptq/sys/fs/procfs/procfs_regs.c
  user/thompsa/vaptq/sys/fs/udf/udf_vfsops.c
  user/thompsa/vaptq/sys/fs/udf/udf_vnops.c
  user/thompsa/vaptq/sys/geom/eli/g_eli.c
  user/thompsa/vaptq/sys/geom/part/g_part_pc98.c
  user/thompsa/vaptq/sys/gnu/fs/reiserfs/reiserfs_fs.h
  user/thompsa/vaptq/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
  user/thompsa/vaptq/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h
  user/thompsa/vaptq/sys/i386/acpica/madt.c
  user/thompsa/vaptq/sys/i386/conf/NOTES
  user/thompsa/vaptq/sys/i386/i386/elf_machdep.c
  user/thompsa/vaptq/sys/i386/i386/i686_mem.c
  user/thompsa/vaptq/sys/i386/i386/in_cksum.c
  user/thompsa/vaptq/sys/i386/i386/k6_mem.c
  user/thompsa/vaptq/sys/i386/i386/machdep.c
  user/thompsa/vaptq/sys/i386/i386/mp_machdep.c
  user/thompsa/vaptq/sys/i386/i386/pmap.c
  user/thompsa/vaptq/sys/i386/i386/trap.c
  user/thompsa/vaptq/sys/i386/include/elf.h
  user/thompsa/vaptq/sys/i386/include/npx.h
  user/thompsa/vaptq/sys/i386/include/pcb.h
  user/thompsa/vaptq/sys/i386/include/xen/xenpmap.h
  user/thompsa/vaptq/sys/i386/isa/npx.c
  user/thompsa/vaptq/sys/i386/linux/linux.h
  user/thompsa/vaptq/sys/i386/linux/linux_sysvec.c
  user/thompsa/vaptq/sys/i386/xen/mp_machdep.c
  user/thompsa/vaptq/sys/ia64/ia64/elf_machdep.c
  user/thompsa/vaptq/sys/ia64/include/elf.h
  user/thompsa/vaptq/sys/isa/syscons_isa.c
  user/thompsa/vaptq/sys/kern/imgact_elf.c
  user/thompsa/vaptq/sys/kern/kern_conf.c
  user/thompsa/vaptq/sys/kern/kern_exec.c
  user/thompsa/vaptq/sys/kern/kern_ktrace.c
  user/thompsa/vaptq/sys/kern/kern_lock.c
  user/thompsa/vaptq/sys/kern/kern_mutex.c
  user/thompsa/vaptq/sys/kern/kern_poll.c
  user/thompsa/vaptq/sys/kern/kern_priv.c
  user/thompsa/vaptq/sys/kern/kern_prot.c
  user/thompsa/vaptq/sys/kern/kern_rwlock.c
  user/thompsa/vaptq/sys/kern/kern_sx.c
  user/thompsa/vaptq/sys/kern/kern_sysctl.c
  user/thompsa/vaptq/sys/kern/kern_tc.c
  user/thompsa/vaptq/sys/kern/kern_thread.c
  user/thompsa/vaptq/sys/kern/kern_umtx.c
  user/thompsa/vaptq/sys/kern/sched_ule.c
  user/thompsa/vaptq/sys/kern/subr_bus.c
  user/thompsa/vaptq/sys/kern/subr_lock.c
  user/thompsa/vaptq/sys/kern/subr_param.c
  user/thompsa/vaptq/sys/kern/subr_smp.c
  user/thompsa/vaptq/sys/kern/subr_witness.c
  user/thompsa/vaptq/sys/kern/sys_generic.c
  user/thompsa/vaptq/sys/kern/sys_pipe.c
  user/thompsa/vaptq/sys/kern/sys_process.c
  user/thompsa/vaptq/sys/kern/sysv_shm.c
  user/thompsa/vaptq/sys/kern/tty.c
  user/thompsa/vaptq/sys/kern/tty_info.c
  user/thompsa/vaptq/sys/kern/tty_pts.c
  user/thompsa/vaptq/sys/kern/uipc_sem.c
  user/thompsa/vaptq/sys/kern/uipc_usrreq.c
  user/thompsa/vaptq/sys/kern/vfs_bio.c
  user/thompsa/vaptq/sys/kern/vfs_cache.c
  user/thompsa/vaptq/sys/kern/vfs_default.c
  user/thompsa/vaptq/sys/kern/vfs_extattr.c
  user/thompsa/vaptq/sys/kern/vfs_lookup.c
  user/thompsa/vaptq/sys/kern/vfs_mount.c
  user/thompsa/vaptq/sys/kern/vfs_subr.c
  user/thompsa/vaptq/sys/kern/vfs_vnops.c
  user/thompsa/vaptq/sys/kern/vnode_if.src
  user/thompsa/vaptq/sys/legacy/dev/usb/   (props changed)
  user/thompsa/vaptq/sys/legacy/dev/usb/ehci_pci.c
  user/thompsa/vaptq/sys/legacy/dev/usb/ohci_pci.c
  user/thompsa/vaptq/sys/legacy/dev/usb/uhci_pci.c
  user/thompsa/vaptq/sys/mips/include/elf.h
  user/thompsa/vaptq/sys/mips/mips/elf_machdep.c
  user/thompsa/vaptq/sys/mips/mips/pmap.c
  user/thompsa/vaptq/sys/modules/Makefile
  user/thompsa/vaptq/sys/modules/drm/radeon/Makefile
  user/thompsa/vaptq/sys/modules/if_ndis/Makefile
  user/thompsa/vaptq/sys/modules/ndis/Makefile
  user/thompsa/vaptq/sys/modules/netgraph/Makefile
  user/thompsa/vaptq/sys/net/bpf.c
  user/thompsa/vaptq/sys/net/bpf_zerocopy.c
  user/thompsa/vaptq/sys/net/if.c
  user/thompsa/vaptq/sys/net/if_bridge.c
  user/thompsa/vaptq/sys/net/if_gif.h
  user/thompsa/vaptq/sys/net/if_loop.c
  user/thompsa/vaptq/sys/net/if_tap.c
  user/thompsa/vaptq/sys/net/if_var.h
  user/thompsa/vaptq/sys/net/netisr.h
  user/thompsa/vaptq/sys/net/vnet.h
  user/thompsa/vaptq/sys/net80211/ieee80211.h
  user/thompsa/vaptq/sys/net80211/ieee80211_freebsd.h
  user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c
  user/thompsa/vaptq/sys/net80211/ieee80211_var.h
  user/thompsa/vaptq/sys/netgraph/atm/ng_ccatm.h
  user/thompsa/vaptq/sys/netgraph/atm/uni/ng_uni_cust.h
  user/thompsa/vaptq/sys/netgraph/ng_l2tp.c
  user/thompsa/vaptq/sys/netgraph/ng_pppoe.c
  user/thompsa/vaptq/sys/netgraph/ng_pppoe.h
  user/thompsa/vaptq/sys/netinet/if_ether.c
  user/thompsa/vaptq/sys/netinet/igmp.c
  user/thompsa/vaptq/sys/netinet/igmp.h
  user/thompsa/vaptq/sys/netinet/igmp_var.h
  user/thompsa/vaptq/sys/netinet/in.c
  user/thompsa/vaptq/sys/netinet/in.h
  user/thompsa/vaptq/sys/netinet/in_gif.c
  user/thompsa/vaptq/sys/netinet/in_mcast.c
  user/thompsa/vaptq/sys/netinet/in_pcb.c
  user/thompsa/vaptq/sys/netinet/in_pcb.h
  user/thompsa/vaptq/sys/netinet/in_proto.c
  user/thompsa/vaptq/sys/netinet/in_var.h
  user/thompsa/vaptq/sys/netinet/ip6.h
  user/thompsa/vaptq/sys/netinet/ip_dummynet.c
  user/thompsa/vaptq/sys/netinet/ip_fw.h
  user/thompsa/vaptq/sys/netinet/ip_fw2.c
  user/thompsa/vaptq/sys/netinet/ip_input.c
  user/thompsa/vaptq/sys/netinet/ip_options.c
  user/thompsa/vaptq/sys/netinet/ip_options.h
  user/thompsa/vaptq/sys/netinet/ip_output.c
  user/thompsa/vaptq/sys/netinet/ip_var.h
  user/thompsa/vaptq/sys/netinet/raw_ip.c
  user/thompsa/vaptq/sys/netinet/sctp.h
  user/thompsa/vaptq/sys/netinet/sctp_constants.h
  user/thompsa/vaptq/sys/netinet/sctp_indata.c
  user/thompsa/vaptq/sys/netinet/sctp_os_bsd.h
  user/thompsa/vaptq/sys/netinet/sctp_output.c
  user/thompsa/vaptq/sys/netinet/sctp_structs.h
  user/thompsa/vaptq/sys/netinet/sctp_timer.c
  user/thompsa/vaptq/sys/netinet/sctp_var.h
  user/thompsa/vaptq/sys/netinet/sctputil.c
  user/thompsa/vaptq/sys/netinet/sctputil.h
  user/thompsa/vaptq/sys/netinet/tcp_input.c
  user/thompsa/vaptq/sys/netinet/tcp_subr.c
  user/thompsa/vaptq/sys/netinet/tcp_timer.c
  user/thompsa/vaptq/sys/netinet/tcp_timewait.c
  user/thompsa/vaptq/sys/netinet/tcp_usrreq.c
  user/thompsa/vaptq/sys/netinet/udp_usrreq.c
  user/thompsa/vaptq/sys/netinet/vinet.h
  user/thompsa/vaptq/sys/netinet6/in6.c
  user/thompsa/vaptq/sys/netinet6/in6_gif.c
  user/thompsa/vaptq/sys/netinet6/in6_ifattach.c
  user/thompsa/vaptq/sys/netinet6/in6_pcb.c
  user/thompsa/vaptq/sys/netinet6/ip6_output.c
  user/thompsa/vaptq/sys/netinet6/mld6.c
  user/thompsa/vaptq/sys/netinet6/route6.c
  user/thompsa/vaptq/sys/netinet6/vinet6.h
  user/thompsa/vaptq/sys/netipsec/key.c
  user/thompsa/vaptq/sys/netipsec/vipsec.h
  user/thompsa/vaptq/sys/netnatm/natm.c
  user/thompsa/vaptq/sys/nfsclient/nfs_vnops.c
  user/thompsa/vaptq/sys/pc98/cbus/scterm-sck.c
  user/thompsa/vaptq/sys/pc98/cbus/syscons_cbus.c
  user/thompsa/vaptq/sys/pc98/conf/NOTES
  user/thompsa/vaptq/sys/pc98/pc98/machdep.c
  user/thompsa/vaptq/sys/pci/intpm.c
  user/thompsa/vaptq/sys/pci/viapm.c
  user/thompsa/vaptq/sys/powerpc/aim/mmu_oea.c
  user/thompsa/vaptq/sys/powerpc/booke/pmap.c
  user/thompsa/vaptq/sys/powerpc/include/elf.h
  user/thompsa/vaptq/sys/powerpc/include/spr.h
  user/thompsa/vaptq/sys/powerpc/mpc85xx/mpc85xx.c
  user/thompsa/vaptq/sys/powerpc/mpc85xx/mpc85xx.h
  user/thompsa/vaptq/sys/powerpc/mpc85xx/ocpbus.c
  user/thompsa/vaptq/sys/powerpc/powerpc/elf_machdep.c
  user/thompsa/vaptq/sys/security/audit/audit.c
  user/thompsa/vaptq/sys/security/audit/audit.h
  user/thompsa/vaptq/sys/security/audit/audit_bsm_token.c
  user/thompsa/vaptq/sys/security/audit/audit_syscalls.c
  user/thompsa/vaptq/sys/security/mac/mac_atalk.c
  user/thompsa/vaptq/sys/security/mac/mac_audit.c
  user/thompsa/vaptq/sys/security/mac/mac_cred.c
  user/thompsa/vaptq/sys/security/mac/mac_framework.c
  user/thompsa/vaptq/sys/security/mac/mac_framework.h
  user/thompsa/vaptq/sys/security/mac/mac_inet.c
  user/thompsa/vaptq/sys/security/mac/mac_inet6.c
  user/thompsa/vaptq/sys/security/mac/mac_internal.h
  user/thompsa/vaptq/sys/security/mac/mac_net.c
  user/thompsa/vaptq/sys/security/mac/mac_pipe.c
  user/thompsa/vaptq/sys/security/mac/mac_policy.h
  user/thompsa/vaptq/sys/security/mac/mac_posix_sem.c
  user/thompsa/vaptq/sys/security/mac/mac_posix_shm.c
  user/thompsa/vaptq/sys/security/mac/mac_priv.c
  user/thompsa/vaptq/sys/security/mac/mac_process.c
  user/thompsa/vaptq/sys/security/mac/mac_socket.c
  user/thompsa/vaptq/sys/security/mac/mac_syscalls.c
  user/thompsa/vaptq/sys/security/mac/mac_system.c
  user/thompsa/vaptq/sys/security/mac/mac_sysv_msg.c
  user/thompsa/vaptq/sys/security/mac/mac_sysv_sem.c
  user/thompsa/vaptq/sys/security/mac/mac_sysv_shm.c
  user/thompsa/vaptq/sys/security/mac/mac_vfs.c
  user/thompsa/vaptq/sys/security/mac_biba/mac_biba.c
  user/thompsa/vaptq/sys/security/mac_bsdextended/mac_bsdextended.c
  user/thompsa/vaptq/sys/security/mac_bsdextended/ugidfw_internal.h
  user/thompsa/vaptq/sys/security/mac_bsdextended/ugidfw_vnode.c
  user/thompsa/vaptq/sys/security/mac_lomac/mac_lomac.c
  user/thompsa/vaptq/sys/security/mac_mls/mac_mls.c
  user/thompsa/vaptq/sys/security/mac_portacl/mac_portacl.c
  user/thompsa/vaptq/sys/security/mac_stub/mac_stub.c
  user/thompsa/vaptq/sys/security/mac_test/mac_test.c
  user/thompsa/vaptq/sys/sparc64/conf/GENERIC
  user/thompsa/vaptq/sys/sparc64/include/elf.h
  user/thompsa/vaptq/sys/sparc64/sparc64/elf_machdep.c
  user/thompsa/vaptq/sys/sun4v/include/elf.h
  user/thompsa/vaptq/sys/sys/_pthreadtypes.h
  user/thompsa/vaptq/sys/sys/aio.h
  user/thompsa/vaptq/sys/sys/buf.h
  user/thompsa/vaptq/sys/sys/cdefs.h
  user/thompsa/vaptq/sys/sys/diskpc98.h
  user/thompsa/vaptq/sys/sys/elf_common.h
  user/thompsa/vaptq/sys/sys/fcntl.h
  user/thompsa/vaptq/sys/sys/imgact.h
  user/thompsa/vaptq/sys/sys/imgact_elf.h
  user/thompsa/vaptq/sys/sys/ktrace.h
  user/thompsa/vaptq/sys/sys/lock_profile.h
  user/thompsa/vaptq/sys/sys/mbuf.h
  user/thompsa/vaptq/sys/sys/memrange.h
  user/thompsa/vaptq/sys/sys/mount.h
  user/thompsa/vaptq/sys/sys/param.h
  user/thompsa/vaptq/sys/sys/pipe.h
  user/thompsa/vaptq/sys/sys/priv.h
  user/thompsa/vaptq/sys/sys/proc.h
  user/thompsa/vaptq/sys/sys/sdt.h
  user/thompsa/vaptq/sys/sys/sem.h
  user/thompsa/vaptq/sys/sys/shm.h
  user/thompsa/vaptq/sys/sys/smp.h
  user/thompsa/vaptq/sys/sys/stat.h
  user/thompsa/vaptq/sys/sys/sysctl.h
  user/thompsa/vaptq/sys/sys/syslog.h
  user/thompsa/vaptq/sys/sys/systm.h
  user/thompsa/vaptq/sys/sys/termios.h
  user/thompsa/vaptq/sys/sys/time.h
  user/thompsa/vaptq/sys/sys/tree.h
  user/thompsa/vaptq/sys/sys/uio.h
  user/thompsa/vaptq/sys/sys/vimage.h
  user/thompsa/vaptq/sys/sys/vnode.h
  user/thompsa/vaptq/sys/ufs/ffs/ffs_snapshot.c
  user/thompsa/vaptq/sys/ufs/ffs/ffs_vfsops.c
  user/thompsa/vaptq/sys/ufs/ffs/ffs_vnops.c
  user/thompsa/vaptq/sys/ufs/ufs/inode.h
  user/thompsa/vaptq/sys/vm/vm_init.c
  user/thompsa/vaptq/sys/vm/vnode_pager.c
  user/thompsa/vaptq/sys/xdr/xdr_mem.c
  user/thompsa/vaptq/sys/xen/evtchn/evtchn.c
  user/thompsa/vaptq/sys/xen/evtchn/evtchn_dev.c
  user/thompsa/vaptq/sys/xen/features.c
  user/thompsa/vaptq/sys/xen/gnttab.c
  user/thompsa/vaptq/sys/xen/gnttab.h
  user/thompsa/vaptq/sys/xen/interface/arch-x86/xen.h
  user/thompsa/vaptq/sys/xen/interface/hvm/params.h
  user/thompsa/vaptq/sys/xen/xenbus/xenbus_probe.c
  user/thompsa/vaptq/sys/xen/xenbus/xenbus_xs.c
  user/thompsa/vaptq/tools/regression/bin/sh/builtins/type1.0.stderr   (props changed)
  user/thompsa/vaptq/tools/regression/include/tgmath/Makefile
  user/thompsa/vaptq/tools/regression/lib/libc/stdio/Makefile
  user/thompsa/vaptq/tools/regression/lib/libc/string/Makefile
  user/thompsa/vaptq/tools/regression/lib/msun/test-conj.t   (props changed)
  user/thompsa/vaptq/tools/regression/sockets/unix_gc/unix_gc.c
  user/thompsa/vaptq/tools/tools/ath/Makefile
  user/thompsa/vaptq/tools/tools/ath/athregs/Makefile
  user/thompsa/vaptq/tools/tools/ath/athstats/main.c
  user/thompsa/vaptq/tools/tools/ifinfo/ifinfo.c
  user/thompsa/vaptq/usr.bin/calendar/calendars/calendar.freebsd
  user/thompsa/vaptq/usr.bin/csup/   (props changed)
  user/thompsa/vaptq/usr.bin/fstat/msdosfs.c
  user/thompsa/vaptq/usr.bin/ipcs/ipcs.c
  user/thompsa/vaptq/usr.bin/kdump/kdump.1
  user/thompsa/vaptq/usr.bin/kdump/kdump.c
  user/thompsa/vaptq/usr.bin/ktrace/ktrace.1
  user/thompsa/vaptq/usr.bin/ktrace/ktrace.h
  user/thompsa/vaptq/usr.bin/ktrace/subr.c
  user/thompsa/vaptq/usr.bin/ministat/ministat.c
  user/thompsa/vaptq/usr.bin/ncal/ncal.1
  user/thompsa/vaptq/usr.bin/ncal/ncal.c
  user/thompsa/vaptq/usr.bin/netstat/inet.c
  user/thompsa/vaptq/usr.bin/newkey/newkey.c
  user/thompsa/vaptq/usr.bin/newkey/update.c
  user/thompsa/vaptq/usr.bin/nl/nl.c
  user/thompsa/vaptq/usr.bin/procstat/   (props changed)
  user/thompsa/vaptq/usr.bin/sockstat/sockstat.c
  user/thompsa/vaptq/usr.bin/systat/netstat.c
  user/thompsa/vaptq/usr.bin/systat/vmstat.c
  user/thompsa/vaptq/usr.bin/tar/   (props changed)
  user/thompsa/vaptq/usr.bin/tar/Makefile
  user/thompsa/vaptq/usr.bin/tar/bsdtar.c
  user/thompsa/vaptq/usr.bin/tar/bsdtar.h
  user/thompsa/vaptq/usr.bin/tar/bsdtar_platform.h
  user/thompsa/vaptq/usr.bin/tar/cmdline.c
  user/thompsa/vaptq/usr.bin/tar/matching.c
  user/thompsa/vaptq/usr.bin/tar/read.c
  user/thompsa/vaptq/usr.bin/tar/siginfo.c
  user/thompsa/vaptq/usr.bin/tar/test/Makefile
  user/thompsa/vaptq/usr.bin/tar/test/main.c
  user/thompsa/vaptq/usr.bin/tar/test/test.h
  user/thompsa/vaptq/usr.bin/tar/test/test_0.c
  user/thompsa/vaptq/usr.bin/tar/test/test_basic.c
  user/thompsa/vaptq/usr.bin/tar/test/test_copy.c
  user/thompsa/vaptq/usr.bin/tar/test/test_getdate.c
  user/thompsa/vaptq/usr.bin/tar/test/test_option_T.c
  user/thompsa/vaptq/usr.bin/tar/test/test_patterns.c
  user/thompsa/vaptq/usr.bin/tar/test/test_strip_components.c
  user/thompsa/vaptq/usr.bin/tar/test/test_symlink_dir.c
  user/thompsa/vaptq/usr.bin/tar/test/test_version.c
  user/thompsa/vaptq/usr.bin/tar/tree.c
  user/thompsa/vaptq/usr.bin/tar/util.c
  user/thompsa/vaptq/usr.bin/tar/write.c
  user/thompsa/vaptq/usr.bin/top/machine.c
  user/thompsa/vaptq/usr.sbin/IPXrouted/tables.c
  user/thompsa/vaptq/usr.sbin/boot0cfg/boot0cfg.c
  user/thompsa/vaptq/usr.sbin/cxgbtool/cxgbtool.c
  user/thompsa/vaptq/usr.sbin/cxgbtool/version.h
  user/thompsa/vaptq/usr.sbin/gstat/gstat.8
  user/thompsa/vaptq/usr.sbin/gstat/gstat.c
  user/thompsa/vaptq/usr.sbin/ifmcstat/Makefile
  user/thompsa/vaptq/usr.sbin/ifmcstat/ifmcstat.8
  user/thompsa/vaptq/usr.sbin/ifmcstat/ifmcstat.c
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/getid.c   (props changed)
  user/thompsa/vaptq/usr.sbin/mergemaster/mergemaster.sh
  user/thompsa/vaptq/usr.sbin/mtest/mtest.8
  user/thompsa/vaptq/usr.sbin/mtest/mtest.c
  user/thompsa/vaptq/usr.sbin/sysinstall/config.c
  user/thompsa/vaptq/usr.sbin/sysinstall/dispatch.c
  user/thompsa/vaptq/usr.sbin/sysinstall/menus.c
  user/thompsa/vaptq/usr.sbin/sysinstall/modules.c
  user/thompsa/vaptq/usr.sbin/sysinstall/sysinstall.8
  user/thompsa/vaptq/usr.sbin/sysinstall/sysinstall.h
  user/thompsa/vaptq/usr.sbin/sysinstall/user.c
  user/thompsa/vaptq/usr.sbin/usbconfig/Makefile
  user/thompsa/vaptq/usr.sbin/usbconfig/usbconfig.c
  user/thompsa/vaptq/usr.sbin/wpa/Makefile.inc
  user/thompsa/vaptq/usr.sbin/wpa/hostapd/Makefile
  user/thompsa/vaptq/usr.sbin/wpa/hostapd/driver_freebsd.c
  user/thompsa/vaptq/usr.sbin/wpa/hostapd_cli/Makefile
  user/thompsa/vaptq/usr.sbin/wpa/wpa_cli/Makefile
  user/thompsa/vaptq/usr.sbin/wpa/wpa_passphrase/Makefile
  user/thompsa/vaptq/usr.sbin/wpa/wpa_supplicant/Makefile
  user/thompsa/vaptq/usr.sbin/wpa/wpa_supplicant/Packet32.c
  user/thompsa/vaptq/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
  user/thompsa/vaptq/usr.sbin/wpa/wpa_supplicant/driver_wired.c
  user/thompsa/vaptq/usr.sbin/zic/   (props changed)

Modified: user/thompsa/vaptq/MAINTAINERS
==============================================================================
--- user/thompsa/vaptq/MAINTAINERS	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/MAINTAINERS	Wed Mar 18 21:33:53 2009	(r189988)
@@ -29,7 +29,6 @@ MAC Framework	rwatson	Pre-commit review 
 MAC Modules	rwatson	Pre-commit review requested.
 contrib/openbsm	rwatson	Pre-commit review requested.
 sys/security/audit	rwatson	Pre-commit review requested.
-ATA/IDE		sos	Pre-commit review requested.
 ahc(4)		gibbs	Pre-commit review requested.
 ahd(4)		gibbs	Pre-commit review requested.
 NEWCARD		imp	Pre-commit review requested.

Modified: user/thompsa/vaptq/Makefile
==============================================================================
--- user/thompsa/vaptq/Makefile	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/Makefile	Wed Mar 18 21:33:53 2009	(r189988)
@@ -88,7 +88,7 @@ TGTS=	all all-man buildenv buildenvvars 
 	obj objlink regress rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 distribute32 install32
+	build32 distribute32 install32 xdev xdev-build xdev-install
 TGTS+=	${SUBDIR_TARGETS}
 
 BITGTS=	files includes

Modified: user/thompsa/vaptq/Makefile.inc1
==============================================================================
--- user/thompsa/vaptq/Makefile.inc1	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/Makefile.inc1	Wed Mar 18 21:33:53 2009	(r189988)
@@ -232,7 +232,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+		-DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # build-tools stage
@@ -291,7 +291,7 @@ LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTRE
 		SHLIBDIR=/usr/lib32
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
+		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
 		-DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP}
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
 .endif
@@ -344,30 +344,13 @@ _worldtmp:
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
-    usr/bin usr/games usr/include/sys usr/lib \
-    usr/libexec usr/sbin usr/share/dict \
-    usr/share/groff_font/devX100 \
-    usr/share/groff_font/devX100-12 \
-    usr/share/groff_font/devX75 \
-    usr/share/groff_font/devX75-12 \
-    usr/share/groff_font/devascii \
-    usr/share/groff_font/devcp1047 \
-    usr/share/groff_font/devdvi \
-    usr/share/groff_font/devhtml \
-    usr/share/groff_font/devkoi8-r \
-    usr/share/groff_font/devlatin1 \
-    usr/share/groff_font/devlbp \
-    usr/share/groff_font/devlj4 \
-    usr/share/groff_font/devps \
-    usr/share/groff_font/devutf8 \
-    usr/share/tmac/mdoc usr/share/tmac/mm
-	mkdir -p ${WORLDTMP}/legacy/${_dir}
-.endfor
-.for _dir in \
-    lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc
+    lib usr legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${WORLDTMP}/legacy/usr >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${WORLDTMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
@@ -429,7 +412,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries
+	    -DWITHOUT_MAN -DWITHOUT_PROFILE libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -448,10 +431,9 @@ build32:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
-.for _dir in \
-    usr/include usr/lib32 usr/share/misc
-	mkdir -p ${LIB32TMP}/${_dir}
-.endfor
+	mkdir -p ${LIB32TMP}/usr/lib32
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${LIB32TMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	mkdir -p ${WORLDTMP}
@@ -612,8 +594,12 @@ installcheck_UGID:
 #
 # Required install tools to be saved in a scratch dir for safety.
 #
+.if ${MK_INFO} != "no"
+_install-info=	install-info
+.endif
+
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
-	date echo egrep find grep install-info \
+	date echo egrep find grep ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
 	test true uname wc zic
 
@@ -1328,3 +1314,92 @@ check-old: check-old-files check-old-lib
 #
 showconfig:
 	@${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort
+
+
+###############
+
+.if defined(XDEV) && defined(XDEV_ARCH)
+
+NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
+	-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
+	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS
+
+XDDIR=${XDEV}-freebsd
+XDTP=/usr/${XDDIR}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH}
+CDENV= ${CDBENV} \
+	_SHLIBDIRPREFIX=${XDTP} \
+	TOOLS_PREFIX=${XDTP}
+CD2ENV=${CDENV} \
+	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
+
+CDTMP=	${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp
+CDMAKE=${CDENV} ${MAKE} ${NOFUN}
+CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
+XDDESTDIR=${DESTDIR}${XDTP}
+.if !defined(OSREL)
+OSREL!= uname -r | sed -e 's/[-(].*//'
+.endif
+
+.ORDER: xdev-build xdev-install
+xdev: xdev-build xdev-install
+
+.ORDER: _xb-build-tools _xb-cross-tools
+xdev-build: _xb-build-tools _xb-cross-tools
+
+_xb-build-tools:
+	${_+_}cd ${.CURDIR}; \
+	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
+
+_xb-cross-tools:
+.for _tool in \
+    gnu/usr.bin/binutils \
+    gnu/usr.bin/cc
+	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
+	cd ${.CURDIR}/${_tool}; \
+	${CDMAKE} DIRPRFX=${_tool}/ obj; \
+	${CDMAKE} DIRPRFX=${_tool}/ depend; \
+	${CDMAKE} DIRPRFX=${_tool}/ all
+.endfor
+
+_xi-mtree:
+	${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
+	mkdir -p ${XDDESTDIR}
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
+	    -p ${XDDESTDIR} >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${XDDESTDIR}/usr >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+	    -p ${XDDESTDIR}/usr/include >/dev/null
+
+.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+
+_xi-cross-tools:
+	@echo "_xi-cross-tools"
+.for _tool in \
+    gnu/usr.bin/binutils \
+    gnu/usr.bin/cc
+	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
+	cd ${.CURDIR}/${_tool}; \
+	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
+.endfor
+
+_xi-includes:
+	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \
+		DESTDIR=${XDDESTDIR}
+
+_xi-libraries:
+	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
+		DESTDIR=${XDDESTDIR}
+
+_xi-links:
+	${_+_}cd ${XDDESTDIR}/usr/bin; \
+		for i in *; do \
+			ln -sf ../../${XDTP}/usr/bin/$$i \
+			    ../../../../usr/bin/${XDDIR}-$$i; \
+			ln -sf ../../${XDTP}/usr/bin/$$i \
+			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
+		done
+.endif

Modified: user/thompsa/vaptq/ObsoleteFiles.inc
==============================================================================
--- user/thompsa/vaptq/ObsoleteFiles.inc	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/ObsoleteFiles.inc	Wed Mar 18 21:33:53 2009	(r189988)
@@ -14,6 +14,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090313: k8temp(4) renamed to amdtemp(4)
+OLD_FILES+=usr/share/man/man4/k8temp.4.gz
+# 20090308: libusb.so.1 renamed
+OLD_LIBS+=usr/lib/libusb20.so.1
+OLD_FILES+=usr/lib/libusb20.a
+OLD_FILES+=usr/lib/libusb20.so
+OLD_FILES+=usr/lib/libusb20_p.a
+OLD_FILES+=usr/include/libusb20_compat01.h
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 # 20090223: changeover of USB stacks
@@ -1766,9 +1774,6 @@ OLD_FILES+=usr/lib/libss.a
 OLD_FILES+=usr/lib/libss_p.a
 OLD_FILES+=usr/lib/libtelnet.a
 OLD_FILES+=usr/lib/libtelnet_p.a
-OLD_FILES+=usr/lib/libusb.a
-OLD_FILES+=usr/lib/libusb.so
-OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/sbin/diskpart
 # 200202XX
 OLD_FILES+=usr/bin/gprof4

Modified: user/thompsa/vaptq/UPDATING
==============================================================================
--- user/thompsa/vaptq/UPDATING	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/UPDATING	Wed Mar 18 21:33:53 2009	(r189988)
@@ -22,6 +22,82 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090315:
+	Support for the IFF_NEEDSGIANT network interface flag has been
+	removed, which means that non-MPSAFE network device drivers are no
+	longer supported.  In particular, if_ar, if_sr, and network device
+	drivers from the old (legacy) USB stack can no longer be built or
+	used.
+
+20090313:
+	POSIX.1 Native Language Support (NLS) has been enabled in libc and
+	a bunch of new language catalog files have also been added.
+	This means that some common libc messages are now localized and
+	they depend on the LC_MESSAGES environmental variable.
+
+20090313:
+	The k8temp(4) driver has been renamed to amdtemp(4) since
+	support for K10 and K11 CPU families was added.
+
+20090309:
+	IGMPv3 and Source-Specific Multicast (SSM) have been merged
+	to the IPv4 stack. VIMAGE hooks are in but not yet used.
+
+	For kernel developers, the most important changes are that the
+	ip_output() and ip_input() paths no longer take the IN_MULTI_LOCK(),
+	and this lock has been downgraded to a non-recursive mutex.
+
+	Transport protocols (UDP, Raw IP) are now responsible for filtering
+	inbound multicast traffic according to group membership and source
+	filters. The imo_multicast_filter() KPI exists for this purpose.
+	Transports which do not use multicast (SCTP, TCP) already reject
+	multicast by default. Forwarding and receive performance may improve
+	as a mutex acquisition is no longer needed in the ip_input()
+	low-level input path.  in_addmulti() and in_delmulti() are shimmed
+	to new KPIs which exist to support SSM in-kernel.
+
+	For application developers, it is recommended that loopback of
+	multicast datagrams be disabled for best performance, as this
+	will still cause the lock to be taken for each looped-back
+	datagram transmission. The net.inet.ip.mcast.loop sysctl may
+	be tuned to 0 to disable loopback by default; it defaults to 1
+	to preserve the existing behaviour.
+
+	For systems administrators, to obtain best performance with
+	multicast reception and multiple groups, it is always recommended
+	that a card with a suitably precise hash filter is used. Hash
+	collisions will still result in the lock being taken within the
+	transport protocol input path to check group membership.
+
+	If deploying FreeBSD in an environment with IGMP snooping switches,
+	it is recommended that the net.inet.igmp.sendlocal sysctl remain
+	enabled; this forces 224.0.0.0/24 group membership to be announced
+	via IGMP.
+
+	The size of 'struct igmpstat' has changed; netstat needs to be
+	recompiled to reflect this.
+	Bump __FreeBSD_version to 800070.
+
+20090309:
+	libusb20.so.1 is now installed as libusb.so.1 and the ports system
+	updated to use it. This requires a buildworld/installworld in order to
+	update the library and dependencies (usbconfig, etc). Its advisable to
+	rebuild all ports which uses libusb. More specific directions are given
+	in the ports collection UPDATING file. Any /etc/libmap.conf entries for
+	libusb are no longer required and can be removed.
+
+20090302:
+	A workaround is committed to allow the creation of System V shared
+	memory segment of size > 2 GB on the 64-bit architectures.
+	Due to a limitation of the existing ABI, the shm_segsz member
+	of the struct shmid_ds, returned by shmctl(IPC_STAT) call is
+	wrong for large segments. Note that limits must be explicitely
+	raised to allow such segments to be created.
+
+20090301:
+	The layout of struct ifnet has changed, requiring a rebuild of all
+	network device driver modules.
+
 20090227:
 	The /dev handling for the new USB stack has changed, a
 	buildworld/installworld is required for libusb20.
@@ -31,7 +107,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	module names reverted to their previous values (eg, usb, ehci, ohci,
 	ums, ...).  The old usb stack can be compiled in by prefixing the name
 	with the letter 'o', the old usb modules have been removed.
-	Updating entry 20090216 for xorg may still apply.
+	Updating entry 20090216 for xorg and 20090215 for libmap may still
+	apply.
 
 20090217:
 	The rc.conf(5) option if_up_delay has been renamed to
@@ -55,6 +132,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	that includes GENERIC then ensure that usb names are also changed over,
 	eg uftdi -> usb2_serial_ftdi.
 
+	Older programs linked against the ports libusb 0.1 need to be
+	redirected to the new stack's libusb20.  /etc/libmap.conf can
+	be used for this:
+		# Map old usb library to new one for usb2 stack
+		libusb-0.1.so.8	libusb20.so.1
+
 20090203:
 	The ichsmb(4) driver has been changed to require SMBus slave
 	addresses be left-justified (xxxxxxx0b) rather than right-justified.

Modified: user/thompsa/vaptq/bin/cat/Makefile
==============================================================================
--- user/thompsa/vaptq/bin/cat/Makefile	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/bin/cat/Makefile	Wed Mar 18 21:33:53 2009	(r189988)
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	cat
+WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: user/thompsa/vaptq/bin/sh/miscbltin.c
==============================================================================
--- user/thompsa/vaptq/bin/sh/miscbltin.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/bin/sh/miscbltin.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -147,6 +147,7 @@ readcmd(int argc __unused, char **argv _
 		if (tcgetattr(0, &told) == 0) {
 			memcpy(&tnew, &told, sizeof(told));
 			cfmakeraw(&tnew);
+			tnew.c_iflag |= told.c_iflag & ICRNL;
 			tcsetattr(0, TCSANOW, &tnew);
 			tsaved = 1;
 		}

Modified: user/thompsa/vaptq/cddl/Makefile.inc
==============================================================================
--- user/thompsa/vaptq/cddl/Makefile.inc	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/cddl/Makefile.inc	Wed Mar 18 21:33:53 2009	(r189988)
@@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../.
 IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
+
+CSTD?=		gnu89

Modified: user/thompsa/vaptq/cddl/lib/libzpool/Makefile
==============================================================================
--- user/thompsa/vaptq/cddl/lib/libzpool/Makefile	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/cddl/lib/libzpool/Makefile	Wed Mar 18 21:33:53 2009	(r189988)
@@ -33,8 +33,6 @@ SRCS=		${ZFS_COMMON_SRCS} ${ZFS_SHARED_S
 		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
 		${UNICODE_SRCS}
 
-CFLAGS+=	-std=c99
-
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@@ -60,4 +58,6 @@ LDADD=		-lpthread -lz
 # atomic.S doesn't like profiling.
 NO_PROFILE=
 
+CSTD=	c99
+
 .include <bsd.lib.mk>

Modified: user/thompsa/vaptq/cddl/usr.bin/ztest/Makefile
==============================================================================
--- user/thompsa/vaptq/cddl/usr.bin/ztest/Makefile	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/cddl/usr.bin/ztest/Makefile	Wed Mar 18 21:33:53 2009	(r189988)
@@ -5,8 +5,6 @@
 PROG=	ztest
 NO_MAN=
 
-CFLAGS+= -std=c99
-
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
@@ -21,4 +19,6 @@ DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} $
 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
 LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
+CSTD=	c99
+
 .include <bsd.prog.mk>

Modified: user/thompsa/vaptq/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- user/thompsa/vaptq/cddl/usr.sbin/zdb/Makefile	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/cddl/usr.sbin/zdb/Makefile	Wed Mar 18 21:33:53 2009	(r189988)
@@ -6,8 +6,6 @@ PROG=	zdb
 MAN=	zdb.8
 SRCS=	zdb.c zdb_il.c
 
-CFLAGS+= -std=c99
-
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@@ -25,4 +23,6 @@ DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LI
 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
 LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
 
+CSTD=	c99
+
 .include <bsd.prog.mk>

Modified: user/thompsa/vaptq/contrib/csup/updater.c
==============================================================================
--- user/thompsa/vaptq/contrib/csup/updater.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/csup/updater.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -1682,7 +1682,7 @@ updater_rcsedit(struct updater *up, stru
 	stream_close(dest);
 	rcsfile_free(rf);
 	if (error)
-		return (UPDATER_ERR_PROTO);
+		lprintf(-1, "Error writing %s\n", name);
 
 finish:
 	sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW);

Modified: user/thompsa/vaptq/contrib/gcc/c-cppbuiltin.c
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/c-cppbuiltin.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/c-cppbuiltin.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -1,5 +1,6 @@
 /* Define builtin-in macros for the C family front ends.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -484,7 +485,10 @@ c_cpp_builtins (cpp_reader *pfile)
   /* Misc.  */
   builtin_define_with_value ("__VERSION__", version_string, 1);
 
-  cpp_define (pfile, "__GNUC_GNU_INLINE__");
+  if (flag_gnu89_inline)
+    cpp_define (pfile, "__GNUC_GNU_INLINE__");
+  else
+    cpp_define (pfile, "__GNUC_STDC_INLINE__");
 
   /* Definitions for LP64 model.  */
   if (TYPE_PRECISION (long_integer_type_node) == 64

Modified: user/thompsa/vaptq/contrib/gcc/c-decl.c
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/c-decl.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/c-decl.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -1,6 +1,6 @@
 /* Process declarations and variables for C compiler.
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -20,6 +20,9 @@ Software Foundation, 51 Franklin Street,
 02110-1301, USA.  */
 
 /* $FreeBSD$ */
+/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
+/* Fixed problems with compiling inline-25.c and inline-26.c */
+/* XXX still fails inline-29.c, inline-31.c, and inline-32.c */
 
 /* Process declarations and symbol lookup for C front end.
    Also constructs types; the standard scalar types at initialization,
@@ -156,10 +159,6 @@ int current_function_returns_abnormally;
 
 static int warn_about_return_type;
 
-/* Nonzero when starting a function declared `extern inline'.  */
-
-static int current_extern_inline;
-
 /* Nonzero when the current toplevel function contains a declaration
    of a nested function which is never defined.  */
 
@@ -804,6 +803,15 @@ pop_scope (void)
 	      error ("nested function %q+D declared but never defined", p);
 	      undef_nested_function = true;
 	    }
+	  /* C99 6.7.4p6: "a function with external linkage... declared
+	     with an inline function specifier ... shall also be defined in the
+	     same translation unit."  */
+	  else if (DECL_DECLARED_INLINE_P (p)
+		   && TREE_PUBLIC (p)
+		   && !DECL_INITIAL (p)
+		   && !flag_gnu89_inline)
+	    pedwarn ("inline function %q+D declared but never defined", p);
+
 	  goto common_symbol;
 
 	case VAR_DECL:
@@ -1294,10 +1302,11 @@ diagnose_mismatched_decls (tree newdecl,
 
   /* Function declarations can either be 'static' or 'extern' (no
      qualifier is equivalent to 'extern' - C99 6.2.2p5) and therefore
-     can never conflict with each other on account of linkage (6.2.2p4).
-     Multiple definitions are not allowed (6.9p3,5) but GCC permits
-     two definitions if one is 'extern inline' and one is not.  The non-
-     extern-inline definition supersedes the extern-inline definition.  */
+     can never conflict with each other on account of linkage
+     (6.2.2p4).  Multiple definitions are not allowed (6.9p3,5) but
+     gnu89 mode permits two definitions if one is 'extern inline' and
+     one is not.  The non- extern-inline definition supersedes the
+     extern-inline definition.  */
 
   else if (TREE_CODE (newdecl) == FUNCTION_DECL)
     {
@@ -1323,16 +1332,18 @@ diagnose_mismatched_decls (tree newdecl,
 	    {
 	      /* If both decls are in the same TU and the new declaration
 		 isn't overriding an extern inline reject the new decl.
-		 When we handle c99 style inline rules we'll want to reject
-		 the following:
-
-		 DECL_EXTERN_INLINE (olddecl)
-		 && !DECL_EXTERN_INLINE (newdecl)
-
-		 if they're in the same translation unit. Until we implement
-		 the full semantics we accept the construct.  */
-	      if (!(DECL_EXTERN_INLINE (olddecl)
-		    && !DECL_EXTERN_INLINE (newdecl))
+		 In c99, no overriding is allowed in the same translation
+		 unit.  */
+	      if ((!DECL_EXTERN_INLINE (olddecl)
+		   || DECL_EXTERN_INLINE (newdecl)
+		   || (!flag_gnu89_inline
+		       && (!DECL_DECLARED_INLINE_P (olddecl)
+			   || !lookup_attribute ("gnu_inline",
+						 DECL_ATTRIBUTES (olddecl)))
+		       && (!DECL_DECLARED_INLINE_P (newdecl)
+			   || !lookup_attribute ("gnu_inline",
+						 DECL_ATTRIBUTES (newdecl))))
+		  )
 		  && same_translation_unit_p (newdecl, olddecl))
 		{
 		  error ("redefinition of %q+D", newdecl);
@@ -1392,6 +1403,23 @@ diagnose_mismatched_decls (tree newdecl,
 	      warned = true;
 	    }
 	}
+
+      /* Make sure gnu_inline attribute is either not present, or
+	 present on all inline decls.  */
+      if (DECL_DECLARED_INLINE_P (olddecl)
+	  && DECL_DECLARED_INLINE_P (newdecl))
+	{
+	  bool newa = lookup_attribute ("gnu_inline",
+					DECL_ATTRIBUTES (newdecl)) != NULL;
+	  bool olda = lookup_attribute ("gnu_inline",
+					DECL_ATTRIBUTES (olddecl)) != NULL;
+	  if (newa != olda)
+	    {
+	      error ("%<gnu_inline%> attribute present on %q+D",
+		     newa ? newdecl : olddecl);
+	      error ("%Jbut not here", newa ? olddecl : newdecl);
+	    }
+	}
     }
   else if (TREE_CODE (newdecl) == VAR_DECL)
     {
@@ -1523,9 +1551,13 @@ diagnose_mismatched_decls (tree newdecl,
 	 ??? Should we still warn about this now we have unit-at-a-time
 	 mode and can get it right?
 	 Definitely don't complain if the decls are in different translation
-	 units.  */
+	 units.
+	 C99 permits this, so don't warn in that case.  (The function
+	 may not be inlined everywhere in function-at-a-time mode, but
+	 we still shouldn't warn.)  */
       if (DECL_DECLARED_INLINE_P (newdecl) && !DECL_DECLARED_INLINE_P (olddecl)
-	  && same_translation_unit_p (olddecl, newdecl))
+	  && same_translation_unit_p (olddecl, newdecl)
+	  && flag_gnu89_inline)
 	{
 	  if (TREE_USED (olddecl))
 	    {
@@ -1602,12 +1634,13 @@ diagnose_mismatched_decls (tree newdecl,
 static void
 merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
 {
-  int new_is_definition = (TREE_CODE (newdecl) == FUNCTION_DECL
-			   && DECL_INITIAL (newdecl) != 0);
-  int new_is_prototype = (TREE_CODE (newdecl) == FUNCTION_DECL
-			  && TYPE_ARG_TYPES (TREE_TYPE (newdecl)) != 0);
-  int old_is_prototype = (TREE_CODE (olddecl) == FUNCTION_DECL
-			  && TYPE_ARG_TYPES (TREE_TYPE (olddecl)) != 0);
+  bool new_is_definition = (TREE_CODE (newdecl) == FUNCTION_DECL
+			    && DECL_INITIAL (newdecl) != 0);
+  bool new_is_prototype = (TREE_CODE (newdecl) == FUNCTION_DECL
+			   && TYPE_ARG_TYPES (TREE_TYPE (newdecl)) != 0);
+  bool old_is_prototype = (TREE_CODE (olddecl) == FUNCTION_DECL
+			   && TYPE_ARG_TYPES (TREE_TYPE (olddecl)) != 0);
+  bool extern_changed = false;
 
   /* For real parm decl following a forward decl, rechain the old decl
      in its new location and clear TREE_ASM_WRITTEN (it's not a
@@ -1750,6 +1783,20 @@ merge_decls (tree newdecl, tree olddecl,
 	}
     }
 
+  /* In c99, 'extern' declaration before (or after) 'inline' means this
+     function is not DECL_EXTERNAL, unless 'gnu_inline' attribute
+     is present.  */
+  if (TREE_CODE (newdecl) == FUNCTION_DECL
+      && !flag_gnu89_inline
+      && (DECL_DECLARED_INLINE_P (newdecl)
+	  || DECL_DECLARED_INLINE_P (olddecl))
+      && (!DECL_DECLARED_INLINE_P (newdecl)
+	  || !DECL_DECLARED_INLINE_P (olddecl)
+	  || !DECL_EXTERNAL (olddecl))
+      && DECL_EXTERNAL (newdecl)
+      && !lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (newdecl)))
+    DECL_EXTERNAL (newdecl) = 0;
+
   if (DECL_EXTERNAL (newdecl))
     {
       TREE_STATIC (newdecl) = TREE_STATIC (olddecl);
@@ -1842,6 +1889,8 @@ merge_decls (tree newdecl, tree olddecl,
 	}
     }
 
+   extern_changed = DECL_EXTERNAL (olddecl) && !DECL_EXTERNAL (newdecl);
+
   /* Copy most of the decl-specific fields of NEWDECL into OLDDECL.
      But preserve OLDDECL's DECL_UID and DECL_CONTEXT.  */
   {
@@ -1884,6 +1933,13 @@ merge_decls (tree newdecl, tree olddecl,
 	  || (TREE_CODE (olddecl) == VAR_DECL
 	      && TREE_STATIC (olddecl))))
     make_decl_rtl (olddecl);
+
+  /* If we changed a function from DECL_EXTERNAL to !DECL_EXTERNAL,
+     and the definition is coming from the old version, cgraph needs
+     to be called again.  */
+  if (extern_changed && !new_is_definition 
+      && TREE_CODE (olddecl) == FUNCTION_DECL && DECL_INITIAL (olddecl))
+    cgraph_finalize_function (olddecl, false);
 }
 
 /* Handle when a new declaration NEWDECL has the same name as an old
@@ -3274,6 +3330,18 @@ start_decl (struct c_declarator *declara
   /* Set attributes here so if duplicate decl, will have proper attributes.  */
   decl_attributes (&decl, attributes, 0);
 
+  /* Handle gnu_inline attribute.  */
+  if (declspecs->inline_p
+      && !flag_gnu89_inline
+      && TREE_CODE (decl) == FUNCTION_DECL
+      && lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (decl)))
+    {
+      if (declspecs->storage_class == csc_auto && current_scope != file_scope)
+	;
+      else if (declspecs->storage_class != csc_static)
+	DECL_EXTERNAL (decl) = !DECL_EXTERNAL (decl);
+    }
+
   if (TREE_CODE (decl) == FUNCTION_DECL
       && targetm.calls.promote_prototypes (TREE_TYPE (decl)))
     {
@@ -3301,6 +3369,18 @@ start_decl (struct c_declarator *declara
     warning (OPT_Wattributes, "inline function %q+D given attribute noinline",
 	     decl);
 
+  /* C99 6.7.4p3: An inline definition of a function with external
+     linkage shall not contain a definition of a modifiable object
+     with static storage duration...  */
+  if (TREE_CODE (decl) == VAR_DECL
+      && current_scope != file_scope
+      && TREE_STATIC (decl)
+      && !TREE_READONLY (decl)
+      && DECL_DECLARED_INLINE_P (current_function_decl)
+      && DECL_EXTERNAL (current_function_decl))
+    pedwarn ("%q+D is static but declared in inline function %qD "
+	     "which is not static", decl, current_function_decl);
+
   /* Add this decl to the current scope.
      TEM may equal DECL or it may be a previous decl of the same name.  */
   tem = pushdecl (decl);
@@ -4755,8 +4835,16 @@ grokdeclarator (const struct c_declarato
 	   GCC to signify a forward declaration of a nested function.  */
 	if (storage_class == csc_auto && current_scope != file_scope)
 	  DECL_EXTERNAL (decl) = 0;
+	/* In C99, a function which is declared 'inline' with 'extern'
+	   is not an external reference (which is confusing).  It
+	   means that the later definition of the function must be output
+	   in this file, C99 6.7.4p6.  In GNU C89, a function declared
+	   'extern inline' is an external reference.  */
+	else if (declspecs->inline_p && storage_class != csc_static)
+	  DECL_EXTERNAL (decl) = ((storage_class == csc_extern)
+				  == flag_gnu89_inline);
 	else
-	  DECL_EXTERNAL (decl) = 1;
+	  DECL_EXTERNAL (decl) = !initialized;
 
 	/* Record absence of global scope for `static' or `auto'.  */
 	TREE_PUBLIC (decl)
@@ -4786,11 +4874,7 @@ grokdeclarator (const struct c_declarato
 	       the abstract origin pointing between the declarations,
 	       which will confuse dwarf2out.  */
 	    if (initialized)
-	      {
-		DECL_INLINE (decl) = 1;
-		if (storage_class == csc_extern)
-		  current_extern_inline = 1;
-	      }
+	      DECL_INLINE (decl) = 1;
 	  }
 	/* If -finline-functions, assume it can be inlined.  This does
 	   two things: let the function be deferred until it is actually
@@ -5288,12 +5372,15 @@ start_struct (enum tree_code code, tree 
 	    error ("nested redefinition of %<union %E%>", name);
 	  else
 	    error ("nested redefinition of %<struct %E%>", name);
+	  /* Don't create structures that contain themselves.  */
+	  ref = NULL_TREE;
 	}
     }
-  else
-    {
-      /* Otherwise create a forward-reference just so the tag is in scope.  */
 
+  /* Otherwise create a forward-reference just so the tag is in scope.  */
+
+  if (ref == NULL_TREE || TREE_CODE (ref) != code)
+    {
       ref = make_node (code);
       pushtag (name, ref);
     }
@@ -5985,7 +6072,6 @@ start_function (struct c_declspecs *decl
   current_function_returns_null = 0;
   current_function_returns_abnormally = 0;
   warn_about_return_type = 0;
-  current_extern_inline = 0;
   c_switch_stack = NULL;
 
   nstack_se = XOBNEW (&parser_obstack, struct c_label_context_se);
@@ -6025,6 +6111,16 @@ start_function (struct c_declspecs *decl
     warning (OPT_Wattributes, "inline function %q+D given attribute noinline",
 	     decl1);
 
+  /* Handle gnu_inline attribute.  */
+  if (declspecs->inline_p
+      && !flag_gnu89_inline
+      && TREE_CODE (decl1) == FUNCTION_DECL
+      && lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (decl1)))
+    {
+      if (declspecs->storage_class != csc_static)
+	DECL_EXTERNAL (decl1) = !DECL_EXTERNAL (decl1);
+    }
+
   announce_function (decl1);
 
   if (!COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (TREE_TYPE (decl1))))
@@ -6137,36 +6233,6 @@ start_function (struct c_declspecs *decl
     warning (OPT_Wmissing_declarations,
 	     "%q+D was used with no declaration before its definition", decl1);
 
-  /* This is a definition, not a reference.
-     So normally clear DECL_EXTERNAL.
-     However, `extern inline' acts like a declaration
-     except for defining how to inline.  So set DECL_EXTERNAL in that case.  */
-  DECL_EXTERNAL (decl1) = current_extern_inline;
-
-  /* C99 specified different behaviour for non-static inline
-     functions, compared with the traditional GNU behaviour.  We don't
-     support the C99 behaviour, but we do warn about non-static inline
-     functions here.  The warning can be disabled via an explicit use
-     of -fgnu89-inline, or by using the gnu_inline attribute.  */
-  if (DECL_DECLARED_INLINE_P (decl1)
-      && TREE_PUBLIC (decl1)
-      && flag_isoc99
-      && flag_gnu89_inline != 1
-      && !lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (decl1))
-      && diagnostic_report_warnings_p ())
-    {
-      static bool info = false;
-
-      warning (0, "C99 inline functions are not supported; using GNU89");
-      if (!info)
-	{
-	  warning (0,
-		   "to disable this warning use -fgnu89-inline or "
-		   "the gnu_inline function attribute");
-	  info = true;
-	}
-    }
-
   /* This function exists in static storage.
      (This does not mean `static' in the C sense!)  */
   TREE_STATIC (decl1) = 1;
@@ -6942,7 +7008,6 @@ c_push_function_context (struct function
   p->returns_null = current_function_returns_null;
   p->returns_abnormally = current_function_returns_abnormally;
   p->warn_about_return_type = warn_about_return_type;
-  p->extern_inline = current_extern_inline;
 }
 
 /* Restore the variables used during compilation of a C function.  */
@@ -6971,7 +7036,6 @@ c_pop_function_context (struct function 
   current_function_returns_null = p->returns_null;
   current_function_returns_abnormally = p->returns_abnormally;
   warn_about_return_type = p->warn_about_return_type;
-  current_extern_inline = p->extern_inline;
 
   f->language = NULL;
 }

Modified: user/thompsa/vaptq/contrib/gcc/c-opts.c
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/c-opts.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/c-opts.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -21,6 +21,7 @@ Software Foundation, 51 Franklin Street,
 02110-1301, USA.  */
 
 /* $FreeBSD$ */
+/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
 
 #include "config.h"
 #include "system.h"
@@ -1008,11 +1009,12 @@ c_common_post_options (const char **pfil
   if (flag_inline_functions)
     flag_inline_trees = 2;
 
-  /* We recognize -fgnu89-inline in preparation for 4.3 where the
-     option will be meaningful.  Here we just reject
-     -fno-gnu89-inline, since we don't support it.  */
-  if (!flag_gnu89_inline)
-    error ("-fno-gnu89-inline is not supported");
+  /* By default we use C99 inline semantics in GNU99 or C99 mode.  C99
+     inline semantics are not supported in GNU89 or C89 mode.  */
+  if (flag_gnu89_inline == -1)
+    flag_gnu89_inline = !flag_isoc99;
+  else if (!flag_gnu89_inline && !flag_isoc99)
+    error ("-fno-gnu89-inline is only supported in GNU99 or C99 mode");
 
   /* If we are given more than one input file, we must use
      unit-at-a-time mode.  */

Modified: user/thompsa/vaptq/contrib/gcc/c-tree.h
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/c-tree.h	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/c-tree.h	Wed Mar 18 21:33:53 2009	(r189988)
@@ -384,7 +384,6 @@ struct language_function GTY(())
   int returns_null;
   int returns_abnormally;
   int warn_about_return_type;
-  int extern_inline;
 };
 
 /* Save lists of labels used or defined in particular contexts.

Modified: user/thompsa/vaptq/contrib/gcc/c-typeck.c
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/c-typeck.c	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/c-typeck.c	Wed Mar 18 21:33:53 2009	(r189988)
@@ -2109,6 +2109,19 @@ build_external_ref (tree id, int fun, lo
       if (context != 0 && context != current_function_decl)
 	DECL_NONLOCAL (ref) = 1;
     }
+  /* C99 6.7.4p3: An inline definition of a function with external
+     linkage ... shall not contain a reference to an identifier with
+     internal linkage.  */
+  else if (current_function_decl != 0
+	   && DECL_DECLARED_INLINE_P (current_function_decl)
+	   && DECL_EXTERNAL (current_function_decl)
+	   && VAR_OR_FUNCTION_DECL_P (ref)
+	   && DECL_FILE_SCOPE_P (ref)
+	   && pedantic
+	   && (TREE_CODE (ref) != VAR_DECL || TREE_STATIC (ref))
+	   && ! TREE_PUBLIC (ref))
+    pedwarn ("%H%qD is static but used in inline function %qD "
+	     "which is not static", &loc, ref, current_function_decl);
 
   return ref;
 }

Modified: user/thompsa/vaptq/contrib/gcc/doc/extend.texi
==============================================================================
--- user/thompsa/vaptq/contrib/gcc/doc/extend.texi	Wed Mar 18 21:33:28 2009	(r189987)
+++ user/thompsa/vaptq/contrib/gcc/doc/extend.texi	Wed Mar 18 21:33:53 2009	(r189988)
@@ -3829,66 +3829,54 @@ These attributes mainly are intended to 
 @cindex open coding
 @cindex macros, inline alternative
 
-By declaring a function @code{inline}, you can direct GCC to
+By declaring a function inline, you can direct GCC to make
+calls to that function faster.  One way GCC can achieve this is to
 integrate that function's code into the code for its callers.  This
 makes execution faster by eliminating the function-call overhead; in
-addition, if any of the actual argument values are constant, their known
-values may permit simplifications at compile time so that not all of the
-inline function's code needs to be included.  The effect on code size is
-less predictable; object code may be larger or smaller with function
-inlining, depending on the particular case.  Inlining of functions is an
-optimization and it really ``works'' only in optimizing compilation.  If
-you don't use @option{-O}, no function is really inline.
-
-Inline functions are included in the ISO C99 standard, but there are
-currently substantial differences between what GCC implements and what
-the ISO C99 standard requires.  GCC will fully support C99 inline
-functions in version 4.3.  The traditional GCC handling of inline
-functions will still be available with @option{-std=gnu89},
- at option{-fgnu89-inline} or when @code{gnu_inline} attribute is present
-on all inline declarations.  The preprocessor macros
- at code{__GNUC_GNU_INLINE__} and @code{__GNUC_STDC_INLINE__} may be used
-to determine the handling of @code{inline} during a particular
-compilation (@pxref{Common Predefined Macros,,,cpp,The C
-Preprocessor}).
+addition, if any of the actual argument values are constant, their
+known values may permit simplifications at compile time so that not
+all of the inline function's code needs to be included.  The effect on
+code size is less predictable; object code may be larger or smaller
+with function inlining, depending on the particular case.  You can
+also direct GCC to try to integrate all ``simple enough'' functions
+into their callers with the option @option{-finline-functions}.
+
+GCC implements three different semantics of declaring a function
+inline.  One is available with @option{-std=gnu89}, another when
+ at option{-std=c99} or @option{-std=gnu99}, and the third is used when
+compiling C++.
 
 To declare a function inline, use the @code{inline} keyword in its
 declaration, like this:
 
 @smallexample
-inline int
+static inline int
 inc (int *a)
 @{
   (*a)++;
 @}
 @end smallexample
 
-(If you are writing a header file to be included in ISO C programs, write
- at code{__inline__} instead of @code{inline}.  @xref{Alternate Keywords}.)
-You can also make all ``simple enough'' functions inline with the option
- at option{-finline-functions}.
-
- at opindex Winline
-Note that certain usages in a function definition can make it unsuitable
-for inline substitution.  Among these usages are: use of varargs, use of
-alloca, use of variable sized data types (@pxref{Variable Length}),
-use of computed goto (@pxref{Labels as Values}), use of nonlocal goto,
-and nested functions (@pxref{Nested Functions}).  Using @option{-Winline}
-will warn when a function marked @code{inline} could not be substituted,
-and will give the reason for the failure.
+If you are writing a header file to be included in ISO C89 programs, write
+ at code{__inline__} instead of @code{inline}.  @xref{Alternate Keywords}.
 
-Note that in C and Objective-C, unlike C++, the @code{inline} keyword
-does not affect the linkage of the function.
+The three types of inlining behave similarly in two important cases:
+when the @code{inline} keyword is used on a @code{static} function,
+like the example above, and when a function is first declared without
+using the @code{inline} keyword and then is defined with
+ at code{inline}, like this:
 
- at cindex automatic @code{inline} for C++ member fns
- at cindex @code{inline} automatic for C++ member fns
- at cindex member fns, automatically @code{inline}
- at cindex C++ member fns, automatically @code{inline}
- at opindex fno-default-inline
-GCC automatically inlines member functions defined within the class
-body of C++ programs even if they are not explicitly declared
- at code{inline}.  (You can override this with @option{-fno-default-inline};
- at pxref{C++ Dialect Options,,Options Controlling C++ Dialect}.)
+ at smallexample
+extern int inc (int *a);
+inline int
+inc (int *a)
+@{
+  (*a)++;
+@}
+ at end smallexample
+
+In both of these common cases, the program behaves the same as if you
+had not used the @code{inline} keyword, except for its speed.
 
 @cindex inline functions, omission of
 @opindex fkeep-inline-functions
@@ -3904,6 +3892,27 @@ nonintegrated call, then the function is
 usual.  The function must also be compiled as usual if the program
 refers to its address, because that can't be inlined.
 
+ at cindex automatic @code{inline} for C++ member fns
+ at cindex @code{inline} automatic for C++ member fns
+ at cindex member fns, automatically @code{inline}
+ at cindex C++ member fns, automatically @code{inline}
+ at opindex fno-default-inline
+As required by ISO C++, GCC considers member functions defined within
+the body of a class to be marked inline even if they are
+not explicitly declared with the @code{inline} keyword.  You can
+override this with @option{-fno-default-inline}; @pxref{C++ Dialect
+Options,,Options Controlling C++ Dialect}.
+
+GCC does not inline any functions when not optimizing unless you specify
+the @samp{always_inline} attribute for the function, like this:
+
+ at smallexample
+/* @r{Prototype.}  */

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


More information about the svn-src-user mailing list