svn commit: r217654 - in projects/binutils-2.17: bin/sh contrib/groff/tmac contrib/top etc/mtree gnu/usr.bin/dialog gnu/usr.bin/groff/tmac lib/libc/sys lib/libfetch lib/libjail sbin/sysctl share/ex...

Dimitry Andric dim at FreeBSD.org
Thu Jan 20 19:20:11 UTC 2011 

Author: dim
Date: Thu Jan 20 19:20:10 2011
New Revision: 217654
URL: http://svn.freebsd.org/changeset/base/217654

Log:
  Sync: merge r217434 through r217651 from ^/head.

Added:
  projects/binutils-2.17/share/man/man4/rgephy.4
     - copied unchanged from r217651, head/share/man/man4/rgephy.4
  projects/binutils-2.17/sys/conf/ldscript.mips.octeon1
     - copied unchanged from r217651, head/sys/conf/ldscript.mips.octeon1
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_diagcodes.h
     - copied unchanged from r217651, head/sys/dev/ath/ath_hal/ah_diagcodes.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar9001/
     - copied from r217651, head/sys/dev/ath/ath_hal/ar9001/
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar9002/
     - copied from r217651, head/sys/dev/ath/ath_hal/ar9002/
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar9003/
     - copied from r217651, head/sys/dev/ath/ath_hal/ar9003/
  projects/binutils-2.17/tools/regression/bin/sh/builtins/trap5.0
     - copied unchanged from r217651, head/tools/regression/bin/sh/builtins/trap5.0
  projects/binutils-2.17/tools/regression/bin/sh/builtins/trap6.0
     - copied unchanged from r217651, head/tools/regression/bin/sh/builtins/trap6.0
  projects/binutils-2.17/tools/regression/bin/sh/execution/killed1.0
     - copied unchanged from r217651, head/tools/regression/bin/sh/execution/killed1.0
Deleted:
  projects/binutils-2.17/sys/conf/ldscript.mips.64
  projects/binutils-2.17/sys/conf/ldscript.mips.n32
  projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.32
  projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.64
  projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.n32
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9160.ini
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.ini
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini
  projects/binutils-2.17/sys/netinet/sctp_cc_functions.h
