svn commit: r206634 - in user/jmallett/octeon: . bin/ps bin/pwait bin/sh contrib/binutils/bfd contrib/com_err crypto/openssh etc etc/defaults etc/rc.d gnu/usr.bin/gdb gnu/usr.bin/gdb/gdbserver gnu/...

Juli Mallett jmallett at FreeBSD.org
Wed Apr 14 21:46:23 UTC 2010 

Author: jmallett
Date: Wed Apr 14 21:46:22 2010
New Revision: 206634
URL: http://svn.freebsd.org/changeset/base/206634

Log:
  Merge from head.

Added:
  user/jmallett/octeon/etc/rc.d/ubthidhci
     - copied unchanged from r206631, head/etc/rc.d/ubthidhci
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c
     - copied unchanged from r206631, head/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-amd64.c
     - copied unchanged from r206631, head/gnu/usr.bin/gdb/gdbserver/reg-amd64.c
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c
     - copied unchanged from r206631, head/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c
  user/jmallett/octeon/sbin/geom/class/sched/
     - copied from r206631, head/sbin/geom/class/sched/
  user/jmallett/octeon/share/man/man4/sge.4
     - copied unchanged from r206631, head/share/man/man4/sge.4
  user/jmallett/octeon/sys/boot/i386/efi/
     - copied from r206631, head/sys/boot/i386/efi/
  user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu
     - copied unchanged from r206631, head/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu
  user/jmallett/octeon/sys/dev/sge/
     - copied from r206631, head/sys/dev/sge/
  user/jmallett/octeon/sys/dev/syscons/logo/beastie.c
     - copied unchanged from r206631, head/sys/dev/syscons/logo/beastie.c
  user/jmallett/octeon/sys/geom/sched/
     - copied from r206631, head/sys/geom/sched/
  user/jmallett/octeon/sys/modules/geom/geom_sched/
     - copied from r206631, head/sys/modules/geom/geom_sched/
  user/jmallett/octeon/sys/modules/sge/
     - copied from r206631, head/sys/modules/sge/
  user/jmallett/octeon/sys/modules/syscons/beastie/
     - copied from r206631, head/sys/modules/syscons/beastie/
  user/jmallett/octeon/sys/net80211/ieee80211_ratectl.c
     - copied unchanged from r206631, head/sys/net80211/ieee80211_ratectl.c
  user/jmallett/octeon/sys/net80211/ieee80211_ratectl.h
     - copied unchanged from r206631, head/sys/net80211/ieee80211_ratectl.h
  user/jmallett/octeon/sys/sparc64/pci/sbbc.c
     - copied unchanged from r206631, head/sys/sparc64/pci/sbbc.c
  user/jmallett/octeon/tools/regression/bin/sh/parameters/pwd1.0
     - copied unchanged from r206631, head/tools/regression/bin/sh/parameters/pwd1.0
Deleted:
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-ppc.c
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
  user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu
