svn commit: r294962 - in projects/clang380-import: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/bsnmp/snmp_mibII contrib/netbsd-tests/lib/libc/sys contrib/net...

Dimitry Andric dim at FreeBSD.org
Wed Jan 27 22:52:25 UTC 2016 

Author: dim
Date: Wed Jan 27 22:52:20 2016
New Revision: 294962
URL: https://svnweb.freebsd.org/changeset/base/294962

Log:
  Merge ^/head r294777 through r294960.

Added:
  projects/clang380-import/lib/libsysdecode/syscallnames.c
     - copied unchanged from r294960, head/lib/libsysdecode/syscallnames.c
  projects/clang380-import/lib/libsysdecode/sysdecode_syscallnames.3
     - copied unchanged from r294960, head/lib/libsysdecode/sysdecode_syscallnames.3
  projects/clang380-import/lib/libthr/arch/riscv/include/
     - copied from r294960, head/lib/libthr/arch/riscv/include/
  projects/clang380-import/lib/libthread_db/arch/riscv/
     - copied from r294960, head/lib/libthread_db/arch/riscv/
  projects/clang380-import/lib/msun/riscv/fenv.c
     - copied unchanged from r294960, head/lib/msun/riscv/fenv.c
  projects/clang380-import/secure/lib/libcrypto/opensslconf-riscv.h
     - copied unchanged from r294960, head/secure/lib/libcrypto/opensslconf-riscv.h
  projects/clang380-import/share/vt/fonts/gallant.hex
     - copied unchanged from r294960, head/share/vt/fonts/gallant.hex
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_iofic.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_iofic.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_serdes.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_serdes.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_serdes.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_serdes.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_serdes_internal_regs.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_serdes_internal_regs.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_serdes_regs.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_serdes_regs.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_config.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_config.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_config.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_config.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_debug.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_debug.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_debug.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_debug.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_iofic.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_iofic.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_iofic.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_iofic.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_iofic_regs.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_iofic_regs.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_main.c
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_main.c
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_regs.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_regs.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_regs_m2s.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_regs_m2s.h
  projects/clang380-import/sys/contrib/alpine-hal/al_hal_udma_regs_s2m.h
     - copied unchanged from r294960, head/sys/contrib/alpine-hal/al_hal_udma_regs_s2m.h
  projects/clang380-import/sys/contrib/alpine-hal/eth/
     - copied from r294960, head/sys/contrib/alpine-hal/eth/
  projects/clang380-import/sys/netinet/cc/cc.h
     - copied unchanged from r294960, head/sys/netinet/cc/cc.h
Deleted:
  projects/clang380-import/share/vt/fonts/gallant.fnt.uu
  projects/clang380-import/sys/netinet/tcp_cc.h
