svn commit: r292843 - in projects/vnet: . bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/zdb cddl/sbin/zfs cddl/sbin/zpool cddl/usr.sbin/zdb cddl/usr.sbin/zhack contrib/bmake contrib/bmake/mk ...

Mon Dec 28 22:52:42 UTC 2015

Author: bz
Date: Mon Dec 28 22:52:36 2015
New Revision: 292843
URL: https://svnweb.freebsd.org/changeset/base/292843

Log:
  Mfh r292839

Added:
  projects/vnet/bin/sh/tests/expansion/trim9.0
     - copied unchanged from r292839, head/bin/sh/tests/expansion/trim9.0
  projects/vnet/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff
     - copied unchanged from r292839, head/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff
  projects/vnet/lib/libc/stdlib/hcreate_r.c
     - copied unchanged from r292839, head/lib/libc/stdlib/hcreate_r.c
  projects/vnet/lib/libc/stdlib/hdestroy_r.c
     - copied unchanged from r292839, head/lib/libc/stdlib/hdestroy_r.c
  projects/vnet/lib/libc/stdlib/hsearch.h
     - copied unchanged from r292839, head/lib/libc/stdlib/hsearch.h
  projects/vnet/lib/libc/stdlib/hsearch_r.c
     - copied unchanged from r292839, head/lib/libc/stdlib/hsearch_r.c
  projects/vnet/lib/libc/stdlib/tsearch_path.h
     - copied unchanged from r292839, head/lib/libc/stdlib/tsearch_path.h
  projects/vnet/lib/libc/tests/stdlib/tsearch_test.c
     - copied unchanged from r292839, head/lib/libc/tests/stdlib/tsearch_test.c
  projects/vnet/lib/libsysdecode/mkioctls
     - copied unchanged from r292839, head/lib/libsysdecode/mkioctls
  projects/vnet/lib/libsysdecode/sysdecode_ioctlname.3
     - copied unchanged from r292839, head/lib/libsysdecode/sysdecode_ioctlname.3
  projects/vnet/libexec/rtld-elf/riscv/
     - copied from r292839, head/libexec/rtld-elf/riscv/
  projects/vnet/share/man/man4/mdio.4
     - copied unchanged from r292839, head/share/man/man4/mdio.4
  projects/vnet/sys/crypto/sha2/sha384.h
     - copied unchanged from r292839, head/sys/crypto/sha2/sha384.h
  projects/vnet/sys/crypto/sha2/sha512.h
     - copied unchanged from r292839, head/sys/crypto/sha2/sha512.h
  projects/vnet/sys/crypto/sha2/sha512c.c
     - copied unchanged from r292839, head/sys/crypto/sha2/sha512c.c
  projects/vnet/sys/dev/bxe/bxe_dump.h
     - copied unchanged from r292839, head/sys/dev/bxe/bxe_dump.h
  projects/vnet/sys/dev/bxe/bxe_ioctl.h
     - copied unchanged from r292839, head/sys/dev/bxe/bxe_ioctl.h
  projects/vnet/sys/dev/cxgbe/cxgbei/
     - copied from r292839, head/sys/dev/cxgbe/cxgbei/
  projects/vnet/sys/dev/ixgbe/ixgbe_osdep.c
     - copied unchanged from r292839, head/sys/dev/ixgbe/ixgbe_osdep.c
  projects/vnet/sys/dev/mdio/
     - copied from r292839, head/sys/dev/mdio/
  projects/vnet/sys/mips/conf/MT7620
     - copied unchanged from r292839, head/sys/mips/conf/MT7620
  projects/vnet/sys/mips/conf/MT7620.hints
     - copied unchanged from r292839, head/sys/mips/conf/MT7620.hints
  projects/vnet/sys/mips/conf/RT5350
     - copied unchanged from r292839, head/sys/mips/conf/RT5350
  projects/vnet/sys/mips/conf/RT5350.hints
     - copied unchanged from r292839, head/sys/mips/conf/RT5350.hints
  projects/vnet/sys/mips/rt305x/rt305x_ehci.c
     - copied unchanged from r292839, head/sys/mips/rt305x/rt305x_ehci.c
  projects/vnet/sys/mips/rt305x/rt305x_ohci.c
     - copied unchanged from r292839, head/sys/mips/rt305x/rt305x_ohci.c
  projects/vnet/sys/mips/rt305x/rt305x_pci.c
     - copied unchanged from r292839, head/sys/mips/rt305x/rt305x_pci.c
  projects/vnet/sys/mips/rt305x/rt305x_pcireg.h
     - copied unchanged from r292839, head/sys/mips/rt305x/rt305x_pcireg.h
  projects/vnet/sys/mips/rt305x/rt305x_spi.c
     - copied unchanged from r292839, head/sys/mips/rt305x/rt305x_spi.c
  projects/vnet/sys/modules/cxgbe/cxgbei/
     - copied from r292839, head/sys/modules/cxgbe/cxgbei/
  projects/vnet/sys/modules/mdio/
     - copied from r292839, head/sys/modules/mdio/
  projects/vnet/sys/netinet/tcp_fastopen.c
     - copied unchanged from r292839, head/sys/netinet/tcp_fastopen.c
  projects/vnet/sys/netinet/tcp_fastopen.h
     - copied unchanged from r292839, head/sys/netinet/tcp_fastopen.h
  projects/vnet/sys/x86/include/cputypes.h
     - copied unchanged from r292839, head/sys/x86/include/cputypes.h
Replaced:
  projects/vnet/lib/libc/stdlib/hcreate.c
     - copied unchanged from r292839, head/lib/libc/stdlib/hcreate.c
Deleted:
  projects/vnet/contrib/llvm/patches/patch-08-llvm-r250085-fix-avx-crash.diff
  projects/vnet/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff
  projects/vnet/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff
  projects/vnet/lib/libmd/sha512.h
  projects/vnet/lib/libmd/sha512c.c
  projects/vnet/sys/crypto/sha2/sha2.c
  projects/vnet/sys/crypto/sha2/sha2.h
  projects/vnet/sys/dev/etherswitch/mdio.c
  projects/vnet/sys/dev/etherswitch/mdio.h
  projects/vnet/sys/dev/etherswitch/mdio_if.m
  projects/vnet/sys/dev/ixgbe/LICENSE
  projects/vnet/sys/dev/ixgbe/README
  projects/vnet/usr.bin/kdump/mkioctls