Modified:
  projects/binutils-2.17/bin/sh/jobs.c
  projects/binutils-2.17/bin/sh/sh.1
  projects/binutils-2.17/bin/sh/trap.c
  projects/binutils-2.17/contrib/groff/tmac/doc-common
  projects/binutils-2.17/contrib/groff/tmac/doc-syms
  projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man
  projects/binutils-2.17/etc/mtree/README
  projects/binutils-2.17/gnu/usr.bin/dialog/Makefile
  projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local
  projects/binutils-2.17/lib/libc/sys/mknod.2
  projects/binutils-2.17/lib/libfetch/ftp.c
  projects/binutils-2.17/lib/libjail/jail.c
  projects/binutils-2.17/sbin/sysctl/sysctl.8
  projects/binutils-2.17/sbin/sysctl/sysctl.c
  projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/binutils-2.17/share/man/man4/Makefile
  projects/binutils-2.17/share/man/man4/axe.4
  projects/binutils-2.17/share/man/man4/miibus.4
  projects/binutils-2.17/share/man/man4/nfe.4
  projects/binutils-2.17/share/man/man4/nve.4
  projects/binutils-2.17/share/man/man4/re.4
  projects/binutils-2.17/share/man/man4/sge.4
  projects/binutils-2.17/share/man/man5/xfs.5
  projects/binutils-2.17/share/man/man9/Makefile
  projects/binutils-2.17/share/man/man9/sleep.9
  projects/binutils-2.17/share/man/man9/sysctl.9
  projects/binutils-2.17/share/misc/bsd-family-tree
  projects/binutils-2.17/share/misc/committers-doc.dot
  projects/binutils-2.17/sys/amd64/amd64/amd64_mem.c
  projects/binutils-2.17/sys/amd64/amd64/machdep.c
  projects/binutils-2.17/sys/amd64/amd64/mem.c
  projects/binutils-2.17/sys/amd64/amd64/sys_machdep.c
  projects/binutils-2.17/sys/amd64/include/memdev.h
  projects/binutils-2.17/sys/arm/arm/mem.c
  projects/binutils-2.17/sys/arm/arm/vm_machdep.c
  projects/binutils-2.17/sys/arm/include/memdev.h
  projects/binutils-2.17/sys/boot/forth/beastie.4th
  projects/binutils-2.17/sys/cam/ata/ata_xpt.c
  projects/binutils-2.17/sys/cam/scsi/scsi_da.c
  projects/binutils-2.17/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
  projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/binutils-2.17/sys/compat/linux/linux_file.c
  projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c
  projects/binutils-2.17/sys/conf/files
  projects/binutils-2.17/sys/conf/files.amd64
  projects/binutils-2.17/sys/conf/files.i386
  projects/binutils-2.17/sys/conf/files.pc98
  projects/binutils-2.17/sys/conf/files.powerpc
  projects/binutils-2.17/sys/conf/ldscript.mips.mips64   (contents, props changed)
  projects/binutils-2.17/sys/conf/options
  projects/binutils-2.17/sys/dev/acpi_support/acpi_ibm.c
  projects/binutils-2.17/sys/dev/acpi_support/atk0110.c
  projects/binutils-2.17/sys/dev/acpica/acpi_pci.c
  projects/binutils-2.17/sys/dev/acpica/acpi_video.c
  projects/binutils-2.17/sys/dev/alc/if_alc.c
  projects/binutils-2.17/sys/dev/alc/if_alcreg.h
  projects/binutils-2.17/sys/dev/ale/if_ale.c
  projects/binutils-2.17/sys/dev/ale/if_alevar.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_devid.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom_v14.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom_v14.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ah_internal.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  projects/binutils-2.17/sys/dev/ath/ath_rate/sample/sample.c
  projects/binutils-2.17/sys/dev/ath/ath_rate/sample/sample.h
  projects/binutils-2.17/sys/dev/ath/if_ath.c
  projects/binutils-2.17/sys/dev/ath/if_athvar.h
  projects/binutils-2.17/sys/dev/buslogic/bt.c
  projects/binutils-2.17/sys/dev/bwi/if_bwi.c
  projects/binutils-2.17/sys/dev/bwn/if_bwn.c
  projects/binutils-2.17/sys/dev/cs/if_cs.c
  projects/binutils-2.17/sys/dev/cxgb/cxgb_sge.c
  projects/binutils-2.17/sys/dev/e1000/if_em.c
  projects/binutils-2.17/sys/dev/e1000/if_igb.c
  projects/binutils-2.17/sys/dev/e1000/if_lem.c
  projects/binutils-2.17/sys/dev/en/midway.c
  projects/binutils-2.17/sys/dev/fatm/if_fatm.c
  projects/binutils-2.17/sys/dev/iicbus/ds1775.c
  projects/binutils-2.17/sys/dev/iicbus/max6690.c
  projects/binutils-2.17/sys/dev/iscsi/initiator/isc_sm.c
  projects/binutils-2.17/sys/dev/iwn/if_iwn.c
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe.c
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe.h
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_82599.c
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_api.h
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_common.c
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_common.h
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_mbx.c
  projects/binutils-2.17/sys/dev/ixgbe/ixgbe_type.h
  projects/binutils-2.17/sys/dev/md/md.c
  projects/binutils-2.17/sys/dev/mem/memdev.c
  projects/binutils-2.17/sys/dev/mem/memutil.c
  projects/binutils-2.17/sys/dev/mmc/mmc.c
  projects/binutils-2.17/sys/dev/msk/if_msk.c
  projects/binutils-2.17/sys/dev/patm/if_patm_attach.c
  projects/binutils-2.17/sys/dev/ral/rt2560.c
  projects/binutils-2.17/sys/dev/ral/rt2661.c
  projects/binutils-2.17/sys/dev/re/if_re.c
  projects/binutils-2.17/sys/dev/sis/if_sis.c
  projects/binutils-2.17/sys/dev/uart/uart_bus_fdt.c
  projects/binutils-2.17/sys/dev/usb/controller/usb_controller.c
  projects/binutils-2.17/sys/dev/usb/net/usb_ethernet.c
  projects/binutils-2.17/sys/dev/usb/serial/u3g.c
  projects/binutils-2.17/sys/dev/usb/usb_freebsd.h
  projects/binutils-2.17/sys/dev/usb/usb_transfer.c
  projects/binutils-2.17/sys/dev/usb/usbdevs
  projects/binutils-2.17/sys/dev/usb/wlan/if_rum.c
  projects/binutils-2.17/sys/dev/usb/wlan/if_run.c
  projects/binutils-2.17/sys/dev/usb/wlan/if_ural.c
  projects/binutils-2.17/sys/dev/wi/if_wi.c
  projects/binutils-2.17/sys/dev/wpi/if_wpi.c
  projects/binutils-2.17/sys/dev/xen/netback/netback.c
  projects/binutils-2.17/sys/fs/ext2fs/ext2_alloc.c
  projects/binutils-2.17/sys/fs/ext2fs/ext2_dinode.h
  projects/binutils-2.17/sys/fs/ext2fs/ext2_lookup.c
  projects/binutils-2.17/sys/fs/ext2fs/ext2_subr.c
  projects/binutils-2.17/sys/fs/ext2fs/ext2_vfsops.c
  projects/binutils-2.17/sys/fs/ext2fs/ext2fs.h
  projects/binutils-2.17/sys/fs/ext2fs/inode.h
  projects/binutils-2.17/sys/fs/nfs/nfs_commonsubs.c
  projects/binutils-2.17/sys/fs/tmpfs/tmpfs_subr.c
  projects/binutils-2.17/sys/fs/tmpfs/tmpfs_vnops.c
  projects/binutils-2.17/sys/geom/part/g_part_gpt.c
  projects/binutils-2.17/sys/i386/i386/i686_mem.c
  projects/binutils-2.17/sys/i386/i386/machdep.c
  projects/binutils-2.17/sys/i386/i386/mem.c
  projects/binutils-2.17/sys/i386/i386/sys_machdep.c
  projects/binutils-2.17/sys/i386/i386/vm86bios.s
  projects/binutils-2.17/sys/i386/i386/vm_machdep.c
  projects/binutils-2.17/sys/i386/include/memdev.h
  projects/binutils-2.17/sys/ia64/ia64/mem.c
  projects/binutils-2.17/sys/ia64/include/memdev.h
  projects/binutils-2.17/sys/kern/kern_linker.c
  projects/binutils-2.17/sys/kern/kern_sysctl.c
  projects/binutils-2.17/sys/kern/kern_tc.c
  projects/binutils-2.17/sys/kern/subr_bus.c
  projects/binutils-2.17/sys/kern/sysv_msg.c
  projects/binutils-2.17/sys/kern/sysv_sem.c
  projects/binutils-2.17/sys/kern/sysv_shm.c
  projects/binutils-2.17/sys/kern/uipc_usrreq.c
  projects/binutils-2.17/sys/kern/vfs_subr.c
  projects/binutils-2.17/sys/mips/cavium/cryptocteon/cavium_crypto.c
  projects/binutils-2.17/sys/mips/cavium/octeon_machdep.c
  projects/binutils-2.17/sys/mips/cavium/uart_bus_octeonusart.c
  projects/binutils-2.17/sys/mips/conf/MALTA64
  projects/binutils-2.17/sys/mips/conf/OCTEON1
  projects/binutils-2.17/sys/mips/conf/XLR
  projects/binutils-2.17/sys/mips/conf/XLR64
  projects/binutils-2.17/sys/mips/conf/XLRN32
  projects/binutils-2.17/sys/mips/include/memdev.h
  projects/binutils-2.17/sys/mips/mips/machdep.c
  projects/binutils-2.17/sys/mips/mips/mem.c
  projects/binutils-2.17/sys/mips/mips/tick.c
  projects/binutils-2.17/sys/mips/mips/vm_machdep.c
  projects/binutils-2.17/sys/mips/rmi/pic.h
  projects/binutils-2.17/sys/mips/rmi/std.xlr
  projects/binutils-2.17/sys/mips/rmi/tick.c
  projects/binutils-2.17/sys/mips/rmi/xlr_machdep.c
  projects/binutils-2.17/sys/mips/rmi/xlr_pci.c
  projects/binutils-2.17/sys/modules/ath/Makefile
  projects/binutils-2.17/sys/modules/mem/Makefile
  projects/binutils-2.17/sys/net/if_enc.c
  projects/binutils-2.17/sys/net/vnet.h
  projects/binutils-2.17/sys/net80211/ieee80211_freebsd.c
  projects/binutils-2.17/sys/net80211/ieee80211_mesh.c
  projects/binutils-2.17/sys/net80211/ieee80211_node.c
  projects/binutils-2.17/sys/netinet/ip_divert.c
  projects/binutils-2.17/sys/netinet/raw_ip.c
  projects/binutils-2.17/sys/netinet/sctp_cc_functions.c
  projects/binutils-2.17/sys/netinet/sctp_constants.h
  projects/binutils-2.17/sys/netinet/sctp_pcb.c
  projects/binutils-2.17/sys/netinet/sctp_sysctl.c
  projects/binutils-2.17/sys/netinet/sctp_uio.h
  projects/binutils-2.17/sys/netinet/sctp_usrreq.c
  projects/binutils-2.17/sys/netinet/sctputil.c
  projects/binutils-2.17/sys/netinet/tcp_reass.c
  projects/binutils-2.17/sys/netinet/tcp_subr.c
  projects/binutils-2.17/sys/netinet/udp_usrreq.c
  projects/binutils-2.17/sys/pc98/pc98/machdep.c
  projects/binutils-2.17/sys/pci/if_rlreg.h
  projects/binutils-2.17/sys/powerpc/aim/slb.c
  projects/binutils-2.17/sys/powerpc/aim/vm_machdep.c
  projects/binutils-2.17/sys/powerpc/booke/machdep.c
  projects/binutils-2.17/sys/powerpc/booke/platform_bare.c
  projects/binutils-2.17/sys/powerpc/booke/vm_machdep.c
  projects/binutils-2.17/sys/powerpc/include/memdev.h
  projects/binutils-2.17/sys/powerpc/include/metadata.h
  projects/binutils-2.17/sys/powerpc/powermac/cpcht.c
  projects/binutils-2.17/sys/powerpc/powerpc/mem.c
  projects/binutils-2.17/sys/sparc64/include/memdev.h
  projects/binutils-2.17/sys/sparc64/sparc64/exception.S
  projects/binutils-2.17/sys/sparc64/sparc64/mem.c
  projects/binutils-2.17/sys/sparc64/sparc64/pmap.c
  projects/binutils-2.17/sys/sparc64/sparc64/vm_machdep.c
  projects/binutils-2.17/sys/sun4v/include/memdev.h
  projects/binutils-2.17/sys/sys/memrange.h
  projects/binutils-2.17/sys/sys/sysctl.h
  projects/binutils-2.17/sys/vm/device_pager.c
  projects/binutils-2.17/sys/vm/pmap.h
  projects/binutils-2.17/sys/vm/sg_pager.c
  projects/binutils-2.17/sys/vm/swap_pager.c
  projects/binutils-2.17/sys/vm/vm_fault.c
  projects/binutils-2.17/sys/vm/vm_object.c
  projects/binutils-2.17/sys/vm/vm_page.c
  projects/binutils-2.17/sys/vm/vm_page.h
  projects/binutils-2.17/sys/vm/vm_pageout.c
  projects/binutils-2.17/sys/vm/vm_pager.c
  projects/binutils-2.17/sys/vm/vm_pager.h
  projects/binutils-2.17/sys/vm/vm_phys.c
  projects/binutils-2.17/sys/x86/x86/tsc.c
  projects/binutils-2.17/sys/xen/xenbus/xenbusb.c
  projects/binutils-2.17/tools/tools/sysbuild/sysbuild.sh
  projects/binutils-2.17/usr.bin/netstat/if.c
  projects/binutils-2.17/usr.bin/netstat/netstat.h
  projects/binutils-2.17/usr.bin/netstat/route.c
  projects/binutils-2.17/usr.bin/unifdef/unifdef.c
  projects/binutils-2.17/usr.sbin/sysinstall/install.c
  projects/binutils-2.17/usr.sbin/sysinstall/menus.c
  projects/binutils-2.17/usr.sbin/syslogd/syslogd.c