Modified:
  user/jmallett/octeon/MAINTAINERS
  user/jmallett/octeon/Makefile.inc1
  user/jmallett/octeon/bin/ps/ps.1
  user/jmallett/octeon/bin/pwait/pwait.1
  user/jmallett/octeon/bin/sh/mksyntax.c
  user/jmallett/octeon/bin/sh/parser.c
  user/jmallett/octeon/contrib/binutils/bfd/config.bfd
  user/jmallett/octeon/contrib/com_err/compile_et.1
  user/jmallett/octeon/crypto/openssh/sshd.c
  user/jmallett/octeon/etc/defaults/rc.conf
  user/jmallett/octeon/etc/network.subr
  user/jmallett/octeon/etc/rc.d/ip6addrctl
  user/jmallett/octeon/etc/rc.d/netif
  user/jmallett/octeon/etc/rc.d/netoptions
  user/jmallett/octeon/etc/rc.firewall
  user/jmallett/octeon/gnu/usr.bin/gdb/Makefile
  user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/Makefile
  user/jmallett/octeon/gnu/usr.bin/gdb/kgdb/kgdb.1
  user/jmallett/octeon/lib/libc/gen/check_utility_compat.3
  user/jmallett/octeon/lib/libc/gen/confstr.3
  user/jmallett/octeon/lib/libc/gen/dladdr.3
  user/jmallett/octeon/lib/libc/gen/dlinfo.3
  user/jmallett/octeon/lib/libc/gen/dllockinit.3
  user/jmallett/octeon/lib/libc/gen/dlopen.3
  user/jmallett/octeon/lib/libc/gen/fmtcheck.3
  user/jmallett/octeon/lib/libc/gen/frexp.3
  user/jmallett/octeon/lib/libc/gen/ftok.3
  user/jmallett/octeon/lib/libc/gen/getutxent.3
  user/jmallett/octeon/lib/libc/gen/setproctitle.3
  user/jmallett/octeon/lib/libc/gen/stringlist.3
  user/jmallett/octeon/lib/libc/gen/sysconf.3
  user/jmallett/octeon/lib/libc/gen/sysctl.3
  user/jmallett/octeon/lib/libc/locale/isalnum.3
  user/jmallett/octeon/lib/libc/locale/isalpha.3
  user/jmallett/octeon/lib/libc/posix1e/mac_prepare.3
  user/jmallett/octeon/lib/libc/softfloat/softfloat-specialize
  user/jmallett/octeon/lib/libc/stdlib/hcreate.3
  user/jmallett/octeon/lib/libc/stdlib/ptsname.3
  user/jmallett/octeon/lib/libc/sys/sigaction.2
  user/jmallett/octeon/lib/libcam/cam.3
  user/jmallett/octeon/lib/libcam/cam_cdbparse.3
  user/jmallett/octeon/lib/libcompat/4.1/cftime.3
  user/jmallett/octeon/lib/libcompat/4.4/cuserid.3
  user/jmallett/octeon/lib/libedit/editline.3
  user/jmallett/octeon/lib/libedit/editrc.5
  user/jmallett/octeon/lib/libelf/elf.3
  user/jmallett/octeon/lib/libelf/elf_begin.3
  user/jmallett/octeon/lib/libelf/elf_cntl.3
  user/jmallett/octeon/lib/libelf/elf_end.3
  user/jmallett/octeon/lib/libelf/elf_errmsg.3
  user/jmallett/octeon/lib/libelf/elf_fill.3
  user/jmallett/octeon/lib/libelf/elf_flagdata.3
  user/jmallett/octeon/lib/libelf/elf_getarhdr.3
  user/jmallett/octeon/lib/libelf/elf_getarsym.3
  user/jmallett/octeon/lib/libelf/elf_getbase.3
  user/jmallett/octeon/lib/libelf/elf_getdata.3
  user/jmallett/octeon/lib/libelf/elf_getident.3
  user/jmallett/octeon/lib/libelf/elf_getphnum.3
  user/jmallett/octeon/lib/libelf/elf_getscn.3
  user/jmallett/octeon/lib/libelf/elf_getshnum.3
  user/jmallett/octeon/lib/libelf/elf_getshstrndx.3
  user/jmallett/octeon/lib/libelf/elf_hash.3
  user/jmallett/octeon/lib/libelf/elf_kind.3
  user/jmallett/octeon/lib/libelf/elf_memory.3
  user/jmallett/octeon/lib/libelf/elf_next.3
  user/jmallett/octeon/lib/libelf/elf_rand.3
  user/jmallett/octeon/lib/libelf/elf_rawfile.3
  user/jmallett/octeon/lib/libelf/elf_strptr.3
  user/jmallett/octeon/lib/libelf/elf_update.3
  user/jmallett/octeon/lib/libelf/elf_version.3
  user/jmallett/octeon/lib/libelf/gelf.3
  user/jmallett/octeon/lib/libelf/gelf_checksum.3
  user/jmallett/octeon/lib/libelf/gelf_fsize.3
  user/jmallett/octeon/lib/libelf/gelf_getcap.3
  user/jmallett/octeon/lib/libelf/gelf_getclass.3
  user/jmallett/octeon/lib/libelf/gelf_getdyn.3
  user/jmallett/octeon/lib/libelf/gelf_getehdr.3
  user/jmallett/octeon/lib/libelf/gelf_getmove.3
  user/jmallett/octeon/lib/libelf/gelf_getphdr.3
  user/jmallett/octeon/lib/libelf/gelf_getrel.3
  user/jmallett/octeon/lib/libelf/gelf_getrela.3
  user/jmallett/octeon/lib/libelf/gelf_getshdr.3
  user/jmallett/octeon/lib/libelf/gelf_getsym.3
  user/jmallett/octeon/lib/libelf/gelf_getsyminfo.3
  user/jmallett/octeon/lib/libelf/gelf_getsymshndx.3
  user/jmallett/octeon/lib/libelf/gelf_newehdr.3
  user/jmallett/octeon/lib/libelf/gelf_newphdr.3
  user/jmallett/octeon/lib/libelf/gelf_update_ehdr.3
  user/jmallett/octeon/lib/libelf/gelf_xlatetof.3
  user/jmallett/octeon/lib/libgssapi/gss_accept_sec_context.3
  user/jmallett/octeon/lib/libgssapi/gss_acquire_cred.3
  user/jmallett/octeon/lib/libgssapi/gss_add_cred.3
  user/jmallett/octeon/lib/libgssapi/gss_add_oid_set_member.3
  user/jmallett/octeon/lib/libgssapi/gss_canonicalize_name.3
  user/jmallett/octeon/lib/libgssapi/gss_compare_name.3
  user/jmallett/octeon/lib/libgssapi/gss_context_time.3
  user/jmallett/octeon/lib/libgssapi/gss_create_empty_oid_set.3
  user/jmallett/octeon/lib/libgssapi/gss_delete_sec_context.3
  user/jmallett/octeon/lib/libgssapi/gss_display_name.3
  user/jmallett/octeon/lib/libgssapi/gss_display_status.3
  user/jmallett/octeon/lib/libgssapi/gss_duplicate_name.3
  user/jmallett/octeon/lib/libgssapi/gss_export_name.3
  user/jmallett/octeon/lib/libgssapi/gss_export_sec_context.3
  user/jmallett/octeon/lib/libgssapi/gss_get_mic.3
  user/jmallett/octeon/lib/libgssapi/gss_import_name.3
  user/jmallett/octeon/lib/libgssapi/gss_import_sec_context.3
  user/jmallett/octeon/lib/libgssapi/gss_indicate_mechs.3
  user/jmallett/octeon/lib/libgssapi/gss_init_sec_context.3
  user/jmallett/octeon/lib/libgssapi/gss_inquire_context.3
  user/jmallett/octeon/lib/libgssapi/gss_inquire_cred.3
  user/jmallett/octeon/lib/libgssapi/gss_inquire_cred_by_mech.3
  user/jmallett/octeon/lib/libgssapi/gss_inquire_mechs_for_name.3
  user/jmallett/octeon/lib/libgssapi/gss_inquire_names_for_mech.3
  user/jmallett/octeon/lib/libgssapi/gss_process_context_token.3
  user/jmallett/octeon/lib/libgssapi/gss_release_buffer.3
  user/jmallett/octeon/lib/libgssapi/gss_release_cred.3
  user/jmallett/octeon/lib/libgssapi/gss_release_name.3
  user/jmallett/octeon/lib/libgssapi/gss_release_oid_set.3
  user/jmallett/octeon/lib/libgssapi/gss_test_oid_set_member.3
  user/jmallett/octeon/lib/libgssapi/gss_unwrap.3
  user/jmallett/octeon/lib/libgssapi/gss_verify_mic.3
  user/jmallett/octeon/lib/libgssapi/gss_wrap.3
  user/jmallett/octeon/lib/libgssapi/gss_wrap_size_limit.3
  user/jmallett/octeon/lib/libmemstat/libmemstat.3
  user/jmallett/octeon/lib/libpmc/pmc.3
  user/jmallett/octeon/lib/libpmc/pmc.atom.3
  user/jmallett/octeon/lib/libpmc/pmc.core.3
  user/jmallett/octeon/lib/libpmc/pmc.core2.3
  user/jmallett/octeon/lib/libpmc/pmc.corei7.3
  user/jmallett/octeon/lib/libpmc/pmc.corei7uc.3
  user/jmallett/octeon/lib/libpmc/pmc.iaf.3
  user/jmallett/octeon/lib/libpmc/pmc.k7.3
  user/jmallett/octeon/lib/libpmc/pmc.k8.3
  user/jmallett/octeon/lib/libpmc/pmc.p4.3
  user/jmallett/octeon/lib/libpmc/pmc.p5.3
  user/jmallett/octeon/lib/libpmc/pmc.p6.3
  user/jmallett/octeon/lib/libpmc/pmc.tsc.3
  user/jmallett/octeon/lib/libpmc/pmc.ucf.3
  user/jmallett/octeon/lib/libpmc/pmc.westmere.3
  user/jmallett/octeon/lib/libpmc/pmc.westmereuc.3
  user/jmallett/octeon/lib/libpmc/pmc_allocate.3
  user/jmallett/octeon/lib/libpmc/pmc_attach.3
  user/jmallett/octeon/lib/libpmc/pmc_capabilities.3
  user/jmallett/octeon/lib/libpmc/pmc_configure_logfile.3
  user/jmallett/octeon/lib/libpmc/pmc_disable.3
  user/jmallett/octeon/lib/libpmc/pmc_event_names_of_class.3
  user/jmallett/octeon/lib/libpmc/pmc_get_driver_stats.3
  user/jmallett/octeon/lib/libpmc/pmc_get_msr.3
  user/jmallett/octeon/lib/libpmc/pmc_init.3
  user/jmallett/octeon/lib/libpmc/pmc_name_of_capability.3
  user/jmallett/octeon/lib/libpmc/pmc_read.3
  user/jmallett/octeon/lib/libpmc/pmc_set.3
  user/jmallett/octeon/lib/libpmc/pmc_start.3
  user/jmallett/octeon/lib/libpmc/pmclog.3
  user/jmallett/octeon/lib/libthr/libthr.3
  user/jmallett/octeon/lib/libugidfw/bsde_get_rule.3
  user/jmallett/octeon/lib/libugidfw/bsde_get_rule_count.3
  user/jmallett/octeon/lib/libugidfw/bsde_parse_rule.3
  user/jmallett/octeon/lib/libugidfw/bsde_rule_to_string.3
  user/jmallett/octeon/lib/libugidfw/libugidfw.3
  user/jmallett/octeon/lib/libulog/ulog_login.3
  user/jmallett/octeon/lib/libulog/utempter_add_record.3
  user/jmallett/octeon/lib/libutil/_secure_path.3
  user/jmallett/octeon/lib/libutil/auth.3
  user/jmallett/octeon/lib/libutil/hexdump.3
  user/jmallett/octeon/lib/libutil/kinfo_getfile.3
  user/jmallett/octeon/lib/libutil/kinfo_getvmmap.3
  user/jmallett/octeon/lib/libutil/kld.3
  user/jmallett/octeon/lib/libutil/login_auth.3
  user/jmallett/octeon/lib/libutil/login_cap.3
  user/jmallett/octeon/lib/libutil/login_class.3
  user/jmallett/octeon/lib/libutil/login_ok.3
  user/jmallett/octeon/lib/libutil/login_times.3
  user/jmallett/octeon/lib/libutil/login_tty.3
  user/jmallett/octeon/lib/libutil/property.3
  user/jmallett/octeon/lib/libutil/pty.3
  user/jmallett/octeon/lib/libutil/realhostname.3
  user/jmallett/octeon/lib/libutil/realhostname_sa.3
  user/jmallett/octeon/lib/libutil/trimdomain.3
  user/jmallett/octeon/lib/libutil/uucplock.3
  user/jmallett/octeon/release/Makefile
  user/jmallett/octeon/release/Makefile.inc.docports
  user/jmallett/octeon/sbin/geom/class/Makefile
  user/jmallett/octeon/sbin/ipfw/main.c
  user/jmallett/octeon/sbin/iscontrol/iscsi.conf.5
  user/jmallett/octeon/sbin/mca/mca.c
  user/jmallett/octeon/sbin/spppcontrol/spppcontrol.8
  user/jmallett/octeon/share/man/man3/sysexits.3
  user/jmallett/octeon/share/man/man3/tgmath.3
  user/jmallett/octeon/share/man/man4/Makefile
  user/jmallett/octeon/share/man/man4/altq.4
  user/jmallett/octeon/share/man/man4/audit.4
  user/jmallett/octeon/share/man/man4/auditpipe.4
  user/jmallett/octeon/share/man/man4/coda.4
  user/jmallett/octeon/share/man/man4/gbde.4
  user/jmallett/octeon/share/man/man4/geom.4
  user/jmallett/octeon/share/man/man4/geom_fox.4
  user/jmallett/octeon/share/man/man4/geom_linux_lvm.4
  user/jmallett/octeon/share/man/man4/geom_uzip.4
  user/jmallett/octeon/share/man/man4/ipw.4
  user/jmallett/octeon/share/man/man4/iscsi_initiator.4
  user/jmallett/octeon/share/man/man4/iwi.4
  user/jmallett/octeon/share/man/man4/iwn.4
  user/jmallett/octeon/share/man/man4/kbdmux.4
  user/jmallett/octeon/share/man/man4/lp.4
  user/jmallett/octeon/share/man/man4/mac.4
  user/jmallett/octeon/share/man/man4/mac_biba.4
  user/jmallett/octeon/share/man/man4/mac_bsdextended.4
  user/jmallett/octeon/share/man/man4/mac_ifoff.4
  user/jmallett/octeon/share/man/man4/mac_lomac.4
  user/jmallett/octeon/share/man/man4/mac_mls.4
  user/jmallett/octeon/share/man/man4/mac_none.4
  user/jmallett/octeon/share/man/man4/mac_partition.4
  user/jmallett/octeon/share/man/man4/mac_seeotheruids.4
  user/jmallett/octeon/share/man/man4/mac_stub.4
  user/jmallett/octeon/share/man/man4/mac_test.4
  user/jmallett/octeon/share/man/man4/miibus.4
  user/jmallett/octeon/share/man/man4/ng_netflow.4
  user/jmallett/octeon/share/man/man4/orm.4
  user/jmallett/octeon/share/man/man4/ral.4
  user/jmallett/octeon/share/man/man4/rp.4
  user/jmallett/octeon/share/man/man4/rum.4
  user/jmallett/octeon/share/man/man4/run.4
  user/jmallett/octeon/share/man/man4/sched_4bsd.4
  user/jmallett/octeon/share/man/man4/sched_ule.4
  user/jmallett/octeon/share/man/man4/si.4
  user/jmallett/octeon/share/man/man4/splash.4
  user/jmallett/octeon/share/man/man4/tap.4
  user/jmallett/octeon/share/man/man4/uhso.4
  user/jmallett/octeon/share/man/man4/upgt.4
  user/jmallett/octeon/share/man/man4/ural.4
  user/jmallett/octeon/share/man/man4/vkbd.4
  user/jmallett/octeon/share/man/man4/vlan.4
  user/jmallett/octeon/share/man/man4/wpi.4
  user/jmallett/octeon/share/man/man5/ar.5
  user/jmallett/octeon/share/man/man5/rc.conf.5
  user/jmallett/octeon/share/man/man7/clocks.7
  user/jmallett/octeon/share/man/man7/maclabel.7
  user/jmallett/octeon/share/man/man8/picobsd.8
  user/jmallett/octeon/share/man/man8/rescue.8
  user/jmallett/octeon/share/man/man9/CTASSERT.9
  user/jmallett/octeon/share/man/man9/DELAY.9
  user/jmallett/octeon/share/man/man9/KASSERT.9
  user/jmallett/octeon/share/man/man9/VFS.9
  user/jmallett/octeon/share/man/man9/VFS_CHECKEXP.9
  user/jmallett/octeon/share/man/man9/VFS_FHTOVP.9
  user/jmallett/octeon/share/man/man9/VFS_MOUNT.9
  user/jmallett/octeon/share/man/man9/VFS_QUOTACTL.9
  user/jmallett/octeon/share/man/man9/VFS_ROOT.9
  user/jmallett/octeon/share/man/man9/VFS_STATFS.9
  user/jmallett/octeon/share/man/man9/VFS_SYNC.9
  user/jmallett/octeon/share/man/man9/VFS_UNMOUNT.9
  user/jmallett/octeon/share/man/man9/VFS_VGET.9
  user/jmallett/octeon/share/man/man9/VOP_ACCESS.9
  user/jmallett/octeon/share/man/man9/VOP_ACLCHECK.9
  user/jmallett/octeon/share/man/man9/VOP_ADVLOCK.9
  user/jmallett/octeon/share/man/man9/VOP_ATTRIB.9
  user/jmallett/octeon/share/man/man9/VOP_BWRITE.9
  user/jmallett/octeon/share/man/man9/VOP_CREATE.9
  user/jmallett/octeon/share/man/man9/VOP_FSYNC.9
  user/jmallett/octeon/share/man/man9/VOP_GETACL.9
  user/jmallett/octeon/share/man/man9/VOP_GETEXTATTR.9
  user/jmallett/octeon/share/man/man9/VOP_GETPAGES.9
  user/jmallett/octeon/share/man/man9/VOP_GETVOBJECT.9
  user/jmallett/octeon/share/man/man9/VOP_INACTIVE.9
  user/jmallett/octeon/share/man/man9/VOP_IOCTL.9
  user/jmallett/octeon/share/man/man9/VOP_LINK.9
  user/jmallett/octeon/share/man/man9/VOP_LISTEXTATTR.9
  user/jmallett/octeon/share/man/man9/VOP_LOCK.9
  user/jmallett/octeon/share/man/man9/VOP_LOOKUP.9
  user/jmallett/octeon/share/man/man9/VOP_OPENCLOSE.9
  user/jmallett/octeon/share/man/man9/VOP_PATHCONF.9
  user/jmallett/octeon/share/man/man9/VOP_PRINT.9
  user/jmallett/octeon/share/man/man9/VOP_RDWR.9
  user/jmallett/octeon/share/man/man9/VOP_READDIR.9
  user/jmallett/octeon/share/man/man9/VOP_READLINK.9
  user/jmallett/octeon/share/man/man9/VOP_REALLOCBLKS.9
  user/jmallett/octeon/share/man/man9/VOP_REMOVE.9
  user/jmallett/octeon/share/man/man9/VOP_RENAME.9
  user/jmallett/octeon/share/man/man9/VOP_REVOKE.9
  user/jmallett/octeon/share/man/man9/VOP_SETACL.9
  user/jmallett/octeon/share/man/man9/VOP_SETEXTATTR.9
  user/jmallett/octeon/share/man/man9/VOP_STRATEGY.9
  user/jmallett/octeon/share/man/man9/VOP_VPTOCNP.9
  user/jmallett/octeon/share/man/man9/VOP_VPTOFH.9
  user/jmallett/octeon/share/man/man9/accept_filter.9
  user/jmallett/octeon/share/man/man9/accf_data.9
  user/jmallett/octeon/share/man/man9/accf_dns.9
  user/jmallett/octeon/share/man/man9/accf_http.9
  user/jmallett/octeon/share/man/man9/acl.9
  user/jmallett/octeon/share/man/man9/atomic.9
  user/jmallett/octeon/share/man/man9/cr_cansee.9
  user/jmallett/octeon/share/man/man9/cr_seeothergids.9
  user/jmallett/octeon/share/man/man9/cr_seeotheruids.9
  user/jmallett/octeon/share/man/man9/devfs_set_cdevpriv.9
  user/jmallett/octeon/share/man/man9/devtoname.9
  user/jmallett/octeon/share/man/man9/extattr.9
  user/jmallett/octeon/share/man/man9/firmware.9
  user/jmallett/octeon/share/man/man9/hexdump.9
  user/jmallett/octeon/share/man/man9/ifnet.9
  user/jmallett/octeon/share/man/man9/make_dev.9
  user/jmallett/octeon/share/man/man9/namei.9
  user/jmallett/octeon/share/man/man9/p_candebug.9
  user/jmallett/octeon/share/man/man9/p_cansee.9
  user/jmallett/octeon/share/man/man9/pfind.9
  user/jmallett/octeon/share/man/man9/pgfind.9
  user/jmallett/octeon/share/man/man9/prison_check.9
  user/jmallett/octeon/share/man/man9/random.9
  user/jmallett/octeon/share/man/man9/rijndael.9
  user/jmallett/octeon/share/man/man9/rtalloc.9
  user/jmallett/octeon/share/man/man9/rtentry.9
  user/jmallett/octeon/share/man/man9/sleep.9
  user/jmallett/octeon/share/man/man9/spl.9
  user/jmallett/octeon/share/man/man9/stack.9
  user/jmallett/octeon/share/man/man9/uio.9
  user/jmallett/octeon/share/man/man9/usbdi.9
  user/jmallett/octeon/share/man/man9/vaccess.9
  user/jmallett/octeon/share/man/man9/vaccess_acl_nfs4.9
  user/jmallett/octeon/share/man/man9/vaccess_acl_posix1e.9
  user/jmallett/octeon/share/man/man9/vcount.9
  user/jmallett/octeon/share/man/man9/vget.9
  user/jmallett/octeon/share/man/man9/vm_map_entry_resize_free.9
  user/jmallett/octeon/share/man/man9/vnode.9
  user/jmallett/octeon/share/man/man9/vput.9
  user/jmallett/octeon/share/man/man9/vref.9
  user/jmallett/octeon/share/man/man9/vrefcnt.9
  user/jmallett/octeon/share/man/man9/vrele.9
  user/jmallett/octeon/share/misc/committers-ports.dot
  user/jmallett/octeon/sys/amd64/amd64/exception.S
  user/jmallett/octeon/sys/amd64/amd64/machdep.c
  user/jmallett/octeon/sys/amd64/amd64/trap.c
  user/jmallett/octeon/sys/amd64/conf/GENERIC
  user/jmallett/octeon/sys/amd64/ia32/ia32_signal.c
  user/jmallett/octeon/sys/amd64/include/md_var.h
  user/jmallett/octeon/sys/arm/include/bus.h
  user/jmallett/octeon/sys/boot/forth/loader.conf
  user/jmallett/octeon/sys/compat/linprocfs/linprocfs.c
  user/jmallett/octeon/sys/conf/NOTES
  user/jmallett/octeon/sys/conf/files
  user/jmallett/octeon/sys/conf/files.sparc64
  user/jmallett/octeon/sys/contrib/dev/iwn/LICENSE
  user/jmallett/octeon/sys/contrib/ipfilter/netinet/ip_compat.h
  user/jmallett/octeon/sys/dev/aac/aac.c
  user/jmallett/octeon/sys/dev/aac/aac_cam.c
  user/jmallett/octeon/sys/dev/aac/aac_debug.c
  user/jmallett/octeon/sys/dev/aac/aac_disk.c
  user/jmallett/octeon/sys/dev/aac/aac_pci.c
  user/jmallett/octeon/sys/dev/aac/aac_tables.h
  user/jmallett/octeon/sys/dev/aac/aacreg.h
  user/jmallett/octeon/sys/dev/aac/aacvar.h
  user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
  user/jmallett/octeon/sys/dev/ath/if_ath.c
  user/jmallett/octeon/sys/dev/bwi/if_bwi.c
  user/jmallett/octeon/sys/dev/bwi/if_bwivar.h
  user/jmallett/octeon/sys/dev/bwn/if_bwn.c
  user/jmallett/octeon/sys/dev/bwn/if_bwnvar.h
  user/jmallett/octeon/sys/dev/e1000/if_em.c
  user/jmallett/octeon/sys/dev/e1000/if_em.h
  user/jmallett/octeon/sys/dev/e1000/if_igb.c
  user/jmallett/octeon/sys/dev/e1000/if_lem.c
  user/jmallett/octeon/sys/dev/fb/vesa.c
  user/jmallett/octeon/sys/dev/iwn/if_iwn.c
  user/jmallett/octeon/sys/dev/iwn/if_iwnreg.h
  user/jmallett/octeon/sys/dev/iwn/if_iwnvar.h
  user/jmallett/octeon/sys/dev/mii/miidevs
  user/jmallett/octeon/sys/dev/mii/truephy.c
  user/jmallett/octeon/sys/dev/msk/if_msk.c
  user/jmallett/octeon/sys/dev/ral/rt2560.c
  user/jmallett/octeon/sys/dev/ral/rt2560var.h
  user/jmallett/octeon/sys/dev/ral/rt2661.c
  user/jmallett/octeon/sys/dev/ral/rt2661var.h
  user/jmallett/octeon/sys/dev/re/if_re.c
  user/jmallett/octeon/sys/dev/syscons/logo/logo.c
  user/jmallett/octeon/sys/dev/syscons/logo/logo_saver.c
  user/jmallett/octeon/sys/dev/uart/uart.h
  user/jmallett/octeon/sys/dev/uart/uart_cpu_sparc64.c
  user/jmallett/octeon/sys/dev/usb/serial/u3g.c
  user/jmallett/octeon/sys/dev/usb/usbdevs
  user/jmallett/octeon/sys/dev/usb/wlan/if_rum.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_rumvar.h
  user/jmallett/octeon/sys/dev/usb/wlan/if_run.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_runvar.h
  user/jmallett/octeon/sys/dev/usb/wlan/if_ural.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_uralvar.h
  user/jmallett/octeon/sys/dev/usb/wlan/if_zyd.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_zydreg.h
  user/jmallett/octeon/sys/dev/wpi/if_wpi.c
  user/jmallett/octeon/sys/dev/wpi/if_wpivar.h
  user/jmallett/octeon/sys/fs/devfs/devfs_devs.c
  user/jmallett/octeon/sys/fs/devfs/devfs_int.h
  user/jmallett/octeon/sys/fs/nwfs/nwfs.h
  user/jmallett/octeon/sys/fs/nwfs/nwfs_io.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_ioctl.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_mount.h
  user/jmallett/octeon/sys/fs/nwfs/nwfs_node.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_node.h
  user/jmallett/octeon/sys/fs/nwfs/nwfs_subr.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_subr.h
  user/jmallett/octeon/sys/fs/nwfs/nwfs_vfsops.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_vnops.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs.h
  user/jmallett/octeon/sys/fs/smbfs/smbfs_io.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_node.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_node.h
  user/jmallett/octeon/sys/fs/smbfs/smbfs_smb.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_subr.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_subr.h
  user/jmallett/octeon/sys/fs/smbfs/smbfs_vfsops.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_vnops.c
  user/jmallett/octeon/sys/i386/conf/GENERIC
  user/jmallett/octeon/sys/i386/i386/machdep.c
  user/jmallett/octeon/sys/i386/i386/mpboot.s
  user/jmallett/octeon/sys/i386/i386/trap.c
  user/jmallett/octeon/sys/i386/include/bootinfo.h
  user/jmallett/octeon/sys/ia64/ia64/mca.c
  user/jmallett/octeon/sys/ia64/ia64/mp_machdep.c
  user/jmallett/octeon/sys/ia64/include/mca.h
  user/jmallett/octeon/sys/ia64/include/pal.h
  user/jmallett/octeon/sys/kern/init_main.c
  user/jmallett/octeon/sys/kern/kern_clock.c
  user/jmallett/octeon/sys/kern/tty_pts.c
  user/jmallett/octeon/sys/kern/vfs_syscalls.c
  user/jmallett/octeon/sys/libkern/iconv.c
  user/jmallett/octeon/sys/libkern/iconv_converter_if.m
  user/jmallett/octeon/sys/libkern/iconv_xlat.c
  user/jmallett/octeon/sys/libkern/strcasecmp.c
  user/jmallett/octeon/sys/mips/atheros/if_arge.c
  user/jmallett/octeon/sys/mips/include/bus.h
  user/jmallett/octeon/sys/mips/mips/busdma_machdep.c
  user/jmallett/octeon/sys/modules/Makefile
  user/jmallett/octeon/sys/modules/dummynet/Makefile
  user/jmallett/octeon/sys/modules/geom/Makefile
  user/jmallett/octeon/sys/modules/iwnfw/iwn6000/Makefile
  user/jmallett/octeon/sys/modules/syscons/Makefile
  user/jmallett/octeon/sys/modules/uart/Makefile
  user/jmallett/octeon/sys/modules/wlan/Makefile
  user/jmallett/octeon/sys/net/if.c
  user/jmallett/octeon/sys/net/if_clone.c
  user/jmallett/octeon/sys/net/if_llatbl.c
  user/jmallett/octeon/sys/net80211/ieee80211.c
  user/jmallett/octeon/sys/net80211/ieee80211_amrr.c
  user/jmallett/octeon/sys/net80211/ieee80211_amrr.h
  user/jmallett/octeon/sys/net80211/ieee80211_crypto_ccmp.c
  user/jmallett/octeon/sys/net80211/ieee80211_crypto_tkip.c
  user/jmallett/octeon/sys/net80211/ieee80211_freebsd.h
  user/jmallett/octeon/sys/net80211/ieee80211_ioctl.c
  user/jmallett/octeon/sys/net80211/ieee80211_node.c
  user/jmallett/octeon/sys/net80211/ieee80211_node.h
  user/jmallett/octeon/sys/net80211/ieee80211_rssadapt.c
  user/jmallett/octeon/sys/net80211/ieee80211_rssadapt.h
  user/jmallett/octeon/sys/net80211/ieee80211_scan_sta.c
  user/jmallett/octeon/sys/net80211/ieee80211_var.h
  user/jmallett/octeon/sys/netgraph/ng_pipe.c
  user/jmallett/octeon/sys/netgraph/ng_pipe.h
  user/jmallett/octeon/sys/netinet/if_ether.c
  user/jmallett/octeon/sys/netinet/in.c
  user/jmallett/octeon/sys/netinet/in_mcast.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_dn_glue.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h
  user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c
  user/jmallett/octeon/sys/netinet/ipfw/ip_fw_sockopt.c
  user/jmallett/octeon/sys/netinet/tcp_input.c
  user/jmallett/octeon/sys/netinet6/in6.c
  user/jmallett/octeon/sys/netinet6/mld6.c
  user/jmallett/octeon/sys/netinet6/nd6.c
  user/jmallett/octeon/sys/netncp/ncp_conn.c
  user/jmallett/octeon/sys/netncp/ncp_conn.h
  user/jmallett/octeon/sys/netncp/ncp_file.h
  user/jmallett/octeon/sys/netncp/ncp_lib.h
  user/jmallett/octeon/sys/netncp/ncp_login.c
  user/jmallett/octeon/sys/netncp/ncp_ncp.c
  user/jmallett/octeon/sys/netncp/ncp_ncp.h
  user/jmallett/octeon/sys/netncp/ncp_nls.c
  user/jmallett/octeon/sys/netncp/ncp_nls.h
  user/jmallett/octeon/sys/netncp/ncp_rcfile.h
  user/jmallett/octeon/sys/netncp/ncp_rq.c
  user/jmallett/octeon/sys/netncp/ncp_rq.h
  user/jmallett/octeon/sys/netncp/ncp_sock.c
  user/jmallett/octeon/sys/netncp/ncp_sock.h
  user/jmallett/octeon/sys/netncp/ncp_subr.c
  user/jmallett/octeon/sys/netncp/ncp_subr.h
  user/jmallett/octeon/sys/netncp/ncp_user.h
  user/jmallett/octeon/sys/netsmb/netbios.h
  user/jmallett/octeon/sys/netsmb/smb.h
  user/jmallett/octeon/sys/netsmb/smb_conn.c
  user/jmallett/octeon/sys/netsmb/smb_conn.h
  user/jmallett/octeon/sys/netsmb/smb_dev.c
  user/jmallett/octeon/sys/netsmb/smb_dev.h
  user/jmallett/octeon/sys/netsmb/smb_iod.c
  user/jmallett/octeon/sys/netsmb/smb_rq.c
  user/jmallett/octeon/sys/netsmb/smb_rq.h
  user/jmallett/octeon/sys/netsmb/smb_smb.c
  user/jmallett/octeon/sys/netsmb/smb_subr.c
  user/jmallett/octeon/sys/netsmb/smb_subr.h
  user/jmallett/octeon/sys/netsmb/smb_tran.h
  user/jmallett/octeon/sys/netsmb/smb_trantcp.c
  user/jmallett/octeon/sys/netsmb/smb_trantcp.h
  user/jmallett/octeon/sys/netsmb/smb_usr.c
  user/jmallett/octeon/sys/pc98/cbus/clock.c
  user/jmallett/octeon/sys/pci/if_rlreg.h
  user/jmallett/octeon/sys/sparc64/conf/GENERIC
  user/jmallett/octeon/sys/sparc64/conf/NOTES
  user/jmallett/octeon/sys/sparc64/include/dcr.h
  user/jmallett/octeon/sys/sparc64/include/lsu.h
  user/jmallett/octeon/sys/sparc64/sparc64/ofw_machdep.c
  user/jmallett/octeon/sys/sparc64/sparc64/trap.c
  user/jmallett/octeon/sys/sys/iconv.h
  user/jmallett/octeon/sys/sys/mchain.h
  user/jmallett/octeon/sys/vm/memguard.c
  user/jmallett/octeon/sys/vm/memguard.h
  user/jmallett/octeon/sys/vm/vm_contig.c
  user/jmallett/octeon/sys/vm/vm_extern.h
  user/jmallett/octeon/sys/vm/vm_glue.c
  user/jmallett/octeon/sys/x86/isa/clock.c
  user/jmallett/octeon/usr.bin/ar/ar.1
  user/jmallett/octeon/usr.bin/c89/c89.1
  user/jmallett/octeon/usr.bin/c99/c99.1
  user/jmallett/octeon/usr.bin/calendar/calendars/calendar.dutch
  user/jmallett/octeon/usr.bin/column/column.1
  user/jmallett/octeon/usr.bin/comm/comm.1
  user/jmallett/octeon/usr.bin/csup/cpasswd.1   (contents, props changed)
  user/jmallett/octeon/usr.bin/csup/csup.1
  user/jmallett/octeon/usr.bin/enigma/enigma.1
  user/jmallett/octeon/usr.bin/gzip/gzip.1
  user/jmallett/octeon/usr.bin/gzip/gzip.c
  user/jmallett/octeon/usr.bin/gzip/unbzip2.c
  user/jmallett/octeon/usr.bin/hexdump/od.1
  user/jmallett/octeon/usr.bin/killall/killall.1
  user/jmallett/octeon/usr.bin/lockf/lockf.1
  user/jmallett/octeon/usr.bin/tar/bsdtar.1
  user/jmallett/octeon/usr.bin/tar/bsdtar.c
  user/jmallett/octeon/usr.bin/tar/bsdtar_platform.h
  user/jmallett/octeon/usr.bin/tar/matching.c
  user/jmallett/octeon/usr.bin/tar/subst.c
  user/jmallett/octeon/usr.bin/tar/tree.h
  user/jmallett/octeon/usr.bin/tar/write.c
  user/jmallett/octeon/usr.bin/wtmpcvt/wtmpcvt.1
  user/jmallett/octeon/usr.bin/xlint/lint1/decl.c
  user/jmallett/octeon/usr.bin/xlint/lint1/lint1.h
  user/jmallett/octeon/usr.bin/xlint/lint1/mem1.c
  user/jmallett/octeon/usr.sbin/asf/asf.8
  user/jmallett/octeon/usr.sbin/burncd/burncd.8
  user/jmallett/octeon/usr.sbin/ctm/ctm/ctm.1
  user/jmallett/octeon/usr.sbin/ctm/ctm/ctm.5
  user/jmallett/octeon/usr.sbin/devinfo/devinfo.8
  user/jmallett/octeon/usr.sbin/fdformat/fdformat.1
  user/jmallett/octeon/usr.sbin/fdread/fdread.1
  user/jmallett/octeon/usr.sbin/fdwrite/fdwrite.1
  user/jmallett/octeon/usr.sbin/fifolog/fifolog_create/fifolog.1
  user/jmallett/octeon/usr.sbin/flowctl/flowctl.8
  user/jmallett/octeon/usr.sbin/lastlogin/lastlogin.8
  user/jmallett/octeon/usr.sbin/lastlogin/lastlogin.c
  user/jmallett/octeon/usr.sbin/mtest/mtest.8
  user/jmallett/octeon/usr.sbin/periodic/periodic.8
  user/jmallett/octeon/usr.sbin/pmcannotate/pmcannotate.8
  user/jmallett/octeon/usr.sbin/pmccontrol/pmccontrol.8
  user/jmallett/octeon/usr.sbin/pmcstat/pmcstat.8
  user/jmallett/octeon/usr.sbin/pppctl/pppctl.8
  user/jmallett/octeon/usr.sbin/setfmac/setfsmac.8
  user/jmallett/octeon/usr.sbin/setpmac/setpmac.8
  user/jmallett/octeon/usr.sbin/sysinstall/devices.c
  user/jmallett/octeon/usr.sbin/sysinstall/menus.c
  user/jmallett/octeon/usr.sbin/uhsoctl/uhsoctl.1
  user/jmallett/octeon/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
  user/jmallett/octeon/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