Modified:
  projects/vnet/MAINTAINERS   (contents, props changed)
  projects/vnet/Makefile.inc1
  projects/vnet/ObsoleteFiles.inc
  projects/vnet/bin/sh/tests/expansion/Makefile
  projects/vnet/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/vnet/cddl/sbin/zfs/Makefile
  projects/vnet/cddl/sbin/zpool/Makefile
  projects/vnet/cddl/usr.sbin/zdb/Makefile
  projects/vnet/cddl/usr.sbin/zhack/Makefile
  projects/vnet/contrib/bmake/ChangeLog
  projects/vnet/contrib/bmake/Makefile
  projects/vnet/contrib/bmake/mk/ChangeLog
  projects/vnet/contrib/bmake/mk/auto.obj.mk
  projects/vnet/contrib/bmake/mk/install-mk
  projects/vnet/contrib/bmake/os.sh
  projects/vnet/contrib/bmake/suff.c
  projects/vnet/contrib/bsnmp/snmpd/action.c
  projects/vnet/contrib/bsnmp/snmpd/main.c
  projects/vnet/contrib/bsnmp/snmpd/trap.c
  projects/vnet/contrib/gcc/config/rs6000/sysv4.h
  projects/vnet/contrib/libexecinfo/backtrace.3
  projects/vnet/contrib/llvm/include/llvm-c/Core.h
  projects/vnet/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
  projects/vnet/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
  projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
  projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  projects/vnet/contrib/llvm/lib/IR/AsmWriter.cpp
  projects/vnet/contrib/llvm/lib/IR/Core.cpp
  projects/vnet/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp
  projects/vnet/contrib/llvm/lib/MC/MCContext.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
  projects/vnet/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h
  projects/vnet/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
  projects/vnet/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp
  projects/vnet/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp
  projects/vnet/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td
  projects/vnet/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
  projects/vnet/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  projects/vnet/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp
  projects/vnet/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
  projects/vnet/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp   (contents, props changed)
  projects/vnet/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
  projects/vnet/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  projects/vnet/contrib/llvm/lib/Transforms/Utils/Local.cpp
  projects/vnet/contrib/llvm/patches/README.TXT
  projects/vnet/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/vnet/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/vnet/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
  projects/vnet/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  projects/vnet/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/vnet/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  projects/vnet/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
  projects/vnet/contrib/llvm/tools/llvm-lto/llvm-lto.cpp
  projects/vnet/etc/defaults/rc.conf
  projects/vnet/etc/mtree/BSD.debug.dist
  projects/vnet/etc/mtree/BSD.usr.dist
  projects/vnet/etc/rc.d/NETWORKING
  projects/vnet/etc/rc.d/jail
  projects/vnet/etc/rc.d/netwait
  projects/vnet/etc/services
  projects/vnet/gnu/usr.bin/binutils/ld/Makefile
  projects/vnet/include/search.h
  projects/vnet/lib/clang/include/Makefile
  projects/vnet/lib/clang/include/clang/Basic/Version.inc
  projects/vnet/lib/clang/include/clang/Config/config.h
  projects/vnet/lib/clang/include/llvm/Config/config.h
  projects/vnet/lib/clang/include/llvm/Config/llvm-config.h
  projects/vnet/lib/libc/Makefile
  projects/vnet/lib/libc/arm/sys/__vdso_gettc.c
  projects/vnet/lib/libc/gen/nlist.c
  projects/vnet/lib/libc/net/gethostbynis.c
  projects/vnet/lib/libc/net/netdb_private.h
  projects/vnet/lib/libc/stdio/findfp.c
  projects/vnet/lib/libc/stdlib/Makefile.inc
  projects/vnet/lib/libc/stdlib/hcreate.3
  projects/vnet/lib/libc/stdlib/tdelete.c
  projects/vnet/lib/libc/stdlib/tsearch.3
  projects/vnet/lib/libc/stdlib/tsearch.c
  projects/vnet/lib/libc/sys/clock_gettime.2
  projects/vnet/lib/libc/sys/gettimeofday.2
  projects/vnet/lib/libc/tests/resolv/Makefile
  projects/vnet/lib/libc/tests/resolv/resolv_test.c
  projects/vnet/lib/libc/tests/stdlib/Makefile
  projects/vnet/lib/libclang_rt/Makefile.inc
  projects/vnet/lib/libcrypt/Makefile
  projects/vnet/lib/libmd/Makefile
  projects/vnet/lib/libmd/sha512.3
  projects/vnet/lib/libmd/shadriver.c
  projects/vnet/lib/libsysdecode/Makefile
  projects/vnet/lib/libsysdecode/sysdecode.3
  projects/vnet/lib/libsysdecode/sysdecode.h
  projects/vnet/lib/libthr/thread/thr_fork.c
  projects/vnet/lib/msun/tests/fma_test.c
  projects/vnet/libexec/rtld-elf/arm/reloc.c
  projects/vnet/libexec/rtld-elf/rtld.c
  projects/vnet/sbin/gbde/Makefile
  projects/vnet/sbin/gbde/gbde.c
  projects/vnet/sbin/geom/class/eli/Makefile
  projects/vnet/sbin/ifconfig/Makefile
  projects/vnet/sbin/ifconfig/sfp.c
  projects/vnet/sbin/md5/Makefile
  projects/vnet/sbin/md5/md5.1
  projects/vnet/sbin/md5/md5.c
  projects/vnet/share/man/man4/Makefile
  projects/vnet/share/man/man5/procfs.5
  projects/vnet/share/man/man9/Makefile
  projects/vnet/share/man/man9/pci.9
  projects/vnet/share/misc/committers-ports.dot
  projects/vnet/share/mk/bsd.lib.mk
  projects/vnet/share/mk/sys.mk
  projects/vnet/sys/amd64/amd64/initcpu.c
  projects/vnet/sys/amd64/include/cputypes.h
  projects/vnet/sys/amd64/include/md_var.h
  projects/vnet/sys/arm/arm/pmap-v6-new.c
  projects/vnet/sys/arm64/include/setjmp.h
  projects/vnet/sys/boot/i386/zfsboot/zfsboot.c
  projects/vnet/sys/boot/pc98/boot2/boot2.c
  projects/vnet/sys/boot/pc98/libpc98/biosdisk.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
  projects/vnet/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/vnet/sys/compat/linux/linux_futex.c
  projects/vnet/sys/compat/linux/linux_timer.c
  projects/vnet/sys/compat/linuxkpi/common/include/linux/kobject.h
  projects/vnet/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/vnet/sys/conf/files
  projects/vnet/sys/conf/options
  projects/vnet/sys/conf/options.mips
  projects/vnet/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/vnet/sys/crypto/sha2/sha256.h
  projects/vnet/sys/dev/bxe/bxe.c
  projects/vnet/sys/dev/bxe/bxe.h
  projects/vnet/sys/dev/bxe/bxe_stats.c
  projects/vnet/sys/dev/bxe/bxe_stats.h
  projects/vnet/sys/dev/bxe/ecore_init.h
  projects/vnet/sys/dev/cxgbe/adapter.h
  projects/vnet/sys/dev/cxgbe/offload.h
  projects/vnet/sys/dev/cxgbe/t4_main.c
  projects/vnet/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/vnet/sys/dev/cxgbe/tom/t4_ddp.c
  projects/vnet/sys/dev/cxgbe/tom/t4_tom.c
  projects/vnet/sys/dev/cxgbe/tom/t4_tom.h
  projects/vnet/sys/dev/e1000/if_igb.c
  projects/vnet/sys/dev/e1000/if_igb.h
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_7240.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_8216.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_8226.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_8316.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_8327.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_9340.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_phy.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_reg.c
  projects/vnet/sys/dev/etherswitch/e6000sw/e6000sw.c
  projects/vnet/sys/dev/etherswitch/ip17x/ip17x.c
  projects/vnet/sys/dev/etherswitch/ukswitch/ukswitch.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  projects/vnet/sys/dev/isci/scil/scic_sds_phy.h
  projects/vnet/sys/dev/iscsi/iscsi.c
  projects/vnet/sys/dev/isp/isp.c
  projects/vnet/sys/dev/isp/isp_freebsd.c
  projects/vnet/sys/dev/isp/isp_freebsd.h
  projects/vnet/sys/dev/isp/isp_library.c
  projects/vnet/sys/dev/isp/isp_library.h
  projects/vnet/sys/dev/isp/isp_pci.c
  projects/vnet/sys/dev/isp/isp_sbus.c
  projects/vnet/sys/dev/isp/isp_target.c
  projects/vnet/sys/dev/isp/ispmbox.h
  projects/vnet/sys/dev/isp/ispvar.h
  projects/vnet/sys/dev/ixgbe/if_ix.c
  projects/vnet/sys/dev/ixgbe/if_ixv.c
  projects/vnet/sys/dev/ixgbe/ix_txrx.c
  projects/vnet/sys/dev/ixgbe/ixgbe.h
  projects/vnet/sys/dev/ixgbe/ixgbe_82598.c
  projects/vnet/sys/dev/ixgbe/ixgbe_82599.c
  projects/vnet/sys/dev/ixgbe/ixgbe_api.c
  projects/vnet/sys/dev/ixgbe/ixgbe_api.h
  projects/vnet/sys/dev/ixgbe/ixgbe_common.c
  projects/vnet/sys/dev/ixgbe/ixgbe_dcb.c
  projects/vnet/sys/dev/ixgbe/ixgbe_osdep.h
  projects/vnet/sys/dev/ixgbe/ixgbe_phy.c
  projects/vnet/sys/dev/ixgbe/ixgbe_phy.h
  projects/vnet/sys/dev/ixgbe/ixgbe_type.h
  projects/vnet/sys/dev/ixgbe/ixgbe_vf.c
  projects/vnet/sys/dev/ixgbe/ixgbe_x540.c
  projects/vnet/sys/dev/ixgbe/ixgbe_x550.c
  projects/vnet/sys/dev/ixgbe/ixgbe_x550.h
  projects/vnet/sys/dev/mge/if_mge.c
  projects/vnet/sys/dev/mlx5/device.h
  projects/vnet/sys/dev/mlx5/mlx5_en/en.h
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
  projects/vnet/sys/dev/netmap/netmap.c
  projects/vnet/sys/dev/pci/pci.c
  projects/vnet/sys/dev/pci/pci_if.m
  projects/vnet/sys/dev/pci/pci_private.h
  projects/vnet/sys/dev/pci/pcivar.h
  projects/vnet/sys/dev/random/build.sh
  projects/vnet/sys/dev/random/fortuna.c
  projects/vnet/sys/dev/random/hash.c
  projects/vnet/sys/dev/random/other_algorithm.c
  projects/vnet/sys/dev/random/randomdev.c
  projects/vnet/sys/dev/random/unit_test.c
  projects/vnet/sys/dev/random/yarrow.c
  projects/vnet/sys/dev/rt/if_rt.c
  projects/vnet/sys/dev/rt/if_rtreg.h
  projects/vnet/sys/dev/rt/if_rtvar.h
  projects/vnet/sys/dev/usb/controller/xhci.h
  projects/vnet/sys/dev/usb/controller/xhci_pci.c
  projects/vnet/sys/fs/devfs/devfs_vnops.c
  projects/vnet/sys/geom/bde/g_bde.c
  projects/vnet/sys/geom/bde/g_bde_crypt.c
  projects/vnet/sys/geom/bde/g_bde_lock.c
  projects/vnet/sys/geom/bde/g_bde_work.c
  projects/vnet/sys/geom/eli/g_eli.h
  projects/vnet/sys/geom/geom_map.c
  projects/vnet/sys/geom/part/g_part.c
  projects/vnet/sys/geom/part/g_part.h
  projects/vnet/sys/geom/part/g_part_gpt.c
  projects/vnet/sys/i386/i386/initcpu.c
  projects/vnet/sys/i386/include/cputypes.h
  projects/vnet/sys/kern/imgact_elf.c
  projects/vnet/sys/kern/kern_resource.c
  projects/vnet/sys/kern/kern_time.c
  projects/vnet/sys/kern/link_elf.c
  projects/vnet/sys/mips/atheros/if_arge.c
  projects/vnet/sys/mips/cavium/cvmx_config.h
  projects/vnet/sys/mips/conf/RT305X
  projects/vnet/sys/mips/include/cpufunc.h
  projects/vnet/sys/mips/include/cpuinfo.h
  projects/vnet/sys/mips/include/cpuregs.h
  projects/vnet/sys/mips/include/pte.h
  projects/vnet/sys/mips/mips/cpu.c
  projects/vnet/sys/mips/rt305x/files.rt305x
  projects/vnet/sys/mips/rt305x/obio.c
  projects/vnet/sys/mips/rt305x/rt305x_dotg.c
  projects/vnet/sys/mips/rt305x/rt305x_machdep.c
  projects/vnet/sys/mips/rt305x/rt305x_sysctl.c
  projects/vnet/sys/mips/rt305x/rt305xreg.h
  projects/vnet/sys/mips/rt305x/uart_bus_rt305x.c
  projects/vnet/sys/mips/rt305x/uart_cpu_rt305x.c
  projects/vnet/sys/modules/Makefile
  projects/vnet/sys/modules/crypto/Makefile
  projects/vnet/sys/modules/cxgbe/Makefile
  projects/vnet/sys/modules/geom/geom_bde/Makefile
  projects/vnet/sys/modules/ix/Makefile
  projects/vnet/sys/modules/ixv/Makefile
  projects/vnet/sys/modules/usb/rsufw/Makefile.inc
  projects/vnet/sys/modules/usb/urtwnfw/Makefile.inc
  projects/vnet/sys/modules/zfs/Makefile
  projects/vnet/sys/net/bpf.c
  projects/vnet/sys/net/if.c
  projects/vnet/sys/net/if_llatbl.c
  projects/vnet/sys/net/sff8436.h
  projects/vnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  projects/vnet/sys/netinet/if_ether.c
  projects/vnet/sys/netinet/in_rmx.c
  projects/vnet/sys/netinet/sctp_os_bsd.h
  projects/vnet/sys/netinet/sctp_output.c
  projects/vnet/sys/netinet/tcp.h
  projects/vnet/sys/netinet/tcp_input.c
  projects/vnet/sys/netinet/tcp_output.c
  projects/vnet/sys/netinet/tcp_subr.c
  projects/vnet/sys/netinet/tcp_syncache.c
  projects/vnet/sys/netinet/tcp_syncache.h
  projects/vnet/sys/netinet/tcp_timer.c
  projects/vnet/sys/netinet/tcp_usrreq.c
  projects/vnet/sys/netinet/tcp_var.h
  projects/vnet/sys/netinet/udp_usrreq.c
  projects/vnet/sys/netinet6/in6.c
  projects/vnet/sys/netinet6/in6_rmx.c
  projects/vnet/sys/opencrypto/xform.h
  projects/vnet/sys/powerpc/booke/pmap.c
  projects/vnet/sys/powerpc/include/param.h
  projects/vnet/sys/powerpc/include/platform.h
  projects/vnet/sys/powerpc/include/pmap.h
  projects/vnet/sys/powerpc/ofw/ofw_machdep.c
  projects/vnet/sys/powerpc/powerpc/machdep.c
  projects/vnet/sys/powerpc/powerpc/platform.c
  projects/vnet/sys/powerpc/powerpc/pmap_dispatch.c
  projects/vnet/sys/sys/fcntl.h
  projects/vnet/sys/sys/gpt.h
  projects/vnet/sys/sys/libkern.h
  projects/vnet/sys/vm/vnode_pager.c
  projects/vnet/sys/x86/x86/identcpu.c
  projects/vnet/sys/x86/xen/pv.c
  projects/vnet/sys/x86/xen/xen_apic.c
  projects/vnet/tests/sys/aio/aio_kqueue_test.c
  projects/vnet/tests/sys/aio/lio_kqueue_test.c
  projects/vnet/tests/sys/kern/pipe/pipe_overcommit1_test.c
  projects/vnet/tests/sys/kern/unix_seqpacket_test.c
  projects/vnet/tests/sys/mac/bsdextended/ugidfw_test.c
  projects/vnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/vnet/tools/regression/sockets/unix_passfd/unix_passfd.c
  projects/vnet/tools/tools/nanobsd/embedded/common
  projects/vnet/tools/tools/nanobsd/embedded/rpi2.cfg
  projects/vnet/usr.bin/bmake/Makefile
  projects/vnet/usr.bin/kdump/Makefile
  projects/vnet/usr.bin/kdump/kdump.c
  projects/vnet/usr.bin/nfsstat/Makefile
  projects/vnet/usr.bin/nfsstat/nfsstat.c
  projects/vnet/usr.bin/systat/vmstat.c
  projects/vnet/usr.bin/truss/Makefile
  projects/vnet/usr.bin/truss/syscalls.c
  projects/vnet/usr.bin/vmstat/vmstat.c
  projects/vnet/usr.sbin/bsdinstall/scripts/entropy
  projects/vnet/usr.sbin/camdd/Makefile
  projects/vnet/usr.sbin/cron/cron/do_command.c
  projects/vnet/usr.sbin/cron/cron/popen.c
  projects/vnet/usr.sbin/cron/crontab/crontab.c
  projects/vnet/usr.sbin/fstyp/Makefile
  projects/vnet/usr.sbin/fstyp/fstyp.c
  projects/vnet/usr.sbin/fstyp/geli.c
  projects/vnet/usr.sbin/fstyp/zfs.c
  projects/vnet/usr.sbin/pwd_mkdb/pwd_mkdb.c