Directory Properties:
  projects/binutils-2.17/   (props changed)
  projects/binutils-2.17/cddl/contrib/opensolaris/   (props changed)
  projects/binutils-2.17/contrib/bind9/   (props changed)
  projects/binutils-2.17/contrib/binutils/   (props changed)
  projects/binutils-2.17/contrib/bzip2/   (props changed)
  projects/binutils-2.17/contrib/dialog/   (props changed)
  projects/binutils-2.17/contrib/ee/   (props changed)
  projects/binutils-2.17/contrib/expat/   (props changed)
  projects/binutils-2.17/contrib/file/   (props changed)
  projects/binutils-2.17/contrib/gdb/   (props changed)
  projects/binutils-2.17/contrib/gdtoa/   (props changed)
  projects/binutils-2.17/contrib/gnu-sort/   (props changed)
  projects/binutils-2.17/contrib/groff/   (props changed)
  projects/binutils-2.17/contrib/less/   (props changed)
  projects/binutils-2.17/contrib/libpcap/   (props changed)
  projects/binutils-2.17/contrib/llvm/   (props changed)
  projects/binutils-2.17/contrib/llvm/tools/clang/   (props changed)
  projects/binutils-2.17/contrib/ncurses/   (props changed)
  projects/binutils-2.17/contrib/netcat/   (props changed)
  projects/binutils-2.17/contrib/ntp/   (props changed)
  projects/binutils-2.17/contrib/one-true-awk/   (props changed)
  projects/binutils-2.17/contrib/openbsm/   (props changed)
  projects/binutils-2.17/contrib/openpam/   (props changed)
  projects/binutils-2.17/contrib/pf/   (props changed)
  projects/binutils-2.17/contrib/sendmail/   (props changed)
  projects/binutils-2.17/contrib/tcpdump/   (props changed)
  projects/binutils-2.17/contrib/tcsh/   (props changed)
  projects/binutils-2.17/contrib/top/   (props changed)
  projects/binutils-2.17/contrib/top/install-sh   (props changed)
  projects/binutils-2.17/contrib/tzcode/stdtime/   (props changed)
  projects/binutils-2.17/contrib/tzcode/zic/   (props changed)
  projects/binutils-2.17/contrib/tzdata/   (props changed)
  projects/binutils-2.17/contrib/wpa/   (props changed)
  projects/binutils-2.17/contrib/xz/   (props changed)
  projects/binutils-2.17/crypto/openssh/   (props changed)
  projects/binutils-2.17/crypto/openssl/   (props changed)
  projects/binutils-2.17/lib/libc/   (props changed)
  projects/binutils-2.17/lib/libc/stdtime/   (props changed)
  projects/binutils-2.17/lib/libutil/   (props changed)
  projects/binutils-2.17/lib/libz/   (props changed)
  projects/binutils-2.17/sbin/   (props changed)
  projects/binutils-2.17/sbin/ipfw/   (props changed)
  projects/binutils-2.17/share/mk/bsd.arch.inc.mk   (props changed)
  projects/binutils-2.17/share/zoneinfo/   (props changed)
  projects/binutils-2.17/sys/   (props changed)
  projects/binutils-2.17/sys/amd64/include/xen/   (props changed)
  projects/binutils-2.17/sys/cddl/contrib/opensolaris/   (props changed)
  projects/binutils-2.17/sys/contrib/dev/acpica/   (props changed)
  projects/binutils-2.17/sys/contrib/octeon-sdk/   (props changed)
  projects/binutils-2.17/sys/contrib/pf/   (props changed)
  projects/binutils-2.17/sys/contrib/x86emu/   (props changed)
  projects/binutils-2.17/usr.bin/calendar/   (props changed)
  projects/binutils-2.17/usr.bin/csup/   (props changed)
  projects/binutils-2.17/usr.bin/procstat/   (props changed)
  projects/binutils-2.17/usr.sbin/zic/   (props changed)