Directory Properties:
  user/jmallett/octeon/   (props changed)
  user/jmallett/octeon/sys/contrib/x86emu/   (props changed)
  user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9160.ini   (props changed)

Modified: user/jmallett/octeon/MAINTAINERS
==============================================================================
--- user/jmallett/octeon/MAINTAINERS	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/MAINTAINERS	Wed Apr 14 21:46:22 2010	(r206634)
@@ -123,6 +123,9 @@ usr.sbin/zic		edwin   Heads-up appreciat
 				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.
+sysinstall	randi	Please contact about any major changes so that
+			they can be co-ordinated.
+sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 
 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/jmallett/octeon/Makefile.inc1
==============================================================================
--- user/jmallett/octeon/Makefile.inc1	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/Makefile.inc1	Wed Apr 14 21:46:22 2010	(r206634)
@@ -15,6 +15,7 @@
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	TARGET="machine" to crossbuild world for a different machine type
+#	TARGET_ARCH= may be required when a TARGET supports multiple endians
 
 #
 # The intended user-driven targets are:

Modified: user/jmallett/octeon/bin/ps/ps.1
==============================================================================
--- user/jmallett/octeon/bin/ps/ps.1	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/bin/ps/ps.1	Wed Apr 14 21:46:22 2010	(r206634)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 17, 2010
+.Dd April 13, 2010
 .Dt PS 1
 .Os
 .Sh NAME