Directory Properties:
  projects/vnet/   (props changed)
  projects/vnet/cddl/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/contrib/bmake/   (props changed)
  projects/vnet/contrib/gcc/   (props changed)
  projects/vnet/contrib/libexecinfo/   (props changed)
  projects/vnet/contrib/llvm/   (props changed)
  projects/vnet/contrib/llvm/tools/clang/   (props changed)
  projects/vnet/contrib/llvm/tools/lldb/   (props changed)
  projects/vnet/contrib/llvm/tools/llvm-dwarfdump/   (props changed)
  projects/vnet/contrib/llvm/tools/llvm-lto/   (props changed)
  projects/vnet/gnu/usr.bin/binutils/   (props changed)
  projects/vnet/include/   (props changed)
  projects/vnet/lib/libc/   (props changed)
  projects/vnet/sbin/   (props changed)
  projects/vnet/share/   (props changed)
  projects/vnet/share/man/man4/   (props changed)
  projects/vnet/sys/   (props changed)
  projects/vnet/sys/boot/   (props changed)
  projects/vnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/sys/conf/   (props changed)
  projects/vnet/sys/contrib/ipfilter/   (props changed)
  projects/vnet/sys/dev/hyperv/   (props changed)

Modified: projects/vnet/MAINTAINERS
==============================================================================

