svn commit: r204601 - in user/imp/tbemd: . bin/kill bin/pkill bin/sh cddl cddl/lib/drti cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl...

Tue Mar 2 20:20:55 UTC 2010

Author: imp
Date: Tue Mar  2 20:20:53 2010
New Revision: 204601
URL: http://svn.freebsd.org/changeset/base/204601

Log:
  Merge with latest head.

Added:
  user/imp/tbemd/contrib/dtc/
     - copied from r204598, head/contrib/dtc/
  user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h
     - copied unchanged from r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h
  user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h
     - copied unchanged from r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h
  user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c
     - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c
  user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c
     - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c
  user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.h
     - copied unchanged from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.h
  user/imp/tbemd/contrib/tzcode/
     - copied from r204598, head/contrib/tzcode/
     - copied from r204598, head/contrib/tzdata/
  user/imp/tbemd/etc/rc.d/hastd
     - copied unchanged from r204598, head/etc/rc.d/hastd
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
     - copied unchanged from r204598, head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
     - copied unchanged from r204598, head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
  user/imp/tbemd/gnu/usr.bin/dtc/
     - copied from r204598, head/gnu/usr.bin/dtc/
  user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c
     - copied unchanged from r204598, head/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c
  user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
     - copied unchanged from r204598, head/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
  user/imp/tbemd/lib/libalias/Makefile.inc
     - copied unchanged from r204598, head/lib/libalias/Makefile.inc
  user/imp/tbemd/sbin/hastctl/
     - copied from r204598, head/sbin/hastctl/
  user/imp/tbemd/sbin/hastd/
     - copied from r204598, head/sbin/hastd/
  user/imp/tbemd/share/examples/hast/
     - copied from r204598, head/share/examples/hast/
  user/imp/tbemd/share/man/man4/man4.powerpc/smu.4
     - copied unchanged from r204598, head/share/man/man4/man4.powerpc/smu.4
  user/imp/tbemd/sys/amd64/amd64/atpic_vector.S
     - copied unchanged from r204598, head/sys/amd64/amd64/atpic_vector.S
  user/imp/tbemd/sys/contrib/libfdt/
     - copied from r204598, head/sys/contrib/libfdt/
  user/imp/tbemd/sys/i386/i386/atpic_vector.s
     - copied unchanged from r204598, head/sys/i386/i386/atpic_vector.s
  user/imp/tbemd/sys/kern/kern_gzio.c
     - copied unchanged from r204598, head/sys/kern/kern_gzio.c
  user/imp/tbemd/sys/kern/subr_hash.c
     - copied unchanged from r204598, head/sys/kern/subr_hash.c
  user/imp/tbemd/sys/kern/subr_uio.c
     - copied unchanged from r204598, head/sys/kern/subr_uio.c
  user/imp/tbemd/sys/mips/rmi/bus_space_rmi_pci.c
     - copied unchanged from r204598, head/sys/mips/rmi/bus_space_rmi_pci.c
  user/imp/tbemd/sys/net/netisr_internal.h
     - copied unchanged from r204598, head/sys/net/netisr_internal.h
  user/imp/tbemd/sys/net/zutil.h
     - copied unchanged from r204598, head/sys/net/zutil.h
  user/imp/tbemd/sys/netinet/ipfw/dn_heap.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_heap.c
  user/imp/tbemd/sys/netinet/ipfw/dn_heap.h
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_heap.h
  user/imp/tbemd/sys/netinet/ipfw/dn_sched.h
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched.h
  user/imp/tbemd/sys/netinet/ipfw/dn_sched_fifo.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_fifo.c
  user/imp/tbemd/sys/netinet/ipfw/dn_sched_qfq.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_qfq.c
  user/imp/tbemd/sys/netinet/ipfw/dn_sched_rr.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_rr.c
  user/imp/tbemd/sys/netinet/ipfw/dn_sched_wf2q.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/dn_sched_wf2q.c
  user/imp/tbemd/sys/netinet/ipfw/dummynet.txt
     - copied unchanged from r204598, head/sys/netinet/ipfw/dummynet.txt
  user/imp/tbemd/sys/netinet/ipfw/ip_dn_glue.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_glue.c
  user/imp/tbemd/sys/netinet/ipfw/ip_dn_io.c
     - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_io.c
  user/imp/tbemd/sys/netinet/ipfw/ip_dn_private.h
     - copied unchanged from r204598, head/sys/netinet/ipfw/ip_dn_private.h
  user/imp/tbemd/sys/netinet/ipfw/test/
     - copied from r204598, head/sys/netinet/ipfw/test/
  user/imp/tbemd/sys/x86/
     - copied from r204598, head/sys/x86/
  user/imp/tbemd/tools/regression/kthread/
     - copied from r204598, head/tools/regression/kthread/
  user/imp/tbemd/tools/tools/mcgrab/
     - copied from r204598, head/tools/tools/mcgrab/
  user/imp/tbemd/usr.bin/csup/README
     - copied unchanged from r204598, head/usr.bin/csup/README
  user/imp/tbemd/usr.bin/csup/TODO
     - copied unchanged from r204598, head/usr.bin/csup/TODO
  user/imp/tbemd/usr.bin/csup/attrstack.c
     - copied unchanged from r204598, head/usr.bin/csup/attrstack.c
  user/imp/tbemd/usr.bin/csup/attrstack.h
     - copied unchanged from r204598, head/usr.bin/csup/attrstack.h
  user/imp/tbemd/usr.bin/csup/auth.c
     - copied unchanged from r204598, head/usr.bin/csup/auth.c
  user/imp/tbemd/usr.bin/csup/auth.h
     - copied unchanged from r204598, head/usr.bin/csup/auth.h
  user/imp/tbemd/usr.bin/csup/config.c
     - copied unchanged from r204598, head/usr.bin/csup/config.c
  user/imp/tbemd/usr.bin/csup/config.h
     - copied unchanged from r204598, head/usr.bin/csup/config.h
  user/imp/tbemd/usr.bin/csup/cpasswd.1
     - copied unchanged from r204598, head/usr.bin/csup/cpasswd.1
  user/imp/tbemd/usr.bin/csup/cpasswd.sh
     - copied unchanged from r204598, head/usr.bin/csup/cpasswd.sh
  user/imp/tbemd/usr.bin/csup/csup.1
     - copied unchanged from r204598, head/usr.bin/csup/csup.1
  user/imp/tbemd/usr.bin/csup/detailer.c
     - copied unchanged from r204598, head/usr.bin/csup/detailer.c
  user/imp/tbemd/usr.bin/csup/detailer.h
     - copied unchanged from r204598, head/usr.bin/csup/detailer.h
  user/imp/tbemd/usr.bin/csup/diff.c
     - copied unchanged from r204598, head/usr.bin/csup/diff.c
  user/imp/tbemd/usr.bin/csup/diff.h
     - copied unchanged from r204598, head/usr.bin/csup/diff.h
  user/imp/tbemd/usr.bin/csup/fattr.c
     - copied unchanged from r204598, head/usr.bin/csup/fattr.c
  user/imp/tbemd/usr.bin/csup/fattr.h
     - copied unchanged from r204598, head/usr.bin/csup/fattr.h
  user/imp/tbemd/usr.bin/csup/fattr_bsd.h
     - copied unchanged from r204598, head/usr.bin/csup/fattr_bsd.h
  user/imp/tbemd/usr.bin/csup/fattr_posix.h
     - copied unchanged from r204598, head/usr.bin/csup/fattr_posix.h
  user/imp/tbemd/usr.bin/csup/fixups.c
     - copied unchanged from r204598, head/usr.bin/csup/fixups.c
  user/imp/tbemd/usr.bin/csup/fixups.h
     - copied unchanged from r204598, head/usr.bin/csup/fixups.h
  user/imp/tbemd/usr.bin/csup/fnmatch.c
     - copied unchanged from r204598, head/usr.bin/csup/fnmatch.c
  user/imp/tbemd/usr.bin/csup/fnmatch.h
     - copied unchanged from r204598, head/usr.bin/csup/fnmatch.h
  user/imp/tbemd/usr.bin/csup/globtree.c
     - copied unchanged from r204598, head/usr.bin/csup/globtree.c
  user/imp/tbemd/usr.bin/csup/globtree.h
     - copied unchanged from r204598, head/usr.bin/csup/globtree.h
  user/imp/tbemd/usr.bin/csup/idcache.c
     - copied unchanged from r204598, head/usr.bin/csup/idcache.c
  user/imp/tbemd/usr.bin/csup/idcache.h
     - copied unchanged from r204598, head/usr.bin/csup/idcache.h
  user/imp/tbemd/usr.bin/csup/keyword.c
     - copied unchanged from r204598, head/usr.bin/csup/keyword.c
  user/imp/tbemd/usr.bin/csup/keyword.h
     - copied unchanged from r204598, head/usr.bin/csup/keyword.h
  user/imp/tbemd/usr.bin/csup/lex.rcs.c
     - copied unchanged from r204598, head/usr.bin/csup/lex.rcs.c
  user/imp/tbemd/usr.bin/csup/lister.c
     - copied unchanged from r204598, head/usr.bin/csup/lister.c
  user/imp/tbemd/usr.bin/csup/lister.h
     - copied unchanged from r204598, head/usr.bin/csup/lister.h
  user/imp/tbemd/usr.bin/csup/main.c
     - copied unchanged from r204598, head/usr.bin/csup/main.c
  user/imp/tbemd/usr.bin/csup/main.h
     - copied unchanged from r204598, head/usr.bin/csup/main.h
  user/imp/tbemd/usr.bin/csup/misc.c
     - copied unchanged from r204598, head/usr.bin/csup/misc.c
  user/imp/tbemd/usr.bin/csup/misc.h
     - copied unchanged from r204598, head/usr.bin/csup/misc.h
  user/imp/tbemd/usr.bin/csup/mux.c
     - copied unchanged from r204598, head/usr.bin/csup/mux.c
  user/imp/tbemd/usr.bin/csup/mux.h
     - copied unchanged from r204598, head/usr.bin/csup/mux.h
  user/imp/tbemd/usr.bin/csup/parse.y
     - copied unchanged from r204598, head/usr.bin/csup/parse.y
  user/imp/tbemd/usr.bin/csup/pathcomp.c
     - copied unchanged from r204598, head/usr.bin/csup/pathcomp.c
  user/imp/tbemd/usr.bin/csup/pathcomp.h
     - copied unchanged from r204598, head/usr.bin/csup/pathcomp.h
  user/imp/tbemd/usr.bin/csup/proto.c
     - copied unchanged from r204598, head/usr.bin/csup/proto.c
  user/imp/tbemd/usr.bin/csup/proto.h
     - copied unchanged from r204598, head/usr.bin/csup/proto.h
  user/imp/tbemd/usr.bin/csup/queue.h
     - copied unchanged from r204598, head/usr.bin/csup/queue.h
  user/imp/tbemd/usr.bin/csup/rcsfile.c
     - copied unchanged from r204598, head/usr.bin/csup/rcsfile.c
  user/imp/tbemd/usr.bin/csup/rcsfile.h
     - copied unchanged from r204598, head/usr.bin/csup/rcsfile.h
  user/imp/tbemd/usr.bin/csup/rcsparse.c
     - copied unchanged from r204598, head/usr.bin/csup/rcsparse.c
  user/imp/tbemd/usr.bin/csup/rcsparse.h
     - copied unchanged from r204598, head/usr.bin/csup/rcsparse.h
  user/imp/tbemd/usr.bin/csup/rcstokenizer.h
     - copied unchanged from r204598, head/usr.bin/csup/rcstokenizer.h
  user/imp/tbemd/usr.bin/csup/rcstokenizer.l
     - copied unchanged from r204598, head/usr.bin/csup/rcstokenizer.l
  user/imp/tbemd/usr.bin/csup/rsyncfile.c
     - copied unchanged from r204598, head/usr.bin/csup/rsyncfile.c
  user/imp/tbemd/usr.bin/csup/rsyncfile.h
     - copied unchanged from r204598, head/usr.bin/csup/rsyncfile.h
  user/imp/tbemd/usr.bin/csup/status.c
     - copied unchanged from r204598, head/usr.bin/csup/status.c
  user/imp/tbemd/usr.bin/csup/status.h
     - copied unchanged from r204598, head/usr.bin/csup/status.h
  user/imp/tbemd/usr.bin/csup/stream.c
     - copied unchanged from r204598, head/usr.bin/csup/stream.c
  user/imp/tbemd/usr.bin/csup/stream.h
     - copied unchanged from r204598, head/usr.bin/csup/stream.h
  user/imp/tbemd/usr.bin/csup/threads.c
     - copied unchanged from r204598, head/usr.bin/csup/threads.c
  user/imp/tbemd/usr.bin/csup/threads.h
     - copied unchanged from r204598, head/usr.bin/csup/threads.h
  user/imp/tbemd/usr.bin/csup/token.h
     - copied unchanged from r204598, head/usr.bin/csup/token.h
  user/imp/tbemd/usr.bin/csup/token.l
     - copied unchanged from r204598, head/usr.bin/csup/token.l
  user/imp/tbemd/usr.bin/csup/updater.c
     - copied unchanged from r204598, head/usr.bin/csup/updater.c
  user/imp/tbemd/usr.bin/csup/updater.h
     - copied unchanged from r204598, head/usr.bin/csup/updater.h
  user/imp/tbemd/usr.bin/netstat/netisr.c
     - copied unchanged from r204598, head/usr.bin/netstat/netisr.c
  user/imp/tbemd/usr.bin/seq/
     - copied from r204598, head/usr.bin/seq/