@@ -298,6 +298,7 @@ the include file
 .It Dv "P_WAITED" Ta No "0x01000	Someone is waiting for us"
 .It Dv "P_WEXIT" Ta No "0x02000		Working on exiting"
 .It Dv "P_EXEC" Ta No "0x04000		Process called exec"
+.It Dv "P_WKILLED" Ta No "0x08000	Killed, shall go to kernel/user boundary ASAP"
 .It Dv "P_CONTINUED" Ta No "0x10000	Proc has continued from a stopped state"
 .It Dv "P_STOPPED_SIG" Ta No "0x20000	Stopped due to SIGSTOP/SIGTSTP"
 .It Dv "P_STOPPED_TRACE" Ta No "0x40000	Stopped because of tracing"

Modified: user/jmallett/octeon/bin/pwait/pwait.1
==============================================================================
--- user/jmallett/octeon/bin/pwait/pwait.1	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/bin/pwait/pwait.1	Wed Apr 14 21:46:22 2010	(r206634)
@@ -33,8 +33,8 @@
 .\" $FreeBSD$
 .\"
 .Dd November 1, 2009
-.Os
 .Dt PWAIT 1
+.Os
 .Sh NAME
 .Nm pwait
 .Nd wait for processes to terminate

Modified: user/jmallett/octeon/bin/sh/mksyntax.c
==============================================================================
--- user/jmallett/octeon/bin/sh/mksyntax.c	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/bin/sh/mksyntax.c	Wed Apr 14 21:46:22 2010	(r206634)
@@ -232,6 +232,7 @@ main(int argc __unused, char **argv __un
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
+	add("\"", "CDQUOTE");
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("(", "CLP");

Modified: user/jmallett/octeon/bin/sh/parser.c
==============================================================================
--- user/jmallett/octeon/bin/sh/parser.c	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/bin/sh/parser.c	Wed Apr 14 21:46:22 2010	(r206634)
@@ -1223,7 +1223,10 @@ readtoken1(int firstc, char const *initi
 				if (eofmark != NULL && newvarnest == 0)
 					USTPUTC(c, out);
 				else {
-					state[level].syntax = BASESYNTAX;
+					if (state[level].category == TSTATE_ARITH)
+						state[level].syntax = ARISYNTAX;
+					else
+						state[level].syntax = BASESYNTAX;
 					quotef++;
 				}
 				break;

Modified: user/jmallett/octeon/contrib/binutils/bfd/config.bfd
==============================================================================
--- user/jmallett/octeon/contrib/binutils/bfd/config.bfd	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/contrib/binutils/bfd/config.bfd	Wed Apr 14 21:46:22 2010	(r206634)
@@ -221,6 +221,10 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
+  armeb-*-freebsd*)
+    targ_defvec=bfd_elf32_bigarm_vec
+    targ_selvecs=bfd_elf32_littlearm_vec
+    ;;
   arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
     targ_defvec=bfd_elf32_littlearm_vec

Modified: user/jmallett/octeon/contrib/com_err/compile_et.1
==============================================================================
--- user/jmallett/octeon/contrib/com_err/compile_et.1	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/contrib/com_err/compile_et.1	Wed Apr 14 21:46:22 2010	(r206634)
@@ -4,8 +4,8 @@
 .\" $FreeBSD$
 .\"
 .Dd November 22, 1988
-.Os
 .Dt COMPILE_ET 1
+.Os
 .Sh NAME
 .Nm compile_et
 .Nd error table compiler

Modified: user/jmallett/octeon/crypto/openssh/sshd.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/sshd.c	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/crypto/openssh/sshd.c	Wed Apr 14 21:46:22 2010	(r206634)
@@ -1330,10 +1330,6 @@ main(int ac, char **av)
 	/* Initialize configuration options to their default values. */
 	initialize_server_options(&options);
 
-	/* Avoid killing the process in high-pressure swapping environments. */
-	if (madvise(NULL, 0, MADV_PROTECT) != 0)
-		debug("madvise(): %.200s", strerror(errno));
-
 	/* Parse command-line arguments. */
 	while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) {
 		switch (opt) {
@@ -1749,6 +1745,10 @@ main(int ac, char **av)
 	/* Reinitialize the log (because of the fork above). */
 	log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
+	/* Avoid killing the process in high-pressure swapping environments. */
+	if (!inetd_flag && madvise(NULL, 0, MADV_PROTECT) != 0)
+		debug("madvise(): %.200s", strerror(errno));
+
 	/* Initialize the random number generator. */
 	arc4random_stir();
 

Modified: user/jmallett/octeon/etc/defaults/rc.conf
==============================================================================
--- user/jmallett/octeon/etc/defaults/rc.conf	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/defaults/rc.conf	Wed Apr 14 21:46:22 2010	(r206634)
@@ -210,6 +210,7 @@ cloned_interfaces=""		# List of cloned n
 ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
 #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
 #ifconfig_ed0_ipx="ipx 0x00010010"	# Sample IPX address family entry.
+#ifconfig_ed0_ipv6="RTADV" 	# Sample IPv6 entry for RA/rtsol(8)
 #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
 #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
 #ifconfig_fxp0_name="net0"	# Change interface name from fxp0 to net0.
@@ -435,12 +436,18 @@ rfcomm_pppd_server_two_channel="3"	# Ove
 #rfcomm_pppd_server_two_register_sp="NO"	# Override SP and DUN register
 #rfcomm_pppd_server_two_register_dun="NO"	# for 'two'
 
+#ubthidhci_enable="YES"		# Switch an USB BT controller present on
+#ubthidhci_busnum="3"		# bus 3 and addr 2 from HID mode to HCI mode.
+#ubthidhci_addr="2"		# Check usbconfig list to find the correct
+				# numbers for your system.
+
 ### Miscellaneous network options: ###
 icmp_bmcastecho="NO"	# respond to broadcast ping packets
 
 ### IPv6 options: ###
-ipv6_network_interfaces="none"	# List of IPv6 network interfaces
-				# (or "auto" or "none").
+ipv6_network_interfaces="AUTO"	# List of IPv6 network interfaces
+ipv6_prefer="YES" 		# Use IPv6 when both IPv4 and IPv6 can be used
+ipv6_privacy="NO" 		# Use privacy addresses with RTADV (RFC 4193)
 ipv6_defaultrouter="NO"		# Set to IPv6 default gateway (or NO).
 #ipv6_defaultrouter="2002:c058:6301::"	# Use this for 6to4 (RFC 3068)
 ipv6_static_routes=""		# Set to static route list (or leave empty).
@@ -499,7 +506,6 @@ ipv6_ipfilter_rules="/etc/ipf6.rules"	# 
 					# for examples
 ip6addrctl_enable="YES"	# Set to YES to enable default address selection
 ip6addrctl_verbose="NO"	# Set to YES to enable verbose configuration messages
-ipv6_prefer="NO"	# Use IPv6 when both IPv4 and IPv6 can be used
 
 ##############################################################
 ###  System console options  #################################

Modified: user/jmallett/octeon/etc/network.subr
==============================================================================
--- user/jmallett/octeon/etc/network.subr	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/network.subr	Wed Apr 14 21:46:22 2010	(r206634)
@@ -96,44 +96,32 @@ ifconfig_up()
 	# inet6 specific
 	if afexists inet6; then
 		if ipv6if $1; then
-			if checkyesno ipv6_gateway_enable; then
-				_ipv6_opts="-accept_rtadv"
-			fi
-		else
-			if checkyesno ipv6_prefer; then
-				_ipv6_opts="-ifdisabled"
-			else
-				_ipv6_opts="ifdisabled"
+			# Implicitly handles ipv6_gateway_enable
+			_ipv6_opts='-ifdisabled -accept_rtadv'
+
+			if ipv6_autoconfif $1; then
+				_ipv6_opts='-ifdisabled accept_rtadv'
 			fi
 
-			# backward compatibility: $ipv6_enable
-			case $ipv6_enable in
-			[Yy][Ee][Ss])
-				_ipv6_opts="${_ipv6_opts} accept_rtadv"
-				;;
-			esac
-		fi
+			ifconfig $1 inet6 $_ipv6_opts
 
-		if [ -n "${_ipv6_opts}" ]; then
-			ifconfig $1 inet6 ${_ipv6_opts}
-		fi
+			# ifconfig_IF_ipv6
+			ifconfig_args=`ifconfig_getargs $1 ipv6`
 
-		# ifconfig_IF_ipv6
-		ifconfig_args=`ifconfig_getargs $1 ipv6`
-		if [ -n "${ifconfig_args}" ]; then
-			ifconfig $1 inet6 -ifdisabled
-			ifconfig $1 ${ifconfig_args}
-			_cfg=0
-		fi
+			if [ -n "$ifconfig_args" ]; then
+				ifconfig $1 $ifconfig_args
+				_cfg=0
+			fi
+		else
+		# Remove in FreeBSD 10.x
+		# Explicit test is necessary here to avoid nonexistence error
+			case "$ipv6_enable" in
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+			warn "Interface $1 will NOT be configured for IPv6"
+				;;
+			esac
 
-		# backward compatiblity: $ipv6_ifconfig_IF
-		ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF`
-		if [ -n "${ifconfig_args}" ]; then
-			warn "\$ipv6_ifconfig_$1 is obsolete." \
-			    "  Use ifconfig_$1_ipv6 instead."
-			ifconfig $1 inet6 -ifdisabled
-			ifconfig $1 inet6 ${ifconfig_args}
-			_cfg=0
+			ifconfig $1 inet6 ifdisabled
 		fi
 	fi
 
@@ -194,7 +182,7 @@ ifconfig_down()
 #	$default if given.
 get_if_var()
 {
-	local _if _punct _var _default prefix suffix
+	local _if _punct _punct_c _var _default prefix suffix
 
 	if [ $# -ne 2 -a $# -ne 3 ]; then
 		err 3 'USAGE: get_if_var name var [default]'
@@ -219,7 +207,7 @@ get_if_var()
 #	outside this file.
 _ifconfig_getargs()
 {
-	local _ifn _af
+	local _ifn _af value
 	_ifn=$1
 	_af=${2+_$2}
 
@@ -227,7 +215,18 @@ _ifconfig_getargs()
 		return 1
 	fi
 
-	get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"
+	value=`get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"`
+
+	# Remove in FreeBSD 10.x
+	if [ "$_af" = _ipv6 -a -z "$value" ]; then
+		value=`get_if_var $_ifn ipv6_ifconfig_IF "$ifconfig_DEFAULT"`
+		if [ -n "$value" ]; then
+			warn "\$ipv6_ifconfig_$1 is obsolete." \
+			"  Use ifconfig_$1_ipv6 instead."
+		fi
+	fi
+
+	echo $value
 }
 
 # ifconfig_getargs if [af]