--- projects/vnet/MAINTAINERS	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/MAINTAINERS	Mon Dec 28 22:52:36 2015	(r292843)
@@ -24,6 +24,15 @@ maintainer of a sub-system is to check r
 sub-system.
 ***
 
+***
+Maintainers are encouraged to visit:
+  https://reviews.freebsd.org/herald
+
+and configure notifications for parts of the tree which they maintain.
+Notifications can automatically be sent when someone proposes a revision or
+makes a commit to the specified subtree.
+***
+
 subsystem	login	notes
 -----------------------------
 atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
@@ -47,7 +56,9 @@ isci(4)		jimharris	Pre-commit review req
 iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 kqueue		jmg	Pre-commit review requested.  Documentation Required.
+libdpv		dteske	Pre-commit review requested. Keep in sync with dpv(1).
 libfetch	des	Pre-commit review requested.
+libfigpar	dteske	Pre-commit review requested.
 libpam		des	Pre-commit review requested.
 linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
@@ -76,6 +87,7 @@ sh(1)		jilles		Pre-commit review request
 				compiled in as builtins.
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
+sys/boot/forth		dteske	Pre-commit review requested.
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.
@@ -85,5 +97,8 @@ sys/dev/usb	hselasky	If in doubt, ask.
 sys/netinet/ip_carp.c	glebius	Pre-commit review recommended.
 sys/netpfil/pf	kp,glebius	Pre-commit review recommended.
 tests			freebsd-testing,ngie	Pre-commit review requested.
+usr.sbin/bsdconfig	dteske	Pre-commit phabricator review requested.
+usr.sbin/dpv	dteske	Pre-commit review requested. Keep in sync with libdpv.
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
+usr.sbin/sysrc	dteske	Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr.
 vmm(4)		neel,grehan	Pre-commit review requested.

Modified: projects/vnet/Makefile.inc1
==============================================================================
--- projects/vnet/Makefile.inc1	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/Makefile.inc1	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1677,7 +1677,7 @@ NXBMAKE=	${NXBENV} ${MAKE} \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no
+		MK_LLDB=no MK_DEBUG_FILES=no
 
 # native-xtools is the current target for qemu-user cross builds of ports
 # via poudriere and the imgact_binmisc kernel module.

Modified: projects/vnet/ObsoleteFiles.inc
==============================================================================
--- projects/vnet/ObsoleteFiles.inc	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/ObsoleteFiles.inc	Mon Dec 28 22:52:36 2015	(r292843)
@@ -38,6 +38,88 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1.
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
+OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
+OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
+OLD_DIRS+=usr/lib/clang/3.7.0/include
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.7.0/lib
+OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 OLD_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme

Modified: projects/vnet/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/vnet/bin/sh/tests/expansion/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/bin/sh/tests/expansion/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -90,5 +90,6 @@ FILES+=		trim5.0
 FILES+=		trim6.0
 FILES+=		trim7.0
 FILES+=		trim8.0
+FILES+=		trim9.0
 
 .include <bsd.test.mk>