Directory Properties:
  user/imp/tbemd/contrib/tzdata/   (props changed)
Replaced:
  user/imp/tbemd/usr.bin/csup/Makefile
     - copied unchanged from r204598, head/usr.bin/csup/Makefile
Deleted:
  user/imp/tbemd/contrib/bc/
  user/imp/tbemd/contrib/csup/
  user/imp/tbemd/gnu/usr.bin/bc/
  user/imp/tbemd/gnu/usr.bin/dc/
  user/imp/tbemd/lib/libc/stdtime/asctime.c
  user/imp/tbemd/lib/libc/stdtime/ctime.3
  user/imp/tbemd/lib/libc/stdtime/difftime.c
  user/imp/tbemd/lib/libc/stdtime/localtime.c
  user/imp/tbemd/lib/libc/stdtime/private.h
  user/imp/tbemd/lib/libc/stdtime/time2posix.3
  user/imp/tbemd/lib/libc/stdtime/tzfile.5
  user/imp/tbemd/lib/libc/stdtime/tzfile.h
  user/imp/tbemd/share/zoneinfo/africa
  user/imp/tbemd/share/zoneinfo/antarctica
  user/imp/tbemd/share/zoneinfo/asia
  user/imp/tbemd/share/zoneinfo/australasia
  user/imp/tbemd/share/zoneinfo/backward
  user/imp/tbemd/share/zoneinfo/etcetera
  user/imp/tbemd/share/zoneinfo/europe
  user/imp/tbemd/share/zoneinfo/factory
  user/imp/tbemd/share/zoneinfo/leapseconds
  user/imp/tbemd/share/zoneinfo/northamerica
  user/imp/tbemd/share/zoneinfo/pacificnew
  user/imp/tbemd/share/zoneinfo/southamerica
  user/imp/tbemd/share/zoneinfo/systemv
  user/imp/tbemd/share/zoneinfo/yearistype.sh
  user/imp/tbemd/share/zoneinfo/zone.tab
  user/imp/tbemd/sys/amd64/isa/
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_version.h
  user/imp/tbemd/sys/dev/cxgb/cxgb_config.h
  user/imp/tbemd/sys/i386/bios/smbios.c
  user/imp/tbemd/sys/i386/bios/vpd.c
  user/imp/tbemd/sys/i386/cpufreq/
  user/imp/tbemd/sys/i386/isa/atpic.c
  user/imp/tbemd/sys/i386/isa/atpic_vector.s
  user/imp/tbemd/sys/i386/isa/clock.c
  user/imp/tbemd/sys/i386/isa/elcr.c
  user/imp/tbemd/sys/i386/isa/icu.h
  user/imp/tbemd/sys/i386/isa/isa.c
  user/imp/tbemd/sys/i386/isa/isa.h
  user/imp/tbemd/sys/i386/isa/isa_dma.c
  user/imp/tbemd/sys/i386/isa/nmi.c
  user/imp/tbemd/sys/ia64/include/sapicreg.h
  user/imp/tbemd/sys/ia64/include/sapicvar.h
  user/imp/tbemd/sys/isa/atrtc.c
  user/imp/tbemd/sys/isa/orm.c
  user/imp/tbemd/sys/kern/kern_subr.c
  user/imp/tbemd/tools/tools/mctest/mcgrab.1
  user/imp/tbemd/tools/tools/mctest/mcgrab.cc
  user/imp/tbemd/usr.sbin/zic/Theory
  user/imp/tbemd/usr.sbin/zic/ialloc.c
  user/imp/tbemd/usr.sbin/zic/private.h
  user/imp/tbemd/usr.sbin/zic/scheck.c
  user/imp/tbemd/usr.sbin/zic/zdump.8
  user/imp/tbemd/usr.sbin/zic/zdump.c
  user/imp/tbemd/usr.sbin/zic/zic.8
  user/imp/tbemd/usr.sbin/zic/zic.c