@@ -249,6 +248,8 @@ ifconfig_getargs()
 		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
 		[Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
 		[Ww][Pp][Aa]) ;;
+		[Rr][Tt][Aa][Dd][Vv]) ;;
+		[Nn][Oo][Rr][Tt][Aa][Dd][Vv]) ;;
 		*)
 			_args="$_args $_arg"
 			;;
@@ -372,77 +373,45 @@ afexists()
 	esac
 }
 
-# noafif if
-#	Returns 0 if the interface has no af configuration and 1 otherwise.
-noafif()
-{
-	local _if
-	_if=$1
-
-	case $_if in
-	pflog[0-9]*|\
-	pfsync[0-9]*|\
-	an[0-9]*|\
-	ath[0-9]*|\
-	ipw[0-9]*|\
-	iwi[0-9]*|\
-	iwn[0-9]*|\
-	ral[0-9]*|\
-	wi[0-9]*|\
-	wl[0-9]*|\
-	wpi[0-9]*)
-		return 0
-		;;
-	esac
-
-	return 1
-}
-
 # ipv6if if
 #	Returns 0 if the interface should be configured for IPv6 and
 #	1 otherwise.
 ipv6if()
 {
-	local _if _tmpargs i
-	_if=$1
-
 	if ! afexists inet6; then
 		return 1
 	fi
 
 	# lo0 is always IPv6-enabled
-	case $_if in
+	case $1 in
 	lo0)
 		return 0
 		;;
 	esac
 