Copied: projects/vnet/bin/sh/tests/expansion/trim9.0 (from r292839, head/bin/sh/tests/expansion/trim9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/expansion/trim9.0	Mon Dec 28 22:52:36 2015	(r292843, copy of r292839, head/bin/sh/tests/expansion/trim9.0)
@@ -0,0 +1,61 @@
+# $FreeBSD$
+
+# POSIX does not specify these but they occasionally occur in the wild.
+# This just serves to keep working what currently works.
+
+failures=''
+ok=''
+
+testcase() {
+	code="$1"
+	expected="$2"
+	oIFS="$IFS"
+	eval "$code"
+	IFS='|'
+	result="$#|$*"
+	IFS="$oIFS"
+	if [ "x$result" = "x$expected" ]; then
+		ok=x$ok
+	else
+		failures=x$failures
+		echo "For $code, expected $expected actual $result"
+	fi
+}
+
+testcase 'shift $#; set -- "${*#Q}"'		'1|'
+testcase 'shift $#; set -- "${*##Q}"'		'1|'
+testcase 'shift $#; set -- "${*%Q}"'		'1|'
+testcase 'shift $#; set -- "${*%%Q}"'		'1|'
+testcase 'set -- Q R; set -- "${*#Q}"'		'1| R'
+testcase 'set -- Q R; set -- "${*##Q}"'		'1| R'
+testcase 'set -- Q R; set -- "${*%R}"'		'1|Q '
+testcase 'set -- Q R; set -- "${*%%R}"'		'1|Q '
+testcase 'set -- Q R; set -- "${*#S}"'		'1|Q R'
+testcase 'set -- Q R; set -- "${*##S}"'		'1|Q R'
+testcase 'set -- Q R; set -- "${*%S}"'		'1|Q R'
+testcase 'set -- Q R; set -- "${*%%S}"'		'1|Q R'
+testcase 'set -- Q R; set -- ${*#Q}'		'1|R'
+testcase 'set -- Q R; set -- ${*##Q}'		'1|R'
+testcase 'set -- Q R; set -- ${*%R}'		'1|Q'
+testcase 'set -- Q R; set -- ${*%%R}'		'1|Q'
+testcase 'set -- Q R; set -- ${*#S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${*##S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${*%S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${*%%S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${@#Q}'		'1|R'
+testcase 'set -- Q R; set -- ${@##Q}'		'1|R'
+testcase 'set -- Q R; set -- ${@%R}'		'1|Q'
+testcase 'set -- Q R; set -- ${@%%R}'		'1|Q'
+testcase 'set -- Q R; set -- ${@#S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${@##S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${@%S}'		'2|Q|R'
+testcase 'set -- Q R; set -- ${@%%S}'		'2|Q|R'
+testcase 'set -- Q R; set -- "${@#Q}"'		'2||R'
+testcase 'set -- Q R; set -- "${@%R}"'		'2|Q|'
+testcase 'set -- Q R; set -- "${@%%R}"'		'2|Q|'
+testcase 'set -- Q R; set -- "${@#S}"'		'2|Q|R'
+testcase 'set -- Q R; set -- "${@##S}"'		'2|Q|R'
+testcase 'set -- Q R; set -- "${@%S}"'		'2|Q|R'
+testcase 'set -- Q R; set -- "${@%%S}"'		'2|Q|R'
+
+test "x$failures" = x

Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Dec 28 22:52:36 2015	(r292843)
@@ -3657,7 +3657,8 @@ main(int argc, char **argv)
 
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
-	ASSERT(g_zfs != NULL);
+	if (g_zfs == NULL)
+		fatal("Fail to initialize zfs");
 
 	if (dump_all)
 		verbose = MAX(verbose, 1);

Modified: projects/vnet/cddl/sbin/zfs/Makefile
==============================================================================
--- projects/vnet/cddl/sbin/zfs/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/cddl/sbin/zfs/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
-LIBADD=	geom jail nvpair umem util uutil zfs_core zfs
+LIBADD=	jail nvpair uutil zfs_core zfs
 
 .include <bsd.prog.mk>

Modified: projects/vnet/cddl/sbin/zpool/Makefile
==============================================================================
--- projects/vnet/cddl/sbin/zpool/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/cddl/sbin/zpool/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
 
-LIBADD=	avl geom nvpair umem util uutil zfs_core zfs
+LIBADD=	geom nvpair uutil zfs
 
 .include <bsd.prog.mk>

Modified: projects/vnet/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- projects/vnet/cddl/usr.sbin/zdb/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/cddl/usr.sbin/zdb/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair umem uutil zfs zpool
 
 # Since there are many asserts in this program, it makes no sense to compile
 # it without debugging.

Modified: projects/vnet/cddl/usr.sbin/zhack/Makefile
==============================================================================
--- projects/vnet/cddl/usr.sbin/zhack/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/cddl/usr.sbin/zhack/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair zfs zpool
 
 CFLAGS+=	-DDEBUG=1
 #DEBUG_FLAGS+=	-g

Modified: projects/vnet/contrib/bmake/ChangeLog
==============================================================================
--- projects/vnet/contrib/bmake/ChangeLog	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/ChangeLog	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1,3 +1,9 @@
+2015-12-20  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151220
+	  Merge with NetBSD make, pick up
+	  o suff.c: re-initialize suffNull when clearing suffixes.
+
 2015-12-01  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151201

Modified: projects/vnet/contrib/bmake/Makefile
==============================================================================
--- projects/vnet/contrib/bmake/Makefile	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/Makefile	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
+#	$Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151201
+MAKE_VERSION= 20151220
 
 PROG=	bmake
 

Modified: projects/vnet/contrib/bmake/mk/ChangeLog
==============================================================================
--- projects/vnet/contrib/bmake/mk/ChangeLog	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/mk/ChangeLog	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1,3 +1,9 @@
+2015-12-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20151212
+	* auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist.
+	  only apply :tA to __objdir when comparing to .OBJDIR
+
 2015-11-14  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* install-mk (MK_VERSION): 20151111

Modified: projects/vnet/contrib/bmake/mk/auto.obj.mk
==============================================================================
--- projects/vnet/contrib/bmake/mk/auto.obj.mk	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/mk/auto.obj.mk	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1,4 +1,4 @@
-# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $
+# $Id: auto.obj.mk,v 1.12 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 2004, Simon J. Gerraty
 #
@@ -40,12 +40,12 @@ MKOBJDIRS= auto
 .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto
 # Use __objdir here so it is easier to tweak without impacting
 # the logic.
-.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
+.if !empty(MAKEOBJDIRPREFIX)
 __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
 .endif
 __objdir?= ${MAKEOBJDIR:Uobj}
-__objdir:= ${__objdir:tA}
-.if ${.OBJDIR} != ${__objdir}
+__objdir:= ${__objdir}
+.if ${.OBJDIR:tA} != ${__objdir:tA}
 # We need to chdir, make the directory if needed
 .if !exists(${__objdir}/) && \
 	(${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
@@ -53,11 +53,10 @@ __objdir:= ${__objdir:tA}
 __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \
         ${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \
         ${Mkdirs}; Mkdirs ${__objdir}
-__objdir:= ${__objdir:tA}
 .endif
 # This causes make to use the specified directory as .OBJDIR
 .OBJDIR: ${__objdir}
-.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != ""
+.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != ""
 .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
 .endif
 .endif

Modified: projects/vnet/contrib/bmake/mk/install-mk
==============================================================================
--- projects/vnet/contrib/bmake/mk/install-mk	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/mk/install-mk	Mon Dec 28 22:52:36 2015	(r292843)
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $
+#	$Id: install-mk,v 1.118 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg at crufty.net
 #
 
-MK_VERSION=20151111
+MK_VERSION=20151212
 OWNER=
 GROUP=
 MODE=444

Modified: projects/vnet/contrib/bmake/os.sh
==============================================================================
--- projects/vnet/contrib/bmake/os.sh	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/os.sh	Mon Dec 28 22:52:36 2015	(r292843)
@@ -17,7 +17,7 @@
 #	Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $
+#	$Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -56,10 +56,10 @@ Which() {
 	case "$1" in
 	/*)	test $t $1 && echo $1;;
 	*)
-        	# some shells cannot correctly handle `IFS`
-        	# in conjunction with the for loop.
-        	_dirs=`IFS=:; echo ${2:-$PATH}`
-        	for d in $_dirs
+		# some shells cannot correctly handle `IFS`
+		# in conjunction with the for loop.
+		_dirs=`IFS=:; echo ${2:-$PATH}`
+		for d in $_dirs
 		do
 			test $t $d/$1 && { echo $d/$1; break; }
 		done
@@ -70,11 +70,11 @@ Which() {
 # tr is insanely non-portable wrt char classes, so we need to
 # spell out the alphabet. sed y/// would work too.
 toUpper() {
-        ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+	${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 }
 
 toLower() {
-        ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+	${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
 K=
@@ -91,7 +91,7 @@ SunOS)
 	export CHOWN
 	
 	# Great! Solaris keeps moving arch(1)
-        # should just bite the bullet and use uname -p
+	# should just bite the bullet and use uname -p
 	arch=`Which arch /usr/bin:/usr/ucb`
 	
 	MAILER=/usr/ucb/Mail
@@ -105,8 +105,8 @@ SunOS)
 		MACHINE=$MACHINE_ARCH
 		;;
 	4*)
-                MACHINE_ARCH=`arch`
-                ;;
+		MACHINE_ARCH=`arch`
+		;;
 	5*)
 		K=-k
 		LOCAL_FS=ufs
@@ -116,8 +116,8 @@ SunOS)
 		# overwriting an existing file!!!!! We want one that works!
 		test -x /usr/xpg4/bin/ln && LN=${LN:-/usr/xpg4/bin/ln}
 		# wonderful, 5.8's tr again require's []'s
-                # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
-                # use toUpper/toLower instead.
+		# but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
+		# use toUpper/toLower instead.
 		;;
 	esac
 	case "$OS/$MACHINE_ARCH" in
@@ -142,9 +142,9 @@ SunOS)
 		SHARE_ARCH=$OS/$HOST
 		;;
 	OpenBSD)
-	        arch=`Which arch /usr/bin:/usr/ucb:$PATH`
-                MACHINE_ARCH=`$arch -s`
-                ;;
+		arch=`Which arch /usr/bin:/usr/ucb:$PATH`
+		MACHINE_ARCH=`$arch -s`
+		;;
 	esac
 	NAWK=awk
 	export NAWK
@@ -218,17 +218,25 @@ export HOST_TARGET
 
 case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac
 
-export HOSTNAME HOST        
+Echo() {
+	case "$1" in
+	-n) _n=$N _c=$C; shift;;
+	*) _n= _c=;;
+	esac
+	echo $_n "$@" $_c
+}
+
+export HOSTNAME HOST	    
 export OS MACHINE MACHINE_ARCH OSREL OSMAJOR LOCAL_FS TMP_DIRS MAILER N C K PS_AXC
 export LN SHARE_ARCH TR
 
 case /$0 in
 */os.sh)
-        for v in $*
+	for v in $*
 	do
-                eval vv=\$$v
-                echo "$v='$vv'"
+		eval vv=\$$v
+		echo "$v='$vv'"
 	done
-        ;;
+	;;
 esac
 

Modified: projects/vnet/contrib/bmake/suff.c
==============================================================================
--- projects/vnet/contrib/bmake/suff.c	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bmake/suff.c	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -553,7 +553,20 @@ Suff_ClearSuffixes(void)
 #endif
     sufflist = Lst_Init(FALSE);
     sNum = 0;
-    suffNull = emptySuff;
+    if (suffNull)
+	SuffFree(suffNull);
+    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
+
+    suffNull->name =   	    bmake_strdup("");
+    suffNull->nameLen =     0;
+    suffNull->searchPath =  Lst_Init(FALSE);
+    Dir_Concat(suffNull->searchPath, dirSearchPath);
+    suffNull->children =    Lst_Init(FALSE);
+    suffNull->parents =	    Lst_Init(FALSE);
+    suffNull->ref =	    Lst_Init(FALSE);
+    suffNull->sNum =   	    sNum++;
+    suffNull->flags =  	    SUFF_NULL;
+    suffNull->refCount =    1;
 }
 
 /*-
@@ -2524,32 +2537,18 @@ Suff_SetNull(char *name)
 void
 Suff_Init(void)
 {
-    sufflist = Lst_Init(FALSE);
 #ifdef CLEANUP
     suffClean = Lst_Init(FALSE);
 #endif
     srclist = Lst_Init(FALSE);
     transforms = Lst_Init(FALSE);
 
-    sNum = 0;
     /*
      * Create null suffix for single-suffix rules (POSIX). The thing doesn't
      * actually go on the suffix list or everyone will think that's its
      * suffix.
      */
-    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
-
-    suffNull->name =   	    bmake_strdup("");
-    suffNull->nameLen =     0;
-    suffNull->searchPath =  Lst_Init(FALSE);
-    Dir_Concat(suffNull->searchPath, dirSearchPath);
-    suffNull->children =    Lst_Init(FALSE);
-    suffNull->parents =	    Lst_Init(FALSE);
-    suffNull->ref =	    Lst_Init(FALSE);
-    suffNull->sNum =   	    sNum++;
-    suffNull->flags =  	    SUFF_NULL;
-    suffNull->refCount =    1;
-
+    Suff_ClearSuffixes();
 }
 
 

Modified: projects/vnet/contrib/bsnmp/snmpd/action.c
==============================================================================
--- projects/vnet/contrib/bsnmp/snmpd/action.c	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bsnmp/snmpd/action.c	Mon Dec 28 22:52:36 2015	(r292843)
@@ -60,29 +60,6 @@ static const struct asn_oid
 #endif
 
 /*
- * Get a string value from the KERN sysctl subtree.
- */
-static char *
-act_getkernstring(int id)
-{
-	int mib[2];
-	size_t len;
-	char *string;
-
-	mib[0] = CTL_KERN;
-	mib[1] = id;
-	if (sysctl(mib, 2, NULL, &len, NULL, 0) != 0)
-		return (NULL);
-	if ((string = malloc(len)) == NULL)
-		return (NULL);
-	if (sysctl(mib, 2, string, &len, NULL, 0) != 0) {
-		free(string);
-		return (NULL);
-	}
-	return (string);
-}
-
-/*
  * Get an integer value from the KERN sysctl subtree.
  */
 static char *

Modified: projects/vnet/contrib/bsnmp/snmpd/main.c
==============================================================================
--- projects/vnet/contrib/bsnmp/snmpd/main.c	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bsnmp/snmpd/main.c	Mon Dec 28 22:52:36 2015	(r292843)
@@ -119,26 +119,30 @@ static struct lmodules modules_start = T
 struct community_list community_list = TAILQ_HEAD_INITIALIZER(community_list);
 
 /* list of all known USM users */
-struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist);
+static struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist);
 
 /* A list of all VACM users configured, including v1, v2c and v3 */