Modified:
  user/imp/tbemd/MAINTAINERS
  user/imp/tbemd/ObsoleteFiles.inc
  user/imp/tbemd/bin/kill/kill.c
  user/imp/tbemd/bin/pkill/pkill.1
  user/imp/tbemd/bin/pkill/pkill.c
  user/imp/tbemd/bin/sh/parser.c
  user/imp/tbemd/cddl/Makefile.inc
  user/imp/tbemd/cddl/lib/drti/Makefile
  user/imp/tbemd/cddl/lib/libavl/Makefile
  user/imp/tbemd/cddl/lib/libctf/Makefile
  user/imp/tbemd/cddl/lib/libdtrace/Makefile
  user/imp/tbemd/cddl/lib/libnvpair/Makefile
  user/imp/tbemd/cddl/lib/libumem/Makefile
  user/imp/tbemd/cddl/lib/libuutil/Makefile
  user/imp/tbemd/cddl/lib/libzfs/Makefile
  user/imp/tbemd/cddl/lib/libzpool/Makefile
  user/imp/tbemd/cddl/sbin/zfs/Makefile
  user/imp/tbemd/cddl/sbin/zpool/Makefile
  user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile
  user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile
  user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile
  user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile
  user/imp/tbemd/cddl/usr.bin/zinject/Makefile
  user/imp/tbemd/cddl/usr.bin/ztest/Makefile
  user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile
  user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile
  user/imp/tbemd/cddl/usr.sbin/zdb/Makefile
  user/imp/tbemd/contrib/gcc/config/mips/freebsd.h
  user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h
  user/imp/tbemd/etc/defaults/rc.conf
  user/imp/tbemd/etc/mtree/BSD.usr.dist
  user/imp/tbemd/etc/rc.d/Makefile
  user/imp/tbemd/etc/rc.d/rtsold
  user/imp/tbemd/games/fortune/datfiles/fortunes
  user/imp/tbemd/games/fortune/fortune/fortune.c
  user/imp/tbemd/gnu/usr.bin/Makefile
  user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.mips
  user/imp/tbemd/gnu/usr.bin/binutils/ld/genscripts.sh
  user/imp/tbemd/gnu/usr.bin/diff/Makefile
  user/imp/tbemd/gnu/usr.bin/diff3/Makefile
  user/imp/tbemd/gnu/usr.bin/gdb/arch/mips/Makefile
  user/imp/tbemd/gnu/usr.bin/gdb/arch/mips/init.c
  user/imp/tbemd/gnu/usr.bin/gdb/gdbserver/Makefile
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_mips.c
  user/imp/tbemd/gnu/usr.bin/sdiff/Makefile
  user/imp/tbemd/lib/libalias/libalias/Makefile
  user/imp/tbemd/lib/libarchive/archive_write_disk.3
  user/imp/tbemd/lib/libarchive/test/Makefile
  user/imp/tbemd/lib/libbsnmp/Makefile.inc
  user/imp/tbemd/lib/libbsnmp/libbsnmp/Makefile
  user/imp/tbemd/lib/libc/gen/fmtcheck.3
  user/imp/tbemd/lib/libc/gen/pause.c
  user/imp/tbemd/lib/libc/gen/stringlist.3
  user/imp/tbemd/lib/libc/gen/sysconf.c
  user/imp/tbemd/lib/libc/gen/sysctl.3
  user/imp/tbemd/lib/libc/gen/sysctl.c
  user/imp/tbemd/lib/libc/gen/sysctlbyname.c
  user/imp/tbemd/lib/libc/gen/sysctlnametomib.c
  user/imp/tbemd/lib/libc/include/reentrant.h
  user/imp/tbemd/lib/libc/nls/msgcat.c
  user/imp/tbemd/lib/libc/stdio/mktemp.c
  user/imp/tbemd/lib/libc/stdlib/malloc.c
  user/imp/tbemd/lib/libc/stdlib/rb.h
  user/imp/tbemd/lib/libc/stdtime/Makefile.inc
  user/imp/tbemd/lib/libc/sys/mlockall.2
  user/imp/tbemd/lib/libc/sys/ntp_adjtime.2
  user/imp/tbemd/lib/libc/sys/utrace.2
  user/imp/tbemd/lib/libdwarf/Makefile
  user/imp/tbemd/lib/libedit/editline.3
  user/imp/tbemd/lib/libedit/editrc.5
  user/imp/tbemd/lib/libedit/read.h
  user/imp/tbemd/lib/libkvm/Makefile
  user/imp/tbemd/lib/libkvm/kvm.c
  user/imp/tbemd/lib/libkvm/kvm.h
  user/imp/tbemd/lib/libkvm/kvm_getpcpu.3
  user/imp/tbemd/lib/libkvm/kvm_pcpu.c
  user/imp/tbemd/lib/libkvm/kvm_private.h
  user/imp/tbemd/lib/libkvm/kvm_vnet.c
  user/imp/tbemd/lib/libpam/Makefile.inc
  user/imp/tbemd/lib/libpam/modules/Makefile.inc
  user/imp/tbemd/lib/libpam/modules/pam_krb5/Makefile
  user/imp/tbemd/lib/libproc/Makefile
  user/imp/tbemd/lib/librt/Makefile
  user/imp/tbemd/lib/libutil/humanize_number.3
  user/imp/tbemd/libexec/rpc.rstatd/Makefile
  user/imp/tbemd/libexec/rtld-elf/powerpc/reloc.c
  user/imp/tbemd/libexec/rtld-elf/powerpc/rtld_machdep.h
  user/imp/tbemd/libexec/rtld-elf/powerpc/rtld_start.S
  user/imp/tbemd/libexec/ulog-helper/Makefile
  user/imp/tbemd/sbin/Makefile
  user/imp/tbemd/sbin/atacontrol/atacontrol.c
  user/imp/tbemd/sbin/camcontrol/camcontrol.c
  user/imp/tbemd/sbin/ddb/Makefile
  user/imp/tbemd/sbin/devfs/devfs.8
  user/imp/tbemd/sbin/geom/class/part/Makefile
  user/imp/tbemd/sbin/ggate/ggatec/ggatec.c
  user/imp/tbemd/sbin/ggate/ggated/ggated.c
  user/imp/tbemd/sbin/ggate/ggatel/ggatel.c
  user/imp/tbemd/sbin/ggate/shared/ggate.c
  user/imp/tbemd/sbin/ifconfig/Makefile
  user/imp/tbemd/sbin/ifconfig/ifconfig.8
  user/imp/tbemd/sbin/ifconfig/ifconfig.c
  user/imp/tbemd/sbin/ifconfig/ifvlan.c
  user/imp/tbemd/sbin/ipf/ipftest/Makefile
  user/imp/tbemd/sbin/ipfw/altq.c
  user/imp/tbemd/sbin/ipfw/dummynet.c
  user/imp/tbemd/sbin/ipfw/ipfw.8
  user/imp/tbemd/sbin/ipfw/ipfw2.c
  user/imp/tbemd/sbin/ipfw/ipfw2.h
  user/imp/tbemd/sbin/ipfw/main.c
  user/imp/tbemd/sbin/mount_hpfs/Makefile
  user/imp/tbemd/sbin/mount_hpfs/mount_hpfs.c
  user/imp/tbemd/sbin/mount_ntfs/Makefile
  user/imp/tbemd/sbin/mount_ntfs/mount_ntfs.c
  user/imp/tbemd/sbin/restore/restore.h
  user/imp/tbemd/sbin/route/Makefile
  user/imp/tbemd/sbin/route/route.c
  user/imp/tbemd/sbin/routed/Makefile
  user/imp/tbemd/sbin/routed/if.c
  user/imp/tbemd/sbin/routed/rtquery/Makefile
  user/imp/tbemd/sbin/rtsol/Makefile
  user/imp/tbemd/secure/libexec/sftp-server/Makefile
  user/imp/tbemd/secure/usr.sbin/sshd/Makefile
  user/imp/tbemd/share/examples/Makefile
  user/imp/tbemd/share/examples/autofs/driver/Makefile
  user/imp/tbemd/share/man/man4/Makefile
  user/imp/tbemd/share/man/man4/ahci.4
  user/imp/tbemd/share/man/man4/bwn.4
  user/imp/tbemd/share/man/man4/man4.powerpc/Makefile
  user/imp/tbemd/share/man/man4/msk.4
  user/imp/tbemd/share/man/man4/ng_ipfw.4
  user/imp/tbemd/share/man/man4/siis.4
  user/imp/tbemd/share/man/man5/core.5
  user/imp/tbemd/share/man/man5/devfs.rules.5
  user/imp/tbemd/share/man/man5/rc.conf.5
  user/imp/tbemd/share/man/man9/BUF_ISLOCKED.9
  user/imp/tbemd/share/man/man9/BUF_RECURSED.9
  user/imp/tbemd/share/man/man9/DEVICE_PROBE.9
  user/imp/tbemd/share/man/man9/VOP_LOCK.9
  user/imp/tbemd/share/man/man9/devfs_set_cdevpriv.9
  user/imp/tbemd/share/man/man9/ieee80211_scan.9
  user/imp/tbemd/share/man/man9/namei.9
  user/imp/tbemd/share/man/man9/netisr.9
  user/imp/tbemd/share/man/man9/vm_page_alloc.9
  user/imp/tbemd/share/mk/bsd.cpu.mk
  user/imp/tbemd/share/mk/bsd.libnames.mk
  user/imp/tbemd/share/zoneinfo/Makefile
  user/imp/tbemd/sys/amd64/amd64/busdma_machdep.c
  user/imp/tbemd/sys/amd64/amd64/exception.S
  user/imp/tbemd/sys/amd64/amd64/identcpu.c
  user/imp/tbemd/sys/amd64/amd64/intr_machdep.c
  user/imp/tbemd/sys/amd64/amd64/machdep.c
  user/imp/tbemd/sys/amd64/amd64/mca.c
  user/imp/tbemd/sys/amd64/amd64/nexus.c
  user/imp/tbemd/sys/amd64/amd64/pmap.c
  user/imp/tbemd/sys/amd64/amd64/vm_machdep.c
  user/imp/tbemd/sys/amd64/include/sysarch.h
  user/imp/tbemd/sys/arm/arm/cpufunc.c
  user/imp/tbemd/sys/arm/arm/identcpu.c
  user/imp/tbemd/sys/arm/at91/if_ate.c
  user/imp/tbemd/sys/arm/conf/BWCT
  user/imp/tbemd/sys/arm/conf/HL200
  user/imp/tbemd/sys/arm/conf/KB920X
  user/imp/tbemd/sys/arm/include/armreg.h
  user/imp/tbemd/sys/arm/include/md_var.h
  user/imp/tbemd/sys/arm/mv/mv_machdep.c
  user/imp/tbemd/sys/arm/xscale/ixp425/cambria_fled.c
  user/imp/tbemd/sys/boot/forth/loader.conf
  user/imp/tbemd/sys/boot/powerpc/ofw/Makefile
  user/imp/tbemd/sys/boot/powerpc/uboot/Makefile
  user/imp/tbemd/sys/boot/powerpc/uboot/conf.c
  user/imp/tbemd/sys/boot/sparc64/loader/main.c
  user/imp/tbemd/sys/boot/uboot/common/main.c
  user/imp/tbemd/sys/boot/uboot/lib/disk.c
  user/imp/tbemd/sys/boot/uboot/lib/time.c
  user/imp/tbemd/sys/boot/zfs/zfs.c
  user/imp/tbemd/sys/cam/ata/ata_xpt.c
  user/imp/tbemd/sys/cam/cam_xpt.c
  user/imp/tbemd/sys/cam/cam_xpt_internal.h
  user/imp/tbemd/sys/cam/scsi/scsi_xpt.c
  user/imp/tbemd/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
  user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/imp/tbemd/sys/compat/linux/linux_getcwd.c
  user/imp/tbemd/sys/compat/linux/linux_stats.c
  user/imp/tbemd/sys/compat/linux/linux_time.c
  user/imp/tbemd/sys/conf/NOTES
  user/imp/tbemd/sys/conf/files
  user/imp/tbemd/sys/conf/files.amd64
  user/imp/tbemd/sys/conf/files.i386
  user/imp/tbemd/sys/conf/files.mips
  user/imp/tbemd/sys/conf/files.pc98
  user/imp/tbemd/sys/conf/ldscript.mips.cfe
  user/imp/tbemd/sys/conf/options
  user/imp/tbemd/sys/conf/options.mips
  user/imp/tbemd/sys/dev/aac/aac.c
  user/imp/tbemd/sys/dev/aac/aac_cam.c
  user/imp/tbemd/sys/dev/age/if_age.c
  user/imp/tbemd/sys/dev/alc/if_alc.c
  user/imp/tbemd/sys/dev/ale/if_ale.c
  user/imp/tbemd/sys/dev/ata/ata-all.c
  user/imp/tbemd/sys/dev/ata/ata-pci.c
  user/imp/tbemd/sys/dev/ata/ata-pci.h
  user/imp/tbemd/sys/dev/ata/ata-sata.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-acerlabs.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-intel.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212.h
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
  user/imp/tbemd/sys/dev/ath/if_ath.c
  user/imp/tbemd/sys/dev/bce/if_bce.c
  user/imp/tbemd/sys/dev/bge/if_bge.c
  user/imp/tbemd/sys/dev/bwn/if_bwn.c
  user/imp/tbemd/sys/dev/bwn/if_bwnvar.h
  user/imp/tbemd/sys/dev/cm/if_cm_isa.c
  user/imp/tbemd/sys/dev/cm/smc90cx6.c
  user/imp/tbemd/sys/dev/cm/smc90cx6reg.h
  user/imp/tbemd/sys/dev/cm/smc90cx6var.h
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_common.h
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/imp/tbemd/sys/dev/cxgb/cxgb_adapter.h
  user/imp/tbemd/sys/dev/cxgb/cxgb_main.c
  user/imp/tbemd/sys/dev/cxgb/cxgb_offload.h
  user/imp/tbemd/sys/dev/cxgb/cxgb_osdep.h
  user/imp/tbemd/sys/dev/cxgb/cxgb_sge.c
  user/imp/tbemd/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  user/imp/tbemd/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
  user/imp/tbemd/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
  user/imp/tbemd/sys/dev/fb/fb.c
  user/imp/tbemd/sys/dev/fb/vesa.c
  user/imp/tbemd/sys/dev/gem/if_gem.c
  user/imp/tbemd/sys/dev/isp/isp.c
  user/imp/tbemd/sys/dev/isp/isp_freebsd.c
  user/imp/tbemd/sys/dev/isp/isp_library.c
  user/imp/tbemd/sys/dev/isp/isp_library.h
  user/imp/tbemd/sys/dev/isp/isp_pci.c
  user/imp/tbemd/sys/dev/isp/isp_target.c
  user/imp/tbemd/sys/dev/isp/ispmbox.h
  user/imp/tbemd/sys/dev/isp/ispreg.h
  user/imp/tbemd/sys/dev/jme/if_jme.c
  user/imp/tbemd/sys/dev/md/md.c
  user/imp/tbemd/sys/dev/mfi/mfi_cam.c
  user/imp/tbemd/sys/dev/mfi/mfi_pci.c
  user/imp/tbemd/sys/dev/mii/brgphy.c
  user/imp/tbemd/sys/dev/mii/miidevs
  user/imp/tbemd/sys/dev/mpt/mpt_raid.c
  user/imp/tbemd/sys/dev/msk/if_msk.c
  user/imp/tbemd/sys/dev/msk/if_mskreg.h
  user/imp/tbemd/sys/dev/mxge/if_mxge.c
  user/imp/tbemd/sys/dev/ofw/ofw_pci.h
  user/imp/tbemd/sys/dev/re/if_re.c
  user/imp/tbemd/sys/dev/sound/pci/hda/hdac.c
  user/imp/tbemd/sys/dev/stge/if_stge.c
  user/imp/tbemd/sys/dev/stge/if_stgereg.h
  user/imp/tbemd/sys/dev/syscons/scvidctl.c
  user/imp/tbemd/sys/dev/syscons/snake/snake_saver.c
  user/imp/tbemd/sys/dev/syscons/syscons.c
  user/imp/tbemd/sys/dev/syscons/syscons.h
  user/imp/tbemd/sys/dev/uart/uart_bus_pci.c
  user/imp/tbemd/sys/dev/xen/netfront/netfront.c
  user/imp/tbemd/sys/fs/ext2fs/ext2_vnops.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_denode.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_fat.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_fileno.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_lookup.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_vfsops.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfs_vnops.c
  user/imp/tbemd/sys/fs/msdosfs/msdosfsmount.h
  user/imp/tbemd/sys/geom/gate/g_gate.c
  user/imp/tbemd/sys/geom/gate/g_gate.h
  user/imp/tbemd/sys/geom/geom_subr.c
  user/imp/tbemd/sys/geom/multipath/g_multipath.c
  user/imp/tbemd/sys/geom/stripe/g_stripe.c
  user/imp/tbemd/sys/i386/conf/XEN
  user/imp/tbemd/sys/i386/i386/exception.s
  user/imp/tbemd/sys/i386/i386/machdep.c
  user/imp/tbemd/sys/i386/i386/mca.c
  user/imp/tbemd/sys/i386/i386/nexus.c
  user/imp/tbemd/sys/i386/i386/pmap.c
  user/imp/tbemd/sys/i386/i386/vm_machdep.c
  user/imp/tbemd/sys/i386/xen/clock.c
  user/imp/tbemd/sys/i386/xen/pmap.c
  user/imp/tbemd/sys/i386/xen/xen_machdep.c
  user/imp/tbemd/sys/ia64/ia64/context.S
  user/imp/tbemd/sys/ia64/ia64/exception.S
  user/imp/tbemd/sys/ia64/ia64/interrupt.c
  user/imp/tbemd/sys/ia64/ia64/locore.S
  user/imp/tbemd/sys/ia64/ia64/nexus.c
  user/imp/tbemd/sys/ia64/ia64/pmap.c
  user/imp/tbemd/sys/ia64/ia64/sapic.c
  user/imp/tbemd/sys/ia64/ia64/support.S
  user/imp/tbemd/sys/ia64/ia64/syscall.S
  user/imp/tbemd/sys/ia64/include/intr.h
  user/imp/tbemd/sys/ia64/include/pmap.h
  user/imp/tbemd/sys/kern/imgact_elf.c
  user/imp/tbemd/sys/kern/kern_conf.c
  user/imp/tbemd/sys/kern/kern_kthread.c
  user/imp/tbemd/sys/kern/kern_proc.c
  user/imp/tbemd/sys/kern/kern_sig.c
  user/imp/tbemd/sys/kern/kern_thr.c
  user/imp/tbemd/sys/kern/subr_param.c
  user/imp/tbemd/sys/kern/uipc_socket.c
  user/imp/tbemd/sys/kern/uipc_syscalls.c
  user/imp/tbemd/sys/kern/vfs_default.c
  user/imp/tbemd/sys/kern/vfs_mount.c
  user/imp/tbemd/sys/kern/vfs_syscalls.c
  user/imp/tbemd/sys/mips/alchemy/obio.c
  user/imp/tbemd/sys/mips/atheros/ar71xxreg.h
  user/imp/tbemd/sys/mips/cavium/dev/rgmii/octeon_fpa.c
  user/imp/tbemd/sys/mips/cavium/octeon_machdep.c
  user/imp/tbemd/sys/mips/cavium/octeon_pcmap_regs.h
  user/imp/tbemd/sys/mips/conf/ADM5120
  user/imp/tbemd/sys/mips/conf/MALTA
  user/imp/tbemd/sys/mips/conf/MALTA64
  user/imp/tbemd/sys/mips/conf/OCTEON1
  user/imp/tbemd/sys/mips/conf/OCTEON1-32
  user/imp/tbemd/sys/mips/conf/QEMU
  user/imp/tbemd/sys/mips/conf/SWARM
  user/imp/tbemd/sys/mips/conf/XLR
  user/imp/tbemd/sys/mips/include/asm.h
  user/imp/tbemd/sys/mips/include/bus.h
  user/imp/tbemd/sys/mips/include/cdefs.h
  user/imp/tbemd/sys/mips/include/intr_machdep.h
  user/imp/tbemd/sys/mips/include/ucontext.h
  user/imp/tbemd/sys/mips/mips/elf_trampoline.c
  user/imp/tbemd/sys/mips/mips/exception.S
  user/imp/tbemd/sys/mips/rmi/board.c
  user/imp/tbemd/sys/mips/rmi/bus_space_rmi.c
  user/imp/tbemd/sys/mips/rmi/files.xlr
  user/imp/tbemd/sys/mips/rmi/interrupt.h
  user/imp/tbemd/sys/mips/rmi/intr_machdep.c
  user/imp/tbemd/sys/mips/rmi/iodi.c
  user/imp/tbemd/sys/mips/rmi/pcibus.h
  user/imp/tbemd/sys/mips/rmi/xlr_pci.c
  user/imp/tbemd/sys/mips/rmi/xls_ehci.c
  user/imp/tbemd/sys/modules/Makefile
  user/imp/tbemd/sys/modules/ath/Makefile
  user/imp/tbemd/sys/modules/bios/smbios/Makefile
  user/imp/tbemd/sys/modules/bios/vpd/Makefile
  user/imp/tbemd/sys/modules/cpufreq/Makefile
  user/imp/tbemd/sys/modules/cxgb/cxgb/Makefile
  user/imp/tbemd/sys/net/bpf.c
  user/imp/tbemd/sys/net/if.c
  user/imp/tbemd/sys/net/if.h
  user/imp/tbemd/sys/net/if_bridge.c
  user/imp/tbemd/sys/net/if_ethersubr.c
  user/imp/tbemd/sys/net/if_gre.c
  user/imp/tbemd/sys/net/if_gre.h
  user/imp/tbemd/sys/net/if_loop.c
  user/imp/tbemd/sys/net/if_tap.c
  user/imp/tbemd/sys/net/if_tun.c
  user/imp/tbemd/sys/net/if_vlan.c
  user/imp/tbemd/sys/net/netisr.c
  user/imp/tbemd/sys/net/netisr.h
  user/imp/tbemd/sys/net/radix.c
  user/imp/tbemd/sys/net/zlib.h
  user/imp/tbemd/sys/netinet/in_proto.c
  user/imp/tbemd/sys/netinet/ip_dummynet.h
  user/imp/tbemd/sys/netinet/ip_fw.h
  user/imp/tbemd/sys/netinet/ip_gre.c
  user/imp/tbemd/sys/netinet/ip_gre.h
  user/imp/tbemd/sys/netinet/ip_input.c
  user/imp/tbemd/sys/netinet/ip_mroute.c
  user/imp/tbemd/sys/netinet/ip_options.c
  user/imp/tbemd/sys/netinet/ip_var.h
  user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw2.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_dynamic.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_log.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_pfil.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_private.h
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_sockopt.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_table.c
  user/imp/tbemd/sys/netinet/sctp_input.c
  user/imp/tbemd/sys/netinet/sctp_output.c
  user/imp/tbemd/sys/netinet/sctp_output.h
  user/imp/tbemd/sys/netinet/sctp_usrreq.c
  user/imp/tbemd/sys/netinet/sctputil.c
  user/imp/tbemd/sys/netinet/tcp_syncache.c
  user/imp/tbemd/sys/netinet6/in6_pcb.c
  user/imp/tbemd/sys/netinet6/nd6.c
  user/imp/tbemd/sys/netipsec/keydb.h
  user/imp/tbemd/sys/nfsclient/nfs_kdtrace.c
  user/imp/tbemd/sys/pc98/pc98/machdep.c
  user/imp/tbemd/sys/powerpc/aim/machdep.c
  user/imp/tbemd/sys/powerpc/aim/mmu_oea.c
  user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c
  user/imp/tbemd/sys/powerpc/aim/trap.c
  user/imp/tbemd/sys/powerpc/aim/uma_machdep.c
  user/imp/tbemd/sys/powerpc/booke/copyinout.c
  user/imp/tbemd/sys/powerpc/include/pte.h
  user/imp/tbemd/sys/powerpc/include/sr.h
  user/imp/tbemd/sys/powerpc/include/vmparam.h
  user/imp/tbemd/sys/powerpc/powermac/smu.c
  user/imp/tbemd/sys/powerpc/powerpc/cpu.c
  user/imp/tbemd/sys/powerpc/powerpc/mem.c
  user/imp/tbemd/sys/security/mac_biba/mac_biba.c
  user/imp/tbemd/sys/security/mac_lomac/mac_lomac.c
  user/imp/tbemd/sys/security/mac_mls/mac_mls.c
  user/imp/tbemd/sys/sparc64/include/cache.h
  user/imp/tbemd/sys/sparc64/include/cpu.h
  user/imp/tbemd/sys/sparc64/include/md_var.h
  user/imp/tbemd/sys/sparc64/include/pcpu.h
  user/imp/tbemd/sys/sparc64/include/pmap.h
  user/imp/tbemd/sys/sparc64/include/smp.h
  user/imp/tbemd/sys/sparc64/include/tick.h
  user/imp/tbemd/sys/sparc64/include/ver.h
  user/imp/tbemd/sys/sparc64/sparc64/cache.c
  user/imp/tbemd/sys/sparc64/sparc64/cheetah.c
  user/imp/tbemd/sys/sparc64/sparc64/identcpu.c
  user/imp/tbemd/sys/sparc64/sparc64/iommu.c
  user/imp/tbemd/sys/sparc64/sparc64/machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/mp_locore.S
  user/imp/tbemd/sys/sparc64/sparc64/mp_machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/nexus.c
  user/imp/tbemd/sys/sparc64/sparc64/pmap.c
  user/imp/tbemd/sys/sparc64/sparc64/spitfire.c
  user/imp/tbemd/sys/sparc64/sparc64/tick.c
  user/imp/tbemd/sys/sparc64/sparc64/trap.c
  user/imp/tbemd/sys/sys/ata.h
  user/imp/tbemd/sys/sys/eventhandler.h
  user/imp/tbemd/sys/sys/fbio.h
  user/imp/tbemd/sys/sys/imgact.h
  user/imp/tbemd/sys/sys/imgact_aout.h
  user/imp/tbemd/sys/sys/imgact_elf.h
  user/imp/tbemd/sys/sys/queue.h
  user/imp/tbemd/sys/sys/sysctl.h
  user/imp/tbemd/sys/sys/sysent.h
  user/imp/tbemd/sys/sys/systm.h
  user/imp/tbemd/sys/sys/user.h
  user/imp/tbemd/sys/vm/vm_init.c
  user/imp/tbemd/sys/vm/vm_page.c
  user/imp/tbemd/sys/vm/vnode_pager.c
  user/imp/tbemd/sys/xen/evtchn/evtchn_dev.c
  user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc
  user/imp/tbemd/tools/regression/file/closefrom/Makefile
  user/imp/tbemd/tools/regression/file/flock/Makefile
  user/imp/tbemd/tools/regression/gaithrstress/Makefile
  user/imp/tbemd/tools/regression/kgssapi/Makefile
  user/imp/tbemd/tools/regression/kqueue/Makefile
  user/imp/tbemd/tools/regression/mqueue/mqtest1/Makefile
  user/imp/tbemd/tools/regression/mqueue/mqtest2/Makefile
  user/imp/tbemd/tools/regression/mqueue/mqtest3/Makefile
  user/imp/tbemd/tools/regression/mqueue/mqtest4/Makefile
  user/imp/tbemd/tools/regression/mqueue/mqtest5/Makefile
  user/imp/tbemd/tools/regression/netipx/ipxdgramloopback/Makefile
  user/imp/tbemd/tools/regression/netipx/spxabort/Makefile
  user/imp/tbemd/tools/regression/netipx/spxloopback/Makefile
  user/imp/tbemd/tools/regression/priv/Makefile
  user/imp/tbemd/tools/regression/pthread/cv_cancel1/Makefile
  user/imp/tbemd/tools/regression/pthread/mutex_isowned_np/Makefile
  user/imp/tbemd/tools/regression/rpcsec_gss/Makefile
  user/imp/tbemd/tools/regression/sigqueue/sigqtest1/Makefile
  user/imp/tbemd/tools/regression/sigqueue/sigqtest2/Makefile
  user/imp/tbemd/tools/regression/sockets/sendfile/Makefile
  user/imp/tbemd/tools/regression/sockets/sendfile/sendfile.c
  user/imp/tbemd/tools/regression/sockets/unix_gc/Makefile
  user/imp/tbemd/tools/regression/sockets/unix_sorflush/Makefile
  user/imp/tbemd/tools/regression/sysvsem/semtest.c
  user/imp/tbemd/tools/regression/tls/libxx/Makefile
  user/imp/tbemd/tools/regression/tls/libyy/Makefile
  user/imp/tbemd/tools/regression/tls/ttls1/Makefile
  user/imp/tbemd/tools/regression/tls/ttls2/Makefile
  user/imp/tbemd/tools/regression/tls/ttls4/Makefile
  user/imp/tbemd/tools/regression/tmpfs/Makefile
  user/imp/tbemd/tools/tools/ether_reflect/Makefile
  user/imp/tbemd/tools/tools/mctest/Makefile
  user/imp/tbemd/tools/tools/mctest/mctest.1
  user/imp/tbemd/tools/tools/net80211/stumbler/Makefile
  user/imp/tbemd/tools/tools/net80211/w00t/Makefile.inc
  user/imp/tbemd/tools/tools/netrate/http/Makefile
  user/imp/tbemd/tools/tools/netrate/httpd/Makefile
  user/imp/tbemd/tools/tools/netrate/juggle/Makefile
  user/imp/tbemd/tools/tools/netrate/tcpconnect/Makefile
  user/imp/tbemd/tools/tools/netrate/tcpp/Makefile
  user/imp/tbemd/tools/tools/netrate/tcpreceive/Makefile
  user/imp/tbemd/tools/tools/umastat/Makefile
  user/imp/tbemd/usr.bin/Makefile
  user/imp/tbemd/usr.bin/cpio/Makefile
  user/imp/tbemd/usr.bin/cpio/bsdcpio.1
  user/imp/tbemd/usr.bin/fetch/Makefile
  user/imp/tbemd/usr.bin/gcore/Makefile
  user/imp/tbemd/usr.bin/hexdump/hexdump.1
  user/imp/tbemd/usr.bin/hexdump/od.1
  user/imp/tbemd/usr.bin/jot/jot.1
  user/imp/tbemd/usr.bin/locale/Makefile
  user/imp/tbemd/usr.bin/netstat/Makefile
  user/imp/tbemd/usr.bin/netstat/main.c
  user/imp/tbemd/usr.bin/netstat/netstat.1
  user/imp/tbemd/usr.bin/netstat/netstat.h
  user/imp/tbemd/usr.bin/pr/Makefile
  user/imp/tbemd/usr.bin/pr/egetopt.c
  user/imp/tbemd/usr.bin/pr/pr.c
  user/imp/tbemd/usr.bin/systat/Makefile
  user/imp/tbemd/usr.bin/tar/Makefile
  user/imp/tbemd/usr.bin/tar/test/test_option_T.c
  user/imp/tbemd/usr.bin/tar/test/test_option_s.c
  user/imp/tbemd/usr.bin/tar/tree.c
  user/imp/tbemd/usr.bin/unifdef/unifdef.1
  user/imp/tbemd/usr.bin/unifdef/unifdef.c
  user/imp/tbemd/usr.bin/unzip/Makefile
  user/imp/tbemd/usr.bin/xinstall/xinstall.c
  user/imp/tbemd/usr.sbin/auditd/Makefile
  user/imp/tbemd/usr.sbin/bluetooth/bthidd/Makefile
  user/imp/tbemd/usr.sbin/boot0cfg/Makefile
  user/imp/tbemd/usr.sbin/bsnmpd/modules/Makefile.inc
  user/imp/tbemd/usr.sbin/chown/chgrp.1
  user/imp/tbemd/usr.sbin/chown/chown.8
  user/imp/tbemd/usr.sbin/chown/chown.c
  user/imp/tbemd/usr.sbin/cxgbtool/cxgbtool.c
  user/imp/tbemd/usr.sbin/cxgbtool/reg_defs.c
  user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3.c
  user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3b.c
  user/imp/tbemd/usr.sbin/cxgbtool/reg_defs_t3c.c
  user/imp/tbemd/usr.sbin/fwcontrol/Makefile
  user/imp/tbemd/usr.sbin/mfiutil/Makefile
  user/imp/tbemd/usr.sbin/mptable/mptable.c
  user/imp/tbemd/usr.sbin/mptutil/Makefile
  user/imp/tbemd/usr.sbin/mptutil/mpt_cam.c
  user/imp/tbemd/usr.sbin/mptutil/mpt_show.c
  user/imp/tbemd/usr.sbin/mtree/mtree.5
  user/imp/tbemd/usr.sbin/pmcstat/Makefile
  user/imp/tbemd/usr.sbin/rtsold/Makefile
  user/imp/tbemd/usr.sbin/rtsold/dump.c
  user/imp/tbemd/usr.sbin/rtsold/if.c
  user/imp/tbemd/usr.sbin/rtsold/rtsock.c
  user/imp/tbemd/usr.sbin/rtsold/rtsol.c
  user/imp/tbemd/usr.sbin/rtsold/rtsold.c
  user/imp/tbemd/usr.sbin/rtsold/rtsold.h
  user/imp/tbemd/usr.sbin/sysinstall/devices.c
  user/imp/tbemd/usr.sbin/uhsoctl/Makefile
  user/imp/tbemd/usr.sbin/zic/zdump/Makefile
  user/imp/tbemd/usr.sbin/zic/zic/Makefile
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)