-	# True if $ifconfig_IF_ipv6 is defined.
-	_tmpargs=`_ifconfig_getargs $_if ipv6`
-	if [ -n "${_tmpargs}" ]; then
-		return 0
-	fi
-
-	# backward compatibility: True if $ipv6_ifconfig_IF is defined.
-	_tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
-	if [ -n "${_tmpargs}" ]; then
-		return 0
-	fi
+	local _if _tmpargs i
+	_if=$1
 
-	case "${ipv6_network_interfaces}" in
-	[Aa][Uu][Tt][Oo])
-		return 0
-		;;
+	case "$ipv6_network_interfaces" in
 	''|[Nn][Oo][Nn][Ee])
 		return 1
 		;;
+	$_if|"$_if "*|*" $_if"|*" $_if "*|[Aa][Uu][Tt][Oo])
+		# True if $ifconfig_IF_ipv6 is defined.
+		_tmpargs=`_ifconfig_getargs $_if ipv6`
+		;;
 	esac
 
-	for i in ${ipv6_network_interfaces}; do
-		if [ "$i" = "$_if" ]; then
-			return 0
-		fi
-	done
+	if [ -n "$_tmpargs" ]; then
+		# Remove in FreeBSD 10.x
+		# Explicit test is necessary here to avoid nonexistence error
+		case "$ipv6_enable" in
+		[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+			;;
+		*)	return 0
+			;;
+		esac
+	fi
 
 	return 1
 }
@@ -452,15 +421,24 @@ ipv6if()
 #	Stateless Address Configuration, 1 otherwise.
 ipv6_autoconfif()
 {
+	case $1 in
+	lo0|\
+	stf[0-9]*|\
+	faith[0-9]*|\
+	lp[0-9]*|\
+	sl[0-9]*|\
+	pflog[0-9]*|\
+	pfsync[0-9]*)
+		return 1
+		;;
+	esac
+
 	local _if _tmpargs _arg
 	_if=$1
 
 	if ! ipv6if $_if; then
 		return 1
 	fi
-	if noafif $_if; then
-		return 1
-	fi
 	if checkyesno ipv6_gateway_enable; then
 		return 1
 	fi
@@ -468,45 +446,24 @@ ipv6_autoconfif()
 	if [ -n "${_tmpargs}" ]; then
 		return 1
 	fi
+	if ! is_wired_interface $_if; then
+		case $_if in
+		wlan[0-9]*)	;;	# Allow test to continue
+		*)	return 1
+			;;
+		esac
+	fi
 