Modified:
  projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_tcp.c
  projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
  projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
  projects/clang380-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/clang380-import/crypto/openssh/FREEBSD-upgrade
  projects/clang380-import/crypto/openssh/servconf.c
  projects/clang380-import/crypto/openssh/sshd_config
  projects/clang380-import/crypto/openssh/sshd_config.5
  projects/clang380-import/etc/defaults/rc.conf
  projects/clang380-import/etc/group
  projects/clang380-import/etc/master.passwd
  projects/clang380-import/etc/rc.d/ntpd
  projects/clang380-import/gnu/lib/libgcc/Makefile
  projects/clang380-import/lib/libc/Makefile
  projects/clang380-import/lib/libc/net/Makefile.inc
  projects/clang380-import/lib/libc/sys/revoke.2
  projects/clang380-import/lib/libdevinfo/devinfo.3
  projects/clang380-import/lib/libdevinfo/devinfo.h
  projects/clang380-import/lib/libdpv/dialog_util.c
  projects/clang380-import/lib/libdpv/dialog_util.h
  projects/clang380-import/lib/libdpv/dpv.3
  projects/clang380-import/lib/libdpv/dpv.c
  projects/clang380-import/lib/libdpv/dpv.h
  projects/clang380-import/lib/libdpv/dpv_private.h
  projects/clang380-import/lib/libsysdecode/Makefile
  projects/clang380-import/lib/libsysdecode/sysdecode.3
  projects/clang380-import/lib/libsysdecode/sysdecode.h
  projects/clang380-import/libexec/rtld-elf/rtld.c
  projects/clang380-import/share/man/man9/bus_adjust_resource.9
  projects/clang380-import/share/man/man9/bus_alloc_resource.9
  projects/clang380-import/share/man/man9/bus_get_resource.9
  projects/clang380-import/share/man/man9/bus_set_resource.9
  projects/clang380-import/share/man/man9/mod_cc.9
  projects/clang380-import/share/man/man9/rman.9
  projects/clang380-import/share/misc/committers-src.dot
  projects/clang380-import/share/mk/bsd.dep.mk
  projects/clang380-import/share/mk/bsd.progs.mk
  projects/clang380-import/sys/amd64/amd64/machdep.c
  projects/clang380-import/sys/amd64/ia32/ia32_signal.c
  projects/clang380-import/sys/amd64/linux/linux_sysvec.c
  projects/clang380-import/sys/amd64/linux32/linux32_sysvec.c
  projects/clang380-import/sys/arm/arm/machdep.c
  projects/clang380-import/sys/arm/arm/nexus.c
  projects/clang380-import/sys/arm/arm/pmap-v6-new.c
  projects/clang380-import/sys/arm/arm/pmap-v6.c
  projects/clang380-import/sys/arm/arm/pmap.c
  projects/clang380-import/sys/arm/arm/trap-v6.c
  projects/clang380-import/sys/arm/at91/at91.c
  projects/clang380-import/sys/arm/cavium/cns11xx/econa.c
  projects/clang380-import/sys/arm/mv/mv_localbus.c
  projects/clang380-import/sys/arm/mv/mv_pci.c
  projects/clang380-import/sys/arm/versatile/versatile_pci.c
  projects/clang380-import/sys/arm/xscale/i8134x/i81342.c
  projects/clang380-import/sys/arm/xscale/i8134x/i81342_pci.c
  projects/clang380-import/sys/arm/xscale/i8134x/obio.c
  projects/clang380-import/sys/arm/xscale/ixp425/avila_ata.c
  projects/clang380-import/sys/arm/xscale/ixp425/ixp425.c
  projects/clang380-import/sys/arm/xscale/ixp425/ixp425_pci.c
  projects/clang380-import/sys/arm/xscale/pxa/pxa_obio.c
  projects/clang380-import/sys/arm/xscale/pxa/pxa_smi.c
  projects/clang380-import/sys/arm64/arm64/gic_v3_fdt.c
  projects/clang380-import/sys/arm64/arm64/machdep.c
  projects/clang380-import/sys/arm64/arm64/nexus.c
  projects/clang380-import/sys/arm64/arm64/vm_machdep.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.c
  projects/clang380-import/sys/boot/common/paths.h
  projects/clang380-import/sys/boot/ficl/i386/sysdep.c
  projects/clang380-import/sys/boot/i386/boot2/boot2.c
  projects/clang380-import/sys/boot/i386/gptboot/gptboot.c
  projects/clang380-import/sys/boot/i386/zfsboot/zfsboot.c
  projects/clang380-import/sys/boot/mips/beri/boot2/boot2.c
  projects/clang380-import/sys/boot/pc98/boot2/boot2.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/clang380-import/sys/compat/linuxkpi/common/include/asm/atomic.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/bitops.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/clocksource.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/completion.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/etherdevice.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/gfp.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/if_vlan.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/kernel.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/netdevice.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/notifier.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/pci.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/rcupdate.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/uaccess.h
  projects/clang380-import/sys/conf/files
  projects/clang380-import/sys/conf/kern.post.mk
  projects/clang380-import/sys/conf/kern.pre.mk
  projects/clang380-import/sys/dev/acpica/acpi.c
  projects/clang380-import/sys/dev/acpica/acpi_hpet.c
  projects/clang380-import/sys/dev/acpica/acpi_pcib_acpi.c
  projects/clang380-import/sys/dev/acpica/acpi_resource.c
  projects/clang380-import/sys/dev/acpica/acpi_timer.c
  projects/clang380-import/sys/dev/acpica/acpivar.h
  projects/clang380-import/sys/dev/advansys/adv_isa.c
  projects/clang380-import/sys/dev/ahci/ahci.c
  projects/clang380-import/sys/dev/ahci/ahci.h
  projects/clang380-import/sys/dev/ata/ata-cbus.c
  projects/clang380-import/sys/dev/ata/ata-isa.c
  projects/clang380-import/sys/dev/ata/ata-pci.c
  projects/clang380-import/sys/dev/ata/ata-pci.h
  projects/clang380-import/sys/dev/atkbdc/atkbdc_ebus.c
  projects/clang380-import/sys/dev/atkbdc/atkbdc_isa.c
  projects/clang380-import/sys/dev/atkbdc/atkbdc_subr.c
  projects/clang380-import/sys/dev/cs/if_cs.c
  projects/clang380-import/sys/dev/ctau/if_ct.c
  projects/clang380-import/sys/dev/cx/if_cx.c
  projects/clang380-import/sys/dev/cxgb/cxgb_osdep.h
  projects/clang380-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/clang380-import/sys/dev/cxgb/ulp/tom/cxgb_listen.c
  projects/clang380-import/sys/dev/cxgbe/tom/t4_connect.c
  projects/clang380-import/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang380-import/sys/dev/cxgbe/tom/t4_listen.c
  projects/clang380-import/sys/dev/cxgbe/tom/t4_tom.c
  projects/clang380-import/sys/dev/ed/if_ed_3c503.c
  projects/clang380-import/sys/dev/ed/if_ed_cbus.c
  projects/clang380-import/sys/dev/ed/if_ed_hpp.c
  projects/clang380-import/sys/dev/ed/if_ed_wd80x3.c
  projects/clang380-import/sys/dev/eisa/eisaconf.c
  projects/clang380-import/sys/dev/fdt/simplebus.c
  projects/clang380-import/sys/dev/fe/if_fe_cbus.c
  projects/clang380-import/sys/dev/fe/if_fe_isa.c
  projects/clang380-import/sys/dev/filemon/filemon.c
  projects/clang380-import/sys/dev/filemon/filemon_wrapper.c
  projects/clang380-import/sys/dev/gpio/gpiobus.c
  projects/clang380-import/sys/dev/hyperv/include/hyperv.h
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_channel.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_connection.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  projects/clang380-import/sys/dev/ixgbe/if_ix.c
  projects/clang380-import/sys/dev/ixgbe/ixgbe.h
  projects/clang380-import/sys/dev/mca/mca_bus.c
  projects/clang380-import/sys/dev/mvs/mvs_pci.c
  projects/clang380-import/sys/dev/mvs/mvs_soc.c
  projects/clang380-import/sys/dev/ncv/ncr53c500_pccard.c
  projects/clang380-import/sys/dev/nsp/nsp_pccard.c
  projects/clang380-import/sys/dev/ofw/ofw_subr.c
  projects/clang380-import/sys/dev/ofw/ofwbus.c
  projects/clang380-import/sys/dev/pccard/pccard.c
  projects/clang380-import/sys/dev/pccard/pccardvarp.h
  projects/clang380-import/sys/dev/pccbb/pccbb.c
  projects/clang380-import/sys/dev/pccbb/pccbb_pci.c
  projects/clang380-import/sys/dev/pccbb/pccbbvar.h
  projects/clang380-import/sys/dev/pcf/pcf_isa.c
  projects/clang380-import/sys/dev/pci/hostb_pci.c
  projects/clang380-import/sys/dev/pci/isa_pci.c
  projects/clang380-import/sys/dev/pci/pci.c
  projects/clang380-import/sys/dev/pci/pci_host_generic.c
  projects/clang380-import/sys/dev/pci/pci_iov.c
  projects/clang380-import/sys/dev/pci/pci_pci.c
  projects/clang380-import/sys/dev/pci/pci_private.h
  projects/clang380-import/sys/dev/pci/pci_subr.c
  projects/clang380-import/sys/dev/pci/pcib_private.h
  projects/clang380-import/sys/dev/pci/pcivar.h
  projects/clang380-import/sys/dev/pci/vga_pci.c
  projects/clang380-import/sys/dev/ppc/ppc.c
  projects/clang380-import/sys/dev/ppc/ppcvar.h
  projects/clang380-import/sys/dev/puc/puc.c
  projects/clang380-import/sys/dev/puc/puc_bfe.h
  projects/clang380-import/sys/dev/qlxgbe/ql_fw.c
  projects/clang380-import/sys/dev/qlxgbe/ql_ver.h
  projects/clang380-import/sys/dev/quicc/quicc_bfe.h
  projects/clang380-import/sys/dev/quicc/quicc_core.c
  projects/clang380-import/sys/dev/rtwn/if_rtwn.c
  projects/clang380-import/sys/dev/rtwn/if_rtwnreg.h
  projects/clang380-import/sys/dev/scc/scc_bfe.h
  projects/clang380-import/sys/dev/scc/scc_core.c
  projects/clang380-import/sys/dev/siba/siba.c
  projects/clang380-import/sys/dev/siba/siba_bwn.c
  projects/clang380-import/sys/dev/siba/siba_pcib.c
  projects/clang380-import/sys/dev/siis/siis.c
  projects/clang380-import/sys/dev/snc/if_snc_cbus.c
  projects/clang380-import/sys/dev/sound/isa/gusc.c
  projects/clang380-import/sys/dev/sound/isa/sbc.c
  projects/clang380-import/sys/dev/sound/pci/csa.c
  projects/clang380-import/sys/dev/sound/pci/fm801.c
  projects/clang380-import/sys/dev/sound/pci/vibes.c
  projects/clang380-import/sys/dev/stg/tmc18c30_subr.c
  projects/clang380-import/sys/dev/wl/if_wl.c
  projects/clang380-import/sys/i386/i386/machdep.c
  projects/clang380-import/sys/i386/linux/linux_sysvec.c
  projects/clang380-import/sys/i386/svr4/svr4_machdep.c
  projects/clang380-import/sys/isa/isa_common.c
  projects/clang380-import/sys/isa/isa_common.h
  projects/clang380-import/sys/kern/bus_if.m
  projects/clang380-import/sys/kern/kern_ktrace.c
  projects/clang380-import/sys/kern/kern_rctl.c
  projects/clang380-import/sys/kern/subr_bus.c
  projects/clang380-import/sys/kern/subr_rman.c
  projects/clang380-import/sys/kern/tty.c
  projects/clang380-import/sys/kern/tty_ttydisc.c
  projects/clang380-import/sys/kern/vfs_aio.c
  projects/clang380-import/sys/kern/vfs_bio.c
  projects/clang380-import/sys/kern/vfs_cluster.c
  projects/clang380-import/sys/mips/adm5120/admpci.c
  projects/clang380-import/sys/mips/adm5120/obio.c
  projects/clang380-import/sys/mips/alchemy/obio.c
  projects/clang380-import/sys/mips/atheros/apb.c
  projects/clang380-import/sys/mips/atheros/ar71xx_pci.c
  projects/clang380-import/sys/mips/atheros/ar724x_pci.c
  projects/clang380-import/sys/mips/atheros/qca955x_pci.c
  projects/clang380-import/sys/mips/beri/beri_simplebus.c
  projects/clang380-import/sys/mips/cavium/ciu.c
  projects/clang380-import/sys/mips/cavium/obio.c
  projects/clang380-import/sys/mips/cavium/octopci.c
  projects/clang380-import/sys/mips/idt/idtpci.c
  projects/clang380-import/sys/mips/idt/obio.c
  projects/clang380-import/sys/mips/malta/gt.c
  projects/clang380-import/sys/mips/malta/gt_pci.c
  projects/clang380-import/sys/mips/malta/obio.c
  projects/clang380-import/sys/mips/mips/cpu.c
  projects/clang380-import/sys/mips/mips/exception.S
  projects/clang380-import/sys/mips/mips/freebsd32_machdep.c
  projects/clang380-import/sys/mips/mips/nexus.c
  projects/clang380-import/sys/mips/mips/pm_machdep.c
  projects/clang380-import/sys/mips/mips/vm_machdep.c
  projects/clang380-import/sys/mips/nlm/xlp_simplebus.c
  projects/clang380-import/sys/mips/rmi/iodi.c
  projects/clang380-import/sys/mips/rmi/xlr_pci.c
  projects/clang380-import/sys/mips/rt305x/obio.c
  projects/clang380-import/sys/mips/rt305x/rt305x_gpio.c
  projects/clang380-import/sys/mips/rt305x/rt305x_pci.c
  projects/clang380-import/sys/mips/sentry5/obio.c
  projects/clang380-import/sys/mips/sibyte/sb_zbbus.c
  projects/clang380-import/sys/mips/sibyte/sb_zbpci.c
  projects/clang380-import/sys/net/vnet.h
  projects/clang380-import/sys/netinet/cc/cc.c
  projects/clang380-import/sys/netinet/cc/cc_cdg.c
  projects/clang380-import/sys/netinet/cc/cc_chd.c
  projects/clang380-import/sys/netinet/cc/cc_cubic.c
  projects/clang380-import/sys/netinet/cc/cc_dctcp.c
  projects/clang380-import/sys/netinet/cc/cc_hd.c
  projects/clang380-import/sys/netinet/cc/cc_htcp.c
  projects/clang380-import/sys/netinet/cc/cc_newreno.c
  projects/clang380-import/sys/netinet/cc/cc_vegas.c
  projects/clang380-import/sys/netinet/tcp_input.c
  projects/clang380-import/sys/netinet/tcp_offload.c
  projects/clang380-import/sys/netinet/tcp_output.c
  projects/clang380-import/sys/netinet/tcp_stacks/fastpath.c
  projects/clang380-import/sys/netinet/tcp_subr.c
  projects/clang380-import/sys/netinet/tcp_syncache.c
  projects/clang380-import/sys/netinet/tcp_syncache.h
  projects/clang380-import/sys/netinet/tcp_timer.c
  projects/clang380-import/sys/netinet/tcp_timer.h
  projects/clang380-import/sys/netinet/tcp_timewait.c
  projects/clang380-import/sys/netinet/tcp_usrreq.c
  projects/clang380-import/sys/netinet/tcp_var.h
  projects/clang380-import/sys/netpfil/ipfw/dn_heap.c
  projects/clang380-import/sys/netpfil/ipfw/dn_sched_fifo.c
  projects/clang380-import/sys/netpfil/ipfw/dn_sched_qfq.c
  projects/clang380-import/sys/netpfil/ipfw/dn_sched_rr.c
  projects/clang380-import/sys/netpfil/ipfw/test/Makefile
  projects/clang380-import/sys/netpfil/ipfw/test/dn_test.h
  projects/clang380-import/sys/netpfil/ipfw/test/main.c
  projects/clang380-import/sys/netpfil/ipfw/test/mylist.h
  projects/clang380-import/sys/netpfil/ipfw/test/test_dn_sched.c
  projects/clang380-import/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/clang380-import/sys/pc98/pc98/canbus.c
  projects/clang380-import/sys/powerpc/mpc85xx/lbc.c
  projects/clang380-import/sys/powerpc/ofw/ofw_pci.c
  projects/clang380-import/sys/powerpc/powermac/macgpio.c
  projects/clang380-import/sys/powerpc/powermac/macio.c
  projects/clang380-import/sys/powerpc/powermac/uninorth.c
  projects/clang380-import/sys/powerpc/powerpc/exec_machdep.c
  projects/clang380-import/sys/powerpc/psim/ata_iobus.c
  projects/clang380-import/sys/powerpc/psim/iobus.c
  projects/clang380-import/sys/sparc64/central/central.c
  projects/clang380-import/sys/sparc64/ebus/ebus.c
  projects/clang380-import/sys/sparc64/fhc/fhc.c
  projects/clang380-import/sys/sparc64/isa/isa.c
  projects/clang380-import/sys/sparc64/pci/apb.c
  projects/clang380-import/sys/sparc64/pci/fire.c
  projects/clang380-import/sys/sparc64/pci/ofw_pci.c
  projects/clang380-import/sys/sparc64/pci/psycho.c
  projects/clang380-import/sys/sparc64/pci/sbbc.c
  projects/clang380-import/sys/sparc64/pci/schizo.c
  projects/clang380-import/sys/sparc64/sbus/sbus.c
  projects/clang380-import/sys/sparc64/sparc64/machdep.c
  projects/clang380-import/sys/sparc64/sparc64/nexus.c
  projects/clang380-import/sys/sparc64/sparc64/upa.c
  projects/clang380-import/sys/sys/_types.h
  projects/clang380-import/sys/sys/bus.h
  projects/clang380-import/sys/sys/elf_common.h
  projects/clang380-import/sys/sys/param.h
  projects/clang380-import/sys/sys/rman.h
  projects/clang380-import/sys/sys/signal.h
  projects/clang380-import/sys/sys/types.h
  projects/clang380-import/sys/ufs/ffs/ffs_inode.c
  projects/clang380-import/sys/ufs/ffs/ffs_vfsops.c
  projects/clang380-import/sys/x86/include/legacyvar.h
  projects/clang380-import/sys/x86/include/pci_cfgreg.h
  projects/clang380-import/sys/x86/isa/atrtc.c
  projects/clang380-import/sys/x86/isa/clock.c
  projects/clang380-import/sys/x86/isa/isa.c
  projects/clang380-import/sys/x86/pci/pci_bus.c
  projects/clang380-import/sys/x86/pci/qpi.c
  projects/clang380-import/sys/x86/x86/mptable_pci.c
  projects/clang380-import/sys/x86/x86/nexus.c
  projects/clang380-import/tools/tools/nanobsd/defaults.sh
  projects/clang380-import/usr.bin/dpv/dpv.1
  projects/clang380-import/usr.bin/dpv/dpv.c
  projects/clang380-import/usr.bin/kdump/Makefile
  projects/clang380-import/usr.bin/kdump/kdump.c
  projects/clang380-import/usr.bin/systat/netstat.c
  projects/clang380-import/usr.bin/truss/Makefile
  projects/clang380-import/usr.bin/truss/aarch64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/aarch64-freebsd.c
  projects/clang380-import/usr.bin/truss/amd64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/amd64-freebsd.c
  projects/clang380-import/usr.bin/truss/amd64-freebsd32.c
  projects/clang380-import/usr.bin/truss/amd64-linux32.c
  projects/clang380-import/usr.bin/truss/arm-freebsd.c
  projects/clang380-import/usr.bin/truss/i386-freebsd.c
  projects/clang380-import/usr.bin/truss/i386-linux.c
  projects/clang380-import/usr.bin/truss/main.c
  projects/clang380-import/usr.bin/truss/mips-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc64-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc64-freebsd32.c
  projects/clang380-import/usr.bin/truss/setup.c
  projects/clang380-import/usr.bin/truss/sparc64-freebsd.c
  projects/clang380-import/usr.bin/truss/truss.h
  projects/clang380-import/usr.sbin/Makefile
  projects/clang380-import/usr.sbin/bsdconfig/include/messages.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/packages/index.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/strings.subr
  projects/clang380-import/usr.sbin/iscsid/pdu.c
  projects/clang380-import/usr.sbin/makefs/tests/Makefile
  projects/clang380-import/usr.sbin/syslogd/syslogd.c