Modified: user/imp/tbemd/MAINTAINERS
==============================================================================

--- user/imp/tbemd/MAINTAINERS	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/MAINTAINERS	Tue Mar  2 20:20:53 2010	(r204601)
@@ -125,6 +125,12 @@ gnu/usr.bin/send-pr	bugmaster	Pre-commit
 ncurses		rafan	Heads-up appreciated, try not to break it.
 *env(3)		secteam	Due to the problematic security history of this
 			code, please have patches reviewed by secteam.
+share/zoneinfo		edwin	Heads-up appreciated, since our data is coming
+				from a third party source.
+usr.sbin/zic		edwin   Heads-up appreciated, since this code is
+				maintained by a third party source.
+lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
+				is maintained by a third party source.
 
 Following are the entries from the Makefiles, and a few other sources.
 Please remove stale entries from both their origin, and this file.

Modified: user/imp/tbemd/ObsoleteFiles.inc
==============================================================================
--- user/imp/tbemd/ObsoleteFiles.inc	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/ObsoleteFiles.inc	Tue Mar  2 20:20:53 2010	(r204601)
@@ -14,6 +14,21 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/sapicreg.h
+OLD_FILES+=usr/include/machine/sapicvar.h
+.endif
+# 20100208: man pages moved
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
+OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
+OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
+OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
+OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
+OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
+OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
+.endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
@@ -2275,7 +2290,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
-.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc"
+.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign

Modified: user/imp/tbemd/bin/kill/kill.c
==============================================================================
--- user/imp/tbemd/bin/kill/kill.c	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/bin/kill/kill.c	Tue Mar  2 20:20:53 2010	(r204601)
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
 			numsig = strtol(*argv, &ep, 10);
 			if (!**argv || *ep)
 				errx(1, "illegal signal number: %s", *argv);
-			if (numsig < 0 || numsig >= sys_nsig)
+			if (numsig < 0)
 				nosig(*argv);
 		} else
 			nosig(*argv);

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

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

Modified: user/imp/tbemd/bin/sh/parser.c
==============================================================================
--- user/imp/tbemd/bin/sh/parser.c	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/bin/sh/parser.c	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1641,7 +1641,7 @@ getprompt(void *unused __unused)
 			case 'w':
 				ps[i] = '\0';
 				getcwd(&ps[i], PROMPTLEN - i);
-				if (*fmt == 'W') {
+				if (*fmt == 'W' && ps[i + 1] != '\0') {
 					/* Final path component only. */
 					trim = 1;
 					for (j = i; ps[j] != '\0'; j++)

Modified: user/imp/tbemd/cddl/Makefile.inc
==============================================================================
--- user/imp/tbemd/cddl/Makefile.inc	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/Makefile.inc	Tue Mar  2 20:20:53 2010	(r204601)
@@ -7,4 +7,5 @@ IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
 
+WARNS?=		6
 CSTD?=		gnu89

Modified: user/imp/tbemd/cddl/lib/drti/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/drti/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/drti/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
-
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
 
 SRCS=		drti.c
 FILES=		${SRCS:R:S/$/.o/g}
@@ -10,7 +8,6 @@ FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
-WARNS?=		6
 CLEANFILES=	${FILES}
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \

Modified: user/imp/tbemd/cddl/lib/libavl/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libavl/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libavl/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -4,6 +4,7 @@
 
 LIB=	avl
 SRCS=	avl.c
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 

Modified: user/imp/tbemd/cddl/lib/libctf/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libctf/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libctf/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common
+.PATH:		${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf
 
 LIB=		ctf
-SHLIB_MAJOR=	2
-
 SRCS=		ctf_create.c \
 		ctf_decl.c \
 		ctf_error.c \
@@ -17,10 +17,7 @@ SRCS=		ctf_create.c \
 		ctf_types.c \
 		ctf_util.c
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/common/ctf
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common
-.PATH:		${OPENSOLARIS_SYS_DISTDIR}/common/ctf
-
+WARNS?=		0
 CFLAGS+=	-DCTF_OLD_VERSIONS
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \

Modified: user/imp/tbemd/cddl/lib/libdtrace/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libdtrace/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libdtrace/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common
 
 LIB=		dtrace
-SHLIB_MAJOR=	2
-
-WARNS=		1
-
 SRCS=		dt_aggregate.c \
 		dt_as.c \
 		dt_buf.c \
@@ -51,8 +48,7 @@ DSRCS=		errno.d			\
 		signal.d		\
 		unistd.d
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
+WARNS?=		1
 
 CFLAGS+=	-I${.OBJDIR} \
 		-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \

Modified: user/imp/tbemd/cddl/lib/libnvpair/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libnvpair/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libnvpair/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -10,6 +10,7 @@ SRCS=	libnvpair.c \
 	nvpair_alloc_fixed.c \
 	nvpair.c
 
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common

Modified: user/imp/tbemd/cddl/lib/libumem/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libumem/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libumem/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -4,6 +4,7 @@
 
 LIB=	umem
 SRCS=	umem.c
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
 .include <bsd.lib.mk>

Modified: user/imp/tbemd/cddl/lib/libuutil/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libuutil/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libuutil/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -15,6 +15,7 @@ SRCS=	avl.c \
 	uu_pname.c \
 	uu_strtoint.c
 
+WARNS?=	0
 CFLAGS+= -DNATIVE_BUILD
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris

Modified: user/imp/tbemd/cddl/lib/libzfs/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libzfs/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libzfs/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -32,6 +32,7 @@ SRCS+=	zfs_deleg.c \
 	libzfs_sendrecv.c \
 	libzfs_status.c
 
+WARNS?=	0
 CFLAGS+= -DZFS_NO_ACL
 CFLAGS+= -I${.CURDIR}/../../../sbin/mount
 CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem

Modified: user/imp/tbemd/cddl/lib/libzpool/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libzpool/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/lib/libzpool/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -33,6 +33,7 @@ SRCS=		${ZFS_COMMON_SRCS} ${ZFS_SHARED_S
 		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
 		${UNICODE_SRCS}
 
+WARNS?=		0
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem

Modified: user/imp/tbemd/cddl/sbin/zfs/Makefile
==============================================================================
--- user/imp/tbemd/cddl/sbin/zfs/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/sbin/zfs/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -6,6 +6,7 @@ PROG=	zfs
 MAN=	zfs.8
 SRCS=	zfs_main.c zfs_iter.c
 
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem

Modified: user/imp/tbemd/cddl/sbin/zpool/Makefile
==============================================================================
--- user/imp/tbemd/cddl/sbin/zpool/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/sbin/zpool/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -7,6 +7,7 @@ PROG=	zpool
 MAN=	zpool.8
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
 
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem

Modified: user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/ctfconvert/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
 
 DEBUG_FLAGS=	-g
 
 PROG=		ctfconvert
-
+NO_MAN=
 SRCS=		alist.c \
 		ctf.c \
 		ctfconvert.c \
@@ -29,8 +28,6 @@ SRCS=		alist.c \
 		traverse.c \
 		util.c
 
-WARNS?=		6
-
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR} \
@@ -40,12 +37,7 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz -lthr
-
-.PATH:		${.CURDIR}
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
-
-MK_MAN=		no
+DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD=		-lctf -ldwarf -lelf -lz -lpthread
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/ctfdump/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump
 
 PROG=		ctfdump
-
+NO_MAN=
 SRCS=		dump.c \
 		symbol.c \
 		utils.c
 
-WARNS?=		6
-
 CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
@@ -19,13 +18,7 @@ CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
-LDADD+=		-lelf -lz
-
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump
-
-NO_MAN=
+DPADD=		${LIBPTHREAD} ${LIBELF} ${LIBZ}
+LDADD=		-lpthread -lelf -lz
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/ctfmerge/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-.include	"../../Makefile.inc"
-
-WARNS=		1
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
 
 PROG=		ctfmerge
-
+NO_MAN=
 SRCS=		alist.c \
 		barrier.c \
 		ctf.c \
@@ -26,7 +23,7 @@ SRCS=		alist.c \
 		traverse.c \
 		util.c
 
-WARNS?=		6
+WARNS?=		1
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -37,11 +34,7 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz -lthr
-
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
-
-MK_MAN=		no
+DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD=		-lctf -ldwarf -lelf -lz -lpthread
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/sgsmsg/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,20 +1,17 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
 # This program is required as a bootstrap tool for 'make buildworld'
 PROG=		sgsmsg
-
+NO_MAN=
 SRCS=		avl.c sgsmsg.c string_table.c findprime.c
 
+WARNS?=		0
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common
-.PATH:		${OPENSOLARIS_SYS_DISTDIR}/common/avl
-
-NO_MAN=
-
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.bin/zinject/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/zinject/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/zinject/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -6,6 +6,7 @@ PROG=	zinject
 SRCS=	zinject.c translate.c
 NO_MAN=
 
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
@@ -19,7 +20,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
-	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+	${LIBZFS} ${LIBZPOOL}
 LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.bin/ztest/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.bin/ztest/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.bin/ztest/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -5,6 +5,7 @@
 PROG=	ztest
 NO_MAN=
 
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem

Modified: user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.sbin/dtrace/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,14 +1,12 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace
 
 PROG=		dtrace
-
-BINDIR?=	/usr/sbin
-
 SRCS=		dtrace.c
+BINDIR?=	/usr/sbin
 
-WARNS=		1
+WARNS?=		1
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -18,20 +16,11 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/compat
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace
-
 # Optional debugging stuff...
 #CFLAGS+=	-DNEED_ERRLOC
 #YFLAGS+=	-d
 
-LDFLAGS+=	-pthread \
-		-L${.OBJDIR}/../../lib/libdtrace \
-		-L${.OBJDIR}/../../lib/libproc \
-		-L${.OBJDIR}/../../lib/libctf \
-		-L${.OBJDIR}/../../../lib/libelf
-
-LDADD+=		-ldtrace -ly -ll -lproc -lctf -lelf -lz
-
-DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ}
+LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.sbin/lockstat/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -1,14 +1,13 @@
 # $FreeBSD$
 
-.include	"../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat
 
 PROG=		lockstat
-
-BINDIR?=	/usr/sbin
-
+NO_MAN=
 SRCS=		lockstat.c sym.c
+BINDIR?=	/usr/sbin
 
-WARNS=		1
+WARNS?=		1
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -19,22 +18,11 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/compat \
 		-I${.CURDIR}/../../../sys
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat
-
 CFLAGS+=	-DNEED_ERRLOC -g
 
 #YFLAGS+=	-d
 
-LDFLAGS+=	-pthread \
-		-L${.OBJDIR}/../../lib/libdtrace \
-		-L${.OBJDIR}/../../lib/libproc \
-		-L${.OBJDIR}/../../lib/libctf \
-		-L${.OBJDIR}/../../../lib/libelf
-
-LDADD+=		-ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt
-
-#DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
-
-NO_MAN=
+DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT}
+LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- user/imp/tbemd/cddl/usr.sbin/zdb/Makefile	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/cddl/usr.sbin/zdb/Makefile	Tue Mar  2 20:20:53 2010	(r204601)
@@ -6,6 +6,9 @@ PROG=	zdb
 MAN=	zdb.8
 SRCS=	zdb.c zdb_il.c
 
+WARNS?=	0
+CSTD=	c99
+
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@@ -23,6 +26,5 @@ DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LI
 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
 LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
 
-CSTD=	c99
 
 .include <bsd.prog.mk>

Modified: user/imp/tbemd/contrib/gcc/config/mips/freebsd.h
==============================================================================
--- user/imp/tbemd/contrib/gcc/config/mips/freebsd.h	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/contrib/gcc/config/mips/freebsd.h	Tue Mar  2 20:20:53 2010	(r204601)
@@ -130,10 +130,67 @@ Boston, MA 02110-1301, USA.  */
       if (TARGET_MIPS16)					\
 	builtin_define ("__mips16");				\
 								\
+      if (mips_abi == ABI_N32)                                  \
+        {                                                       \
+          builtin_define ("__mips_n32");                        \
+          builtin_define ("_ABIN32=2");                         \
+          builtin_define ("_MIPS_SIM=_ABIN32");                 \
+          builtin_define ("_MIPS_SZLONG=32");                   \
+          builtin_define ("_MIPS_SZPTR=32");                    \
+        }                                                       \
+      else if (mips_abi == ABI_64)                              \
+        {                                                       \
+          builtin_define ("__mips_n64");                        \
+          builtin_define ("_ABI64=3");                          \
+          builtin_define ("_MIPS_SIM=_ABI64");                  \
+          builtin_define ("_MIPS_SZLONG=64");                   \
+          builtin_define ("_MIPS_SZPTR=64");                    \
+        }                                                       \
+      else if (mips_abi == ABI_O64)                             \
+        {                                                       \
+          builtin_define ("__mips_o64");                        \
+          builtin_define ("_ABIO64=4");                         \
+          builtin_define ("_MIPS_SIM=_ABIO64");                 \
+          builtin_define ("_MIPS_SZLONG=64");                   \
+          builtin_define ("_MIPS_SZPTR=64");                    \
+        }                                                       \
+      else if (mips_abi == ABI_EABI)                            \
+        {                                                       \
+          builtin_define ("__mips_eabi");                       \
+          builtin_define ("_ABIEMB=5");                         \
+          builtin_define ("_MIPS_SIM=_ABIEMB");                 \
+          if (TARGET_LONG64)                                    \
+            builtin_define ("_MIPS_SZLONG=64");                 \
+          else                                                  \
+            builtin_define ("_MIPS_SZLONG=32");                 \
+          if (TARGET_64BIT)                                     \
+            builtin_define ("_MIPS_SZPTR=64");                  \
+          else                                                  \
+            builtin_define ("_MIPS_SZPTR=32");                  \
+        }                                                       \
+      else                                                      \
+        {                                                       \
+          builtin_define ("__mips_o32");                        \
+          builtin_define ("_ABIO32=1");                         \
+          builtin_define ("_MIPS_SIM=_ABIO32");                 \
+          builtin_define ("_MIPS_SZLONG=32");                   \
+          builtin_define ("_MIPS_SZPTR=32");                    \
+        }                                                       \
+      if (TARGET_FLOAT64)                                       \
+        builtin_define ("_MIPS_FPSET=32");                      \
+      else                                                      \
+        builtin_define ("_MIPS_FPSET=16");                      \
+                                                                \
+      builtin_define ("_MIPS_SZINT=32");                        \
+								\
       MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info);	\
       MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info);	\
 								\