Modified: projects/binutils-2.17/bin/sh/jobs.c
==============================================================================
--- projects/binutils-2.17/bin/sh/jobs.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/bin/sh/jobs.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -1062,6 +1062,7 @@ dowait(int block, struct job *job)
 			if (coredump)
 				out1str(" (core dumped)");
 			out1c('\n');
+			flushout(out1);
 		}
 	} else {
 		TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job));

Modified: projects/binutils-2.17/bin/sh/sh.1
==============================================================================
--- projects/binutils-2.17/bin/sh/sh.1	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/bin/sh/sh.1	Thu Jan 20 19:20:10 2011	(r217654)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2010
+.Dd January 16, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1848,7 +1848,12 @@ If
 .Ar exitstatus
 is given
 it is used as the exit status of the shell;
-otherwise the exit status of the preceding command is used.
+otherwise, if the shell is executing an
+.Cm EXIT
+trap, the exit status of the last command before the trap is used;
+if the shell is executing a trap for a signal,
+the shell exits by resending the signal to itself;
+otherwise, the exit status of the preceding command is used.
 The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p

Modified: projects/binutils-2.17/bin/sh/trap.c
==============================================================================
--- projects/binutils-2.17/bin/sh/trap.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/bin/sh/trap.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -79,6 +79,7 @@ static volatile sig_atomic_t gotsig[NSIG
 				/* indicates specified signal received */
 static int ignore_sigchld;	/* Used while handling SIGCHLD traps. */
 volatile sig_atomic_t gotwinch;
+static int last_trapsig;
 
 static int exiting;		/* exitshell() has been called */
 static int exiting_exitstatus;	/* value passed to exitshell() */
@@ -153,8 +154,18 @@ trapcmd(int argc, char **argv)
 	char *action;
 	int signo;
 	int errors = 0;
+	int i;
+
+	while ((i = nextopt("l")) != '\0') {
+		switch (i) {
+		case 'l':
+			printsignals();
+			return (0);
+		}
+	}
+	argv = argptr;
 
-	if (argc <= 1) {
+	if (*argv == NULL) {
 		for (signo = 0 ; signo < sys_nsig ; signo++) {
 			if (signo < NSIG && trap[signo] != NULL) {
 				out1str("trap -- ");
@@ -171,19 +182,12 @@ trapcmd(int argc, char **argv)
 		return 0;
 	}
 	action = NULL;
-	if (*++argv && strcmp(*argv, "--") == 0)
-		argv++;
 	if (*argv && sigstring_to_signum(*argv) == -1) {
-		if ((*argv)[0] != '-') {
-			action = *argv;
+		if (strcmp(*argv, "-") == 0)
 			argv++;
-		} else if ((*argv)[1] == '\0') {
+		else {
+			action = *argv;
 			argv++;
-		} else if ((*argv)[1] == 'l' && (*argv)[2] == '\0') {
-			printsignals();
-			return 0;
-		} else {
-			error("bad option %s", *argv);
 		}
 	}
 	while (*argv) {
@@ -438,6 +442,7 @@ dotrap(void)
 					 */
 					if (i == SIGCHLD)
 						ignore_sigchld++;
+					last_trapsig = i;
 					savestatus = exitstatus;
 					evalstring(trap[i], 0);
 					exitstatus = savestatus;
@@ -492,9 +497,16 @@ exitshell_savedstatus(void)
 {
 	struct jmploc loc1, loc2;
 	char *p;
+	int sig = 0;
+	sigset_t sigs;
 
-	if (!exiting)
-		exiting_exitstatus = oexitstatus;
+	if (!exiting) {
+		if (in_dotrap && last_trapsig) {
+			sig = last_trapsig;
+			exiting_exitstatus = sig + 128;
+		} else
+			exiting_exitstatus = oexitstatus;
+	}
 	exitstatus = oexitstatus = exiting_exitstatus;
 	if (setjmp(loc1.loc)) {
 		goto l1;
@@ -512,5 +524,15 @@ l1:   handler = &loc2;			/* probably unn
 #if JOBS
 	setjobctl(0);
 #endif
-l2:   _exit(exiting_exitstatus);
+l2:
+	if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
+	    sig != SIGTTOU) {
+		signal(sig, SIG_DFL);
+		sigemptyset(&sigs);
+		sigaddset(&sigs, sig);
+		sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+		kill(getpid(), sig);
+		/* If the default action is to ignore, fall back to _exit(). */
+	}
+	_exit(exiting_exitstatus);
 }

Modified: projects/binutils-2.17/contrib/groff/tmac/doc-common
==============================================================================
--- projects/binutils-2.17/contrib/groff/tmac/doc-common	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/contrib/groff/tmac/doc-common	Thu Jan 20 19:20:10 2011	(r217654)
@@ -454,6 +454,39 @@
 .ds doc-operating-system-NetBSD-3.1   3.1
 .ds doc-operating-system-NetBSD-4.0   4.0
 .ds doc-operating-system-NetBSD-4.0.1 4.0.1
+.ds doc-operating-system-NetBSD-5.0   5.0
+.ds doc-operating-system-NetBSD-5.0.1 5.0.1
+.ds doc-operating-system-NetBSD-5.0.2 5.0.2
+.
+.ds doc-operating-system-OpenBSD-2.0  2.0
+.ds doc-operating-system-OpenBSD-2.1  2.1
+.ds doc-operating-system-OpenBSD-2.2  2.2
+.ds doc-operating-system-OpenBSD-2.3  2.3
+.ds doc-operating-system-OpenBSD-2.4  2.4
+.ds doc-operating-system-OpenBSD-2.5  2.5
+.ds doc-operating-system-OpenBSD-2.6  2.6
+.ds doc-operating-system-OpenBSD-2.7  2.7
+.ds doc-operating-system-OpenBSD-2.8  2.8
+.ds doc-operating-system-OpenBSD-2.9  2.9
+.ds doc-operating-system-OpenBSD-3.0  3.0
+.ds doc-operating-system-OpenBSD-3.1  3.1
+.ds doc-operating-system-OpenBSD-3.2  3.2
+.ds doc-operating-system-OpenBSD-3.3  3.3
+.ds doc-operating-system-OpenBSD-3.4  3.4
+.ds doc-operating-system-OpenBSD-3.5  3.5
+.ds doc-operating-system-OpenBSD-3.6  3.6
+.ds doc-operating-system-OpenBSD-3.7  3.7
+.ds doc-operating-system-OpenBSD-3.8  3.8
+.ds doc-operating-system-OpenBSD-3.9  3.9
+.ds doc-operating-system-OpenBSD-4.0  4.0
+.ds doc-operating-system-OpenBSD-4.1  4.1
+.ds doc-operating-system-OpenBSD-4.2  4.2
+.ds doc-operating-system-OpenBSD-4.3  4.3
+.ds doc-operating-system-OpenBSD-4.4  4.4
+.ds doc-operating-system-OpenBSD-4.5  4.5
+.ds doc-operating-system-OpenBSD-4.6  4.6
+.ds doc-operating-system-OpenBSD-4.7  4.7
+.ds doc-operating-system-OpenBSD-4.8  4.8
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -506,6 +539,10 @@
 .ds doc-operating-system-FreeBSD-6.4     6.4
 .ds doc-operating-system-FreeBSD-7.0     7.0
 .ds doc-operating-system-FreeBSD-7.1     7.1
+.ds doc-operating-system-FreeBSD-7.2     7.2
+.ds doc-operating-system-FreeBSD-7.3     7.3
+.ds doc-operating-system-FreeBSD-8.0     8.0
+.ds doc-operating-system-FreeBSD-8.1     8.1
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0
@@ -540,6 +577,10 @@
 .ds doc-operating-system-DragonFly-1.12   1.12
 .ds doc-operating-system-DragonFly-1.12.2 1.12.2
 .ds doc-operating-system-DragonFly-2.0    2.0
+.ds doc-operating-system-DragonFly-2.2    2.2
+.ds doc-operating-system-DragonFly-2.4    2.4
+.ds doc-operating-system-DragonFly-2.6    2.6
+.ds doc-operating-system-DragonFly-2.8    2.8
 .
 .de Os
 .  ds doc-command-name
@@ -569,6 +610,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"DragonFly" \{\
+.    ds doc-operating-system DragonFly
+.    if \A\$2 \{\
+.      ie d doc-operating-system-DragonFly-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"NetBSD" \{\
 .    ds doc-operating-system NetBSD
 .    if \A\$2 \{\
@@ -577,6 +626,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"OpenBSD" \{\
+.    ds doc-operating-system OpenBSD
+.    if \A\$2 \{\
+.      ie d doc-operating-system-OpenBSD-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"Darwin" \{\
 .    ds doc-operating-system Darwin
 .    if \A\$2 \{\
@@ -589,7 +646,7 @@
 .    ds doc-operating-system \$1
 .    if !"\$2"" \
 .      as doc-operating-system " \$2
-.  \}\}\}\}\}\}
+.  \}\}\}\}\}\}\}\}
 ..
 .
 .