Directory Properties:
  projects/clang380-import/   (props changed)
  projects/clang380-import/cddl/   (props changed)
  projects/clang380-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang380-import/crypto/openssh/   (props changed)
  projects/clang380-import/gnu/lib/   (props changed)
  projects/clang380-import/lib/libc/   (props changed)
  projects/clang380-import/share/   (props changed)
  projects/clang380-import/sys/   (props changed)
  projects/clang380-import/sys/boot/   (props changed)
  projects/clang380-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang380-import/sys/conf/   (props changed)
  projects/clang380-import/sys/dev/hyperv/   (props changed)

Modified: projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Jan 27 22:52:20 2016	(r294962)
@@ -2841,8 +2841,11 @@ Do not actually receive the stream. This
 option to verify the name the receive operation would use.
 .It Fl o Sy origin Ns = Ns Ar snapshot
 Forces the stream to be received as a clone of the given snapshot.
-This is only valid if the stream is an incremental stream whose source
-is the same as the provided origin.
+If the stream is a full send stream, this will create the filesystem
+described by the stream as a clone of the specified snapshot. Which
+snapshot was specified will not affect the success or failure of the
+receive, as long as the snapshot does exist.  If the stream is an
+incremental send stream, all the normal verification will be performed.
 .It Fl F
 Force a rollback of the file system to the most recent snapshot before
 performing the receive operation. If receiving an incremental replication