-	case $_if in
-	lo0|\
-	stf[0-9]*|\
-	faith[0-9]*|\
-	lp[0-9]*|\
-	sl[0-9]*|\
-	pflog[0-9]*|\
-	pfsync[0-9]*)
+	_tmpargs=`_ifconfig_getargs $_if ipv6`
+	case "$_tmpargs" in
+	*inet6\ *|*[Nn][Oo][Rr][Tt][Aa][Dd][Vv]*|*-accept_rtadv*)
 		return 1
 		;;
-	esac
-
-	# backward compatibility: $ipv6_enable
-	case $ipv6_enable in
-	[Yy][Ee][Ss])
+	*[Rr][Tt][Aa][Dd][Vv]*|*accept_rtadv*)
 		return 0
 		;;
 	esac
 
-	_tmpargs=`_ifconfig_getargs $_if ipv6`
-	for _arg in $_tmpargs; do
-		case $_arg in
-		accept_rtadv)
-			return 0
-			;;
-		esac
-	done
-
-	# backward compatibility: $ipv6_ifconfig_IF
-	_tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
-	for _arg in $_tmpargs; do
-		case $_arg in
-		accept_rtadv)
-			return 0
-			;;
-		esac
-	done
-
 	return 1
 }
 

Modified: user/jmallett/octeon/etc/rc.d/ip6addrctl
==============================================================================
--- user/jmallett/octeon/etc/rc.d/ip6addrctl	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/rc.d/ip6addrctl	Wed Apr 14 21:46:22 2010	(r206634)
@@ -20,8 +20,6 @@ status_cmd="ip6addrctl"
 prefer_ipv6_cmd="ip6addrctl_prefer_ipv6"
 prefer_ipv4_cmd="ip6addrctl_prefer_ipv4"
 