Modified: projects/binutils-2.17/contrib/groff/tmac/doc-syms
==============================================================================
--- projects/binutils-2.17/contrib/groff/tmac/doc-syms	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/contrib/groff/tmac/doc-syms	Thu Jan 20 19:20:10 2011	(r217654)
@@ -637,6 +637,8 @@
 .as doc-str-St--p1003.1-2001   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-2004   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004
 .as doc-str-St--p1003.1-2004   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .
 .\" POSIX Part 2: Shell and Utilities
 .ds doc-str-St--p1003.2        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2

Modified: projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man
==============================================================================
--- projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man	Thu Jan 20 19:20:10 2011	(r217654)
@@ -44,9 +44,9 @@
 .\" for an already extremely slow package.
 .\"
 .
-.Dd January 5, 2006
-.Os
+.Dd November 2, 2010
 .Dt GROFF_MDOC 7
+.Os
 .
 .
 .Sh NAME
@@ -563,8 +563,8 @@ The body of a man page is easily constru
 .Bd -literal -offset indent
 \&.\e" The following commands are required for all man pages.
 \&.Dd Month day, year
-\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Dt DOCUMENT_TITLE [section number] [architecture/volume]
+\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Sh NAME
 \&.Nm name
 \&.Nd one line description of name
@@ -600,9 +600,9 @@ The body of a man page is easily constru
 .
 The first items in the template are the commands
 .Ql .Dd ,
-.Ql .Os ,
+.Ql .Dt ,
 and
-.Ql .Dt ;
+.Ql .Os ;
 the document date, the operating system the man page or subject source is
 developed or modified for, and the man page title (in
 .Em upper case )
@@ -856,7 +856,7 @@ is the acronym for the operating system 
 the release ID.
 .
 .Bd -ragged -compact
-.Bl -tag -width ".No FreeBSD" -offset indent
+.Bl -tag -width ".No DragonFly" -offset indent
 .It ATT
 7th, 7, III, 3, V, V.2, V.3, V.4
 .It BSD
@@ -865,14 +865,19 @@ the release ID.
 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e,
 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1,
 1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0,
-4.0.1
+4.0.1, 5.0, 5.0.1, 5.0.2
 .It FreeBSD
 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0,
+8.1
+.It OpenBSD
+2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4,
+3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8
 .It DragonFly
-1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2,
+2.4, 2.6, 2.8
 .It Darwin
 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0,
 8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0
@@ -1588,7 +1593,7 @@ For example,
 .Ql ".Rv \-std atexit"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 3
@@ -1618,7 +1623,7 @@ For example,
 .Ql ".Ex \-std cat"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 1
@@ -1786,6 +1791,11 @@ When called without arguments,
 .Ql .Nm
 regurgitates this initial name for the sole purpose of making less work for
 the author.
+.Ql .Nm
+causes a line break within the
+.Sx SYNOPSIS
+section.
+.Pp
 Note: A section two or three document function name is addressed with the
 .Ql .Nm
 in the
@@ -1974,6 +1984,8 @@ Part 1: System API
 .St -p1003.1-2001
 .It Li \-p1003.1\-2004
 .St -p1003.1-2004
+.It Li \-p1003.1\-2008
+.St -p1003.1-2008
 .El
 .Pp
 .
@@ -1993,8 +2005,8 @@ Part 2: Shell and Utilities
 .Pp
 .
 X/Open
-.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .Pp
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .It Li \-susv2
 .St -susv2
 .It Li \-susv3

Modified: projects/binutils-2.17/etc/mtree/README
==============================================================================
--- projects/binutils-2.17/etc/mtree/README	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/etc/mtree/README	Thu Jan 20 19:20:10 2011	(r217654)
@@ -36,10 +36,10 @@ and keep them in good working order.
         mechanism for making better selections for these as it
         traverses the hierarchy.
 
-        The BSD.X.new file should NOT be commited, will be missing the
-        correct header, and important keywords like ``nochange''.  Simply
-        use the diff for a sanity check to make sure things are in the
-        correct order and correctly indented.
+        The BSD.X.new file should NOT be committed, as it will be missing
+        the correct header, and important keywords like ``nochange''.
+        Simply use the diff for a sanity check to make sure things are in
+        the correct order and correctly indented.
 
     e)  Further sanity checking of the system builds with DESTDIR=/someplace
         are more complicated, but can often catch missing entries in these

Modified: projects/binutils-2.17/gnu/usr.bin/dialog/Makefile
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/dialog/Makefile	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/gnu/usr.bin/dialog/Makefile	Thu Jan 20 19:20:10 2011	(r217654)
@@ -3,7 +3,7 @@
 DIALOG=	${.CURDIR}/../../../contrib/dialog
 PROG=   dialog
 