-      if (ISA_MIPS3)						\
+      if (ISA_MIPS1)                                            \
+        builtin_define ("__mips=1");                            \
+      else if (ISA_MIPS2)                                       \
+        builtin_define ("__mips=2");                            \
+      else if (ISA_MIPS3)					\
 	builtin_define ("__mips=3");				\
       else if (ISA_MIPS4)					\
 	builtin_define ("__mips=4");				\
@@ -152,7 +209,12 @@ Boston, MA 02110-1301, USA.  */
 	  builtin_define ("__mips=64");				\
 	  builtin_define ("__mips_isa_rev=1");			\
 	}							\
-								\
+/*      else if (ISA_MIPS64R2)					\
+	{							\
+	  builtin_define ("__mips=64");				\
+	  builtin_define ("__mips_isa_rev=2");			\
+	}							\
+*/								\
       if (TARGET_HARD_FLOAT)					\
 	builtin_define ("__mips_hard_float");			\
       else if (TARGET_SOFT_FLOAT)				\
@@ -167,18 +229,6 @@ Boston, MA 02110-1301, USA.  */
 	builtin_define ("__MIPSEL__");				\
 								\
       /* No language dialect defines.  */			\
-								\
-      if (mips_abi == ABI_EABI)					\
-	builtin_define ("__mips_eabi");				\
-      else if (mips_abi == ABI_N32)				\
-	builtin_define ("__mips_n32");				\
-      else if (mips_abi == ABI_64)				\
-	builtin_define ("__mips_n64");				\
-      else if (mips_abi == ABI_O64)				\
-	builtin_define ("__mips_o64");				\
-      else							\
-	builtin_define ("__mips_o32");				\
-								\
       if (TARGET_ABICALLS)					\
 	builtin_define ("__ABICALLS__");			\
     }								\