Modified: projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -26,6 +26,7 @@
  * Copyright (c) 2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
+ * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  */
 
 #include <assert.h>
@@ -67,7 +68,7 @@ extern void zfs_setprop_error(libzfs_han
 
 static int zfs_receive_impl(libzfs_handle_t *, const char *, const char *,
     recvflags_t *, int, const char *, nvlist_t *, avl_tree_t *, char **, int,
-    uint64_t *);
+    uint64_t *, const char *);
 static int guid_to_name(libzfs_handle_t *, const char *,
     uint64_t, boolean_t, char *);
 
@@ -2602,6 +2603,7 @@ zfs_receive_package(libzfs_handle_t *hdl
 	nvlist_t *stream_nv = NULL;
 	avl_tree_t *stream_avl = NULL;
 	char *fromsnap = NULL;
+	char *sendsnap = NULL;
 	char *cp;
 	char tofs[ZFS_MAXNAMELEN];
 	char sendfs[ZFS_MAXNAMELEN];
@@ -2750,8 +2752,16 @@ zfs_receive_package(libzfs_handle_t *hdl
 	 */
 	(void) strlcpy(sendfs, drr->drr_u.drr_begin.drr_toname,
 	    ZFS_MAXNAMELEN);
-	if ((cp = strchr(sendfs, '@')) != NULL)
+	if ((cp = strchr(sendfs, '@')) != NULL) {
 		*cp = '\0';
+		/*
+		 * Find the "sendsnap", the final snapshot in a replication
+		 * stream.  zfs_receive_one() handles certain errors
+		 * differently, depending on if the contained stream is the
+		 * last one or not.
+		 */
+		sendsnap = (cp + 1);
+	}
 
 	/* Finally, receive each contained stream */
 	do {
@@ -2764,7 +2774,7 @@ zfs_receive_package(libzfs_handle_t *hdl
 		 */
 		error = zfs_receive_impl(hdl, destname, NULL, flags, fd,
 		    sendfs, stream_nv, stream_avl, top_zfs, cleanup_fd,
-		    action_handlep);
+		    action_handlep, sendsnap);
 		if (error == ENODATA) {
 			error = 0;
 			break;
@@ -2930,7 +2940,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
     const char *originsnap, recvflags_t *flags, dmu_replay_record_t *drr,
     dmu_replay_record_t *drr_noswap, const char *sendfs, nvlist_t *stream_nv,
     avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
-    uint64_t *action_handlep)
+    uint64_t *action_handlep, const char *finalsnap)
 {
 	zfs_cmd_t zc = { 0 };
 	time_t begin_time;
@@ -2947,6 +2957,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 	nvlist_t *snapprops_nvlist = NULL;
 	zprop_errflags_t prop_errflags;
 	boolean_t recursive;
+	char *snapname = NULL;
 
 	begin_time = time(NULL);
 
@@ -2957,7 +2968,6 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 	    ENOENT);
 
 	if (stream_avl != NULL) {
-		char *snapname;
 		nvlist_t *fs = fsavl_find(stream_avl, drrb->drr_toguid,
 		    &snapname);
 		nvlist_t *props;
@@ -3313,7 +3323,21 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 			    ZPROP_N_MORE_ERRORS) == 0) {
 				trunc_prop_errs(intval);
 				break;
-			} else {
+			} else if (snapname == NULL || finalsnap == NULL ||
+			    strcmp(finalsnap, snapname) == 0 ||
+			    strcmp(nvpair_name(prop_err),
+			    zfs_prop_to_name(ZFS_PROP_REFQUOTA)) != 0) {
+				/*
+				 * Skip the special case of, for example,
+				 * "refquota", errors on intermediate
+				 * snapshots leading up to a final one.
+				 * That's why we have all of the checks above.
+				 *
+				 * See zfs_ioctl.c's extract_delay_props() for
+				 * a list of props which can fail on
+				 * intermediate snapshots, but shouldn't
+				 * affect the overall receive.
+				 */
 				(void) snprintf(tbuf, sizeof (tbuf),
 				    dgettext(TEXT_DOMAIN,
 				    "cannot receive %s property on %s"),
@@ -3498,7 +3522,7 @@ static int
 zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,
     const char *originsnap, recvflags_t *flags, int infd, const char *sendfs,
     nvlist_t *stream_nv, avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
-    uint64_t *action_handlep)
+    uint64_t *action_handlep, const char *finalsnap)
 {
 	int err;
 	dmu_replay_record_t drr, drr_noswap;
@@ -3594,10 +3618,11 @@ zfs_receive_impl(libzfs_handle_t *hdl, c
 			if ((cp = strchr(nonpackage_sendfs, '@')) != NULL)
 				*cp = '\0';
 			sendfs = nonpackage_sendfs;
+			VERIFY(finalsnap == NULL);
 		}
 		return (zfs_receive_one(hdl, infd, tosnap, originsnap, flags,
 		    &drr, &drr_noswap, sendfs, stream_nv, stream_avl, top_zfs,
-		    cleanup_fd, action_handlep));
+		    cleanup_fd, action_handlep, finalsnap));
 	} else {
 		assert(DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
 		    DMU_COMPOUNDSTREAM);
@@ -3632,7 +3657,7 @@ zfs_receive(libzfs_handle_t *hdl, const 
 	VERIFY(cleanup_fd >= 0);
 
 	err = zfs_receive_impl(hdl, tosnap, originsnap, flags, infd, NULL, NULL,
-	    stream_avl, &top_zfs, cleanup_fd, &action_handle);
+	    stream_avl, &top_zfs, cleanup_fd, &action_handle, NULL);
 
 	VERIFY(0 == close(cleanup_fd));
 

Modified: projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_tcp.c
==============================================================================
--- projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -45,10 +45,10 @@ struct tcp_index {
 };
 
 static uint64_t tcp_tick;
+static uint64_t tcp_stats_tick;
 static struct tcpstat tcpstat;
 static struct xinpgen *xinpgen;
 static size_t xinpgen_len;
-static u_int tcp_count;
 static u_int tcp_total;
 
 static u_int oidnum;
@@ -64,13 +64,9 @@ tcp_compare(const void *p1, const void *
 }
 
 static int
-fetch_tcp(void)
+fetch_tcp_stats(void)
 {
 	size_t len;
-	struct xinpgen *ptr;
-	struct xtcpcb *tp;
-	struct tcp_index *oid;
-	in_addr_t inaddr;
 
 	len = sizeof(tcpstat);
 	if (sysctlbyname("net.inet.tcp.stats", &tcpstat, &len, NULL, 0) == -1) {
@@ -82,6 +78,20 @@ fetch_tcp(void)
 		return (-1);
 	}
 
+	tcp_stats_tick = get_ticks();
+
+	return (0);
+}
+
+static int
+fetch_tcp(void)
+{
+	size_t len;
+	struct xinpgen *ptr;
+	struct xtcpcb *tp;
+	struct tcp_index *oid;
+	in_addr_t inaddr;
+
 	len = 0;
 	if (sysctlbyname("net.inet.tcp.pcblist", NULL, &len, NULL, 0) == -1) {
 		syslog(LOG_ERR, "net.inet.tcp.pcblist: %m");
@@ -102,7 +112,6 @@ fetch_tcp(void)
 
 	tcp_tick = get_ticks();
 
-	tcp_count = 0;
 	tcp_total = 0;
 	for (ptr = (struct xinpgen *)(void *)((char *)xinpgen + xinpgen->xig_len);
 	     ptr->xig_len > sizeof(struct xinpgen);
@@ -114,10 +123,6 @@ fetch_tcp(void)
 
 		if (tp->xt_inp.inp_vflag & INP_IPV4)
 			tcp_total++;
-
-		if (tp->xt_tp.t_state == TCPS_ESTABLISHED ||
-		    tp->xt_tp.t_state == TCPS_CLOSE_WAIT)
-			tcp_count++;
 	}
 
 	if (oidnum < tcp_total) {
@@ -184,8 +189,8 @@ op_tcp(struct snmp_context *ctx __unused
 		abort();
 	}
 
-	if (tcp_tick < this_tick)
-		if (fetch_tcp() == -1)
+	if (tcp_stats_tick < this_tick)
+		if (fetch_tcp_stats() == -1)
 			return (SNMP_ERR_GENERR);
 
 	switch (value->var.subs[sub - 1]) {
@@ -226,7 +231,8 @@ op_tcp(struct snmp_context *ctx __unused
 		break;
 
 	  case LEAF_tcpCurrEstab:
-		value->v.uint32 = tcp_count;
+		value->v.uint32 = tcpstat.tcps_states[TCPS_ESTABLISHED] +
+		    tcpstat.tcps_states[TCPS_CLOSE_WAIT];
 		break;
 
 	  case LEAF_tcpInSegs:

Modified: projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
==============================================================================
--- projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mincore.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mincore.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -206,7 +206,8 @@ ATF_TC_BODY(mincore_resid, tc)
 		    "might be low on memory");
 
 #ifdef __FreeBSD__
-	ATF_REQUIRE(mlock(addr, npgs * page) == 0);
+	ATF_REQUIRE_MSG(mlock(addr, npgs * page) == 0, "mlock failed: %s",
+	    strerror(errno));
 #endif
 	ATF_REQUIRE(check_residency(addr, npgs) == npgs);
 	ATF_REQUIRE(munmap(addr, npgs * page) == 0);

Modified: projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
==============================================================================
--- projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mlock.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/contrib/netbsd-tests/lib/libc/sys/t_mlock.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -47,12 +47,89 @@ __RCSID("$NetBSD: t_mlock.c,v 1.5 2014/0
 #include <unistd.h>
 
 #ifdef __FreeBSD__
+#include <limits.h>
 #define _KMEMUSER
 #include <machine/vmparam.h>
 #endif
 
 static long page = 0;
 
+#ifdef __FreeBSD__
+#define	VM_MAX_WIRED "vm.max_wired"
+
+static void
+vm_max_wired_sysctl(int *old_value, int *new_value)
+{
+	size_t old_len;
+	size_t new_len = (new_value == NULL ? 0 : sizeof(int));
+
+	if (old_value == NULL)
+		printf("Setting the new value to %d\n", *new_value);
+	else {
+		ATF_REQUIRE_MSG(sysctlbyname(VM_MAX_WIRED, NULL, &old_len,
+		    new_value, new_len) == 0,
+		    "sysctlbyname(%s) failed: %s", VM_MAX_WIRED, strerror(errno));
+	}
+
+	ATF_REQUIRE_MSG(sysctlbyname(VM_MAX_WIRED, old_value, &old_len,
+	    new_value, new_len) == 0,
+	    "sysctlbyname(%s) failed: %s", VM_MAX_WIRED, strerror(errno));
+
+	if (old_value != NULL)
+		printf("Saved the old value (%d)\n", *old_value);
+}
+
+static void
+set_vm_max_wired(int new_value)
+{
+	FILE *fp;
+	int old_value;
+
+	fp = fopen(VM_MAX_WIRED, "w");
+	if (fp == NULL) {
+		atf_tc_skip("could not open %s for writing: %s",
+		    VM_MAX_WIRED, strerror(errno));
+		return;
+	}
+
+	vm_max_wired_sysctl(&old_value, NULL);
+
+	ATF_REQUIRE_MSG(fprintf(fp, "%d", old_value) > 0,
+	    "saving %s failed", VM_MAX_WIRED);
+
+	fclose(fp);
+
+	vm_max_wired_sysctl(NULL, &new_value);
+}
+
+static void
+restore_vm_max_wired(void)
+{
+	FILE *fp;
+	int saved_max_wired;
+
+	fp = fopen(VM_MAX_WIRED, "r");
+	if (fp == NULL) {
+		perror("fopen failed\n");
+		return;
+	}
+
+	if (fscanf(fp, "%d", &saved_max_wired) != 1) {
+		perror("fscanf failed\n");
+		fclose(fp);
+		return;
+	}
+
+	fclose(fp);
+	printf("old value in %s: %d\n", VM_MAX_WIRED, saved_max_wired);
+
+	if (saved_max_wired == 0) /* This will cripple the test host */
+		return;
+
+	vm_max_wired_sysctl(NULL, &saved_max_wired);
+}
+#endif
+
 ATF_TC(mlock_clip);
 ATF_TC_HEAD(mlock_clip, tc)
 {
@@ -78,11 +155,19 @@ ATF_TC_BODY(mlock_clip, tc)
 	free(buf);
 }
 
+#ifdef __FreeBSD__
+ATF_TC_WITH_CLEANUP(mlock_err);
+#else
 ATF_TC(mlock_err);
+#endif
 ATF_TC_HEAD(mlock_err, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
 	    "Test error conditions in mlock(2) and munlock(2)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects");
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(mlock_err, tc)
@@ -99,6 +184,8 @@ ATF_TC_BODY(mlock_err, tc)
 	if ((uintptr_t)VM_MIN_ADDRESS > 0)
 		null_errno = EINVAL;	/* NULL is not inside user VM */
 #endif
+	/* Set max_wired really really high to avoid EAGAIN */
+	set_vm_max_wired(INT_MAX);
 #else
 	if (sysctlbyname("vm.minaddress", &vmin, &len, NULL, 0) != 0)
 		atf_tc_fail("failed to read vm.minaddress");
@@ -139,6 +226,14 @@ ATF_TC_BODY(mlock_err, tc)
 	ATF_REQUIRE_ERRNO(ENOMEM, munlock(invalid_ptr, page) == -1);
 }
 
+#ifdef __FreeBSD__
+ATF_TC_CLEANUP(mlock_err, tc)
+{
+
+	restore_vm_max_wired();
+}
+#endif
+
 ATF_TC(mlock_limits);
 ATF_TC_HEAD(mlock_limits, tc)
 {
@@ -200,10 +295,18 @@ ATF_TC_BODY(mlock_limits, tc)
 	free(buf);
 }
 
+#ifdef __FreeBSD__
+ATF_TC_WITH_CLEANUP(mlock_mmap);
+#else
 ATF_TC(mlock_mmap);
+#endif
 ATF_TC_HEAD(mlock_mmap, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test mlock(2)-mmap(2) interaction");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects");
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(mlock_mmap, tc)
@@ -215,6 +318,11 @@ ATF_TC_BODY(mlock_mmap, tc)
 #endif
 	void *buf;
 
+#ifdef __FreeBSD__
+	/* Set max_wired really really high to avoid EAGAIN */
+	set_vm_max_wired(INT_MAX);
+#endif
+
 	/*
 	 * Make a wired RW mapping and check that mlock(2)
 	 * does not fail for the (already locked) mapping.
@@ -248,11 +356,27 @@ ATF_TC_BODY(mlock_mmap, tc)
 	ATF_REQUIRE(munmap(buf, page) == 0);
 }
 
+#ifdef __FreeBSD__
+ATF_TC_CLEANUP(mlock_mmap, tc)
+{
+
+	restore_vm_max_wired();
+}
+#endif
+
+#ifdef __FreeBSD__
+ATF_TC_WITH_CLEANUP(mlock_nested);
+#else
 ATF_TC(mlock_nested);
+#endif
 ATF_TC_HEAD(mlock_nested, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
 	    "Test that consecutive mlock(2) calls succeed");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects");
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(mlock_nested, tc)
@@ -260,6 +384,11 @@ ATF_TC_BODY(mlock_nested, tc)
 	const size_t maxiter = 100;
 	void *buf;
 
+#ifdef __FreeBSD__
+	/* Set max_wired really really high to avoid EAGAIN */
+	set_vm_max_wired(INT_MAX);
+#endif
+
 	buf = malloc(page);
 	ATF_REQUIRE(buf != NULL);
 
@@ -270,6 +399,14 @@ ATF_TC_BODY(mlock_nested, tc)
 	free(buf);
 }
 
+#ifdef __FreeBSD__
+ATF_TC_CLEANUP(mlock_nested, tc)
+{
+
+	restore_vm_max_wired();
+}
+#endif
+
 ATF_TP_ADD_TCS(tp)
 {
 

Modified: projects/clang380-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- projects/clang380-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Wed Jan 27 22:52:20 2016	(r294962)
@@ -70,7 +70,15 @@ recurse_body()
 	echo -e "cod\ndover sole\nhaddock\nhalibut\npilchard" > recurse/d/fish
 	echo -e "cod\nhaddock\nplaice" > recurse/a/f/favourite-fish
 
+	# Begin FreeBSD
+	if true; then
+		atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" -x "grep -r haddock recurse | sort"
+	else
+	# End FreeBSD
 	atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" grep -r haddock recurse
+	# Begin FreeBSD
+	fi
+	# End FreeBSD
 }
 
 atf_test_case recurse_symlink

Modified: projects/clang380-import/crypto/openssh/FREEBSD-upgrade
==============================================================================
--- projects/clang380-import/crypto/openssh/FREEBSD-upgrade	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/crypto/openssh/FREEBSD-upgrade	Wed Jan 27 22:52:20 2016	(r294962)
@@ -117,6 +117,7 @@
       - PasswordAuthentication defaults to "no".
       - VersionAddendum defaults to "FreeBSD-YYYYMMDD".
       - PrivilegeSeparation defaults to "sandbox".
+      - UseDNS defaults to "yes".
 
 2) Modified client-side defaults
 

Modified: projects/clang380-import/crypto/openssh/servconf.c
==============================================================================
--- projects/clang380-import/crypto/openssh/servconf.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/crypto/openssh/servconf.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -320,7 +320,7 @@ fill_default_server_options(ServerOption
 	if (options->max_sessions == -1)
 		options->max_sessions = DEFAULT_SESSIONS_MAX;
 	if (options->use_dns == -1)
-		options->use_dns = 0;
+		options->use_dns = 1;
 	if (options->client_alive_interval == -1)
 		options->client_alive_interval = 0;
 	if (options->client_alive_count_max == -1)

Modified: projects/clang380-import/crypto/openssh/sshd_config
==============================================================================
--- projects/clang380-import/crypto/openssh/sshd_config	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/crypto/openssh/sshd_config	Wed Jan 27 22:52:20 2016	(r294962)
@@ -115,7 +115,7 @@
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
-#UseDNS no
+#UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10:30:100
 #PermitTunnel no

Modified: projects/clang380-import/crypto/openssh/sshd_config.5
==============================================================================
--- projects/clang380-import/crypto/openssh/sshd_config.5	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/crypto/openssh/sshd_config.5	Wed Jan 27 22:52:20 2016	(r294962)
@@ -1541,8 +1541,8 @@ the resolved host name for the remote IP
 very same IP address.
 .Pp
 If this option is set to
-.Dq no
-(the default) then only addresses and not host names may be used in
+.Dq no ,
+then only addresses and not host names may be used in
 .Pa ~/.ssh/known_hosts
 .Cm from
 and
@@ -1550,6 +1550,8 @@ and
 .Cm Match
 .Cm Host
 directives.
+The default is
+.Dq yes .
 .It Cm UseLogin
 Specifies whether
 .Xr login 1

Modified: projects/clang380-import/etc/defaults/rc.conf
==============================================================================
--- projects/clang380-import/etc/defaults/rc.conf	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/etc/defaults/rc.conf	Wed Jan 27 22:52:20 2016	(r294962)
@@ -368,6 +368,8 @@ ntp_db_leapfile="/var/db/ntpd.leap-secon
 				# Working copy (updated weekly) leapfile
 ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list"
 				# Source from which to fetch leapfile
+ntp_leapfile_fetch_opts="-mq"	# Options to use for ntp leapfile fetch,
+				# e.g. --no-verify-peer
 ntp_leapfile_expiry_days=30	# Check for new leapfile 30 days prior to
 				# expiry.
 ntp_leapfile_fetch_verbose="NO"	# Be verbose during NTP leapfile fetch

Modified: projects/clang380-import/etc/group
==============================================================================
--- projects/clang380-import/etc/group	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/etc/group	Wed Jan 27 22:52:20 2016	(r294962)
@@ -29,6 +29,7 @@ dialer:*:68:
 network:*:69:
 audit:*:77:
 www:*:80:
+_ypldap:*:160:
 hast:*:845:
 nogroup:*:65533:
 nobody:*:65534:

Modified: projects/clang380-import/etc/master.passwd
==============================================================================
--- projects/clang380-import/etc/master.passwd	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/etc/master.passwd	Wed Jan 27 22:52:20 2016	(r294962)
@@ -22,6 +22,6 @@ uucp:*:66:66::0:0:UUCP pseudo-user:/var/
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
 auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
 www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
-_ypldap:*:93:93::0:0:YP Ldap unprivileged user:/var/empty:/usr/sbin/nologin
+_ypldap:*:160:160::0:0:YP Ldap unprivileged user:/var/empty:/usr/sbin/nologin
 hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Modified: projects/clang380-import/etc/rc.d/ntpd
==============================================================================
--- projects/clang380-import/etc/rc.d/ntpd	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/etc/rc.d/ntpd	Wed Jan 27 22:52:20 2016	(r294962)
@@ -105,7 +105,7 @@ ntpd_fetch_leapfile() {
 		$verbose Within ntp leapfile expiry limit, initiating fetch
 		for url in $ntp_leapfile_sources ; do
 			$verbose fetching $url
-			fetch -mqo $ntp_tmp_leapfile $url && break
+			fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break
 		done
 		ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
 		if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then

Modified: projects/clang380-import/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/clang380-import/gnu/lib/libgcc/Makefile	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/gnu/lib/libgcc/Makefile	Wed Jan 27 22:52:20 2016	(r294962)
@@ -58,8 +58,10 @@ LIB2FUNCS+= _fixuns${mode}si
 .endfor
 
 # Likewise double-word routines.
-.if ${TARGET_CPUARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm"
-# These are implemented in an ARM specific file but will not be filtered out
+.if ${TARGET_CPUARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm" && \
+    ${TARGET_CPUARCH} != "riscv64"
+# These are implemented in an ARM specific file but will not be filtered out.
+# RISCVTODO: can't compile
 .for mode in sf df xf tf
 LIB2FUNCS+= _fix${mode}di _fixuns${mode}di
 LIB2FUNCS+= _floatdi${mode} _floatundi${mode}
@@ -209,7 +211,7 @@ COMMONHDRS+=	unwind.h
 HIDE =  -fvisibility=hidden -DHIDE_EXPORTS
 CC_T =	${CC} -c ${CFLAGS} ${HIDE} -fPIC
 CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
-CC_S =	${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
+CC_S =	${CC} -c ${CFLAGS} ${SHARED_CFLAGS} ${PICFLAG} -DSHARED
 
 #-----------------------------------------------------------------------
 #
@@ -322,7 +324,10 @@ EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/}
 EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/}
 EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.So/}
 EH_CFLAGS = -fexceptions -D__GLIBC__=3 -DElfW=__ElfN
+.if ${TARGET_CPUARCH} != "riscv64"
+# RISCVTODO: unwinding support
 SOBJS    += ${EH_OBJS_S}
+.endif
 
 .for _src in ${LIB2ADDEHSTATIC:M*.c}
 ${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}

Modified: projects/clang380-import/lib/libc/Makefile
==============================================================================
--- projects/clang380-import/lib/libc/Makefile	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libc/Makefile	Wed Jan 27 22:52:20 2016	(r294962)
@@ -173,7 +173,7 @@ CFLAGS+= -I${SRCTOP}/lib/libutil
 # Same issue with libm
 MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${SRCTOP}/lib/msun -V ARCH_SUBDIR
 # unfortunately msun/src contains both private and public headers
-CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR} 
+CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR}
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+= -I${SRCTOP}/lib/msun/x86
 .endif

Modified: projects/clang380-import/lib/libc/net/Makefile.inc
==============================================================================
--- projects/clang380-import/lib/libc/net/Makefile.inc	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libc/net/Makefile.inc	Wed Jan 27 22:52:20 2016	(r294962)
@@ -12,7 +12,7 @@ SRCS+=	base64.c ether_addr.c eui64.c \
 	getproto.c getprotoent.c getprotoname.c getservent.c \
 	if_indextoname.c if_nameindex.c if_nametoindex.c \
 	ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
-	nsdispatch.c nslexer.c nsparser.y nss_compat.c \
+	nsdispatch.c nslexer.l nsparser.y nss_compat.c \
 	rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \
         sockatmark.c sourcefilter.c vars.c
 
@@ -34,13 +34,8 @@ CFLAGS+=-I${LIBC_SRCTOP}/resolv
 YFLAGS+=-p_nsyy
 LFLAGS+=-P_nsyy
 
-CLEANFILES+=nslexer.c nslexer.c.*
-
-nslexer.c: nslexer.l nsparser.h
-	${LEX} ${LFLAGS} -o${.TARGET}.tmp1 ${.IMPSRC}
-	sed -e '/YY_BUF_SIZE/s/16384/1024/' ${.TARGET}.tmp1 >${.TARGET}.tmp2
-	rm -f ${.TARGET}.tmp1
-	mv -f ${.TARGET}.tmp2 ${.TARGET}
+CFLAGS.nslexer.c= -DYY_BUF_SIZE=1024
+CFLAGS+=	${CFLAGS.${.IMPSRC:T}}
 
 MAN+=	byteorder.3 ethers.3 eui64.3 \
 	getaddrinfo.3 gai_strerror.3 gethostbyname.3 \

Modified: projects/clang380-import/lib/libc/sys/revoke.2
==============================================================================
--- projects/clang380-import/lib/libc/sys/revoke.2	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libc/sys/revoke.2	Wed Jan 27 22:52:20 2016	(r294962)
@@ -31,7 +31,7 @@
 .\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd Jan 25, 2016
 .Dt REVOKE 2
 .Os
 .Sh NAME
@@ -59,7 +59,8 @@ and a
 system call will succeed.
 If the file is a special file for a device which is open,
 the device close function
-is called as if all open references to the file had been closed.
+is called as if all open references to the file had been closed
+using a special close method which does not block.
 .Pp
 Access to a file may be revoked only by its owner or the super user.
 The
@@ -104,3 +105,6 @@ The
 .Fn revoke
 system call first appeared in
 .Bx 4.3 Reno .
+.Sh BUGS
+The non-blocking close method is only correctly implemented for
+terminal devices.

Modified: projects/clang380-import/lib/libdevinfo/devinfo.3
==============================================================================
--- projects/clang380-import/lib/libdevinfo/devinfo.3	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdevinfo/devinfo.3	Wed Jan 27 22:52:20 2016	(r294962)
@@ -110,8 +110,8 @@ struct devinfo_dev {
 
 struct devinfo_rman {
     devinfo_handle_t	dm_handle;	/* resource manager handle */
-    u_long		dm_start;	/* resource start */
-    u_long		dm_size;	/* resource size */
+    rman_res_t		dm_start;	/* resource start */
+    rman_res_t		dm_size;	/* resource size */
     char		*dm_desc;	/* resource description */
 };
 
@@ -119,8 +119,8 @@ struct devinfo_res {
     devinfo_handle_t	dr_handle;	/* resource handle */
     devinfo_handle_t	dr_rman;	/* resource manager handle */
     devinfo_handle_t	dr_device;	/* owning device */
-    u_long		dr_start;	/* region start */
-    u_long		dr_size;	/* region size */
+    rman_res_t		dr_start;	/* region start */
+    rman_res_t		dr_size;	/* region size */
 };
 .Ed
 .Pp

Modified: projects/clang380-import/lib/libdevinfo/devinfo.h
==============================================================================
--- projects/clang380-import/lib/libdevinfo/devinfo.h	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdevinfo/devinfo.h	Wed Jan 27 22:52:20 2016	(r294962)
@@ -56,8 +56,8 @@ struct devinfo_dev {
 struct devinfo_rman {
 	devinfo_handle_t	dm_handle;	/* resource manager handle */
 
-	unsigned long		dm_start;	/* resource start */
-	unsigned long		dm_size;	/* resource size */
+	rman_res_t		dm_start;	/* resource start */
+	rman_res_t		dm_size;	/* resource size */
     
 	char			*dm_desc;	/* resource description */
 };
@@ -67,8 +67,8 @@ struct devinfo_res {
 	devinfo_handle_t	dr_rman;	/* resource manager handle */
 	devinfo_handle_t	dr_device;	/* owning device */
 
-	unsigned long		dr_start;	/* region start */
-	unsigned long		dr_size;	/* region size */
+	rman_res_t		dr_start;	/* region start */
+	rman_res_t		dr_size;	/* region size */
 	/* XXX add flags */
 };
 

Modified: projects/clang380-import/lib/libdpv/dialog_util.c
==============================================================================
--- projects/clang380-import/lib/libdpv/dialog_util.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dialog_util.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -261,6 +261,13 @@ dialog_spawn_gauge(char *init_prompt, pi
 			errx(EXIT_FAILURE, "Out of memory?!");
 		sprintf(dargv[n++], "--title");
 		dargv[n++] = title;
+	} else {
+		if ((dargv[n] = malloc(8)) == NULL)
+			errx(EXIT_FAILURE, "Out of memory?!");
+		sprintf(dargv[n++], "--title");
+		if ((dargv[n] = malloc(1)) == NULL)
+			errx(EXIT_FAILURE, "Out of memory?!");
+		*dargv[n++] = '\0';
 	}
 	if (backtitle != NULL) {
 		if ((dargv[n] = malloc(12)) == NULL)

Modified: projects/clang380-import/lib/libdpv/dialog_util.h
==============================================================================
--- projects/clang380-import/lib/libdpv/dialog_util.h	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dialog_util.h	Wed Jan 27 22:52:20 2016	(r294962)
@@ -55,7 +55,6 @@ extern int dheight, dwidth;
 
 __BEGIN_DECLS
 uint8_t		 dialog_prompt_nlstate(const char *_prompt);
-void		 dialog_gauge_free(void);
 void		 dialog_maxsize_free(void);
 char		*dialog_prompt_lastline(char *_prompt, uint8_t _nlstate);
 int		 dialog_maxcols(void);

Modified: projects/clang380-import/lib/libdpv/dpv.3
==============================================================================
--- projects/clang380-import/lib/libdpv/dpv.3	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dpv.3	Wed Jan 27 22:52:20 2016	(r294962)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013-2015 Devin Teske
+.\" Copyright (c) 2013-2016 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 22, 2015
+.Dd Jan 26, 2016
 .Dt DPV 3
 .Os
 .Sh NAME
@@ -64,6 +64,7 @@ argument contains the following properti
 features:
 .Bd -literal -offset indent
 struct dpv_config {
+    uint8_t          keep_tite;     /* Cleaner exit for scripts */
     enum dpv_display display_type;  /* Def. DPV_DISPLAY_LIBDIALOG */
     enum dpv_output  output_type;   /* Default DPV_OUTPUT_NONE */
     int              debug;         /* Enable debug on stderr */

Modified: projects/clang380-import/lib/libdpv/dpv.c
==============================================================================
--- projects/clang380-import/lib/libdpv/dpv.c	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dpv.c	Wed Jan 27 22:52:20 2016	(r294962)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske at FreeBSD.org>
+ * Copyright (c) 2013-2016 Devin Teske <dteske at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,7 @@ long long dpv_overall_read = 0;
 static char pathbuf[PATH_MAX];
 
 /* Extra display information */
+uint8_t keep_tite = FALSE;	/* dpv_config.keep_tite */
 uint8_t no_labels = FALSE;	/* dpv_config.options & DPV_NO_LABELS */
 uint8_t wide = FALSE;		/* dpv_config.options & DPV_WIDE_MODE */
 char *aprompt = NULL;		/* dpv_config.aprompt */
@@ -150,6 +151,7 @@ dpv(struct dpv_config *config, struct dp
 	dialog_updates_per_second = DIALOG_UPDATES_PER_SEC;
 	display_limit	= DISPLAY_LIMIT_DEFAULT;
 	display_type	= DPV_DISPLAY_LIBDIALOG;
+	keep_tite	= FALSE;
 	label_size	= LABEL_SIZE_DEFAULT;
 	msg_done	= NULL;
 	msg_fail	= NULL;
@@ -193,6 +195,7 @@ dpv(struct dpv_config *config, struct dp
 		dialog_updates_per_second = config->dialog_updates_per_second;
 		display_limit	= config->display_limit;
 		display_type	= config->display_type;
+		keep_tite	= config->keep_tite;
 		label_size	= config->label_size;
 		msg_done	= (char *)config->msg_done;
 		msg_fail	= (char *)config->msg_fail;
@@ -695,7 +698,7 @@ dpv(struct dpv_config *config, struct dp
 			close(dialog_out);
 			waitpid(pid, (int *)NULL, 0);	
 		}
-		if (!dpv_interrupt)
+		if (!keep_tite && !dpv_interrupt)
 			printf("\n");
 	} else
 		warnx("%s: %lli overall read", __func__, dpv_overall_read);

Modified: projects/clang380-import/lib/libdpv/dpv.h
==============================================================================
--- projects/clang380-import/lib/libdpv/dpv.h	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dpv.h	Wed Jan 27 22:52:20 2016	(r294962)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske at FreeBSD.org>
+ * Copyright (c) 2013-2016 Devin Teske <dteske at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,6 +97,7 @@ struct dpv_file_node {
  * Anatomy of config option to pass as dpv() config argument
  */
 struct dpv_config {
+	uint8_t	keep_tite;		/* Prevent visually distracting exit */
 	enum dpv_display display_type;	/* Display (default TYPE_LIBDIALOG) */
 	enum dpv_output  output_type;	/* Output (default TYPE_NONE) */
 	int	debug;			/* Enable debugging output on stderr */

Modified: projects/clang380-import/lib/libdpv/dpv_private.h
==============================================================================
--- projects/clang380-import/lib/libdpv/dpv_private.h	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libdpv/dpv_private.h	Wed Jan 27 22:52:20 2016	(r294962)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske at FreeBSD.org>
+ * Copyright (c) 2013-2016 Devin Teske <dteske at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,7 @@ extern uint8_t debug;
 extern unsigned int dpv_nfiles;
 
 /* Extra display information */
+extern uint8_t keep_tite;
 extern uint8_t no_labels;
 extern uint8_t wide;
 extern char *msg_done, *msg_fail, *msg_pending;

Modified: projects/clang380-import/lib/libsysdecode/Makefile
==============================================================================
--- projects/clang380-import/lib/libsysdecode/Makefile	Wed Jan 27 22:50:04 2016	(r294961)
+++ projects/clang380-import/lib/libsysdecode/Makefile	Wed Jan 27 22:52:20 2016	(r294962)
@@ -4,11 +4,14 @@
 
 LIB=	sysdecode
 
-SRCS=	ioctl.c utrace.c
+SRCS=	ioctl.c syscallnames.c utrace.c
 INCS=	sysdecode.h
 
+CFLAGS+= -I${.CURDIR}/../../sys
+
 MAN+=	sysdecode.3 \
 	sysdecode_ioctlname.3 \
+	sysdecode_syscallnames.3 \
 	sysdecode_utrace.3
 
 CLEANFILES= ioctl.c
@@ -23,6 +26,10 @@ CFLAGS+=-DPF
 
 # Workaround duplicate declarations in <netinet/ip_compat.h>
 CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls
+
+# Workaround warning for unused ssi_cables[] in <dev/lmc/if_lmc.h>
+CFLAGS.gcc.ioctl.c+= -Wno-unused
+
 CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
 
 ioctl.c: mkioctls

Copied: projects/clang380-import/lib/libsysdecode/syscallnames.c (from r294960, head/lib/libsysdecode/syscallnames.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/libsysdecode/syscallnames.c	Wed Jan 27 22:52:20 2016	(r294962, copy of r294960, head/lib/libsysdecode/syscallnames.c)
@@ -0,0 +1,105 @@
+/*-
+ * Copyright (c) 2015 John H. Baldwin <jhb 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Map system call codes to names for the supported ABIs on each
+ * platform.  Rather than regnerating system call name tables locally
+ * during the build, use the generated tables in the kernel source
+ * tree.
+ */
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <sysdecode.h>
+
+static
+#include <kern/syscalls.c>
+
+#if defined(__amd64__) || defined(__powerpc64__)
+static
+#include <compat/freebsd32/freebsd32_syscalls.c>
+#endif
+
+#if defined(__amd64__) || defined(__i386__)
+static
+#ifdef __amd64__
+#include <amd64/linux/linux_syscalls.c>
+#else
+#include <i386/linux/linux_syscalls.c>
+#endif
+#endif
+
+#ifdef __amd64__
+static
+#include <amd64/linux32/linux32_syscalls.c>
+#endif
+
+#if defined(__amd64__) || defined(__aarch64__)
+static
+#include <compat/cloudabi64/cloudabi64_syscalls.c>
+#endif
+
+const char *
+sysdecode_syscallname(enum sysdecode_abi abi, unsigned int code)
+{
+
+	switch (abi) {
+	case FREEBSD:
+		if (code < nitems(syscallnames))
+			return (syscallnames[code]);
+		break;
+#if defined(__amd64__) || defined(__powerpc64__)
+	case FREEBSD32:
+		if (code < nitems(freebsd32_syscallnames))
+			return (freebsd32_syscallnames[code]);
+		break;
+#endif
+#if defined(__amd64__) || defined(__i386__)
+	case LINUX:
+		if (code < nitems(linux_syscallnames))
+			return (linux_syscallnames[code]);
+		break;
+#endif
+#ifdef __amd64__
+	case LINUX32:
+		if (code < nitems(linux32_syscallnames))
+			return (linux32_syscallnames[code]);
+		break;
+#endif
+#if defined(__amd64__) || defined(__aarch64__)
+	case CLOUDABI64:
+		if (code < nitems(cloudabi64_syscallnames))
+			return (cloudabi64_syscallnames[code]);
+		break;
+#endif
+	default:
+		break;
+	}
+	return (NULL);
+}

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

More information about the svn-src-projects mailing list