-DPADD=	$(LIBDIALOG) $(LIBNCURSES)
+DPADD=	$(LIBDIALOG) $(LIBNCURSES) $(LIBM)
 LDADD=	-ldialog -lncursesw -lm
 CFLAGS+= -I${.CURDIR} -I${DIALOG}
 .PATH:	${DIALOG}

Modified: projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local	Thu Jan 20 19:20:10 2011	(r217654)
@@ -74,17 +74,10 @@
 .ds doc-default-operating-system FreeBSD\~9.0
 .
 .\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-7.2    7.2
-.ds doc-operating-system-FreeBSD-7.3    7.3
-.ds doc-operating-system-FreeBSD-7.4    7.4
-.ds doc-operating-system-FreeBSD-8.0    8.0
-.ds doc-operating-system-FreeBSD-8.1    8.1
 .ds doc-operating-system-FreeBSD-8.2    8.2
 .ds doc-operating-system-FreeBSD-9.0    9.0
 .
 .\" Definitions not (yet) in doc-syms
-.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
-.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .
 .ec
 .

Modified: projects/binutils-2.17/lib/libc/sys/mknod.2
==============================================================================
--- projects/binutils-2.17/lib/libc/sys/mknod.2	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/lib/libc/sys/mknod.2	Thu Jan 20 19:20:10 2011	(r217654)
@@ -28,7 +28,7 @@
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd January 16, 2011
 .Dt MKNOD 2
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In unistd.h
+.In sys/stat.h
 .Ft int
 .Fn mknod "const char *path" "mode_t mode" "dev_t dev"
 .Ft int