-struct vacm_userlist vacm_userlist = SLIST_HEAD_INITIALIZER(vacm_userlist);
+static struct vacm_userlist vacm_userlist =
+    SLIST_HEAD_INITIALIZER(vacm_userlist);
 
 /* A list of all VACM groups */
-struct vacm_grouplist vacm_grouplist = SLIST_HEAD_INITIALIZER(vacm_grouplist);
+static struct vacm_grouplist vacm_grouplist =
+    SLIST_HEAD_INITIALIZER(vacm_grouplist);
 
 static struct vacm_group vacm_default_group = {
 	.groupname = "",
 };
 
 /* The list of configured access entries */
-struct vacm_accesslist vacm_accesslist = TAILQ_HEAD_INITIALIZER(vacm_accesslist);
+static struct vacm_accesslist vacm_accesslist =
+    TAILQ_HEAD_INITIALIZER(vacm_accesslist);
 
 /* The list of configured views */
-struct vacm_viewlist vacm_viewlist = SLIST_HEAD_INITIALIZER(vacm_viewlist);
+static struct vacm_viewlist vacm_viewlist =
+    SLIST_HEAD_INITIALIZER(vacm_viewlist);
 
 /* The list of configured contexts */
-struct vacm_contextlist vacm_contextlist =
+static struct vacm_contextlist vacm_contextlist =
     SLIST_HEAD_INITIALIZER(vacm_contextlist);
 
 /* list of all installed object resources */