-set_rcvar_obsolete ipv6_enable ipv6_prefer
-
 ip6addrctl_prefer_ipv6()
 {
 	afexists inet6 || return 0

Modified: user/jmallett/octeon/etc/rc.d/netif
==============================================================================
--- user/jmallett/octeon/etc/rc.d/netif	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/rc.d/netif	Wed Apr 14 21:46:22 2010	(r206634)
@@ -34,6 +34,7 @@
 . /etc/network.subr
 
 name="network"
+start_precmd="network_prestart"
 start_cmd="network_start"
 stop_cmd="network_stop"
 cloneup_cmd="clone_up"
@@ -41,7 +42,13 @@ clonedown_cmd="clone_down"
 extra_commands="cloneup clonedown"
 cmdifn=
 
-set_rcvar_obsolete ipv6_enable ipv6_prefer
+network_prestart()
+{
+	if [ -n "$ipv6_enable" ]; then
+		warn 'The ipv6_enable option is deprecated.'
+		warn 'See rc.conf(5) for information on disabling IPv6.'
+	fi
+}
 
 network_start()
 {

Modified: user/jmallett/octeon/etc/rc.d/netoptions
==============================================================================
--- user/jmallett/octeon/etc/rc.d/netoptions	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/rc.d/netoptions	Wed Apr 14 21:46:22 2010	(r206634)
@@ -99,6 +99,13 @@ netoptions_inet6()
 	else
 		${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
 	fi
+
+	if checkyesno ipv6_privacy; then
+		netoptions_init
+		echo -n " IPv6 Privacy Addresses"
+		${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null
+		${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null
+	fi
 }
 
 load_rc_config $name

Copied: user/jmallett/octeon/etc/rc.d/ubthidhci (from r206631, head/etc/rc.d/ubthidhci)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/etc/rc.d/ubthidhci	Wed Apr 14 21:46:22 2010	(r206634, copy of r206631, head/etc/rc.d/ubthidhci)
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ubthidhci
+# REQUIRE: DAEMON 
+# BEFORE: bluetooth 
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="ubthidhci"
+command="/usr/sbin/usbconfig"
+rcvar=`set_rcvar`
+start_precmd="ubthidhci_prestart"
+
+ubthidhci_prestart()
+{
+
+	if [ -z ${ubthidhci_busnum} ]; then
+		warn ubthidhci_busnum is not set
+		return 1
+	fi
+	if [ -z ${ubthidhci_addr} ]; then
+		warn ubthidhci_addr is not set
+		return 1
+	fi
+}
+
+load_rc_config $name
+#
+# We discard the output because:
+# 1) we don't want it to show up during boot; and
+# 2) the request usually returns an error, but that doesn't mean it failed
+#
+# NB: 0x40 is UT_VENDOR
+command_args="-u ${ubthidhci_busnum} -a ${ubthidhci_addr} do_request 0x40 0 0 0 0 > /dev/null 2>&1"
+
+run_rc_command "$1"

Modified: user/jmallett/octeon/etc/rc.firewall
==============================================================================
--- user/jmallett/octeon/etc/rc.firewall	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/etc/rc.firewall	Wed Apr 14 21:46:22 2010	(r206634)
@@ -424,24 +424,21 @@ case ${firewall_type} in
 	# Configuration:
 	#  firewall_myservices:		List of TCP ports on which this host
 	#			 	 offers services.
-	#  firewall_allowservices:	List of IPs which has access to
+	#  firewall_allowservices:	List of IPv4 and/or IPv6 addresses
+	#				 that have access to
 	#				 $firewall_myservices.
-	#  firewall_trusted:		List of IPv4s which has full access 
-	#				 to this host. Be very carefull 
-	#				 when setting this. This option can
-	#				 seriously degrade the level of 
-	#				 protection provided by the firewall.
+	#  firewall_trusted:		List of IPv4 and/or IPv6 addresses
+	#				 that have full access to this host.
+	#				 Be very careful when setting this.
+	#				 This option can seriously degrade
+	#				 the level of protection provided by
+	#				 the firewall.
 	#  firewall_logdeny:		Boolean (YES/NO) specifying if the
 	#				 default denied packets should be
 	#				 logged (in /var/log/security).
 	#  firewall_nologports:		List of TCP/UDP ports for which
 	#				 denied incomming packets are not
 	#				 logged.
-	#  firewall_trusted_ipv6:	List of IPv6s which has full access 
-	#				 to this host. Be very carefull 
-	#				 when setting this. This option can
-	#				 seriously degrade the level of 
-	#				 protection provided by the firewall.
 
 	# Allow packets for which a state has been built.
 	${fwcmd} add check-state

Modified: user/jmallett/octeon/gnu/usr.bin/gdb/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/gdb/Makefile	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/gnu/usr.bin/gdb/Makefile	Wed Apr 14 21:46:22 2010	(r206634)
@@ -3,8 +3,7 @@
 SUBDIR=	doc libgdb gdb gdbtui kgdb
 
 TARGET_ARCH?= ${MACHINE_ARCH}
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "arm" || \
-    ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc"
+.if exists(${.CURDIR}/gdbserver/reg-${TARGET_ARCH}.c)
 SUBDIR+=gdbserver
 .endif
 

Modified: user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/Makefile	Wed Apr 14 21:44:14 2010	(r206633)
+++ user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/Makefile	Wed Apr 14 21:46:22 2010	(r206634)
@@ -14,20 +14,9 @@ SRCS=	inferiors.c mem-break.c regcache.c
 	server.c signals.c target.c utils.c
 SRCS+=	fbsd-low.c
 
-.if ${MACHINE_ARCH} == "amd64"
-SRCS+= fbsd-amd64-low.c i387-fp.c reg-x86-64.c
-.endif
-
-.if ${MACHINE_ARCH} == "arm"
-SRCS+= fbsd-arm-low.c reg-arm.c
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-SRCS+= fbsd-i386-low.c i387-fp.c reg-i386.c
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-SRCS+= fbsd-ppc-low.c reg-ppc.c
+SRCS+= fbsd-${MACHINE_ARCH}-low.c reg-${MACHINE_ARCH}.c
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+SRCS+= i387-fp.c
 .endif
 
 #CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_ARCH}

Copied: user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c (from r206631, head/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c	Wed Apr 14 21:46:22 2010	(r206634, copy of r206631, head/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c)
@@ -0,0 +1,156 @@
+/* FreeBSD/PowerPC specific low level interface, for the remote server for
+   GDB.
+   Copyright 1995, 1996, 1998, 1999, 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "server.h"
+#include "fbsd-low.h"
+
+#include <sys/procfs.h>
+#include <sys/ptrace.h>
+
+#define ppc_num_regs 71
+
+/* Currently, don't check/send MQ.  */
+static int ppc_regmap[] =
+ { 0, 4, 8, 12, 16, 20, 24, 28,
+   32, 36, 40, 44, 48, 52, 56, 60,
+   64, 68, 72, 76, 80, 84, 88, 92,
+   96, 100, 104, 108, 112, 116, 120, 124,
+#if 0
+  /*
+   * XXX on FreeBSD the gdbserver for PowerPC was only tested with FPU-less
+   * cores i.e. e500. Let's leave the original FPR references around in case
+   * someone picks up and brings support for AIM-like FPU machines.
+   */
+  PT_FPR0*4,     PT_FPR0*4 + 8, PT_FPR0*4+16,  PT_FPR0*4+24,
+  PT_FPR0*4+32,  PT_FPR0*4+40,  PT_FPR0*4+48,  PT_FPR0*4+56,
+  PT_FPR0*4+64,  PT_FPR0*4+72,  PT_FPR0*4+80,  PT_FPR0*4+88,
+  PT_FPR0*4+96,  PT_FPR0*4+104,  PT_FPR0*4+112,  PT_FPR0*4+120,
+  PT_FPR0*4+128, PT_FPR0*4+136,  PT_FPR0*4+144,  PT_FPR0*4+152,
+  PT_FPR0*4+160,  PT_FPR0*4+168,  PT_FPR0*4+176,  PT_FPR0*4+184,
+  PT_FPR0*4+192,  PT_FPR0*4+200,  PT_FPR0*4+208,  PT_FPR0*4+216,
+  PT_FPR0*4+224,  PT_FPR0*4+232,  PT_FPR0*4+240,  PT_FPR0*4+248,
+#endif
+   -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1,
+   144, -1, 132, 128, 140, 136, -1
+ };
+
+static int
+ppc_cannot_store_register (int regno)
+{
+  /* Some kernels do not allow us to store fpscr.  */
+  if (regno == find_regno ("fpscr"))
+    return 2;
+
+  return 0;
+}
+
+static int
+ppc_cannot_fetch_register (int regno)
+{
+  return 0;
+}
+
+static CORE_ADDR
+ppc_get_pc (void)
+{
+  unsigned long pc;
+
+  collect_register_by_name ("pc", &pc);
+  return (CORE_ADDR) pc;
+}
+
+static void
+ppc_set_pc (CORE_ADDR pc)
+{
+  unsigned long newpc = pc;
+
+  supply_register_by_name ("pc", &newpc);
+}
+
+/* Correct in either endianness.  Note that this file is
+   for PowerPC only, not PowerPC64.
+   This instruction is "twge r2, r2", which GDB uses as a software
+   breakpoint.  */
+static const unsigned long ppc_breakpoint = 0x7d821008;
+#define ppc_breakpoint_len 4
+
+static int
+ppc_breakpoint_at (CORE_ADDR where)
+{
+  unsigned long insn;
+
+  (*the_target->read_memory) (where, (char *) &insn, 4);
+  if (insn == ppc_breakpoint)
+    return 1;
+  /* If necessary, recognize more trap instructions here.  GDB only uses the
+     one.  */
+  return 0;
+}
+
+static void
+ppc_fill_gregset (void *buf)
+{
+  int i;
+
+  for (i = 0; i < ppc_num_regs; i++)
+	if (ppc_regmap[i] != -1)
+		collect_register (i, ((char *) buf) + ppc_regmap[i]);
+
+}
+
+static void
+ppc_store_gregset (const void *buf)
+{
+  int i;
+
+  for (i = 0; i < ppc_num_regs; i++)
+	if (ppc_regmap[i] != -1)
+		supply_register (i, ((char *) buf) + ppc_regmap[i]);
+
+}
+
+struct regset_info target_regsets[] = {
+  { PT_GETREGS, PT_SETREGS, sizeof (struct reg),
+    GENERAL_REGS,
+    ppc_fill_gregset, ppc_store_gregset },
+  { 0, 0, -1, -1, NULL, NULL }
+};
+
+struct fbsd_target_ops the_low_target = {
+  ppc_num_regs,
+  ppc_regmap,
+  ppc_cannot_fetch_register,
+  ppc_cannot_store_register,
+  ppc_get_pc,
+  ppc_set_pc,
+  (const char *) &ppc_breakpoint,
+  ppc_breakpoint_len,
+  NULL,
+  0,
+  ppc_breakpoint_at,
+};

Copied: user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-amd64.c (from r206631, head/gnu/usr.bin/gdb/gdbserver/reg-amd64.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-amd64.c	Wed Apr 14 21:46:22 2010	(r206634, copy of r206631, head/gnu/usr.bin/gdb/gdbserver/reg-amd64.c)
@@ -0,0 +1,99 @@
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
+/* A register protocol for GDB, the GNU debugger.
+   Copyright 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.  */
+
+/* This file was created with the aid of ``regdat.sh'' and ``../../../../contrib/gdb/gdb/regformats/reg-x86-64.dat''.  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "regdef.h"
+#include "regcache.h"
+
+struct reg regs_x86_64[] = {
+  { "rax", 0, 64 },
+  { "rbx", 64, 64 },
+  { "rcx", 128, 64 },
+  { "rdx", 192, 64 },
+  { "rsi", 256, 64 },
+  { "rdi", 320, 64 },
+  { "rbp", 384, 64 },
+  { "rsp", 448, 64 },
+  { "r8", 512, 64 },
+  { "r9", 576, 64 },
+  { "r10", 640, 64 },
+  { "r11", 704, 64 },
+  { "r12", 768, 64 },
+  { "r13", 832, 64 },
+  { "r14", 896, 64 },
+  { "r15", 960, 64 },
+  { "rip", 1024, 64 },
+  { "eflags", 1088, 32 },
+  { "cs", 1120, 32 },
+  { "ss", 1152, 32 },
+  { "ds", 1184, 32 },
+  { "es", 1216, 32 },
+  { "fs", 1248, 32 },
+  { "gs", 1280, 32 },
+  { "st0", 1312, 80 },
+  { "st1", 1392, 80 },
+  { "st2", 1472, 80 },
+  { "st3", 1552, 80 },
+  { "st4", 1632, 80 },
+  { "st5", 1712, 80 },
+  { "st6", 1792, 80 },
+  { "st7", 1872, 80 },
+  { "fctrl", 1952, 32 },
+  { "fstat", 1984, 32 },
+  { "ftag", 2016, 32 },
+  { "fiseg", 2048, 32 },
+  { "fioff", 2080, 32 },
+  { "foseg", 2112, 32 },
+  { "fooff", 2144, 32 },
+  { "fop", 2176, 32 },
+  { "xmm0", 2208, 128 },
+  { "xmm1", 2336, 128 },
+  { "xmm2", 2464, 128 },
+  { "xmm3", 2592, 128 },
+  { "xmm4", 2720, 128 },
+  { "xmm5", 2848, 128 },
+  { "xmm6", 2976, 128 },
+  { "xmm7", 3104, 128 },
+  { "xmm8", 3232, 128 },
+  { "xmm9", 3360, 128 },
+  { "xmm10", 3488, 128 },
+  { "xmm11", 3616, 128 },
+  { "xmm12", 3744, 128 },
+  { "xmm13", 3872, 128 },
+  { "xmm14", 4000, 128 },
+  { "xmm15", 4128, 128 },
+  { "mxcsr", 4256, 32 },
+};
+
+const char *expedite_regs_x86_64[] = { "rbp", "rsp", "rip", 0 };
+
+void
+init_registers ()
+{
+    set_register_cache (regs_x86_64,
+			sizeof (regs_x86_64) / sizeof (regs_x86_64[0]));
+    gdbserver_expedite_regs = expedite_regs_x86_64;
+}

Copied: user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c (from r206631, head/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c	Wed Apr 14 21:46:22 2010	(r206634, copy of r206631, head/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c)
@@ -0,0 +1,113 @@
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
+/* A register protocol for GDB, the GNU debugger.
+   Copyright 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.  */
+
+/* This file was created with the aid of ``regdat.sh'' and ``../../../../contrib/gdb/gdb/regformats/reg-ppc.dat''.  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "regdef.h"
+#include "regcache.h"
+
+struct reg regs_ppc[] = {
+  { "r0", 0, 32 },
+  { "r1", 32, 32 },
+  { "r2", 64, 32 },
+  { "r3", 96, 32 },
+  { "r4", 128, 32 },
+  { "r5", 160, 32 },
+  { "r6", 192, 32 },
+  { "r7", 224, 32 },
+  { "r8", 256, 32 },
+  { "r9", 288, 32 },
+  { "r10", 320, 32 },
+  { "r11", 352, 32 },
+  { "r12", 384, 32 },
+  { "r13", 416, 32 },
+  { "r14", 448, 32 },
+  { "r15", 480, 32 },
+  { "r16", 512, 32 },
+  { "r17", 544, 32 },
+  { "r18", 576, 32 },
+  { "r19", 608, 32 },
+  { "r20", 640, 32 },
+  { "r21", 672, 32 },
+  { "r22", 704, 32 },
+  { "r23", 736, 32 },
+  { "r24", 768, 32 },
+  { "r25", 800, 32 },
+  { "r26", 832, 32 },
+  { "r27", 864, 32 },
+  { "r28", 896, 32 },
+  { "r29", 928, 32 },
+  { "r30", 960, 32 },
+  { "r31", 992, 32 },
+  { "f0", 1024, 64 },
+  { "f1", 1088, 64 },
+  { "f2", 1152, 64 },
+  { "f3", 1216, 64 },
+  { "f4", 1280, 64 },
+  { "f5", 1344, 64 },
+  { "f6", 1408, 64 },
+  { "f7", 1472, 64 },
+  { "f8", 1536, 64 },
+  { "f9", 1600, 64 },
+  { "f10", 1664, 64 },
+  { "f11", 1728, 64 },
+  { "f12", 1792, 64 },
+  { "f13", 1856, 64 },
+  { "f14", 1920, 64 },
+  { "f15", 1984, 64 },
+  { "f16", 2048, 64 },
+  { "f17", 2112, 64 },
+  { "f18", 2176, 64 },
+  { "f19", 2240, 64 },
+  { "f20", 2304, 64 },
+  { "f21", 2368, 64 },
+  { "f22", 2432, 64 },
+  { "f23", 2496, 64 },
+  { "f24", 2560, 64 },
+  { "f25", 2624, 64 },
+  { "f26", 2688, 64 },
+  { "f27", 2752, 64 },
+  { "f28", 2816, 64 },
+  { "f29", 2880, 64 },
+  { "f30", 2944, 64 },
+  { "f31", 3008, 64 },
+  { "pc", 3072, 32 },
+  { "ps", 3104, 32 },
+  { "cr", 3136, 32 },
+  { "lr", 3168, 32 },
+  { "ctr", 3200, 32 },
+  { "xer", 3232, 32 },
+  { "fpscr", 3264, 32 },
+};
+
+const char *expedite_regs_ppc[] = { "r1", "pc", 0 };
+
+void

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

More information about the svn-src-user mailing list