Modified: projects/binutils-2.17/lib/libfetch/ftp.c
==============================================================================
--- projects/binutils-2.17/lib/libfetch/ftp.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/lib/libfetch/ftp.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -1132,6 +1132,7 @@ ftp_request(struct url *url, const char 
 
 	/* just a stat */
 	if (strcmp(op, "STAT") == 0) {
+		--conn->ref;
 		ftp_disconnect(conn);
 		return (FILE *)1; /* bogus return value */
 	}

Modified: projects/binutils-2.17/lib/libjail/jail.c
==============================================================================
--- projects/binutils-2.17/lib/libjail/jail.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/lib/libjail/jail.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -381,10 +381,14 @@ jailparam_import(struct jailparam *jp, c
 			((unsigned long *)jp->jp_value)[i] =
 			    strtoul(avalue, &ep, 10);
 			goto integer_test;
-		case CTLTYPE_QUAD:
+		case CTLTYPE_S64:
 			((int64_t *)jp->jp_value)[i] =
 			    strtoimax(avalue, &ep, 10);
 			goto integer_test;
+		case CTLTYPE_U64:
+			((uint64_t *)jp->jp_value)[i] =
+			    strtoumax(avalue, &ep, 10);
+			goto integer_test;
 		case CTLTYPE_STRUCT:
 			tvalue = alloca(fw + 1);
 			strlcpy(tvalue, avalue, fw + 1);
@@ -768,10 +772,14 @@ jailparam_export(struct jailparam *jp)
 			snprintf(valbuf, sizeof(valbuf), "%lu",
 			    ((unsigned long *)jp->jp_value)[i]);
 			break;
-		case CTLTYPE_QUAD:
+		case CTLTYPE_S64:
 			snprintf(valbuf, sizeof(valbuf), "%jd",
 			    (intmax_t)((int64_t *)jp->jp_value)[i]);
 			break;
+		case CTLTYPE_U64:
+			snprintf(valbuf, sizeof(valbuf), "%ju",
+			    (uintmax_t)((uint64_t *)jp->jp_value)[i]);
+			break;
 		case CTLTYPE_STRUCT:
 			switch (jp->jp_structtype) {
 			case JPS_IN_ADDR:
@@ -941,7 +949,8 @@ jailparam_type(struct jailparam *jp)
 	case CTLTYPE_ULONG:
 		jp->jp_valuelen = sizeof(long);
 		break;
-	case CTLTYPE_QUAD:
+	case CTLTYPE_S64:
+	case CTLTYPE_U64:
 		jp->jp_valuelen = sizeof(int64_t);
 		break;
 	case CTLTYPE_STRING:

Modified: projects/binutils-2.17/sbin/sysctl/sysctl.8
==============================================================================
--- projects/binutils-2.17/sbin/sysctl/sysctl.8	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/sbin/sysctl/sysctl.8	Thu Jan 20 19:20:10 2011	(r217654)
@@ -28,7 +28,7 @@
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd February 6, 2010
+.Dd January 17, 2011
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -134,9 +134,7 @@ few bytes.
 .Pp
 The information available from
 .Nm
-consists of integers, strings, devices
-.Pq Vt dev_t ,
-and opaque types.
+consists of integers, strings, and opaque types.
 The
 .Nm
 utility
@@ -165,17 +163,8 @@ For a detailed description of these vari
 .Pp
 The changeable column indicates whether a process with appropriate
 privilege can change the value.
-String, integer, and devices values can be set using
+String and integer values can be set using
 .Nm .
-For device values,
-.Ar value
-can be specified as a character device special file name.
-Special values
-.Cm off
-and
-.Cm none
-denote
-.Dq no device .
 .Bl -column security.bsd.unprivileged_read_msgbuf integerxxx
 .It Sy "Name	Type	Changeable
 .It "kern.ostype	string	no
@@ -220,7 +209,6 @@ denote
 .It "hw.floatingpoint	integer	no
 .It "hw.machine_arch	string	no
 .It "hw.realmem	integer	no
-.It "machdep.console_device	dev_t	no
 .It "machdep.adjkerntz	integer	yes
 .It "machdep.disable_rtc_set	integer	yes
 .It "machdep.guessed_bootdev	string	no

Modified: projects/binutils-2.17/sbin/sysctl/sysctl.c
==============================================================================
--- projects/binutils-2.17/sbin/sysctl/sysctl.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/sbin/sysctl/sysctl.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -67,7 +67,6 @@ static int	show_var(int *, int);
 static int	sysctl_all(int *oid, int len);
 static int	name2oid(char *, int *);
 
-static void	set_T_dev_t(char *, void **, size_t *);
 static int	set_IK(const char *, int *);
 
 static void
@@ -171,7 +170,8 @@ parse(char *string)
 	long longval;
 	unsigned long ulongval;
 	size_t newsize = 0;
-	quad_t quadval;
+	int64_t i64val;
+	uint64_t u64val;
 	int mib[CTL_MAXNAME];
 	char *cp, *bufp, buf[BUFSIZ], *endptr, fmt[BUFSIZ];
 	u_int kind;
@@ -231,7 +231,8 @@ parse(char *string)
 		    (kind & CTLTYPE) == CTLTYPE_UINT ||
 		    (kind & CTLTYPE) == CTLTYPE_LONG ||
 		    (kind & CTLTYPE) == CTLTYPE_ULONG ||
-		    (kind & CTLTYPE) == CTLTYPE_QUAD) {
+		    (kind & CTLTYPE) == CTLTYPE_S64 ||
+		    (kind & CTLTYPE) == CTLTYPE_U64) {
 			if (strlen(newval) == 0)
 				errx(1, "empty numeric value");
 		}
@@ -278,19 +279,23 @@ parse(char *string)
 				break;
 			case CTLTYPE_STRING:
 				break;
-			case CTLTYPE_QUAD:
-				quadval = strtoq(newval, &endptr, 0);
+			case CTLTYPE_S64:
+				i64val = strtoimax(newval, &endptr, 0);
 				if (endptr == newval || *endptr != '\0')
-					errx(1, "invalid quad integer"
-					    " '%s'", (char *)newval);
-				newval = &quadval;
-				newsize = sizeof(quadval);
+					errx(1, "invalid int64_t '%s'",
+					    (char *)newval);
+				newval = &i64val;
+				newsize = sizeof(i64val);
+				break;
+			case CTLTYPE_U64:
+				u64val = strtoumax(newval, &endptr, 0);
+				if (endptr == newval || *endptr != '\0')
+					errx(1, "invalid uint64_t '%s'",
+					    (char *)newval);
+				newval = &u64val;
+				newsize = sizeof(u64val);
 				break;
 			case CTLTYPE_OPAQUE:
-				if (strcmp(fmt, "T,dev_t") == 0) {
-					set_T_dev_t (newval, &newval, &newsize);
-					break;
-				}
 				/* FALLTHROUGH */
 			default:
 				errx(1, "oid '%s' is type %d,"
@@ -420,40 +425,6 @@ S_vmtotal(int l2, void *p)
 }
 
 static int
-T_dev_t(int l2, void *p)
-{
-	dev_t *d = (dev_t *)p;
-
-	if (l2 != sizeof(*d)) {
-		warnx("T_dev_T %d != %zu", l2, sizeof(*d));
-		return (1);
-	}
-	printf("%s", devname(*d, S_IFCHR));
-	return (0);
-}
-
-static void
-set_T_dev_t(char *path, void **val, size_t *size)
-{
-	static struct stat statb;
-
-	if (strcmp(path, "none") && strcmp(path, "off")) {
-		int rc = stat (path, &statb);
-		if (rc) {
-			err(1, "cannot stat %s", path);
-		}
-
-		if (!S_ISCHR(statb.st_mode)) {
-			errx(1, "must specify a device special file.");
-		}
-	} else {
-		statb.st_rdev = NODEV;
-	}
-	*val = (void *) &statb.st_rdev;
-	*size = sizeof(statb.st_rdev);
-}
-
-static int
 set_IK(const char *str, int *val)
 {
 	float temp;
@@ -532,6 +503,21 @@ oidfmt(int *oid, int len, char *fmt, u_i
 	return (0);
 }
 
+static int ctl_sign[CTLTYPE+1] = {
+	[CTLTYPE_INT] = 1,
+	[CTLTYPE_LONG] = 1,
+	[CTLTYPE_S64] = 1,
+};
+
+static int ctl_size[CTLTYPE+1] = {
+	[CTLTYPE_INT] = sizeof(int),
+	[CTLTYPE_UINT] = sizeof(u_int),
+	[CTLTYPE_LONG] = sizeof(long),
+	[CTLTYPE_ULONG] = sizeof(u_long),
+	[CTLTYPE_S64] = sizeof(int64_t),
+	[CTLTYPE_U64] = sizeof(int64_t),
+};
+
 /*
  * This formats and outputs the value of one variable
  *
@@ -539,7 +525,6 @@ oidfmt(int *oid, int len, char *fmt, u_i
  * Returns one if didn't know what to do with this.
  * Return minus one if we had errors.
  */
-
 static int
 show_var(int *oid, int nlen)
 {
@@ -549,7 +534,7 @@ show_var(int *oid, int nlen)
 	int qoid[CTL_MAXNAME+2];
 	uintmax_t umv;
 	intmax_t mv;
-	int i, hexlen;
+	int i, hexlen, sign, ctltype;
 	size_t intlen;
 	size_t j, len;
 	u_int kind;
@@ -614,46 +599,51 @@ show_var(int *oid, int nlen)
 	fmt = buf;
 	oidfmt(oid, nlen, fmt, &kind);
 	p = val;
-	switch (*fmt) {
-	case 'A':
+	ctltype = (kind & CTLTYPE);
+	sign = ctl_sign[ctltype];
+	intlen = ctl_size[ctltype];
+
+	switch (ctltype) {
+	case CTLTYPE_STRING:
 		if (!nflag)
 			printf("%s%s", name, sep);
 		printf("%.*s", (int)len, p);
 		free(oval);
 		return (0);
 
-	case 'I':
-	case 'L':
-	case 'Q':
+	case CTLTYPE_INT:
+	case CTLTYPE_UINT:
+	case CTLTYPE_LONG:
+	case CTLTYPE_ULONG:
+	case CTLTYPE_S64:
+	case CTLTYPE_U64:
 		if (!nflag)
 			printf("%s%s", name, sep);
-		switch (*fmt) {
-		case 'I': intlen = sizeof(int); break;
-		case 'L': intlen = sizeof(long); break;
-		case 'Q': intlen = sizeof(quad_t); break;
-		}
 		hexlen = 2 + (intlen * CHAR_BIT + 3) / 4;
 		sep1 = "";
 		while (len >= intlen) {
-			switch (*fmt) {
-			case 'I':
+			switch (kind & CTLTYPE) {
+			case CTLTYPE_INT:
+			case CTLTYPE_UINT:
 				umv = *(u_int *)p;
 				mv = *(int *)p;
 				break;
-			case 'L':
+			case CTLTYPE_LONG:
+			case CTLTYPE_ULONG:
 				umv = *(u_long *)p;
 				mv = *(long *)p;
 				break;
-			case 'Q':
-				umv = *(u_quad_t *)p;
-				mv = *(quad_t *)p;
+			case CTLTYPE_S64:
+			case CTLTYPE_U64:
+				umv = *(uint64_t *)p;
+				mv = *(int64_t *)p;
 				break;
 			}
 			fputs(sep1, stdout);
-			if (fmt[1] == 'U')
-				printf(hflag ? "%'ju" : "%ju", umv);
-			else if (fmt[1] == 'X')
+			if (xflag)
 				printf("%#0*jx", hexlen, umv);
+			else if (!sign)
+				printf(hflag ? "%'ju" : "%ju", umv);
 			else if (fmt[1] == 'K') {
 				if (mv < 0)
 					printf("%jd", mv);
@@ -668,15 +658,7 @@ show_var(int *oid, int nlen)
 		free(oval);
 		return (0);
 
-	case 'P':
-		if (!nflag)
-			printf("%s%s", name, sep);
-		printf("%p", *(void **)p);
-		free(oval);
-		return (0);
-
-	case 'T':
-	case 'S':
+	case CTLTYPE_OPAQUE:
 		i = 0;
 		if (strcmp(fmt, "S,clockinfo") == 0)
 			func = S_clockinfo;
@@ -686,8 +668,6 @@ show_var(int *oid, int nlen)
 			func = S_loadavg;
 		else if (strcmp(fmt, "S,vmtotal") == 0)
 			func = S_vmtotal;
-		else if (strcmp(fmt, "T,dev_t") == 0)
-			func = T_dev_t;
 		else
 			func = NULL;
 		if (func) {

Modified: projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c
==============================================================================
--- projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c	Thu Jan 20 19:20:10 2011	(r217654)
@@ -100,8 +100,9 @@ load(module_t mod, int cmd, void *arg)
 			return (EINVAL);
 		}
 		SYSCTL_ADD_PROC(&clist, SYSCTL_CHILDREN(a_root1),
-		    OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
-		    sysctl_dyn_sysctl_test, "A", "I can be here, too");
+		    OID_AUTO, "procedure", CTLTYPE_STRING | CTLFLAG_RD,
+		    NULL, 0, sysctl_dyn_sysctl_test, "A",
+		    "I can be here, too");
 		printf("   (%p)	/kern		  dyn_sysctl\n", &clist);
 
 		/* Overlap second tree with the first. */

Modified: projects/binutils-2.17/share/man/man4/Makefile
==============================================================================
--- projects/binutils-2.17/share/man/man4/Makefile	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/Makefile	Thu Jan 20 19:20:10 2011	(r217654)
@@ -337,6 +337,7 @@ MAN=	aac.4 \
 	random.4 \
 	rc.4 \
 	re.4 \
+	rgephy.4 \
 	rl.4 \
 	rndtest.4 \
 	route.4 \

Modified: projects/binutils-2.17/share/man/man4/axe.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/axe.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/axe.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 20, 2008
+.Dd January 16, 2011
 .Dt AXE 4
 .Os
 .Sh NAME
@@ -206,6 +206,7 @@ The driver failed to allocate an mbuf fo
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr rgephy 4 ,
 .Xr ifconfig 8
 .Rs
 .%T "ASIX AX88172 AX88178 and AX88772 data sheets"

Modified: projects/binutils-2.17/share/man/man4/miibus.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/miibus.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/miibus.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -8,7 +8,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 30, 2010
+.Dd January 15, 2011
 .Dt MIIBUS 4
 .Os
 .Sh NAME
@@ -162,6 +162,7 @@ but as a result are not well behaved new
 .Xr nve 4 ,
 .Xr pcn 4 ,
 .Xr re 4 ,
+.Xr rgephy 4 ,
 .Xr rl 4 ,
 .Xr rue 4 ,
 .Xr sf 4 ,

Modified: projects/binutils-2.17/share/man/man4/nfe.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/nfe.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/nfe.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 2, 2008
+.Dd January, 2011
 .Dt NFE 4
 .Os
 .Sh NAME
@@ -174,6 +174,7 @@ before a change takes effect.
 .Xr netintro 4 ,
 .Xr pci 4 ,
 .Xr polling 4 ,
+.Xr rgephy 4 ,
 .Xr sysctl 8 ,
 .Xr ifconfig 8
 .Sh HISTORY

Modified: projects/binutils-2.17/share/man/man4/nve.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/nve.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/nve.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 8, 2007
+.Dd January 16, 2011
 .Dt NVE 4
 .Os
 .Sh NAME
@@ -120,6 +120,7 @@ the network connection (cable).
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr rgephy 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The

Modified: projects/binutils-2.17/share/man/man4/re.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/re.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/re.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 2, 2010
+.Dd January, 2011
 .Dt RE 4
 .Os
 .Sh NAME
@@ -213,6 +213,7 @@ the network connection (cable).
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr polling 4 ,
+.Xr rgephy 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Rs

Copied: projects/binutils-2.17/share/man/man4/rgephy.4 (from r217651, head/share/man/man4/rgephy.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/binutils-2.17/share/man/man4/rgephy.4	Thu Jan 20 19:20:10 2011	(r217654, copy of r217651, head/share/man/man4/rgephy.4)
@@ -0,0 +1,96 @@
+.\"
+.\" Copyright (c) 2011 Marius Strobl <marius at FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd January 15 2011 $
+.Dt RGEPHY 4
+.Os
+.Sh NAME
+.Nm rgephy
+.Nd RealTek RTL8168/8169/8110/8211 series 10/100/1000 Gigabit Ethernet PHY driver
+.Sh SYNOPSIS
+To compile all available PHY drivers into the kernel,
+place the following line in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device miibus"
+.Ed
+.Pp
+Alternatively, to selectively compile this driver into the kernel,
+place the following lines in your kernel configuration file instead:
+.Bd -ragged -offset indent
+.Cd "device mii"
+.Cd "device rgephy"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the RealTek RTL8168, RTL8169, RTL8110 and RTL8211 series
+integrated 10/100/1000 Gigabit Ethernet PHYs.
+.Pp
+In order to get a list of media types and options supported by a specific
+instance of the
+.Nm
+driver, run
+.Li ifconfig -m
+on the instance of its parent MAC driver.
+.Pp
+Additionally,
+the
+.Nm
+driver supports the following special media option:
+.Bl -tag -width ".Cm flag0"
+.It Cm flag0
+When manually setting media type and options via
+.Xr ifconfig 8 ,
+the
+.Nm
+driver by default also triggers an autonegotiation advertising the selected
+media.
+This is done in order to work around hardware issues in certain scenarios.
+It is believed that this behavior does not cause harm in general but in fact
+can have an adverse effect in edge cases.
+In order to manually set the media type and options without also triggering
+an autonegotiation,
+the
+.Nm
+driver allows to turn this behavior off via the
+.Cm flag0
+media option.
+.El
+.Pp
+Note that this special media option will not show up in the output of
+.Xr ifconfig 8 ,
+even when set.
+.Sh EXAMPLES
+Manually set 100BASE-TX full-duplex without also triggering an
+autonegotiation:
+.Pp
+.Dl "ifconfig re0 media 100baseTX mediaopt full-duplex,flag0"
+.Sh SEE ALSO
+.\".Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr miibus 4 ,
+.Xr ifconfig 8

Modified: projects/binutils-2.17/share/man/man4/sge.4
==============================================================================
--- projects/binutils-2.17/share/man/man4/sge.4	Thu Jan 20 19:17:05 2011	(r217653)
+++ projects/binutils-2.17/share/man/man4/sge.4	Thu Jan 20 19:20:10 2011	(r217654)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 10, 2010

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

More information about the svn-src-projects mailing list