Modified: projects/vnet/contrib/bsnmp/snmpd/trap.c
==============================================================================
--- projects/vnet/contrib/bsnmp/snmpd/trap.c	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/bsnmp/snmpd/trap.c	Mon Dec 28 22:52:36 2015	(r292843)
@@ -60,15 +60,15 @@
 struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list);
 
 /* List of target addresses */
-struct target_addresslist target_addresslist =
+static struct target_addresslist target_addresslist =
     SLIST_HEAD_INITIALIZER(target_addresslist);
 
 /* List of target parameters */
-struct target_paramlist target_paramlist =
+static struct target_paramlist target_paramlist =
     SLIST_HEAD_INITIALIZER(target_paramlist);
 
 /* List of notification targets */
-struct target_notifylist target_notifylist =
+static struct target_notifylist target_notifylist =
     SLIST_HEAD_INITIALIZER(target_notifylist);
 
 static const struct asn_oid oid_begemotTrapSinkTable =

Modified: projects/vnet/contrib/gcc/config/rs6000/sysv4.h
==============================================================================
--- projects/vnet/contrib/gcc/config/rs6000/sysv4.h	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/gcc/config/rs6000/sysv4.h	Mon Dec 28 22:52:36 2015	(r292843)
@@ -282,7 +282,9 @@ do {									\
 #define RESTORE_FP_SUFFIX "_l"
 
 /* Type used for ptrdiff_t, as a string used in a declaration.  */
+#ifndef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
+#endif
 
 /* Type used for wchar_t, as a string used in a declaration.  */
 /* Override svr4.h definition.  */

Modified: projects/vnet/contrib/libexecinfo/backtrace.3
==============================================================================
--- projects/vnet/contrib/libexecinfo/backtrace.3	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/libexecinfo/backtrace.3	Mon Dec 28 22:52:36 2015	(r292843)
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 3, 2015
+.Dd December 12, 2015
 .Dt BACKTRACE 3
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Ft "char **"
 .Fn backtrace_symbols_fmt "void * const *addrlist" "size_t len" "const char *fmt"
 .Ft int
-.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "const char *fmt" "int fd"
+.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "int fd" "const char *fmt"
 .Sh DESCRIPTION
 The
 .Fn backtrace
@@ -85,7 +85,7 @@ the /proc filesystem is available to det
 The difference of the symbol address and the address element printed
 using 0x%tx.
 .It Dv D
-The difference of the symbol addresss and the address element printed using
+The difference of the symbol address and the address element printed using
 +0x%tx if non-zero, or nothing if zero.
 .It Dv f
 The filename of the symbol as determined by

Modified: projects/vnet/contrib/llvm/include/llvm-c/Core.h
==============================================================================
--- projects/vnet/contrib/llvm/include/llvm-c/Core.h	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/include/llvm-c/Core.h	Mon Dec 28 22:52:36 2015	(r292843)
@@ -2675,7 +2675,8 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder
                              LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
                              const char *Name);
 LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
-                                 unsigned NumClauses, const char *Name);
+                                 LLVMValueRef PersFn, unsigned NumClauses,
+                                 const char *Name);
 LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
 LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
 

Modified: projects/vnet/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
==============================================================================
--- projects/vnet/contrib/llvm/include/llvm/CodeGen/CommandFlags.h	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/include/llvm/CodeGen/CommandFlags.h	Mon Dec 28 22:52:36 2015	(r292843)
@@ -21,7 +21,7 @@
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Module.h"
 #include "llvm/MC/MCTargetOptionsCommandFlags.h"
-#include "llvm//MC/SubtargetFeature.h"
+#include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Host.h"

Modified: projects/vnet/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -169,7 +169,7 @@ void WinException::endFunction(const Mac
     Asm->OutStreamer->PopSection();
   }
 
-  if (shouldEmitMoves)
+  if (shouldEmitMoves || shouldEmitPersonality)
     Asm->OutStreamer->EmitWinCFIEndProc();
 }
 

Modified: projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -439,7 +439,7 @@ ExpandUnalignedLoad(LoadSDNode *LD, Sele
                              ISD::ANY_EXTEND, dl, VT, Result);
 
       ValResult = Result;
-      ChainResult = Chain;
+      ChainResult = newLoad.getValue(1);
       return;
     }
 

Modified: projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1010,6 +1010,8 @@ SDValue DAGTypeLegalizer::GetVectorEleme
 
   // Calculate the element offset and add it to the pointer.
   unsigned EltSize = EltVT.getSizeInBits() / 8; // FIXME: should be ABI size.
+  assert(EltSize * 8 == EltVT.getSizeInBits() &&
+         "Converting bits to bytes lost precision");
 
   Index = DAG.getNode(ISD::MUL, dl, Index.getValueType(), Index,
                       DAG.getConstant(EltSize, dl, Index.getValueType()));

Modified: projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -1528,9 +1528,25 @@ SDValue DAGTypeLegalizer::SplitVecOp_EXT
   if (CustomLowerNode(N, N->getValueType(0), true))
     return SDValue();
 
-  // Store the vector to the stack.
-  EVT EltVT = VecVT.getVectorElementType();
+  // Make the vector elements byte-addressable if they aren't already.
   SDLoc dl(N);
+  EVT EltVT = VecVT.getVectorElementType();
+  if (EltVT.getSizeInBits() < 8) {
+    SmallVector<SDValue, 4> ElementOps;
+    for (unsigned i = 0; i < VecVT.getVectorNumElements(); ++i) {
+      ElementOps.push_back(DAG.getAnyExtOrTrunc(
+          DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, EltVT, Vec,
+                      DAG.getConstant(i, dl, MVT::i8)),
+          dl, MVT::i8));
+    }
+
+    EltVT = MVT::i8;
+    VecVT = EVT::getVectorVT(*DAG.getContext(), EltVT,
+                             VecVT.getVectorNumElements());
+    Vec = DAG.getNode(ISD::BUILD_VECTOR, dl, VecVT, ElementOps);
+  }
+
+  // Store the vector to the stack.
   SDValue StackPtr = DAG.CreateStackTemporary(VecVT);
   SDValue Store = DAG.getStore(DAG.getEntryNode(), dl, Vec, StackPtr,
                                MachinePointerInfo(), false, false, 0);