@@ -241,6 +291,15 @@ Boston, MA 02110-1301, USA.  */
 #undef  LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX "."
 
+/* Currently we don't support 128bit long doubles, so for now we force
+   n32 to be 64bit.  */
+#undef	LONG_DOUBLE_TYPE_SIZE
+#define	LONG_DOUBLE_TYPE_SIZE 64
+ 
+#ifdef IN_LIBGCC2
+#undef	LIBGCC2_LONG_DOUBLE_TYPE_SIZE
+#define	LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64
+#endif
 
 /************************[  Debugger stuff  ]*********************************/
 

Copied: user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h (from r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/contrib/gdb/gdb/config/mips/nm-fbsd.h	Tue Mar  2 20:20:53 2010	(r204601, copy of r204598, head/contrib/gdb/gdb/config/mips/nm-fbsd.h)
@@ -0,0 +1,48 @@
+/***********************************************************************
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI: 
+*****************************#RMI_1#**********************************/
+/* Native-dependent definitions for NetBSD/mips.
+   Copyright 2002 Free Software Foundation, Inc.
+   Contributed by Wasabi Systems, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef NM_FBSD_H
+#define NM_FBSD_H
+
+/* Override child_pid_to_exec_file in 'inftarg.c'.  */
+#define CHILD_PID_TO_EXEC_FILE
+
+/* Type of the third argument to the `ptrace' system call.  */
+#define PTRACE_ARG3_TYPE caddr_t
+
+/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
+#define FETCH_INFERIOR_REGISTERS
+
+/* We can attach and detach.  */
+#define ATTACH_DETACH
+
+/* Shared library support.  */
+
+#include "solib.h"
+
+#endif /* NM_FBSD_H */

Copied: user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h (from r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/contrib/gdb/gdb/config/mips/tm-fbsd.h	Tue Mar  2 20:20:53 2010	(r204601, copy of r204598, head/contrib/gdb/gdb/config/mips/tm-fbsd.h)
@@ -0,0 +1,43 @@
+/***********************************************************************
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI: 
+*****************************#RMI_1#**********************************/
+/* Target-dependent definitions for NetBSD/mips.
+   Copyright 2002 Free Software Foundation, Inc.
+   Contributed by Wasabi Systems, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef TM_FBSD_H
+#define TM_FBSD_H
+
+#include "mips/tm-mips.h"
+#include "solib.h"
+
+/* We don't want to inherit tm-mips.h's shared library trampoline code.  */
+#undef IN_SOLIB_CALL_TRAMPOLINE
+#undef IN_SOLIB_RETURN_TRAMPOLINE
+#undef SKIP_TRAMPOLINE_CODE
+#undef IGNORE_HELPER_CALL
+
+/* XXX undef a bunch of stuff we want to use multi-arch */
+#undef IN_SIGTRAMP
+#endif /* TM_FBSD_H */

Modified: user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h
==============================================================================
--- user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h	Tue Mar  2 19:50:19 2010	(r204600)
+++ user/imp/tbemd/contrib/gdb/gdb/mips-tdep.h	Tue Mar  2 20:20:53 2010	(r204601)
@@ -62,6 +62,17 @@ struct mips_regnum
 extern const struct mips_regnum *mips_regnum (struct gdbarch *gdbarch);
 
 enum {
+  MIPS_S0_REGNUM = 16,
+  MIPS_S1_REGNUM = 17,
+  MIPS_S2_REGNUM = 18,
+  MIPS_S3_REGNUM = 19,
+  MIPS_S4_REGNUM = 20,
+  MIPS_S5_REGNUM = 21,
+  MIPS_S6_REGNUM = 22,
+  MIPS_S7_REGNUM = 23,
+  MIPS_SP_REGNUM = 29,
+  MIPS_FP_REGNUM = 30,
+  MIPS_RA_REGNUM = 31,
   MIPS_EMBED_LO_REGNUM = 33,
   MIPS_EMBED_HI_REGNUM = 34,
   MIPS_EMBED_BADVADDR_REGNUM = 35,

Copied: user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c (from r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-nat.c	Tue Mar  2 20:20:53 2010	(r204601, copy of r204598, head/contrib/gdb/gdb/mipsfbsd-nat.c)
@@ -0,0 +1,108 @@
+/***********************************************************************
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI: 
+*****************************#RMI_1#**********************************/
+/* Native-dependent code for MIPS systems running NetBSD.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "inferior.h"
+#include "regcache.h"
+
+#include "mipsfbsd-tdep.h"
+
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+
+/* Determine if PT_GETREGS fetches this register.  */
+static int
+getregs_supplies (int regno)
+{
+  return ((regno) >= ZERO_REGNUM && (regno) <= PC_REGNUM);
+}
+
+void
+fetch_inferior_registers (int regno)
+{
+  if (regno == -1 || getregs_supplies (regno))
+    {
+      struct reg regs;
+
+      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	perror_with_name ("Couldn't get registers");
+      
+      mipsfbsd_supply_reg ((char *) &regs, regno);
+      if (regno != -1)
+	return;
+    }
+
+  if (regno == -1 || regno >= FP0_REGNUM)
+    {
+      struct fpreg fpregs;
+
+      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+	perror_with_name ("Couldn't get floating point status");
+
+      mipsfbsd_supply_fpreg ((char *) &fpregs, regno);
+    }
+}
+
+void
+store_inferior_registers (int regno)
+{
+  if (regno == -1 || getregs_supplies (regno))
+    {
+      struct reg regs;
+
+      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	perror_with_name ("Couldn't get registers");
+
+      mipsfbsd_fill_reg ((char *) &regs, regno);
+
+      if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), 
+		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	perror_with_name ("Couldn't write registers");
+
+      if (regno != -1)
+	return;
+    }
+
+  if (regno == -1 || regno >= FP0_REGNUM)
+    {
+      struct fpreg fpregs; 
+
+      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+	perror_with_name ("Couldn't get floating point status");
+
+      mipsfbsd_fill_fpreg ((char *) &fpregs, regno);
+
+      if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+	perror_with_name ("Couldn't write floating point status");
+    }
+}

Copied: user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c (from r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/contrib/gdb/gdb/mipsfbsd-tdep.c	Tue Mar  2 20:20:53 2010	(r204601, copy of r204598, head/contrib/gdb/gdb/mipsfbsd-tdep.c)
@@ -0,0 +1,579 @@
+/***********************************************************************
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI: 
+*****************************#RMI_1#**********************************/
+/* Target-dependent code for MIPS systems running NetBSD.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Contributed by Wasabi Systems, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "target.h"
+#include "value.h"
+#include "osabi.h"
+
+#include "nbsd-tdep.h"     
+#include "mipsfbsd-tdep.h" 
+#include "mips-tdep.h"     
+
+#include "solib-svr4.h"
+
+#include <sys/procfs.h>
+#include "gregset.h"
+#include "trad-frame.h"
+#include "frame.h"
+#include "frame-unwind.h"
+#include "bfd.h"
+#include "objfiles.h"
+
+/* Conveniently, GDB uses the same register numbering as the
+   ptrace register structure used by NetBSD/mips.  */
+
+void
+mipsfbsd_supply_reg (char *regs, int regno)
+{
+  int i;
+
+  for (i = 0; i <= PC_REGNUM; i++)
+    {
+      if (regno == i || regno == -1)
+	{
+	  if (CANNOT_FETCH_REGISTER (i))
+	    supply_register (i, NULL);
+	  else
+            supply_register (i, regs + (i * mips_regsize (current_gdbarch)));
+        }
+    }
+}
+void 
+supply_gregset (gdb_gregset_t *gregs)
+{
+  mipsfbsd_supply_reg((char *)gregs, -1);
+}
+
+void
+mipsfbsd_fill_reg (char *regs, int regno)
+{
+  int i;
+
+  for (i = 0; i <= PC_REGNUM; i++)
+    if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i))
+      regcache_collect (i, regs + (i * mips_regsize (current_gdbarch)));
+}
+
+void 
+fill_gregset (gdb_gregset_t  *gregs, int regno)
+{
+  mipsfbsd_fill_reg ((char *)gregs, regno);
+}
+
+void
+mipsfbsd_supply_fpreg (char *fpregs, int regno)
+{
+  int i;
+
+  for (i = FP0_REGNUM;
+       i <= mips_regnum (current_gdbarch)->fp_implementation_revision;
+       i++)

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