Modified: projects/vnet/contrib/llvm/lib/IR/AsmWriter.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/IR/AsmWriter.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/IR/AsmWriter.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -794,6 +794,10 @@ void SlotTracker::processFunction() {
   ST_DEBUG("begin processFunction!\n");
   fNext = 0;
 
+  // Process function metadata if it wasn't hit at the module-level.
+  if (!ShouldInitializeAllMetadata)
+    processFunctionMetadata(*TheFunction);
+
   // Add all the function arguments with no names.
   for(Function::const_arg_iterator AI = TheFunction->arg_begin(),
       AE = TheFunction->arg_end(); AI != AE; ++AI)
@@ -807,8 +811,6 @@ void SlotTracker::processFunction() {
     if (!BB.hasName())
       CreateFunctionSlot(&BB);
 
-    processFunctionMetadata(*TheFunction);
-
     for (auto &I : BB) {
       if (!I.getType()->isVoidTy() && !I.hasName())
         CreateFunctionSlot(&I);
@@ -836,11 +838,11 @@ void SlotTracker::processFunction() {
 
 void SlotTracker::processFunctionMetadata(const Function &F) {
   SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
-  for (auto &BB : F) {
-    F.getAllMetadata(MDs);
-    for (auto &MD : MDs)
-      CreateMetadataSlot(MD.second);
+  F.getAllMetadata(MDs);
+  for (auto &MD : MDs)
+    CreateMetadataSlot(MD.second);
 
+  for (auto &BB : F) {
     for (auto &I : BB)
       processInstructionMetadata(I);
   }

Modified: projects/vnet/contrib/llvm/lib/IR/Core.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/IR/Core.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/IR/Core.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -2257,7 +2257,14 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder
 }
 
 LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
-                                 unsigned NumClauses, const char *Name) {
+                                 LLVMValueRef PersFn, unsigned NumClauses,
+                                 const char *Name) {
+  // The personality used to live on the landingpad instruction, but now it
+  // lives on the parent function. For compatibility, take the provided
+  // personality and put it on the parent function.
+  if (PersFn)
+    unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
+        cast<Function>(unwrap(PersFn)));
   return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
 }
 

Modified: projects/vnet/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -63,14 +63,21 @@ const char* LTOCodeGenerator::getVersion
 #endif
 }
 
+static void handleLTODiagnostic(const DiagnosticInfo &DI) {
+  DiagnosticPrinterRawOStream DP(errs());
+  DI.print(DP);
+  errs() << "\n";
+}
+
 LTOCodeGenerator::LTOCodeGenerator()
-    : Context(getGlobalContext()), IRLinker(new Module("ld-temp.o", Context)) {
+    : Context(getGlobalContext()), IRLinker(new Module("ld-temp.o", Context),
+                                            handleLTODiagnostic) {
   initializeLTOPasses();
 }
 
 LTOCodeGenerator::LTOCodeGenerator(std::unique_ptr<LLVMContext> Context)
     : OwnedContext(std::move(Context)), Context(*OwnedContext),
-      IRLinker(new Module("ld-temp.o", *OwnedContext)) {
+      IRLinker(new Module("ld-temp.o", *OwnedContext), handleLTODiagnostic) {
   initializeLTOPasses();
 }
 

Modified: projects/vnet/contrib/llvm/lib/MC/MCContext.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/MC/MCContext.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/MC/MCContext.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -82,6 +82,7 @@ void MCContext::reset() {
 
   UsedNames.clear();
   Symbols.clear();
+  SectionSymbols.clear();
   Allocator.Reset();
   Instances.clear();
   CompilationDir.clear();

Modified: projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -264,6 +264,12 @@ void AMDGPUAsmPrinter::getSIProgramInfo(
   for (const MachineBasicBlock &MBB : MF) {
     for (const MachineInstr &MI : MBB) {
       // TODO: CodeSize should account for multiple functions.
+
+      // TODO: Should we count size of debug info?
+      if (MI.isDebugValue())
+        continue;
+
+      // FIXME: This is reporting 0 for many instructions.
       CodeSize += MI.getDesc().Size;
 
       unsigned numOperands = MI.getNumOperands();

Modified: projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -134,13 +134,17 @@ static Value* GEPToVectorIndex(GetElemen
 //
 // TODO: Check isTriviallyVectorizable for calls and handle other
 // instructions.
-static bool canVectorizeInst(Instruction *Inst) {
+static bool canVectorizeInst(Instruction *Inst, User *User) {
   switch (Inst->getOpcode()) {
   case Instruction::Load:
-  case Instruction::Store:
   case Instruction::BitCast:
   case Instruction::AddrSpaceCast:
     return true;
+  case Instruction::Store: {
+    // Must be the stored pointer operand, not a stored value.
+    StoreInst *SI = cast<StoreInst>(Inst);
+    return SI->getPointerOperand() == User;
+  }
   default:
     return false;
   }
@@ -166,7 +170,7 @@ static bool tryPromoteAllocaToVector(All
   for (User *AllocaUser : Alloca->users()) {
     GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(AllocaUser);
     if (!GEP) {
-      if (!canVectorizeInst(cast<Instruction>(AllocaUser)))
+      if (!canVectorizeInst(cast<Instruction>(AllocaUser), Alloca))
         return false;
 
       WorkList.push_back(AllocaUser);
@@ -184,7 +188,7 @@ static bool tryPromoteAllocaToVector(All
 
     GEPVectorIdx[GEP] = Index;
     for (User *GEPUser : AllocaUser->users()) {
-      if (!canVectorizeInst(cast<Instruction>(GEPUser)))
+      if (!canVectorizeInst(cast<Instruction>(GEPUser), AllocaUser))
         return false;
 
       WorkList.push_back(GEPUser);
@@ -240,7 +244,12 @@ static bool collectUsesWithPtrTypes(Valu
   for (User *User : Val->users()) {
     if(std::find(WorkList.begin(), WorkList.end(), User) != WorkList.end())
       continue;
-    if (isa<CallInst>(User)) {
+    if (CallInst *CI = dyn_cast<CallInst>(User)) {
+      // TODO: We might be able to handle some cases where the callee is a
+      // constantexpr bitcast of a function.
+      if (!CI->getCalledFunction())
+        return false;
+
       WorkList.push_back(User);
       continue;
     }
@@ -250,6 +259,12 @@ static bool collectUsesWithPtrTypes(Valu
     if (UseInst && UseInst->getOpcode() == Instruction::PtrToInt)
       return false;
 
+    if (StoreInst *SI = dyn_cast_or_null<StoreInst>(UseInst)) {
+      // Reject if the stored value is not the pointer operand.
+      if (SI->getPointerOperand() != Val)
+        return false;
+    }
+
     if (!User->getType()->isPointerTy())
       continue;
 

Modified: projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td
==============================================================================
--- projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td	Mon Dec 28 22:52:36 2015	(r292843)
@@ -14,8 +14,7 @@
 let Namespace = "AMDGPU" in {
 
 foreach Index = 0-15 in {
-  // Indices are used in a variety of ways here, so don't set a size/offset.
-  def sub#Index : SubRegIndex<-1, -1>;
+  def sub#Index : SubRegIndex<32, !shl(Index, 5)>;
 }
 
 def INDIRECT_BASE_ADDR : Register <"INDIRECT_BASE_ADDR">;

Modified: projects/vnet/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
==============================================================================
--- projects/vnet/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp	Mon Dec 28 22:20:01 2015	(r292842)
+++ projects/vnet/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp	Mon Dec 28 22:52:36 2015	(r292843)
@@ -71,12 +71,26 @@ void AMDGPUMCObjectWriter::writeObject(M
   }
 }
 
+static unsigned getFixupKindNumBytes(unsigned Kind) {
+  switch (Kind) {
+  case FK_Data_1:
+    return 1;
+  case FK_Data_2:
+    return 2;
+  case FK_Data_4:
+    return 4;
+  case FK_Data_8:
+    return 8;
+  default:
+    llvm_unreachable("Unknown fixup kind!");
+  }
+}
+
 void AMDGPUAsmBackend::applyFixup(const MCFixup &Fixup, char *Data,
                                   unsigned DataSize, uint64_t Value,
                                   bool IsPCRel) const {
 
   switch ((unsigned)Fixup.getKind()) {
-    default: llvm_unreachable("Unknown fixup kind");
     case AMDGPU::fixup_si_sopp_br: {
       uint16_t *Dst = (uint16_t*)(Data + Fixup.getOffset());
       *Dst = (Value - 4) / 4;
@@ -96,6 +110,24 @@ void AMDGPUAsmBackend::applyFixup(const 
       *Dst = Value + 4;

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