From owner-svn-src-projects@freebsd.org  Sun Feb 21 13:49:32 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF0B7AB0736
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 13:49:32 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76E0D1F50;
 Sun, 21 Feb 2016 13:49:32 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LDnV7K048516;
 Sun, 21 Feb 2016 13:49:31 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LDnQlI048467;
 Sun, 21 Feb 2016 13:49:26 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602211349.u1LDnQlI048467@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 21 Feb 2016 13:49:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295845 - in projects/clang380-import: . bin/dd bin/sh
 bin/sh/tests bin/sh/tests/parser cddl/contrib/opensolaris/cmd/zfs
 cddl/contrib/opensolaris/cmd/zpool cddl/usr.sbin/dtrace/tests/co...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 13:49:33 -0000

Author: dim
Date: Sun Feb 21 13:49:26 2016
New Revision: 295845
URL: https://svnweb.freebsd.org/changeset/base/295845

Log:
  Merge ^/head r295601 through r295844.

Added:
  projects/clang380-import/bin/dd/ref.obs_zeroes
     - copied unchanged from r295844, head/bin/dd/ref.obs_zeroes
  projects/clang380-import/bin/sh/tests/parser/comment1.0
     - copied unchanged from r295844, head/bin/sh/tests/parser/comment1.0
  projects/clang380-import/bin/sh/tests/parser/comment2.42
     - copied unchanged from r295844, head/bin/sh/tests/parser/comment2.42
  projects/clang380-import/bin/sh/tests/parser/nul1.0
     - copied unchanged from r295844, head/bin/sh/tests/parser/nul1.0
  projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend
  projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend
  projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmlibdriver/Makefile.depend
  projects/clang380-import/lib/clang/libllvmlto/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmlto/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmmirparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmorcjit/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend
     - copied unchanged from r295844, head/lib/clang/libllvmpasses/Makefile.depend
  projects/clang380-import/lib/libpe/Makefile.depend
     - copied unchanged from r295844, head/lib/libpe/Makefile.depend
  projects/clang380-import/libexec/makewhatis.local/
     - copied from r295844, head/libexec/makewhatis.local/
  projects/clang380-import/sys/arm/allwinner/a10_codec.c
     - copied unchanged from r295844, head/sys/arm/allwinner/a10_codec.c
  projects/clang380-import/sys/arm/allwinner/a10_dmac.c
     - copied unchanged from r295844, head/sys/arm/allwinner/a10_dmac.c
  projects/clang380-import/sys/arm/allwinner/a10_dmac.h
     - copied unchanged from r295844, head/sys/arm/allwinner/a10_dmac.h
  projects/clang380-import/sys/arm/allwinner/a10_padconf.c
     - copied unchanged from r295844, head/sys/arm/allwinner/a10_padconf.c
  projects/clang380-import/sys/arm/allwinner/a20/a20_padconf.c
     - copied unchanged from r295844, head/sys/arm/allwinner/a20/a20_padconf.c
  projects/clang380-import/sys/arm/allwinner/allwinner_pinctrl.h
     - copied unchanged from r295844, head/sys/arm/allwinner/allwinner_pinctrl.h
  projects/clang380-import/sys/arm/allwinner/axp209.c
     - copied unchanged from r295844, head/sys/arm/allwinner/axp209.c
  projects/clang380-import/sys/arm/allwinner/sunxi_dma_if.m
     - copied unchanged from r295844, head/sys/arm/allwinner/sunxi_dma_if.m
  projects/clang380-import/sys/arm/arm/busdma_machdep-v4.c
     - copied unchanged from r295844, head/sys/arm/arm/busdma_machdep-v4.c
  projects/clang380-import/sys/arm/arm/pmap-v4.c
     - copied unchanged from r295844, head/sys/arm/arm/pmap-v4.c
  projects/clang380-import/sys/arm/arm/trap-v4.c
     - copied unchanged from r295844, head/sys/arm/arm/trap-v4.c
  projects/clang380-import/sys/arm/include/pmap-v4.h
     - copied unchanged from r295844, head/sys/arm/include/pmap-v4.h
  projects/clang380-import/sys/arm/include/pte-v4.h
     - copied unchanged from r295844, head/sys/arm/include/pte-v4.h
  projects/clang380-import/sys/arm/ti/omap4/omap4_wugen.c
     - copied unchanged from r295844, head/sys/arm/ti/omap4/omap4_wugen.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.h
     - copied unchanged from r295844, head/sys/arm64/cavium/thunder_pcie_pem.h
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem_fdt.c
     - copied unchanged from r295844, head/sys/arm64/cavium/thunder_pcie_pem_fdt.c
  projects/clang380-import/sys/dev/iicbus/twsi/
     - copied from r295844, head/sys/dev/iicbus/twsi/
  projects/clang380-import/usr.bin/bmake/tests/Makefile.inc
     - copied unchanged from r295844, head/usr.bin/bmake/tests/Makefile.inc
  projects/clang380-import/usr.bin/clang/bugpoint/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/bugpoint/Makefile.depend
  projects/clang380-import/usr.bin/clang/llc/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llc/Makefile.depend
  projects/clang380-import/usr.bin/clang/lli/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/lli/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-ar/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-ar/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-as/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-as/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-cov/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-cov/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-cxxdump/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-cxxdump/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-diff/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-diff/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-dis/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-dis/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-dwarfdump/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-dwarfdump/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-extract/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-extract/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-link/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-link/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-lto/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-lto/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-mc/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-mc/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-nm/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-nm/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-objdump/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-objdump/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-pdbdump/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-pdbdump/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-profdata/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-profdata/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-rtdyld/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-rtdyld/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-symbolizer/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/llvm-symbolizer/Makefile.depend
  projects/clang380-import/usr.bin/clang/opt/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/clang/opt/Makefile.depend
  projects/clang380-import/usr.bin/truss/Makefile.depend
     - copied unchanged from r295844, head/usr.bin/truss/Makefile.depend
Replaced:
  projects/clang380-import/sys/arm/include/pmap.h
     - copied unchanged from r295844, head/sys/arm/include/pmap.h
Deleted:
  projects/clang380-import/sys/arm/arm/busdma_machdep.c
  projects/clang380-import/sys/arm/arm/pmap.c
  projects/clang380-import/sys/arm/arm/trap.c
  projects/clang380-import/sys/arm/include/pte.h
  projects/clang380-import/sys/arm/mv/twsi.c
  projects/clang380-import/usr.bin/truss/Makefile.depend.amd64
Modified:
  projects/clang380-import/Makefile.inc1
  projects/clang380-import/bin/dd/Makefile
  projects/clang380-import/bin/dd/dd.c
  projects/clang380-import/bin/dd/dd.h
  projects/clang380-import/bin/dd/gen.c
  projects/clang380-import/bin/sh/input.c
  projects/clang380-import/bin/sh/tests/Makefile
  projects/clang380-import/bin/sh/tests/parser/Makefile
  projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile
  projects/clang380-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms
  projects/clang380-import/include/signal.h
  projects/clang380-import/lib/libc/gen/directory.3
  projects/clang380-import/lib/libc/stdio/fgetln.3
  projects/clang380-import/lib/libc/stdio/fgetln.c
  projects/clang380-import/lib/libc/stdio/fputs.c
  projects/clang380-import/lib/libc/sys/lseek.2
  projects/clang380-import/lib/libc/tests/Makefile
  projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile
  projects/clang380-import/lib/libc/tests/sys/Makefile
  projects/clang380-import/lib/libkvm/kvm_arm.c
  projects/clang380-import/lib/libkvm/kvm_arm.h
  projects/clang380-import/libexec/Makefile
  projects/clang380-import/libexec/rtld-elf/tests/Makefile
  projects/clang380-import/sbin/ifconfig/ifclone.c
  projects/clang380-import/sbin/ifconfig/ifconfig.c
  projects/clang380-import/sbin/ifconfig/ifconfig.h
  projects/clang380-import/sbin/kldstat/Makefile.depend
  projects/clang380-import/secure/lib/libssh/Makefile.depend
  projects/clang380-import/share/man/man4/geom_uncompress.4
  projects/clang380-import/share/man/man5/mailer.conf.5
  projects/clang380-import/share/misc/committers-ports.dot
  projects/clang380-import/share/mk/bsd.dep.mk
  projects/clang380-import/share/mk/bsd.init.mk
  projects/clang380-import/share/mk/bsd.lib.mk
  projects/clang380-import/share/mk/bsd.obj.mk
  projects/clang380-import/share/mk/bsd.prog.mk
  projects/clang380-import/share/mk/bsd.subdir.mk
  projects/clang380-import/share/mk/bsd.test.mk
  projects/clang380-import/share/mk/local.meta.sys.mk
  projects/clang380-import/sys/arm/allwinner/a10_ahci.c
  projects/clang380-import/sys/arm/allwinner/a10_clk.c
  projects/clang380-import/sys/arm/allwinner/a10_clk.h
  projects/clang380-import/sys/arm/allwinner/a10_gpio.c
  projects/clang380-import/sys/arm/allwinner/a20/a20_if_dwc.c
  projects/clang380-import/sys/arm/allwinner/a20/files.a20
  projects/clang380-import/sys/arm/allwinner/allwinner_machdep.c
  projects/clang380-import/sys/arm/allwinner/allwinner_machdep.h
  projects/clang380-import/sys/arm/allwinner/files.a10
  projects/clang380-import/sys/arm/allwinner/files.allwinner
  projects/clang380-import/sys/arm/allwinner/if_emac.c
  projects/clang380-import/sys/arm/arm/bus_space_generic.c
  projects/clang380-import/sys/arm/arm/devmap.c
  projects/clang380-import/sys/arm/arm/elf_trampoline.c
  projects/clang380-import/sys/arm/arm/fiq.c
  projects/clang380-import/sys/arm/arm/genassym.c
  projects/clang380-import/sys/arm/arm/generic_timer.c
  projects/clang380-import/sys/arm/arm/locore-v4.S
  projects/clang380-import/sys/arm/arm/locore-v6.S
  projects/clang380-import/sys/arm/arm/nexus.c
  projects/clang380-import/sys/arm/arm/ofw_machdep.c
  projects/clang380-import/sys/arm/arm/pmap-v6.c
  projects/clang380-import/sys/arm/arm/syscall.c
  projects/clang380-import/sys/arm/at91/at91.c
  projects/clang380-import/sys/arm/at91/at91_machdep.c
  projects/clang380-import/sys/arm/at91/at91_pinctrl.c
  projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_dma.h
  projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/clang380-import/sys/arm/cavium/cns11xx/econa.c
  projects/clang380-import/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/clang380-import/sys/arm/conf/A10
  projects/clang380-import/sys/arm/conf/A20
  projects/clang380-import/sys/arm/conf/ARMADA38X
  projects/clang380-import/sys/arm/conf/ARMADAXP
  projects/clang380-import/sys/arm/conf/CUBIEBOARD
  projects/clang380-import/sys/arm/conf/DB-78XXX
  projects/clang380-import/sys/arm/conf/DB-88F5XXX
  projects/clang380-import/sys/arm/conf/DB-88F6XXX
  projects/clang380-import/sys/arm/conf/DOCKSTAR
  projects/clang380-import/sys/arm/conf/DREAMPLUG-1001
  projects/clang380-import/sys/arm/conf/NOTES
  projects/clang380-import/sys/arm/freescale/imx/imx6_machdep.c
  projects/clang380-import/sys/arm/include/devmap.h
  projects/clang380-import/sys/arm/include/pmap-v6.h
  projects/clang380-import/sys/arm/include/pmap_var.h
  projects/clang380-import/sys/arm/include/pte-v6.h
  projects/clang380-import/sys/arm/include/vm.h
  projects/clang380-import/sys/arm/mv/files.mv
  projects/clang380-import/sys/arm/mv/mv_localbus.c
  projects/clang380-import/sys/arm/mv/mv_machdep.c
  projects/clang380-import/sys/arm/mv/mv_pci.c
  projects/clang380-import/sys/arm/mv/orion/db88f5xxx.c
  projects/clang380-import/sys/arm/ti/omap4/files.omap4
  projects/clang380-import/sys/arm/ti/ti_scm.c
  projects/clang380-import/sys/arm/versatile/versatile_machdep.c
  projects/clang380-import/sys/arm/xscale/i8134x/crb_machdep.c
  projects/clang380-import/sys/arm/xscale/ixp425/avila_machdep.c
  projects/clang380-import/sys/arm/xscale/pxa/pxa_machdep.c
  projects/clang380-import/sys/arm64/arm64/gic_fdt.c
  projects/clang380-import/sys/arm64/arm64/gic_v3_fdt.c
  projects/clang380-import/sys/arm64/arm64/gic_v3_its.c
  projects/clang380-import/sys/arm64/arm64/nexus.c
  projects/clang380-import/sys/arm64/arm64/ofw_machdep.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.h
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.c
  projects/clang380-import/sys/arm64/include/devmap.h
  projects/clang380-import/sys/boot/efi/boot1/Makefile
  projects/clang380-import/sys/boot/efi/boot1/Makefile.depend
  projects/clang380-import/sys/boot/efi/loader/arch/arm64/exec.c
  projects/clang380-import/sys/boot/fdt/dts/arm/bananapi.dts
  projects/clang380-import/sys/boot/fdt/dts/arm/cubieboard.dts
  projects/clang380-import/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
  projects/clang380-import/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  projects/clang380-import/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/clang380-import/sys/boot/i386/boot2/Makefile
  projects/clang380-import/sys/boot/i386/pxeldr/Makefile
  projects/clang380-import/sys/boot/i386/zfsboot/Makefile
  projects/clang380-import/sys/cam/scsi/scsi_da.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/clang380-import/sys/compat/x86bios/x86bios.c
  projects/clang380-import/sys/conf/files.arm
  projects/clang380-import/sys/conf/files.arm64
  projects/clang380-import/sys/conf/kern.mk
  projects/clang380-import/sys/conf/kern.post.mk
  projects/clang380-import/sys/conf/kmod.mk
  projects/clang380-import/sys/conf/options.arm
  projects/clang380-import/sys/contrib/x86emu/x86emu.c
  projects/clang380-import/sys/dev/acpica/acpi.c
  projects/clang380-import/sys/dev/acpica/acpi_hpet.c
  projects/clang380-import/sys/dev/acpica/acpi_package.c
  projects/clang380-import/sys/dev/acpica/acpivar.h
  projects/clang380-import/sys/dev/ae/if_ae.c
  projects/clang380-import/sys/dev/age/if_age.c
  projects/clang380-import/sys/dev/alc/if_alc.c
  projects/clang380-import/sys/dev/ale/if_ale.c
  projects/clang380-import/sys/dev/arcmsr/arcmsr.c
  projects/clang380-import/sys/dev/ata/chipsets/ata-promise.c
  projects/clang380-import/sys/dev/ata/chipsets/ata-serverworks.c
  projects/clang380-import/sys/dev/bxe/bxe.c
  projects/clang380-import/sys/dev/bxe/bxe.h
  projects/clang380-import/sys/dev/bxe/bxe_stats.c
  projects/clang380-import/sys/dev/bxe/ecore_init.h
  projects/clang380-import/sys/dev/cxgbe/adapter.h
  projects/clang380-import/sys/dev/cxgbe/common/common.h
  projects/clang380-import/sys/dev/cxgbe/common/t4_hw.h
  projects/clang380-import/sys/dev/cxgbe/common/t4_msg.h
  projects/clang380-import/sys/dev/cxgbe/common/t4_regs.h
  projects/clang380-import/sys/dev/cxgbe/common/t4_regs_values.h
  projects/clang380-import/sys/dev/cxgbe/common/t4_tcb.h
  projects/clang380-import/sys/dev/cxgbe/tom/t4_connect.c
  projects/clang380-import/sys/dev/cy/cy_isa.c
  projects/clang380-import/sys/dev/cy/cy_pci.c
  projects/clang380-import/sys/dev/ed/if_ed_pccard.c
  projects/clang380-import/sys/dev/eisa/eisaconf.c
  projects/clang380-import/sys/dev/fb/s3_pci.c
  projects/clang380-import/sys/dev/fdc/fdc_pccard.c
  projects/clang380-import/sys/dev/fdt/simplebus.c
  projects/clang380-import/sys/dev/filemon/filemon_wrapper.c
  projects/clang380-import/sys/dev/firewire/sbp_targ.c
  projects/clang380-import/sys/dev/gpio/gpiobus.c
  projects/clang380-import/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/clang380-import/sys/dev/hptiop/hptiop.c
  projects/clang380-import/sys/dev/hptmv/entry.c
  projects/clang380-import/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/clang380-import/sys/dev/hptrr/hptrr_osm_bsd.c
  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/ichsmb/ichsmb_pci.c
  projects/clang380-import/sys/dev/ioat/ioat.c
  projects/clang380-import/sys/dev/ioat/ioat_hw.h
  projects/clang380-import/sys/dev/ioat/ioat_internal.h
  projects/clang380-import/sys/dev/isci/isci.c
  projects/clang380-import/sys/dev/iwn/if_iwn.c
  projects/clang380-import/sys/dev/ixgb/if_ixgb.c
  projects/clang380-import/sys/dev/ixl/if_ixl.c
  projects/clang380-import/sys/dev/ixl/ixl_txrx.c
  projects/clang380-import/sys/dev/jme/if_jme.c
  projects/clang380-import/sys/dev/lmc/if_lmc.c
  projects/clang380-import/sys/dev/mca/mca_bus.c
  projects/clang380-import/sys/dev/mmc/mmcsd.c
  projects/clang380-import/sys/dev/mrsas/mrsas.c
  projects/clang380-import/sys/dev/msk/if_msk.c
  projects/clang380-import/sys/dev/mxge/if_mxge.c
  projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.h
  projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_regs.h
  projects/clang380-import/sys/dev/nvme/nvme_ctrlr.c
  projects/clang380-import/sys/dev/ofw/ofw_subr.c
  projects/clang380-import/sys/dev/ofw/ofwbus.c
  projects/clang380-import/sys/dev/ofw/openfirm.h
  projects/clang380-import/sys/dev/pccard/pccard.c
  projects/clang380-import/sys/dev/pci/pci_pci.c
  projects/clang380-import/sys/dev/pci/pci_user.c
  projects/clang380-import/sys/dev/qlxgb/qla_hw.c
  projects/clang380-import/sys/dev/quicc/quicc_core.c
  projects/clang380-import/sys/dev/random/nehemiah.c
  projects/clang380-import/sys/dev/rl/if_rl.c
  projects/clang380-import/sys/dev/siba/siba.c
  projects/clang380-import/sys/dev/sound/pci/envy24.c
  projects/clang380-import/sys/dev/sound/pci/envy24ht.c
  projects/clang380-import/sys/dev/sound/pci/hdspe.c
  projects/clang380-import/sys/dev/sound/pci/vibes.c
  projects/clang380-import/sys/dev/stge/if_stge.c
  projects/clang380-import/sys/dev/tsec/if_tsec_fdt.c
  projects/clang380-import/sys/dev/twa/tw_osl_freebsd.c
  projects/clang380-import/sys/dev/tws/tws.c
  projects/clang380-import/sys/dev/uart/uart_cpu_fdt.c
  projects/clang380-import/sys/dev/uart/uart_cpu_powerpc.c
  projects/clang380-import/sys/dev/usb/net/if_smsc.c
  projects/clang380-import/sys/dev/usb/wlan/if_rum.c
  projects/clang380-import/sys/dev/usb/wlan/if_rumreg.h
  projects/clang380-import/sys/dev/virtio/block/virtio_blk.c
  projects/clang380-import/sys/dev/vnic/mrml_bridge.c
  projects/clang380-import/sys/dev/vt/hw/ofwfb/ofwfb.c
  projects/clang380-import/sys/dev/vte/if_vte.c
  projects/clang380-import/sys/dev/xen/blkfront/blkfront.c
  projects/clang380-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang380-import/sys/fs/nullfs/null_vnops.c
  projects/clang380-import/sys/geom/geom.h
  projects/clang380-import/sys/geom/geom_io.c
  projects/clang380-import/sys/geom/journal/g_journal.c
  projects/clang380-import/sys/geom/mirror/g_mirror.c
  projects/clang380-import/sys/geom/raid/g_raid.c
  projects/clang380-import/sys/geom/raid3/g_raid3.c
  projects/clang380-import/sys/isa/isa_common.c
  projects/clang380-import/sys/isa/vga_isa.c
  projects/clang380-import/sys/kern/bus_if.m
  projects/clang380-import/sys/kern/kern_event.c
  projects/clang380-import/sys/kern/kern_physio.c
  projects/clang380-import/sys/kern/subr_bus.c
  projects/clang380-import/sys/kern/subr_intr.c
  projects/clang380-import/sys/kern/vfs_subr.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/beri/beri_simplebus.c
  projects/clang380-import/sys/mips/idt/obio.c
  projects/clang380-import/sys/mips/mips/nexus.c
  projects/clang380-import/sys/mips/mips/ofw_machdep.c
  projects/clang380-import/sys/mips/nlm/xlp_simplebus.c
  projects/clang380-import/sys/mips/rt305x/obio.c
  projects/clang380-import/sys/mips/sibyte/ata_zbbus.c
  projects/clang380-import/sys/mips/sibyte/sb_zbbus.c
  projects/clang380-import/sys/net/if_lagg.c
  projects/clang380-import/sys/net80211/ieee80211.h
  projects/clang380-import/sys/net80211/ieee80211_adhoc.c
  projects/clang380-import/sys/net80211/ieee80211_hostap.c
  projects/clang380-import/sys/net80211/ieee80211_mesh.c
  projects/clang380-import/sys/net80211/ieee80211_proto.c
  projects/clang380-import/sys/net80211/ieee80211_sta.c
  projects/clang380-import/sys/net80211/ieee80211_wds.c
  projects/clang380-import/sys/netinet/sctp_asconf.c
  projects/clang380-import/sys/netinet/sctp_bsd_addr.c
  projects/clang380-import/sys/netinet/sctp_input.c
  projects/clang380-import/sys/netinet/sctp_output.c
  projects/clang380-import/sys/netinet/sctp_pcb.c
  projects/clang380-import/sys/netinet/sctp_pcb.h
  projects/clang380-import/sys/netinet/sctp_timer.c
  projects/clang380-import/sys/netinet/sctp_timer.h
  projects/clang380-import/sys/netinet/sctputil.c
  projects/clang380-import/sys/netinet/tcp_lro.c
  projects/clang380-import/sys/netinet/tcp_lro.h
  projects/clang380-import/sys/netinet6/in6.c
  projects/clang380-import/sys/netinet6/nd6.h
  projects/clang380-import/sys/netinet6/nd6_nbr.c
  projects/clang380-import/sys/netinet6/nd6_rtr.c
  projects/clang380-import/sys/netinet6/sctp6_usrreq.c
  projects/clang380-import/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/clang380-import/sys/netpfil/pf/pf.c
  projects/clang380-import/sys/powerpc/booke/pmap.c
  projects/clang380-import/sys/powerpc/include/pte.h
  projects/clang380-import/sys/powerpc/mpc85xx/isa.c
  projects/clang380-import/sys/powerpc/ofw/ofw_machdep.c
  projects/clang380-import/sys/powerpc/ofw/ofw_syscons.c
  projects/clang380-import/sys/powerpc/powerpc/nexus.c
  projects/clang380-import/sys/powerpc/ps3/ps3bus.c
  projects/clang380-import/sys/riscv/include/atomic.h
  projects/clang380-import/sys/riscv/include/ucontext.h
  projects/clang380-import/sys/riscv/include/vmparam.h
  projects/clang380-import/sys/riscv/riscv/locore.S
  projects/clang380-import/sys/riscv/riscv/nexus.c
  projects/clang380-import/sys/riscv/riscv/pmap.c
  projects/clang380-import/sys/riscv/riscv/swtch.S
  projects/clang380-import/sys/riscv/riscv/vm_machdep.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/sbus/sbus.c
  projects/clang380-import/sys/sparc64/sparc64/nexus.c
  projects/clang380-import/sys/sparc64/sparc64/upa.c
  projects/clang380-import/sys/sys/bus.h
  projects/clang380-import/sys/sys/param.h
  projects/clang380-import/sys/sys/rman.h
  projects/clang380-import/sys/sys/sockbuf.h
  projects/clang380-import/sys/sys/socketvar.h
  projects/clang380-import/sys/x86/iommu/intel_drv.c
  projects/clang380-import/sys/x86/isa/isa.c
  projects/clang380-import/sys/x86/x86/nexus.c
  projects/clang380-import/targets/pseudo/clang/Makefile.depend
  projects/clang380-import/targets/pseudo/userland/lib/Makefile.depend
  projects/clang380-import/tests/sys/Makefile
  projects/clang380-import/tests/sys/kqueue/read.c
  projects/clang380-import/tests/sys/pjdfstest/tests/Makefile
  projects/clang380-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang380-import/usr.bin/calendar/calendars/calendar.freebsd
  projects/clang380-import/usr.bin/cap_mkdb/cap_mkdb.c
  projects/clang380-import/usr.bin/elfcopy/Makefile.depend
  projects/clang380-import/usr.bin/hexdump/display.c
  projects/clang380-import/usr.bin/kdump/Makefile.depend
  projects/clang380-import/usr.bin/mail/def.h
  projects/clang380-import/usr.bin/makewhatis/Makefile
  projects/clang380-import/usr.bin/truss/amd64-linux32.c
  projects/clang380-import/usr.bin/truss/i386-linux.c
  projects/clang380-import/usr.bin/truss/setup.c
  projects/clang380-import/usr.bin/truss/syscall.h
  projects/clang380-import/usr.bin/truss/syscalls.c
  projects/clang380-import/usr.sbin/amd/include/Makefile
  projects/clang380-import/usr.sbin/cron/cron/do_command.c
  projects/clang380-import/usr.sbin/cron/crontab/crontab.c
  projects/clang380-import/usr.sbin/ctld/Makefile.depend
  projects/clang380-import/usr.sbin/iostat/Makefile
  projects/clang380-import/usr.sbin/iostat/iostat.c
  projects/clang380-import/usr.sbin/pciconf/Makefile
  projects/clang380-import/usr.sbin/pciconf/cap.c
  projects/clang380-import/usr.sbin/pciconf/pciconf.c
  projects/clang380-import/usr.sbin/rtsold/rtsold.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/contrib/elftoolchain/   (props changed)
  projects/clang380-import/include/   (props changed)
  projects/clang380-import/lib/libc/   (props changed)
  projects/clang380-import/sbin/   (props changed)
  projects/clang380-import/share/   (props changed)
  projects/clang380-import/share/man/man4/   (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/contrib/x86emu/   (props changed)
  projects/clang380-import/sys/dev/hyperv/   (props changed)
  projects/clang380-import/targets/   (props changed)
  projects/clang380-import/usr.bin/calendar/   (props changed)
  projects/clang380-import/usr.sbin/rtsold/   (props changed)

Modified: projects/clang380-import/Makefile.inc1
==============================================================================
--- projects/clang380-import/Makefile.inc1	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/Makefile.inc1	Sun Feb 21 13:49:26 2016	(r295845)
@@ -1090,7 +1090,7 @@ distrib-dirs distribution: .MAKE .PHONY
 .if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
-		METALOG=${METALOG} installconfig
+		METALOG=${METALOG} MK_TESTS=no installconfig
 .endif
 
 #

Modified: projects/clang380-import/bin/dd/Makefile
==============================================================================
--- projects/clang380-import/bin/dd/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/dd/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -24,7 +24,18 @@ test: ${PROG} gen
 	    LC_ALL=en_US.US-ASCII hexdump -C | \
 	    diff -I FreeBSD - ${.CURDIR}/ref.${conv}
 .endfor
-	@rm -f gen
+	@${ECHO} "testing sparse file (obs zeroes)"
+	@./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null
+	@hexdump -C obs_zeroes | diff -I FreeBSD - ${.CURDIR}/ref.obs_zeroes
+
+	@${ECHO} "testing spase file (all zeroes)"
+	@./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null
+	@diff 1M_zeroes 1M_zeroes.1
+	@diff 1M_zeroes 1M_zeroes.2
+
+	@rm -f gen 1M_zeroes* obs_zeroes
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

Modified: projects/clang380-import/bin/dd/dd.c
==============================================================================
--- projects/clang380-import/bin/dd/dd.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/dd/dd.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -77,7 +77,6 @@ STAT	st;			/* statistics */
 void	(*cfunc)(void);		/* conversion function */
 uintmax_t cpy_cnt;		/* # of blocks to copy */
 static off_t	pending = 0;	/* pending seek if sparse */
-static off_t	last_sp = 0;	/* size of last added sparse block */
 u_int	ddflags = 0;		/* conversion options */
 size_t	cbsz;			/* conversion block size */
 uintmax_t files_cnt = 1;	/* # of files to copy */
@@ -409,6 +408,15 @@ dd_close(void)
 	}
 	if (out.dbcnt || pending)
 		dd_out(1);
+
+	/*
+	 * If the file ends with a hole, ftruncate it to extend its size
+	 * up to the end of the hole (without having to write any data).
+	 */
+	if (out.seek_offset > 0 && (out.flags & ISTRUNC)) {
+		if (ftruncate(out.fd, out.seek_offset) == -1)
+			err(1, "truncating %s", out.name);
+	}
 }
 
 void
@@ -457,29 +465,27 @@ dd_out(int force)
 			}
 			if (sparse && !force) {
 				pending += cnt;
-				last_sp = cnt;
 				nw = cnt;
 			} else {
 				if (pending != 0) {
-					/* If forced to write, and we have no
-					 * data left, we need to write the last
-					 * sparse block explicitly.
+					/*
+					 * Seek past hole.  Note that we need to record the
+					 * reached offset, because we might have no more data
+					 * to write, in which case we'll need to call
+					 * ftruncate to extend the file size.
 					 */
-					if (force && cnt == 0) {
-						pending -= last_sp;
-						assert(outp == out.db);
-						memset(outp, 0, cnt);
-					}
-					if (lseek(out.fd, pending, SEEK_CUR) ==
-					    -1)
+					out.seek_offset = lseek(out.fd, pending, SEEK_CUR);
+					if (out.seek_offset == -1)
 						err(2, "%s: seek error creating sparse file",
 						    out.name);
-					pending = last_sp = 0;
+					pending = 0;
 				}
-				if (cnt)
+				if (cnt) {
 					nw = write(out.fd, outp, cnt);
-				else
+					out.seek_offset = 0;
+				} else {
 					return;
+				}
 			}
 
 			if (nw <= 0) {

Modified: projects/clang380-import/bin/dd/dd.h
==============================================================================
--- projects/clang380-import/bin/dd/dd.h	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/dd/dd.h	Sun Feb 21 13:49:26 2016	(r295845)
@@ -54,6 +54,7 @@ typedef struct {
 	const char	*name;		/* name */
 	int		fd;		/* file descriptor */
 	off_t		offset;		/* # of blocks to skip */
+	off_t		seek_offset;	/* offset of last seek past output hole */
 } IO;
 
 typedef struct {

Modified: projects/clang380-import/bin/dd/gen.c
==============================================================================
--- projects/clang380-import/bin/dd/gen.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/dd/gen.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -5,13 +5,20 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 int
-main(int argc __unused, char **argv __unused)
+main(int argc, char **argv)
 {
 	int i;
 
-	for (i = 0; i < 256; i++)
-		putchar(i);
+	if (argc > 1 && !strcmp(argv[1], "189284")) {
+		fputs("ABCDEFGH", stdout);
+		for (i = 0; i < 8; i++)
+			putchar(0);
+	} else {
+		for (i = 0; i < 256; i++)
+			putchar(i);
+	}
 	return (0);
 }

Copied: projects/clang380-import/bin/dd/ref.obs_zeroes (from r295844, head/bin/dd/ref.obs_zeroes)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/dd/ref.obs_zeroes	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/bin/dd/ref.obs_zeroes)
@@ -0,0 +1,3 @@
+$FreeBSD$
+00000000  41 42 43 44 45 46 47 48  00 00 00 00 00 00 00 00  |ABCDEFGH........|
+00000010

Modified: projects/clang380-import/bin/sh/input.c
==============================================================================
--- projects/clang380-import/bin/sh/input.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/sh/input.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -195,8 +195,7 @@ retry:
 int
 preadbuffer(void)
 {
-	char *p, *q;
-	int more;
+	char *p, *q, *r, *end;
 	char savec;
 
 	while (parsefile->strpush) {
@@ -224,34 +223,31 @@ again:
 		}
 	}
 
-	q = p = parsefile->buf + (parsenextc - parsefile->buf);
-
-	/* delete nul characters */
-	for (more = 1; more;) {
-		switch (*p) {
-		case '\0':
-			p++;	/* Skip nul */
-			goto check;
-
-		case '\n':
-			parsenleft = q - parsenextc;
-			more = 0; /* Stop processing here */
-			break;
-
-		default:
-			break;
-		}
-
-		*q++ = *p++;
-check:
-		if (--parselleft <= 0) {
-			parsenleft = q - parsenextc - 1;
-			if (parsenleft < 0)
-				goto again;
-			*q = '\0';
-			more = 0;
+	p = parsefile->buf + (parsenextc - parsefile->buf);
+	end = p + parselleft;
+	*end = '\0';
+	q = strchrnul(p, '\n');
+	if (q != end && *q == '\0') {
+		/* delete nul characters */
+		for (r = q; q != end; q++) {
+			if (*q != '\0')
+				*r++ = *q;
 		}
+		parselleft -= end - r;
+		if (parselleft == 0)
+			goto again;
+		end = p + parselleft;
+		*end = '\0';
+		q = strchrnul(p, '\n');
+	}
+	if (q == end) {
+		parsenleft = parselleft;
+		parselleft = 0;
+	} else /* *q == '\n' */ {
+		parsenleft = q - parsenextc + 1;
+		parselleft -= parsenleft;
 	}
+	parsenleft--;
 
 	savec = *q;
 	*q = '\0';

Modified: projects/clang380-import/bin/sh/tests/Makefile
==============================================================================
--- projects/clang380-import/bin/sh/tests/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/sh/tests/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -10,6 +10,4 @@ TESTS_SUBDIRS+=	parameters
 TESTS_SUBDIRS+=	parser
 TESTS_SUBDIRS+=	set-e
 
-SUBDIR_PARALLEL=
-
 .include <bsd.test.mk>

Modified: projects/clang380-import/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/clang380-import/bin/sh/tests/parser/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/bin/sh/tests/parser/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -25,6 +25,8 @@ FILES+=		alias15.0 alias15.0.stdout
 FILES+=		and-pipe-not.0
 FILES+=		case1.0
 FILES+=		case2.0
+FILES+=		comment1.0
+FILES+=		comment2.42
 FILES+=		dollar-quote1.0
 FILES+=		dollar-quote2.0
 FILES+=		dollar-quote3.0
@@ -71,6 +73,7 @@ FILES+=		line-cont10.0
 FILES+=		line-cont11.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
+FILES+=		nul1.0
 FILES+=		only-redir1.0
 FILES+=		only-redir2.0
 FILES+=		only-redir3.0

Copied: projects/clang380-import/bin/sh/tests/parser/comment1.0 (from r295844, head/bin/sh/tests/parser/comment1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/sh/tests/parser/comment1.0	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/bin/sh/tests/parser/comment1.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+${SH} -c '#'

Copied: projects/clang380-import/bin/sh/tests/parser/comment2.42 (from r295844, head/bin/sh/tests/parser/comment2.42)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/sh/tests/parser/comment2.42	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/bin/sh/tests/parser/comment2.42)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+${SH} -c '#
+exit 42'

Copied: projects/clang380-import/bin/sh/tests/parser/nul1.0 (from r295844, head/bin/sh/tests/parser/nul1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/sh/tests/parser/nul1.0	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/bin/sh/tests/parser/nul1.0)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Although POSIX does not specify the effect of NUL bytes in scripts,
+# we ignore them.
+
+{
+	printf 'v=%03000d\0%02000d' 7 2
+	dd if=/dev/zero bs=1000 count=1 status=none
+	printf '1 w=%03000d%02000d1\0\n' 7 2
+	printf '\0l\0v\0=\0$\0{\0#\0v\0}\n'
+	printf '\0l\0w\0=\0\0$\0{\0#\0w}\0\0\0\n'
+	printf '[ "$lv.$lw.$v" = "5001.5001.$w" ]\n'
+} | ${SH}

Modified: projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -1713,7 +1713,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1750,7 +1750,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid source "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1786,7 +1786,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -3156,7 +3156,7 @@ zfs_do_list(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile
==============================================================================
--- projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -86,6 +86,4 @@ TESTS_SUBDIRS+= aggs \
 .PATH:		${.CURDIR:H:H:H:H:H}/tests
 KYUAFILE=	YES
 
-SUBDIR_PARALLEL=
-
 .include <bsd.test.mk>

Modified: projects/clang380-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang380-import/contrib/elftoolchain/elfcopy/main.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/contrib/elftoolchain/elfcopy/main.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -641,6 +641,18 @@ create_file(struct elfcopy *ecp, const c
 	 * ELF object before processing.
 	 */
 	if (ecp->itf != ETF_ELF) {
+		/*
+		 * If the output object is not an ELF file, choose an arbitrary
+		 * ELF format for the intermediate file. srec, ihex and binary
+		 * formats are independent of class, endianness and machine
+		 * type so these choices do not affect the output.
+		 */
+		if (ecp->otf != ETF_ELF) {
+			if (ecp->oec == ELFCLASSNONE)
+				ecp->oec = ELFCLASS64;
+			if (ecp->oed == ELFDATANONE)
+				ecp->oed = ELFDATA2LSB;
+		}
 		create_tempfile(&elftemp, &efd);
 		if ((ecp->eout = elf_begin(efd, ELF_C_WRITE, NULL)) == NULL)
 			errx(EXIT_FAILURE, "elf_begin() failed: %s",

Modified: projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms
==============================================================================
--- projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms	Sun Feb 21 13:49:26 2016	(r295845)
@@ -16,7 +16,7 @@
 .R
 ..
 .de Id
-.ND \\$4
+.ND 1 June 1995
 ..
 .Id $FreeBSD$
 .RP

Modified: projects/clang380-import/include/signal.h
==============================================================================
--- projects/clang380-import/include/signal.h	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/include/signal.h	Sun Feb 21 13:49:26 2016	(r295845)
@@ -36,8 +36,10 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 #include <sys/signal.h>
+#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
 #include <machine/ucontext.h>
 #include <sys/_ucontext.h>
+#endif
 
 #if __BSD_VISIBLE
 /*

Copied: projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend (from r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Copied: projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend (from r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Copied: projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend (from r295844, head/lib/clang/libllvmlibdriver/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmlibdriver/Makefile.depend)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+LibDriver.o: Options.inc.h
+LibDriver.po: Options.inc.h
+.endif

Copied: projects/clang380-import/lib/clang/libllvmlto/Makefile.depend (from r295844, head/lib/clang/libllvmlto/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmlto/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmlto/Makefile.depend)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+LTOCodeGenerator.o: Intrinsics.inc.h
+LTOCodeGenerator.po: Intrinsics.inc.h
+.endif

Copied: projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend (from r295844, head/lib/clang/libllvmmirparser/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmmirparser/Makefile.depend)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Copied: projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend (from r295844, head/lib/clang/libllvmorcjit/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmorcjit/Makefile.depend)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Copied: projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend (from r295844, head/lib/clang/libllvmpasses/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/clang/libllvmpasses/Makefile.depend)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+PassBuilder.o: Intrinsics.inc.h
+PassBuilder.po: Intrinsics.inc.h
+.endif

Modified: projects/clang380-import/lib/libc/gen/directory.3
==============================================================================
--- projects/clang380-import/lib/libc/gen/directory.3	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/gen/directory.3	Sun Feb 21 13:49:26 2016	(r295845)
@@ -28,7 +28,7 @@
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd May 6, 2015
+.Dd February 19, 2016
 .Dt DIRECTORY 3
 .Os
 .Sh NAME
@@ -46,7 +46,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In dirent.h
 .Ft DIR *
 .Fn opendir "const char *filename"

Modified: projects/clang380-import/lib/libc/stdio/fgetln.3
==============================================================================
--- projects/clang380-import/lib/libc/stdio/fgetln.3	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/stdio/fgetln.3	Sun Feb 21 13:49:26 2016	(r295845)
@@ -28,7 +28,7 @@
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd April 19, 1994
+.Dd February 15, 2016
 .Dt FGETLN 3
 .Os
 .Sh NAME
@@ -97,6 +97,9 @@ These changes are lost as soon as the po
 The argument
 .Fa stream
 is not a stream open for reading.
+.It Bq Er ENOMEM
+The internal line buffer could not be expanded due to lack of available memory,
+or because it would need to expand beyond INT_MAX in size.
 .El
 .Pp
 The

Modified: projects/clang380-import/lib/libc/stdio/fgetln.c
==============================================================================
--- projects/clang380-import/lib/libc/stdio/fgetln.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/stdio/fgetln.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -37,6 +37,8 @@ static char sccsid[] = "@(#)fgetln.c	8.2
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -61,6 +63,10 @@ __slbexpand(FILE *fp, size_t newsize)
 #endif
 	if (fp->_lb._size >= newsize)
 		return (0);
+	if (newsize > INT_MAX) {
+		errno = ENOMEM;
+		return (-1);
+	}
 	if ((p = realloc(fp->_lb._base, newsize)) == NULL)
 		return (-1);
 	fp->_lb._base = p;
@@ -152,13 +158,14 @@ fgetln(FILE *fp, size_t *lenp)
 	}
 	*lenp = len;
 #ifdef notdef
-	fp->_lb._base[len] = 0;
+	fp->_lb._base[len] = '\0';
 #endif
 	FUNLOCKFILE(fp);
 	return ((char *)fp->_lb._base);
 
 error:
 	*lenp = 0;		/* ??? */
+	fp->_flags |= __SERR;
 	FUNLOCKFILE(fp);
 	return (NULL);		/* ??? */
 }

Modified: projects/clang380-import/lib/libc/stdio/fputs.c
==============================================================================
--- projects/clang380-import/lib/libc/stdio/fputs.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/stdio/fputs.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -37,6 +37,7 @@ static char sccsid[] = "@(#)fputs.c	8.1 
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include "un-namespace.h"
@@ -62,5 +63,7 @@ fputs(const char * __restrict s, FILE * 
 	ORIENT(fp, -1);
 	retval = __sfvwrite(fp, &uio);
 	FUNLOCKFILE(fp);
+	if (retval == 0)
+		return (iov.iov_len > INT_MAX ? INT_MAX : iov.iov_len);
 	return (retval);
 }

Modified: projects/clang380-import/lib/libc/sys/lseek.2
==============================================================================
--- projects/clang380-import/lib/libc/sys/lseek.2	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/sys/lseek.2	Sun Feb 21 13:49:26 2016	(r295845)
@@ -28,7 +28,7 @@
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd May 26, 2012
+.Dd February 18, 2016
 .Dt LSEEK 2
 .Os
 .Sh NAME
@@ -131,8 +131,14 @@ Applications can use
 .Dv SEEK_HOLE
 to optimise their behavior for ranges of zeros, but must not depend on it to
 find all such ranges in a file.
+Each file is presented as having a zero-size virtual hole at the very
+end of the file.
 The existence of a hole at the end of every data region allows for easy
-programming and implies that a virtual hole exists at the end of the file.
+programming and also provides compatibility to the original implementation
+in Solaris.
+It also causes the current file size (i.e., end-of-file offset) to be returned
+to indicate that there are no more holes past the supplied
+.Fa offset .
 Applications should use
 .Fn fpathconf _PC_MIN_HOLE_SIZE
 or
@@ -176,9 +182,11 @@ be negative for a non-character special 
 For
 .Dv SEEK_DATA ,
 there are no more data regions past the supplied offset.
-For
-.Dv SEEK_HOLE ,
-there are no more holes past the supplied offset.
+Due to existence of the hole at the end of the file, for
+.Dv SEEK_HOLE
+this error is only returned when the
+.Fa offset
+already points to the end-of-file position.
 .It Bq Er EOVERFLOW
 The resulting file offset would be a value which cannot be represented
 correctly in an object of type

Modified: projects/clang380-import/lib/libc/tests/Makefile
==============================================================================
--- projects/clang380-import/lib/libc/tests/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/tests/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -22,6 +22,8 @@ TESTS_SUBDIRS+=	termios
 TESTS_SUBDIRS+=	tls
 TESTS_SUBDIRS+=	ttyio
 
+SUBDIR_DEPEND_tls= tls_dso
+
 .if ${MK_LOCALES} != "no"
 TESTS_SUBDIRS+=	locale
 .endif

Modified: projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile
==============================================================================
--- projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -20,7 +20,7 @@ CLEANFILES+=	h_nonexec
 .include "../../Makefile.netbsd-tests"
 
 h_zero:
-	dd if=/dev/zero of=h_zero bs=1k count=2
+	dd if=/dev/zero of=h_zero bs=1k count=2 status=none
 	chmod a+x h_zero
 
 CLEANFILES+=	h_zero

Modified: projects/clang380-import/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/clang380-import/lib/libc/tests/sys/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libc/tests/sys/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -78,6 +78,6 @@ truncate_test_FILESGRP= wheel
 
 CLEANFILES=	truncate_test.root_owned
 truncate_test.root_owned:
-	dd if=/dev/null bs=1 count=1 of=${.TARGET}
+	dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none
 
 .include <bsd.test.mk>

Modified: projects/clang380-import/lib/libkvm/kvm_arm.c
==============================================================================
--- projects/clang380-import/lib/libkvm/kvm_arm.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libkvm/kvm_arm.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -183,7 +183,7 @@ _arm_initvtop(kvm_t *kd)
 #define	l1pte_section_p(pde)	(((pde) & ARM_L1_TYPE_MASK) == ARM_L1_TYPE_S)
 #define	l1pte_valid(pde)	((pde) != 0)
 #define	l2pte_valid(pte)	((pte) != 0)
-#define l2pte_index(v)		(((v) & ARM_L2_ADDR_BITS) >> ARM_L2_S_SHIFT)
+#define l2pte_index(v)		(((v) & ARM_L1_S_OFFSET) >> ARM_L2_S_SHIFT)
 
 
 static int

Modified: projects/clang380-import/lib/libkvm/kvm_arm.h
==============================================================================
--- projects/clang380-import/lib/libkvm/kvm_arm.h	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/lib/libkvm/kvm_arm.h	Sun Feb 21 13:49:26 2016	(r295845)
@@ -29,10 +29,6 @@
 #ifndef __KVM_ARM_H__
 #define	__KVM_ARM_H__
 
-#ifdef __arm__
-#include <machine/pte.h>
-#endif
-
 typedef uint32_t	arm_physaddr_t;
 typedef uint32_t	arm_pd_entry_t;
 typedef uint32_t	arm_pt_entry_t;
@@ -72,11 +68,15 @@ typedef uint32_t	arm_pt_entry_t;
 #define	ARM_L2_TYPE_T	0x03		/* Tiny Page  -  1k - not used */
 #define	ARM_L2_TYPE_MASK	0x03
 
-#define	ARM_L2_ADDR_BITS	0x000ff000	/* L2 PTE address bits */
-
 #ifdef __arm__
 #include <machine/acle-compat.h>
 
+#if __ARM_ARCH >= 6
+#include <machine/pte-v6.h>
+#else
+#include <machine/pte-v4.h>
+#endif
+
 _Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch");
 _Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch");
 _Static_assert(PAGE_MASK == ARM_PAGE_MASK, "PAGE_MASK mismatch");
@@ -106,7 +106,6 @@ _Static_assert(L2_TYPE_S == ARM_L2_TYPE_
 _Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
 #endif
 _Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
-_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch");
 #endif
 
 int	_arm_native(kvm_t *);

Copied: projects/clang380-import/lib/libpe/Makefile.depend (from r295844, head/lib/libpe/Makefile.depend)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/lib/libpe/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845, copy of r295844, head/lib/libpe/Makefile.depend)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Modified: projects/clang380-import/libexec/Makefile
==============================================================================
--- projects/clang380-import/libexec/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/libexec/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -10,6 +10,7 @@ SUBDIR=	${_atf} \
 	${_dma} \
 	getty \
 	${_mail.local} \
+	${_makewhatis.local} \
 	${_mknetid} \
 	${_pppoed} \
 	revnetgroup \
@@ -88,6 +89,10 @@ _mail.local=	mail.local
 _smrsh=		smrsh
 .endif
 
+.if ${MK_MAN_UTILS} != "no"
+_makewhatis.local=	makewhatis.local
+.endif
+
 .if ${MK_TALK} != "no"
 SUBDIR+=	talkd
 .endif

Modified: projects/clang380-import/libexec/rtld-elf/tests/Makefile
==============================================================================
--- projects/clang380-import/libexec/rtld-elf/tests/Makefile	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/libexec/rtld-elf/tests/Makefile	Sun Feb 21 13:49:26 2016	(r295845)
@@ -4,6 +4,7 @@
 
 SUBDIR+=	libpythagoras target
 
+SUBDIR_DEPEND_target=	libpythagoras
 ATF_TESTS_C=	ld_library_pathfds
 
 .include <bsd.test.mk>

Modified: projects/clang380-import/sbin/ifconfig/ifclone.c
==============================================================================
--- projects/clang380-import/sbin/ifconfig/ifclone.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/sbin/ifconfig/ifclone.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -144,11 +144,12 @@ ifclonecreate(int s, void *arg)
 	}
 
 	/*
-	 * If we get a different name back than we put in, print it.
+	 * If we get a different name back than we put in, update record and
+	 * indicate it should be printed later.
 	 */
 	if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) {
 		strlcpy(name, ifr.ifr_name, sizeof(name));
-		printf("%s\n", name);
+		printifname = 1;
 	}
 }
 

Modified: projects/clang380-import/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/clang380-import/sbin/ifconfig/ifconfig.c	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/sbin/ifconfig/ifconfig.c	Sun Feb 21 13:49:26 2016	(r295845)
@@ -93,6 +93,7 @@ int	clearaddr;
 int	newaddr = 1;
 int	verbose;
 int	noload;
+int	printifname = 0;
 
 int	supmedia = 0;
 int	printkeys = 0;		/* Print keying material for interfaces. */
@@ -108,6 +109,8 @@ static struct afswtch *af_getbyname(cons
 static struct afswtch *af_getbyfamily(int af);
 static void af_other_status(int);
 
+void printifnamemaybe(void);
+
 static struct option *opts = NULL;
 
 struct ifa_order_elt {
@@ -297,6 +300,12 @@ sortifaddrs(struct ifaddrs *list,
 	return (result);
 }
 
+void printifnamemaybe()
+{
+	if (printifname)
+		printf("%s\n", name);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -314,6 +323,12 @@ main(int argc, char *argv[])
 	size_t iflen;
 
 	all = downonly = uponly = namesonly = noload = verbose = 0;
+	
+	/*
+	 * Ensure we print interface name when expected to,
+	 * even if we terminate early due to error.
+	 */
+	atexit(printifnamemaybe);
 
 	/* Parse leading line options */
 	strlcpy(options, "adklmnuv", sizeof(options));
@@ -1011,6 +1026,8 @@ setifname(const char *val, int dummy __u
     const struct afswtch *afp)
 {
 	char *newname;
+	
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 
 	newname = strdup(val);
 	if (newname == NULL)
@@ -1020,6 +1037,7 @@ setifname(const char *val, int dummy __u
 		free(newname);
 		err(1, "ioctl SIOCSIFNAME (set name)");
 	}
+	printifname = 1;
 	strlcpy(name, newname, sizeof(name));
 	free(newname);
 }
@@ -1031,6 +1049,8 @@ setifdescr(const char *val, int dummy __
 {
 	char *newdescr;
 
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+	
 	ifr.ifr_buffer.length = strlen(val) + 1;
 	if (ifr.ifr_buffer.length == 1) {
 		ifr.ifr_buffer.buffer = newdescr = NULL;

Modified: projects/clang380-import/sbin/ifconfig/ifconfig.h
==============================================================================
--- projects/clang380-import/sbin/ifconfig/ifconfig.h	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/sbin/ifconfig/ifconfig.h	Sun Feb 21 13:49:26 2016	(r295845)
@@ -133,6 +133,7 @@ extern	int supmedia;
 extern	int printkeys;
 extern	int newaddr;
 extern	int verbose;
+extern	int printifname;
 
 void	setifcap(const char *, int value, int s, const struct afswtch *);
 

Modified: projects/clang380-import/sbin/kldstat/Makefile.depend
==============================================================================
--- projects/clang380-import/sbin/kldstat/Makefile.depend	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/sbin/kldstat/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845)
@@ -8,6 +8,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libutil \
 
 
 .include <dirdeps.mk>

Modified: projects/clang380-import/secure/lib/libssh/Makefile.depend
==============================================================================
--- projects/clang380-import/secure/lib/libssh/Makefile.depend	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/secure/lib/libssh/Makefile.depend	Sun Feb 21 13:49:26 2016	(r295845)
@@ -6,6 +6,7 @@ DIRDEPS = \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
+	include/gssapi \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \

Modified: projects/clang380-import/share/man/man4/geom_uncompress.4
==============================================================================
--- projects/clang380-import/share/man/man4/geom_uncompress.4	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/share/man/man4/geom_uncompress.4	Sun Feb 21 13:49:26 2016	(r295845)
@@ -1,3 +1,4 @@
+.\" Copyright (c) 2006, Ceri Davies <ceri@FreeBSD.org>
 .\" Copyright (c) 2014, Luiz Otavio O Souza <loos@FreeBSD.org>
 .\" All rights reserved.
 .\"
@@ -100,8 +101,18 @@ Consumers:
 The
 .Nm
 driver was written by
-.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
-and
-.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
+.An Max Khon Aq Mt fjoe@FreeBSD.org
+as
+.Xr geom_uzip 4 .
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org
+copied it over as
+.Nm
+and added LZMA functionality .
 This manual page was written by
-.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org
+for the
+.Xr geom_uzip 4 ,
+and modified by
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org
+to match
+.Nm .

Modified: projects/clang380-import/share/man/man5/mailer.conf.5
==============================================================================
--- projects/clang380-import/share/man/man5/mailer.conf.5	Sun Feb 21 13:03:58 2016	(r295844)
+++ projects/clang380-import/share/man/man5/mailer.conf.5	Sun Feb 21 13:49:26 2016	(r295845)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2010
+.Dd February 18, 2016
 .Dt MAILER.CONF 5
 .Os
 .Sh NAME
@@ -101,9 +101,10 @@ mailq		/usr/libexec/sendmail/sendmail
 newaliases	/usr/libexec/sendmail/sendmail
 .Ed
 .Pp
-This example shows how to invoke a sendmail-workalike like
+Using
 .Nm Postfix
-in place of
+(from ports)
+to replace
 .Xr sendmail 8 :
 .Bd -literal -offset indent
 # Emulate sendmail using postfix
@@ -113,12 +114,10 @@ mailq		/usr/local/sbin/sendmail
 newaliases	/usr/local/sbin/sendmail
 .Ed
 .Pp
-This example shows
-how to invoke
-a sendmail-workalike with
+Using
 .Nm Exim
 (from ports)
-in place of
+to replace
 .Xr sendmail 8 :
 .Bd -literal -offset indent
 # Emulate sendmail using exim
@@ -129,24 +128,40 @@ newaliases	/usr/bin/true
 rmail		/usr/local/sbin/exim -i -oee
 .Ed
 .Pp
-This example shows the use of the
+Using
 .Nm mini_sendmail
-package from ports in place of
-.Xr sendmail 8 .
-Note the use of additional arguments.
+(from ports)
+to replace
+.Xr sendmail 8 :
 .Bd -literal -offset indent
 # Send outgoing mail to a smart relay using mini_sendmail
 sendmail	/usr/local/bin/mini_sendmail -srelayhost
 send-mail	/usr/local/bin/mini_sendmail -srelayhost
 .Ed
+.Pp
+Using
+.Xr dma 8
+to replace
+.Xr sendmail 8 :
+.Bd -literal -offset indent
+# Execute dma instead of sendmail
+sendmail	/usr/libexec/dma
+send-mail	/usr/libexec/dma
+mailq		/usr/libexec/dma
+newaliases	/usr/libexec/dma
+rmail		/usr/libexec/dma
+.Ed
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr mailq 1 ,
 .Xr newaliases 1 ,
+.Xr dma 8 ,
 .Xr mailwrapper 8 ,
 .Xr sendmail 8
 .Pp

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

From owner-svn-src-projects@freebsd.org  Sun Feb 21 14:47:53 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5E2BAAFE38
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 14:47:53 +0000 (UTC) (envelope-from ian@freebsd.org)
Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org
 [54.200.247.200])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E69311F4
 for <svn-src-projects@freebsd.org>; Sun, 21 Feb 2016 14:47:53 +0000 (UTC)
 (envelope-from ian@freebsd.org)
X-MHO-User: 21ba7fed-d8aa-11e5-8dfb-c75234cc769e
X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information
X-Originating-IP: 73.34.117.227
X-Mail-Handler: DuoCircle Outbound SMTP
Received: from ilsoft.org (unknown [73.34.117.227])
 by outbound1.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA;
 Sun, 21 Feb 2016 14:48:12 +0000 (UTC)
Received: from rev (rev [172.22.42.240])
 by ilsoft.org (8.15.2/8.14.9) with ESMTP id u1LElhGQ003375;
 Sun, 21 Feb 2016 07:47:43 -0700 (MST) (envelope-from ian@freebsd.org)
Message-ID: <1456066063.1294.40.camel@freebsd.org>
Subject: Re: svn commit: r295812 - projects/mips64-clang/sys/mips/rmi
From: Ian Lepore <ian@freebsd.org>
To: Sean Bruno <sbruno@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-projects@freebsd.org
Date: Sun, 21 Feb 2016 07:47:43 -0700
In-Reply-To: <201602191637.u1JGb6lm055074@repo.freebsd.org>
References: <201602191637.u1JGb6lm055074@repo.freebsd.org>
Content-Type: text/plain; charset="us-ascii"
X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 14:47:53 -0000

On Fri, 2016-02-19 at 16:37 +0000, Sean Bruno wrote:
> Author: sbruno
> Date: Fri Feb 19 16:37:06 2016
> New Revision: 295812
> URL: https://svnweb.freebsd.org/changeset/base/295812
> 
> Log:
>   Change a static const string to a #define as the strcpy() throws a
>   warn/error with clang.
>   
>   /home/sbruno/mips64-clang/sys/mips/rmi/xls_ehci.c:133:25: error:
>   format string is not a string literal (potentially insecure)
>   	[-Werror,-Wformat-security]
>           sprintf(sc->sc_vendor, xlr_vendor_desc);
> 
> Modified:
>   projects/mips64-clang/sys/mips/rmi/xls_ehci.c
> 
> Modified: projects/mips64-clang/sys/mips/rmi/xls_ehci.c
> =====================================================================
> =========
> --- projects/mips64-clang/sys/mips/rmi/xls_ehci.c	Fri Feb 19
> 15:53:08 2016	(r295811)
> +++ projects/mips64-clang/sys/mips/rmi/xls_ehci.c	Fri Feb 19
> 16:37:06 2016	(r295812)
> @@ -73,7 +73,7 @@ static device_attach_t ehci_xls_attach;
>  static device_detach_t ehci_xls_detach;
>  
>  static const char *xlr_usb_dev_desc = "RMI XLR USB 2.0 controller";
> -static const char *xlr_vendor_desc = "RMI Corp";
> +#define XLR_VENDOR_DESC "RMI Corp";
>  
>  static int
>  ehci_xls_probe(device_t self)
> @@ -130,7 +130,7 @@ ehci_xls_attach(device_t self)
>  	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
>  	device_set_desc(sc->sc_bus.bdev, xlr_usb_dev_desc);
>  
> -	sprintf(sc->sc_vendor, xlr_vendor_desc);
> +	sprintf(sc->sc_vendor, XLR_VENDOR_DESC);
>  
>  	err = bus_setup_intr(self, sc->sc_irq_res,
>  	    INTR_TYPE_BIO | INTR_MPSAFE, NULL,
> 

Bah.  The compiler should understand that a static const char* is
equivelent to a string literal for the purposes of this warning.

That said, a sprintf() is just a strange spelling of strlcpy() here.

-- Ian


From owner-svn-src-projects@freebsd.org  Sun Feb 21 14:50:43 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F916AAFF4C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 14:50:43 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 89FB3137D;
 Sun, 21 Feb 2016 14:50:42 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LEofcl066689;
 Sun, 21 Feb 2016 14:50:41 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LEoclb066659;
 Sun, 21 Feb 2016 14:50:38 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201602211450.u1LEoclb066659@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 21 Feb 2016 14:50:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295855 - in projects/vnet: . bin/csh bin/dd bin/pkill
 bin/ps bin/sh bin/sh/tests bin/sh/tests/parser
 cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool
 cddl/usr.sbin/d...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 14:50:43 -0000

Author: bz
Date: Sun Feb 21 14:50:37 2016
New Revision: 295855
URL: https://svnweb.freebsd.org/changeset/base/295855

Log:
  Mfh @r295854
  
  Looping SCTP changes all the way back now that they are upstream and in head.
  Looping rtsock/routing fix back in which was taken from here and committed
  to head.
  
  Updating head to track latest changes.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/vnet/bin/dd/ref.obs_zeroes
     - copied unchanged from r295854, head/bin/dd/ref.obs_zeroes
  projects/vnet/bin/sh/tests/parser/comment1.0
     - copied unchanged from r295854, head/bin/sh/tests/parser/comment1.0
  projects/vnet/bin/sh/tests/parser/comment2.42
     - copied unchanged from r295854, head/bin/sh/tests/parser/comment2.42
  projects/vnet/bin/sh/tests/parser/nul1.0
     - copied unchanged from r295854, head/bin/sh/tests/parser/nul1.0
  projects/vnet/contrib/elftoolchain/addr2line/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/addr2line/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/elfcopy/pe.c
     - copied unchanged from r295854, head/contrib/elftoolchain/elfcopy/pe.c
  projects/vnet/contrib/elftoolchain/elfdump/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/elfdump/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/libdwarf/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/libdwarf/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/libelftc/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/libelftc/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/libpe/
     - copied from r295854, head/contrib/elftoolchain/libpe/
  projects/vnet/contrib/elftoolchain/nm/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/nm/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/readelf/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/readelf/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/size/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/size/os.NetBSD.mk
  projects/vnet/contrib/elftoolchain/strings/os.NetBSD.mk
     - copied unchanged from r295854, head/contrib/elftoolchain/strings/os.NetBSD.mk
  projects/vnet/contrib/unbound/util/as112.c
     - copied unchanged from r295854, head/contrib/unbound/util/as112.c
  projects/vnet/contrib/unbound/util/as112.h
     - copied unchanged from r295854, head/contrib/unbound/util/as112.h
  projects/vnet/lib/clang/libllvmdebuginfodwarf/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend
  projects/vnet/lib/clang/libllvmdebuginfopdb/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmdebuginfopdb/Makefile.depend
  projects/vnet/lib/clang/libllvmlibdriver/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmlibdriver/Makefile.depend
  projects/vnet/lib/clang/libllvmlto/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmlto/Makefile.depend
  projects/vnet/lib/clang/libllvmmirparser/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmmirparser/Makefile.depend
  projects/vnet/lib/clang/libllvmorcjit/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmorcjit/Makefile.depend
  projects/vnet/lib/clang/libllvmpasses/Makefile.depend
     - copied unchanged from r295854, head/lib/clang/libllvmpasses/Makefile.depend
  projects/vnet/lib/libpe/
     - copied from r295854, head/lib/libpe/
  projects/vnet/libexec/makewhatis.local/
     - copied from r295854, head/libexec/makewhatis.local/
  projects/vnet/share/examples/jails/VIMAGE
     - copied unchanged from r295854, head/share/examples/jails/VIMAGE
  projects/vnet/share/examples/jails/jail.xxx.conf
     - copied unchanged from r295854, head/share/examples/jails/jail.xxx.conf
  projects/vnet/share/examples/jails/jib
     - copied unchanged from r295854, head/share/examples/jails/jib
  projects/vnet/share/examples/jails/jng
     - copied unchanged from r295854, head/share/examples/jails/jng
  projects/vnet/share/examples/jails/rc.conf.jails
     - copied unchanged from r295854, head/share/examples/jails/rc.conf.jails
  projects/vnet/share/examples/jails/rcjail.xxx.conf
     - copied unchanged from r295854, head/share/examples/jails/rcjail.xxx.conf
  projects/vnet/sys/arm/allwinner/a10_codec.c
     - copied unchanged from r295854, head/sys/arm/allwinner/a10_codec.c
  projects/vnet/sys/arm/allwinner/a10_dmac.c
     - copied unchanged from r295854, head/sys/arm/allwinner/a10_dmac.c
  projects/vnet/sys/arm/allwinner/a10_dmac.h
     - copied unchanged from r295854, head/sys/arm/allwinner/a10_dmac.h
  projects/vnet/sys/arm/allwinner/a10_padconf.c
     - copied unchanged from r295854, head/sys/arm/allwinner/a10_padconf.c
  projects/vnet/sys/arm/allwinner/a20/a20_padconf.c
     - copied unchanged from r295854, head/sys/arm/allwinner/a20/a20_padconf.c
  projects/vnet/sys/arm/allwinner/allwinner_pinctrl.h
     - copied unchanged from r295854, head/sys/arm/allwinner/allwinner_pinctrl.h
  projects/vnet/sys/arm/allwinner/axp209.c
     - copied unchanged from r295854, head/sys/arm/allwinner/axp209.c
  projects/vnet/sys/arm/allwinner/sunxi_dma_if.m
     - copied unchanged from r295854, head/sys/arm/allwinner/sunxi_dma_if.m
  projects/vnet/sys/arm/arm/busdma_machdep-v4.c
     - copied unchanged from r295854, head/sys/arm/arm/busdma_machdep-v4.c
  projects/vnet/sys/arm/arm/pmap-v4.c
     - copied unchanged from r295854, head/sys/arm/arm/pmap-v4.c
  projects/vnet/sys/arm/arm/trap-v4.c
     - copied unchanged from r295854, head/sys/arm/arm/trap-v4.c
  projects/vnet/sys/arm/conf/A10
     - copied unchanged from r295854, head/sys/arm/conf/A10
  projects/vnet/sys/arm/include/cpu-v4.h
     - copied unchanged from r295854, head/sys/arm/include/cpu-v4.h
  projects/vnet/sys/arm/include/pmap-v4.h
     - copied unchanged from r295854, head/sys/arm/include/pmap-v4.h
  projects/vnet/sys/arm/include/pte-v4.h
     - copied unchanged from r295854, head/sys/arm/include/pte-v4.h
  projects/vnet/sys/arm/ti/omap4/omap4_wugen.c
     - copied unchanged from r295854, head/sys/arm/ti/omap4/omap4_wugen.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_pem.h
     - copied unchanged from r295854, head/sys/arm64/cavium/thunder_pcie_pem.h
  projects/vnet/sys/arm64/cavium/thunder_pcie_pem_fdt.c
     - copied unchanged from r295854, head/sys/arm64/cavium/thunder_pcie_pem_fdt.c
  projects/vnet/sys/boot/fdt/dts/arm/olimex-a20-som-evb.dts
     - copied unchanged from r295854, head/sys/boot/fdt/dts/arm/olimex-a20-som-evb.dts
  projects/vnet/sys/boot/fdt/dts/arm/olinuxino-lime.dts
     - copied unchanged from r295854, head/sys/boot/fdt/dts/arm/olinuxino-lime.dts
  projects/vnet/sys/boot/fdt/dts/riscv/qemu.dts
     - copied unchanged from r295854, head/sys/boot/fdt/dts/riscv/qemu.dts
  projects/vnet/sys/dev/iicbus/twsi/
     - copied from r295854, head/sys/dev/iicbus/twsi/
  projects/vnet/sys/gnu/dts/arm/alphascale-asm9260-devkit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/alphascale-asm9260-devkit.dts
  projects/vnet/sys/gnu/dts/arm/alphascale-asm9260.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/alphascale-asm9260.dtsi
  projects/vnet/sys/gnu/dts/arm/alpine-db.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/alpine-db.dts
  projects/vnet/sys/gnu/dts/arm/alpine.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/alpine.dtsi
  projects/vnet/sys/gnu/dts/arm/am335x-baltos-ir5221.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-baltos-ir5221.dts
  projects/vnet/sys/gnu/dts/arm/am335x-bonegreen.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-bonegreen.dts
  projects/vnet/sys/gnu/dts/arm/am335x-chiliboard.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-chiliboard.dts
  projects/vnet/sys/gnu/dts/arm/am335x-chilisom.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-chilisom.dtsi
  projects/vnet/sys/gnu/dts/arm/am335x-cm-t335.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-cm-t335.dts
  projects/vnet/sys/gnu/dts/arm/am335x-phycore-som.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-phycore-som.dtsi
  projects/vnet/sys/gnu/dts/arm/am335x-sbc-t335.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-sbc-t335.dts
  projects/vnet/sys/gnu/dts/arm/am335x-shc.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-shc.dts
  projects/vnet/sys/gnu/dts/arm/am335x-sl50.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-sl50.dts
  projects/vnet/sys/gnu/dts/arm/am335x-wega-rdk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-wega-rdk.dts
  projects/vnet/sys/gnu/dts/arm/am335x-wega.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am335x-wega.dtsi
  projects/vnet/sys/gnu/dts/arm/am437x-cm-t43.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am437x-cm-t43.dts
  projects/vnet/sys/gnu/dts/arm/am437x-sbc-t43.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am437x-sbc-t43.dts
  projects/vnet/sys/gnu/dts/arm/am57xx-cl-som-am57x.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am57xx-cl-som-am57x.dts
  projects/vnet/sys/gnu/dts/arm/am57xx-sbc-am57x.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/am57xx-sbc-am57x.dts
  projects/vnet/sys/gnu/dts/arm/arm-realview-pb11mp.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/arm-realview-pb11mp.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-dlink-dns327l.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-dlink-dns327l.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-nas-2bay.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-nas-2bay.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-nas-4bay.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-nas-4bay.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-nas-xbay.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-nas-xbay.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-personal-cloud-2bay.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-personal-cloud-2bay.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-personal-cloud.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-personal-cloud.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-seagate-personal-cloud.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-370-seagate-personal-cloud.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-385-linksys-caiman.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-385-linksys-caiman.dts
  projects/vnet/sys/gnu/dts/arm/armada-385-linksys-cobra.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-385-linksys-cobra.dts
  projects/vnet/sys/gnu/dts/arm/armada-385-linksys.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-385-linksys.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-388-clearfog.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-388-clearfog.dts
  projects/vnet/sys/gnu/dts/arm/armada-38x-solidrun-microsom.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-38x-solidrun-microsom.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-390.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-390.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-398-db.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-398-db.dts
  projects/vnet/sys/gnu/dts/arm/armada-398.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-398.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-39x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-39x.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-xp-linksys-mamba.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/armada-xp-linksys-mamba.dts
  projects/vnet/sys/gnu/dts/arm/at91-ariettag25.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-ariettag25.dts
  projects/vnet/sys/gnu/dts/arm/at91-kizbox.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-kizbox.dts
  projects/vnet/sys/gnu/dts/arm/at91-kizbox2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-kizbox2.dts
  projects/vnet/sys/gnu/dts/arm/at91-kizboxmini.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-kizboxmini.dts
  projects/vnet/sys/gnu/dts/arm/at91-sama5d2_xplained.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts
  projects/vnet/sys/gnu/dts/arm/at91-sama5d4_ma5d4.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-sama5d4_ma5d4.dtsi
  projects/vnet/sys/gnu/dts/arm/at91-sama5d4_ma5d4evk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-sama5d4_ma5d4evk.dts
  projects/vnet/sys/gnu/dts/arm/at91-sama5d4_xplained.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-sama5d4_xplained.dts
  projects/vnet/sys/gnu/dts/arm/at91-vinco.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91-vinco.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9x5dm.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/at91sam9x5dm.dtsi
  projects/vnet/sys/gnu/dts/arm/axm5516-amarillo.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/axm5516-amarillo.dts
  projects/vnet/sys/gnu/dts/arm/axm55xx.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/axm55xx.dtsi
  projects/vnet/sys/gnu/dts/arm/axp152.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/axp152.dtsi
  projects/vnet/sys/gnu/dts/arm/axp22x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/axp22x.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm-nsp.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm-nsp.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm2835-rpi-a-plus.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm2835-rpi-a-plus.dts
  projects/vnet/sys/gnu/dts/arm/bcm2835-rpi-b-rev2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm2835-rpi-b-rev2.dts
  projects/vnet/sys/gnu/dts/arm/bcm2836-rpi-2-b.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm2836-rpi-2-b.dts
  projects/vnet/sys/gnu/dts/arm/bcm2836.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm2836.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm283x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm283x.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm4708-asus-rt-ac56u.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4708-asus-rt-ac56u.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708-asus-rt-ac68u.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4708-asus-rt-ac68u.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708-smartrg-sr400ac.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4708-smartrg-sr400ac.dts
  projects/vnet/sys/gnu/dts/arm/bcm4709-asus-rt-ac87u.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4709-asus-rt-ac87u.dts
  projects/vnet/sys/gnu/dts/arm/bcm4709-buffalo-wxr-1900dhp.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4709-buffalo-wxr-1900dhp.dts
  projects/vnet/sys/gnu/dts/arm/bcm4709-netgear-r7000.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4709-netgear-r7000.dts
  projects/vnet/sys/gnu/dts/arm/bcm4709-netgear-r8000.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm4709-netgear-r8000.dts
  projects/vnet/sys/gnu/dts/arm/bcm5301x-nand-cs0-bch8.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm5301x-nand-cs0-bch8.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm94708.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm94708.dts
  projects/vnet/sys/gnu/dts/arm/bcm94709.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm94709.dts
  projects/vnet/sys/gnu/dts/arm/bcm953012k.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm953012k.dts
  projects/vnet/sys/gnu/dts/arm/bcm958305k.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm958305k.dts
  projects/vnet/sys/gnu/dts/arm/bcm958625k.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm958625k.dts
  projects/vnet/sys/gnu/dts/arm/bcm9hmidc.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/bcm9hmidc.dtsi
  projects/vnet/sys/gnu/dts/arm/compulab-sb-som.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/compulab-sb-som.dtsi
  projects/vnet/sys/gnu/dts/arm/cros-ec-sbs.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/cros-ec-sbs.dtsi
  projects/vnet/sys/gnu/dts/arm/dm8148-evm.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dm8148-evm.dts
  projects/vnet/sys/gnu/dts/arm/dm8148-t410.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dm8148-t410.dts
  projects/vnet/sys/gnu/dts/arm/dm814x-clocks.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dm814x-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/dm814x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dm814x.dtsi
  projects/vnet/sys/gnu/dts/arm/dove-cm-a510.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dove-cm-a510.dtsi
  projects/vnet/sys/gnu/dts/arm/dove-sbc-a510.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dove-sbc-a510.dts
  projects/vnet/sys/gnu/dts/arm/dra62x-clocks.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dra62x-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/dra62x-j5eco-evm.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dra62x-j5eco-evm.dts
  projects/vnet/sys/gnu/dts/arm/dra62x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/dra62x.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4-cpu-thermal.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos4-cpu-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4412-tmu-sensor-conf.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos4412-tmu-sensor-conf.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5250-snow-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5250-snow-common.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5250-snow-rev5.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5250-snow-rev5.dts
  projects/vnet/sys/gnu/dts/arm/exynos5250-snow.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5250-snow.dts
  projects/vnet/sys/gnu/dts/arm/exynos5420-peach-pit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5420-peach-pit.dts
  projects/vnet/sys/gnu/dts/arm/exynos5420-trip-points.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5420-trip-points.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-cpu-thermal.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-cpu-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-cpus.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-cpus.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-odroidxu3-audio.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-odroidxu3-audio.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-odroidxu3-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-odroidxu3-common.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-odroidxu3-lite.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-odroidxu3-lite.dts
  projects/vnet/sys/gnu/dts/arm/exynos5422-odroidxu4.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5422-odroidxu4.dts
  projects/vnet/sys/gnu/dts/arm/exynos5440-tmu-sensor-conf.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5440-tmu-sensor-conf.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5440-trip-points.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5440-trip-points.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5800-peach-pi.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/exynos5800-peach-pi.dts
  projects/vnet/sys/gnu/dts/arm/imx51-ts4800.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx51-ts4800.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-apf6dev.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6dl-apf6dev.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-aristainetos2_4.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6dl-aristainetos2_4.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-aristainetos2_7.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6dl-aristainetos2_7.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-gw551x.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6dl-gw551x.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-nit6xlite.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6dl-nit6xlite.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-apf6dev.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6q-apf6dev.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-gw551x.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6q-gw551x.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-nitrogen6_max.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6q-nitrogen6_max.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-novena.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6q-novena.dts
  projects/vnet/sys/gnu/dts/arm/imx6qdl-apf6.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-apf6.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-apf6dev.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-apf6dev.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-aristainetos2.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-aristainetos2.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw551x.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-gw551x.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-nit6xlite.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-nit6xlite.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-nitrogen6_max.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6qdl-nitrogen6_max.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6sl-warp.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6sl-warp.dts
  projects/vnet/sys/gnu/dts/arm/imx6sx-sdb-reva.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6sx-sdb-reva.dts
  projects/vnet/sys/gnu/dts/arm/imx6sx-sdb.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6sx-sdb.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6ul-14x14-evk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6ul-14x14-evk.dts
  projects/vnet/sys/gnu/dts/arm/imx6ul-pinfunc.h
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6ul-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/imx6ul.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx6ul.dtsi
  projects/vnet/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts
  projects/vnet/sys/gnu/dts/arm/imx7d-pinfunc.h
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx7d-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/imx7d-sbc-imx7.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx7d-sbc-imx7.dts
  projects/vnet/sys/gnu/dts/arm/imx7d-sdb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx7d-sdb.dts
  projects/vnet/sys/gnu/dts/arm/imx7d.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/imx7d.dtsi
  projects/vnet/sys/gnu/dts/arm/k2e-netcp.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/k2e-netcp.dtsi
  projects/vnet/sys/gnu/dts/arm/k2hk-netcp.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/k2hk-netcp.dtsi
  projects/vnet/sys/gnu/dts/arm/k2l-netcp.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/k2l-netcp.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-lswvl.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/kirkwood-lswvl.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-lswxl.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/kirkwood-lswxl.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-nas2big.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/kirkwood-nas2big.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-nsa325.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/kirkwood-nsa325.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-pogoplug-series-4.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/kirkwood-pogoplug-series-4.dts
  projects/vnet/sys/gnu/dts/arm/logicpd-torpedo-37xx-devkit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/logicpd-torpedo-37xx-devkit.dts
  projects/vnet/sys/gnu/dts/arm/logicpd-torpedo-som.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/logicpd-torpedo-som.dtsi
  projects/vnet/sys/gnu/dts/arm/lpc18xx.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc18xx.dtsi
  projects/vnet/sys/gnu/dts/arm/lpc4337-ciaa.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc4337-ciaa.dts
  projects/vnet/sys/gnu/dts/arm/lpc4350-hitex-eval.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc4350-hitex-eval.dts
  projects/vnet/sys/gnu/dts/arm/lpc4350.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc4350.dtsi
  projects/vnet/sys/gnu/dts/arm/lpc4357-ea4357-devkit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc4357-ea4357-devkit.dts
  projects/vnet/sys/gnu/dts/arm/lpc4357.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/lpc4357.dtsi
  projects/vnet/sys/gnu/dts/arm/meson8-minix-neo-x8.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/meson8-minix-neo-x8.dts
  projects/vnet/sys/gnu/dts/arm/meson8b-mxq.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/meson8b-mxq.dts
  projects/vnet/sys/gnu/dts/arm/meson8b-odroidc1.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/meson8b-odroidc1.dts
  projects/vnet/sys/gnu/dts/arm/meson8b.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/meson8b.dtsi
  projects/vnet/sys/gnu/dts/arm/mmp2-brownstone.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mmp2-brownstone.dts
  projects/vnet/sys/gnu/dts/arm/mmp2.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mmp2.dtsi
  projects/vnet/sys/gnu/dts/arm/mt2701-evb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mt2701-evb.dts
  projects/vnet/sys/gnu/dts/arm/mt2701.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mt2701.dtsi
  projects/vnet/sys/gnu/dts/arm/mt6580-evbp1.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mt6580-evbp1.dts
  projects/vnet/sys/gnu/dts/arm/mt6580.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mt6580.dtsi
  projects/vnet/sys/gnu/dts/arm/mt8135-pinfunc.h
     - copied unchanged from r295854, head/sys/gnu/dts/arm/mt8135-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/omap3-devkit8000-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-devkit8000-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-devkit8000-lcd-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-devkit8000-lcd-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts
  projects/vnet/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts
  projects/vnet/sys/gnu/dts/arm/omap3-overo-palo35-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-palo35-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-palo35.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-palo35.dts
  projects/vnet/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts
  projects/vnet/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts
  projects/vnet/sys/gnu/dts/arm/omap3-overo-tobiduo-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-tobiduo-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-tobiduo.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-overo-tobiduo.dts
  projects/vnet/sys/gnu/dts/arm/omap3-pandora-1ghz.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-pandora-1ghz.dts
  projects/vnet/sys/gnu/dts/arm/omap3-pandora-600mhz.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-pandora-600mhz.dts
  projects/vnet/sys/gnu/dts/arm/omap3-pandora-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap3-pandora-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap5-board-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap5-board-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap5-igep0050.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/omap5-igep0050.dts
  projects/vnet/sys/gnu/dts/arm/orion5x-linkstation-lswtgl.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/orion5x-linkstation-lswtgl.dts
  projects/vnet/sys/gnu/dts/arm/orion5x-lswsgl.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/orion5x-lswsgl.dts
  projects/vnet/sys/gnu/dts/arm/pxa168-aspenite.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/pxa168-aspenite.dts
  projects/vnet/sys/gnu/dts/arm/pxa168.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/pxa168.dtsi
  projects/vnet/sys/gnu/dts/arm/pxa910-dkb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/pxa910-dkb.dts
  projects/vnet/sys/gnu/dts/arm/pxa910.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/pxa910.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-apq8064-cm-qs600.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8064-cm-qs600.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8064-ifc6410.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8064-ifc6410.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8064-sony-xperia-yuga.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8064-sony-xperia-yuga.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8064-v2.0.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8064-v2.0.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-apq8064.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8064.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-apq8074-dragonboard.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8074-dragonboard.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8084-ifc6540.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8084-ifc6540.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8084-mtp.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8084-mtp.dts
  projects/vnet/sys/gnu/dts/arm/qcom-apq8084.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-apq8084.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-ipq8064-ap148.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-ipq8064-ap148.dts
  projects/vnet/sys/gnu/dts/arm/qcom-ipq8064-v1.0.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-ipq8064-v1.0.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-ipq8064.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-ipq8064.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-msm8660-surf.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8660-surf.dts
  projects/vnet/sys/gnu/dts/arm/qcom-msm8660.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8660.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-msm8960-cdp.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8960-cdp.dts
  projects/vnet/sys/gnu/dts/arm/qcom-msm8960.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8960.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-honami.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-honami.dts
  projects/vnet/sys/gnu/dts/arm/qcom-msm8974.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-msm8974.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-pm8841.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-pm8841.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-pm8941.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-pm8941.dtsi
  projects/vnet/sys/gnu/dts/arm/qcom-pma8084.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/qcom-pma8084.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7791-porter.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/r8a7791-porter.dts
  projects/vnet/sys/gnu/dts/arm/r8a7793-gose.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/r8a7793-gose.dts
  projects/vnet/sys/gnu/dts/arm/r8a7793.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/r8a7793.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7794-silk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/r8a7794-silk.dts
  projects/vnet/sys/gnu/dts/arm/r8a77xx-aa121td01-panel.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/r8a77xx-aa121td01-panel.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3036-evb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3036-evb.dts
  projects/vnet/sys/gnu/dts/arm/rk3036-kylin.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3036-kylin.dts
  projects/vnet/sys/gnu/dts/arm/rk3036.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3036.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3228-evb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3228-evb.dts
  projects/vnet/sys/gnu/dts/arm/rk3228.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3228.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-popmetal.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-popmetal.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-r89.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-r89.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-rock2-som.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-rock2-som.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-rock2-square.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-rock2-square.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-brain.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-brain.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-chromebook.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-chromebook.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-jaq.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-jaq.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-jerry.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-jerry.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-mickey.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-mickey.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-minnie.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-minnie.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-pinky.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-pinky.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-sdmmc.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-sdmmc.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron-speedy.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron-speedy.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-veyron.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/rk3288-veyron.dtsi
  projects/vnet/sys/gnu/dts/arm/s3c6400.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c6400.dtsi
  projects/vnet/sys/gnu/dts/arm/s3c6410-mini6410.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c6410-mini6410.dts
  projects/vnet/sys/gnu/dts/arm/s3c6410-smdk6410.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c6410-smdk6410.dts
  projects/vnet/sys/gnu/dts/arm/s3c6410.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c6410.dtsi
  projects/vnet/sys/gnu/dts/arm/s3c64xx-pinctrl.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c64xx-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/s3c64xx.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/s3c64xx.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d2-pinfunc.h
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sama5d2-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/sama5d2.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sama5d2.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_arria10.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_arria10.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_arria5.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_arria5.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_arria5_socdk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_arria5_socdk.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_de0_sockit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_de0_sockit.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_mcv.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_mcv.dtsi
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_mcvevk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_mcvevk.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_socdk.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_socdk.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_sockit.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_sockit.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_cyclone5_socrates.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_cyclone5_socrates.dts
  projects/vnet/sys/gnu/dts/arm/socfpga_vt.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/socfpga_vt.dts
  projects/vnet/sys/gnu/dts/arm/stm32429i-eval.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/stm32429i-eval.dts
  projects/vnet/sys/gnu/dts/arm/stm32f429-disco.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/stm32f429-disco.dts
  projects/vnet/sys/gnu/dts/arm/stm32f429.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/stm32f429.dtsi
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-gemei-g9.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-gemei-g9.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-inet1.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-inet1.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-inet9f-rev03.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-inet9f-rev03.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-itead-iteaduino-plus.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-itead-iteaduino-plus.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-jesurun-q5.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-jesurun-q5.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-pcduino2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-pcduino2.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-pov-protab2-ips9.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun4i-a10-pov-protab2-ips9.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-auxtek-t003.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a10s-auxtek-t003.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-auxtek-t004.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a10s-auxtek-t004.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-wobo-i5.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a10s-wobo-i5.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-empire-electronix-d709.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a13-empire-electronix-d709.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-inet-98v-rev2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a13-inet-98v-rev2.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-q8-tablet.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a13-q8-tablet.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-utoo-p66.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-a13-utoo-p66.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-q8-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-q8-common.dtsi
  projects/vnet/sys/gnu/dts/arm/sun5i-r8-chip.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-r8-chip.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-r8.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i-r8.dtsi
  projects/vnet/sys/gnu/dts/arm/sun5i.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun5i.dtsi
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-i7.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31-i7.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-mele-a1000g-quad.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31-mele-a1000g-quad.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-primo81.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31s-primo81.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-sina31s-core.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31s-sina31s-core.dtsi
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-sina31s.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31s-sina31s.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-sinovoip-bpi-m2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31s-sinovoip-bpi-m2.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-yones-toptech-bs1078-v2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun6i-a31s-yones-toptech-bs1078-v2.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-icnova-swac.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-icnova-swac.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-mk808c.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-mk808c.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-olimex-som-evb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-olimex-som-evb.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-orangepi-mini.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-orangepi-mini.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-orangepi.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-orangepi.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-pcduino3-nano.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-pcduino3-nano.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-wexler-tab7200.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-wexler-tab7200.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-wits-pro-a20-dkt.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun7i-a20-wits-pro-a20-dkt.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-a33.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a23-a33.dtsi
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-evb.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a23-evb.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-gt90h-v4.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a23-gt90h-v4.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-q8-tablet.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a23-q8-tablet.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33-et-q8-v1.6.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33-et-q8-v1.6.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33-ga10h-v1.1.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33-ga10h-v1.1.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33-ippo-q8h-v1.2.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33-ippo-q8h-v1.2.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33-q8-tablet.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33-q8-tablet.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33-sinlinx-sina33.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33-sinlinx-sina33.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a33.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-a33.dtsi
  projects/vnet/sys/gnu/dts/arm/sun8i-h3-orangepi-plus.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-h3-orangepi-plus.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-h3.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-h3.dtsi
  projects/vnet/sys/gnu/dts/arm/sun8i-q8-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun8i-q8-common.dtsi
  projects/vnet/sys/gnu/dts/arm/sun9i-a80-cubieboard4.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sun9i-a80-cubieboard4.dts
  projects/vnet/sys/gnu/dts/arm/sunxi-q8-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/sunxi-q8-common.dtsi
  projects/vnet/sys/gnu/dts/arm/tango4-common.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tango4-common.dtsi
  projects/vnet/sys/gnu/dts/arm/tango4-smp8758.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tango4-smp8758.dtsi
  projects/vnet/sys/gnu/dts/arm/tango4-vantage-1172.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tango4-vantage-1172.dts
  projects/vnet/sys/gnu/dts/arm/tegra124-jetson-tk1-emc.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tegra124-jetson-tk1-emc.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra124-nyan-blaze-emc.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tegra124-nyan-blaze-emc.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra124-nyan-blaze.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tegra124-nyan-blaze.dts
  projects/vnet/sys/gnu/dts/arm/tegra124-nyan.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/tegra124-nyan.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-common32.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-common32.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-ld4-ref.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-ld4-ref.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-ld4.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-ld4.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-ld6b-ref.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-ld6b-ref.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-ld6b.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-ld6b.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-pro4-ref.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-pro4-ref.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-pro4.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-pro4.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-pro5.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-pro5.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-sld3-ref.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-sld3-ref.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-sld3.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-sld3.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-sld8-ref.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-sld8-ref.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-ph1-sld8.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ph1-sld8.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-pinctrl.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-proxstream2-gentil.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-proxstream2-gentil.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-proxstream2-vodka.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-proxstream2-vodka.dts
  projects/vnet/sys/gnu/dts/arm/uniphier-proxstream2.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-proxstream2.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-ref-daughter.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-ref-daughter.dtsi
  projects/vnet/sys/gnu/dts/arm/uniphier-support-card.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/uniphier-support-card.dtsi
  projects/vnet/sys/gnu/dts/arm/vf610m4-colibri.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/vf610m4-colibri.dts
  projects/vnet/sys/gnu/dts/arm/vf610m4-cosmic.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/vf610m4-cosmic.dts
  projects/vnet/sys/gnu/dts/arm/vf610m4.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/vf610m4.dtsi
  projects/vnet/sys/gnu/dts/arm/zx296702-ad1.dts
     - copied unchanged from r295854, head/sys/gnu/dts/arm/zx296702-ad1.dts
  projects/vnet/sys/gnu/dts/arm/zx296702.dtsi
     - copied unchanged from r295854, head/sys/gnu/dts/arm/zx296702.dtsi
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/alphascale,asm9260.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/alphascale,asm9260.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/bcm-cygnus.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/bcm-cygnus.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/bcm-ns2.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/bcm-ns2.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/bcm-nsp.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/bcm-nsp.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/bcm2835-aux.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/bcm2835-aux.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/bcm2835.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/bcm2835.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos5433.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/exynos5433.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/hi6220-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/hi6220-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/imx6ul-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/imx6ul-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/imx7d-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/imx7d-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/jz4740-cgu.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/jz4740-cgu.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/jz4780-cgu.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/jz4780-cgu.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/lpc18xx-ccu.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/lpc18xx-ccu.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/lpc18xx-cgu.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/lpc18xx-cgu.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/lpc32xx-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/lpc32xx-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa168.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa168.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa1928.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa1928.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa910.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa910.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/maxim,max77686.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/maxim,max77686.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/maxim,max77802.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/maxim,max77802.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/meson8b-clkc.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/meson8b-clkc.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/mt8135-clk.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/mt8135-clk.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/mt8173-clk.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/mt8173-clk.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/pistachio-clk.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/pistachio-clk.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8916.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8916.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8996.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8996.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-ipq806x.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-ipq806x.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-msm8960.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-msm8960.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8996.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8996.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a73a4-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/r8a73a4-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7778-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/r8a7778-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7793-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/r8a7793-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7795-cpg-mssr.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/r8a7795-cpg-mssr.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/renesas-cpg-mssr.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/renesas-cpg-mssr.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3036-cru.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/rk3036-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3228-cru.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/rk3228-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3368-cru.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/rk3368-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rockchip,rk808.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/rockchip,rk808.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/samsung,s2mps11.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/samsung,s2mps11.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/sun4i-a10-pll2.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/sun4i-a10-pll2.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/tegra210-car.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/tegra210-car.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/zx296702-clock.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/clock/zx296702-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/dma/axi-dmac.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/dma/axi-dmac.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/gpio/meson8b-gpio.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/gpio/meson8b-gpio.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/i2c/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/i2c/
  projects/vnet/sys/gnu/dts/include/dt-bindings/iio/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/iio/
  projects/vnet/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq-st.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq-st.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/leds/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/leds/
  projects/vnet/sys/gnu/dts/include/dt-bindings/media/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/media/
  projects/vnet/sys/gnu/dts/include/dt-bindings/memory/tegra210-mc.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/memory/tegra210-mc.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/mfd/arizona.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/mfd/arizona.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/mfd/atmel-flexcom.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/mfd/atmel-flexcom.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/mfd/st-lpc.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/mfd/st-lpc.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/net/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/net/
  projects/vnet/sys/gnu/dts/include/dt-bindings/phy/phy-pistachio-usb.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/phy/phy-pistachio-usb.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/bcm2835.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/bcm2835.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/dm814x.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/dm814x.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/mt6397-pinfunc.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/mt6397-pinfunc.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/mt65xx.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/mt65xx.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/power/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/power/
  projects/vnet/sys/gnu/dts/include/dt-bindings/regulator/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/regulator/
  projects/vnet/sys/gnu/dts/include/dt-bindings/reset/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/reset/
  projects/vnet/sys/gnu/dts/include/dt-bindings/soc/
     - copied from r295854, head/sys/gnu/dts/include/dt-bindings/soc/
  projects/vnet/sys/gnu/dts/include/dt-bindings/sound/apq8016-lpass.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/sound/apq8016-lpass.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/sound/audio-jack-events.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/sound/audio-jack-events.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/sound/tas2552.h
     - copied unchanged from r295854, head/sys/gnu/dts/include/dt-bindings/sound/tas2552.h
  projects/vnet/sys/mips/include/intr.h
     - copied unchanged from r295854, head/sys/mips/include/intr.h
  projects/vnet/sys/mips/mips/mips_pic.c
     - copied unchanged from r295854, head/sys/mips/mips/mips_pic.c
  projects/vnet/sys/riscv/conf/QEMU
     - copied unchanged from r295854, head/sys/riscv/conf/QEMU
  projects/vnet/sys/riscv/conf/SPIKE
     - copied unchanged from r295854, head/sys/riscv/conf/SPIKE
  projects/vnet/sys/sys/_ucontext.h
     - copied unchanged from r295854, head/sys/sys/_ucontext.h
  projects/vnet/sys/sys/intr.h
     - copied unchanged from r295854, head/sys/sys/intr.h
  projects/vnet/tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
     - copied unchanged from r295854, head/tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
  projects/vnet/tools/build/options/WITH_BINUTILS
     - copied unchanged from r295854, head/tools/build/options/WITH_BINUTILS
  projects/vnet/tools/build/options/WITH_BINUTILS_BOOTSTRAP
     - copied unchanged from r295854, head/tools/build/options/WITH_BINUTILS_BOOTSTRAP
  projects/vnet/tools/build/options/WITH_GDB
     - copied unchanged from r295854, head/tools/build/options/WITH_GDB
  projects/vnet/tools/tools/nanobsd/embedded/i386.cfg
     - copied unchanged from r295854, head/tools/tools/nanobsd/embedded/i386.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-armv7.cfg
     - copied unchanged from r295854, head/tools/tools/nanobsd/embedded/qemu-armv7.cfg
  projects/vnet/usr.bin/bmake/tests/Makefile.inc
     - copied unchanged from r295854, head/usr.bin/bmake/tests/Makefile.inc
  projects/vnet/usr.bin/clang/bugpoint/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/bugpoint/Makefile.depend
  projects/vnet/usr.bin/clang/llc/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llc/Makefile.depend
  projects/vnet/usr.bin/clang/lli/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/lli/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-ar/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-ar/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-as/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-as/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-cov/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-cov/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-cxxdump/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-cxxdump/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-diff/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-diff/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-dis/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-dis/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-dwarfdump/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-dwarfdump/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-extract/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-extract/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-link/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-link/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-lto/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-lto/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-mc/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-mc/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-nm/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-nm/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-objdump/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-objdump/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-pdbdump/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-pdbdump/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-profdata/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-profdata/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-rtdyld/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-rtdyld/Makefile.depend
  projects/vnet/usr.bin/clang/llvm-symbolizer/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/llvm-symbolizer/Makefile.depend
  projects/vnet/usr.bin/clang/macho-dump/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/macho-dump/Makefile.depend
  projects/vnet/usr.bin/clang/opt/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/clang/opt/Makefile.depend
  projects/vnet/usr.bin/truss/Makefile.depend
     - copied unchanged from r295854, head/usr.bin/truss/Makefile.depend
  projects/vnet/usr.sbin/ctld/uclparse.c
     - copied unchanged from r295854, head/usr.sbin/ctld/uclparse.c
Replaced:
  projects/vnet/sys/arm/include/pmap.h
     - copied unchanged from r295854, head/sys/arm/include/pmap.h
Deleted:
  projects/vnet/contrib/elftoolchain/libelftc/elftc_symbol_table_create.3
  projects/vnet/sys/arm/arm/busdma_machdep.c
  projects/vnet/sys/arm/arm/pmap.c
  projects/vnet/sys/arm/arm/trap.c
  projects/vnet/sys/arm/include/pte.h
  projects/vnet/sys/arm/mv/twsi.c
  projects/vnet/sys/arm/xilinx/zedboard/
  projects/vnet/sys/gnu/dts/arm/dove-cm-a510.dts
  projects/vnet/sys/gnu/dts/arm/imx53-evk.dts
  projects/vnet/sys/gnu/dts/arm/kizbox.dts
  projects/vnet/sys/gnu/dts/arm/omap34xx-hs.dtsi
  projects/vnet/sys/gnu/dts/arm/omap36xx-hs.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a73a4-ape6evm-reference.dts
  projects/vnet/sys/gnu/dts/arm/r8a7778-bockw-reference.dts
  projects/vnet/sys/gnu/dts/arm/r8a7791-henninger.dts
  projects/vnet/sys/gnu/dts/arm/sh7372-mackerel.dts
  projects/vnet/sys/gnu/dts/arm/sh7372.dtsi
  projects/vnet/sys/gnu/dts/arm/sh73a0-kzm9g-reference.dts
  projects/vnet/sys/gnu/dts/arm/tps65217.dtsi
  projects/vnet/sys/gnu/dts/include/dt-bindings/clk/at91.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clk/exynos-audss-clk.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/phy/phy-miphy365x.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/reset-controller/
  projects/vnet/sys/mips/mips/bus_space_fdt.c
  projects/vnet/usr.bin/truss/Makefile.depend.amd64
Modified:
  projects/vnet/Makefile
  projects/vnet/Makefile.inc1
  projects/vnet/ObsoleteFiles.inc
  projects/vnet/bin/csh/Makefile
  projects/vnet/bin/dd/Makefile
  projects/vnet/bin/dd/args.c
  projects/vnet/bin/dd/dd.1
  projects/vnet/bin/dd/dd.c
  projects/vnet/bin/dd/dd.h
  projects/vnet/bin/dd/gen.c
  projects/vnet/bin/pkill/pkill.c
  projects/vnet/bin/ps/ps.1
  projects/vnet/bin/sh/input.c
  projects/vnet/bin/sh/tests/Makefile
  projects/vnet/bin/sh/tests/parser/Makefile
  projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/vnet/cddl/usr.sbin/dtrace/tests/common/Makefile
  projects/vnet/contrib/elftoolchain/addr2line/addr2line.c
  projects/vnet/contrib/elftoolchain/ar/ar.c
  projects/vnet/contrib/elftoolchain/brandelf/brandelf.c
  projects/vnet/contrib/elftoolchain/common/elfdefinitions.h
  projects/vnet/contrib/elftoolchain/common/native-elf-format
  projects/vnet/contrib/elftoolchain/cxxfilt/cxxfilt.c
  projects/vnet/contrib/elftoolchain/elfcopy/Makefile
  projects/vnet/contrib/elftoolchain/elfcopy/archive.c
  projects/vnet/contrib/elftoolchain/elfcopy/elfcopy.1
  projects/vnet/contrib/elftoolchain/elfcopy/elfcopy.h
  projects/vnet/contrib/elftoolchain/elfcopy/main.c
  projects/vnet/contrib/elftoolchain/elfcopy/sections.c
  projects/vnet/contrib/elftoolchain/elfcopy/segments.c
  projects/vnet/contrib/elftoolchain/elfcopy/symbols.c
  projects/vnet/contrib/elftoolchain/elfdump/elfdump.c
  projects/vnet/contrib/elftoolchain/libdwarf/_libdwarf.h
  projects/vnet/contrib/elftoolchain/libdwarf/dwarf.3
  projects/vnet/contrib/elftoolchain/libdwarf/dwarf_str.c
  projects/vnet/contrib/elftoolchain/libdwarf/libdwarf.h
  projects/vnet/contrib/elftoolchain/libdwarf/libdwarf_rw.c
  projects/vnet/contrib/elftoolchain/libelf/_libelf_config.h
  projects/vnet/contrib/elftoolchain/libelftc/Makefile
  projects/vnet/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
  projects/vnet/contrib/elftoolchain/libelftc/elftc_copyfile.c
  projects/vnet/contrib/elftoolchain/libelftc/elftc_demangle.c
  projects/vnet/contrib/elftoolchain/libelftc/libelftc.h
  projects/vnet/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
  projects/vnet/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  projects/vnet/contrib/elftoolchain/libelftc/make-toolchain-version
  projects/vnet/contrib/elftoolchain/readelf/readelf.c
  projects/vnet/contrib/elftoolchain/strings/strings.1
  projects/vnet/contrib/elftoolchain/strings/strings.c
  projects/vnet/contrib/unbound/Makefile.in
  projects/vnet/contrib/unbound/doc/example.conf
  projects/vnet/contrib/unbound/doc/example.conf.in
  projects/vnet/contrib/unbound/doc/unbound.conf.5
  projects/vnet/contrib/unbound/doc/unbound.conf.5.in
  projects/vnet/contrib/unbound/services/localzone.c
  projects/vnet/contrib/unbound/util/config_file.c
  projects/vnet/contrib/unbound/util/config_file.h
  projects/vnet/contrib/unbound/util/configlexer.lex
  projects/vnet/contrib/unbound/util/configparser.y
  projects/vnet/contrib/unbound/validator/val_anchor.c
  projects/vnet/etc/defaults/rc.conf
  projects/vnet/etc/periodic/daily/800.scrub-zfs
  projects/vnet/etc/periodic/security/520.pfdenied
  projects/vnet/etc/rc.d/jail
  projects/vnet/etc/rc.d/ntpd
  projects/vnet/gnu/usr.bin/rcs/doc/rcs.ms
  projects/vnet/include/signal.h
  projects/vnet/lib/Makefile
  projects/vnet/lib/libc/gen/directory.3
  projects/vnet/lib/libc/gen/elf_utils.c
  projects/vnet/lib/libc/include/libc_private.h
  projects/vnet/lib/libc/stdio/fgetln.3
  projects/vnet/lib/libc/stdio/fgetln.c
  projects/vnet/lib/libc/stdio/fputs.c
  projects/vnet/lib/libc/sys/connect.2
  projects/vnet/lib/libc/sys/interposing_table.c
  projects/vnet/lib/libc/sys/jail.2
  projects/vnet/lib/libc/sys/lseek.2
  projects/vnet/lib/libc/sys/semget.2
  projects/vnet/lib/libc/tests/Makefile
  projects/vnet/lib/libc/tests/gen/posix_spawn/Makefile
  projects/vnet/lib/libc/tests/sys/Makefile
  projects/vnet/lib/libedit/editline.3
  projects/vnet/lib/libedit/el.c
  projects/vnet/lib/libedit/hist.h
  projects/vnet/lib/libedit/keymacro.h
  projects/vnet/lib/libedit/search.c
  projects/vnet/lib/libedit/tokenizer.c
  projects/vnet/lib/libedit/tty.c
  projects/vnet/lib/libelftc/elftc_version.c
  projects/vnet/lib/libfetch/http.c
  projects/vnet/lib/libkvm/kvm_arm.c
  projects/vnet/lib/libkvm/kvm_arm.h
  projects/vnet/lib/libthr/pthread.map
  projects/vnet/lib/libthr/thread/thr_private.h
  projects/vnet/lib/libthr/thread/thr_stack.c
  projects/vnet/lib/libthr/thread/thr_syscalls.c
  projects/vnet/lib/libunbound/Makefile
  projects/vnet/libexec/Makefile
  projects/vnet/libexec/rtld-elf/tests/Makefile
  projects/vnet/sbin/ifconfig/ifclone.c
  projects/vnet/sbin/ifconfig/ifconfig.c
  projects/vnet/sbin/ifconfig/ifconfig.h
  projects/vnet/sbin/kldstat/Makefile.depend
  projects/vnet/secure/lib/libssh/Makefile.depend
  projects/vnet/share/examples/jails/README
  projects/vnet/share/i18n/esdb/MISC/MISC.alias
  projects/vnet/share/man/man4/bridge.4
  projects/vnet/share/man/man4/ds3231.4
  projects/vnet/share/man/man4/geom_uncompress.4
  projects/vnet/share/man/man4/inet.4
  projects/vnet/share/man/man5/mailer.conf.5
  projects/vnet/share/man/man5/rc.conf.5
  projects/vnet/share/man/man7/build.7
  projects/vnet/share/man/man8/uefi.8
  projects/vnet/share/misc/committers-ports.dot
  projects/vnet/share/mk/bsd.README
  projects/vnet/share/mk/bsd.dep.mk
  projects/vnet/share/mk/bsd.incs.mk
  projects/vnet/share/mk/bsd.init.mk
  projects/vnet/share/mk/bsd.lib.mk
  projects/vnet/share/mk/bsd.links.mk
  projects/vnet/share/mk/bsd.man.mk
  projects/vnet/share/mk/bsd.nls.mk
  projects/vnet/share/mk/bsd.obj.mk
  projects/vnet/share/mk/bsd.prog.mk
  projects/vnet/share/mk/bsd.subdir.mk
  projects/vnet/share/mk/bsd.sys.mk
  projects/vnet/share/mk/bsd.test.mk
  projects/vnet/share/mk/local.meta.sys.mk
  projects/vnet/share/mk/src.libnames.mk
  projects/vnet/share/mk/suite.test.mk
  projects/vnet/sys/arm/allwinner/a10_ahci.c
  projects/vnet/sys/arm/allwinner/a10_clk.c
  projects/vnet/sys/arm/allwinner/a10_clk.h
  projects/vnet/sys/arm/allwinner/a10_common.c
  projects/vnet/sys/arm/allwinner/a10_ehci.c
  projects/vnet/sys/arm/allwinner/a10_gpio.c
  projects/vnet/sys/arm/allwinner/a10_mmc.c
  projects/vnet/sys/arm/allwinner/a10_wdog.c
  projects/vnet/sys/arm/allwinner/a20/a20_cpu_cfg.c
  projects/vnet/sys/arm/allwinner/a20/a20_if_dwc.c
  projects/vnet/sys/arm/allwinner/a20/a20_mp.c
  projects/vnet/sys/arm/allwinner/a20/files.a20
  projects/vnet/sys/arm/allwinner/aintc.c
  projects/vnet/sys/arm/allwinner/allwinner_machdep.c
  projects/vnet/sys/arm/allwinner/allwinner_machdep.h
  projects/vnet/sys/arm/allwinner/files.a10
  projects/vnet/sys/arm/allwinner/files.allwinner
  projects/vnet/sys/arm/allwinner/if_emac.c
  projects/vnet/sys/arm/allwinner/timer.c
  projects/vnet/sys/arm/altera/socfpga/socfpga_common.c
  projects/vnet/sys/arm/altera/socfpga/socfpga_mp.c
  projects/vnet/sys/arm/amlogic/aml8726/aml8726_machdep.c
  projects/vnet/sys/arm/amlogic/aml8726/aml8726_mp.c
  projects/vnet/sys/arm/annapurna/alpine/common.c
  projects/vnet/sys/arm/arm/bus_space_generic.c
  projects/vnet/sys/arm/arm/cpufunc.c
  projects/vnet/sys/arm/arm/cpufunc_asm_arm11x6.S
  projects/vnet/sys/arm/arm/cpufunc_asm_arm9.S
  projects/vnet/sys/arm/arm/cpufunc_asm_armv5_ec.S
  projects/vnet/sys/arm/arm/cpufunc_asm_armv7.S
  projects/vnet/sys/arm/arm/cpufunc_asm_fa526.S
  projects/vnet/sys/arm/arm/cpufunc_asm_xscale.S
  projects/vnet/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/vnet/sys/arm/arm/cpuinfo.c
  projects/vnet/sys/arm/arm/db_interface.c
  projects/vnet/sys/arm/arm/debug_monitor.c
  projects/vnet/sys/arm/arm/devmap.c
  projects/vnet/sys/arm/arm/dump_machdep.c
  projects/vnet/sys/arm/arm/elf_machdep.c
  projects/vnet/sys/arm/arm/elf_trampoline.c
  projects/vnet/sys/arm/arm/fiq.c
  projects/vnet/sys/arm/arm/fusu.S
  projects/vnet/sys/arm/arm/genassym.c
  projects/vnet/sys/arm/arm/generic_timer.c
  projects/vnet/sys/arm/arm/identcpu.c
  projects/vnet/sys/arm/arm/locore-v4.S
  projects/vnet/sys/arm/arm/locore-v6.S
  projects/vnet/sys/arm/arm/machdep.c
  projects/vnet/sys/arm/arm/minidump_machdep.c
  projects/vnet/sys/arm/arm/mp_machdep.c
  projects/vnet/sys/arm/arm/nexus.c
  projects/vnet/sys/arm/arm/ofw_machdep.c
  projects/vnet/sys/arm/arm/pmap-v6.c
  projects/vnet/sys/arm/arm/sys_machdep.c
  projects/vnet/sys/arm/arm/syscall.c
  projects/vnet/sys/arm/arm/trap-v6.c
  projects/vnet/sys/arm/at91/at91.c
  projects/vnet/sys/arm/at91/at91_common.c
  projects/vnet/sys/arm/at91/at91_machdep.c
  projects/vnet/sys/arm/at91/at91_pinctrl.c
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_common.c
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_dma.h
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2836_mp.c
  projects/vnet/sys/arm/cavium/cns11xx/econa.c
  projects/vnet/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/vnet/sys/arm/conf/A20
  projects/vnet/sys/arm/conf/ALPINE
  projects/vnet/sys/arm/conf/ARMADA38X
  projects/vnet/sys/arm/conf/ARMADAXP
  projects/vnet/sys/arm/conf/CUBIEBOARD
  projects/vnet/sys/arm/conf/DB-78XXX
  projects/vnet/sys/arm/conf/DB-88F5XXX
  projects/vnet/sys/arm/conf/DB-88F6XXX
  projects/vnet/sys/arm/conf/DOCKSTAR
  projects/vnet/sys/arm/conf/DREAMPLUG-1001
  projects/vnet/sys/arm/conf/EXYNOS5.common
  projects/vnet/sys/arm/conf/NOTES
  projects/vnet/sys/arm/conf/ODROIDC1
  projects/vnet/sys/arm/conf/PANDABOARD
  projects/vnet/sys/arm/conf/RK3188
  projects/vnet/sys/arm/conf/SOCKIT.common
  projects/vnet/sys/arm/conf/VIRT
  projects/vnet/sys/arm/conf/VSATV102
  projects/vnet/sys/arm/conf/VYBRID
  projects/vnet/sys/arm/conf/ZEDBOARD
  projects/vnet/sys/arm/freescale/imx/imx6_machdep.c
  projects/vnet/sys/arm/freescale/imx/imx6_mp.c
  projects/vnet/sys/arm/freescale/imx/imx_common.c
  projects/vnet/sys/arm/freescale/vybrid/vf_common.c
  projects/vnet/sys/arm/include/cpu-v6.h
  projects/vnet/sys/arm/include/cpu.h
  projects/vnet/sys/arm/include/cpufunc.h
  projects/vnet/sys/arm/include/devmap.h
  projects/vnet/sys/arm/include/intr.h
  projects/vnet/sys/arm/include/kdb.h
  projects/vnet/sys/arm/include/pmap-v6.h
  projects/vnet/sys/arm/include/pmap_var.h
  projects/vnet/sys/arm/include/pte-v6.h
  projects/vnet/sys/arm/include/vm.h
  projects/vnet/sys/arm/lpc/lpc_intc.c
  projects/vnet/sys/arm/mv/armada38x/pmsu.c
  projects/vnet/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/vnet/sys/arm/mv/files.mv
  projects/vnet/sys/arm/mv/mv_common.c
  projects/vnet/sys/arm/mv/mv_localbus.c
  projects/vnet/sys/arm/mv/mv_machdep.c
  projects/vnet/sys/arm/mv/mv_pci.c
  projects/vnet/sys/arm/mv/orion/db88f5xxx.c
  projects/vnet/sys/arm/qemu/virt_common.c
  projects/vnet/sys/arm/rockchip/rk30xx_common.c
  projects/vnet/sys/arm/rockchip/rk30xx_mp.c
  projects/vnet/sys/arm/samsung/exynos/exynos5_common.c
  projects/vnet/sys/arm/samsung/exynos/exynos5_mp.c
  projects/vnet/sys/arm/ti/omap4/files.omap4
  projects/vnet/sys/arm/ti/omap4/omap4_mp.c
  projects/vnet/sys/arm/ti/ti_scm.c
  projects/vnet/sys/arm/versatile/versatile_common.c
  projects/vnet/sys/arm/versatile/versatile_machdep.c
  projects/vnet/sys/arm/xilinx/zy7_machdep.c
  projects/vnet/sys/arm/xilinx/zy7_mp.c
  projects/vnet/sys/arm/xscale/i8134x/crb_machdep.c
  projects/vnet/sys/arm/xscale/ixp425/avila_machdep.c
  projects/vnet/sys/arm/xscale/pxa/pxa_machdep.c
  projects/vnet/sys/arm64/arm64/db_disasm.c
  projects/vnet/sys/arm64/arm64/disassem.c
  projects/vnet/sys/arm64/arm64/gic.c
  projects/vnet/sys/arm64/arm64/gic_fdt.c
  projects/vnet/sys/arm64/arm64/gic_v3.c
  projects/vnet/sys/arm64/arm64/gic_v3_fdt.c
  projects/vnet/sys/arm64/arm64/gic_v3_its.c
  projects/vnet/sys/arm64/arm64/gic_v3_reg.h
  projects/vnet/sys/arm64/arm64/gic_v3_var.h
  projects/vnet/sys/arm64/arm64/intr_machdep.c
  projects/vnet/sys/arm64/arm64/locore.S
  projects/vnet/sys/arm64/arm64/nexus.c
  projects/vnet/sys/arm64/arm64/ofw_machdep.c
  projects/vnet/sys/arm64/arm64/pic_if.m
  projects/vnet/sys/arm64/arm64/pmap.c
  projects/vnet/sys/arm64/arm64/swtch.S
  projects/vnet/sys/arm64/arm64/trap.c
  projects/vnet/sys/arm64/cavium/thunder_pcie.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_common.h
  projects/vnet/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_pem.c
  projects/vnet/sys/arm64/include/armreg.h
  projects/vnet/sys/arm64/include/devmap.h
  projects/vnet/sys/arm64/include/intr.h
  projects/vnet/sys/arm64/include/kdb.h
  projects/vnet/sys/boot/Makefile.inc
  projects/vnet/sys/boot/common/load_elf.c
  projects/vnet/sys/boot/efi/boot1/Makefile
  projects/vnet/sys/boot/efi/boot1/Makefile.depend
  projects/vnet/sys/boot/efi/boot1/boot1.c
  projects/vnet/sys/boot/efi/boot1/boot_module.h
  projects/vnet/sys/boot/efi/boot1/ufs_module.c
  projects/vnet/sys/boot/efi/boot1/zfs_module.c
  projects/vnet/sys/boot/efi/include/efidevp.h
  projects/vnet/sys/boot/efi/libefi/efinet.c
  projects/vnet/sys/boot/efi/loader/arch/arm/ldscript.arm
  projects/vnet/sys/boot/efi/loader/arch/arm64/exec.c
  projects/vnet/sys/boot/efi/loader/main.c
  projects/vnet/sys/boot/fdt/dts/arm/bananapi.dts
  projects/vnet/sys/boot/fdt/dts/arm/cubieboard.dts
  projects/vnet/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/vnet/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
  projects/vnet/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  projects/vnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/vnet/sys/boot/ficl/words.c
  projects/vnet/sys/boot/i386/Makefile
  projects/vnet/sys/boot/i386/boot2/Makefile
  projects/vnet/sys/boot/i386/pxeldr/Makefile
  projects/vnet/sys/boot/i386/zfsboot/Makefile
  projects/vnet/sys/boot/zfs/zfs.c
  projects/vnet/sys/cam/ata/ata_all.c
  projects/vnet/sys/cam/ctl/ctl.c
  projects/vnet/sys/cam/scsi/scsi_da.c
  projects/vnet/sys/cam/scsi/scsi_xpt.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/vnet/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/vnet/sys/compat/cloudabi/cloudabi_proc.c
  projects/vnet/sys/compat/linux/linux_fork.c
  projects/vnet/sys/compat/ndis/ntoskrnl_var.h
  projects/vnet/sys/compat/x86bios/x86bios.c
  projects/vnet/sys/conf/files.arm
  projects/vnet/sys/conf/files.arm64
  projects/vnet/sys/conf/files.mips
  projects/vnet/sys/conf/kern.mk
  projects/vnet/sys/conf/kern.post.mk
  projects/vnet/sys/conf/kmod.mk
  projects/vnet/sys/conf/options
  projects/vnet/sys/conf/options.arm
  projects/vnet/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  projects/vnet/sys/contrib/x86emu/x86emu.c
  projects/vnet/sys/dev/acpica/acpi.c
  projects/vnet/sys/dev/acpica/acpi_hpet.c
  projects/vnet/sys/dev/acpica/acpi_package.c
  projects/vnet/sys/dev/acpica/acpivar.h
  projects/vnet/sys/dev/ae/if_ae.c
  projects/vnet/sys/dev/age/if_age.c
  projects/vnet/sys/dev/alc/if_alc.c
  projects/vnet/sys/dev/ale/if_ale.c
  projects/vnet/sys/dev/arcmsr/arcmsr.c
  projects/vnet/sys/dev/ata/ata-all.c
  projects/vnet/sys/dev/ata/chipsets/ata-promise.c
  projects/vnet/sys/dev/ata/chipsets/ata-serverworks.c
  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/ecore_init.h
  projects/vnet/sys/dev/cfi/cfi_core.c
  projects/vnet/sys/dev/cxgb/cxgb_sge.c
  projects/vnet/sys/dev/cxgbe/adapter.h
  projects/vnet/sys/dev/cxgbe/common/common.h
  projects/vnet/sys/dev/cxgbe/common/t4_hw.h
  projects/vnet/sys/dev/cxgbe/common/t4_msg.h
  projects/vnet/sys/dev/cxgbe/common/t4_regs.h
  projects/vnet/sys/dev/cxgbe/common/t4_regs_values.h
  projects/vnet/sys/dev/cxgbe/common/t4_tcb.h
  projects/vnet/sys/dev/cxgbe/t4_main.c
  projects/vnet/sys/dev/cxgbe/t4_sge.c
  projects/vnet/sys/dev/cxgbe/tom/t4_connect.c
  projects/vnet/sys/dev/cy/cy_isa.c
  projects/vnet/sys/dev/cy/cy_pci.c
  projects/vnet/sys/dev/e1000/e1000_80003es2lan.c
  projects/vnet/sys/dev/e1000/e1000_82540.c
  projects/vnet/sys/dev/e1000/e1000_82541.c
  projects/vnet/sys/dev/e1000/e1000_82542.c
  projects/vnet/sys/dev/e1000/e1000_82543.c
  projects/vnet/sys/dev/e1000/e1000_82571.h
  projects/vnet/sys/dev/e1000/e1000_82575.c
  projects/vnet/sys/dev/e1000/e1000_82575.h
  projects/vnet/sys/dev/e1000/e1000_api.c
  projects/vnet/sys/dev/e1000/e1000_defines.h
  projects/vnet/sys/dev/e1000/e1000_hw.h
  projects/vnet/sys/dev/e1000/e1000_i210.c
  projects/vnet/sys/dev/e1000/e1000_ich8lan.c
  projects/vnet/sys/dev/e1000/e1000_ich8lan.h
  projects/vnet/sys/dev/e1000/e1000_mac.h
  projects/vnet/sys/dev/e1000/e1000_mbx.c
  projects/vnet/sys/dev/e1000/e1000_nvm.h
  projects/vnet/sys/dev/e1000/e1000_osdep.h
  projects/vnet/sys/dev/e1000/e1000_phy.c
  projects/vnet/sys/dev/e1000/e1000_regs.h
  projects/vnet/sys/dev/e1000/if_em.c
  projects/vnet/sys/dev/e1000/if_em.h
  projects/vnet/sys/dev/e1000/if_igb.c
  projects/vnet/sys/dev/ed/if_ed_pccard.c
  projects/vnet/sys/dev/eisa/eisaconf.c
  projects/vnet/sys/dev/fb/s3_pci.c
  projects/vnet/sys/dev/fdc/fdc_pccard.c
  projects/vnet/sys/dev/fdt/simplebus.c
  projects/vnet/sys/dev/filemon/filemon_wrapper.c
  projects/vnet/sys/dev/firewire/sbp_targ.c
  projects/vnet/sys/dev/gpio/gpiobus.c
  projects/vnet/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/vnet/sys/dev/hptiop/hptiop.c
  projects/vnet/sys/dev/hptmv/entry.c
  projects/vnet/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/vnet/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/vnet/sys/dev/hwpmc/hwpmc_core.c
  projects/vnet/sys/dev/hwpmc/hwpmc_core.h
  projects/vnet/sys/dev/hwpmc/hwpmc_mod.c
  projects/vnet/sys/dev/hyperv/include/hyperv.h
  projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/vnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/vnet/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/vnet/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/vnet/sys/dev/hyperv/utilities/hv_kvp.c
  projects/vnet/sys/dev/hyperv/utilities/hv_util.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_channel.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_connection.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_hv.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  projects/vnet/sys/dev/ichsmb/ichsmb_pci.c
  projects/vnet/sys/dev/ioat/ioat.c
  projects/vnet/sys/dev/ioat/ioat_hw.h
  projects/vnet/sys/dev/ioat/ioat_internal.h
  projects/vnet/sys/dev/isci/isci.c
  projects/vnet/sys/dev/iscsi/icl.c
  projects/vnet/sys/dev/iscsi/iscsi.h
  projects/vnet/sys/dev/iwn/if_iwn.c
  projects/vnet/sys/dev/ixgb/if_ixgb.c
  projects/vnet/sys/dev/ixgbe/if_ix.c
  projects/vnet/sys/dev/ixl/if_ixl.c
  projects/vnet/sys/dev/ixl/ixl_txrx.c
  projects/vnet/sys/dev/jme/if_jme.c
  projects/vnet/sys/dev/lmc/if_lmc.c
  projects/vnet/sys/dev/mca/mca_bus.c
  projects/vnet/sys/dev/mmc/mmcsd.c
  projects/vnet/sys/dev/mps/mps.c
  projects/vnet/sys/dev/mps/mps_mapping.c
  projects/vnet/sys/dev/mps/mpsvar.h
  projects/vnet/sys/dev/mrsas/mrsas.c
  projects/vnet/sys/dev/msk/if_msk.c
  projects/vnet/sys/dev/mxge/if_mxge.c
  projects/vnet/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/vnet/sys/dev/ntb/ntb_hw/ntb_hw.h
  projects/vnet/sys/dev/ntb/ntb_hw/ntb_regs.h
  projects/vnet/sys/dev/nvme/nvme_ctrlr.c
  projects/vnet/sys/dev/ofw/ofw_bus_subr.c
  projects/vnet/sys/dev/ofw/ofw_bus_subr.h
  projects/vnet/sys/dev/ofw/ofw_subr.c
  projects/vnet/sys/dev/ofw/ofwbus.c
  projects/vnet/sys/dev/ofw/openfirm.h
  projects/vnet/sys/dev/pccard/pccard.c
  projects/vnet/sys/dev/pci/pci_pci.c
  projects/vnet/sys/dev/pci/pci_user.c
  projects/vnet/sys/dev/qlxgb/qla_hw.c
  projects/vnet/sys/dev/quicc/quicc_core.c
  projects/vnet/sys/dev/random/nehemiah.c
  projects/vnet/sys/dev/rl/if_rl.c
  projects/vnet/sys/dev/sfxge/common/efx.h
  projects/vnet/sys/dev/sfxge/common/efx_mcdi.c
  projects/vnet/sys/dev/sfxge/common/efx_mcdi.h
  projects/vnet/sys/dev/sfxge/common/efx_phy.c
  projects/vnet/sys/dev/sfxge/sfxge.c
  projects/vnet/sys/dev/siba/siba.c
  projects/vnet/sys/dev/sound/pci/envy24.c
  projects/vnet/sys/dev/sound/pci/envy24ht.c
  projects/vnet/sys/dev/sound/pci/hdspe.c
  projects/vnet/sys/dev/sound/pci/vibes.c
  projects/vnet/sys/dev/sound/pcm/sndstat.c
  projects/vnet/sys/dev/sound/pcm/sound.c
  projects/vnet/sys/dev/sound/pcm/sound.h
  projects/vnet/sys/dev/stge/if_stge.c
  projects/vnet/sys/dev/tsec/if_tsec_fdt.c
  projects/vnet/sys/dev/twa/tw_osl_freebsd.c
  projects/vnet/sys/dev/tws/tws.c
  projects/vnet/sys/dev/uart/uart_bus_fdt.c
  projects/vnet/sys/dev/uart/uart_cpu_fdt.c
  projects/vnet/sys/dev/uart/uart_cpu_powerpc.c
  projects/vnet/sys/dev/uart/uart_dev_lpc.c
  projects/vnet/sys/dev/uart/uart_dev_ns8250.c
  projects/vnet/sys/dev/usb/controller/ehci_pci.c
  projects/vnet/sys/dev/usb/net/if_smsc.c
  projects/vnet/sys/dev/usb/wlan/if_rum.c
  projects/vnet/sys/dev/usb/wlan/if_rumreg.h
  projects/vnet/sys/dev/virtio/block/virtio_blk.c
  projects/vnet/sys/dev/vnic/mrml_bridge.c
  projects/vnet/sys/dev/vt/hw/ofwfb/ofwfb.c
  projects/vnet/sys/dev/vte/if_vte.c
  projects/vnet/sys/dev/xen/blkfront/blkfront.c
  projects/vnet/sys/dev/xen/netfront/netfront.c
  projects/vnet/sys/fs/cd9660/cd9660_vfsops.c
  projects/vnet/sys/fs/ext2fs/ext2_bmap.c
  projects/vnet/sys/fs/ext2fs/ext2_extents.c
  projects/vnet/sys/fs/ext2fs/ext2_extents.h
  projects/vnet/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/vnet/sys/fs/ext2fs/ext2_vnops.c
  projects/vnet/sys/fs/msdosfs/msdosfs_vnops.c
  projects/vnet/sys/fs/nullfs/null_vnops.c
  projects/vnet/sys/fs/tmpfs/tmpfs_vnops.c
  projects/vnet/sys/geom/geom.h
  projects/vnet/sys/geom/geom_io.c
  projects/vnet/sys/geom/journal/g_journal.c
  projects/vnet/sys/geom/mirror/g_mirror.c
  projects/vnet/sys/geom/raid/g_raid.c
  projects/vnet/sys/geom/raid3/g_raid3.c
  projects/vnet/sys/gnu/dts/arm/am335x-base0033.dts
  projects/vnet/sys/gnu/dts/arm/am335x-bone-common.dtsi
  projects/vnet/sys/gnu/dts/arm/am335x-bone.dts
  projects/vnet/sys/gnu/dts/arm/am335x-boneblack.dts
  projects/vnet/sys/gnu/dts/arm/am335x-evm.dts
  projects/vnet/sys/gnu/dts/arm/am335x-evmsk.dts
  projects/vnet/sys/gnu/dts/arm/am335x-igep0033.dtsi
  projects/vnet/sys/gnu/dts/arm/am335x-lxm.dts
  projects/vnet/sys/gnu/dts/arm/am335x-nano.dts
  projects/vnet/sys/gnu/dts/arm/am335x-pepper.dts
  projects/vnet/sys/gnu/dts/arm/am33xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/am33xx.dtsi
  projects/vnet/sys/gnu/dts/arm/am3517-craneboard.dts
  projects/vnet/sys/gnu/dts/arm/am3517.dtsi
  projects/vnet/sys/gnu/dts/arm/am35xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/am4372.dtsi
  projects/vnet/sys/gnu/dts/arm/am437x-gp-evm.dts
  projects/vnet/sys/gnu/dts/arm/am437x-idk-evm.dts
  projects/vnet/sys/gnu/dts/arm/am437x-sk-evm.dts
  projects/vnet/sys/gnu/dts/arm/am43x-epos-evm.dts
  projects/vnet/sys/gnu/dts/arm/am43xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/am57xx-beagle-x15.dts
  projects/vnet/sys/gnu/dts/arm/animeo_ip.dts
  projects/vnet/sys/gnu/dts/arm/arm-realview-pb1176.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-db.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-mirabox.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-netgear-rn102.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-netgear-rn104.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-rd.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-synology-ds213j.dts
  projects/vnet/sys/gnu/dts/arm/armada-370-xp.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-370.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-375-db.dts
  projects/vnet/sys/gnu/dts/arm/armada-375.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-385-db-ap.dts
  projects/vnet/sys/gnu/dts/arm/armada-388-db.dts
  projects/vnet/sys/gnu/dts/arm/armada-388-gp.dts
  projects/vnet/sys/gnu/dts/arm/armada-388-rd.dts
  projects/vnet/sys/gnu/dts/arm/armada-38x.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-xp-axpwifiap.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-db.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-gp.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-lenovo-ix4-300d.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-matrix.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-mv78260.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-xp-mv78460.dtsi
  projects/vnet/sys/gnu/dts/arm/armada-xp-netgear-rn2120.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-openblocks-ax3-4.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp-synology-ds414.dts
  projects/vnet/sys/gnu/dts/arm/armada-xp.dtsi
  projects/vnet/sys/gnu/dts/arm/armv7-m.dtsi
  projects/vnet/sys/gnu/dts/arm/at91-foxg20.dts
  projects/vnet/sys/gnu/dts/arm/at91-qil_a9260.dts
  projects/vnet/sys/gnu/dts/arm/at91-sama5d3_xplained.dts
  projects/vnet/sys/gnu/dts/arm/at91-sama5d4ek.dts
  projects/vnet/sys/gnu/dts/arm/at91rm9200.dtsi
  projects/vnet/sys/gnu/dts/arm/at91rm9200ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9260.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9261.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9261ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9263.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9263ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9g15.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9g15ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9g25.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9g25ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9g35.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9g35ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9g45.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9m10g45ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9n12.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9n12ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9rl.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9rlek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9x35.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x35ek.dts
  projects/vnet/sys/gnu/dts/arm/at91sam9x5.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5_isi.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5cm.dtsi
  projects/vnet/sys/gnu/dts/arm/at91sam9x5ek.dtsi
  projects/vnet/sys/gnu/dts/arm/atlas7-evb.dts
  projects/vnet/sys/gnu/dts/arm/atlas7.dtsi
  projects/vnet/sys/gnu/dts/arm/axp209.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm-cygnus-clock.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm-cygnus.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm11351.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm21664.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm2835-rpi-b-plus.dts
  projects/vnet/sys/gnu/dts/arm/bcm2835-rpi-b.dts
  projects/vnet/sys/gnu/dts/arm/bcm2835-rpi.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm2835.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm4708-buffalo-wzr-1750dhp.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708-luxul-xwc-1000.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708-netgear-r6250.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708-netgear-r6300-v2.dts
  projects/vnet/sys/gnu/dts/arm/bcm4708.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm47081-asus-rt-n18u.dts
  projects/vnet/sys/gnu/dts/arm/bcm47081-buffalo-wzr-600dhp2.dts
  projects/vnet/sys/gnu/dts/arm/bcm47081-buffalo-wzr-900dhp.dts
  projects/vnet/sys/gnu/dts/arm/bcm5301x.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm63138.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm7445-bcm97445svmb.dts
  projects/vnet/sys/gnu/dts/arm/bcm7445.dtsi
  projects/vnet/sys/gnu/dts/arm/bcm911360_entphn.dts
  projects/vnet/sys/gnu/dts/arm/bcm911360k.dts
  projects/vnet/sys/gnu/dts/arm/bcm958300k.dts
  projects/vnet/sys/gnu/dts/arm/bcm963138dvt.dts
  projects/vnet/sys/gnu/dts/arm/berlin2-sony-nsz-gs7.dts
  projects/vnet/sys/gnu/dts/arm/berlin2.dtsi
  projects/vnet/sys/gnu/dts/arm/berlin2cd-google-chromecast.dts
  projects/vnet/sys/gnu/dts/arm/berlin2cd.dtsi
  projects/vnet/sys/gnu/dts/arm/berlin2q-marvell-dmp.dts
  projects/vnet/sys/gnu/dts/arm/berlin2q.dtsi
  projects/vnet/sys/gnu/dts/arm/cros-ec-keyboard.dtsi
  projects/vnet/sys/gnu/dts/arm/cx92755.dtsi
  projects/vnet/sys/gnu/dts/arm/cx92755_equinox.dts
  projects/vnet/sys/gnu/dts/arm/da850-enbw-cmc.dts
  projects/vnet/sys/gnu/dts/arm/da850-evm.dts
  projects/vnet/sys/gnu/dts/arm/da850.dtsi
  projects/vnet/sys/gnu/dts/arm/dm8168-evm.dts
  projects/vnet/sys/gnu/dts/arm/dm816x.dtsi
  projects/vnet/sys/gnu/dts/arm/dove-cubox.dts
  projects/vnet/sys/gnu/dts/arm/dove.dtsi
  projects/vnet/sys/gnu/dts/arm/dra7-evm.dts
  projects/vnet/sys/gnu/dts/arm/dra7.dtsi
  projects/vnet/sys/gnu/dts/arm/dra72-evm.dts
  projects/vnet/sys/gnu/dts/arm/dra72x.dtsi
  projects/vnet/sys/gnu/dts/arm/dra74x.dtsi
  projects/vnet/sys/gnu/dts/arm/dra7xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/ea3250.dts
  projects/vnet/sys/gnu/dts/arm/efm32gg-dk3750.dts
  projects/vnet/sys/gnu/dts/arm/efm32gg.dtsi
  projects/vnet/sys/gnu/dts/arm/emev2-kzm9d.dts
  projects/vnet/sys/gnu/dts/arm/emev2.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos3250-monk.dts
  projects/vnet/sys/gnu/dts/arm/exynos3250-rinato.dts
  projects/vnet/sys/gnu/dts/arm/exynos3250.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4210-origen.dts
  projects/vnet/sys/gnu/dts/arm/exynos4210-smdkv310.dts
  projects/vnet/sys/gnu/dts/arm/exynos4210-trats.dts
  projects/vnet/sys/gnu/dts/arm/exynos4210-universal_c210.dts
  projects/vnet/sys/gnu/dts/arm/exynos4210.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4212.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4412-odroid-common.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4412-odroidu3.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412-odroidx.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412-origen.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412-smdk4412.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412-tiny4412.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412-trats2.dts
  projects/vnet/sys/gnu/dts/arm/exynos4412.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4415.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4x12-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos4x12.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5250-arndale.dts
  projects/vnet/sys/gnu/dts/arm/exynos5250-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5250-smdk5250.dts
  projects/vnet/sys/gnu/dts/arm/exynos5250-spring.dts
  projects/vnet/sys/gnu/dts/arm/exynos5250.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5260-xyref5260.dts
  projects/vnet/sys/gnu/dts/arm/exynos5410-smdk5410.dts
  projects/vnet/sys/gnu/dts/arm/exynos5410.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5420-arndale-octa.dts
  projects/vnet/sys/gnu/dts/arm/exynos5420-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5420-smdk5420.dts
  projects/vnet/sys/gnu/dts/arm/exynos5420.dtsi
  projects/vnet/sys/gnu/dts/arm/exynos5422-odroidxu3.dts
  projects/vnet/sys/gnu/dts/arm/exynos5440-sd5v1.dts
  projects/vnet/sys/gnu/dts/arm/exynos5440-ssdk5440.dts
  projects/vnet/sys/gnu/dts/arm/exynos5440.dtsi
  projects/vnet/sys/gnu/dts/arm/hi3620-hi4511.dts
  projects/vnet/sys/gnu/dts/arm/hip04.dtsi
  projects/vnet/sys/gnu/dts/arm/hisi-x5hd2-dkb.dts
  projects/vnet/sys/gnu/dts/arm/imx23-olinuxino.dts
  projects/vnet/sys/gnu/dts/arm/imx23.dtsi
  projects/vnet/sys/gnu/dts/arm/imx25-pdk.dts
  projects/vnet/sys/gnu/dts/arm/imx25-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/imx25.dtsi
  projects/vnet/sys/gnu/dts/arm/imx27.dtsi
  projects/vnet/sys/gnu/dts/arm/imx28-apf28.dts
  projects/vnet/sys/gnu/dts/arm/imx28-apf28dev.dts
  projects/vnet/sys/gnu/dts/arm/imx28-cfa10036.dts
  projects/vnet/sys/gnu/dts/arm/imx28-cfa10057.dts
  projects/vnet/sys/gnu/dts/arm/imx28-evk.dts
  projects/vnet/sys/gnu/dts/arm/imx28-m28evk.dts
  projects/vnet/sys/gnu/dts/arm/imx28-tx28.dts
  projects/vnet/sys/gnu/dts/arm/imx28.dtsi
  projects/vnet/sys/gnu/dts/arm/imx31.dtsi
  projects/vnet/sys/gnu/dts/arm/imx35.dtsi
  projects/vnet/sys/gnu/dts/arm/imx50-evk.dts
  projects/vnet/sys/gnu/dts/arm/imx50.dtsi
  projects/vnet/sys/gnu/dts/arm/imx51-apf51dev.dts
  projects/vnet/sys/gnu/dts/arm/imx51.dtsi
  projects/vnet/sys/gnu/dts/arm/imx53-ard.dts
  projects/vnet/sys/gnu/dts/arm/imx53-m53evk.dts
  projects/vnet/sys/gnu/dts/arm/imx53-qsb-common.dtsi
  projects/vnet/sys/gnu/dts/arm/imx53-qsrb.dts
  projects/vnet/sys/gnu/dts/arm/imx53-smd.dts
  projects/vnet/sys/gnu/dts/arm/imx53-tqma53.dtsi
  projects/vnet/sys/gnu/dts/arm/imx53-tx53-x03x.dts
  projects/vnet/sys/gnu/dts/arm/imx53-tx53.dtsi
  projects/vnet/sys/gnu/dts/arm/imx53-voipac-bsb.dts
  projects/vnet/sys/gnu/dts/arm/imx53.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-cubox-i.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-hummingboard.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-rex-basic.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-riotboard.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl-sabrelite.dts
  projects/vnet/sys/gnu/dts/arm/imx6dl.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6q-arm2.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-cubox-i.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-gk802.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-gw5400-a.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-hummingboard.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-nitrogen6x.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-rex-pro.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-sabrelite.dts
  projects/vnet/sys/gnu/dts/arm/imx6q-tbs2910.dts
  projects/vnet/sys/gnu/dts/arm/imx6q.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-aristainetos.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-dfi-fs700-m60.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-gw552x.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-hummingboard.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-microsom-ar8035.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-microsom.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-rex.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-tx6.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6qdl.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6sl-evk.dts
  projects/vnet/sys/gnu/dts/arm/imx6sl.dtsi
  projects/vnet/sys/gnu/dts/arm/imx6sx-sabreauto.dts
  projects/vnet/sys/gnu/dts/arm/imx6sx-sdb.dts
  projects/vnet/sys/gnu/dts/arm/imx6sx.dtsi
  projects/vnet/sys/gnu/dts/arm/integrator.dtsi
  projects/vnet/sys/gnu/dts/arm/k2e-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/k2e-evm.dts
  projects/vnet/sys/gnu/dts/arm/k2e.dtsi
  projects/vnet/sys/gnu/dts/arm/k2hk-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/k2hk-evm.dts
  projects/vnet/sys/gnu/dts/arm/k2hk.dtsi
  projects/vnet/sys/gnu/dts/arm/k2l-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/k2l-evm.dts
  projects/vnet/sys/gnu/dts/arm/k2l.dtsi
  projects/vnet/sys/gnu/dts/arm/keystone.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-b3.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-cloudbox.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-d2net.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-dir665.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-dreamplug.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-is2.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-lsxl.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-mv88f6281gtw-ge.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-net2big.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-net5big.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-netxbig.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-ns2-common.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-ns2.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-ns2max.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-ns2mini.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-rd88f6192.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-synology.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood-t5325.dts
  projects/vnet/sys/gnu/dts/arm/kirkwood-ts219.dtsi
  projects/vnet/sys/gnu/dts/arm/kirkwood.dtsi
  projects/vnet/sys/gnu/dts/arm/lpc32xx.dtsi
  projects/vnet/sys/gnu/dts/arm/ls1021a-qds.dts
  projects/vnet/sys/gnu/dts/arm/ls1021a-twr.dts
  projects/vnet/sys/gnu/dts/arm/ls1021a.dtsi
  projects/vnet/sys/gnu/dts/arm/meson.dtsi
  projects/vnet/sys/gnu/dts/arm/meson6-atv1200.dts
  projects/vnet/sys/gnu/dts/arm/meson8.dtsi
  projects/vnet/sys/gnu/dts/arm/mt6589.dtsi
  projects/vnet/sys/gnu/dts/arm/mt8127.dtsi
  projects/vnet/sys/gnu/dts/arm/mt8135-evbp1.dts
  projects/vnet/sys/gnu/dts/arm/mt8135.dtsi
  projects/vnet/sys/gnu/dts/arm/nspire-classic.dtsi
  projects/vnet/sys/gnu/dts/arm/nspire-cx.dts
  projects/vnet/sys/gnu/dts/arm/nspire.dtsi
  projects/vnet/sys/gnu/dts/arm/omap2.dtsi
  projects/vnet/sys/gnu/dts/arm/omap2420-n8x0-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap2420.dtsi
  projects/vnet/sys/gnu/dts/arm/omap2430-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/omap2430.dtsi
  projects/vnet/sys/gnu/dts/arm/omap24xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-beagle-xm.dts
  projects/vnet/sys/gnu/dts/arm/omap3-beagle.dts
  projects/vnet/sys/gnu/dts/arm/omap3-cm-t3517.dts
  projects/vnet/sys/gnu/dts/arm/omap3-cm-t3730.dts
  projects/vnet/sys/gnu/dts/arm/omap3-cm-t3x.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-cm-t3x30.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-devkit8000.dts
  projects/vnet/sys/gnu/dts/arm/omap3-evm-37xx.dts
  projects/vnet/sys/gnu/dts/arm/omap3-evm-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-gta04.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-gta04a5.dts
  projects/vnet/sys/gnu/dts/arm/omap3-igep.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-igep0020-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts
  projects/vnet/sys/gnu/dts/arm/omap3-igep0020.dts
  projects/vnet/sys/gnu/dts/arm/omap3-igep0030-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts
  projects/vnet/sys/gnu/dts/arm/omap3-igep0030.dts
  projects/vnet/sys/gnu/dts/arm/omap3-ldp.dts
  projects/vnet/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-lilly-dbb056.dts
  projects/vnet/sys/gnu/dts/arm/omap3-n9.dts
  projects/vnet/sys/gnu/dts/arm/omap3-n900.dts
  projects/vnet/sys/gnu/dts/arm/omap3-n950-n9.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-n950.dts
  projects/vnet/sys/gnu/dts/arm/omap3-overo-alto35-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-base.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-chestnut43-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-common-lcd35.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-common-lcd43.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-gallop43-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo-palo43-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-overo.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-panel-sharp-ls037v7dw01.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-tao3530.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3-zoom3.dts
  projects/vnet/sys/gnu/dts/arm/omap3.dtsi
  projects/vnet/sys/gnu/dts/arm/omap34xx.dtsi
  projects/vnet/sys/gnu/dts/arm/omap36xx.dtsi
  projects/vnet/sys/gnu/dts/arm/omap3xxx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-cpu-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-duovero-parlor.dts
  projects/vnet/sys/gnu/dts/arm/omap4-duovero.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-panda-a4.dts
  projects/vnet/sys/gnu/dts/arm/omap4-panda-common.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-panda-es.dts
  projects/vnet/sys/gnu/dts/arm/omap4-sdp-es23plus.dts
  projects/vnet/sys/gnu/dts/arm/omap4-sdp.dts
  projects/vnet/sys/gnu/dts/arm/omap4-var-om44customboard.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-var-som-om44-wlan.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4-var-som-om44.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4.dtsi
  projects/vnet/sys/gnu/dts/arm/omap4460.dtsi
  projects/vnet/sys/gnu/dts/arm/omap5-cm-t54.dts
  projects/vnet/sys/gnu/dts/arm/omap5-core-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/omap5-gpu-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/omap5-uevm.dts
  projects/vnet/sys/gnu/dts/arm/omap5.dtsi
  projects/vnet/sys/gnu/dts/arm/omap54xx-clocks.dtsi
  projects/vnet/sys/gnu/dts/arm/orion5x.dtsi
  projects/vnet/sys/gnu/dts/arm/phy3250.dts
  projects/vnet/sys/gnu/dts/arm/pxa27x.dtsi
  projects/vnet/sys/gnu/dts/arm/pxa2xx.dtsi
  projects/vnet/sys/gnu/dts/arm/pxa3xx.dtsi
  projects/vnet/sys/gnu/dts/arm/r7s72100.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a73a4-ape6evm.dts
  projects/vnet/sys/gnu/dts/arm/r8a73a4.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7740-armadillo800eva.dts
  projects/vnet/sys/gnu/dts/arm/r8a7740.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7778-bockw.dts
  projects/vnet/sys/gnu/dts/arm/r8a7778.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7779-marzen.dts
  projects/vnet/sys/gnu/dts/arm/r8a7779.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7790-lager.dts
  projects/vnet/sys/gnu/dts/arm/r8a7790.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7791-koelsch.dts
  projects/vnet/sys/gnu/dts/arm/r8a7791.dtsi
  projects/vnet/sys/gnu/dts/arm/r8a7794-alt.dts
  projects/vnet/sys/gnu/dts/arm/r8a7794.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3066a-bqcurie2.dts
  projects/vnet/sys/gnu/dts/arm/rk3066a-marsboard.dts
  projects/vnet/sys/gnu/dts/arm/rk3066a-rayeager.dts
  projects/vnet/sys/gnu/dts/arm/rk3066a.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3188-radxarock.dts
  projects/vnet/sys/gnu/dts/arm/rk3188.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-evb-act8846.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-evb-rk808.dts
  projects/vnet/sys/gnu/dts/arm/rk3288-evb.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-firefly.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288-thermal.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3288.dtsi
  projects/vnet/sys/gnu/dts/arm/rk3xxx.dtsi
  projects/vnet/sys/gnu/dts/arm/s3c2416-smdk2416.dts
  projects/vnet/sys/gnu/dts/arm/s3c2416.dtsi
  projects/vnet/sys/gnu/dts/arm/s5pv210-aquila.dts
  projects/vnet/sys/gnu/dts/arm/s5pv210-goni.dts
  projects/vnet/sys/gnu/dts/arm/sama5d3.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d35ek.dts
  projects/vnet/sys/gnu/dts/arm/sama5d3_can.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_emac.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_gmac.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_lcd.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_mci2.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_tcb1.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3_uart.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3xcm.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d3xmb.dtsi
  projects/vnet/sys/gnu/dts/arm/sama5d4.dtsi
  projects/vnet/sys/gnu/dts/arm/sh73a0-kzm9g.dts
  projects/vnet/sys/gnu/dts/arm/sh73a0.dtsi
  projects/vnet/sys/gnu/dts/arm/spear1310-evb.dts
  projects/vnet/sys/gnu/dts/arm/spear1310.dtsi
  projects/vnet/sys/gnu/dts/arm/spear1340-evb.dts
  projects/vnet/sys/gnu/dts/arm/spear1340.dtsi
  projects/vnet/sys/gnu/dts/arm/spear13xx.dtsi
  projects/vnet/sys/gnu/dts/arm/spear300-evb.dts
  projects/vnet/sys/gnu/dts/arm/spear300.dtsi
  projects/vnet/sys/gnu/dts/arm/spear310-evb.dts
  projects/vnet/sys/gnu/dts/arm/spear310.dtsi
  projects/vnet/sys/gnu/dts/arm/spear320-evb.dts
  projects/vnet/sys/gnu/dts/arm/spear320.dtsi
  projects/vnet/sys/gnu/dts/arm/spear3xx.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-ccu8540.dts
  projects/vnet/sys/gnu/dts/arm/ste-ccu9540.dts
  projects/vnet/sys/gnu/dts/arm/ste-dbx5x0.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-href-stuib.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-href-tvk1281618.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-href.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-hrefprev60-stuib.dts
  projects/vnet/sys/gnu/dts/arm/ste-hrefprev60-tvk.dts
  projects/vnet/sys/gnu/dts/arm/ste-hrefprev60.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-hrefv60plus-stuib.dts
  projects/vnet/sys/gnu/dts/arm/ste-hrefv60plus-tvk.dts
  projects/vnet/sys/gnu/dts/arm/ste-hrefv60plus.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-nomadik-nhk15.dts
  projects/vnet/sys/gnu/dts/arm/ste-nomadik-s8815.dts
  projects/vnet/sys/gnu/dts/arm/ste-nomadik-stn8815.dtsi
  projects/vnet/sys/gnu/dts/arm/ste-snowball.dts
  projects/vnet/sys/gnu/dts/arm/ste-u300.dts
  projects/vnet/sys/gnu/dts/arm/stih407-b2120.dts
  projects/vnet/sys/gnu/dts/arm/stih407-clock.dtsi
  projects/vnet/sys/gnu/dts/arm/stih407-family.dtsi
  projects/vnet/sys/gnu/dts/arm/stih407-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/stih407.dtsi
  projects/vnet/sys/gnu/dts/arm/stih410-b2120.dts
  projects/vnet/sys/gnu/dts/arm/stih410-clock.dtsi
  projects/vnet/sys/gnu/dts/arm/stih410.dtsi
  projects/vnet/sys/gnu/dts/arm/stih415.dtsi
  projects/vnet/sys/gnu/dts/arm/stih416-b2020e.dts
  projects/vnet/sys/gnu/dts/arm/stih416-pinctrl.dtsi
  projects/vnet/sys/gnu/dts/arm/stih416.dtsi
  projects/vnet/sys/gnu/dts/arm/stih418-b2199.dts
  projects/vnet/sys/gnu/dts/arm/stih418-clock.dtsi
  projects/vnet/sys/gnu/dts/arm/stih418.dtsi
  projects/vnet/sys/gnu/dts/arm/stihxxx-b2120.dtsi
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-a1000.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-ba10-tvbox.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-chuwi-v7-cw0825.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-cubieboard.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-hackberry.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-hyundai-a7hd.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-inet97fv2.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-marsboard.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-mini-xplus.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-mk802.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-mk802ii.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-olinuxino-lime.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10-pcduino.dts
  projects/vnet/sys/gnu/dts/arm/sun4i-a10.dtsi
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-mk802.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-olinuxino-micro.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s-r7-tv-dongle.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a10s.dtsi
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-hsg-h702.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-olinuxino-micro.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13-olinuxino.dts
  projects/vnet/sys/gnu/dts/arm/sun5i-a13.dtsi
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-app4-evb1.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-colombus.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-hummingbird.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31-m9.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31.dtsi
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s-cs908.dts
  projects/vnet/sys/gnu/dts/arm/sun6i-a31s.dtsi
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-bananapi.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-bananapro.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-cubieboard2.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-cubietruck.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-hummingbird.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-i12-tvbox.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-m3.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime2.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20-pcduino3.dts
  projects/vnet/sys/gnu/dts/arm/sun7i-a20.dtsi
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-ippo-q8h-v1.2.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a23-ippo-q8h-v5.dts
  projects/vnet/sys/gnu/dts/arm/sun8i-a23.dtsi
  projects/vnet/sys/gnu/dts/arm/sun9i-a80-optimus.dts
  projects/vnet/sys/gnu/dts/arm/sun9i-a80.dtsi
  projects/vnet/sys/gnu/dts/arm/sunxi-common-regulators.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra114.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra124-jetson-tk1.dts
  projects/vnet/sys/gnu/dts/arm/tegra124-nyan-big.dts
  projects/vnet/sys/gnu/dts/arm/tegra124-venice2.dts
  projects/vnet/sys/gnu/dts/arm/tegra124.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra20-seaboard.dts
  projects/vnet/sys/gnu/dts/arm/tegra20.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra30-apalis-eval.dts
  projects/vnet/sys/gnu/dts/arm/tegra30-apalis.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra30-beaver.dts
  projects/vnet/sys/gnu/dts/arm/tegra30-cardhu.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra30-colibri-eval-v3.dts
  projects/vnet/sys/gnu/dts/arm/tegra30-colibri.dtsi
  projects/vnet/sys/gnu/dts/arm/tegra30.dtsi
  projects/vnet/sys/gnu/dts/arm/twl4030_omap3.dtsi
  projects/vnet/sys/gnu/dts/arm/twl6030_omap4.dtsi
  projects/vnet/sys/gnu/dts/arm/usb_a9260_common.dtsi
  projects/vnet/sys/gnu/dts/arm/usb_a9263.dts
  projects/vnet/sys/gnu/dts/arm/versatile-ab.dts
  projects/vnet/sys/gnu/dts/arm/versatile-pb.dts
  projects/vnet/sys/gnu/dts/arm/vexpress-v2m-rs1.dtsi
  projects/vnet/sys/gnu/dts/arm/vexpress-v2m.dtsi
  projects/vnet/sys/gnu/dts/arm/vexpress-v2p-ca15_a7.dts
  projects/vnet/sys/gnu/dts/arm/vexpress-v2p-ca9.dts
  projects/vnet/sys/gnu/dts/arm/vf-colibri-eval-v3.dtsi
  projects/vnet/sys/gnu/dts/arm/vf-colibri.dtsi
  projects/vnet/sys/gnu/dts/arm/vf500-colibri-eval-v3.dts
  projects/vnet/sys/gnu/dts/arm/vf500-colibri.dtsi
  projects/vnet/sys/gnu/dts/arm/vf500.dtsi
  projects/vnet/sys/gnu/dts/arm/vf610-colibri.dtsi
  projects/vnet/sys/gnu/dts/arm/vf610-cosmic.dts
  projects/vnet/sys/gnu/dts/arm/vf610-pinfunc.h
  projects/vnet/sys/gnu/dts/arm/vf610-twr.dts
  projects/vnet/sys/gnu/dts/arm/vf610.dtsi
  projects/vnet/sys/gnu/dts/arm/vfxxx.dtsi
  projects/vnet/sys/gnu/dts/arm/wm8505.dtsi
  projects/vnet/sys/gnu/dts/arm/wm8650.dtsi
  projects/vnet/sys/gnu/dts/arm/wm8750.dtsi
  projects/vnet/sys/gnu/dts/arm/zynq-7000.dtsi
  projects/vnet/sys/gnu/dts/arm/zynq-parallella.dts
  projects/vnet/sys/gnu/dts/arm/zynq-zc702.dts
  projects/vnet/sys/gnu/dts/arm/zynq-zc706.dts
  projects/vnet/sys/gnu/dts/arm/zynq-zed.dts
  projects/vnet/sys/gnu/dts/arm/zynq-zybo.dts
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/at91.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos4.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/exynos7-clk.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/r8a7794-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/sh73a0-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/tegra124-car-common.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/gpio/gpio.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/input/input.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/mfd/palmas.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/mfd/qcom-rpm.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/am33xx.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h
  projects/vnet/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h
  projects/vnet/sys/isa/isa_common.c
  projects/vnet/sys/isa/vga_isa.c
  projects/vnet/sys/kern/bus_if.m
  projects/vnet/sys/kern/imgact_elf.c
  projects/vnet/sys/kern/init_main.c
  projects/vnet/sys/kern/kern_event.c
  projects/vnet/sys/kern/kern_fork.c
  projects/vnet/sys/kern/kern_kthread.c
  projects/vnet/sys/kern/kern_mbuf.c
  projects/vnet/sys/kern/kern_physio.c
  projects/vnet/sys/kern/kern_proc.c
  projects/vnet/sys/kern/kern_racct.c
  projects/vnet/sys/kern/link_elf.c
  projects/vnet/sys/kern/link_elf_obj.c
  projects/vnet/sys/kern/subr_bus.c
  projects/vnet/sys/kern/subr_intr.c
  projects/vnet/sys/kern/subr_turnstile.c
  projects/vnet/sys/kern/sysv_sem.c
  projects/vnet/sys/kern/uipc_mbuf.c
  projects/vnet/sys/kern/vfs_aio.c
  projects/vnet/sys/kern/vfs_bio.c
  projects/vnet/sys/kern/vfs_mount.c
  projects/vnet/sys/kern/vfs_subr.c
  projects/vnet/sys/kern/vfs_syscalls.c
  projects/vnet/sys/mips/adm5120/obio.c
  projects/vnet/sys/mips/alchemy/obio.c
  projects/vnet/sys/mips/atheros/apb.c
  projects/vnet/sys/mips/beri/beri_simplebus.c
  projects/vnet/sys/mips/conf/AR71XX_BASE
  projects/vnet/sys/mips/conf/AR724X_BASE
  projects/vnet/sys/mips/conf/AR91XX_BASE
  projects/vnet/sys/mips/conf/QCA953X_BASE
  projects/vnet/sys/mips/idt/obio.c
  projects/vnet/sys/mips/include/bus.h
  projects/vnet/sys/mips/include/fdt.h
  projects/vnet/sys/mips/include/smp.h
  projects/vnet/sys/mips/include/ucontext.h
  projects/vnet/sys/mips/mips/bus_space_generic.c
  projects/vnet/sys/mips/mips/exception.S
  projects/vnet/sys/mips/mips/nexus.c
  projects/vnet/sys/mips/mips/ofw_machdep.c
  projects/vnet/sys/mips/mips/tick.c
  projects/vnet/sys/mips/nlm/xlp_simplebus.c
  projects/vnet/sys/mips/rt305x/obio.c
  projects/vnet/sys/mips/sibyte/ata_zbbus.c
  projects/vnet/sys/mips/sibyte/sb_zbbus.c
  projects/vnet/sys/modules/dtb/allwinner/Makefile
  projects/vnet/sys/net/if_lagg.c
  projects/vnet/sys/net80211/ieee80211.h
  projects/vnet/sys/net80211/ieee80211_adhoc.c
  projects/vnet/sys/net80211/ieee80211_hostap.c
  projects/vnet/sys/net80211/ieee80211_mesh.c
  projects/vnet/sys/net80211/ieee80211_proto.c
  projects/vnet/sys/net80211/ieee80211_sta.c
  projects/vnet/sys/net80211/ieee80211_wds.c
  projects/vnet/sys/netinet/sctp_asconf.c
  projects/vnet/sys/netinet/sctp_bsd_addr.c
  projects/vnet/sys/netinet/sctp_constants.h
  projects/vnet/sys/netinet/sctp_input.c
  projects/vnet/sys/netinet/sctp_output.c
  projects/vnet/sys/netinet/sctp_pcb.c
  projects/vnet/sys/netinet/sctp_pcb.h
  projects/vnet/sys/netinet/sctp_sysctl.c
  projects/vnet/sys/netinet/sctp_timer.c
  projects/vnet/sys/netinet/sctp_timer.h
  projects/vnet/sys/netinet/sctputil.c
  projects/vnet/sys/netinet/tcp_lro.c
  projects/vnet/sys/netinet/tcp_lro.h
  projects/vnet/sys/netinet/tcp_pcap.c
  projects/vnet/sys/netinet6/in6.c
  projects/vnet/sys/netinet6/nd6.c
  projects/vnet/sys/netinet6/nd6.h
  projects/vnet/sys/netinet6/nd6_nbr.c
  projects/vnet/sys/netinet6/nd6_rtr.c
  projects/vnet/sys/netinet6/scope6.c
  projects/vnet/sys/netinet6/sctp6_usrreq.c
  projects/vnet/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/vnet/sys/netpfil/pf/pf.c
  projects/vnet/sys/powerpc/booke/pmap.c
  projects/vnet/sys/powerpc/booke/trap_subr.S
  projects/vnet/sys/powerpc/fpu/fpu_emu.c
  projects/vnet/sys/powerpc/fpu/fpu_explode.c
  projects/vnet/sys/powerpc/include/pte.h
  projects/vnet/sys/powerpc/include/ucontext.h
  projects/vnet/sys/powerpc/mpc85xx/isa.c
  projects/vnet/sys/powerpc/ofw/ofw_machdep.c
  projects/vnet/sys/powerpc/ofw/ofw_syscons.c
  projects/vnet/sys/powerpc/powerpc/genassym.c
  projects/vnet/sys/powerpc/powerpc/nexus.c
  projects/vnet/sys/powerpc/ps3/ps3bus.c
  projects/vnet/sys/riscv/conf/GENERIC
  projects/vnet/sys/riscv/htif/htif.c
  projects/vnet/sys/riscv/include/asm.h
  projects/vnet/sys/riscv/include/atomic.h
  projects/vnet/sys/riscv/include/pcpu.h
  projects/vnet/sys/riscv/include/ucontext.h
  projects/vnet/sys/riscv/include/vmparam.h
  projects/vnet/sys/riscv/riscv/exception.S
  projects/vnet/sys/riscv/riscv/genassym.c
  projects/vnet/sys/riscv/riscv/locore.S
  projects/vnet/sys/riscv/riscv/machdep.c
  projects/vnet/sys/riscv/riscv/nexus.c
  projects/vnet/sys/riscv/riscv/pmap.c
  projects/vnet/sys/riscv/riscv/swtch.S
  projects/vnet/sys/riscv/riscv/vm_machdep.c
  projects/vnet/sys/sparc64/central/central.c
  projects/vnet/sys/sparc64/ebus/ebus.c
  projects/vnet/sys/sparc64/fhc/fhc.c
  projects/vnet/sys/sparc64/include/ucontext.h
  projects/vnet/sys/sparc64/isa/isa.c
  projects/vnet/sys/sparc64/pci/apb.c
  projects/vnet/sys/sparc64/sbus/sbus.c
  projects/vnet/sys/sparc64/sparc64/nexus.c
  projects/vnet/sys/sparc64/sparc64/upa.c
  projects/vnet/sys/sys/ata.h
  projects/vnet/sys/sys/bus.h
  projects/vnet/sys/sys/event.h
  projects/vnet/sys/sys/mbuf.h
  projects/vnet/sys/sys/param.h
  projects/vnet/sys/sys/pmc.h
  projects/vnet/sys/sys/proc.h
  projects/vnet/sys/sys/rman.h
  projects/vnet/sys/sys/signal.h
  projects/vnet/sys/sys/sockbuf.h
  projects/vnet/sys/sys/socketvar.h
  projects/vnet/sys/sys/ucontext.h
  projects/vnet/sys/vm/sg_pager.c
  projects/vnet/sys/vm/uma.h
  projects/vnet/sys/vm/uma_core.c
  projects/vnet/sys/vm/uma_dbg.c
  projects/vnet/sys/vm/uma_dbg.h
  projects/vnet/sys/vm/uma_int.h
  projects/vnet/sys/x86/include/ucontext.h
  projects/vnet/sys/x86/iommu/intel_drv.c
  projects/vnet/sys/x86/isa/isa.c
  projects/vnet/sys/x86/x86/nexus.c
  projects/vnet/targets/pseudo/clang/Makefile.depend
  projects/vnet/targets/pseudo/userland/lib/Makefile.depend
  projects/vnet/targets/pseudo/userland/misc/Makefile.depend
  projects/vnet/tests/sys/Makefile
  projects/vnet/tests/sys/acl/Makefile
  projects/vnet/tests/sys/geom/class/gate/3_test.sh
  projects/vnet/tests/sys/kqueue/read.c
  projects/vnet/tests/sys/pjdfstest/tests/Makefile
  projects/vnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/vnet/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
  projects/vnet/tools/regression/sysvsem/semtest.c
  projects/vnet/tools/tools/ath/athaggrstats/main.c
  projects/vnet/tools/tools/ath/athdebug/athdebug.c
  projects/vnet/tools/tools/ath/athradar/athradar.c
  projects/vnet/tools/tools/ath/athratestats/main.c
  projects/vnet/tools/tools/ath/athregs/dumpregs.c
  projects/vnet/tools/tools/ath/athspectral/athspectral.c
  projects/vnet/tools/tools/ath/athstats/main.c
  projects/vnet/tools/tools/nanobsd/defaults.sh
  projects/vnet/tools/tools/nanobsd/embedded/common
  projects/vnet/usr.bin/calendar/calendars/calendar.freebsd
  projects/vnet/usr.bin/cap_mkdb/cap_mkdb.c
  projects/vnet/usr.bin/elfcopy/Makefile
  projects/vnet/usr.bin/elfcopy/Makefile.depend
  projects/vnet/usr.bin/hexdump/display.c
  projects/vnet/usr.bin/kdump/Makefile.depend
  projects/vnet/usr.bin/mail/def.h
  projects/vnet/usr.bin/makewhatis/Makefile
  projects/vnet/usr.bin/top/machine.c
  projects/vnet/usr.bin/truss/amd64-linux32.c
  projects/vnet/usr.bin/truss/i386-linux.c
  projects/vnet/usr.bin/truss/setup.c
  projects/vnet/usr.bin/truss/syscall.h
  projects/vnet/usr.bin/truss/syscalls.c
  projects/vnet/usr.sbin/amd/include/Makefile
  projects/vnet/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
  projects/vnet/usr.sbin/cron/cron/do_command.c
  projects/vnet/usr.sbin/cron/crontab/crontab.c
  projects/vnet/usr.sbin/ctld/Makefile
  projects/vnet/usr.sbin/ctld/Makefile.depend
  projects/vnet/usr.sbin/ctld/ctld.c
  projects/vnet/usr.sbin/ctld/ctld.h
  projects/vnet/usr.sbin/ctld/login.c
  projects/vnet/usr.sbin/ctld/parse.y
  projects/vnet/usr.sbin/freebsd-update/freebsd-update.sh
  projects/vnet/usr.sbin/iostat/Makefile
  projects/vnet/usr.sbin/iostat/iostat.c
  projects/vnet/usr.sbin/jail/jail.8
  projects/vnet/usr.sbin/jail/jail.conf.5
  projects/vnet/usr.sbin/pciconf/Makefile
  projects/vnet/usr.sbin/pciconf/cap.c
  projects/vnet/usr.sbin/pciconf/pciconf.c
  projects/vnet/usr.sbin/rtsold/rtsold.c
  projects/vnet/usr.sbin/services_mkdb/services_mkdb.c
  projects/vnet/usr.sbin/unbound/control/Makefile
  projects/vnet/usr.sbin/unbound/local-setup/local-unbound-setup.sh
Directory Properties:
  projects/vnet/   (props changed)
  projects/vnet/cddl/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/vnet/contrib/elftoolchain/   (props changed)
  projects/vnet/contrib/elftoolchain/ar/   (props changed)
  projects/vnet/contrib/elftoolchain/brandelf/   (props changed)
  projects/vnet/contrib/elftoolchain/elfdump/   (props changed)
  projects/vnet/contrib/unbound/   (props changed)
  projects/vnet/include/   (props changed)
  projects/vnet/lib/libc/   (props changed)
  projects/vnet/lib/libedit/   (props changed)
  projects/vnet/lib/libedit/edit/readline/   (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/x86emu/   (props changed)
  projects/vnet/sys/dev/hyperv/   (props changed)
  projects/vnet/sys/gnu/dts/   (props changed)
  projects/vnet/sys/gnu/dts/arm/   (props changed)
  projects/vnet/sys/gnu/dts/include/   (props changed)
  projects/vnet/targets/   (props changed)
  projects/vnet/usr.bin/calendar/   (props changed)
  projects/vnet/usr.sbin/jail/   (props changed)
  projects/vnet/usr.sbin/rtsold/   (props changed)

Modified: projects/vnet/Makefile
==============================================================================
--- projects/vnet/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -21,6 +21,7 @@
 # kernel-toolchains   - Build kernel-toolchain for all universe targets.
 # doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree(s).
+# checkworld          - Run test suite on installed world.
 # check-old           - List obsolete directories/files/libraries.
 # check-old-dirs      - List obsolete directories.
 # check-old-files     - List obsolete files.
@@ -112,8 +113,8 @@
 .else
 
 TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
-	check-old check-old-dirs check-old-files check-old-libs \
-	checkdpadd clean cleandepend cleandir cleanworld \
+	check check-old check-old-dirs check-old-files check-old-libs \
+	checkdpadd checkworld clean cleandepend cleandir cleanworld \
 	delete-old delete-old-dirs delete-old-files delete-old-libs \
 	depend distribute distributekernel distributekernel.debug \
 	distributeworld distrib-dirs distribution doxygen \
@@ -121,7 +122,7 @@ TGTS=	all all-man buildenv buildenvvars 
 	installkernel.debug packagekernel packageworld \
 	reinstallkernel reinstallkernel.debug \
 	installworld kernel-toolchain libraries lint maninstall \
-	obj objlink regress rerelease showconfig tags toolchain update \
+	obj objlink rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
 	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
@@ -329,6 +330,10 @@ bmake: .PHONY
 		${MMAKE} all; \
 		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
+regress: .PHONY
+	@echo "'make regress' has been renamed 'make check'" | /usr/bin/fmt
+	@false
+
 tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
 
 tinderbox:
@@ -461,7 +466,8 @@ _THINNER=cat
 _THINNER=xargs grep -L "^.NO_UNIVERSE" || true
 .endif
 KERNCONFS!=	cd ${KERNSRCDIR}/${TARGET}/conf && \
-		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
+		find [[:upper:][:digit:]]*[[:upper:][:digit:]] \
+		-type f -maxdepth 0 \
 		! -name DEFAULTS ! -name NOTES | \
 		${_THINNER}
 universe_kernconfs:

Modified: projects/vnet/Makefile.inc1
==============================================================================
--- projects/vnet/Makefile.inc1	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/Makefile.inc1	Sun Feb 21 14:50:37 2016	(r295855)
@@ -37,6 +37,7 @@
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
+# checkworld  - run test suite on installed world
 # doxygen     - build API documentation of the kernel
 # update      - convenient way to update your source tree (eg: svn/svnup)
 #
@@ -1083,16 +1084,14 @@ redistribute: .MAKE .PHONY
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
-
-distribution: .MAKE .PHONY
+distrib-dirs distribution: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+.if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
-		METALOG=${METALOG} installconfig
+		METALOG=${METALOG} MK_TESTS=no installconfig
+.endif
 
 #
 # buildkernel and installkernel
@@ -1325,6 +1324,20 @@ packagekernel:
 .endif
 
 #
+#
+# checkworld
+#
+# Run test suite on installed world.
+#
+checkworld: .PHONY
+	@if [ ! -x ${LOCALBASE}/bin/kyua ]; then \
+		echo "You need kyua (devel/kyua) to run the test suite." | /usr/bin/fmt; \
+		exit 1; \
+	fi
+	${_+_}${LOCALBASE}/bin/kyua test -k ${TESTSBASE}/Kyuafile
+
+#
+#
 # doxygen
 #
 # Build the API documentation with doxygen
@@ -1625,6 +1638,7 @@ _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
@@ -1637,6 +1651,7 @@ _elftctools+=	usr.bin/addr2line
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy
 .endif
 

Modified: projects/vnet/ObsoleteFiles.inc
==============================================================================
--- projects/vnet/ObsoleteFiles.inc	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/ObsoleteFiles.inc	Sun Feb 21 14:50:37 2016	(r295855)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160211: Remove obsolete unbound-control-setup
+OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160116: Update mandoc to cvs snapshot 20160116
 OLD_FILES+=usr/share/mdocml/example.style.css
 OLD_FILES+=usr/share/mdocml/style.css

Modified: projects/vnet/bin/csh/Makefile
==============================================================================
--- projects/vnet/bin/csh/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/csh/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
 
-CATALOGS=	et:et_EE.ISO8859-15 \
-		finnish:fi_FI.ISO8859-1 \
-		french:fr_FR.ISO8859-1 \
-		german:de_DE.ISO8859-1 \
-		greek:el_GR.ISO8859-7 \
-		italian:it_IT.ISO8859-1 \
-		ja:ja_JP.eucJP \
-		russian:ru_RU.KOI8-R \
-		spanish:es_ES.ISO8859-1 \
-		ukrainian:uk_UA.KOI8-U
-
-NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
-		fr_CH.ISO8859-15 fr_FR.ISO8859-15
-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-		de_CH.ISO8859-15 de_DE.ISO8859-15
-NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
-NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
+CATALOGS=	et:et_EE.UTF-8 \
+		finnish:fi_FI.UTF-8 \
+		french:fr_FR.UTF-8 \
+		german:de_DE.UTF-8 \
+		greek:el_GR.UTF-8 \
+		italian:it_IT.UTF-8 \
+		ja:ja_JP.UTF-8 \
+		russian:ru_RU.UTF-8 \
+		spanish:es_ES.UTF-8 \
+		ukrainian:uk_UA.UTF-8
+
+NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8
+NLSLINKS_fr_FR.UTF-8 = fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8
+NLSLINKS_it_IT.UTF-8 = it_CH.UTF-8
 
 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV
 .if ${MK_ICONV} != "no"
-NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
-NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
-NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
-NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
-NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
-NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
-NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
-NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
-NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
-NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+NLSLINKS_de_DE.UTF-8 += de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+		de_CH.ISO8859-15 de_DE.ISO8859-1 de_DE.ISO8859-15
+NLSLINKS_el_GR.UTF-8 = el_GR.ISO8859-7
+NLSLINKS_es_ES.UTF-8 = es_ES.ISO8859-1 es_ES.ISO8859-15
+NLSLINKS_et_EE.UTF-8 = et_EE.ISO8859-15
+NLSLINKS_fi_FI.UTF-8 = fi_FI.ISO8859-1 fi_FI.ISO8859-15
+NLSLINKS_fr_FR.UTF-8 += fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
+		fr_CH.ISO8859-15 fr_FR.ISO8859-1 fr_FR.ISO8859-15
+NLSLINKS_it_IT.UTF-8 += it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-1 \
+		it_IT.ISO8859-15
+NLSLINKS_ja_JP.UTF-8 = ja_JP.SJIS ja_JP.eucJP
+NLSLINKS_ru_RU.UTF-8 = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.KOI8-R
+NLSLINKS_uk_UA.UTF-8 = uk_UA.ISO8859-5 uk_UA.KOI8-U
 .else
 # Above links can be installed from ports/shells/tcsh_nls
 

Modified: projects/vnet/bin/dd/Makefile
==============================================================================
--- projects/vnet/bin/dd/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -24,7 +24,18 @@ test: ${PROG} gen
 	    LC_ALL=en_US.US-ASCII hexdump -C | \
 	    diff -I FreeBSD - ${.CURDIR}/ref.${conv}
 .endfor
-	@rm -f gen
+	@${ECHO} "testing sparse file (obs zeroes)"
+	@./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null
+	@hexdump -C obs_zeroes | diff -I FreeBSD - ${.CURDIR}/ref.obs_zeroes
+
+	@${ECHO} "testing spase file (all zeroes)"
+	@./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null
+	@diff 1M_zeroes 1M_zeroes.1
+	@diff 1M_zeroes 1M_zeroes.2
+
+	@rm -f gen 1M_zeroes* obs_zeroes
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

Modified: projects/vnet/bin/dd/args.c
==============================================================================
--- projects/vnet/bin/dd/args.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/args.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -360,34 +360,13 @@ c_conv(const void *a, const void *b)
 	    ((const struct conv *)b)->name));
 }
 
-/*
- * Convert an expression of the following forms to a uintmax_t.
- * 	1) A positive decimal number.
- *	2) A positive decimal number followed by a 'b' or 'B' (mult by 512).
- *	3) A positive decimal number followed by a 'k' or 'K' (mult by 1 << 10).
- *	4) A positive decimal number followed by a 'm' or 'M' (mult by 1 << 20).
- *	5) A positive decimal number followed by a 'g' or 'G' (mult by 1 << 30).
- *	5) A positive decimal number followed by a 'w' or 'W' (mult by sizeof int).
- *	6) Two or more positive decimal numbers (with/without [BbKkMmGgWw])
- *	   separated by 'x' or 'X' (also '*' for backwards compatibility),
- *	   specifying the product of the indicated values.
- */
-static uintmax_t
-get_num(const char *val)
+static intmax_t
+postfix_to_mult(const char expr)
 {
-	uintmax_t num, mult, prevnum;
-	char *expr;
-
-	errno = 0;
-	num = strtouq(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
-	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+	intmax_t mult;
 
 	mult = 0;
-	switch (*expr) {
+	switch (expr) {
 	case 'B':
 	case 'b':
 		mult = 512;
@@ -404,14 +383,52 @@ get_num(const char *val)
 	case 'g':
 		mult = 1 << 30;
 		break;
+	case 'T':
+	case 't':
+		mult = (uintmax_t)1 << 40;
+		break;
+	case 'P':
+	case 'p':
+		mult = (uintmax_t)1 << 50;
+		break;
 	case 'W':
 	case 'w':
 		mult = sizeof(int);
 		break;
-	default:
-		;
 	}
 
+	return (mult);
+}
+
+/*
+ * Convert an expression of the following forms to a uintmax_t.
+ * 	1) A positive decimal number.
+ *	2) A positive decimal number followed by a 'b' or 'B' (mult by 512).
+ *	3) A positive decimal number followed by a 'k' or 'K' (mult by 1 << 10).
+ *	4) A positive decimal number followed by a 'm' or 'M' (mult by 1 << 20).
+ *	5) A positive decimal number followed by a 'g' or 'G' (mult by 1 << 30).
+ *	6) A positive decimal number followed by a 't' or 'T' (mult by 1 << 40).
+ *	7) A positive decimal number followed by a 'p' or 'P' (mult by 1 << 50).
+ *	8) A positive decimal number followed by a 'w' or 'W' (mult by sizeof int).
+ *	9) Two or more positive decimal numbers (with/without [BbKkMmGgWw])
+ *	   separated by 'x' or 'X' (also '*' for backwards compatibility),
+ *	   specifying the product of the indicated values.
+ */
+static uintmax_t
+get_num(const char *val)
+{
+	uintmax_t num, mult, prevnum;
+	char *expr;
+
+	errno = 0;
+	num = strtoumax(val, &expr, 0);
+	if (expr == val)			/* No valid digits. */
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
+
+	mult = postfix_to_mult(*expr);
+
 	if (mult != 0) {
 		prevnum = num;
 		num *= mult;
@@ -453,36 +470,13 @@ get_off_t(const char *val)
 	char *expr;
 
 	errno = 0;
-	num = strtoq(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
+	num = strtoimax(val, &expr, 0);
 	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;

Modified: projects/vnet/bin/dd/dd.1
==============================================================================
--- projects/vnet/bin/dd/dd.1	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/dd.1	Sun Feb 21 14:50:37 2016	(r295855)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd August 28, 2014
+.Dd February 4, 2016
 .Dt DD 1
 .Os
 .Sh NAME
@@ -332,10 +332,13 @@ If the number ends with a
 .Dq Li k ,
 .Dq Li m ,
 .Dq Li g ,
+.Dq Li t ,
+.Dq Li p ,
 or
 .Dq Li w ,
 the
-number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
+number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G),
+1099511627776 (1T), 1125899906842624 (1P)
 or the number of bytes in an integer, respectively.
 Two or more numbers may be separated by an
 .Dq Li x

Modified: projects/vnet/bin/dd/dd.c
==============================================================================
--- projects/vnet/bin/dd/dd.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/dd.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -77,7 +77,6 @@ STAT	st;			/* statistics */
 void	(*cfunc)(void);		/* conversion function */
 uintmax_t cpy_cnt;		/* # of blocks to copy */
 static off_t	pending = 0;	/* pending seek if sparse */
-static off_t	last_sp = 0;	/* size of last added sparse block */
 u_int	ddflags = 0;		/* conversion options */
 size_t	cbsz;			/* conversion block size */
 uintmax_t files_cnt = 1;	/* # of files to copy */
@@ -409,6 +408,15 @@ dd_close(void)
 	}
 	if (out.dbcnt || pending)
 		dd_out(1);
+
+	/*
+	 * If the file ends with a hole, ftruncate it to extend its size
+	 * up to the end of the hole (without having to write any data).
+	 */
+	if (out.seek_offset > 0 && (out.flags & ISTRUNC)) {
+		if (ftruncate(out.fd, out.seek_offset) == -1)
+			err(1, "truncating %s", out.name);
+	}
 }
 
 void
@@ -457,29 +465,27 @@ dd_out(int force)
 			}
 			if (sparse && !force) {
 				pending += cnt;
-				last_sp = cnt;
 				nw = cnt;
 			} else {
 				if (pending != 0) {
-					/* If forced to write, and we have no
-					 * data left, we need to write the last
-					 * sparse block explicitly.
+					/*
+					 * Seek past hole.  Note that we need to record the
+					 * reached offset, because we might have no more data
+					 * to write, in which case we'll need to call
+					 * ftruncate to extend the file size.
 					 */
-					if (force && cnt == 0) {
-						pending -= last_sp;
-						assert(outp == out.db);
-						memset(outp, 0, cnt);
-					}
-					if (lseek(out.fd, pending, SEEK_CUR) ==
-					    -1)
+					out.seek_offset = lseek(out.fd, pending, SEEK_CUR);
+					if (out.seek_offset == -1)
 						err(2, "%s: seek error creating sparse file",
 						    out.name);
-					pending = last_sp = 0;
+					pending = 0;
 				}
-				if (cnt)
+				if (cnt) {
 					nw = write(out.fd, outp, cnt);
-				else
+					out.seek_offset = 0;
+				} else {
 					return;
+				}
 			}
 
 			if (nw <= 0) {

Modified: projects/vnet/bin/dd/dd.h
==============================================================================
--- projects/vnet/bin/dd/dd.h	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/dd.h	Sun Feb 21 14:50:37 2016	(r295855)
@@ -54,6 +54,7 @@ typedef struct {
 	const char	*name;		/* name */
 	int		fd;		/* file descriptor */
 	off_t		offset;		/* # of blocks to skip */
+	off_t		seek_offset;	/* offset of last seek past output hole */
 } IO;
 
 typedef struct {

Modified: projects/vnet/bin/dd/gen.c
==============================================================================
--- projects/vnet/bin/dd/gen.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/dd/gen.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -5,13 +5,20 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 int
-main(int argc __unused, char **argv __unused)
+main(int argc, char **argv)
 {
 	int i;
 
-	for (i = 0; i < 256; i++)
-		putchar(i);
+	if (argc > 1 && !strcmp(argv[1], "189284")) {
+		fputs("ABCDEFGH", stdout);
+		for (i = 0; i < 8; i++)
+			putchar(0);
+	} else {
+		for (i = 0; i < 256; i++)
+			putchar(i);
+	}
 	return (0);
 }

Copied: projects/vnet/bin/dd/ref.obs_zeroes (from r295854, head/bin/dd/ref.obs_zeroes)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/dd/ref.obs_zeroes	Sun Feb 21 14:50:37 2016	(r295855, copy of r295854, head/bin/dd/ref.obs_zeroes)
@@ -0,0 +1,3 @@
+$FreeBSD$
+00000000  41 42 43 44 45 46 47 48  00 00 00 00 00 00 00 00  |ABCDEFGH........|
+00000010

Modified: projects/vnet/bin/pkill/pkill.c
==============================================================================
--- projects/vnet/bin/pkill/pkill.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/pkill/pkill.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 
 /* Ignore system-processes (if '-S' flag is not specified) and myself. */
 #define	PSKIP(kp)	((kp)->ki_pid == mypid ||			\
-			 (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
+			 (!kthreads && ((kp)->ki_flag & P_KPROC) != 0))
 
 enum listtype {
 	LT_GENERIC,

Modified: projects/vnet/bin/ps/ps.1
==============================================================================
--- projects/vnet/bin/ps/ps.1	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/ps/ps.1	Sun Feb 21 14:50:37 2016	(r295855)
@@ -318,7 +318,7 @@ the include file
 .Bl -column P_SINGLE_BOUNDARY 0x40000000
 .It Dv "P_ADVLOCK" Ta No "0x00001" Ta "Process may hold a POSIX advisory lock"
 .It Dv "P_CONTROLT" Ta No "0x00002" Ta "Has a controlling terminal"
-.It Dv "P_KTHREAD" Ta No "0x00004" Ta "Kernel thread"
+.It Dv "P_KPROC" Ta No "0x00004" Ta "Kernel process"
 .It Dv "P_FOLLOWFORK" Ta No "0x00008" Ta "Attach debugger to new children"
 .It Dv "P_PPWAIT" Ta No "0x00010" Ta "Parent is waiting for child to exec/exit"
 .It Dv "P_PROFIL" Ta No "0x00020" Ta "Has started profiling"

Modified: projects/vnet/bin/sh/input.c
==============================================================================
--- projects/vnet/bin/sh/input.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/sh/input.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -195,8 +195,7 @@ retry:
 int
 preadbuffer(void)
 {
-	char *p, *q;
-	int more;
+	char *p, *q, *r, *end;
 	char savec;
 
 	while (parsefile->strpush) {
@@ -224,34 +223,31 @@ again:
 		}
 	}
 
-	q = p = parsefile->buf + (parsenextc - parsefile->buf);
-
-	/* delete nul characters */
-	for (more = 1; more;) {
-		switch (*p) {
-		case '\0':
-			p++;	/* Skip nul */
-			goto check;
-
-		case '\n':
-			parsenleft = q - parsenextc;
-			more = 0; /* Stop processing here */
-			break;
-
-		default:
-			break;
-		}
-
-		*q++ = *p++;
-check:
-		if (--parselleft <= 0) {
-			parsenleft = q - parsenextc - 1;
-			if (parsenleft < 0)
-				goto again;
-			*q = '\0';
-			more = 0;
+	p = parsefile->buf + (parsenextc - parsefile->buf);
+	end = p + parselleft;
+	*end = '\0';
+	q = strchrnul(p, '\n');
+	if (q != end && *q == '\0') {
+		/* delete nul characters */
+		for (r = q; q != end; q++) {
+			if (*q != '\0')
+				*r++ = *q;
 		}
+		parselleft -= end - r;
+		if (parselleft == 0)
+			goto again;
+		end = p + parselleft;
+		*end = '\0';
+		q = strchrnul(p, '\n');
+	}
+	if (q == end) {
+		parsenleft = parselleft;
+		parselleft = 0;
+	} else /* *q == '\n' */ {
+		parsenleft = q - parsenextc + 1;
+		parselleft -= parsenleft;
 	}
+	parsenleft--;
 
 	savec = *q;
 	*q = '\0';

Modified: projects/vnet/bin/sh/tests/Makefile
==============================================================================
--- projects/vnet/bin/sh/tests/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/sh/tests/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -10,6 +10,4 @@ TESTS_SUBDIRS+=	parameters
 TESTS_SUBDIRS+=	parser
 TESTS_SUBDIRS+=	set-e
 
-SUBDIR_PARALLEL=
-
 .include <bsd.test.mk>

Modified: projects/vnet/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/vnet/bin/sh/tests/parser/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/bin/sh/tests/parser/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -25,6 +25,8 @@ FILES+=		alias15.0 alias15.0.stdout
 FILES+=		and-pipe-not.0
 FILES+=		case1.0
 FILES+=		case2.0
+FILES+=		comment1.0
+FILES+=		comment2.42
 FILES+=		dollar-quote1.0
 FILES+=		dollar-quote2.0
 FILES+=		dollar-quote3.0
@@ -71,6 +73,7 @@ FILES+=		line-cont10.0
 FILES+=		line-cont11.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
+FILES+=		nul1.0
 FILES+=		only-redir1.0
 FILES+=		only-redir2.0
 FILES+=		only-redir3.0

Copied: projects/vnet/bin/sh/tests/parser/comment1.0 (from r295854, head/bin/sh/tests/parser/comment1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/parser/comment1.0	Sun Feb 21 14:50:37 2016	(r295855, copy of r295854, head/bin/sh/tests/parser/comment1.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+${SH} -c '#'

Copied: projects/vnet/bin/sh/tests/parser/comment2.42 (from r295854, head/bin/sh/tests/parser/comment2.42)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/parser/comment2.42	Sun Feb 21 14:50:37 2016	(r295855, copy of r295854, head/bin/sh/tests/parser/comment2.42)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+${SH} -c '#
+exit 42'

Copied: projects/vnet/bin/sh/tests/parser/nul1.0 (from r295854, head/bin/sh/tests/parser/nul1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/parser/nul1.0	Sun Feb 21 14:50:37 2016	(r295855, copy of r295854, head/bin/sh/tests/parser/nul1.0)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Although POSIX does not specify the effect of NUL bytes in scripts,
+# we ignore them.
+
+{
+	printf 'v=%03000d\0%02000d' 7 2
+	dd if=/dev/zero bs=1000 count=1 status=none
+	printf '1 w=%03000d%02000d1\0\n' 7 2
+	printf '\0l\0v\0=\0$\0{\0#\0v\0}\n'
+	printf '\0l\0w\0=\0\0$\0{\0#\0w}\0\0\0\n'
+	printf '[ "$lv.$lw.$v" = "5001.5001.$w" ]\n'
+} | ${SH}

Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -1713,7 +1713,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1750,7 +1750,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid source "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1786,7 +1786,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -3156,7 +3156,7 @@ zfs_do_list(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/vnet/cddl/usr.sbin/dtrace/tests/common/Makefile
==============================================================================
--- projects/vnet/cddl/usr.sbin/dtrace/tests/common/Makefile	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/cddl/usr.sbin/dtrace/tests/common/Makefile	Sun Feb 21 14:50:37 2016	(r295855)
@@ -86,6 +86,4 @@ TESTS_SUBDIRS+= aggs \
 .PATH:		${.CURDIR:H:H:H:H:H}/tests
 KYUAFILE=	YES
 
-SUBDIR_PARALLEL=
-
 .include <bsd.test.mk>

Modified: projects/vnet/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/vnet/contrib/elftoolchain/addr2line/addr2line.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/contrib/elftoolchain/addr2line/addr2line.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -40,7 +40,7 @@
 #include "uthash.h"
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: addr2line.c 3264 2015-11-30 05:38:14Z kaiwang27 $");
+ELFTC_VCSID("$Id: addr2line.c 3273 2015-12-11 21:38:57Z kaiwang27 $");
 
 struct Func {
 	char *name;
@@ -368,7 +368,8 @@ print_inlines(struct CU *cu, struct Func
 				printf("%s\n", f->name);
 		}
 	}
-	(void) printf("%s:%ju\n", base ? basename(file) : file, call_line);
+	(void) printf("%s:%ju\n", base ? basename(file) : file,
+	    (uintmax_t) call_line);
 
 	if (f->inlined_caller != NULL)
 		print_inlines(cu, f->inlined_caller, f->call_file,
@@ -562,7 +563,8 @@ out:
 		}
 	}
 
-	(void) printf("%s:%ju\n", base ? basename(file) : file, lineno);
+	(void) printf("%s:%ju\n", base ? basename(file) : file,
+	    (uintmax_t) lineno);
 
 	if (ret == DW_DLV_OK && inlines && cu != NULL &&
 	    cu->srcfiles != NULL && f != NULL && f->inlined_caller != NULL)

Copied: projects/vnet/contrib/elftoolchain/addr2line/os.NetBSD.mk (from r295854, head/contrib/elftoolchain/addr2line/os.NetBSD.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/contrib/elftoolchain/addr2line/os.NetBSD.mk	Sun Feb 21 14:50:37 2016	(r295855, copy of r295854, head/contrib/elftoolchain/addr2line/os.NetBSD.mk)
@@ -0,0 +1,2 @@
+# TODO(#511): Revert after the source tree is -Wconversion clean.
+WARNS=5

Modified: projects/vnet/contrib/elftoolchain/ar/ar.c
==============================================================================
--- projects/vnet/contrib/elftoolchain/ar/ar.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/contrib/elftoolchain/ar/ar.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -72,7 +72,7 @@
 
 #include "ar.h"
 
-ELFTC_VCSID("$Id: ar.c 3243 2015-08-31 19:28:45Z emaste $");
+ELFTC_VCSID("$Id: ar.c 3319 2016-01-13 21:37:53Z jkoshy $");
 
 enum options
 {
@@ -407,7 +407,7 @@ Usage: %s <command> [options] archive fi
   -F FORMAT | --flavor=FORMAT\n\
                 Create archives with the specified format.\n\
   -S            Do not generate an archive symbol table.\n\
-  -U            Use original metadata, for unique archive checksums.\n"
+  -U            Use original metadata for archive members.\n"
 
 static void
 bsdar_usage(void)

Modified: projects/vnet/contrib/elftoolchain/brandelf/brandelf.c
==============================================================================
--- projects/vnet/contrib/elftoolchain/brandelf/brandelf.c	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/contrib/elftoolchain/brandelf/brandelf.c	Sun Feb 21 14:50:37 2016	(r295855)
@@ -44,7 +44,7 @@
 
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: brandelf.c 3234 2015-07-31 12:35:09Z emaste $");
+ELFTC_VCSID("$Id: brandelf.c 3354 2016-01-18 21:50:15Z jkoshy $");
 
 static int elftype(const char *);
 static const char *iselftype(int);
@@ -212,7 +212,7 @@ main(int argc, char **argv)
 			/*
 			 * Update the ABI type.
 			 */
-			ehdr.e_ident[EI_OSABI] = type;
+			ehdr.e_ident[EI_OSABI] = (unsigned char) type;
 			if (gelf_update_ehdr(elf, &ehdr) == 0) {
 				warnx("gelf_update_ehdr error: %s",
 				    elf_errmsg(-1));

Modified: projects/vnet/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/vnet/contrib/elftoolchain/common/elfdefinitions.h	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/contrib/elftoolchain/common/elfdefinitions.h	Sun Feb 21 14:50:37 2016	(r295855)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: elfdefinitions.h 3253 2015-10-10 18:31:33Z kaiwang27 $
+ * $Id: elfdefinitions.h 3392 2016-02-05 19:51:22Z emaste $
  */
 
 /*
@@ -1228,6 +1228,7 @@ _ELF_DEFINE_STB(STB_GLOBAL,          1,	
 _ELF_DEFINE_STB(STB_WEAK,            2,					\
 	"visible across all object files but with low precedence")	\
 _ELF_DEFINE_STB(STB_LOOS,            10, "start of OS-specific range")	\
+_ELF_DEFINE_STB(STB_GNU_UNIQUE,      10, "unique symbol (GNU)")		\
 _ELF_DEFINE_STB(STB_HIOS,            12, "end of OS-specific range")	\
 _ELF_DEFINE_STB(STB_LOPROC,          13,				\
 	"start of processor-specific range")				\
@@ -1259,6 +1260,7 @@ _ELF_DEFINE_STT(STT_LOPROC,          13,
 	"start of processor-specific types")				\
 _ELF_DEFINE_STT(STT_ARM_TFUNC,       13, "Thumb function (GNU)")	\
 _ELF_DEFINE_STT(STT_ARM_16BIT,       15, "Thumb label (GNU)")		\
+_ELF_DEFINE_STT(STT_SPARC_REGISTER,  13, "SPARC register information")	\
 _ELF_DEFINE_STT(STT_HIPROC,          15,				\
 	"end of processor-specific types")
 
@@ -1395,7 +1397,7 @@ _ELF_DEFINE_RELOC(R_386_GOT32,		3)	\
 _ELF_DEFINE_RELOC(R_386_PLT32,		4)	\
 _ELF_DEFINE_RELOC(R_386_COPY,		5)	\
 _ELF_DEFINE_RELOC(R_386_GLOB_DAT,	6)	\
-_ELF_DEFINE_RELOC(R_386_JMP_SLOT,	7)	\
+_ELF_DEFINE_RELOC(R_386_JUMP_SLOT,	7)	\
 _ELF_DEFINE_RELOC(R_386_RELATIVE,	8)	\
 _ELF_DEFINE_RELOC(R_386_GOTOFF,		9)	\
 _ELF_DEFINE_RELOC(R_386_GOTPC,		10)	\
@@ -1407,9 +1409,129 @@ _ELF_DEFINE_RELOC(R_386_PC8,		23)
 
 /*
  */
-#define	_ELF_DEFINE_AARCH64_RELOCATIONS()		\
-_ELF_DEFINE_RELOC(R_AARCH64_ABS64,		257)	\
-_ELF_DEFINE_RELOC(R_AARCH64_ABS32,		258)	\
+#define	_ELF_DEFINE_AARCH64_RELOCATIONS()				\
+_ELF_DEFINE_RELOC(R_AARCH64_NONE,				0)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ABS64,				257)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ABS32,				258)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ABS16,				259)	\
+_ELF_DEFINE_RELOC(R_AARCH64_PREL64,				260)	\
+_ELF_DEFINE_RELOC(R_AARCH64_PREL32,				261)	\
+_ELF_DEFINE_RELOC(R_AARCH64_PREL16,				262)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G0,			263)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G0_NC,			264)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G1,			265)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G1_NC,			266)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G2,			267)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G2_NC,			268)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G3,			269)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G0,			270)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G1,			271)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G2,			272)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LD_PREL_LO19,			273)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_LO21,			274)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_PG_HI21,			275)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_PG_HI21_NC,		276)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ADD_ABS_LO12_NC,			277)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LDST8_ABS_LO12_NC,			278)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TSTBR14,				279)	\
+_ELF_DEFINE_RELOC(R_AARCH64_CONDBR19,				280)	\
+_ELF_DEFINE_RELOC(R_AARCH64_JUMP26,				282)	\
+_ELF_DEFINE_RELOC(R_AARCH64_CALL26,				283)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LDST16_ABS_LO12_NC,			284)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LDST32_ABS_LO12_NC,			285)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LDST64_ABS_LO12_NC,			286)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G0,			287)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G0_NC,			288)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G1,			289)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G1_NC,			290)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G2,			291)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G2_NC,			292)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G3,			293)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LDST128_ABS_LO12_NC,		299)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G0,			300)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G0_NC,			301)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G1,			302)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G1_NC,			303)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G2,			304)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G2_NC,			305)	\
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G3,			306)	\
+_ELF_DEFINE_RELOC(R_AARCH64_GOTREL64,				307)	\
+_ELF_DEFINE_RELOC(R_AARCH64_GOTREL32,				308)	\
+_ELF_DEFINE_RELOC(R_AARCH64_GOT_LD_PREL19,			309)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOTOFF_LO15,			310)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_GOT_PAGE,			311)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOT_LO12_NC,			312)	\
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOTPAGE_LO15,			313)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADR_PREL21,			512)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADR_PAGE21,			513)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADD_LO12_NC,			514)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_MOVW_G1,			515)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_MOVW_G0_NC,			516)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADR_PREL21,			517)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADR_PAGE21,			518)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADD_LO12_NC,			519)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_G1,			520)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_G0_NC,			521)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LD_PREL19,			522)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_DTPREL_G2,		523)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_DTPREL_G1,		524)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC,		525)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_DTPREL_G0,		526)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC,		527)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADD_DTPREL_HI12,		529)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC,		530)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST8_DTPREL_LO12,		531)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC,		532)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST16_DTPREL_LO12,		533)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC,	534)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST32_DTPREL_LO12,		535)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC,	536)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST64_DTPREL_LO12,		537)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC,	538)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSIE_MOVW_GOTTPREL_G1,		539)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC,		540)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21,		541)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC,	542)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSIE_LD_GOTTPREL_PREL19,		543)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_MOVW_TPREL_G2,		544)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_MOVW_TPREL_G1,		545)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_MOVW_TPREL_G1_NC,		546)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_MOVW_TPREL_G0,		547)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_MOVW_TPREL_G0_NC,		548)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_ADD_TPREL_HI12,		549)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_ADD_TPREL_LO12,		550)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_ADD_TPREL_LO12_NC,		551)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST8_TPREL_LO12,		552)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC,		553)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST16_TPREL_LO12,		554)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC,		555)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST32_TPREL_LO12,		556)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC,		557)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST64_TPREL_LO12,		558)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC,		559)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_LD_PREL19,			560)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_ADR_PREL21,			561)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_ADR_PAGE21,			562)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_LD64_LO12,			563)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_ADD_LO12,			564)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_OFF_G1,			565)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_OFF_G0_NC,			566)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_LDR,			567)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_ADD,			568)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC_CALL,			569)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12,		570)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC,	571)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12,		572)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC,	573)	\
+_ELF_DEFINE_RELOC(R_AARCH64_COPY,				1024)	\
+_ELF_DEFINE_RELOC(R_AARCH64_GLOB_DAT,				1025)	\
+_ELF_DEFINE_RELOC(R_AARCH64_JUMP_SLOT,				1026)	\
+_ELF_DEFINE_RELOC(R_AARCH64_RELATIVE,				1027)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLS_DTPREL64,			1028)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLS_DTPMOD64,			1029)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLS_TPREL64,			1030)	\
+_ELF_DEFINE_RELOC(R_AARCH64_TLSDESC,				1031)	\
+_ELF_DEFINE_RELOC(R_AARCH64_IRELATIVE,				1032)
 
 /*
  * These are the symbols used in the Sun ``Linkers and Loaders
@@ -1633,7 +1755,7 @@ _ELF_DEFINE_RELOC(R_IA_64_LTV32MSB,		0x7
 _ELF_DEFINE_RELOC(R_IA_64_LTV32LSB,		0x75)	\
 _ELF_DEFINE_RELOC(R_IA_64_LTV64MSB,		0x76)	\
 _ELF_DEFINE_RELOC(R_IA_64_LTV64LSB,		0x77)	\
-_ELF_DEFINE_RELOC(R_IA_64_PCREL21BIa,		0x79)	\
+_ELF_DEFINE_RELOC(R_IA_64_PCREL21BI,		0x79)	\
 _ELF_DEFINE_RELOC(R_IA_64_PCREL22,		0x7A)	\
 _ELF_DEFINE_RELOC(R_IA_64_PCREL64I,		0x7B)	\
 _ELF_DEFINE_RELOC(R_IA_64_IPLTMSB,		0x80)	\
@@ -1723,7 +1845,7 @@ _ELF_DEFINE_RELOC(R_PPC_REL32,		26)	\
 _ELF_DEFINE_RELOC(R_PPC_PLT32,		27)	\
 _ELF_DEFINE_RELOC(R_PPC_PLTREL32,	28)	\
 _ELF_DEFINE_RELOC(R_PPC_PLT16_LO,	29)	\
-_ELF_DEFINE_RELOC(R_PPL_PLT16_HI,	30)	\
+_ELF_DEFINE_RELOC(R_PPC_PLT16_HI,	30)	\
 _ELF_DEFINE_RELOC(R_PPC_PLT16_HA,	31)	\
 _ELF_DEFINE_RELOC(R_PPC_SDAREL16,	32)	\
 _ELF_DEFINE_RELOC(R_PPC_SECTOFF,	33)	\
@@ -1926,7 +2048,7 @@ _ELF_DEFINE_RELOC(R_RISCV_SUB32,		39)	\
 _ELF_DEFINE_RELOC(R_RISCV_SUB64,		40)	\
 _ELF_DEFINE_RELOC(R_RISCV_GNU_VTINHERIT,	41)	\
 _ELF_DEFINE_RELOC(R_RISCV_GNU_VTENTRY,		42)	\
-_ELF_DEFINE_RELOC(R_RISCV_ALIGN			43)	\
+_ELF_DEFINE_RELOC(R_RISCV_ALIGN,		43)	\
 _ELF_DEFINE_RELOC(R_RISCV_RVC_BRANCH,		44)	\
 _ELF_DEFINE_RELOC(R_RISCV_RVC_JUMP,		45)
 
@@ -2042,6 +2164,7 @@ _ELF_DEFINE_IA64_RELOCATIONS()			\
 _ELF_DEFINE_MIPS_RELOCATIONS()			\
 _ELF_DEFINE_PPC32_RELOCATIONS()			\
 _ELF_DEFINE_PPC64_RELOCATIONS()			\
+_ELF_DEFINE_RISCV_RELOCATIONS()			\
 _ELF_DEFINE_SPARC_RELOCATIONS()			\
 _ELF_DEFINE_X86_64_RELOCATIONS()
 

Modified: projects/vnet/contrib/elftoolchain/common/native-elf-format
==============================================================================
--- projects/vnet/contrib/elftoolchain/common/native-elf-format	Sun Feb 21 14:36:50 2016	(r295854)
+++ projects/vnet/contrib/elftoolchain/common/native-elf-format	Sun Feb 21 14:50:37 2016	(r295855)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: native-elf-format 3186 2015-04-16 22:16:40Z emaste $
+# $Id: native-elf-format 3293 2016-01-07 19:26:27Z emaste $
 #
 # Find the native ELF format for a host platform by compiling a
 # test object and examining the resulting object.
@@ -33,6 +33,8 @@ $1 ~ "Data:"  {
 $1 ~ "Machine:" {
         if (match($0, "Intel.*386")) {
             elfarch = "EM_386";
+        } else if (match($0, "MIPS")) {
+            elfarch = "EM_MIPS";

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

From owner-svn-src-projects@freebsd.org  Sun Feb 21 15:34:20 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6076AAF1CB
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 15:34:20 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 737C5121A;
 Sun, 21 Feb 2016 15:34:20 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LFYJx5081853;
 Sun, 21 Feb 2016 15:34:19 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LFYJSc081852;
 Sun, 21 Feb 2016 15:34:19 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201602211534.u1LFYJSc081852@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 21 Feb 2016 15:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295858 - projects/vnet/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 15:34:20 -0000

Author: bz
Date: Sun Feb 21 15:34:19 2016
New Revision: 295858
URL: https://svnweb.freebsd.org/changeset/base/295858

Log:
  Remove now unused variable to make compile.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/netinet/sctp_pcb.c

Modified: projects/vnet/sys/netinet/sctp_pcb.c
==============================================================================
--- projects/vnet/sys/netinet/sctp_pcb.c	Sun Feb 21 14:59:24 2016	(r295857)
+++ projects/vnet/sys/netinet/sctp_pcb.c	Sun Feb 21 15:34:19 2016	(r295858)
@@ -5914,7 +5914,6 @@ sctp_pcb_finish(void)
 	struct sctp_tagblock *twait_block, *prev_twait_block;
 	struct sctp_laddr *wi, *nwi;
 	int i;
-	unsigned int r;
 	struct sctp_iterator *it, *nit;
 
 	if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) {

From owner-svn-src-projects@freebsd.org  Sun Feb 21 16:23:48 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05882AB0608
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 16:23:48 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 961E61ABC;
 Sun, 21 Feb 2016 16:23:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LGNk4c097263;
 Sun, 21 Feb 2016 16:23:46 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LGNirU097238;
 Sun, 21 Feb 2016 16:23:44 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602211623.u1LGNirU097238@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 21 Feb 2016 16:23:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295859 - in projects/clang380-import:
 contrib/llvm/include/llvm/CodeGen contrib/llvm/include/llvm/IR
 contrib/llvm/lib/CodeGen contrib/llvm/lib/CodeGen/SelectionDAG
 contrib/llvm/lib/Sup...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 16:23:48 -0000

Author: dim
Date: Sun Feb 21 16:23:44 2016
New Revision: 295859
URL: https://svnweb.freebsd.org/changeset/base/295859

Log:
  Update llvm and clang to release_38 branch r261369.

Modified:
  projects/clang380-import/contrib/llvm/include/llvm/CodeGen/LiveInterval.h
  projects/clang380-import/contrib/llvm/include/llvm/IR/IRBuilder.h
  projects/clang380-import/contrib/llvm/include/llvm/IR/Instructions.h
  projects/clang380-import/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp
  projects/clang380-import/contrib/llvm/lib/CodeGen/LiveInterval.cpp
  projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  projects/clang380-import/contrib/llvm/lib/CodeGen/WinEHPrepare.cpp
  projects/clang380-import/contrib/llvm/lib/Support/Triple.cpp
  projects/clang380-import/contrib/llvm/lib/Target/Sparc/SparcInstrAliases.td
  projects/clang380-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrAVX512.td
  projects/clang380-import/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp
  projects/clang380-import/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
  projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  projects/clang380-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp
  projects/clang380-import/lib/clang/include/clang/Basic/Version.inc
Directory Properties:
  projects/clang380-import/contrib/llvm/   (props changed)
  projects/clang380-import/contrib/llvm/tools/clang/   (props changed)

Modified: projects/clang380-import/contrib/llvm/include/llvm/CodeGen/LiveInterval.h
==============================================================================
--- projects/clang380-import/contrib/llvm/include/llvm/CodeGen/LiveInterval.h	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/include/llvm/CodeGen/LiveInterval.h	Sun Feb 21 16:23:44 2016	(r295859)
@@ -544,6 +544,11 @@ namespace llvm {
       return true;
     }
 
+    // Returns true if any segment in the live range contains any of the
+    // provided slot indexes.  Slots which occur in holes between
+    // segments will not cause the function to return true.
+    bool isLiveAtIndexes(ArrayRef<SlotIndex> Slots) const;
+
     bool operator<(const LiveRange& other) const {
       const SlotIndex &thisIndex = beginIndex();
       const SlotIndex &otherIndex = other.beginIndex();

Modified: projects/clang380-import/contrib/llvm/include/llvm/IR/IRBuilder.h
==============================================================================
--- projects/clang380-import/contrib/llvm/include/llvm/IR/IRBuilder.h	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/include/llvm/IR/IRBuilder.h	Sun Feb 21 16:23:44 2016	(r295859)
@@ -1539,16 +1539,7 @@ public:
   }
 
   CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args = None,
-                       ArrayRef<OperandBundleDef> OpBundles = None,
                        const Twine &Name = "", MDNode *FPMathTag = nullptr) {
-    CallInst *CI = CallInst::Create(Callee, Args, OpBundles);
-    if (isa<FPMathOperator>(CI))
-      CI = cast<CallInst>(AddFPMathAttributes(CI, FPMathTag, FMF));
-    return Insert(CI, Name);
-  }
-
-  CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,
-                       const Twine &Name, MDNode *FPMathTag = nullptr) {
     PointerType *PTy = cast<PointerType>(Callee->getType());
     FunctionType *FTy = cast<FunctionType>(PTy->getElementType());
     return CreateCall(FTy, Callee, Args, Name, FPMathTag);
@@ -1563,6 +1554,15 @@ public:
     return Insert(CI, Name);
   }
 
+  CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,
+                       ArrayRef<OperandBundleDef> OpBundles,
+                       const Twine &Name = "", MDNode *FPMathTag = nullptr) {
+    CallInst *CI = CallInst::Create(Callee, Args, OpBundles);
+    if (isa<FPMathOperator>(CI))
+      CI = cast<CallInst>(AddFPMathAttributes(CI, FPMathTag, FMF));
+    return Insert(CI, Name);
+  }
+
   CallInst *CreateCall(Function *Callee, ArrayRef<Value *> Args,
                        const Twine &Name = "", MDNode *FPMathTag = nullptr) {
     return CreateCall(Callee->getFunctionType(), Callee, Args, Name, FPMathTag);

Modified: projects/clang380-import/contrib/llvm/include/llvm/IR/Instructions.h
==============================================================================
--- projects/clang380-import/contrib/llvm/include/llvm/IR/Instructions.h	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/include/llvm/IR/Instructions.h	Sun Feb 21 16:23:44 2016	(r295859)
@@ -2512,6 +2512,14 @@ public:
     return block_begin() + getNumOperands();
   }
 
+  iterator_range<block_iterator> blocks() {
+    return make_range(block_begin(), block_end());
+  }
+
+  iterator_range<const_block_iterator> blocks() const {
+    return make_range(block_begin(), block_end());
+  }
+
   op_range incoming_values() { return operands(); }
 
   const_op_range incoming_values() const { return operands(); }

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -213,8 +213,11 @@ VirtRegAuxInfo::calculateSpillWeightAndH
   if (!Spillable)
     return;
 
-  // Mark li as unspillable if all live ranges are tiny.
-  if (li.isZeroLength(LIS.getSlotIndexes())) {
+  // Mark li as unspillable if all live ranges are tiny and the interval
+  // is not live at any reg mask.  If the interval is live at a reg mask
+  // spilling may be required.
+  if (li.isZeroLength(LIS.getSlotIndexes()) &&
+      !li.isLiveAtIndexes(LIS.getRegMaskSlots())) {
     li.markNotSpillable();
     return;
   }

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/LiveInterval.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/LiveInterval.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/LiveInterval.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -748,6 +748,40 @@ void LiveRange::flushSegmentSet() {
   verify();
 }
 
+bool LiveRange::isLiveAtIndexes(ArrayRef<SlotIndex> Slots) const {
+  ArrayRef<SlotIndex>::iterator SlotI = Slots.begin();
+  ArrayRef<SlotIndex>::iterator SlotE = Slots.end();
+
+  // If there are no regmask slots, we have nothing to search.
+  if (SlotI == SlotE)
+    return false;
+
+  // Start our search at the first segment that ends after the first slot.
+  const_iterator SegmentI = find(*SlotI);
+  const_iterator SegmentE = end();
+
+  // If there are no segments that end after the first slot, we're done.
+  if (SegmentI == SegmentE)
+    return false;
+
+  // Look for each slot in the live range.
+  for ( ; SlotI != SlotE; ++SlotI) {
+    // Go to the next segment that ends after the current slot.
+    // The slot may be within a hole in the range.
+    SegmentI = advanceTo(SegmentI, *SlotI);
+    if (SegmentI == SegmentE)
+      return false;
+
+    // If this segment contains the slot, we're done.
+    if (SegmentI->contains(*SlotI))
+      return true;
+    // Otherwise, look for the next slot.
+  }
+
+  // We didn't find a segment containing any of the slots.
+  return false;
+}
+
 void LiveInterval::freeSubRange(SubRange *S) {
   S->~SubRange();
   // Memory was allocated with BumpPtr allocator and is not freed here.

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -1637,6 +1637,7 @@ struct FloatSignAsInt {
   MachinePointerInfo FloatPointerInfo;
   SDValue IntValue;
   APInt SignMask;
+  uint8_t SignBit;
 };
 }
 
@@ -1653,6 +1654,7 @@ void SelectionDAGLegalize::getSignAsIntV
   if (TLI.isTypeLegal(IVT)) {
     State.IntValue = DAG.getNode(ISD::BITCAST, DL, IVT, Value);
     State.SignMask = APInt::getSignBit(NumBits);
+    State.SignBit = NumBits - 1;
     return;
   }
 
@@ -1689,6 +1691,7 @@ void SelectionDAGLegalize::getSignAsIntV
                                   IntPtr, State.IntPointerInfo, MVT::i8,
                                   false, false, false, 0);
   State.SignMask = APInt::getOneBitSet(LoadTy.getSizeInBits(), 7);
+  State.SignBit = 7;
 }
 
 /// Replace the integer value produced by getSignAsIntValue() with a new value
@@ -1731,15 +1734,38 @@ SDValue SelectionDAGLegalize::ExpandFCOP
     return DAG.getSelect(DL, FloatVT, Cond, NegValue, AbsValue);
   }
 
-  // Transform values to integer, copy the sign bit and transform back.
+  // Transform Mag value to integer, and clear the sign bit.
   FloatSignAsInt MagAsInt;
   getSignAsIntValue(MagAsInt, DL, Mag);
-  assert(SignAsInt.SignMask == MagAsInt.SignMask);
-  SDValue ClearSignMask = DAG.getConstant(~SignAsInt.SignMask, DL, IntVT);
-  SDValue ClearedSign = DAG.getNode(ISD::AND, DL, IntVT, MagAsInt.IntValue,
+  EVT MagVT = MagAsInt.IntValue.getValueType();
+  SDValue ClearSignMask = DAG.getConstant(~MagAsInt.SignMask, DL, MagVT);
+  SDValue ClearedSign = DAG.getNode(ISD::AND, DL, MagVT, MagAsInt.IntValue,
                                     ClearSignMask);
-  SDValue CopiedSign = DAG.getNode(ISD::OR, DL, IntVT, ClearedSign, SignBit);
 
+  // Get the signbit at the right position for MagAsInt.
+  int ShiftAmount = SignAsInt.SignBit - MagAsInt.SignBit;
+  if (SignBit.getValueSizeInBits() > ClearedSign.getValueSizeInBits()) {
+    if (ShiftAmount > 0) {
+      SDValue ShiftCnst = DAG.getConstant(ShiftAmount, DL, IntVT);
+      SignBit = DAG.getNode(ISD::SRL, DL, IntVT, SignBit, ShiftCnst);
+    } else if (ShiftAmount < 0) {
+      SDValue ShiftCnst = DAG.getConstant(-ShiftAmount, DL, IntVT);
+      SignBit = DAG.getNode(ISD::SHL, DL, IntVT, SignBit, ShiftCnst);
+    }
+    SignBit = DAG.getNode(ISD::TRUNCATE, DL, MagVT, SignBit);
+  } else if (SignBit.getValueSizeInBits() < ClearedSign.getValueSizeInBits()) {
+    SignBit = DAG.getNode(ISD::ZERO_EXTEND, DL, MagVT, SignBit);
+    if (ShiftAmount > 0) {
+      SDValue ShiftCnst = DAG.getConstant(ShiftAmount, DL, MagVT);
+      SignBit = DAG.getNode(ISD::SRL, DL, MagVT, SignBit, ShiftCnst);
+    } else if (ShiftAmount < 0) {
+      SDValue ShiftCnst = DAG.getConstant(-ShiftAmount, DL, MagVT);
+      SignBit = DAG.getNode(ISD::SHL, DL, MagVT, SignBit, ShiftCnst);
+    }
+  }
+
+  // Store the part with the modified sign and convert back to float.
+  SDValue CopiedSign = DAG.getNode(ISD::OR, DL, MagVT, ClearedSign, SignBit);
   return modifySignAsInt(MagAsInt, DL, CopiedSign);
 }
 

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/WinEHPrepare.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/WinEHPrepare.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/WinEHPrepare.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -257,10 +257,14 @@ static void calculateCXXStateNumbers(Win
         if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI))
           if (InnerCatchSwitch->getUnwindDest() == CatchSwitch->getUnwindDest())
             calculateCXXStateNumbers(FuncInfo, UserI, CatchLow);
-        if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI))
-          if (getCleanupRetUnwindDest(InnerCleanupPad) ==
-              CatchSwitch->getUnwindDest())
+        if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI)) {
+          BasicBlock *UnwindDest = getCleanupRetUnwindDest(InnerCleanupPad);
+          // If a nested cleanup pad reports a null unwind destination and the
+          // enclosing catch pad doesn't it must be post-dominated by an
+          // unreachable instruction.
+          if (!UnwindDest || UnwindDest == CatchSwitch->getUnwindDest())
             calculateCXXStateNumbers(FuncInfo, UserI, CatchLow);
+        }
       }
     }
     int CatchHigh = FuncInfo.getLastStateNumber();
@@ -360,10 +364,14 @@ static void calculateSEHStateNumbers(Win
       if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI))
         if (InnerCatchSwitch->getUnwindDest() == CatchSwitch->getUnwindDest())
           calculateSEHStateNumbers(FuncInfo, UserI, ParentState);
-      if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI))
-        if (getCleanupRetUnwindDest(InnerCleanupPad) ==
-            CatchSwitch->getUnwindDest())
+      if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI)) {
+        BasicBlock *UnwindDest = getCleanupRetUnwindDest(InnerCleanupPad);
+        // If a nested cleanup pad reports a null unwind destination and the
+        // enclosing catch pad doesn't it must be post-dominated by an
+        // unreachable instruction.
+        if (!UnwindDest || UnwindDest == CatchSwitch->getUnwindDest())
           calculateSEHStateNumbers(FuncInfo, UserI, ParentState);
+      }
     }
   } else {
     auto *CleanupPad = cast<CleanupPadInst>(FirstNonPHI);

Modified: projects/clang380-import/contrib/llvm/lib/Support/Triple.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Support/Triple.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Support/Triple.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -338,9 +338,9 @@ static Triple::ArchType parseArch(String
     // FIXME: Do we need to support these?
     .Cases("i786", "i886", "i986", Triple::x86)
     .Cases("amd64", "x86_64", "x86_64h", Triple::x86_64)
-    .Case("powerpc", Triple::ppc)
-    .Cases("powerpc64", "ppu", Triple::ppc64)
-    .Case("powerpc64le", Triple::ppc64le)
+    .Cases("powerpc", "ppc32", Triple::ppc)
+    .Cases("powerpc64", "ppu", "ppc64", Triple::ppc64)
+    .Cases("powerpc64le", "ppc64le", Triple::ppc64le)
     .Case("xscale", Triple::arm)
     .Case("xscaleeb", Triple::armeb)
     .Case("aarch64", Triple::aarch64)
@@ -359,7 +359,7 @@ static Triple::ArchType parseArch(String
     .Case("r600", Triple::r600)
     .Case("amdgcn", Triple::amdgcn)
     .Case("hexagon", Triple::hexagon)
-    .Case("s390x", Triple::systemz)
+    .Cases("s390x", "systemz", Triple::systemz)
     .Case("sparc", Triple::sparc)
     .Case("sparcel", Triple::sparcel)
     .Cases("sparcv9", "sparc64", Triple::sparcv9)

Modified: projects/clang380-import/contrib/llvm/lib/Target/Sparc/SparcInstrAliases.td
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/Sparc/SparcInstrAliases.td	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Target/Sparc/SparcInstrAliases.td	Sun Feb 21 16:23:44 2016	(r295859)
@@ -267,9 +267,9 @@ defm : int_cond_alias<"neg",  0b0110>;
 defm : int_cond_alias<"vc",   0b1111>;
 defm : int_cond_alias<"vs",   0b0111>;
 
-defm : fp_cond_alias<"a",     0b0000>;
-defm : fp_cond_alias<"",      0b0000>; // same as a; gnu asm, not in manual
-defm : fp_cond_alias<"n",     0b1000>;
+defm : fp_cond_alias<"a",     0b1000>;
+defm : fp_cond_alias<"",      0b1000>; // same as a; gnu asm, not in manual
+defm : fp_cond_alias<"n",     0b0000>;
 defm : fp_cond_alias<"u",     0b0111>;
 defm : fp_cond_alias<"g",     0b0110>;
 defm : fp_cond_alias<"ug",    0b0101>;

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -69,19 +69,15 @@ public:
 class X86AsmBackend : public MCAsmBackend {
   const StringRef CPU;
   bool HasNopl;
-  uint64_t MaxNopLength;
+  const uint64_t MaxNopLength;
 public:
-  X86AsmBackend(const Target &T, StringRef CPU) : MCAsmBackend(), CPU(CPU) {
+  X86AsmBackend(const Target &T, StringRef CPU)
+      : MCAsmBackend(), CPU(CPU), MaxNopLength(CPU == "slm" ? 7 : 15) {
     HasNopl = CPU != "generic" && CPU != "i386" && CPU != "i486" &&
               CPU != "i586" && CPU != "pentium" && CPU != "pentium-mmx" &&
               CPU != "i686" && CPU != "k6" && CPU != "k6-2" && CPU != "k6-3" &&
               CPU != "geode" && CPU != "winchip-c6" && CPU != "winchip2" &&
               CPU != "c3" && CPU != "c3-2";
-    // Max length of true long nop instruction is 15 bytes.
-    // Max length of long nop replacement instruction is 7 bytes.
-    // Taking into account SilverMont architecture features max length of nops
-    // is reduced for it to achieve better performance.
-    MaxNopLength = (!HasNopl || CPU == "slm") ? 7 : 15;
   }
 
   unsigned getNumFixupKinds() const override {
@@ -299,7 +295,7 @@ void X86AsmBackend::relaxInstruction(con
 /// bytes.
 /// \return - true on success, false on failure
 bool X86AsmBackend::writeNopData(uint64_t Count, MCObjectWriter *OW) const {
-  static const uint8_t TrueNops[10][10] = {
+  static const uint8_t Nops[10][10] = {
     // nop
     {0x90},
     // xchg %ax,%ax
@@ -322,31 +318,17 @@ bool X86AsmBackend::writeNopData(uint64_
     {0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00},
   };
 
-  // Alternative nop instructions for CPUs which don't support long nops.
-  static const uint8_t AltNops[7][10] = {
-      // nop
-      {0x90},
-      // xchg %ax,%ax
-      {0x66, 0x90},
-      // lea 0x0(%esi),%esi
-      {0x8d, 0x76, 0x00},
-      // lea 0x0(%esi),%esi
-      {0x8d, 0x74, 0x26, 0x00},
-      // nop + lea 0x0(%esi),%esi
-      {0x90, 0x8d, 0x74, 0x26, 0x00},
-      // lea 0x0(%esi),%esi
-      {0x8d, 0xb6, 0x00, 0x00, 0x00, 0x00 },
-      // lea 0x0(%esi),%esi
-      {0x8d, 0xb4, 0x26, 0x00, 0x00, 0x00, 0x00},
-  };
-
-  // Select the right NOP table.
-  // FIXME: Can we get if CPU supports long nops from the subtarget somehow?
-  const uint8_t (*Nops)[10] = HasNopl ? TrueNops : AltNops;
-  assert(HasNopl || MaxNopLength <= 7);
+  // This CPU doesn't support long nops. If needed add more.
+  // FIXME: Can we get this from the subtarget somehow?
+  // FIXME: We could generated something better than plain 0x90.
+  if (!HasNopl) {
+    for (uint64_t i = 0; i < Count; ++i)
+      OW->write8(0x90);
+    return true;
+  }
 
-  // Emit as many largest nops as needed, then emit a nop of the remaining
-  // length.
+  // 15 is the longest single nop instruction.  Emit as many 15-byte nops as
+  // needed, then emit a nop of the remaining length.
   do {
     const uint8_t ThisNopLength = (uint8_t) std::min(Count, MaxNopLength);
     const uint8_t Prefixes = ThisNopLength <= 10 ? 0 : ThisNopLength - 10;

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -192,10 +192,9 @@ static unsigned findDeadCallerSavedReg(M
   return 0;
 }
 
-static bool isEAXLiveIn(MachineFunction &MF) {
-  for (MachineRegisterInfo::livein_iterator II = MF.getRegInfo().livein_begin(),
-       EE = MF.getRegInfo().livein_end(); II != EE; ++II) {
-    unsigned Reg = II->first;
+static bool isEAXLiveIn(MachineBasicBlock &MBB) {
+  for (MachineBasicBlock::RegisterMaskPair RegMask : MBB.liveins()) {
+    unsigned Reg = RegMask.PhysReg;
 
     if (Reg == X86::RAX || Reg == X86::EAX || Reg == X86::AX ||
         Reg == X86::AH || Reg == X86::AL)
@@ -261,7 +260,7 @@ void X86FrameLowering::emitSPUpdate(Mach
       // load the offset into a register and do one sub/add
       unsigned Reg = 0;
 
-      if (isSub && !isEAXLiveIn(*MBB.getParent()))
+      if (isSub && !isEAXLiveIn(MBB))
         Reg = (unsigned)(Is64Bit ? X86::RAX : X86::EAX);
       else
         Reg = findDeadCallerSavedReg(MBB, MBBI, TRI, Is64Bit);
@@ -1133,8 +1132,8 @@ void X86FrameLowering::emitPrologue(Mach
   if (IsWin64Prologue && !IsFunclet && TRI->needsStackRealignment(MF))
     AlignedNumBytes = RoundUpToAlignment(AlignedNumBytes, MaxAlign);
   if (AlignedNumBytes >= StackProbeSize && UseStackProbe) {
-    // Check whether EAX is livein for this function.
-    bool isEAXAlive = isEAXLiveIn(MF);
+    // Check whether EAX is livein for this block.
+    bool isEAXAlive = isEAXLiveIn(MBB);
 
     if (isEAXAlive) {
       // Sanity check that EAX is not livein for this function.

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrAVX512.td
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrAVX512.td	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrAVX512.td	Sun Feb 21 16:23:44 2016	(r295859)
@@ -5896,7 +5896,7 @@ multiclass avx512_sqrt_scalar<bits<8> op
 
   def : Pat<(_.EltVT (OpNode (load addr:$src))),
             (!cast<Instruction>(NAME#SUFF#Zm)
-                (_.EltVT (IMPLICIT_DEF)), addr:$src)>, Requires<[OptForSize]>;
+                (_.EltVT (IMPLICIT_DEF)), addr:$src)>, Requires<[HasAVX512, OptForSize]>;
 }
 
 multiclass avx512_sqrt_scalar_all<bits<8> opc, string OpcodeStr> {

Modified: projects/clang380-import/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -29,6 +29,7 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/LLVMContext.h"
+#include "llvm/Transforms/Utils/Local.h"
 #include <algorithm>
 using namespace llvm;
 
@@ -186,32 +187,8 @@ bool PruneEH::SimplifyFunction(Function 
   for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
     if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
       if (II->doesNotThrow() && canSimplifyInvokeNoUnwind(F)) {
-        SmallVector<Value*, 8> Args(II->arg_begin(), II->arg_end());
-        SmallVector<OperandBundleDef, 1> OpBundles;
-        II->getOperandBundlesAsDefs(OpBundles);
-
-        // Insert a call instruction before the invoke.
-        CallInst *Call = CallInst::Create(II->getCalledValue(), Args, OpBundles,
-                                          "", II);
-        Call->takeName(II);
-        Call->setCallingConv(II->getCallingConv());
-        Call->setAttributes(II->getAttributes());
-        Call->setDebugLoc(II->getDebugLoc());
-
-        // Anything that used the value produced by the invoke instruction
-        // now uses the value produced by the call instruction.  Note that we
-        // do this even for void functions and calls with no uses so that the
-        // callgraph edge is updated.
-        II->replaceAllUsesWith(Call);
         BasicBlock *UnwindBlock = II->getUnwindDest();
-        UnwindBlock->removePredecessor(II->getParent());
-
-        // Insert a branch to the normal destination right before the
-        // invoke.
-        BranchInst::Create(II->getNormalDest(), II);
-
-        // Finally, delete the invoke instruction!
-        BB->getInstList().pop_back();
+        removeUnwindEdge(&*BB);
 
         // If the unwind block is now dead, nuke it.
         if (pred_empty(UnwindBlock))
@@ -251,23 +228,39 @@ void PruneEH::DeleteBasicBlock(BasicBloc
   assert(pred_empty(BB) && "BB is not dead!");
   CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
 
+  Instruction *TokenInst = nullptr;
+
   CallGraphNode *CGN = CG[BB->getParent()];
   for (BasicBlock::iterator I = BB->end(), E = BB->begin(); I != E; ) {
     --I;
-    if (CallInst *CI = dyn_cast<CallInst>(I)) {
-      if (!isa<IntrinsicInst>(I))
-        CGN->removeCallEdgeFor(CI);
-    } else if (InvokeInst *II = dyn_cast<InvokeInst>(I))
-      CGN->removeCallEdgeFor(II);
+
+    if (I->getType()->isTokenTy()) {
+      TokenInst = &*I;
+      break;
+    }
+
+    if (auto CS = CallSite (&*I)) {
+      const Function *Callee = CS.getCalledFunction();
+      if (!Callee || !Intrinsic::isLeaf(Callee->getIntrinsicID()))
+        CGN->removeCallEdgeFor(CS);
+      else if (!Callee->isIntrinsic())
+        CGN->removeCallEdgeFor(CS);
+    }
+
     if (!I->use_empty())
       I->replaceAllUsesWith(UndefValue::get(I->getType()));
   }
 
-  // Get the list of successors of this block.
-  std::vector<BasicBlock*> Succs(succ_begin(BB), succ_end(BB));
+  if (TokenInst) {
+    if (!isa<TerminatorInst>(TokenInst))
+      changeToUnreachable(TokenInst->getNextNode(), /*UseLLVMTrap=*/false);
+  } else {
+    // Get the list of successors of this block.
+    std::vector<BasicBlock *> Succs(succ_begin(BB), succ_end(BB));
 
-  for (unsigned i = 0, e = Succs.size(); i != e; ++i)
-    Succs[i]->removePredecessor(BB);
+    for (unsigned i = 0, e = Succs.size(); i != e; ++i)
+      Succs[i]->removePredecessor(BB);
 
-  BB->eraseFromParent();
+    BB->eraseFromParent();
+  }
 }

Modified: projects/clang380-import/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -4799,6 +4799,17 @@ LSRInstance::LSRInstance(Loop *L, IVUser
       DEBUG(dbgs() << "LSR skipping loop, too many IV Users in " << U << "\n");
       return;
     }
+    // Bail out if we have a PHI on an EHPad that gets a value from a
+    // CatchSwitchInst.  Because the CatchSwitchInst cannot be split, there is
+    // no good place to stick any instructions.
+    if (auto *PN = dyn_cast<PHINode>(U.getUser())) {
+       auto *FirstNonPHI = PN->getParent()->getFirstNonPHI();
+       if (isa<FuncletPadInst>(FirstNonPHI) ||
+           isa<CatchSwitchInst>(FirstNonPHI))
+         for (BasicBlock *PredBB : PN->blocks())
+           if (isa<CatchSwitchInst>(PredBB->getFirstNonPHI()))
+             return;
+    }
   }
 
 #ifndef NDEBUG

Modified: projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -1409,14 +1409,15 @@ private:
 /// different operations.
 class LoopVectorizationCostModel {
 public:
-  LoopVectorizationCostModel(Loop *L, PredicatedScalarEvolution &PSE,
-                             LoopInfo *LI, LoopVectorizationLegality *Legal,
+  LoopVectorizationCostModel(Loop *L, ScalarEvolution *SE, LoopInfo *LI,
+                             LoopVectorizationLegality *Legal,
                              const TargetTransformInfo &TTI,
                              const TargetLibraryInfo *TLI, DemandedBits *DB,
                              AssumptionCache *AC, const Function *F,
-                             const LoopVectorizeHints *Hints)
-      : TheLoop(L), PSE(PSE), LI(LI), Legal(Legal), TTI(TTI), TLI(TLI), DB(DB),
-        AC(AC), TheFunction(F), Hints(Hints) {}
+                             const LoopVectorizeHints *Hints,
+                             SmallPtrSetImpl<const Value *> &ValuesToIgnore)
+      : TheLoop(L), SE(SE), LI(LI), Legal(Legal), TTI(TTI), TLI(TLI), DB(DB),
+        TheFunction(F), Hints(Hints), ValuesToIgnore(ValuesToIgnore) {}
 
   /// Information about vectorization costs
   struct VectorizationFactor {
@@ -1464,9 +1465,6 @@ public:
   SmallVector<RegisterUsage, 8>
   calculateRegisterUsage(const SmallVector<unsigned, 8> &VFs);
 
-  /// Collect values we want to ignore in the cost model.
-  void collectValuesToIgnore();
-
 private:
   /// Returns the expected execution cost. The unit of the cost does
   /// not matter because we use the 'cost' units to compare different
@@ -1498,8 +1496,8 @@ public:
 
   /// The loop that we evaluate.
   Loop *TheLoop;
-  /// Predicated scalar evolution analysis.
-  PredicatedScalarEvolution &PSE;
+  /// Scev analysis.
+  ScalarEvolution *SE;
   /// Loop Info analysis.
   LoopInfo *LI;
   /// Vectorization legality.
@@ -1508,17 +1506,13 @@ public:
   const TargetTransformInfo &TTI;
   /// Target Library Info.
   const TargetLibraryInfo *TLI;
-  /// Demanded bits analysis.
+  /// Demanded bits analysis
   DemandedBits *DB;
-  /// Assumption cache.
-  AssumptionCache *AC;
   const Function *TheFunction;
-  /// Loop Vectorize Hint.
+  // Loop Vectorize Hint.
   const LoopVectorizeHints *Hints;
-  /// Values to ignore in the cost model.
-  SmallPtrSet<const Value *, 16> ValuesToIgnore;
-  /// Values to ignore in the cost model when VF > 1.
-  SmallPtrSet<const Value *, 16> VecValuesToIgnore;
+  // Values to ignore in the cost model.
+  const SmallPtrSetImpl<const Value *> &ValuesToIgnore;
 };
 
 /// \brief This holds vectorization requirements that must be verified late in
@@ -1763,10 +1757,19 @@ struct LoopVectorize : public FunctionPa
       return false;
     }
 
+    // Collect values we want to ignore in the cost model. This includes
+    // type-promoting instructions we identified during reduction detection.
+    SmallPtrSet<const Value *, 32> ValuesToIgnore;
+    CodeMetrics::collectEphemeralValues(L, AC, ValuesToIgnore);
+    for (auto &Reduction : *LVL.getReductionVars()) {
+      RecurrenceDescriptor &RedDes = Reduction.second;
+      SmallPtrSetImpl<Instruction *> &Casts = RedDes.getCastInsts();
+      ValuesToIgnore.insert(Casts.begin(), Casts.end());
+    }
+
     // Use the cost model.
-    LoopVectorizationCostModel CM(L, PSE, LI, &LVL, *TTI, TLI, DB, AC, F,
-                                  &Hints);
-    CM.collectValuesToIgnore();
+    LoopVectorizationCostModel CM(L, PSE.getSE(), LI, &LVL, *TTI, TLI, DB, AC,
+                                  F, &Hints, ValuesToIgnore);
 
     // Check the function attributes to find out if this function should be
     // optimized for size.
@@ -4636,6 +4639,8 @@ void InterleavedAccessInfo::analyzeInter
 
   // Holds all interleaved store groups temporarily.
   SmallSetVector<InterleaveGroup *, 4> StoreGroups;
+  // Holds all interleaved load groups temporarily.
+  SmallSetVector<InterleaveGroup *, 4> LoadGroups;
 
   // Search the load-load/write-write pair B-A in bottom-up order and try to
   // insert B into the interleave group of A according to 3 rules:
@@ -4663,6 +4668,8 @@ void InterleavedAccessInfo::analyzeInter
 
     if (A->mayWriteToMemory())
       StoreGroups.insert(Group);
+    else
+      LoadGroups.insert(Group);
 
     for (auto II = std::next(I); II != E; ++II) {
       Instruction *B = II->first;
@@ -4710,6 +4717,12 @@ void InterleavedAccessInfo::analyzeInter
   for (InterleaveGroup *Group : StoreGroups)
     if (Group->getNumMembers() != Group->getFactor())
       releaseGroup(Group);
+
+  // Remove interleaved load groups that don't have the first and last member.
+  // This guarantees that we won't do speculative out of bounds loads.
+  for (InterleaveGroup *Group : LoadGroups)
+    if (!Group->getMember(0) || !Group->getMember(Group->getFactor() - 1))
+      releaseGroup(Group);
 }
 
 LoopVectorizationCostModel::VectorizationFactor
@@ -4734,7 +4747,7 @@ LoopVectorizationCostModel::selectVector
   }
 
   // Find the trip count.
-  unsigned TC = PSE.getSE()->getSmallConstantTripCount(TheLoop);
+  unsigned TC = SE->getSmallConstantTripCount(TheLoop);
   DEBUG(dbgs() << "LV: Found trip count: " << TC << '\n');
 
   MinBWs = computeMinimumValueSizes(TheLoop->getBlocks(), *DB, &TTI);
@@ -4936,7 +4949,7 @@ unsigned LoopVectorizationCostModel::sel
     return 1;
 
   // Do not interleave loops with a relatively small trip count.
-  unsigned TC = PSE.getSE()->getSmallConstantTripCount(TheLoop);
+  unsigned TC = SE->getSmallConstantTripCount(TheLoop);
   if (TC > 1 && TC < TinyTripCountInterleaveThreshold)
     return 1;
 
@@ -5164,15 +5177,15 @@ LoopVectorizationCostModel::calculateReg
     // Ignore instructions that are never used within the loop.
     if (!Ends.count(I)) continue;
 
+    // Skip ignored values.
+    if (ValuesToIgnore.count(I))
+      continue;
+
     // Remove all of the instructions that end at this location.
     InstrList &List = TransposeEnds[i];
     for (unsigned int j = 0, e = List.size(); j < e; ++j)
       OpenIntervals.erase(List[j]);
 
-    // Skip ignored values.
-    if (ValuesToIgnore.count(I))
-      continue;
-
     // For each VF find the maximum usage of registers.
     for (unsigned j = 0, e = VFs.size(); j < e; ++j) {
       if (VFs[j] == 1) {
@@ -5182,12 +5195,8 @@ LoopVectorizationCostModel::calculateReg
 
       // Count the number of live intervals.
       unsigned RegUsage = 0;
-      for (auto Inst : OpenIntervals) {
-        // Skip ignored values for VF > 1.
-        if (VecValuesToIgnore.count(Inst))
-          continue;
+      for (auto Inst : OpenIntervals)
         RegUsage += GetRegUsage(Inst->getType(), VFs[j]);
-      }
       MaxUsages[j] = std::max(MaxUsages[j], RegUsage);
     }
 
@@ -5331,7 +5340,6 @@ LoopVectorizationCostModel::getInstructi
   if (VF > 1 && MinBWs.count(I))
     RetTy = IntegerType::get(RetTy->getContext(), MinBWs[I]);
   Type *VectorTy = ToVectorTy(RetTy, VF);
-  auto SE = PSE.getSE();
 
   // TODO: We need to estimate the cost of intrinsic calls.
   switch (I->getOpcode()) {
@@ -5633,79 +5641,6 @@ bool LoopVectorizationCostModel::isConse
   return false;
 }
 
-void LoopVectorizationCostModel::collectValuesToIgnore() {
-  // Ignore ephemeral values.
-  CodeMetrics::collectEphemeralValues(TheLoop, AC, ValuesToIgnore);
-
-  // Ignore type-promoting instructions we identified during reduction
-  // detection.
-  for (auto &Reduction : *Legal->getReductionVars()) {
-    RecurrenceDescriptor &RedDes = Reduction.second;
-    SmallPtrSetImpl<Instruction *> &Casts = RedDes.getCastInsts();
-    VecValuesToIgnore.insert(Casts.begin(), Casts.end());
-  }
-
-  // Ignore induction phis that are only used in either GetElementPtr or ICmp
-  // instruction to exit loop. Induction variables usually have large types and
-  // can have big impact when estimating register usage.
-  // This is for when VF > 1.
-  for (auto &Induction : *Legal->getInductionVars()) {
-    auto *PN = Induction.first;
-    auto *UpdateV = PN->getIncomingValueForBlock(TheLoop->getLoopLatch());
-
-    // Check that the PHI is only used by the induction increment (UpdateV) or
-    // by GEPs. Then check that UpdateV is only used by a compare instruction or
-    // the loop header PHI.
-    // FIXME: Need precise def-use analysis to determine if this instruction
-    // variable will be vectorized.
-    if (std::all_of(PN->user_begin(), PN->user_end(),
-                    [&](const User *U) -> bool {
-                      return U == UpdateV || isa<GetElementPtrInst>(U);
-                    }) &&
-        std::all_of(UpdateV->user_begin(), UpdateV->user_end(),
-                    [&](const User *U) -> bool {
-                      return U == PN || isa<ICmpInst>(U);
-                    })) {
-      VecValuesToIgnore.insert(PN);
-      VecValuesToIgnore.insert(UpdateV);
-    }
-  }
-
-  // Ignore instructions that will not be vectorized.
-  // This is for when VF > 1.
-  for (auto bb = TheLoop->block_begin(), be = TheLoop->block_end(); bb != be;
-       ++bb) {
-    for (auto &Inst : **bb) {
-      switch (Inst.getOpcode()) {
-      case Instruction::GetElementPtr: {
-        // Ignore GEP if its last operand is an induction variable so that it is
-        // a consecutive load/store and won't be vectorized as scatter/gather
-        // pattern.
-
-        GetElementPtrInst *Gep = cast<GetElementPtrInst>(&Inst);
-        unsigned NumOperands = Gep->getNumOperands();
-        unsigned InductionOperand = getGEPInductionOperand(Gep);
-        bool GepToIgnore = true;
-
-        // Check that all of the gep indices are uniform except for the
-        // induction operand.
-        for (unsigned i = 0; i != NumOperands; ++i) {
-          if (i != InductionOperand &&
-              !PSE.getSE()->isLoopInvariant(PSE.getSCEV(Gep->getOperand(i)),
-                                            TheLoop)) {
-            GepToIgnore = false;
-            break;
-          }
-        }
-
-        if (GepToIgnore)
-          VecValuesToIgnore.insert(&Inst);
-        break;
-      }
-      }
-    }
-  }
-}
 
 void InnerLoopUnroller::scalarizeInstruction(Instruction *Instr,
                                              bool IfPredicateStore) {

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -4915,8 +4915,8 @@ public:
     default: break;
     case 'l': // r0-r7
     case 'h': // r8-r15
-    case 'w': // VFP Floating point register single precision
-    case 'P': // VFP Floating point register double precision
+    case 't': // VFP Floating point register single precision
+    case 'w': // VFP Floating point register double precision
       Info.setAllowsRegister();
       return true;
     case 'I':

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -585,71 +585,48 @@ void CodeGenFunction::EmitOMPLastprivate
     EmitBlock(ThenBB);
   }
   llvm::DenseMap<const Decl *, const Expr *> LoopCountersAndUpdates;
-  const Expr *LastIterVal = nullptr;
-  const Expr *IVExpr = nullptr;
-  const Expr *IncExpr = nullptr;
   if (auto *LoopDirective = dyn_cast<OMPLoopDirective>(&D)) {
-    if (isOpenMPWorksharingDirective(D.getDirectiveKind())) {
-      LastIterVal = cast<VarDecl>(cast<DeclRefExpr>(
-                                      LoopDirective->getUpperBoundVariable())
-                                      ->getDecl())
-                        ->getAnyInitializer();
-      IVExpr = LoopDirective->getIterationVariable();
-      IncExpr = LoopDirective->getInc();
-      auto IUpdate = LoopDirective->updates().begin();
-      for (auto *E : LoopDirective->counters()) {
-        auto *D = cast<DeclRefExpr>(E)->getDecl()->getCanonicalDecl();
-        LoopCountersAndUpdates[D] = *IUpdate;
-        ++IUpdate;
-      }
+    auto IC = LoopDirective->counters().begin();
+    for (auto F : LoopDirective->finals()) {
+      auto *D = cast<DeclRefExpr>(*IC)->getDecl()->getCanonicalDecl();
+      LoopCountersAndUpdates[D] = F;
+      ++IC;
     }
   }
-  {
-    llvm::DenseSet<const VarDecl *> AlreadyEmittedVars;
-    bool FirstLCV = true;
-    for (const auto *C : D.getClausesOfKind<OMPLastprivateClause>()) {
-      auto IRef = C->varlist_begin();
-      auto ISrcRef = C->source_exprs().begin();
-      auto IDestRef = C->destination_exprs().begin();
-      for (auto *AssignOp : C->assignment_ops()) {
-        auto *PrivateVD = cast<VarDecl>(cast<DeclRefExpr>(*IRef)->getDecl());
-        QualType Type = PrivateVD->getType();
-        auto *CanonicalVD = PrivateVD->getCanonicalDecl();
-        if (AlreadyEmittedVars.insert(CanonicalVD).second) {
-          // If lastprivate variable is a loop control variable for loop-based
-          // directive, update its value before copyin back to original
-          // variable.
-          if (auto *UpExpr = LoopCountersAndUpdates.lookup(CanonicalVD)) {
-            if (FirstLCV && LastIterVal) {
-              EmitAnyExprToMem(LastIterVal, EmitLValue(IVExpr).getAddress(),
-                               IVExpr->getType().getQualifiers(),
-                               /*IsInitializer=*/false);
-              EmitIgnoredExpr(IncExpr);
-              FirstLCV = false;
-            }
-            EmitIgnoredExpr(UpExpr);
-          }
-          auto *SrcVD = cast<VarDecl>(cast<DeclRefExpr>(*ISrcRef)->getDecl());
-          auto *DestVD = cast<VarDecl>(cast<DeclRefExpr>(*IDestRef)->getDecl());
-          // Get the address of the original variable.
-          Address OriginalAddr = GetAddrOfLocalVar(DestVD);
-          // Get the address of the private variable.
-          Address PrivateAddr = GetAddrOfLocalVar(PrivateVD);
-          if (auto RefTy = PrivateVD->getType()->getAs<ReferenceType>())
-            PrivateAddr =
+  llvm::DenseSet<const VarDecl *> AlreadyEmittedVars;
+  for (const auto *C : D.getClausesOfKind<OMPLastprivateClause>()) {
+    auto IRef = C->varlist_begin();
+    auto ISrcRef = C->source_exprs().begin();
+    auto IDestRef = C->destination_exprs().begin();
+    for (auto *AssignOp : C->assignment_ops()) {
+      auto *PrivateVD = cast<VarDecl>(cast<DeclRefExpr>(*IRef)->getDecl());
+      QualType Type = PrivateVD->getType();
+      auto *CanonicalVD = PrivateVD->getCanonicalDecl();
+      if (AlreadyEmittedVars.insert(CanonicalVD).second) {
+        // If lastprivate variable is a loop control variable for loop-based
+        // directive, update its value before copyin back to original
+        // variable.
+        if (auto *UpExpr = LoopCountersAndUpdates.lookup(CanonicalVD))
+          EmitIgnoredExpr(UpExpr);
+        auto *SrcVD = cast<VarDecl>(cast<DeclRefExpr>(*ISrcRef)->getDecl());
+        auto *DestVD = cast<VarDecl>(cast<DeclRefExpr>(*IDestRef)->getDecl());
+        // Get the address of the original variable.
+        Address OriginalAddr = GetAddrOfLocalVar(DestVD);
+        // Get the address of the private variable.
+        Address PrivateAddr = GetAddrOfLocalVar(PrivateVD);
+        if (auto RefTy = PrivateVD->getType()->getAs<ReferenceType>())
+          PrivateAddr =
               Address(Builder.CreateLoad(PrivateAddr),
                       getNaturalTypeAlignment(RefTy->getPointeeType()));
-          EmitOMPCopy(Type, OriginalAddr, PrivateAddr, DestVD, SrcVD, AssignOp);
-        }
-        ++IRef;
-        ++ISrcRef;
-        ++IDestRef;
+        EmitOMPCopy(Type, OriginalAddr, PrivateAddr, DestVD, SrcVD, AssignOp);
       }
+      ++IRef;
+      ++ISrcRef;
+      ++IDestRef;
     }
   }
-  if (IsLastIterCond) {
+  if (IsLastIterCond)
     EmitBlock(DoneBB, /*IsFinished=*/true);
-  }
 }
 
 void CodeGenFunction::EmitOMPReductionClauseInit(
@@ -919,10 +896,6 @@ void CodeGenFunction::EmitOMPLoopBody(co
   // The end (updates/cleanups).
   EmitBlock(Continue.getBlock());
   BreakContinueStack.pop_back();
-    // TODO: Update lastprivates if the SeparateIter flag is true.
-    // This will be implemented in a follow-up OMPLastprivateClause patch, but
-    // result should be still correct without it, as we do not make these
-    // variables private yet.
 }
 
 void CodeGenFunction::EmitOMPInnerLoop(

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -4868,9 +4868,6 @@ public:
 };
 
 class WindowsARMTargetCodeGenInfo : public ARMTargetCodeGenInfo {
-  void addStackProbeSizeTargetAttribute(const Decl *D, llvm::GlobalValue *GV,
-                                        CodeGen::CodeGenModule &CGM) const;
-
 public:
   WindowsARMTargetCodeGenInfo(CodeGenTypes &CGT, ARMABIInfo::ABIKind K)
       : ARMTargetCodeGenInfo(CGT, K) {}
@@ -4879,18 +4876,6 @@ public:
                            CodeGen::CodeGenModule &CGM) const override;
 };
 
-void WindowsARMTargetCodeGenInfo::addStackProbeSizeTargetAttribute(
-    const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &CGM) const {
-  if (!isa<FunctionDecl>(D))
-    return;
-  if (CGM.getCodeGenOpts().StackProbeSize == 4096)
-    return;
-
-  llvm::Function *F = cast<llvm::Function>(GV);
-  F->addFnAttr("stack-probe-size",
-               llvm::utostr(CGM.getCodeGenOpts().StackProbeSize));
-}
-
 void WindowsARMTargetCodeGenInfo::setTargetAttributes(
     const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &CGM) const {
   ARMTargetCodeGenInfo::setTargetAttributes(D, GV, CGM);

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -3108,6 +3108,22 @@ void FreeBSD::AddClangCXXStdlibIncludeAr
   }
 }
 
+void FreeBSD::AddCXXStdlibLibArgs(const ArgList &Args,
+                                  ArgStringList &CmdArgs) const {
+  CXXStdlibType Type = GetCXXStdlibType(Args);
+  bool Profiling = Args.hasArg(options::OPT_pg);
+
+  switch (Type) {
+  case ToolChain::CST_Libcxx:
+    CmdArgs.push_back(Profiling ? "-lc++_p" : "-lc++");
+    break;
+
+  case ToolChain::CST_Libstdcxx:
+    CmdArgs.push_back(Profiling ? "-lstdc++_p" : "-lstdc++");
+    break;
+  }
+}
+
 Tool *FreeBSD::buildAssembler() const {
   return new tools::freebsd::Assembler(*this);
 }

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Sun Feb 21 16:23:44 2016	(r295859)
@@ -722,6 +722,8 @@ public:
   void AddClangCXXStdlibIncludeArgs(
       const llvm::opt::ArgList &DriverArgs,
       llvm::opt::ArgStringList &CC1Args) const override;
+  void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args,
+                           llvm::opt::ArgStringList &CmdArgs) const override;
 
   bool UseSjLjExceptions(const llvm::opt::ArgList &Args) const override;
   bool isPIEDefault() const override;

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -182,7 +182,7 @@ bool ContinuationIndenter::mustBreak(con
     return true;
 
   unsigned NewLineColumn = getNewLineColumn(State);
-  if (Current.isMemberAccess() &&
+  if (Current.isMemberAccess() && Style.ColumnLimit != 0 &&
       State.Column + getLengthToNextOperator(Current) > Style.ColumnLimit &&
       (State.Column > NewLineColumn ||
        Current.NestingLevel < State.StartOfLineLevel))

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp	Sun Feb 21 15:34:19 2016	(r295858)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp	Sun Feb 21 16:23:44 2016	(r295859)
@@ -634,7 +634,8 @@ DSAStackTy::DSAVarData DSAStackTy::getTo
     if (auto *CTD = CTSD->getSpecializedTemplate())
       RD = CTD->getTemplatedDecl();
   if (IsConstant &&
-      !(SemaRef.getLangOpts().CPlusPlus && RD && RD->hasMutableFields())) {
+      !(SemaRef.getLangOpts().CPlusPlus && RD && RD->hasDefinition() &&
+        RD->hasMutableFields())) {
     // Variables with const-qualified type having no mutable member may be
     // listed in a firstprivate clause, even if they are static data members.
     DSAVarData DVarTemp = hasDSA(D, MatchesAnyClause(OMPC_firstprivate),
@@ -3204,7 +3205,7 @@ public:
         NewVD->setInitStyle(VD->getInitStyle());
         NewVD->setExceptionVariable(VD->isExceptionVariable());
         NewVD->setNRVOVariable(VD->isNRVOVariable());
-        NewVD->setCXXForRangeDecl(VD->isInExternCXXContext());
+        NewVD->setCXXForRangeDecl(VD->isCXXForRangeDecl());
         NewVD->setConstexpr(VD->isConstexpr());
         NewVD->setInitCapture(VD->isInitCapture());
         NewVD->setPreviousDeclInSameBlockScope(
@@ -3249,14 +3250,20 @@ OpenMPIterationSpaceChecker::BuildNumIte

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

From owner-svn-src-projects@freebsd.org  Sun Feb 21 16:27:57 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D681AB083F
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 16:27:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 173201F6A;
 Sun, 21 Feb 2016 16:27:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LGRuEr097587;
 Sun, 21 Feb 2016 16:27:56 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LGRtJN097584;
 Sun, 21 Feb 2016 16:27:55 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602211627.u1LGRtJN097584@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 21 Feb 2016 16:27:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295860 - in
 projects/clang380-import/contrib/compiler-rt/lib: msan sanitizer_common
 tsan/rtl
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 16:27:57 -0000

Author: dim
Date: Sun Feb 21 16:27:55 2016
New Revision: 295860
URL: https://svnweb.freebsd.org/changeset/base/295860

Log:
  Update compiler-rt to release_38 branch r261369.

Modified:
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interceptors.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc
Directory Properties:
  projects/clang380-import/contrib/compiler-rt/   (props changed)

Modified: projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interceptors.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interceptors.cc	Sun Feb 21 16:23:44 2016	(r295859)
+++ projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interceptors.cc	Sun Feb 21 16:27:55 2016	(r295860)
@@ -1408,12 +1408,12 @@ int OnExit() {
   __msan_unpoison(ptr, size)
 #define COMMON_INTERCEPTOR_ENTER(ctx, func, ...)                  \
   if (msan_init_is_running) return REAL(func)(__VA_ARGS__);       \
+  ENSURE_MSAN_INITED();                                           \
   MSanInterceptorContext msan_ctx = {IsInInterceptorScope()};     \
   ctx = (void *)&msan_ctx;                                        \
   (void)ctx;                                                      \
   InterceptorScope interceptor_scope;                             \
-  __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */  \
-  ENSURE_MSAN_INITED();
+  __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */
 #define COMMON_INTERCEPTOR_DIR_ACQUIRE(ctx, path) \
   do {                                            \
   } while (false)

Modified: projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc	Sun Feb 21 16:23:44 2016	(r295859)
+++ projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc	Sun Feb 21 16:27:55 2016	(r295860)
@@ -222,6 +222,11 @@ uptr ThreadDescriptorSize() {
     char *end;
     int minor = internal_simple_strtoll(buf + 8, &end, 10);
     if (end != buf + 8 && (*end == '\0' || *end == '.')) {
+      int patch = 0;
+      if (*end == '.')
+        // strtoll will return 0 if no valid conversion could be performed
+        patch = internal_simple_strtoll(end + 1, nullptr, 10);
+
       /* sizeof(struct pthread) values from various glibc versions.  */
       if (SANITIZER_X32)
         val = 1728;  // Assume only one particular version for x32.
@@ -235,9 +240,9 @@ uptr ThreadDescriptorSize() {
         val = FIRST_32_SECOND_64(1136, 1712);
       else if (minor == 10)
         val = FIRST_32_SECOND_64(1168, 1776);
-      else if (minor <= 12)
+      else if (minor == 11 || (minor == 12 && patch == 1))
         val = FIRST_32_SECOND_64(1168, 2288);
-      else if (minor == 13)
+      else if (minor <= 13)
         val = FIRST_32_SECOND_64(1168, 2304);
       else
         val = FIRST_32_SECOND_64(1216, 2304);

Modified: projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc	Sun Feb 21 16:23:44 2016	(r295859)
+++ projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc	Sun Feb 21 16:27:55 2016	(r295860)
@@ -159,8 +159,8 @@ void PrintMatchedSuppressions() {
   Printf("ThreadSanitizer: Matched %d suppressions (pid=%d):\n", hit_count,
          (int)internal_getpid());
   for (uptr i = 0; i < matched.size(); i++) {
-    Printf("%d %s:%s\n", matched[i]->hit_count, matched[i]->type,
-           matched[i]->templ);
+    Printf("%d %s:%s\n", atomic_load_relaxed(&matched[i]->hit_count),
+           matched[i]->type, matched[i]->templ);
   }
 }
 }  // namespace __tsan

From owner-svn-src-projects@freebsd.org  Sun Feb 21 21:51:06 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B09D1AB0A87
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 21 Feb 2016 21:51:06 +0000 (UTC)
 (envelope-from bjkfbsd@gmail.com)
Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com
 [IPv6:2a00:1450:400c:c09::231])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D5E219EE;
 Sun, 21 Feb 2016 21:51:06 +0000 (UTC)
 (envelope-from bjkfbsd@gmail.com)
Received: by mail-wm0-x231.google.com with SMTP id b205so132641923wmb.1;
 Sun, 21 Feb 2016 13:51:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=TAoTHFFK83YxMNozzPtP32Lyx5KKEJEGoNf/i53f5Eo=;
 b=u8MUE9hqy4abMqL6s7kUfQBTzKGWNLfdrvtuhFY+anev4ynBmnfjc61rbUp1BHllTW
 Mvkh2vtUYS+j9QlUyCw9JXj/g/38MbynJfmjnvVtDmBFVBtUYYwqe2bfQTIFZ92214jT
 vzwa2owaWBqyvw9du3Mx2e/f9Wt5nnJYN50oR8/LkIkLPA4cQqGs71egU5SA4QP+aRR/
 xJkUQWTu4/Ju9ZpnAqI8i5eNrtfByI7ReZpWenUAUllG1ZdNPKvkuVWPGM5/ZUh6UyVq
 DRgwjpLVaxe0aiTEOjbBRWhAov5Nce/pas58uOcg1n2Dq86mnqhVLButAo66rgL7L6Bk
 2vKA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:in-reply-to:references:date
 :message-id:subject:from:to:cc:content-type;
 bh=TAoTHFFK83YxMNozzPtP32Lyx5KKEJEGoNf/i53f5Eo=;
 b=LIbv8BpVgRzVMDeB9ZB40t/Cf00eVK1hE3jHdxNJolRXXVFOnKrcwTEdggAo6Nmwg7
 ZtRvcTDawzqJUb11bVoxEwCrzPp8uEMK5Na3BHz+Q2BArm3zIsj7DyaBoBp+4nDx6NCf
 80ViUpHPgozoxUMfllY9Hat1jcR4DXduXayQaRcLehN+MMIm9yGwaV6jFbNZzPus4Riz
 znbDRruc9cPoHxzxiMFKMq+5wFBb20xYOmlLzwAyv/mxkS+2QQsj+RyBL/a7X2WjlFqI
 0p8Yeb7wzNSdT0AiCC3KxIoDiiWwH9Sg3Jots8t9bkS4rqaZANiYbGdOHmFbVG980a0I
 ULFA==
X-Gm-Message-State: AG10YOQryKVHPB7RtFJ7DYHWfgtHtLbXvOS3QuCLyr/l8c9k8J/mkZd4rd1nC47kzR0A5Kwa1e24qtdbwXmUGA==
MIME-Version: 1.0
X-Received: by 10.28.88.81 with SMTP id m78mr9172395wmb.58.1456091463955; Sun,
 21 Feb 2016 13:51:03 -0800 (PST)
Received: by 10.27.170.11 with HTTP; Sun, 21 Feb 2016 13:51:03 -0800 (PST)
In-Reply-To: <1456066063.1294.40.camel@freebsd.org>
References: <201602191637.u1JGb6lm055074@repo.freebsd.org>
 <1456066063.1294.40.camel@freebsd.org>
Date: Sun, 21 Feb 2016 15:51:03 -0600
Message-ID: <CAJ5_RoCoJt8kbWvwvpPMYCDzM56qJjzrm54a=EfwesT-1fdz2A@mail.gmail.com>
Subject: Re: svn commit: r295812 - projects/mips64-clang/sys/mips/rmi
From: Benjamin Kaduk <bjkfbsd@gmail.com>
To: Ian Lepore <ian@freebsd.org>
Cc: Sean Bruno <sbruno@freebsd.org>, 
 "src-committers@freebsd.org" <src-committers@freebsd.org>,
 svn-src-projects@freebsd.org
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 21:51:06 -0000

On Sun, Feb 21, 2016 at 8:47 AM, Ian Lepore <ian@freebsd.org> wrote:

> On Fri, 2016-02-19 at 16:37 +0000, Sean Bruno wrote:
> > Author: sbruno
> > Date: Fri Feb 19 16:37:06 2016
> > New Revision: 295812
> > URL: https://svnweb.freebsd.org/changeset/base/295812
> >
> > Log:
> >   Change a static const string to a #define as the strcpy() throws a
> >   warn/error with clang.
> >
> >   /home/sbruno/mips64-clang/sys/mips/rmi/xls_ehci.c:133:25: error:
> >   format string is not a string literal (potentially insecure)
> >       [-Werror,-Wformat-security]
> >           sprintf(sc->sc_vendor, xlr_vendor_desc);
> >
> > Modified:
> >   projects/mips64-clang/sys/mips/rmi/xls_ehci.c
> >
> > Modified: projects/mips64-clang/sys/mips/rmi/xls_ehci.c
> > =====================================================================
> > =========
> > --- projects/mips64-clang/sys/mips/rmi/xls_ehci.c     Fri Feb 19
> > 15:53:08 2016 (r295811)
> > +++ projects/mips64-clang/sys/mips/rmi/xls_ehci.c     Fri Feb 19
> > 16:37:06 2016 (r295812)
> > @@ -73,7 +73,7 @@ static device_attach_t ehci_xls_attach;
> >  static device_detach_t ehci_xls_detach;
> >
> >  static const char *xlr_usb_dev_desc = "RMI XLR USB 2.0 controller";
> > -static const char *xlr_vendor_desc = "RMI Corp";
> > +#define XLR_VENDOR_DESC "RMI Corp";
> >
> >  static int
> >  ehci_xls_probe(device_t self)
> > @@ -130,7 +130,7 @@ ehci_xls_attach(device_t self)
> >       device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
> >       device_set_desc(sc->sc_bus.bdev, xlr_usb_dev_desc);
> >
> > -     sprintf(sc->sc_vendor, xlr_vendor_desc);
> > +     sprintf(sc->sc_vendor, XLR_VENDOR_DESC);
> >
> >       err = bus_setup_intr(self, sc->sc_irq_res,
> >           INTR_TYPE_BIO | INTR_MPSAFE, NULL,
> >
>
> Bah.  The compiler should understand that a static const char* is
> equivelent to a string literal for the purposes of this warning.
>
>
Is it?  The compiler would need to check that nothing else in the file
writes to xlr_vendor_desc before making that conclusion; on the other hand,
if it was char const * const, then that alone would suffice.


> That said, a sprintf() is just a strange spelling of strlcpy() here.
>

Almost.  sprintf() is not as good about length checking as strlcpy(), which
is a much better option here, as you note.

-Ben


>
> -- Ian
>
> _______________________________________________
> svn-src-projects@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-projects
> To unsubscribe, send any mail to "svn-src-projects-unsubscribe@freebsd.org
> "
>

From owner-svn-src-projects@freebsd.org  Mon Feb 22 05:54:32 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3FF8AB00B9
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 22 Feb 2016 05:54:32 +0000 (UTC)
 (envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
 [211.29.132.53])
 by mx1.freebsd.org (Postfix) with ESMTP id 727841CB5;
 Mon, 22 Feb 2016 05:54:31 +0000 (UTC)
 (envelope-from brde@optusnet.com.au)
Received: from c110-21-41-193.carlnfd1.nsw.optusnet.com.au
 (c110-21-41-193.carlnfd1.nsw.optusnet.com.au [110.21.41.193])
 by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id DCAC1D411CA;
 Mon, 22 Feb 2016 16:54:22 +1100 (AEDT)
Date: Mon, 22 Feb 2016 16:54:22 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Benjamin Kaduk <bjkfbsd@gmail.com>
cc: Ian Lepore <ian@freebsd.org>, Sean Bruno <sbruno@freebsd.org>, 
 "src-committers@freebsd.org" <src-committers@freebsd.org>, 
 svn-src-projects@freebsd.org
Subject: Re: svn commit: r295812 - projects/mips64-clang/sys/mips/rmi
In-Reply-To: <CAJ5_RoCoJt8kbWvwvpPMYCDzM56qJjzrm54a=EfwesT-1fdz2A@mail.gmail.com>
Message-ID: <20160222161248.D887@besplex.bde.org>
References: <201602191637.u1JGb6lm055074@repo.freebsd.org>
 <1456066063.1294.40.camel@freebsd.org>
 <CAJ5_RoCoJt8kbWvwvpPMYCDzM56qJjzrm54a=EfwesT-1fdz2A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=c+ZWOkJl c=1 sm=1 tr=0
 a=73JWPhLeruqQCjN69UNZtQ==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10
 a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8
 a=1REqiezkkBiWeNa2-VYA:9 a=pLwsbZb7xwTSAXTh:21 a=GljBxjIjHKsoKkwG:21
 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2016 05:54:32 -0000

On Sun, 21 Feb 2016, Benjamin Kaduk wrote:

> On Sun, Feb 21, 2016 at 8:47 AM, Ian Lepore <ian@freebsd.org> wrote:
>
>> On Fri, 2016-02-19 at 16:37 +0000, Sean Bruno wrote:
>>> ...
>>> Log:
>>>   Change a static const string to a #define as the strcpy() throws a
>>>   warn/error with clang.
>>
>>>   /home/sbruno/mips64-clang/sys/mips/rmi/xls_ehci.c:133:25: error:
>>>   format string is not a string literal (potentially insecure)
>>>       [-Werror,-Wformat-security]
>>>           sprintf(sc->sc_vendor, xlr_vendor_desc);
>>>
>>> Modified:
>>>   projects/mips64-clang/sys/mips/rmi/xls_ehci.c
>>>
>>> Modified: projects/mips64-clang/sys/mips/rmi/xls_ehci.c
>>> =====================================================================
>>> =========
>>> --- projects/mips64-clang/sys/mips/rmi/xls_ehci.c     Fri Feb 19
>>> 15:53:08 2016 (r295811)
>>> +++ projects/mips64-clang/sys/mips/rmi/xls_ehci.c     Fri Feb 19
>>> 16:37:06 2016 (r295812)
>>> @@ -73,7 +73,7 @@ static device_attach_t ehci_xls_attach;
>>>  static device_detach_t ehci_xls_detach;
>>>
>>>  static const char *xlr_usb_dev_desc = "RMI XLR USB 2.0 controller";
>>> -static const char *xlr_vendor_desc = "RMI Corp";
>>> +#define XLR_VENDOR_DESC "RMI Corp";
>>>
>>>  static int
>>>  ehci_xls_probe(device_t self)
>>> @@ -130,7 +130,7 @@ ehci_xls_attach(device_t self)
>>>       device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
>>>       device_set_desc(sc->sc_bus.bdev, xlr_usb_dev_desc);
>>>
>>> -     sprintf(sc->sc_vendor, xlr_vendor_desc);
>>> +     sprintf(sc->sc_vendor, XLR_VENDOR_DESC);
>>>
>>>       err = bus_setup_intr(self, sc->sc_irq_res,
>>>           INTR_TYPE_BIO | INTR_MPSAFE, NULL,
>>
>> Bah.  The compiler should understand that a static const char* is
>> equivelent to a string literal for the purposes of this warning.

This warning is another compiler bug (or rather, enabling it is usually
a user error).  Disallowing strings that aren't string literals breaks
message catalogs.

> Is it?  The compiler would need to check that nothing else in the file
> writes to xlr_vendor_desc before making that conclusion; on the other hand,
> if it was char const * const, then that alone would suffice.

That would be of low quality too.  Just char const [] works, and doesn't
require a confusing number of const's and doesn't waste space for a pointer.
The compiler could optimize away the pointer after it does the same checks
needed to see that the pointer is not written too.  It could also see that
the pointer is only read once, so it can be removed.

Since the string literal is only used once (similarly for the nearby
dev_desc), it should probably be written as itself instead of
obfuscating it using a pointer or a macro.  The variable to hold the
string or a pointer to the string might be useful for debugging.
However, the compiler is not prevented from optimizing it away.
Something like volatile or or __used is required for that.  The macro
version ensures that the variable doesn't exist.  The string literal
might also be optimized away by encoding it.  E.g., short string
literals of length <= 7 should probably be copied moves of 32-bit data.

>> That said, a sprintf() is just a strange spelling of strlcpy() here.
>
> Almost.  sprintf() is not as good about length checking as strlcpy(), which
> is a much better option here, as you note.

No, it is a bad spelling of strcpy().  The buffer should be large enough
to hold the string, and this is very easy to arrange with a literal string.
If you write the strcpy() with a string literal (or an array) for the source,
and an array for the target, then the compiler can check that the string
fits.  It should also do that for strlcpy() and snprintf() with "%s", and
emit warnings about bogus use of strlcpy() for strings that are sure to
fit, and about not checking the return value for strings that aren't sure
to fit.  sprintf(9) is declared as __printflike(2, 3) and that is apparently
enough to enable most warnings about the printf() family.  strcpy(9) and
strlcpy(9) are declared without any attributes, so any compiler checking
of them would be a bug.  I don't know of any attributes for them.

Bruce

From owner-svn-src-projects@freebsd.org  Mon Feb 22 12:28:29 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2311AB0FDC
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 22 Feb 2016 12:28:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5AD8A121C;
 Mon, 22 Feb 2016 12:28:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1MCSSfh048408;
 Mon, 22 Feb 2016 12:28:28 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1MCSNeT048362;
 Mon, 22 Feb 2016 12:28:23 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602221228.u1MCSNeT048362@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 22 Feb 2016 12:28:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295886 - in projects/release-pkg: bin/dd bin/sh
 bin/sh/tests/parser cddl/contrib/opensolaris/cmd/zfs
 cddl/contrib/opensolaris/cmd/zpool contrib/binutils/bfd lib/libc/gen
 lib/libc/sys l...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2016 12:28:29 -0000

Author: gjb
Date: Mon Feb 22 12:28:23 2016
New Revision: 295886
URL: https://svnweb.freebsd.org/changeset/base/295886

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/bin/dd/ref.obs_zeroes
     - copied unchanged from r295885, head/bin/dd/ref.obs_zeroes
  projects/release-pkg/bin/sh/tests/parser/comment1.0
     - copied unchanged from r295885, head/bin/sh/tests/parser/comment1.0
  projects/release-pkg/bin/sh/tests/parser/comment2.42
     - copied unchanged from r295885, head/bin/sh/tests/parser/comment2.42
  projects/release-pkg/bin/sh/tests/parser/nul1.0
     - copied unchanged from r295885, head/bin/sh/tests/parser/nul1.0
  projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c
     - copied unchanged from r295885, head/sys/arm/arm/busdma_machdep-v4.c
  projects/release-pkg/sys/arm/arm/pmap-v4.c
     - copied unchanged from r295885, head/sys/arm/arm/pmap-v4.c
  projects/release-pkg/sys/arm/arm/trap-v4.c
     - copied unchanged from r295885, head/sys/arm/arm/trap-v4.c
  projects/release-pkg/sys/arm/include/pmap-v4.h
     - copied unchanged from r295885, head/sys/arm/include/pmap-v4.h
  projects/release-pkg/sys/arm/include/pte-v4.h
     - copied unchanged from r295885, head/sys/arm/include/pte-v4.h
Replaced:
  projects/release-pkg/sys/arm/include/pmap.h
     - copied unchanged from r295885, head/sys/arm/include/pmap.h
Deleted:
  projects/release-pkg/sys/arm/arm/busdma_machdep.c
  projects/release-pkg/sys/arm/arm/pmap.c
  projects/release-pkg/sys/arm/arm/trap.c
  projects/release-pkg/sys/arm/include/pte.h
Modified:
  projects/release-pkg/bin/dd/Makefile
  projects/release-pkg/bin/dd/args.c
  projects/release-pkg/bin/dd/dd.c
  projects/release-pkg/bin/dd/dd.h
  projects/release-pkg/bin/dd/gen.c
  projects/release-pkg/bin/sh/alias.c
  projects/release-pkg/bin/sh/input.c
  projects/release-pkg/bin/sh/parser.c
  projects/release-pkg/bin/sh/tests/parser/Makefile
  projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/release-pkg/contrib/binutils/bfd/elf32-arm.c
  projects/release-pkg/lib/libc/gen/directory.3
  projects/release-pkg/lib/libc/sys/lseek.2
  projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
  projects/release-pkg/lib/libc/tests/sys/Makefile
  projects/release-pkg/lib/libkvm/kvm_arm.c
  projects/release-pkg/lib/libkvm/kvm_arm.h
  projects/release-pkg/lib/libvmmapi/vmmapi.c
  projects/release-pkg/sbin/ifconfig/ifclone.c
  projects/release-pkg/sbin/ifconfig/ifconfig.c
  projects/release-pkg/sbin/ifconfig/ifconfig.h
  projects/release-pkg/share/man/man4/geom_uncompress.4
  projects/release-pkg/share/man/man5/mailer.conf.5
  projects/release-pkg/share/man/man9/bios.9
  projects/release-pkg/share/mk/bsd.dep.mk
  projects/release-pkg/share/mk/local.meta.sys.mk
  projects/release-pkg/sys/amd64/amd64/minidump_machdep.c
  projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/release-pkg/sys/amd64/vmm/amd/npt.c
  projects/release-pkg/sys/amd64/vmm/amd/svm.c
  projects/release-pkg/sys/amd64/vmm/vmm.c
  projects/release-pkg/sys/arm/allwinner/a20/std.a20
  projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c
  projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h
  projects/release-pkg/sys/arm/allwinner/std.a10
  projects/release-pkg/sys/arm/altera/socfpga/std.socfpga
  projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726
  projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c
  projects/release-pkg/sys/arm/annapurna/alpine/std.alpine
  projects/release-pkg/sys/arm/arm/debug_monitor.c
  projects/release-pkg/sys/arm/arm/elf_trampoline.c
  projects/release-pkg/sys/arm/arm/genassym.c
  projects/release-pkg/sys/arm/arm/locore-v4.S
  projects/release-pkg/sys/arm/arm/locore-v6.S
  projects/release-pkg/sys/arm/arm/mp_machdep.c
  projects/release-pkg/sys/arm/arm/nexus.c
  projects/release-pkg/sys/arm/arm/pmap-v6.c
  projects/release-pkg/sys/arm/arm/trap-v6.c
  projects/release-pkg/sys/arm/at91/at91.c
  projects/release-pkg/sys/arm/at91/at91_pinctrl.c
  projects/release-pkg/sys/arm/broadcom/bcm2835/std.bcm2836
  projects/release-pkg/sys/arm/cavium/cns11xx/econa.c
  projects/release-pkg/sys/arm/conf/std.armv6
  projects/release-pkg/sys/arm/freescale/imx/std.imx51
  projects/release-pkg/sys/arm/freescale/imx/std.imx53
  projects/release-pkg/sys/arm/freescale/imx/std.imx6
  projects/release-pkg/sys/arm/freescale/vybrid/std.vybrid
  projects/release-pkg/sys/arm/include/pmap-v6.h
  projects/release-pkg/sys/arm/include/pte-v6.h
  projects/release-pkg/sys/arm/mv/armadaxp/std.armadaxp
  projects/release-pkg/sys/arm/mv/mv_localbus.c
  projects/release-pkg/sys/arm/mv/mv_pci.c
  projects/release-pkg/sys/arm/mv/mvvar.h
  projects/release-pkg/sys/arm/qemu/std.virt
  projects/release-pkg/sys/arm/rockchip/std.rk30xx
  projects/release-pkg/sys/arm/samsung/exynos/std.exynos5250
  projects/release-pkg/sys/arm/samsung/exynos/std.exynos5420
  projects/release-pkg/sys/arm/ti/am335x/std.am335x
  projects/release-pkg/sys/arm/ti/omap4/std.omap4
  projects/release-pkg/sys/arm/xilinx/std.zynq7
  projects/release-pkg/sys/arm64/arm64/debug_monitor.c
  projects/release-pkg/sys/arm64/arm64/gic_fdt.c
  projects/release-pkg/sys/arm64/arm64/gic_v3_fdt.c
  projects/release-pkg/sys/arm64/arm64/gic_v3_its.c
  projects/release-pkg/sys/arm64/arm64/minidump_machdep.c
  projects/release-pkg/sys/arm64/arm64/nexus.c
  projects/release-pkg/sys/arm64/arm64/trap.c
  projects/release-pkg/sys/arm64/cavium/thunder_pcie.c
  projects/release-pkg/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/release-pkg/sys/arm64/cavium/thunder_pcie_pem.c
  projects/release-pkg/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  projects/release-pkg/sys/boot/efi/boot1/Makefile
  projects/release-pkg/sys/boot/efi/include/efilib.h
  projects/release-pkg/sys/boot/efi/libefi/time.c
  projects/release-pkg/sys/boot/efi/loader/arch/arm64/exec.c
  projects/release-pkg/sys/boot/i386/boot2/Makefile
  projects/release-pkg/sys/boot/i386/pxeldr/Makefile
  projects/release-pkg/sys/boot/i386/zfsboot/Makefile
  projects/release-pkg/sys/cam/scsi/scsi_da.c
  projects/release-pkg/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
  projects/release-pkg/sys/cddl/dev/dtrace/arm/dtrace_isa.c
  projects/release-pkg/sys/cddl/dev/dtrace/mips/dtrace_isa.c
  projects/release-pkg/sys/compat/linprocfs/linprocfs.c
  projects/release-pkg/sys/compat/linux/linux_util.h
  projects/release-pkg/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  projects/release-pkg/sys/compat/linuxkpi/common/include/linux/list.h
  projects/release-pkg/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/release-pkg/sys/compat/linuxkpi/common/src/linux_pci.c
  projects/release-pkg/sys/compat/svr4/svr4_misc.c
  projects/release-pkg/sys/compat/svr4/svr4_util.h
  projects/release-pkg/sys/compat/x86bios/x86bios.c
  projects/release-pkg/sys/conf/files.arm
  projects/release-pkg/sys/conf/kern.mk
  projects/release-pkg/sys/conf/kern.post.mk
  projects/release-pkg/sys/conf/options
  projects/release-pkg/sys/contrib/x86emu/x86emu.c
  projects/release-pkg/sys/dev/acpica/acpi.c
  projects/release-pkg/sys/dev/acpica/acpi_hpet.c
  projects/release-pkg/sys/dev/acpica/acpi_package.c
  projects/release-pkg/sys/dev/acpica/acpivar.h
  projects/release-pkg/sys/dev/age/if_age.c
  projects/release-pkg/sys/dev/alc/if_alc.c
  projects/release-pkg/sys/dev/ale/if_ale.c
  projects/release-pkg/sys/dev/altera/avgen/altera_avgen.c
  projects/release-pkg/sys/dev/altera/avgen/altera_avgen_fdt.c
  projects/release-pkg/sys/dev/altera/avgen/altera_avgen_nexus.c
  projects/release-pkg/sys/dev/arcmsr/arcmsr.c
  projects/release-pkg/sys/dev/bxe/bxe.c
  projects/release-pkg/sys/dev/bxe/bxe.h
  projects/release-pkg/sys/dev/bxe/bxe_stats.c
  projects/release-pkg/sys/dev/bxe/ecore_init.h
  projects/release-pkg/sys/dev/ce/if_ce.c
  projects/release-pkg/sys/dev/cp/if_cp.c
  projects/release-pkg/sys/dev/cxgbe/adapter.h
  projects/release-pkg/sys/dev/cxgbe/common/common.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_hw.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_msg.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_regs.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_regs_values.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_tcb.h
  projects/release-pkg/sys/dev/cxgbe/tom/t4_connect.c
  projects/release-pkg/sys/dev/cy/cy_isa.c
  projects/release-pkg/sys/dev/cy/cy_pci.c
  projects/release-pkg/sys/dev/drm/drmP.h
  projects/release-pkg/sys/dev/drm2/drmP.h
  projects/release-pkg/sys/dev/ed/if_ed_pccard.c
  projects/release-pkg/sys/dev/eisa/eisaconf.c
  projects/release-pkg/sys/dev/fb/machfb.c
  projects/release-pkg/sys/dev/fb/s3_pci.c
  projects/release-pkg/sys/dev/fdc/fdc_pccard.c
  projects/release-pkg/sys/dev/fdt/simplebus.c
  projects/release-pkg/sys/dev/firewire/sbp_targ.c
  projects/release-pkg/sys/dev/gpio/gpiobus.c
  projects/release-pkg/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/release-pkg/sys/dev/hptiop/hptiop.c
  projects/release-pkg/sys/dev/hptmv/entry.c
  projects/release-pkg/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/release-pkg/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/release-pkg/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/release-pkg/sys/dev/isci/isci.c
  projects/release-pkg/sys/dev/isci/isci_oem_parameters.c
  projects/release-pkg/sys/dev/iwn/if_iwn.c
  projects/release-pkg/sys/dev/ixgb/if_ixgb.c
  projects/release-pkg/sys/dev/ixl/if_ixl.c
  projects/release-pkg/sys/dev/ixl/ixl_txrx.c
  projects/release-pkg/sys/dev/jme/if_jme.c
  projects/release-pkg/sys/dev/lmc/if_lmc.c
  projects/release-pkg/sys/dev/mca/mca_bus.c
  projects/release-pkg/sys/dev/mrsas/mrsas.c
  projects/release-pkg/sys/dev/msk/if_msk.c
  projects/release-pkg/sys/dev/mxge/if_mxge.c
  projects/release-pkg/sys/dev/ntb/if_ntb/if_ntb.c
  projects/release-pkg/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c
  projects/release-pkg/sys/dev/ofw/ofw_subr.c
  projects/release-pkg/sys/dev/ofw/ofwbus.c
  projects/release-pkg/sys/dev/pccard/pccard.c
  projects/release-pkg/sys/dev/pci/pci_user.c
  projects/release-pkg/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  projects/release-pkg/sys/dev/pms/freebsd/driver/ini/src/osapi.c
  projects/release-pkg/sys/dev/qlxgb/qla_hw.c
  projects/release-pkg/sys/dev/quicc/quicc_core.c
  projects/release-pkg/sys/dev/rl/if_rl.c
  projects/release-pkg/sys/dev/rt/if_rt.c
  projects/release-pkg/sys/dev/rtwn/if_rtwn.c
  projects/release-pkg/sys/dev/siba/siba.c
  projects/release-pkg/sys/dev/siba/siba_pcib.c
  projects/release-pkg/sys/dev/sk/if_sk.c
  projects/release-pkg/sys/dev/sound/pci/envy24.c
  projects/release-pkg/sys/dev/sound/pci/envy24ht.c
  projects/release-pkg/sys/dev/sound/pci/hdspe.c
  projects/release-pkg/sys/dev/sound/pci/vibes.c
  projects/release-pkg/sys/dev/stge/if_stge.c
  projects/release-pkg/sys/dev/twa/tw_osl_freebsd.c
  projects/release-pkg/sys/dev/tws/tws.c
  projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c
  projects/release-pkg/sys/dev/usb/wlan/if_urtwnreg.h
  projects/release-pkg/sys/dev/usb/wlan/if_urtwnvar.h
  projects/release-pkg/sys/dev/vnic/mrml_bridge.c
  projects/release-pkg/sys/dev/vt/hw/efifb/efifb.c
  projects/release-pkg/sys/dev/vte/if_vte.c
  projects/release-pkg/sys/fs/ext2fs/ext2_vnops.c
  projects/release-pkg/sys/i386/bios/mca_machdep.c
  projects/release-pkg/sys/i386/i386/machdep.c
  projects/release-pkg/sys/i386/pci/pci_cfgreg.c
  projects/release-pkg/sys/isa/isa_common.c
  projects/release-pkg/sys/isa/vga_isa.c
  projects/release-pkg/sys/kern/bus_if.m
  projects/release-pkg/sys/kern/kern_environment.c
  projects/release-pkg/sys/kern/kern_event.c
  projects/release-pkg/sys/kern/subr_bus.c
  projects/release-pkg/sys/mips/adm5120/admpci.c
  projects/release-pkg/sys/mips/adm5120/obio.c
  projects/release-pkg/sys/mips/alchemy/obio.c
  projects/release-pkg/sys/mips/atheros/apb.c
  projects/release-pkg/sys/mips/atheros/ar71xx_fixup.c
  projects/release-pkg/sys/mips/atheros/ar71xx_pci.c
  projects/release-pkg/sys/mips/atheros/ar71xx_spi.c
  projects/release-pkg/sys/mips/atheros/ar724x_pci.c
  projects/release-pkg/sys/mips/atheros/if_arge.c
  projects/release-pkg/sys/mips/atheros/qca955x_pci.c
  projects/release-pkg/sys/mips/beri/beri_simplebus.c
  projects/release-pkg/sys/mips/cavium/cvmx_config.h
  projects/release-pkg/sys/mips/cavium/octopci.c
  projects/release-pkg/sys/mips/idt/idtpci.c
  projects/release-pkg/sys/mips/idt/obio.c
  projects/release-pkg/sys/mips/malta/gt_pci.c
  projects/release-pkg/sys/mips/mips/minidump_machdep.c
  projects/release-pkg/sys/mips/mips/nexus.c
  projects/release-pkg/sys/mips/mips/stack_machdep.c
  projects/release-pkg/sys/mips/nlm/cms.c
  projects/release-pkg/sys/mips/nlm/dev/net/xlpge.c
  projects/release-pkg/sys/mips/nlm/xlp_simplebus.c
  projects/release-pkg/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/release-pkg/sys/mips/rmi/fmn.c
  projects/release-pkg/sys/mips/rmi/iodi.c
  projects/release-pkg/sys/mips/rt305x/obio.c
  projects/release-pkg/sys/mips/rt305x/rt305x_pci.c
  projects/release-pkg/sys/mips/sibyte/ata_zbbus.c
  projects/release-pkg/sys/mips/sibyte/sb_zbbus.c
  projects/release-pkg/sys/mips/sibyte/sb_zbpci.c
  projects/release-pkg/sys/modules/usb/Makefile
  projects/release-pkg/sys/modules/usb/urtwn/Makefile
  projects/release-pkg/sys/net/if_lagg.c
  projects/release-pkg/sys/net80211/ieee80211.h
  projects/release-pkg/sys/net80211/ieee80211_adhoc.c
  projects/release-pkg/sys/net80211/ieee80211_hostap.c
  projects/release-pkg/sys/net80211/ieee80211_mesh.c
  projects/release-pkg/sys/net80211/ieee80211_proto.c
  projects/release-pkg/sys/net80211/ieee80211_sta.c
  projects/release-pkg/sys/net80211/ieee80211_wds.c
  projects/release-pkg/sys/netinet/sctp_input.c
  projects/release-pkg/sys/netinet/sctp_output.c
  projects/release-pkg/sys/netinet/sctp_pcb.c
  projects/release-pkg/sys/netinet/tcp_lro.c
  projects/release-pkg/sys/netinet/tcp_lro.h
  projects/release-pkg/sys/netinet6/sctp6_usrreq.c
  projects/release-pkg/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/release-pkg/sys/netpfil/pf/pf.c
  projects/release-pkg/sys/powerpc/aim/slb.c
  projects/release-pkg/sys/powerpc/mpc85xx/isa.c
  projects/release-pkg/sys/powerpc/ofw/ofw_real.c
  projects/release-pkg/sys/powerpc/ofw/rtas.c
  projects/release-pkg/sys/powerpc/powermac/macgpio.c
  projects/release-pkg/sys/powerpc/powermac/macio.c
  projects/release-pkg/sys/powerpc/powermac/platform_powermac.c
  projects/release-pkg/sys/powerpc/powerpc/genassym.c
  projects/release-pkg/sys/powerpc/powerpc/nexus.c
  projects/release-pkg/sys/powerpc/powerpc/trap.c
  projects/release-pkg/sys/powerpc/ps3/if_glc.c
  projects/release-pkg/sys/powerpc/ps3/platform_ps3.c
  projects/release-pkg/sys/powerpc/ps3/ps3_syscons.c
  projects/release-pkg/sys/powerpc/ps3/ps3bus.c
  projects/release-pkg/sys/powerpc/ps3/ps3cdrom.c
  projects/release-pkg/sys/powerpc/ps3/ps3disk.c
  projects/release-pkg/sys/powerpc/pseries/platform_chrp.c
  projects/release-pkg/sys/powerpc/psim/iobus.c
  projects/release-pkg/sys/riscv/include/vmparam.h
  projects/release-pkg/sys/riscv/riscv/genassym.c
  projects/release-pkg/sys/riscv/riscv/locore.S
  projects/release-pkg/sys/riscv/riscv/minidump_machdep.c
  projects/release-pkg/sys/riscv/riscv/nexus.c
  projects/release-pkg/sys/riscv/riscv/pmap.c
  projects/release-pkg/sys/riscv/riscv/trap.c
  projects/release-pkg/sys/sparc64/central/central.c
  projects/release-pkg/sys/sparc64/ebus/ebus.c
  projects/release-pkg/sys/sparc64/fhc/fhc.c
  projects/release-pkg/sys/sparc64/isa/isa.c
  projects/release-pkg/sys/sparc64/pci/apb.c
  projects/release-pkg/sys/sparc64/pci/fire.c
  projects/release-pkg/sys/sparc64/sbus/sbus.c
  projects/release-pkg/sys/sparc64/sparc64/iommu.c
  projects/release-pkg/sys/sparc64/sparc64/nexus.c
  projects/release-pkg/sys/sparc64/sparc64/tlb.c
  projects/release-pkg/sys/sparc64/sparc64/upa.c
  projects/release-pkg/sys/sys/bus.h
  projects/release-pkg/sys/sys/param.h
  projects/release-pkg/sys/sys/rman.h
  projects/release-pkg/sys/x86/acpica/acpi_wakeup.c
  projects/release-pkg/sys/x86/iommu/intel_drv.c
  projects/release-pkg/sys/x86/isa/isa.c
  projects/release-pkg/sys/x86/x86/nexus.c
  projects/release-pkg/tests/sys/kqueue/read.c
  projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
  projects/release-pkg/usr.bin/cap_mkdb/cap_mkdb.c
  projects/release-pkg/usr.bin/clang/llvm-ar/Makefile.depend
  projects/release-pkg/usr.sbin/config/config.5
  projects/release-pkg/usr.sbin/iostat/Makefile
  projects/release-pkg/usr.sbin/iostat/iostat.c
  projects/release-pkg/usr.sbin/pciconf/Makefile
  projects/release-pkg/usr.sbin/pciconf/cap.c
  projects/release-pkg/usr.sbin/pciconf/pciconf.c
  projects/release-pkg/usr.sbin/rtsold/rtsold.c
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/cddl/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/release-pkg/contrib/binutils/   (props changed)
  projects/release-pkg/lib/libc/   (props changed)
  projects/release-pkg/lib/libvmmapi/   (props changed)
  projects/release-pkg/sbin/   (props changed)
  projects/release-pkg/share/   (props changed)
  projects/release-pkg/share/man/man4/   (props changed)
  projects/release-pkg/sys/   (props changed)
  projects/release-pkg/sys/amd64/vmm/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/sys/contrib/x86emu/   (props changed)
  projects/release-pkg/sys/dev/hyperv/   (props changed)
  projects/release-pkg/usr.sbin/rtsold/   (props changed)

Modified: projects/release-pkg/bin/dd/Makefile
==============================================================================
--- projects/release-pkg/bin/dd/Makefile	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/dd/Makefile	Mon Feb 22 12:28:23 2016	(r295886)
@@ -25,7 +25,18 @@ test: ${PROG} gen
 	    LC_ALL=en_US.US-ASCII hexdump -C | \
 	    diff -I FreeBSD - ${.CURDIR}/ref.${conv}
 .endfor
-	@rm -f gen
+	@${ECHO} "testing sparse file (obs zeroes)"
+	@./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null
+	@hexdump -C obs_zeroes | diff -I FreeBSD - ${.CURDIR}/ref.obs_zeroes
+
+	@${ECHO} "testing spase file (all zeroes)"
+	@./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null
+	@./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null
+	@diff 1M_zeroes 1M_zeroes.1
+	@diff 1M_zeroes 1M_zeroes.2
+
+	@rm -f gen 1M_zeroes* obs_zeroes
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

Modified: projects/release-pkg/bin/dd/args.c
==============================================================================
--- projects/release-pkg/bin/dd/args.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/dd/args.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -422,11 +422,10 @@ get_num(const char *val)
 
 	errno = 0;
 	num = strtoumax(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
 	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
 
 	mult = postfix_to_mult(*expr);
 
@@ -472,11 +471,10 @@ get_off_t(const char *val)
 
 	errno = 0;
 	num = strtoimax(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
 	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
 
 	mult = postfix_to_mult(*expr);
 

Modified: projects/release-pkg/bin/dd/dd.c
==============================================================================
--- projects/release-pkg/bin/dd/dd.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/dd/dd.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -77,7 +77,6 @@ STAT	st;			/* statistics */
 void	(*cfunc)(void);		/* conversion function */
 uintmax_t cpy_cnt;		/* # of blocks to copy */
 static off_t	pending = 0;	/* pending seek if sparse */
-static off_t	last_sp = 0;	/* size of last added sparse block */
 u_int	ddflags = 0;		/* conversion options */
 size_t	cbsz;			/* conversion block size */
 uintmax_t files_cnt = 1;	/* # of files to copy */
@@ -409,6 +408,15 @@ dd_close(void)
 	}
 	if (out.dbcnt || pending)
 		dd_out(1);
+
+	/*
+	 * If the file ends with a hole, ftruncate it to extend its size
+	 * up to the end of the hole (without having to write any data).
+	 */
+	if (out.seek_offset > 0 && (out.flags & ISTRUNC)) {
+		if (ftruncate(out.fd, out.seek_offset) == -1)
+			err(1, "truncating %s", out.name);
+	}
 }
 
 void
@@ -457,29 +465,27 @@ dd_out(int force)
 			}
 			if (sparse && !force) {
 				pending += cnt;
-				last_sp = cnt;
 				nw = cnt;
 			} else {
 				if (pending != 0) {
-					/* If forced to write, and we have no
-					 * data left, we need to write the last
-					 * sparse block explicitly.
+					/*
+					 * Seek past hole.  Note that we need to record the
+					 * reached offset, because we might have no more data
+					 * to write, in which case we'll need to call
+					 * ftruncate to extend the file size.
 					 */
-					if (force && cnt == 0) {
-						pending -= last_sp;
-						assert(outp == out.db);
-						memset(outp, 0, cnt);
-					}
-					if (lseek(out.fd, pending, SEEK_CUR) ==
-					    -1)
+					out.seek_offset = lseek(out.fd, pending, SEEK_CUR);
+					if (out.seek_offset == -1)
 						err(2, "%s: seek error creating sparse file",
 						    out.name);
-					pending = last_sp = 0;
+					pending = 0;
 				}
-				if (cnt)
+				if (cnt) {
 					nw = write(out.fd, outp, cnt);
-				else
+					out.seek_offset = 0;
+				} else {
 					return;
+				}
 			}
 
 			if (nw <= 0) {

Modified: projects/release-pkg/bin/dd/dd.h
==============================================================================
--- projects/release-pkg/bin/dd/dd.h	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/dd/dd.h	Mon Feb 22 12:28:23 2016	(r295886)
@@ -54,6 +54,7 @@ typedef struct {
 	const char	*name;		/* name */
 	int		fd;		/* file descriptor */
 	off_t		offset;		/* # of blocks to skip */
+	off_t		seek_offset;	/* offset of last seek past output hole */
 } IO;
 
 typedef struct {

Modified: projects/release-pkg/bin/dd/gen.c
==============================================================================
--- projects/release-pkg/bin/dd/gen.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/dd/gen.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -5,13 +5,20 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 int
-main(int argc __unused, char **argv __unused)
+main(int argc, char **argv)
 {
 	int i;
 
-	for (i = 0; i < 256; i++)
-		putchar(i);
+	if (argc > 1 && !strcmp(argv[1], "189284")) {
+		fputs("ABCDEFGH", stdout);
+		for (i = 0; i < 8; i++)
+			putchar(0);
+	} else {
+		for (i = 0; i < 256; i++)
+			putchar(i);
+	}
 	return (0);
 }

Copied: projects/release-pkg/bin/dd/ref.obs_zeroes (from r295885, head/bin/dd/ref.obs_zeroes)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/dd/ref.obs_zeroes	Mon Feb 22 12:28:23 2016	(r295886, copy of r295885, head/bin/dd/ref.obs_zeroes)
@@ -0,0 +1,3 @@
+$FreeBSD$
+00000000  41 42 43 44 45 46 47 48  00 00 00 00 00 00 00 00  |ABCDEFGH........|
+00000010

Modified: projects/release-pkg/bin/sh/alias.c
==============================================================================
--- projects/release-pkg/bin/sh/alias.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/sh/alias.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -144,9 +144,11 @@ rmaliases(void)
 struct alias *
 lookupalias(const char *name, int check)
 {
-	struct alias *ap = *hashalias(name);
+	struct alias *ap;
 
-	for (; ap; ap = ap->next) {
+	if (aliases == 0)
+		return (NULL);
+	for (ap = *hashalias(name); ap; ap = ap->next) {
 		if (equal(name, ap->name)) {
 			if (check && (ap->flag & ALIASINUSE))
 				return (NULL);

Modified: projects/release-pkg/bin/sh/input.c
==============================================================================
--- projects/release-pkg/bin/sh/input.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/sh/input.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -195,8 +195,7 @@ retry:
 int
 preadbuffer(void)
 {
-	char *p, *q;
-	int more;
+	char *p, *q, *r, *end;
 	char savec;
 
 	while (parsefile->strpush) {
@@ -213,8 +212,6 @@ preadbuffer(void)
 	}
 	if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
 		return PEOF;
-	flushout(&output);
-	flushout(&errout);
 
 again:
 	if (parselleft <= 0) {
@@ -224,34 +221,31 @@ again:
 		}
 	}
 
-	q = p = parsefile->buf + (parsenextc - parsefile->buf);
-
-	/* delete nul characters */
-	for (more = 1; more;) {
-		switch (*p) {
-		case '\0':
-			p++;	/* Skip nul */
-			goto check;
-
-		case '\n':
-			parsenleft = q - parsenextc;
-			more = 0; /* Stop processing here */
-			break;
-
-		default:
-			break;
-		}
-
-		*q++ = *p++;
-check:
-		if (--parselleft <= 0) {
-			parsenleft = q - parsenextc - 1;
-			if (parsenleft < 0)
-				goto again;
-			*q = '\0';
-			more = 0;
+	p = parsefile->buf + (parsenextc - parsefile->buf);
+	end = p + parselleft;
+	*end = '\0';
+	q = strchrnul(p, '\n');
+	if (q != end && *q == '\0') {
+		/* delete nul characters */
+		for (r = q; q != end; q++) {
+			if (*q != '\0')
+				*r++ = *q;
 		}
+		parselleft -= end - r;
+		if (parselleft == 0)
+			goto again;
+		end = p + parselleft;
+		*end = '\0';
+		q = strchrnul(p, '\n');
+	}
+	if (q == end) {
+		parsenleft = parselleft;
+		parselleft = 0;
+	} else /* *q == '\n' */ {
+		parsenleft = q - parsenextc + 1;
+		parselleft -= parsenleft;
 	}
+	parsenleft--;
 
 	savec = *q;
 	*q = '\0';

Modified: projects/release-pkg/bin/sh/parser.c
==============================================================================
--- projects/release-pkg/bin/sh/parser.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/sh/parser.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -1930,6 +1930,8 @@ static void
 setprompt(int which)
 {
 	whichprompt = which;
+	if (which == 0)
+		return;
 
 #ifndef NO_HISTORY
 	if (!el)

Modified: projects/release-pkg/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile	Mon Feb 22 12:28:23 2016	(r295886)
@@ -28,6 +28,8 @@ FILES+=		alias15.0 alias15.0.stdout
 FILES+=		and-pipe-not.0
 FILES+=		case1.0
 FILES+=		case2.0
+FILES+=		comment1.0
+FILES+=		comment2.42
 FILES+=		dollar-quote1.0
 FILES+=		dollar-quote2.0
 FILES+=		dollar-quote3.0
@@ -74,6 +76,7 @@ FILES+=		line-cont10.0
 FILES+=		line-cont11.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
+FILES+=		nul1.0
 FILES+=		only-redir1.0
 FILES+=		only-redir2.0
 FILES+=		only-redir3.0

Copied: projects/release-pkg/bin/sh/tests/parser/comment1.0 (from r295885, head/bin/sh/tests/parser/comment1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/comment1.0	Mon Feb 22 12:28:23 2016	(r295886, copy of r295885, head/bin/sh/tests/parser/comment1.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+${SH} -c '#'

Copied: projects/release-pkg/bin/sh/tests/parser/comment2.42 (from r295885, head/bin/sh/tests/parser/comment2.42)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/comment2.42	Mon Feb 22 12:28:23 2016	(r295886, copy of r295885, head/bin/sh/tests/parser/comment2.42)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+${SH} -c '#
+exit 42'

Copied: projects/release-pkg/bin/sh/tests/parser/nul1.0 (from r295885, head/bin/sh/tests/parser/nul1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/nul1.0	Mon Feb 22 12:28:23 2016	(r295886, copy of r295885, head/bin/sh/tests/parser/nul1.0)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Although POSIX does not specify the effect of NUL bytes in scripts,
+# we ignore them.
+
+{
+	printf 'v=%03000d\0%02000d' 7 2
+	dd if=/dev/zero bs=1000 count=1 status=none
+	printf '1 w=%03000d%02000d1\0\n' 7 2
+	printf '\0l\0v\0=\0$\0{\0#\0v\0}\n'
+	printf '\0l\0w\0=\0\0$\0{\0#\0w}\0\0\0\n'
+	printf '[ "$lv.$lw.$v" = "5001.5001.$w" ]\n'
+} | ${SH}

Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -1713,7 +1713,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1750,7 +1750,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid source "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -1786,7 +1786,7 @@ zfs_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}
@@ -3156,7 +3156,7 @@ zfs_do_list(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
-					    value);
+					    suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv)
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid column name "
-					    "'%s'\n"), value);
+					    "'%s'\n"), suboptarg);
 					usage(B_FALSE);
 				}
 			}

Modified: projects/release-pkg/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/release-pkg/contrib/binutils/bfd/elf32-arm.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/contrib/binutils/bfd/elf32-arm.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -59,13 +59,6 @@
 #define elf_info_to_howto               0
 #define elf_info_to_howto_rel           elf32_arm_info_to_howto
 
-#define ARM_ELF_ABI_VERSION		0
-#ifdef __FreeBSD__
-#define ARM_ELF_OS_ABI_VERSION		ELFOSABI_FREEBSD
-#else
-#define ARM_ELF_OS_ABI_VERSION		ELFOSABI_ARM
-#endif
-
 static struct elf_backend_data elf32_arm_vxworks_bed;
 
 /* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g.
@@ -9377,11 +9370,8 @@ elf32_arm_post_process_headers (bfd * ab
 
   i_ehdrp = elf_elfheader (abfd);
 
-  if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN)
-    i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION;
-  else
-    i_ehdrp->e_ident[EI_OSABI] = 0;
-  i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
+  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
+  i_ehdrp->e_ident[EI_ABIVERSION] = 0;
 
   if (link_info)
     {

Modified: projects/release-pkg/lib/libc/gen/directory.3
==============================================================================
--- projects/release-pkg/lib/libc/gen/directory.3	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libc/gen/directory.3	Mon Feb 22 12:28:23 2016	(r295886)
@@ -28,7 +28,7 @@
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd May 6, 2015
+.Dd February 19, 2016
 .Dt DIRECTORY 3
 .Os
 .Sh NAME
@@ -46,7 +46,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In dirent.h
 .Ft DIR *
 .Fn opendir "const char *filename"

Modified: projects/release-pkg/lib/libc/sys/lseek.2
==============================================================================
--- projects/release-pkg/lib/libc/sys/lseek.2	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libc/sys/lseek.2	Mon Feb 22 12:28:23 2016	(r295886)
@@ -28,7 +28,7 @@
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd May 26, 2012
+.Dd February 18, 2016
 .Dt LSEEK 2
 .Os
 .Sh NAME
@@ -131,8 +131,14 @@ Applications can use
 .Dv SEEK_HOLE
 to optimise their behavior for ranges of zeros, but must not depend on it to
 find all such ranges in a file.
+Each file is presented as having a zero-size virtual hole at the very
+end of the file.
 The existence of a hole at the end of every data region allows for easy
-programming and implies that a virtual hole exists at the end of the file.
+programming and also provides compatibility to the original implementation
+in Solaris.
+It also causes the current file size (i.e., end-of-file offset) to be returned
+to indicate that there are no more holes past the supplied
+.Fa offset .
 Applications should use
 .Fn fpathconf _PC_MIN_HOLE_SIZE
 or
@@ -176,9 +182,11 @@ be negative for a non-character special 
 For
 .Dv SEEK_DATA ,
 there are no more data regions past the supplied offset.
-For
-.Dv SEEK_HOLE ,
-there are no more holes past the supplied offset.
+Due to existence of the hole at the end of the file, for
+.Dv SEEK_HOLE
+this error is only returned when the
+.Fa offset
+already points to the end-of-file position.
 .It Bq Er EOVERFLOW
 The resulting file offset would be a value which cannot be represented
 correctly in an object of type

Modified: projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile	Mon Feb 22 12:28:23 2016	(r295886)
@@ -24,7 +24,7 @@ CLEANFILES+=	h_nonexec
 .include "../../Makefile.netbsd-tests"
 
 h_zero:
-	dd if=/dev/zero of=h_zero bs=1k count=2
+	dd if=/dev/zero of=h_zero bs=1k count=2 status=none
 	chmod a+x h_zero
 
 CLEANFILES+=	h_zero

Modified: projects/release-pkg/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/sys/Makefile	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libc/tests/sys/Makefile	Mon Feb 22 12:28:23 2016	(r295886)
@@ -84,6 +84,6 @@ FILESPACKAGE=		${PACKAGE}
 
 CLEANFILES=	truncate_test.root_owned
 truncate_test.root_owned:
-	dd if=/dev/null bs=1 count=1 of=${.TARGET}
+	dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/lib/libkvm/kvm_arm.c
==============================================================================
--- projects/release-pkg/lib/libkvm/kvm_arm.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libkvm/kvm_arm.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -183,7 +183,7 @@ _arm_initvtop(kvm_t *kd)
 #define	l1pte_section_p(pde)	(((pde) & ARM_L1_TYPE_MASK) == ARM_L1_TYPE_S)
 #define	l1pte_valid(pde)	((pde) != 0)
 #define	l2pte_valid(pte)	((pte) != 0)
-#define l2pte_index(v)		(((v) & ARM_L2_ADDR_BITS) >> ARM_L2_S_SHIFT)
+#define l2pte_index(v)		(((v) & ARM_L1_S_OFFSET) >> ARM_L2_S_SHIFT)
 
 
 static int

Modified: projects/release-pkg/lib/libkvm/kvm_arm.h
==============================================================================
--- projects/release-pkg/lib/libkvm/kvm_arm.h	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libkvm/kvm_arm.h	Mon Feb 22 12:28:23 2016	(r295886)
@@ -29,10 +29,6 @@
 #ifndef __KVM_ARM_H__
 #define	__KVM_ARM_H__
 
-#ifdef __arm__
-#include <machine/pte.h>
-#endif
-
 typedef uint32_t	arm_physaddr_t;
 typedef uint32_t	arm_pd_entry_t;
 typedef uint32_t	arm_pt_entry_t;
@@ -72,11 +68,15 @@ typedef uint32_t	arm_pt_entry_t;
 #define	ARM_L2_TYPE_T	0x03		/* Tiny Page  -  1k - not used */
 #define	ARM_L2_TYPE_MASK	0x03
 
-#define	ARM_L2_ADDR_BITS	0x000ff000	/* L2 PTE address bits */
-
 #ifdef __arm__
 #include <machine/acle-compat.h>
 
+#if __ARM_ARCH >= 6
+#include <machine/pte-v6.h>
+#else
+#include <machine/pte-v4.h>
+#endif
+
 _Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch");
 _Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch");
 _Static_assert(PAGE_MASK == ARM_PAGE_MASK, "PAGE_MASK mismatch");
@@ -106,7 +106,6 @@ _Static_assert(L2_TYPE_S == ARM_L2_TYPE_
 _Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
 #endif
 _Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
-_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch");
 #endif
 
 int	_arm_native(kvm_t *);

Modified: projects/release-pkg/lib/libvmmapi/vmmapi.c
==============================================================================
--- projects/release-pkg/lib/libvmmapi/vmmapi.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/lib/libvmmapi/vmmapi.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include <x86/segments.h>
 #include <machine/specialreg.h>
-#include <machine/param.h>
 
 #include <errno.h>
 #include <stdio.h>

Modified: projects/release-pkg/sbin/ifconfig/ifclone.c
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifclone.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sbin/ifconfig/ifclone.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -144,11 +144,12 @@ ifclonecreate(int s, void *arg)
 	}
 
 	/*
-	 * If we get a different name back than we put in, print it.
+	 * If we get a different name back than we put in, update record and
+	 * indicate it should be printed later.
 	 */
 	if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) {
 		strlcpy(name, ifr.ifr_name, sizeof(name));
-		printf("%s\n", name);
+		printifname = 1;
 	}
 }
 

Modified: projects/release-pkg/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifconfig.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sbin/ifconfig/ifconfig.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -93,6 +93,7 @@ int	clearaddr;
 int	newaddr = 1;
 int	verbose;
 int	noload;
+int	printifname = 0;
 
 int	supmedia = 0;
 int	printkeys = 0;		/* Print keying material for interfaces. */
@@ -108,6 +109,8 @@ static struct afswtch *af_getbyname(cons
 static struct afswtch *af_getbyfamily(int af);
 static void af_other_status(int);
 
+void printifnamemaybe(void);
+
 static struct option *opts = NULL;
 
 struct ifa_order_elt {
@@ -297,6 +300,12 @@ sortifaddrs(struct ifaddrs *list,
 	return (result);
 }
 
+void printifnamemaybe()
+{
+	if (printifname)
+		printf("%s\n", name);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -314,6 +323,12 @@ main(int argc, char *argv[])
 	size_t iflen;
 
 	all = downonly = uponly = namesonly = noload = verbose = 0;
+	
+	/*
+	 * Ensure we print interface name when expected to,
+	 * even if we terminate early due to error.
+	 */
+	atexit(printifnamemaybe);
 
 	/* Parse leading line options */
 	strlcpy(options, "adklmnuv", sizeof(options));
@@ -1011,6 +1026,8 @@ setifname(const char *val, int dummy __u
     const struct afswtch *afp)
 {
 	char *newname;
+	
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 
 	newname = strdup(val);
 	if (newname == NULL)
@@ -1020,6 +1037,7 @@ setifname(const char *val, int dummy __u
 		free(newname);
 		err(1, "ioctl SIOCSIFNAME (set name)");
 	}
+	printifname = 1;
 	strlcpy(name, newname, sizeof(name));
 	free(newname);
 }
@@ -1031,6 +1049,8 @@ setifdescr(const char *val, int dummy __
 {
 	char *newdescr;
 
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+	
 	ifr.ifr_buffer.length = strlen(val) + 1;
 	if (ifr.ifr_buffer.length == 1) {
 		ifr.ifr_buffer.buffer = newdescr = NULL;

Modified: projects/release-pkg/sbin/ifconfig/ifconfig.h
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifconfig.h	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sbin/ifconfig/ifconfig.h	Mon Feb 22 12:28:23 2016	(r295886)
@@ -133,6 +133,7 @@ extern	int supmedia;
 extern	int printkeys;
 extern	int newaddr;
 extern	int verbose;
+extern	int printifname;
 
 void	setifcap(const char *, int value, int s, const struct afswtch *);
 

Modified: projects/release-pkg/share/man/man4/geom_uncompress.4
==============================================================================
--- projects/release-pkg/share/man/man4/geom_uncompress.4	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/share/man/man4/geom_uncompress.4	Mon Feb 22 12:28:23 2016	(r295886)
@@ -1,3 +1,4 @@
+.\" Copyright (c) 2006, Ceri Davies <ceri@FreeBSD.org>
 .\" Copyright (c) 2014, Luiz Otavio O Souza <loos@FreeBSD.org>
 .\" All rights reserved.
 .\"
@@ -100,8 +101,18 @@ Consumers:
 The
 .Nm
 driver was written by
-.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
-and
-.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
+.An Max Khon Aq Mt fjoe@FreeBSD.org
+as
+.Xr geom_uzip 4 .
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org
+copied it over as
+.Nm
+and added LZMA functionality .
 This manual page was written by
-.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org
+for the
+.Xr geom_uzip 4 ,
+and modified by
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org
+to match
+.Nm .

Modified: projects/release-pkg/share/man/man5/mailer.conf.5
==============================================================================
--- projects/release-pkg/share/man/man5/mailer.conf.5	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/share/man/man5/mailer.conf.5	Mon Feb 22 12:28:23 2016	(r295886)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2010
+.Dd February 18, 2016
 .Dt MAILER.CONF 5
 .Os
 .Sh NAME
@@ -101,9 +101,10 @@ mailq		/usr/libexec/sendmail/sendmail
 newaliases	/usr/libexec/sendmail/sendmail
 .Ed
 .Pp
-This example shows how to invoke a sendmail-workalike like
+Using
 .Nm Postfix
-in place of
+(from ports)
+to replace
 .Xr sendmail 8 :
 .Bd -literal -offset indent
 # Emulate sendmail using postfix
@@ -113,12 +114,10 @@ mailq		/usr/local/sbin/sendmail
 newaliases	/usr/local/sbin/sendmail
 .Ed
 .Pp
-This example shows
-how to invoke
-a sendmail-workalike with
+Using
 .Nm Exim
 (from ports)
-in place of
+to replace
 .Xr sendmail 8 :
 .Bd -literal -offset indent
 # Emulate sendmail using exim
@@ -129,24 +128,40 @@ newaliases	/usr/bin/true
 rmail		/usr/local/sbin/exim -i -oee
 .Ed
 .Pp
-This example shows the use of the
+Using
 .Nm mini_sendmail
-package from ports in place of
-.Xr sendmail 8 .
-Note the use of additional arguments.
+(from ports)
+to replace
+.Xr sendmail 8 :
 .Bd -literal -offset indent
 # Send outgoing mail to a smart relay using mini_sendmail
 sendmail	/usr/local/bin/mini_sendmail -srelayhost
 send-mail	/usr/local/bin/mini_sendmail -srelayhost
 .Ed
+.Pp
+Using
+.Xr dma 8
+to replace
+.Xr sendmail 8 :
+.Bd -literal -offset indent
+# Execute dma instead of sendmail
+sendmail	/usr/libexec/dma
+send-mail	/usr/libexec/dma
+mailq		/usr/libexec/dma
+newaliases	/usr/libexec/dma
+rmail		/usr/libexec/dma
+.Ed
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr mailq 1 ,
 .Xr newaliases 1 ,
+.Xr dma 8 ,
 .Xr mailwrapper 8 ,
 .Xr sendmail 8
 .Pp
 .Xr postfix 1 Pq Pa ports/mail/postfix ,
+.Xr dma 8 Pq Pa ports/mail/dma ,
+.Xr exim 8 Pq Pa ports/mail/exim ,
 .Xr mini_sendmail 8 Pq Pa ports/mail/mini_sendmail
 .Sh HISTORY
 .Nm

Modified: projects/release-pkg/share/man/man9/bios.9
==============================================================================
--- projects/release-pkg/share/man/man9/bios.9	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/share/man/man9/bios.9	Mon Feb 22 12:28:23 2016	(r295886)
@@ -37,8 +37,6 @@
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
-.In machine/param.h
-.In machine/pmap.h
 .In machine/pc/bios.h
 .Ft uint32_t
 .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"

Modified: projects/release-pkg/share/mk/bsd.dep.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.dep.mk	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/share/mk/bsd.dep.mk	Mon Feb 22 12:28:23 2016	(r295886)
@@ -81,6 +81,16 @@ tags: ${SRCS}
 .endif
 .endif
 
+# Skip reading .depend when not needed to speed up tree-walks
+# and simple lookups.
+.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \
+    make(install*)
+_SKIP_READ_DEPEND=	1
+.if ${MK_DIRDEPS_BUILD} == "no"
+.MAKE.DEPENDFILE=	/dev/null
+.endif
+.endif
+
 .if defined(SRCS)
 CLEANFILES?=
 
@@ -181,7 +191,7 @@ DEPENDSRCS=	${SRCS:M*.[cSC]} ${SRCS:M*.c
 DEPENDOBJS+=	${DEPENDSRCS:R:S,$,.o,}
 .endif
 DEPENDFILES_OBJS=	${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./}
-.if ${.MAKEFLAGS:M-V} == ""
+.if !defined(_SKIP_READ_DEPEND)
 .for __depend_obj in ${DEPENDFILES_OBJS}
 .sinclude "${__depend_obj}"
 .endfor

Modified: projects/release-pkg/share/mk/local.meta.sys.mk
==============================================================================
--- projects/release-pkg/share/mk/local.meta.sys.mk	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/share/mk/local.meta.sys.mk	Mon Feb 22 12:28:23 2016	(r295886)
@@ -204,6 +204,7 @@ CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}}
 .if !empty(TIME_STAMP)
 TRACER= ${TIME_STAMP} ${:U}
 .endif
+WITH_META_STATS= t
 
 # toolchains can be a pain - especially bootstrappping them
 .if ${MACHINE} == "host"

Modified: projects/release-pkg/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- projects/release-pkg/sys/amd64/amd64/minidump_machdep.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/amd64/amd64/minidump_machdep.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);

Modified: projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <compat/cloudabi/cloudabi_util.h>

Modified: projects/release-pkg/sys/amd64/vmm/amd/npt.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/amd/npt.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/amd64/vmm/amd/npt.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include <machine/pmap.h>
-
 #include "npt.h"
 
 SYSCTL_DECL(_hw_vmm);

Modified: projects/release-pkg/sys/amd64/vmm/amd/svm.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/amd/svm.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/amd64/vmm/amd/svm.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 #include <machine/psl.h>
-#include <machine/pmap.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/smp.h>

Modified: projects/release-pkg/sys/amd64/vmm/vmm.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/vmm.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/amd64/vmm/vmm.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -53,12 +53,10 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 
 #include <machine/cpu.h>
-#include <machine/vm.h>
 #include <machine/pcb.h>
 #include <machine/smp.h>
 #include <x86/psl.h>
 #include <x86/apicreg.h>
-#include <machine/vmparam.h>
 
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>

Modified: projects/release-pkg/sys/arm/allwinner/a20/std.a20
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/a20/std.a20	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/allwinner/a20/std.a20	Mon Feb 22 12:28:23 2016	(r295886)
@@ -8,8 +8,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 

Modified: projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -75,6 +75,23 @@ a20_attach(platform_t plat)
 	return (0);
 }
 
+static int
+a31_attach(platform_t plat)
+{
+	soc_type = ALLWINNERSOC_A31;
+	soc_family = ALLWINNERSOC_SUN6I;
+
+	return (0);
+}
+
+static int
+a31s_attach(platform_t plat)
+{
+	soc_type = ALLWINNERSOC_A31S;
+	soc_family = ALLWINNERSOC_SUN6I;
+
+	return (0);
+}
 
 static vm_offset_t
 allwinner_lastaddr(platform_t plat)
@@ -138,6 +155,22 @@ static platform_method_t a20_methods[] =
 	PLATFORMMETHOD_END,
 };
 
+static platform_method_t a31_methods[] = {
+	PLATFORMMETHOD(platform_attach,         a31_attach),
+	PLATFORMMETHOD(platform_lastaddr,       allwinner_lastaddr),
+	PLATFORMMETHOD(platform_devmap_init,    allwinner_devmap_init),
+
+	PLATFORMMETHOD_END,
+};
+
+static platform_method_t a31s_methods[] = {
+	PLATFORMMETHOD(platform_attach,         a31s_attach),
+	PLATFORMMETHOD(platform_lastaddr,       allwinner_lastaddr),
+	PLATFORMMETHOD(platform_devmap_init,    allwinner_devmap_init),
+
+	PLATFORMMETHOD_END,
+};
+
 u_int
 allwinner_soc_type(void)
 {
@@ -152,3 +185,5 @@ allwinner_soc_family(void)
 
 FDT_PLATFORM_DEF(a10, "a10", 0, "allwinner,sun4i-a10");
 FDT_PLATFORM_DEF(a20, "a20", 0, "allwinner,sun7i-a20");
+FDT_PLATFORM_DEF(a31, "a31", 0, "allwinner,sun6i-a31");
+FDT_PLATFORM_DEF(a31s, "a31s", 0, "allwinner,sun6i-a31s");

Modified: projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h	Mon Feb 22 12:28:23 2016	(r295886)
@@ -34,9 +34,12 @@
 #define	ALLWINNERSOC_A13	0x13000000
 #define	ALLWINNERSOC_A10S	0x10000001
 #define	ALLWINNERSOC_A20	0x20000000
+#define	ALLWINNERSOC_A31	0x31000000
+#define	ALLWINNERSOC_A31S	0x31000001
 
 #define	ALLWINNERSOC_SUN4I	0x40000000
 #define	ALLWINNERSOC_SUN5I	0x50000000
+#define	ALLWINNERSOC_SUN6I	0x60000000
 #define	ALLWINNERSOC_SUN7I	0x70000000
 
 u_int allwinner_soc_type(void);

Modified: projects/release-pkg/sys/arm/allwinner/std.a10
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/std.a10	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/allwinner/std.a10	Mon Feb 22 12:28:23 2016	(r295886)
@@ -8,7 +8,5 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.a10"

Modified: projects/release-pkg/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- projects/release-pkg/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 12:28:23 2016	(r295886)
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 

Modified: projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 12:28:23 2016	(r295886)
@@ -17,8 +17,6 @@ device		fdt_pinctrl
 
 files		"../amlogic/aml8726/files.aml8726"
 
-options		ARM_L2_PIPT
-
 # Set all global interrupts to be edge triggered, active high.
 options		GIC_DEFAULT_ICFGR_INIT=0xffffffff
 

Modified: projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 12:28:23 2016	(r295886)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 #include <machine/devmap.h>
 #include <machine/platform.h>
 #include <machine/fdt.h>

Modified: projects/release-pkg/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- projects/release-pkg/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 11:47:28 2016	(r295885)
+++ projects/release-pkg/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 12:28:23 2016	(r295886)
@@ -10,8 +10,6 @@ options 	KERNVIRTADDR=0xa0200000
 makeoptions	KERNBASE=0xa0000000
 options 	KERNBASE=0xa0000000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 

Copied: projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c (from r295885, head/sys/arm/arm/busdma_machdep-v4.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c	Mon Feb 22 12:28:23 2016	(r295886, copy of r295885, head/sys/arm/arm/busdma_machdep-v4.c)
@@ -0,0 +1,1609 @@
+/*-
+ * Copyright (c) 2012 Ian Lepore
+ * Copyright (c) 2004 Olivier Houchard
+ * Copyright (c) 2002 Peter Grehan
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without

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

From owner-svn-src-projects@freebsd.org  Mon Feb 22 22:22:02 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E565AB1210
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 22 Feb 2016 22:22:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F1F3126C;
 Mon, 22 Feb 2016 22:22:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1MMM1w4026367;
 Mon, 22 Feb 2016 22:22:01 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1MMLrZP026272;
 Mon, 22 Feb 2016 22:21:53 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602222221.u1MMLrZP026272@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 22 Feb 2016 22:21:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295902 - in projects/clang380-import: bin/dd bin/sh
 contrib/binutils/bfd lib/libvmmapi share/man/man9 sys/amd64/amd64
 sys/amd64/cloudabi64 sys/amd64/vmm sys/amd64/vmm/amd sys/arm/allwi...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2016 22:22:02 -0000

Author: dim
Date: Mon Feb 22 22:21:53 2016
New Revision: 295902
URL: https://svnweb.freebsd.org/changeset/base/295902

Log:
  Merge ^/head r295845 through r295901.

Added:
  projects/clang380-import/sys/riscv/riscv/stack_machdep.c
     - copied unchanged from r295901, head/sys/riscv/riscv/stack_machdep.c
Modified:
  projects/clang380-import/bin/dd/args.c
  projects/clang380-import/bin/sh/alias.c
  projects/clang380-import/bin/sh/input.c
  projects/clang380-import/bin/sh/parser.c
  projects/clang380-import/contrib/binutils/bfd/elf.c
  projects/clang380-import/contrib/binutils/bfd/elf32-arm.c
  projects/clang380-import/lib/libvmmapi/vmmapi.c
  projects/clang380-import/share/man/man9/bios.9
  projects/clang380-import/sys/amd64/amd64/minidump_machdep.c
  projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/clang380-import/sys/amd64/vmm/amd/npt.c
  projects/clang380-import/sys/amd64/vmm/amd/svm.c
  projects/clang380-import/sys/amd64/vmm/vmm.c
  projects/clang380-import/sys/arm/allwinner/a20/std.a20
  projects/clang380-import/sys/arm/allwinner/std.a10
  projects/clang380-import/sys/arm/altera/socfpga/std.socfpga
  projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726
  projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c
  projects/clang380-import/sys/arm/annapurna/alpine/std.alpine
  projects/clang380-import/sys/arm/arm/debug_monitor.c
  projects/clang380-import/sys/arm/arm/genassym.c
  projects/clang380-import/sys/arm/arm/mp_machdep.c
  projects/clang380-import/sys/arm/arm/pmap-v6.c
  projects/clang380-import/sys/arm/arm/trap-v4.c
  projects/clang380-import/sys/arm/arm/trap-v6.c
  projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836
  projects/clang380-import/sys/arm/conf/std.armv6
  projects/clang380-import/sys/arm/freescale/imx/std.imx51
  projects/clang380-import/sys/arm/freescale/imx/std.imx53
  projects/clang380-import/sys/arm/freescale/imx/std.imx6
  projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid
  projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp
  projects/clang380-import/sys/arm/mv/mvvar.h
  projects/clang380-import/sys/arm/qemu/std.virt
  projects/clang380-import/sys/arm/rockchip/std.rk30xx
  projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250
  projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420
  projects/clang380-import/sys/arm/ti/am335x/std.am335x
  projects/clang380-import/sys/arm/ti/omap4/std.omap4
  projects/clang380-import/sys/arm/xilinx/std.zynq7
  projects/clang380-import/sys/arm64/arm64/debug_monitor.c
  projects/clang380-import/sys/arm64/arm64/minidump_machdep.c
  projects/clang380-import/sys/arm64/arm64/trap.c
  projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  projects/clang380-import/sys/arm64/conf/GENERIC
  projects/clang380-import/sys/boot/efi/include/efilib.h
  projects/clang380-import/sys/boot/efi/libefi/time.c
  projects/clang380-import/sys/boot/uboot/lib/net.c
  projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
  projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c
  projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c
  projects/clang380-import/sys/compat/linprocfs/linprocfs.c
  projects/clang380-import/sys/compat/linux/linux_util.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h
  projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c
  projects/clang380-import/sys/compat/svr4/svr4_misc.c
  projects/clang380-import/sys/compat/svr4/svr4_util.h
  projects/clang380-import/sys/conf/files.riscv
  projects/clang380-import/sys/conf/kern.post.mk
  projects/clang380-import/sys/conf/options
  projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c
  projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c
  projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c
  projects/clang380-import/sys/dev/ce/if_ce.c
  projects/clang380-import/sys/dev/cp/if_cp.c
  projects/clang380-import/sys/dev/drm/drmP.h
  projects/clang380-import/sys/dev/drm2/drmP.h
  projects/clang380-import/sys/dev/fb/machfb.c
  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/isci/isci_oem_parameters.c
  projects/clang380-import/sys/dev/msk/if_msk.c
  projects/clang380-import/sys/dev/ntb/if_ntb/if_ntb.c
  projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/clang380-import/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  projects/clang380-import/sys/dev/pms/freebsd/driver/ini/src/osapi.c
  projects/clang380-import/sys/dev/rt/if_rt.c
  projects/clang380-import/sys/dev/rtwn/if_rtwn.c
  projects/clang380-import/sys/dev/siba/siba_pcib.c
  projects/clang380-import/sys/dev/sk/if_sk.c
  projects/clang380-import/sys/dev/usb/wlan/if_urtwn.c
  projects/clang380-import/sys/dev/usb/wlan/if_urtwnreg.h
  projects/clang380-import/sys/dev/usb/wlan/if_urtwnvar.h
  projects/clang380-import/sys/dev/vt/hw/efifb/efifb.c
  projects/clang380-import/sys/i386/bios/mca_machdep.c
  projects/clang380-import/sys/i386/i386/machdep.c
  projects/clang380-import/sys/i386/pci/pci_cfgreg.c
  projects/clang380-import/sys/kern/kern_environment.c
  projects/clang380-import/sys/mips/adm5120/admpci.c
  projects/clang380-import/sys/mips/atheros/ar71xx_fixup.c
  projects/clang380-import/sys/mips/atheros/ar71xx_pci.c
  projects/clang380-import/sys/mips/atheros/ar71xx_spi.c
  projects/clang380-import/sys/mips/atheros/ar724x_pci.c
  projects/clang380-import/sys/mips/atheros/if_arge.c
  projects/clang380-import/sys/mips/atheros/qca955x_pci.c
  projects/clang380-import/sys/mips/cavium/cvmx_config.h
  projects/clang380-import/sys/mips/cavium/octopci.c
  projects/clang380-import/sys/mips/idt/idtpci.c
  projects/clang380-import/sys/mips/malta/gt_pci.c
  projects/clang380-import/sys/mips/mips/minidump_machdep.c
  projects/clang380-import/sys/mips/mips/nexus.c
  projects/clang380-import/sys/mips/mips/stack_machdep.c
  projects/clang380-import/sys/mips/nlm/cms.c
  projects/clang380-import/sys/mips/nlm/dev/net/xlpge.c
  projects/clang380-import/sys/mips/nlm/xlp_simplebus.c
  projects/clang380-import/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/clang380-import/sys/mips/rmi/fmn.c
  projects/clang380-import/sys/mips/rmi/iodi.c
  projects/clang380-import/sys/mips/rt305x/rt305x_pci.c
  projects/clang380-import/sys/mips/sibyte/sb_zbpci.c
  projects/clang380-import/sys/modules/usb/Makefile
  projects/clang380-import/sys/modules/usb/urtwn/Makefile
  projects/clang380-import/sys/powerpc/aim/slb.c
  projects/clang380-import/sys/powerpc/ofw/ofw_real.c
  projects/clang380-import/sys/powerpc/ofw/rtas.c
  projects/clang380-import/sys/powerpc/powermac/macgpio.c
  projects/clang380-import/sys/powerpc/powermac/macio.c
  projects/clang380-import/sys/powerpc/powermac/platform_powermac.c
  projects/clang380-import/sys/powerpc/powerpc/genassym.c
  projects/clang380-import/sys/powerpc/powerpc/trap.c
  projects/clang380-import/sys/powerpc/ps3/if_glc.c
  projects/clang380-import/sys/powerpc/ps3/platform_ps3.c
  projects/clang380-import/sys/powerpc/ps3/ps3_syscons.c
  projects/clang380-import/sys/powerpc/ps3/ps3bus.c
  projects/clang380-import/sys/powerpc/ps3/ps3cdrom.c
  projects/clang380-import/sys/powerpc/ps3/ps3disk.c
  projects/clang380-import/sys/powerpc/pseries/platform_chrp.c
  projects/clang380-import/sys/powerpc/psim/iobus.c
  projects/clang380-import/sys/riscv/include/atomic.h
  projects/clang380-import/sys/riscv/riscv/genassym.c
  projects/clang380-import/sys/riscv/riscv/machdep.c
  projects/clang380-import/sys/riscv/riscv/minidump_machdep.c
  projects/clang380-import/sys/riscv/riscv/timer.c
  projects/clang380-import/sys/riscv/riscv/trap.c
  projects/clang380-import/sys/sparc64/pci/fire.c
  projects/clang380-import/sys/sparc64/sparc64/iommu.c
  projects/clang380-import/sys/sparc64/sparc64/tlb.c
  projects/clang380-import/sys/x86/acpica/acpi_wakeup.c
  projects/clang380-import/sys/x86/x86/nexus.c
  projects/clang380-import/usr.sbin/config/config.5
  projects/clang380-import/usr.sbin/iostat/iostat.c
Directory Properties:
  projects/clang380-import/   (props changed)
  projects/clang380-import/contrib/binutils/   (props changed)
  projects/clang380-import/lib/libvmmapi/   (props changed)
  projects/clang380-import/share/   (props changed)
  projects/clang380-import/sys/   (props changed)
  projects/clang380-import/sys/amd64/vmm/   (props changed)
  projects/clang380-import/sys/boot/   (props changed)
  projects/clang380-import/sys/conf/   (props changed)
  projects/clang380-import/sys/dev/hyperv/   (props changed)

Modified: projects/clang380-import/bin/dd/args.c
==============================================================================
--- projects/clang380-import/bin/dd/args.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/bin/dd/args.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -422,11 +422,10 @@ get_num(const char *val)
 
 	errno = 0;
 	num = strtoumax(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
 	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
 
 	mult = postfix_to_mult(*expr);
 
@@ -472,11 +471,10 @@ get_off_t(const char *val)
 
 	errno = 0;
 	num = strtoimax(val, &expr, 0);
-	if (errno != 0)				/* Overflow or underflow. */
-		err(1, "%s", oper);
-	
 	if (expr == val)			/* No valid digits. */
-		errx(1, "%s: illegal numeric value", oper);
+		errx(1, "%s: invalid numeric value", oper);
+	if (errno != 0)
+		err(1, "%s", oper);
 
 	mult = postfix_to_mult(*expr);
 

Modified: projects/clang380-import/bin/sh/alias.c
==============================================================================
--- projects/clang380-import/bin/sh/alias.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/bin/sh/alias.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -144,9 +144,11 @@ rmaliases(void)
 struct alias *
 lookupalias(const char *name, int check)
 {
-	struct alias *ap = *hashalias(name);
+	struct alias *ap;
 
-	for (; ap; ap = ap->next) {
+	if (aliases == 0)
+		return (NULL);
+	for (ap = *hashalias(name); ap; ap = ap->next) {
 		if (equal(name, ap->name)) {
 			if (check && (ap->flag & ALIASINUSE))
 				return (NULL);

Modified: projects/clang380-import/bin/sh/input.c
==============================================================================
--- projects/clang380-import/bin/sh/input.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/bin/sh/input.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -212,8 +212,6 @@ preadbuffer(void)
 	}
 	if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
 		return PEOF;
-	flushout(&output);
-	flushout(&errout);
 
 again:
 	if (parselleft <= 0) {

Modified: projects/clang380-import/bin/sh/parser.c
==============================================================================
--- projects/clang380-import/bin/sh/parser.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/bin/sh/parser.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -1930,6 +1930,8 @@ static void
 setprompt(int which)
 {
 	whichprompt = which;
+	if (which == 0)
+		return;
 
 #ifndef NO_HISTORY
 	if (!el)

Modified: projects/clang380-import/contrib/binutils/bfd/elf.c
==============================================================================
--- projects/clang380-import/contrib/binutils/bfd/elf.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/contrib/binutils/bfd/elf.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun
 	shndx_count++;
 
   ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf)
-			+ (indbufend - indbuf) * sizeof (*ssymbuf));
+			+ (indbufend - indbuf) * sizeof (*ssym));
   if (ssymbuf == NULL)
     {
       free (indbuf);
       return NULL;
     }
 
-  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count);
+  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
   ssymbuf->ssym = NULL;
   ssymbuf->count = shndx_count;
   ssymbuf->st_shndx = 0;

Modified: projects/clang380-import/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/clang380-import/contrib/binutils/bfd/elf32-arm.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/contrib/binutils/bfd/elf32-arm.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -59,13 +59,6 @@
 #define elf_info_to_howto               0
 #define elf_info_to_howto_rel           elf32_arm_info_to_howto
 
-#define ARM_ELF_ABI_VERSION		0
-#ifdef __FreeBSD__
-#define ARM_ELF_OS_ABI_VERSION		ELFOSABI_FREEBSD
-#else
-#define ARM_ELF_OS_ABI_VERSION		ELFOSABI_ARM
-#endif
-
 static struct elf_backend_data elf32_arm_vxworks_bed;
 
 /* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g.
@@ -9377,11 +9370,8 @@ elf32_arm_post_process_headers (bfd * ab
 
   i_ehdrp = elf_elfheader (abfd);
 
-  if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN)
-    i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION;
-  else
-    i_ehdrp->e_ident[EI_OSABI] = 0;
-  i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
+  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
+  i_ehdrp->e_ident[EI_ABIVERSION] = 0;
 
   if (link_info)
     {

Modified: projects/clang380-import/lib/libvmmapi/vmmapi.c
==============================================================================
--- projects/clang380-import/lib/libvmmapi/vmmapi.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/lib/libvmmapi/vmmapi.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include <x86/segments.h>
 #include <machine/specialreg.h>
-#include <machine/param.h>
 
 #include <errno.h>
 #include <stdio.h>

Modified: projects/clang380-import/share/man/man9/bios.9
==============================================================================
--- projects/clang380-import/share/man/man9/bios.9	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/share/man/man9/bios.9	Mon Feb 22 22:21:53 2016	(r295902)
@@ -37,8 +37,6 @@
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
-.In machine/param.h
-.In machine/pmap.h
 .In machine/pc/bios.h
 .Ft uint32_t
 .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"

Modified: projects/clang380-import/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- projects/clang380-import/sys/amd64/amd64/minidump_machdep.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/amd64/amd64/minidump_machdep.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);

Modified: projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <compat/cloudabi/cloudabi_util.h>

Modified: projects/clang380-import/sys/amd64/vmm/amd/npt.c
==============================================================================
--- projects/clang380-import/sys/amd64/vmm/amd/npt.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/amd64/vmm/amd/npt.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include <machine/pmap.h>
-
 #include "npt.h"
 
 SYSCTL_DECL(_hw_vmm);

Modified: projects/clang380-import/sys/amd64/vmm/amd/svm.c
==============================================================================
--- projects/clang380-import/sys/amd64/vmm/amd/svm.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/amd64/vmm/amd/svm.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 #include <machine/psl.h>
-#include <machine/pmap.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/smp.h>

Modified: projects/clang380-import/sys/amd64/vmm/vmm.c
==============================================================================
--- projects/clang380-import/sys/amd64/vmm/vmm.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/amd64/vmm/vmm.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -53,12 +53,10 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 
 #include <machine/cpu.h>
-#include <machine/vm.h>
 #include <machine/pcb.h>
 #include <machine/smp.h>
 #include <x86/psl.h>
 #include <x86/apicreg.h>
-#include <machine/vmparam.h>
 
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>

Modified: projects/clang380-import/sys/arm/allwinner/a20/std.a20
==============================================================================
--- projects/clang380-import/sys/arm/allwinner/a20/std.a20	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/allwinner/a20/std.a20	Mon Feb 22 22:21:53 2016	(r295902)
@@ -8,8 +8,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/allwinner/std.a10
==============================================================================
--- projects/clang380-import/sys/arm/allwinner/std.a10	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/allwinner/std.a10	Mon Feb 22 22:21:53 2016	(r295902)
@@ -8,7 +8,5 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.a10"

Modified: projects/clang380-import/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- projects/clang380-import/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 22:21:53 2016	(r295902)
@@ -17,8 +17,6 @@ device		fdt_pinctrl
 
 files		"../amlogic/aml8726/files.aml8726"
 
-options		ARM_L2_PIPT
-
 # Set all global interrupts to be edge triggered, active high.
 options		GIC_DEFAULT_ICFGR_INIT=0xffffffff
 

Modified: projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c
==============================================================================
--- projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 #include <machine/devmap.h>
 #include <machine/platform.h>
 #include <machine/fdt.h>

Modified: projects/clang380-import/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- projects/clang380-import/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 22:21:53 2016	(r295902)
@@ -10,8 +10,6 @@ options 	KERNVIRTADDR=0xa0200000
 makeoptions	KERNBASE=0xa0000000
 options 	KERNBASE=0xa0000000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/arm/debug_monitor.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/debug_monitor.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/debug_monitor.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/debug_monitor.h>
 #include <machine/kdb.h>
-#include <machine/param.h>
 #include <machine/pcb.h>
 #include <machine/reg.h>
 

Modified: projects/clang380-import/sys/arm/arm/genassym.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/genassym.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/genassym.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 
 #include <machine/acle-compat.h>
-#include <machine/vmparam.h>
 #include <machine/armreg.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>

Modified: projects/clang380-import/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/mp_machdep.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/mp_machdep.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/debug_monitor.h>
 #include <machine/smp.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/physmem.h>
 #include <machine/intr.h>
 #include <machine/vmparam.h>

Modified: projects/clang380-import/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/pmap-v6.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/pmap-v6.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <machine/physmem.h>
-#include <machine/vmparam.h>
 
 #include <vm/vm.h>
 #include <vm/uma.h>

Modified: projects/clang380-import/sys/arm/arm/trap-v4.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/trap-v4.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/trap-v4.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/acle-compat.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/machdep.h>
@@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int 
 	}
 
 	/*
-	 * We need to know whether the page should be mapped as R or R/W.  On
-	 * armv6 and later the fault status register indicates whether the
-	 * access was a read or write.  Prior to armv6, we know that a
-	 * permission fault can only be the result of a write to a read-only
-	 * location, so we can deal with those quickly.  Otherwise we need to
-	 * disassemble the faulting instruction to determine if it was a write.
+	 * We need to know whether the page should be mapped as R or R/W.
+	 * On armv4, the fault status register does not indicate whether
+	 * the access was a read or write.  We know that a permission fault
+	 * can only be the result of a write to a read-only location, so we
+	 * can deal with those quickly.  Otherwise we need to disassemble
+	 * the faulting instruction to determine if it was a write.
 	 */
-#if __ARM_ARCH >= 6
-	ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
-#else
 	if (IS_PERMISSION_FAULT(fsr))
 		ftype = VM_PROT_WRITE;
 	else {
@@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int 
 				ftype = VM_PROT_READ;
 		}
 	}
-#endif
 
 	/*
 	 * See if the fault is as a result of ref/mod emulation,

Modified: projects/clang380-import/sys/arm/arm/trap-v6.c
==============================================================================
--- projects/clang380-import/sys/arm/arm/trap-v6.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/arm/trap-v6.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
-#include <machine/vmparam.h>
 
 #ifdef KDB
 #include <sys/kdb.h>

Modified: projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836
==============================================================================
--- projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Feb 22 22:21:53 2016	(r295902)
@@ -5,7 +5,6 @@ cpu		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836
 
-options 	ARM_L2_PIPT
 options 	IPI_IRQ_START=76
 
 files	"../broadcom/bcm2835/files.bcm2836"

Modified: projects/clang380-import/sys/arm/conf/std.armv6
==============================================================================
--- projects/clang380-import/sys/arm/conf/std.armv6	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/conf/std.armv6	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,6 +2,8 @@
 #
 # $FreeBSD$
 
+options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols

Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx51
==============================================================================
--- projects/clang380-import/sys/arm/freescale/imx/std.imx51	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/freescale/imx/std.imx51	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000

Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx53
==============================================================================
--- projects/clang380-import/sys/arm/freescale/imx/std.imx53	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/freescale/imx/std.imx53	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000

Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx6
==============================================================================
--- projects/clang380-import/sys/arm/freescale/imx/std.imx6	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/freescale/imx/std.imx6	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000

Modified: projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid
==============================================================================
--- projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,6 +7,4 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 files		"../freescale/vybrid/files.vybrid"

Modified: projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp
==============================================================================
--- projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,5 +2,3 @@
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options		KERNVIRTADDR=0xc0200000
-
-options		ARM_L2_PIPT

Modified: projects/clang380-import/sys/arm/mv/mvvar.h
==============================================================================
--- projects/clang380-import/sys/arm/mv/mvvar.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/mv/mvvar.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -44,7 +44,6 @@
 #include <machine/bus.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/vm.h>
 
 #include <dev/ofw/openfirm.h>
 

Modified: projects/clang380-import/sys/arm/qemu/std.virt
==============================================================================
--- projects/clang380-import/sys/arm/qemu/std.virt	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/qemu/std.virt	Mon Feb 22 22:21:53 2016	(r295902)
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options 	KERNVIRTADDR		= 0xc1000000
 makeoptions	KERNVIRTADDR		= 0xc1000000

Modified: projects/clang380-import/sys/arm/rockchip/std.rk30xx
==============================================================================
--- projects/clang380-import/sys/arm/rockchip/std.rk30xx	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/rockchip/std.rk30xx	Mon Feb 22 22:21:53 2016	(r295902)
@@ -8,8 +8,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250
==============================================================================
--- projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420
==============================================================================
--- projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 

Modified: projects/clang380-import/sys/arm/ti/am335x/std.am335x
==============================================================================
--- projects/clang380-import/sys/arm/ti/am335x/std.am335x	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/ti/am335x/std.am335x	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_TI_AM335X
-
-options		ARM_L2_PIPT

Modified: projects/clang380-import/sys/arm/ti/omap4/std.omap4
==============================================================================
--- projects/clang380-import/sys/arm/ti/omap4/std.omap4	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/ti/omap4/std.omap4	Mon Feb 22 22:21:53 2016	(r295902)
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_OMAP4
-
-options		ARM_L2_PIPT

Modified: projects/clang380-import/sys/arm/xilinx/std.zynq7
==============================================================================
--- projects/clang380-import/sys/arm/xilinx/std.zynq7	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm/xilinx/std.zynq7	Mon Feb 22 22:21:53 2016	(r295902)
@@ -12,7 +12,5 @@ files		"../xilinx/files.zynq7"
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15

Modified: projects/clang380-import/sys/arm64/arm64/debug_monitor.c
==============================================================================
--- projects/clang380-import/sys/arm64/arm64/debug_monitor.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm64/arm64/debug_monitor.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/debug_monitor.h>
 #include <machine/kdb.h>
-#include <machine/param.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h>

Modified: projects/clang380-import/sys/arm64/arm64/minidump_machdep.c
==============================================================================
--- projects/clang380-import/sys/arm64/arm64/minidump_machdep.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm64/arm64/minidump_machdep.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -52,9 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/md_var.h>
-#include <machine/pmap.h>
 #include <machine/pte.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);

Modified: projects/clang380-import/sys/arm64/arm64/trap.c
==============================================================================
--- projects/clang380-import/sys/arm64/arm64/trap.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm64/arm64/trap.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/pcpu.h>
-#include <machine/vmparam.h>
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>

Modified: projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <compat/cloudabi/cloudabi_util.h>

Modified: projects/clang380-import/sys/arm64/conf/GENERIC
==============================================================================
--- projects/clang380-import/sys/arm64/conf/GENERIC	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/arm64/conf/GENERIC	Mon Feb 22 22:21:53 2016	(r295902)
@@ -103,6 +103,7 @@ device		mii
 device		miibus		# MII bus support
 device		em		# Intel PRO/1000 Gigabit Ethernet Family
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+device		ix		# Intel 10Gb Ethernet Family
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		vnic		# Cavium ThunderX NIC
 

Modified: projects/clang380-import/sys/boot/efi/include/efilib.h
==============================================================================
--- projects/clang380-import/sys/boot/efi/include/efilib.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/boot/efi/include/efilib.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -46,7 +46,6 @@ int efi_handle_lookup(EFI_HANDLE, struct
 int efi_handle_update_dev(EFI_HANDLE, struct devsw *, int, uint64_t);
 
 int efi_status_to_errno(EFI_STATUS);
-time_t efi_time(EFI_TIME *);
 
 EFI_STATUS main(int argc, CHAR16 *argv[]);
 void exit(EFI_STATUS status);

Modified: projects/clang380-import/sys/boot/efi/libefi/time.c
==============================================================================
--- projects/clang380-import/sys/boot/efi/libefi/time.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/boot/efi/libefi/time.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #define SECSPERHOUR ( 60*60 )
 #define SECSPERDAY	(24 * SECSPERHOUR)
 
-time_t
+static time_t
 efi_time(EFI_TIME *ETime)
 {
     /*
@@ -164,7 +164,7 @@ efi_time(EFI_TIME *ETime)
     return UTime;
 }
 
-int
+static int
 EFI_GetTimeOfDay(
 	OUT struct timeval *tp,
 	OUT struct timezone *tzp

Modified: projects/clang380-import/sys/boot/uboot/lib/net.c
==============================================================================
--- projects/clang380-import/sys/boot/uboot/lib/net.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/boot/uboot/lib/net.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -108,9 +108,19 @@ get_env_net_params()
 	char *envstr;
 	in_addr_t rootaddr, serveraddr;
 
-	/* Silently get out right away if we don't have rootpath. */
-	if (ub_env_get("rootpath") == NULL)
+	/*
+	 * Silently get out right away if we don't have rootpath, because none
+	 * of the other info we obtain below is sufficient to boot without it.
+	 *
+	 * If we do have rootpath, copy it into the global var and also set
+	 * dhcp.root-path in the env.  If we don't get all the other info from
+	 * the u-boot env below, we will still try dhcp/bootp, but the server-
+	 * provided path will not replace the user-provided value we set here.
+	 */
+	if ((envstr = ub_env_get("rootpath")) == NULL)
 		return;
+	strlcpy(rootpath, envstr, sizeof(rootpath));
+	setenv("dhcp.root-path", rootpath, 0);
 
 	/*
 	 * Our own IP address must be valid.  Silently get out if it's not set,
@@ -154,9 +164,6 @@ get_env_net_params()
 	 * There must be a rootpath.  It may be ip:/path or it may be just the
 	 * path in which case the ip needs to be in serverip.
 	 */
-	if ((envstr = ub_env_get("rootpath")) == NULL)
-		return;
-	strncpy(rootpath, envstr, sizeof(rootpath) - 1);
 	rootaddr = net_parse_rootpath();
 	if (rootaddr == INADDR_NONE)
 		rootaddr = serveraddr;

Modified: projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
==============================================================================
--- projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -44,7 +44,6 @@
 #include <machine/atomic.h>
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/stack.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>

Modified: projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c
==============================================================================
--- projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -44,7 +44,6 @@
 #include <machine/atomic.h>
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/stack.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>

Modified: projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c
==============================================================================
--- projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -44,7 +44,6 @@
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
 #include <machine/mips_opcode.h>
-#include <machine/vmparam.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>
 #include <sys/kdb.h>

Modified: projects/clang380-import/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- projects/clang380-import/sys/compat/linprocfs/linprocfs.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linprocfs/linprocfs.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/resourcevar.h>
+#include <sys/resource.h>
 #include <sys/sbuf.h>
 #include <sys/sem.h>
 #include <sys/smp.h>
@@ -1366,6 +1367,67 @@ linprocfs_dofdescfs(PFS_FILL_ARGS)
 	return (0);
 }
 
+/*
+ * Filler function for proc/pid/limits
+ */
+
+#define RLIM_NONE -1
+
+static const struct limit_info {
+	const char	*desc;
+	const char	*unit;
+	unsigned long long	rlim_id;
+} limits_info[] = {
+	{ "Max cpu time",		"seconds",	RLIMIT_CPU },
+	{ "Max file size",		"bytes",	RLIMIT_FSIZE },
+	{ "Max data size",		"bytes", 	RLIMIT_DATA },
+	{ "Max stack size",		"bytes", 	RLIMIT_STACK },
+	{ "Max core file size",		"bytes",	RLIMIT_CORE },
+	{ "Max resident set",		"bytes",	RLIMIT_RSS },
+	{ "Max processes",		"processes",	RLIMIT_NPROC },
+	{ "Max open files",		"files",	RLIMIT_NOFILE },
+	{ "Max locked memory",		"bytes",	RLIMIT_MEMLOCK },
+	{ "Max address space",		"bytes",	RLIMIT_AS },
+	{ "Max file locks",		"locks",	RLIM_INFINITY },
+	{ "Max pending signals",	"signals",	RLIM_INFINITY },
+	{ "Max msgqueue size",		"bytes",	RLIM_NONE },
+	{ "Max nice priority", 		"",		RLIM_NONE },
+	{ "Max realtime priority",	"",		RLIM_NONE },
+	{ "Max realtime timeout",	"us",		RLIM_INFINITY },
+	{ 0, 0, 0 }
+};
+
+static int
+linprocfs_doproclimits(PFS_FILL_ARGS)
+{
+	const struct limit_info	*li;
+	struct rlimit li_rlimits;
+	struct plimit *cur_proc_lim;
+
+	cur_proc_lim = lim_alloc();
+	lim_copy(cur_proc_lim, p->p_limit);
+	sbuf_printf(sb, "%-26s%-21s%-21s%-10s\n", "Limit", "Soft Limit",
+			"Hard Limit", "Units");
+	for (li = limits_info; li->desc != NULL; ++li) {
+		if (li->rlim_id != RLIM_INFINITY && li->rlim_id != RLIM_NONE)
+			li_rlimits = cur_proc_lim->pl_rlimit[li->rlim_id];
+		else {
+			li_rlimits.rlim_cur = 0;
+			li_rlimits.rlim_max = 0;
+		}
+		if (li->rlim_id == RLIM_INFINITY ||
+		    li_rlimits.rlim_cur == RLIM_INFINITY)
+			sbuf_printf(sb, "%-26s%-21s%-21s%-10s\n",
+			    li->desc, "unlimited", "unlimited", li->unit);
+		else
+			sbuf_printf(sb, "%-26s%-21ld%-21ld%-10s\n",
+			    li->desc, (long)li_rlimits.rlim_cur,
+			    (long)li_rlimits.rlim_max, li->unit);
+	}
+	lim_free(cur_proc_lim);
+	return (0);
+}
+
 
 /*
  * Filler function for proc/sys/kernel/random/uuid
@@ -1504,6 +1566,8 @@ linprocfs_init(PFS_INIT_ARGS)
 	    NULL, NULL, NULL, 0);
 	pfs_create_file(dir, "auxv", &linprocfs_doauxv,
 	    NULL, &procfs_candebug, NULL, PFS_RD|PFS_RAWRD);
+	pfs_create_file(dir, "limits", &linprocfs_doproclimits,
+	    NULL, NULL, NULL, PFS_RD);
 
 	/* /proc/scsi/... */
 	dir = pfs_create_dir(root, "scsi", NULL, NULL, NULL, 0);

Modified: projects/clang380-import/sys/compat/linux/linux_util.h
==============================================================================
--- projects/clang380-import/sys/compat/linux/linux_util.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linux/linux_util.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -37,7 +37,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/vmparam.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/syslog.h>

Modified: projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
==============================================================================
--- projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -47,7 +47,6 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 
 enum dma_data_direction {
 	DMA_BIDIRECTIONAL = 0,

Modified: projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h
==============================================================================
--- projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -68,7 +68,6 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #define	prefetch(x)
 

Modified: projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c
==============================================================================
--- projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/stdarg.h>
-#include <machine/pmap.h>
 
 #include <linux/kobject.h>
 #include <linux/device.h>

Modified: projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c
==============================================================================
--- projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/stdarg.h>
-#include <machine/pmap.h>
 
 #include <linux/kobject.h>
 #include <linux/device.h>

Modified: projects/clang380-import/sys/compat/svr4/svr4_misc.c
==============================================================================
--- projects/clang380-import/sys/compat/svr4/svr4_misc.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/svr4/svr4_misc.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
 
 #include <security/mac/mac_framework.h>
 
-#include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_map.h>

Modified: projects/clang380-import/sys/compat/svr4/svr4_util.h
==============================================================================
--- projects/clang380-import/sys/compat/svr4/svr4_util.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/compat/svr4/svr4_util.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -35,7 +35,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/vmparam.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/cdefs.h>

Modified: projects/clang380-import/sys/conf/files.riscv
==============================================================================
--- projects/clang380-import/sys/conf/files.riscv	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/conf/files.riscv	Mon Feb 22 22:21:53 2016	(r295902)
@@ -34,9 +34,10 @@ riscv/riscv/machdep.c		standard
 riscv/riscv/mem.c		standard
 riscv/riscv/nexus.c		standard
 riscv/riscv/pmap.c		standard
-riscv/riscv/sys_machdep.c	standard
+riscv/riscv/stack_machdep.c	standard
 riscv/riscv/support.S		standard
 riscv/riscv/swtch.S		standard
+riscv/riscv/sys_machdep.c	standard
 riscv/riscv/trap.c		standard
 riscv/riscv/timer.c		standard
 riscv/riscv/uio_machdep.c	standard

Modified: projects/clang380-import/sys/conf/kern.post.mk
==============================================================================
--- projects/clang380-import/sys/conf/kern.post.mk	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/conf/kern.post.mk	Mon Feb 22 22:21:53 2016	(r295902)
@@ -222,10 +222,9 @@ _MKDEPCC:= ${CC:N${CCACHE_BIN}}
 SRCS=	assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
 	${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	${MFILES:T:S/.m$/.h/}
-DEPENDFILES=	.depend
+DEPENDFILES=	.depend .depend.*
 .if ${MK_FAST_DEPEND} == "yes" && \
     (${.MAKE.MODE:Unormal:Mmeta} == "" || ${.MAKE.MODE:Unormal:Mnofilemon} != "")
-DEPENDFILES+=	.depend.*
 DEPEND_CFLAGS+=	-MD -MP -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=	-MT${.TARGET}
 .if defined(.PARSEDIR)

Modified: projects/clang380-import/sys/conf/options
==============================================================================
--- projects/clang380-import/sys/conf/options	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/conf/options	Mon Feb 22 22:21:53 2016	(r295902)
@@ -673,6 +673,9 @@ UPLCOM_INTR_INTERVAL	opt_uplcom.h
 UVSCOM_DEFAULT_OPKTSIZE	opt_uvscom.h
 UVSCOM_INTR_INTERVAL	opt_uvscom.h
 
+# options for the Realtek RTL8188*U/RTL8192CU driver (urtwn)
+URTWN_WITHOUT_UCODE	opt_urtwn.h
+
 # Embedded system options
 INIT_PATH
 

Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c
==============================================================================
--- projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/vm.h>
 
 #include <vm/vm.h>
 

Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c
==============================================================================
--- projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/vm.h>
 
 #include <vm/vm.h>
 

Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c
==============================================================================
--- projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/vm.h>
 
 #include <vm/vm.h>
 

Modified: projects/clang380-import/sys/dev/ce/if_ce.c
==============================================================================
--- projects/clang380-import/sys/dev/ce/if_ce.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/ce/if_ce.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ce/ceddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
-#include <machine/pmap.h>
 
 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
 #ifndef PP_FR

Modified: projects/clang380-import/sys/dev/cp/if_cp.c
==============================================================================
--- projects/clang380-import/sys/dev/cp/if_cp.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/cp/if_cp.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/cp/cpddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
-#include <machine/pmap.h>
 
 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
 #ifndef PP_FR

Modified: projects/clang380-import/sys/dev/drm/drmP.h
==============================================================================
--- projects/clang380-import/sys/dev/drm/drmP.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/drm/drmP.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -75,8 +75,6 @@ struct drm_file;
 #include <vm/vm_pager.h>
 #include <vm/vm_param.h>
 #include <vm/vm_phys.h>
-#include <machine/param.h>
-#include <machine/pmap.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #if defined(__i386__) || defined(__amd64__)

Modified: projects/clang380-import/sys/dev/drm2/drmP.h
==============================================================================
--- projects/clang380-import/sys/dev/drm2/drmP.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/drm2/drmP.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 #include <vm/vm_param.h>
 #include <vm/vm_phys.h>
-#include <machine/param.h>
-#include <machine/pmap.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #if defined(__i386__) || defined(__amd64__)

Modified: projects/clang380-import/sys/dev/fb/machfb.c
==============================================================================
--- projects/clang380-import/sys/dev/fb/machfb.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/fb/machfb.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <machine/ofw_machdep.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/sc_machdep.h>
 

Modified: projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h
==============================================================================
--- projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h	Mon Feb 22 22:21:53 2016	(r295902)
@@ -1026,11 +1026,12 @@ struct hn_tx_ring {
 #endif
 	int		hn_txdesc_cnt;
 	int		hn_txdesc_avail;
-	int		hn_txeof;
+	int		hn_has_txeof;
 
 	int		hn_sched_tx;
+	void		(*hn_txeof)(struct hn_tx_ring *);
 	struct taskqueue *hn_tx_taskq;
-	struct task	hn_start_task;
+	struct task	hn_tx_task;
 	struct task	hn_txeof_task;
 
 	struct mtx	hn_tx_lock;
@@ -1086,7 +1087,6 @@ typedef struct hn_softc {
 extern int hv_promisc_mode;
 
 void netvsc_linkstatus_callback(struct hv_device *device_obj, uint32_t status);
-void netvsc_xmit_completion(void *context);
 void hv_nv_on_receive_completion(struct hv_device *device,
     uint64_t tid, uint32_t status);
 netvsc_dev *hv_nv_on_device_add(struct hv_device *device,

Modified: projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Mon Feb 22 22:16:32 2016	(r295901)
+++ projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Mon Feb 22 22:21:53 2016	(r295902)
@@ -100,7 +100,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/frame.h>
-#include <machine/vmparam.h>
 
 #include <sys/bus.h>
 #include <sys/rman.h>
@@ -298,8 +297,8 @@ static int hn_create_tx_ring(struct hn_s
 static void hn_destroy_tx_ring(struct hn_tx_ring *);
 static int hn_create_tx_data(struct hn_softc *);
 static void hn_destroy_tx_data(struct hn_softc *);
-static void hn_start_taskfunc(void *xsc, int pending);
-static void hn_txeof_taskfunc(void *xsc, int pending);
+static void hn_start_taskfunc(void *, int);
+static void hn_start_txeof_taskfunc(void *, int);
 static void hn_stop_tx_tasks(struct hn_softc *);
 static int hn_encap(struct hn_tx_ring *, struct hn_txdesc *, struct mbuf **);
 static void hn_create_rx_data(struct hn_softc *sc);
@@ -653,17 +652,10 @@ hn_txdesc_hold(struct hn_txdesc *txd)
 	atomic_add_int(&txd->refs, 1);
 }
 
-/*
- * Send completion processing
- *
- * Note:  It looks like offset 0 of buf is reserved to hold the softc
- * pointer.  The sc pointer is not currently needed in this function, and
- * it is not presently populated by the TX function.
- */
-void
-netvsc_xmit_completion(void *context)
+static void
+hn_tx_done(void *xpkt)
 {
-	netvsc_packet *packet = context;
+	netvsc_packet *packet = xpkt;
 	struct hn_txdesc *txd;
 	struct hn_tx_ring *txr;
 
@@ -671,7 +663,7 @@ netvsc_xmit_completion(void *context)
 	    packet->compl.send.send_completion_tid;
 
 	txr = txd->txr;
-	txr->hn_txeof = 1;
+	txr->hn_has_txeof = 1;
 	hn_txdesc_put(txr, txd);
 }
 
@@ -691,11 +683,11 @@ netvsc_channel_rollup(struct hv_device *

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

From owner-svn-src-projects@freebsd.org  Tue Feb 23 16:01:39 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 310FCAB2A57
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 23 Feb 2016 16:01:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F177CE7C;
 Tue, 23 Feb 2016 16:01:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1NG1cbX044637;
 Tue, 23 Feb 2016 16:01:38 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1NG1YTE044602;
 Tue, 23 Feb 2016 16:01:34 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602231601.u1NG1YTE044602@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 23 Feb 2016 16:01:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295926 - in projects/release-pkg: contrib/binutils/bfd
 contrib/libarchive/libarchive lib/libc/db/hash sys/arm/arm
 sys/arm/freescale/imx sys/arm/include sys/arm64/conf sys/boot/fdt/dts/...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Feb 2016 16:01:39 -0000

Author: gjb
Date: Tue Feb 23 16:01:34 2016
New Revision: 295926
URL: https://svnweb.freebsd.org/changeset/base/295926

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/sys/riscv/riscv/stack_machdep.c
     - copied unchanged from r295925, head/sys/riscv/riscv/stack_machdep.c
Modified:
  projects/release-pkg/contrib/binutils/bfd/elf.c
  projects/release-pkg/contrib/libarchive/libarchive/archive_read.c
  projects/release-pkg/lib/libc/db/hash/hash.c
  projects/release-pkg/sys/arm/arm/cpu_asm-v6.S
  projects/release-pkg/sys/arm/arm/trap-v4.c
  projects/release-pkg/sys/arm/freescale/imx/imx6_machdep.c
  projects/release-pkg/sys/arm/include/cpu-v6.h
  projects/release-pkg/sys/arm64/conf/GENERIC
  projects/release-pkg/sys/boot/fdt/dts/riscv/qemu.dts
  projects/release-pkg/sys/boot/fdt/dts/riscv/spike.dts
  projects/release-pkg/sys/boot/uboot/lib/net.c
  projects/release-pkg/sys/compat/cloudabi/cloudabi_mem.c
  projects/release-pkg/sys/conf/files.riscv
  projects/release-pkg/sys/conf/kern.post.mk
  projects/release-pkg/sys/dev/e1000/if_em.c
  projects/release-pkg/sys/dev/e1000/if_em.h
  projects/release-pkg/sys/dev/e1000/if_igb.c
  projects/release-pkg/sys/dev/e1000/if_igb.h
  projects/release-pkg/sys/dev/e1000/if_lem.h
  projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/release-pkg/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c
  projects/release-pkg/sys/dev/uart/uart_dev_lpc.c
  projects/release-pkg/sys/dev/usb/usb_hid.c
  projects/release-pkg/sys/dev/usb/usbdevs
  projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c
  projects/release-pkg/sys/powerpc/mpc85xx/mpc85xx.c
  projects/release-pkg/sys/riscv/include/atomic.h
  projects/release-pkg/sys/riscv/riscv/machdep.c
  projects/release-pkg/sys/riscv/riscv/timer.c
  projects/release-pkg/sys/riscv/riscv/trap.c
  projects/release-pkg/usr.sbin/iostat/iostat.c
  projects/release-pkg/usr.sbin/pwd_mkdb/pwd_mkdb.c
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/contrib/binutils/   (props changed)
  projects/release-pkg/contrib/libarchive/   (props changed)
  projects/release-pkg/contrib/libarchive/libarchive/   (props changed)
  projects/release-pkg/lib/libc/   (props changed)
  projects/release-pkg/sys/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/sys/dev/hyperv/   (props changed)

Modified: projects/release-pkg/contrib/binutils/bfd/elf.c
==============================================================================
--- projects/release-pkg/contrib/binutils/bfd/elf.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/contrib/binutils/bfd/elf.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun
 	shndx_count++;
 
   ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf)
-			+ (indbufend - indbuf) * sizeof (*ssymbuf));
+			+ (indbufend - indbuf) * sizeof (*ssym));
   if (ssymbuf == NULL)
     {
       free (indbuf);
       return NULL;
     }
 
-  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count);
+  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
   ssymbuf->ssym = NULL;
   ssymbuf->count = shndx_count;
   ssymbuf->st_shndx = 0;

Modified: projects/release-pkg/contrib/libarchive/libarchive/archive_read.c
==============================================================================
--- projects/release-pkg/contrib/libarchive/libarchive/archive_read.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/contrib/libarchive/libarchive/archive_read.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
 static int
 choose_filters(struct archive_read *a)
 {
-	int number_bidders, i, bid, best_bid;
+	int number_bidders, i, bid, best_bid, n;
 	struct archive_read_filter_bidder *bidder, *best_bidder;
 	struct archive_read_filter *filter;
 	ssize_t avail;
 	int r;
 
-	for (;;) {
+	for (n = 0; n < 25; ++n) {
 		number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
 		best_bid = 0;
@@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
 			return (ARCHIVE_FATAL);
 		}
 	}
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Input requires too many filters for decoding");
+	return (ARCHIVE_FATAL);
 }
 
 /*

Modified: projects/release-pkg/lib/libc/db/hash/hash.c
==============================================================================
--- projects/release-pkg/lib/libc/db/hash/hash.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/lib/libc/db/hash/hash.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -422,8 +422,10 @@ hdestroy(HTAB *hashp)
 	if (hashp->tmp_buf)
 		free(hashp->tmp_buf);
 
-	if (hashp->fp != -1)
+	if (hashp->fp != -1) {
+		(void)_fsync(hashp->fp);
 		(void)_close(hashp->fp);
+	}
 
 	free(hashp);
 
@@ -458,6 +460,8 @@ hash_sync(const DB *dbp, u_int32_t flags
 		return (0);
 	if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
 		return (ERROR);
+	if (hashp->fp != -1 && _fsync(hashp->fp) != 0)
+		return (ERROR);
 	hashp->new_file = 0;
 	return (0);
 }

Modified: projects/release-pkg/sys/arm/arm/cpu_asm-v6.S
==============================================================================
--- projects/release-pkg/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 16:01:34 2016	(r295926)
@@ -34,16 +34,9 @@
 #include <machine/armreg.h>
 #include <machine/sysreg.h>
 
-#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
-	mrc CP15_TPIDRPRW(tmp); \
-	add   tmp, tmp, #(TD_PCB)
-#else
-.Lcurpcb:
-	.word _C_LABEL(__pcpu) + PC_CURPCB
-#define GET_PCB(tmp) \
-	ldr   tmp, .Lcurpcb
-#endif
+	mrc	CP15_TPIDRPRW(tmp); \
+	add	tmp, tmp, #(TD_PCB)
 
 /*
  * Define cache functions used by startup code, which counts on the fact that

Modified: projects/release-pkg/sys/arm/arm/trap-v4.c
==============================================================================
--- projects/release-pkg/sys/arm/arm/trap-v4.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/arm/arm/trap-v4.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/acle-compat.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/machdep.h>
@@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int 
 	}
 
 	/*
-	 * We need to know whether the page should be mapped as R or R/W.  On
-	 * armv6 and later the fault status register indicates whether the
-	 * access was a read or write.  Prior to armv6, we know that a
-	 * permission fault can only be the result of a write to a read-only
-	 * location, so we can deal with those quickly.  Otherwise we need to
-	 * disassemble the faulting instruction to determine if it was a write.
+	 * We need to know whether the page should be mapped as R or R/W.
+	 * On armv4, the fault status register does not indicate whether
+	 * the access was a read or write.  We know that a permission fault
+	 * can only be the result of a write to a read-only location, so we
+	 * can deal with those quickly.  Otherwise we need to disassemble
+	 * the faulting instruction to determine if it was a write.
 	 */
-#if __ARM_ARCH >= 6
-	ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
-#else
 	if (IS_PERMISSION_FAULT(fsr))
 		ftype = VM_PROT_WRITE;
 	else {
@@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int 
 				ftype = VM_PROT_READ;
 		}
 	}
-#endif
 
 	/*
 	 * See if the fault is as a result of ref/mod emulation,

Modified: projects/release-pkg/sys/arm/freescale/imx/imx6_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/freescale/imx/imx6_machdep.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/arm/freescale/imx/imx6_machdep.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -94,6 +94,74 @@ fdt_pic_decode_t fdt_pic_table[] = {
 };
 #endif
 
+/*
+ * Fix FDT data related to interrupts.
+ *
+ * Driven by the needs of linux and its drivers (as always), the published FDT
+ * data for imx6 now sets the interrupt parent for most devices to the GPC
+ * interrupt controller, which is for use when the chip is in deep-sleep mode.
+ * We don't support deep sleep or have a GPC-PIC driver; we need all interrupts
+ * to be handled by the GIC.
+ *
+ * Luckily, the change to the FDT data was to assign the GPC as the interrupt
+ * parent for the soc node and letting that get inherited by all other devices
+ * (except a few that directly name GIC as their interrupt parent).  So we can
+ * set the world right by just changing the interrupt-parent property of the soc
+ * node to refer to GIC instead of GPC.  This will get us by until we write our
+ * own GPC driver (or until linux changes its mind and the FDT data again).
+ *
+ * We validate that we have data that looks like we expect before changing it:
+ *  - SOC node exists and has GPC as its interrupt parent.
+ *  - GPC node exists and has GIC as its interrupt parent.
+ *  - GIC node exists and is its own interrupt parent.
+ *
+ * This applies to all models of imx6.  Luckily all of them have the devices
+ * involved at the same addresses on the same busses, so we don't need any
+ * per-soc logic.  We handle this at platform attach time rather than via the
+ * fdt_fixup_table, because the latter requires matching on the FDT "model"
+ * property, and this applies to all boards including those not yet invented.
+ */
+static void
+fix_fdt_interrupt_data(void)
+{
+	phandle_t gicipar, gicnode, gicxref;
+	phandle_t gpcipar, gpcnode, gpcxref;
+	phandle_t socipar, socnode;
+	int result;
+
+	socnode = OF_finddevice("/soc");
+	if (socnode == -1)
+	    return;
+	result = OF_getencprop(socnode, "interrupt-parent", &socipar,
+	    sizeof(socipar));
+	if (result <= 0)
+		return;
+
+	gicnode = OF_finddevice("/soc/interrupt-controller@00a01000");
+	if (gicnode == -1)
+		return;
+	result = OF_getencprop(gicnode, "interrupt-parent", &gicipar,
+	    sizeof(gicipar));
+	if (result <= 0)
+		return;
+	gicxref = OF_xref_from_node(gicnode);
+
+	gpcnode = OF_finddevice("/soc/aips-bus@02000000/gpc@020dc000");
+	if (gpcnode == -1)
+		return;
+	result = OF_getencprop(gpcnode, "interrupt-parent", &gpcipar,
+	    sizeof(gpcipar));
+	if (result <= 0)
+		return;
+	gpcxref = OF_xref_from_node(gpcnode);
+
+	if (socipar != gpcxref || gpcipar != gicxref || gicipar != gicxref)
+		return;
+
+	gicxref = cpu_to_fdt32(gicxref);
+	OF_setprop(socnode, "interrupt-parent", &gicxref, sizeof(gicxref));
+}
+
 static vm_offset_t
 imx6_lastaddr(platform_t plat)
 {
@@ -104,6 +172,10 @@ imx6_lastaddr(platform_t plat)
 static int
 imx6_attach(platform_t plat)
 {
+
+	/* Fix soc interrupt-parent property. */
+	fix_fdt_interrupt_data();
+
 	/* Inform the MPCore timer driver that its clock is variable. */
 	arm_tmr_change_frequency(ARM_TMR_FREQUENCY_VARIES);
 

Modified: projects/release-pkg/sys/arm/include/cpu-v6.h
==============================================================================
--- projects/release-pkg/sys/arm/include/cpu-v6.h	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/arm/include/cpu-v6.h	Tue Feb 23 16:01:34 2016	(r295926)
@@ -177,15 +177,12 @@ _RF0(cp15_dfar_get, CP15_DFAR(%0))
 _RF0(cp15_ifar_get, CP15_IFAR(%0))
 _RF0(cp15_l2ctlr_get, CP15_L2CTLR(%0))
 #endif
-/* ARMv6+ and XScale */
 _RF0(cp15_actlr_get, CP15_ACTLR(%0))
 _WF1(cp15_actlr_set, CP15_ACTLR(%0))
-#if __ARM_ARCH >= 6
 _WF1(cp15_ats1cpr_set, CP15_ATS1CPR(%0))
 _WF1(cp15_ats1cpw_set, CP15_ATS1CPW(%0))
 _RF0(cp15_par_get, CP15_PAR(%0))
 _RF0(cp15_sctlr_get, CP15_SCTLR(%0))
-#endif
 
 /*CPU id registers */
 _RF0(cp15_midr_get, CP15_MIDR(%0))

Modified: projects/release-pkg/sys/arm64/conf/GENERIC
==============================================================================
--- projects/release-pkg/sys/arm64/conf/GENERIC	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/arm64/conf/GENERIC	Tue Feb 23 16:01:34 2016	(r295926)
@@ -103,6 +103,7 @@ device		mii
 device		miibus		# MII bus support
 device		em		# Intel PRO/1000 Gigabit Ethernet Family
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+device		ix		# Intel 10Gb Ethernet Family
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		vnic		# Cavium ThunderX NIC
 

Modified: projects/release-pkg/sys/boot/fdt/dts/riscv/qemu.dts
==============================================================================
--- projects/release-pkg/sys/boot/fdt/dts/riscv/qemu.dts	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/boot/fdt/dts/riscv/qemu.dts	Tue Feb 23 16:01:34 2016	(r295926)
@@ -49,7 +49,7 @@
 
 	memory {
 		device_type = "memory";
-		reg = <0x0 0x8000000>; /* 128MB at 0x0 */
+		reg = <0x0 0x40000000>; /* 1GB at 0x0 */
 	};
 
 	soc {

Modified: projects/release-pkg/sys/boot/fdt/dts/riscv/spike.dts
==============================================================================
--- projects/release-pkg/sys/boot/fdt/dts/riscv/spike.dts	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/boot/fdt/dts/riscv/spike.dts	Tue Feb 23 16:01:34 2016	(r295926)
@@ -49,7 +49,7 @@
 
 	memory {
 		device_type = "memory";
-		reg = <0x0 0x8000000>; /* 128MB at 0x0 */
+		reg = <0x0 0x40000000>; /* 1GB at 0x0 */
 	};
 
 	soc {

Modified: projects/release-pkg/sys/boot/uboot/lib/net.c
==============================================================================
--- projects/release-pkg/sys/boot/uboot/lib/net.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/boot/uboot/lib/net.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -108,9 +108,19 @@ get_env_net_params()
 	char *envstr;
 	in_addr_t rootaddr, serveraddr;
 
-	/* Silently get out right away if we don't have rootpath. */
-	if (ub_env_get("rootpath") == NULL)
+	/*
+	 * Silently get out right away if we don't have rootpath, because none
+	 * of the other info we obtain below is sufficient to boot without it.
+	 *
+	 * If we do have rootpath, copy it into the global var and also set
+	 * dhcp.root-path in the env.  If we don't get all the other info from
+	 * the u-boot env below, we will still try dhcp/bootp, but the server-
+	 * provided path will not replace the user-provided value we set here.
+	 */
+	if ((envstr = ub_env_get("rootpath")) == NULL)
 		return;
+	strlcpy(rootpath, envstr, sizeof(rootpath));
+	setenv("dhcp.root-path", rootpath, 0);
 
 	/*
 	 * Our own IP address must be valid.  Silently get out if it's not set,
@@ -154,9 +164,6 @@ get_env_net_params()
 	 * There must be a rootpath.  It may be ip:/path or it may be just the
 	 * path in which case the ip needs to be in serverip.
 	 */
-	if ((envstr = ub_env_get("rootpath")) == NULL)
-		return;
-	strncpy(rootpath, envstr, sizeof(rootpath) - 1);
 	rootaddr = net_parse_rootpath();
 	if (rootaddr == INADDR_NONE)
 		rootaddr = serveraddr;

Modified: projects/release-pkg/sys/compat/cloudabi/cloudabi_mem.c
==============================================================================
--- projects/release-pkg/sys/compat/cloudabi/cloudabi_mem.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/compat/cloudabi/cloudabi_mem.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -35,18 +35,26 @@ __FBSDID("$FreeBSD$");
 
 /* Converts CloudABI's memory protection flags to FreeBSD's. */
 static int
-convert_mprot(cloudabi_mprot_t in)
+convert_mprot(cloudabi_mprot_t in, int *out)
 {
-	int out;
 
-	out = 0;
+	/* Unknown protection flags. */
+	if ((in & ~(CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE |
+	    CLOUDABI_PROT_READ)) != 0)
+		return (ENOTSUP);
+	/* W^X: Write and exec cannot be enabled at the same time. */
+	if ((in & (CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE)) ==
+	    (CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE))
+		return (ENOTSUP);
+
+	*out = 0;
 	if (in & CLOUDABI_PROT_EXEC)
-		out |= PROT_EXEC;
+		*out |= PROT_EXEC;
 	if (in & CLOUDABI_PROT_WRITE)
-		out |= PROT_WRITE;
+		*out |= PROT_WRITE;
 	if (in & CLOUDABI_PROT_READ)
-		out |= PROT_READ;
-	return (out);
+		*out |= PROT_READ;
+	return (0);
 }
 
 int
@@ -98,10 +106,10 @@ cloudabi_sys_mem_map(struct thread *td, 
 	struct mmap_args mmap_args = {
 		.addr	= uap->addr,
 		.len	= uap->len,
-		.prot	= convert_mprot(uap->prot),
 		.fd	= uap->fd,
 		.pos	= uap->off
 	};
+	int error;
 
 	/* Translate flags. */
 	if (uap->flags & CLOUDABI_MAP_ANON)
@@ -113,6 +121,11 @@ cloudabi_sys_mem_map(struct thread *td, 
 	if (uap->flags & CLOUDABI_MAP_SHARED)
 		mmap_args.flags |= MAP_SHARED;
 
+	/* Translate protection. */
+	error = convert_mprot(uap->prot, &mmap_args.prot);
+	if (error != 0)
+		return (error);
+
 	return (sys_mmap(td, &mmap_args));
 }
 
@@ -123,8 +136,13 @@ cloudabi_sys_mem_protect(struct thread *
 	struct mprotect_args mprotect_args = {
 		.addr	= uap->addr,
 		.len	= uap->len,
-		.prot	= convert_mprot(uap->prot),
 	};
+	int error;
+
+	/* Translate protection. */
+	error = convert_mprot(uap->prot, &mprotect_args.prot);
+	if (error != 0)
+		return (error);
 
 	return (sys_mprotect(td, &mprotect_args));
 }

Modified: projects/release-pkg/sys/conf/files.riscv
==============================================================================
--- projects/release-pkg/sys/conf/files.riscv	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/conf/files.riscv	Tue Feb 23 16:01:34 2016	(r295926)
@@ -34,9 +34,10 @@ riscv/riscv/machdep.c		standard
 riscv/riscv/mem.c		standard
 riscv/riscv/nexus.c		standard
 riscv/riscv/pmap.c		standard
-riscv/riscv/sys_machdep.c	standard
+riscv/riscv/stack_machdep.c	optional	ddb | stack
 riscv/riscv/support.S		standard
 riscv/riscv/swtch.S		standard
+riscv/riscv/sys_machdep.c	standard
 riscv/riscv/trap.c		standard
 riscv/riscv/timer.c		standard
 riscv/riscv/uio_machdep.c	standard

Modified: projects/release-pkg/sys/conf/kern.post.mk
==============================================================================
--- projects/release-pkg/sys/conf/kern.post.mk	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/conf/kern.post.mk	Tue Feb 23 16:01:34 2016	(r295926)
@@ -222,10 +222,9 @@ _MKDEPCC:= ${CC:N${CCACHE_BIN}}
 SRCS=	assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
 	${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	${MFILES:T:S/.m$/.h/}
-DEPENDFILES=	.depend
+DEPENDFILES=	.depend .depend.*
 .if ${MK_FAST_DEPEND} == "yes" && \
     (${.MAKE.MODE:Unormal:Mmeta} == "" || ${.MAKE.MODE:Unormal:Mnofilemon} != "")
-DEPENDFILES+=	.depend.*
 DEPEND_CFLAGS+=	-MD -MP -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=	-MT${.TARGET}
 .if defined(.PARSEDIR)

Modified: projects/release-pkg/sys/dev/e1000/if_em.c
==============================================================================
--- projects/release-pkg/sys/dev/e1000/if_em.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/e1000/if_em.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -3193,9 +3193,11 @@ em_setup_interface(device_t dev, struct 
 	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	if_setioctlfn(ifp, em_ioctl);
 	if_setgetcounterfn(ifp, em_get_counter);
+
 	/* TSO parameters */
 	ifp->if_hw_tsomax = IP_MAXPACKET;
-	ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER;
+	/* Take m_pullup(9)'s in em_xmit() w/ TSO into acount. */
+	ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER - 5;
 	ifp->if_hw_tsomaxsegsize = EM_TSO_SEG_SIZE;
 
 #ifdef EM_MULTIQUEUE

Modified: projects/release-pkg/sys/dev/e1000/if_em.h
==============================================================================
--- projects/release-pkg/sys/dev/e1000/if_em.h	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/e1000/if_em.h	Tue Feb 23 16:01:34 2016	(r295926)
@@ -269,7 +269,7 @@
 #define HW_DEBUGOUT1(S, A)          if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)       if (DEBUG_HW) printf(S "\n", A, B)
 
-#define EM_MAX_SCATTER		64
+#define EM_MAX_SCATTER		40
 #define EM_VFTA_SIZE		128
 #define EM_TSO_SIZE		(65535 + sizeof(struct ether_vlan_header))
 #define EM_TSO_SEG_SIZE		4096	/* Max dma segment size */

Modified: projects/release-pkg/sys/dev/e1000/if_igb.c
==============================================================================
--- projects/release-pkg/sys/dev/e1000/if_igb.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/e1000/if_igb.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -3139,6 +3139,12 @@ igb_setup_interface(device_t dev, struct
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = igb_ioctl;
 	ifp->if_get_counter = igb_get_counter;
+
+	/* TSO parameters */
+	ifp->if_hw_tsomax = IP_MAXPACKET;
+	ifp->if_hw_tsomaxsegcount = IGB_MAX_SCATTER;
+	ifp->if_hw_tsomaxsegsize = IGB_TSO_SEG_SIZE;
+
 #ifndef IGB_LEGACY_TX
 	ifp->if_transmit = igb_mq_start;
 	ifp->if_qflush = igb_qflush;

Modified: projects/release-pkg/sys/dev/e1000/if_igb.h
==============================================================================
--- projects/release-pkg/sys/dev/e1000/if_igb.h	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/e1000/if_igb.h	Tue Feb 23 16:01:34 2016	(r295926)
@@ -278,7 +278,7 @@
 #define HW_DEBUGOUT1(S, A)          if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)       if (DEBUG_HW) printf(S "\n", A, B)
 
-#define IGB_MAX_SCATTER		64
+#define IGB_MAX_SCATTER		40
 #define IGB_VFTA_SIZE		128
 #define IGB_BR_SIZE		4096	/* ring buf size */
 #define IGB_TSO_SIZE		(65535 + sizeof(struct ether_vlan_header))

Modified: projects/release-pkg/sys/dev/e1000/if_lem.h
==============================================================================
--- projects/release-pkg/sys/dev/e1000/if_lem.h	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/e1000/if_lem.h	Tue Feb 23 16:01:34 2016	(r295926)
@@ -236,10 +236,8 @@
 #define HW_DEBUGOUT1(S, A)          if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)       if (DEBUG_HW) printf(S "\n", A, B)
 
-#define EM_MAX_SCATTER		64
+#define EM_MAX_SCATTER		40
 #define EM_VFTA_SIZE		128
-#define EM_TSO_SIZE		(65535 + sizeof(struct ether_vlan_header))
-#define EM_TSO_SEG_SIZE		4096	/* Max dma segment size */
 #define EM_MSIX_MASK		0x01F00000 /* For 82574 use */
 #define ETH_ZLEN		60
 #define ETH_ADDR_LEN		6

Modified: projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -905,6 +905,68 @@ done:
 }
 
 /*
+ * NOTE:
+ * If this function fails, then txd will be freed, but the mbuf
+ * associated w/ the txd will _not_ be freed.
+ */
+static int
+hn_send_pkt(struct ifnet *ifp, struct hv_device *device_ctx,
+    struct hn_tx_ring *txr, struct hn_txdesc *txd)
+{
+	int error, send_failed = 0;
+
+again:
+	/*
+	 * Make sure that txd is not freed before ETHER_BPF_MTAP.
+	 */
+	hn_txdesc_hold(txd);
+	error = hv_nv_on_send(device_ctx, &txd->netvsc_pkt);
+	if (!error) {
+		ETHER_BPF_MTAP(ifp, txd->m);
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	}
+	hn_txdesc_put(txr, txd);
+
+	if (__predict_false(error)) {
+		int freed;
+
+		/*
+		 * This should "really rarely" happen.
+		 *
+		 * XXX Too many RX to be acked or too many sideband
+		 * commands to run?  Ask netvsc_channel_rollup()
+		 * to kick start later.
+		 */
+		txr->hn_has_txeof = 1;
+		if (!send_failed) {
+			txr->hn_send_failed++;
+			send_failed = 1;
+			/*
+			 * Try sending again after set hn_has_txeof;
+			 * in case that we missed the last
+			 * netvsc_channel_rollup().
+			 */
+			goto again;
+		}
+		if_printf(ifp, "send failed\n");
+
+		/*
+		 * Caller will perform further processing on the
+		 * associated mbuf, so don't free it in hn_txdesc_put();
+		 * only unload it from the DMA map in hn_txdesc_put(),
+		 * if it was loaded.
+		 */
+		txd->m = NULL;
+		freed = hn_txdesc_put(txr, txd);
+		KASSERT(freed != 0,
+		    ("fail to free txd upon send error"));
+
+		txr->hn_send_failed++;
+	}
+	return error;
+}
+
+/*
  * Start a transmit of one or more packets
  */
 static int
@@ -922,9 +984,9 @@ hn_start_locked(struct hn_tx_ring *txr, 
 		return 0;
 
 	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
-		int error, send_failed = 0;
 		struct hn_txdesc *txd;
 		struct mbuf *m_head;
+		int error;
 
 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
 		if (m_head == NULL)
@@ -936,14 +998,14 @@ hn_start_locked(struct hn_tx_ring *txr, 
 			 * dispatch this packet sending (and sending of any
 			 * following up packets) to tx taskqueue.
 			 */
-			IF_PREPEND(&ifp->if_snd, m_head);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			return 1;
 		}
 
 		txd = hn_txdesc_get(txr);
 		if (txd == NULL) {
 			txr->hn_no_txdescs++;
-			IF_PREPEND(&ifp->if_snd, m_head);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			atomic_set_int(&ifp->if_drv_flags, IFF_DRV_OACTIVE);
 			break;
 		}
@@ -953,53 +1015,11 @@ hn_start_locked(struct hn_tx_ring *txr, 
 			/* Both txd and m_head are freed */
 			continue;
 		}
-again:
-		/*
-		 * Make sure that txd is not freed before ETHER_BPF_MTAP.
-		 */
-		hn_txdesc_hold(txd);
-		error = hv_nv_on_send(device_ctx, &txd->netvsc_pkt);
-		if (!error) {
-			ETHER_BPF_MTAP(ifp, m_head);
-			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
-		}
-		hn_txdesc_put(txr, txd);
 
+		error = hn_send_pkt(ifp, device_ctx, txr, txd);
 		if (__predict_false(error)) {
-			int freed;
-
-			/*
-			 * This should "really rarely" happen.
-			 *
-			 * XXX Too many RX to be acked or too many sideband
-			 * commands to run?  Ask netvsc_channel_rollup()
-			 * to kick start later.
-			 */
-			txr->hn_has_txeof = 1;
-			if (!send_failed) {
-				txr->hn_send_failed++;
-				send_failed = 1;
-				/*
-				 * Try sending again after set hn_has_txeof;
-				 * in case that we missed the last
-				 * netvsc_channel_rollup().
-				 */
-				goto again;
-			}
-			if_printf(ifp, "send failed\n");
-
-			/*
-			 * This mbuf will be prepended, don't free it
-			 * in hn_txdesc_put(); only unload it from the
-			 * DMA map in hn_txdesc_put(), if it was loaded.
-			 */
-			txd->m = NULL;
-			freed = hn_txdesc_put(txr, txd);
-			KASSERT(freed != 0,
-			    ("fail to free txd upon send error"));
-
-			txr->hn_send_failed++;
-			IF_PREPEND(&ifp->if_snd, m_head);
+			/* txd is freed, but m_head is not */
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			atomic_set_int(&ifp->if_drv_flags, IFF_DRV_OACTIVE);
 			break;
 		}

Modified: projects/release-pkg/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- projects/release-pkg/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -810,8 +810,8 @@ hv_storvsc_rescan_target(struct storvsc_
 
 	if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid, targetid,
 	    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
-		printf("unable to create path for rescan, pathid: %d,"
-		    "targetid: %d\n", pathid, targetid);
+		printf("unable to create path for rescan, pathid: %u,"
+		    "targetid: %u\n", pathid, targetid);
 		xpt_free_ccb(ccb);
 		return;
 	}

Modified: projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c
==============================================================================
--- projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -54,10 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_cpu.h>
 #include <dev/uart/uart_cpu_fdt.h>
 
-#ifdef __aarch64__
-extern bus_space_tag_t fdtbus_bs_tag;
-#endif
-
 /*
  * UART console routines.
  */
@@ -136,9 +132,6 @@ uart_cpu_getdev(int devtype, struct uart
 	char *cp;
 	int err;
 
-	uart_bus_space_mem = fdtbus_bs_tag;
-	uart_bus_space_io = NULL;
-
 	/* Allow overriding the FDT using the environment. */
 	class = &uart_ns8250_class;
 	err = uart_getenv(devtype, di, class);
@@ -195,10 +188,8 @@ uart_cpu_getdev(int devtype, struct uart
 	if (uart_fdt_get_shift(node, &shift) != 0)
 		shift = uart_getregshift(class);
 
-	if (OF_getprop(node, "current-speed", &br, sizeof(br)) <= 0)
+	if (OF_getencprop(node, "current-speed", &br, sizeof(br)) <= 0)
 		br = 0;
-	else
-		br = fdt32_to_cpu(br);
 
 	/*
 	 * Finalize configuration.
@@ -212,5 +203,9 @@ uart_cpu_getdev(int devtype, struct uart
 	di->stopbits = 1;
 	di->parity = UART_PARITY_NONE;
 
-	return (OF_decode_addr(node, 0, &di->bas.bst, &di->bas.bsh, NULL));
+	err = OF_decode_addr(node, 0, &di->bas.bst, &di->bas.bsh, NULL);
+	uart_bus_space_mem = di->bas.bst;
+	uart_bus_space_io = NULL;
+
+	return (err);
 }

Modified: projects/release-pkg/sys/dev/uart/uart_dev_lpc.c
==============================================================================
--- projects/release-pkg/sys/dev/uart/uart_dev_lpc.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/uart/uart_dev_lpc.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <machine/bus.h>
-#include <machine/fdt.h>
 
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
@@ -49,9 +48,9 @@ __FBSDID("$FreeBSD$");
 static bus_space_handle_t bsh_clkpwr;
 
 #define	lpc_ns8250_get_clkreg(_bas, _reg)	\
-    bus_space_read_4(fdtbus_bs_tag, bsh_clkpwr, (_reg))
+    bus_space_read_4((_bas)->bst, bsh_clkpwr, (_reg))
 #define	lpc_ns8250_set_clkreg(_bas, _reg, _val)	\
-    bus_space_write_4(fdtbus_bs_tag, bsh_clkpwr, (_reg), (_val))
+    bus_space_write_4((_bas)->bst, bsh_clkpwr, (_reg), (_val))
 
 /*
  * Clear pending interrupts. THRE is cleared by reading IIR. Data
@@ -292,7 +291,7 @@ lpc_ns8250_init(struct uart_bas *bas, in
 	u_long	clkmode;
 	
 	/* Enable UART clock */
-	bus_space_map(fdtbus_bs_tag, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
+	bus_space_map(bas->bst, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
 	    &bsh_clkpwr);
 	clkmode = lpc_ns8250_get_clkreg(bas, LPC_UART_CLKMODE);
 	lpc_ns8250_set_clkreg(bas, LPC_UART_CLKMODE, clkmode | 

Modified: projects/release-pkg/sys/dev/usb/usb_hid.c
==============================================================================
--- projects/release-pkg/sys/dev/usb/usb_hid.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/usb/usb_hid.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -354,7 +354,8 @@ hid_get_item(struct hid_data *s, struct 
 					/* range check usage count */
 					if (c->loc.count > 255) {
 						DPRINTFN(0, "Number of "
-						    "items truncated to 255\n");
+						    "items(%u) truncated to 255\n",
+						    (unsigned)(c->loc.count));
 						s->ncount = 255;
 					} else
 						s->ncount = c->loc.count;

Modified: projects/release-pkg/sys/dev/usb/usbdevs
==============================================================================
--- projects/release-pkg/sys/dev/usb/usbdevs	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/usb/usbdevs	Tue Feb 23 16:01:34 2016	(r295926)
@@ -835,6 +835,7 @@ product ABOCOM RT2573_4		0xb21e	RT2573
 product ABOCOM RTL8188CU_1	0x8188  RTL8188CU
 product ABOCOM RTL8188CU_2	0x8189  RTL8188CU
 product ABOCOM RTL8192CU	0x8178  RTL8192CU
+product ABOCOM RTL8188EU	0x8179  RTL8188EU
 product ABOCOM WUG2700		0xb21f	WUG2700
 
 /* Acton Research Corp. */

Modified: projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -176,6 +176,7 @@ static const STRUCT_USB_HOST_ID urtwn_de
 	URTWN_DEV(TRENDNET,	RTL8192CU),
 	URTWN_DEV(ZYXEL,	RTL8192CU),
 	/* URTWN_RTL8188E */
+	URTWN_RTL8188E_DEV(ABOCOM,	RTL8188EU),
 	URTWN_RTL8188E_DEV(DLINK,	DWA123D1),
 	URTWN_RTL8188E_DEV(DLINK,	DWA125D1),
 	URTWN_RTL8188E_DEV(ELECOM,	WDC150SU2M),

Modified: projects/release-pkg/sys/powerpc/mpc85xx/mpc85xx.c
==============================================================================
--- projects/release-pkg/sys/powerpc/mpc85xx/mpc85xx.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/powerpc/mpc85xx/mpc85xx.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -157,7 +157,8 @@ law_find_free(void)
 	return (i);
 }
 
-#define	_LAW_SR(trgt,size)	(0x80000000 | (trgt << 20) | (ffsl(size) - 2))
+#define	_LAW_SR(trgt,size)	(0x80000000 | (trgt << 20) | \
+				(flsl(size + (size - 1)) - 2))
 
 int
 law_enable(int trgt, uint64_t bar, uint32_t size)

Modified: projects/release-pkg/sys/riscv/include/atomic.h
==============================================================================
--- projects/release-pkg/sys/riscv/include/atomic.h	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/riscv/include/atomic.h	Tue Feb 23 16:01:34 2016	(r295926)
@@ -399,10 +399,6 @@ atomic_store_rel_64(volatile uint64_t *p
 	*p = val;
 }
 
-#define	atomic_add_acq_int	atomic_add_acq_32
-#define	atomic_clear_acq_int	atomic_clear_acq_32
-#define	atomic_cmpset_acq_int	atomic_cmpset_acq_32
-
 #define	atomic_add_acq_long		atomic_add_acq_64
 #define	atomic_clear_acq_long		atomic_add_acq_64
 #define	atomic_cmpset_acq_long		atomic_cmpset_acq_64

Modified: projects/release-pkg/sys/riscv/riscv/machdep.c
==============================================================================
--- projects/release-pkg/sys/riscv/riscv/machdep.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/riscv/riscv/machdep.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -555,7 +555,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, 
 		tf->tf_ra = (register_t)(sysent->sv_psstrings -
 		    *(sysent->sv_szsigcode));
 
-	CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr,
+	CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_sepc,
 	    tf->tf_sp);
 
 	PROC_LOCK(p);
@@ -729,9 +729,13 @@ fake_preload_metadata(struct riscv_bootp
 void
 initriscv(struct riscv_bootparams *rvbp)
 {
+	struct mem_region mem_regions[FDT_MEM_REGIONS];
 	vm_offset_t lastaddr;
+	int mem_regions_sz;
 	vm_size_t kernlen;
+	uint32_t memsize;
 	caddr_t kmdp;
+	int i;
 
 	/* Set the module data location */
 	lastaddr = fake_preload_metadata(rvbp);
@@ -752,11 +756,12 @@ initriscv(struct riscv_bootparams *rvbp)
 	/* Load the physical memory ranges */
 	physmap_idx = 0;
 
-	/*
-	 * RISCVTODO: figure out whether platform provides ranges,
-	 * or grab from FDT.
-	 */
-	add_physmap_entry(0, 0x8000000, physmap, &physmap_idx);
+	/* Grab physical memory regions information from device tree. */
+	if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, &memsize) != 0)
+		panic("Cannot get physical memory regions");
+	for (i = 0; i < mem_regions_sz; i++)
+		add_physmap_entry(mem_regions[i].mr_start,
+		    mem_regions[i].mr_size, physmap, &physmap_idx);
 
 	/* Set the pcpu data, this is needed by pmap_bootstrap */
 	pcpup = &__pcpu[0];

Copied: projects/release-pkg/sys/riscv/riscv/stack_machdep.c (from r295925, head/sys/riscv/riscv/stack_machdep.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/sys/riscv/riscv/stack_machdep.c	Tue Feb 23 16:01:34 2016	(r295926, copy of r295925, head/sys/riscv/riscv/stack_machdep.c)
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2016 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * 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$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/stack.h>
+
+#include <machine/vmparam.h>
+#include <machine/pcb.h>
+
+void
+stack_save_td(struct stack *st, struct thread *td)
+{
+
+}
+
+int
+stack_save_td_running(struct stack *st, struct thread *td)
+{
+
+	return (EOPNOTSUPP);
+}
+
+void
+stack_save(struct stack *st)
+{
+
+}

Modified: projects/release-pkg/sys/riscv/riscv/timer.c
==============================================================================
--- projects/release-pkg/sys/riscv/riscv/timer.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/riscv/riscv/timer.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -145,8 +145,9 @@ riscv_tmr_intr(void *arg)
 
 	/*
 	 * Clear interrupt pending bit.
-	 * Note sip register is unimplemented in Spike simulator,
-	 * so use machine command to clear in mip.
+	 * Note: SIP_STIP bit is not implemented in sip register
+	 * in Spike simulator, so use machine command to clear
+	 * interrupt pending bit in mip.
 	 */
 	machine_command(ECALL_CLEAR_PENDING, 0);
 

Modified: projects/release-pkg/sys/riscv/riscv/trap.c
==============================================================================
--- projects/release-pkg/sys/riscv/riscv/trap.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/sys/riscv/riscv/trap.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -270,6 +270,17 @@ do_trap_supervisor(struct trapframe *fra
 	case EXCP_INSTR_ACCESS_FAULT:
 		data_abort(frame, 0);
 		break;
+	case EXCP_INSTR_BREAKPOINT:
+#ifdef KDB
+		kdb_trap(exception, 0, frame);
+#else
+		dump_regs(frame);
+		panic("No debugger in kernel.\n");
+#endif
+	case EXCP_INSTR_ILLEGAL:
+		dump_regs(frame);
+		panic("Illegal instruction at %x\n", frame->tf_sepc);
+		break;
 	default:
 		dump_regs(frame);
 		panic("Unknown kernel exception %x badaddr %lx\n",
@@ -281,6 +292,10 @@ void
 do_trap_user(struct trapframe *frame)
 {
 	uint64_t exception;
+	struct thread *td;
+
+	td = curthread;
+	td->td_frame = frame;
 
 	exception = (frame->tf_scause & EXCP_MASK);
 	if (frame->tf_scause & EXCP_INTR) {
@@ -302,6 +317,14 @@ do_trap_user(struct trapframe *frame)
 		frame->tf_sepc += 4;	/* Next instruction */
 		svc_handler(frame);
 		break;
+	case EXCP_INSTR_ILLEGAL:
+		call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_sepc);
+		userret(td, frame);
+		break;
+	case EXCP_INSTR_BREAKPOINT:
+		call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_sepc);
+		userret(td, frame);
+		break;
 	default:
 		dump_regs(frame);
 		panic("Unknown userland exception %x badaddr %lx\n",

Modified: projects/release-pkg/usr.sbin/iostat/iostat.c
==============================================================================
--- projects/release-pkg/usr.sbin/iostat/iostat.c	Tue Feb 23 15:28:13 2016	(r295925)
+++ projects/release-pkg/usr.sbin/iostat/iostat.c	Tue Feb 23 16:01:34 2016	(r295926)
@@ -797,7 +797,7 @@ devstats(int perf_select, long double et
 	long double total_mb, blocks_per_second, total_duration;
 	long double ms_per_other, ms_per_read, ms_per_write, ms_per_transaction;
 	int firstline = 1;
-	char *devname;
+	char *devicename;
 
 	if (xflag > 0) {
 		printf("                        extended device statistics  ");
@@ -871,7 +871,7 @@ devstats(int perf_select, long double et
 		}
 
 		if (xflag > 0) {
-			if (asprintf(&devname, "%s%d",
+			if (asprintf(&devicename, "%s%d",
 			    cur.dinfo->devices[di].device_name,
 			    cur.dinfo->devices[di].unit_number) == -1)
 				err(1, "asprintf");
@@ -887,7 +887,7 @@ devstats(int perf_select, long double et
 					printf("%-8.8s %5d %5d %8.1Lf "
 					    "%8.1Lf %5d %5d %5d %5d "
 					    "%4" PRIu64 " %3.0Lf ",
-					    devname,
+					    devicename,
 					    (int)transfers_per_second_read,
 					    (int)transfers_per_second_write,
 					    mb_per_second_read * 1024,
@@ -900,7 +900,7 @@ devstats(int perf_select, long double et
 					printf("%-8.8s %11.1Lf %11.1Lf "
 					    "%12.1Lf %12.1Lf %4" PRIu64
 					    " %10.1Lf %9.1Lf ",
-					    devname,
+					    devicename,
 					    (long double)total_transfers_read,
 					    (long double)total_transfers_write,
 					    (long double)
@@ -925,7 +925,7 @@ devstats(int perf_select, long double et
 				}
 				printf("\n");
 			}
-			free(devname);
+			free(devicename);
 		} else if (oflag > 0) {
 			int msdig = (ms_per_transaction < 100.0) ? 1 : 0;
 
@@ -979,15 +979,15 @@ static void
 cpustats(void)
 {
 	int state;
-	double time;
+	double cptime;
 
-	time = 0.0;

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

From owner-svn-src-projects@freebsd.org  Wed Feb 24 02:59:15 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94814AB12B5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 02:59:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 61D80160D;
 Wed, 24 Feb 2016 02:59:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O2xECX038804;
 Wed, 24 Feb 2016 02:59:14 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O2xEf9038803;
 Wed, 24 Feb 2016 02:59:14 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602240259.u1O2xEf9038803@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 24 Feb 2016 02:59:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295953 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 02:59:15 -0000

Author: gjb
Date: Wed Feb 24 02:59:14 2016
New Revision: 295953
URL: https://svnweb.freebsd.org/changeset/base/295953

Log:
  Further subdir-ize WSTAGEDIR and KSTAGEDIR base on the
  TARGET/TARGET_ARCH value, since there are valid use cases
  for having multiple on any given system.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb 24 02:52:49 2016	(r295952)
+++ projects/release-pkg/Makefile.inc1	Wed Feb 24 02:59:14 2016	(r295953)
@@ -1364,8 +1364,8 @@ packagekernel:
 stagekernel:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
-WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/worldstage
-KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/kernelstage
+WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
 PKGSIGNKEY?=	# empty
 

From owner-svn-src-projects@freebsd.org  Wed Feb 24 03:00:07 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66934AB12FE
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 03:00:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 38DF817E2;
 Wed, 24 Feb 2016 03:00:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O3064k038922;
 Wed, 24 Feb 2016 03:00:06 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O306eS038921;
 Wed, 24 Feb 2016 03:00:06 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602240300.u1O306eS038921@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 24 Feb 2016 03:00:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295954 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 03:00:07 -0000

Author: gjb
Date: Wed Feb 24 03:00:06 2016
New Revision: 295954
URL: https://svnweb.freebsd.org/changeset/base/295954

Log:
  Set PORTSDIR if not already set.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb 24 02:59:14 2016	(r295953)
+++ projects/release-pkg/Makefile.inc1	Wed Feb 24 03:00:06 2016	(r295954)
@@ -1364,6 +1364,7 @@ packagekernel:
 stagekernel:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
+PORTSDIR?=	/usr/ports
 WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
 KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo

From owner-svn-src-projects@freebsd.org  Wed Feb 24 03:05:07 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F028AB1866
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 03:05:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 36DC01C8;
 Wed, 24 Feb 2016 03:05:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O356S5042231;
 Wed, 24 Feb 2016 03:05:06 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O356a1042228;
 Wed, 24 Feb 2016 03:05:06 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602240305.u1O356a1042228@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 24 Feb 2016 03:05:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295955 - in projects/release-pkg: . release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 03:05:07 -0000

Author: gjb
Date: Wed Feb 24 03:05:05 2016
New Revision: 295955
URL: https://svnweb.freebsd.org/changeset/base/295955

Log:
  Include a 'package-pkg' target, intended for use for
  architectures we do not provide upstream pkg(8) packages.
  
  This is not tied to anything as-is, and likely will break
  your system if used (based on experience with testing with
  powerpc).
  
  There is an overwhelming amount of evil happening here,
  so until the issues are fixed, it will not be tied into the
  'packages' target.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/scripts/make-pkg-package.sh   (contents, props changed)
Modified:
  projects/release-pkg/Makefile
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile	Wed Feb 24 03:00:06 2016	(r295954)
+++ projects/release-pkg/Makefile	Wed Feb 24 03:05:05 2016	(r295955)
@@ -128,7 +128,7 @@ TGTS=	all all-man buildenv buildenvvars 
 	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
 	xdev-links native-xtools stageworld stagekernel stage-packages \
 	create-world-packages create-kernel-packages create-packages \
-	packages installconfig real-packages sign-packages
+	packages installconfig real-packages sign-packages package-pkg
 
 TGTS+=	${SUBDIR_TARGETS}
 

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb 24 03:00:06 2016	(r295954)
+++ projects/release-pkg/Makefile.inc1	Wed Feb 24 03:05:05 2016	(r295955)
@@ -1378,6 +1378,12 @@ _pkgbootstrap:
 packages:
 	${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
 
+package-pkg:
+	rm -rf /tmp/ports.${TARGET} || :
+	env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${REVISION} \
+		PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \
+		sh ${.CURDIR}/release/scripts/make-pkg-package.sh
+
 real-packages:	stage-packages create-packages sign-packages
 
 stage-packages:

Added: projects/release-pkg/release/scripts/make-pkg-package.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/scripts/make-pkg-package.sh	Wed Feb 24 03:05:05 2016	(r295955)
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Simulate the build environment.
+eval $(make -C ${SRCDIR} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} buildenvvars)
+export WRKDIRPREFIX=/tmp/ports.${TARGET}
+export WSTAGEDIR=${WSTAGEDIR}
+export REPODIR=${REPODIR}
+export PKG_VERSION=${PKG_VERSION}
+export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR)
+
+make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+	CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION}" \
+	stage create-manifest
+
+pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \
+	create -v -m ${WRKDIR}/.metadir/ \
+	-r ${WRKDIR}/stage \
+	-p ${WRKDIR}/.PLIST.mktmp \
+	-o ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
+mkdir -p ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/
+cd ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ && \
+	ln -s ../pkg-*.txz

From owner-svn-src-projects@freebsd.org  Wed Feb 24 03:09:02 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37926AB1955
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 03:09:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D38146AB;
 Wed, 24 Feb 2016 03:09:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O390Dm042482;
 Wed, 24 Feb 2016 03:09:00 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O38wRi042450;
 Wed, 24 Feb 2016 03:08:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602240308.u1O38wRi042450@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 24 Feb 2016 03:08:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295957 - in projects/release-pkg: . bin/sh
 bin/sh/tests/parser etc etc/defaults lib/libsysdecode share/man/man4
 share/man/man8 sys/boot/forth sys/conf sys/dev/acpica sys/dev/ixl sys/de...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 03:09:02 -0000

Author: gjb
Date: Wed Feb 24 03:08:58 2016
New Revision: 295957
URL: https://svnweb.freebsd.org/changeset/base/295957

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/bin/sh/tests/parser/set-v1.0
     - copied unchanged from r295956, head/bin/sh/tests/parser/set-v1.0
  projects/release-pkg/bin/sh/tests/parser/set-v1.0.stderr
     - copied unchanged from r295956, head/bin/sh/tests/parser/set-v1.0.stderr
  projects/release-pkg/lib/libsysdecode/errno.c
     - copied unchanged from r295956, head/lib/libsysdecode/errno.c
  projects/release-pkg/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
     - copied unchanged from r295956, head/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
  projects/release-pkg/sys/geom/uzip/g_uzip.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip.h
  projects/release-pkg/sys/geom/uzip/g_uzip_cloop.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_cloop.h
  projects/release-pkg/sys/geom/uzip/g_uzip_dapi.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_dapi.h
  projects/release-pkg/sys/geom/uzip/g_uzip_lzma.c
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_lzma.c
  projects/release-pkg/sys/geom/uzip/g_uzip_lzma.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_lzma.h
  projects/release-pkg/sys/geom/uzip/g_uzip_softc.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_softc.h
  projects/release-pkg/sys/geom/uzip/g_uzip_wrkthr.c
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_wrkthr.c
  projects/release-pkg/sys/geom/uzip/g_uzip_wrkthr.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_wrkthr.h
  projects/release-pkg/sys/geom/uzip/g_uzip_zlib.c
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_zlib.c
  projects/release-pkg/sys/geom/uzip/g_uzip_zlib.h
     - copied unchanged from r295956, head/sys/geom/uzip/g_uzip_zlib.h
  projects/release-pkg/usr.bin/mkuzip/mkuz_blockcache.c
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_blockcache.c
  projects/release-pkg/usr.bin/mkuzip/mkuz_blockcache.h
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_blockcache.h
  projects/release-pkg/usr.bin/mkuzip/mkuz_cloop.h
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_cloop.h
  projects/release-pkg/usr.bin/mkuzip/mkuz_lzma.c
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_lzma.c
  projects/release-pkg/usr.bin/mkuzip/mkuz_lzma.h
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_lzma.h
  projects/release-pkg/usr.bin/mkuzip/mkuz_zlib.c
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_zlib.c
  projects/release-pkg/usr.bin/mkuzip/mkuz_zlib.h
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuz_zlib.h
  projects/release-pkg/usr.bin/mkuzip/mkuzip.h
     - copied unchanged from r295956, head/usr.bin/mkuzip/mkuzip.h
Deleted:
  projects/release-pkg/share/man/man4/geom_uncompress.4
  projects/release-pkg/sys/geom/uncompress/
  projects/release-pkg/sys/modules/geom/geom_uncompress/
  projects/release-pkg/usr.bin/mkulzma/
  projects/release-pkg/usr.bin/truss/cloudabi.c
  projects/release-pkg/usr.bin/truss/cloudabi.h
Modified:
  projects/release-pkg/ObsoleteFiles.inc
  projects/release-pkg/bin/sh/input.c
  projects/release-pkg/bin/sh/tests/parser/Makefile
  projects/release-pkg/etc/defaults/rc.conf
  projects/release-pkg/etc/rc.subr
  projects/release-pkg/lib/libsysdecode/Makefile
  projects/release-pkg/lib/libsysdecode/sysdecode.3
  projects/release-pkg/lib/libsysdecode/sysdecode.h
  projects/release-pkg/lib/libsysdecode/sysdecode_syscallnames.3
  projects/release-pkg/share/man/man4/Makefile
  projects/release-pkg/share/man/man4/geom_map.4
  projects/release-pkg/share/man/man4/geom_uzip.4
  projects/release-pkg/share/man/man8/rc.subr.8
  projects/release-pkg/sys/boot/forth/loader.conf
  projects/release-pkg/sys/conf/files
  projects/release-pkg/sys/dev/acpica/acpi_ec.c
  projects/release-pkg/sys/dev/acpica/acpi_video.c
  projects/release-pkg/sys/dev/ixl/if_ixl.c
  projects/release-pkg/sys/dev/ixl/ixl_txrx.c
  projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c
  projects/release-pkg/sys/dev/usb/controller/xhci.c
  projects/release-pkg/sys/dev/usb/controller/xhci.h
  projects/release-pkg/sys/geom/uzip/g_uzip.c
  projects/release-pkg/sys/kern/kern_mib.c
  projects/release-pkg/sys/mips/conf/ALFA_HORNET_UB
  projects/release-pkg/sys/mips/conf/AP121
  projects/release-pkg/sys/mips/conf/AP135
  projects/release-pkg/sys/mips/conf/AP143
  projects/release-pkg/sys/mips/conf/AP91
  projects/release-pkg/sys/mips/conf/AP93
  projects/release-pkg/sys/mips/conf/AP96
  projects/release-pkg/sys/mips/conf/CARAMBOLA2
  projects/release-pkg/sys/mips/conf/DB120
  projects/release-pkg/sys/mips/conf/DIR-655A1
  projects/release-pkg/sys/mips/conf/DIR-825B1
  projects/release-pkg/sys/mips/conf/DIR-825C1
  projects/release-pkg/sys/mips/conf/ENH200
  projects/release-pkg/sys/mips/conf/MT7620
  projects/release-pkg/sys/mips/conf/ONIONOMEGA
  projects/release-pkg/sys/mips/conf/PB47
  projects/release-pkg/sys/mips/conf/PB92
  projects/release-pkg/sys/mips/conf/PICOSTATION_M2HP
  projects/release-pkg/sys/mips/conf/ROUTERSTATION
  projects/release-pkg/sys/mips/conf/RSPRO
  projects/release-pkg/sys/mips/conf/RT305X
  projects/release-pkg/sys/mips/conf/RT5350
  projects/release-pkg/sys/mips/conf/TL-ARCHERC7V2
  projects/release-pkg/sys/mips/conf/TL-WDR4300
  projects/release-pkg/sys/mips/conf/TL-WR1043NDv2
  projects/release-pkg/sys/mips/conf/TL-WR740Nv4
  projects/release-pkg/sys/mips/conf/TP-WN1043ND
  projects/release-pkg/sys/mips/conf/WZR-300HP
  projects/release-pkg/sys/mips/conf/WZR-HPAG300H
  projects/release-pkg/sys/modules/geom/Makefile
  projects/release-pkg/sys/modules/geom/geom_uzip/Makefile
  projects/release-pkg/sys/net80211/ieee80211_node.c
  projects/release-pkg/sys/netinet/tcp_stacks/fastpath.c
  projects/release-pkg/sys/netinet/tcp_subr.c
  projects/release-pkg/sys/netinet6/sctp6_usrreq.c
  projects/release-pkg/sys/ufs/ffs/ffs_inode.c
  projects/release-pkg/sys/x86/isa/clock.c
  projects/release-pkg/targets/pseudo/userland/Makefile.depend
  projects/release-pkg/usr.bin/Makefile
  projects/release-pkg/usr.bin/kdump/kdump.c
  projects/release-pkg/usr.bin/mkuzip/Makefile
  projects/release-pkg/usr.bin/mkuzip/mkuzip.8
  projects/release-pkg/usr.bin/mkuzip/mkuzip.c
  projects/release-pkg/usr.bin/truss/Makefile
  projects/release-pkg/usr.bin/truss/aarch64-cloudabi64.c
  projects/release-pkg/usr.bin/truss/amd64-cloudabi64.c
  projects/release-pkg/usr.bin/truss/amd64-linux32.c
  projects/release-pkg/usr.bin/truss/extern.h
  projects/release-pkg/usr.bin/truss/i386-linux.c
  projects/release-pkg/usr.bin/truss/main.c
  projects/release-pkg/usr.bin/truss/setup.c
  projects/release-pkg/usr.bin/truss/syscalls.c
  projects/release-pkg/usr.bin/truss/truss.1
  projects/release-pkg/usr.bin/truss/truss.h
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/share/   (props changed)
  projects/release-pkg/share/man/man4/   (props changed)
  projects/release-pkg/sys/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/targets/   (props changed)

Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/ObsoleteFiles.inc	Wed Feb 24 03:08:58 2016	(r295957)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160223: functionality from mkulzma(1) merged into mkuzip(1)
+OLD_FILES+=usr/bin/mkulzma
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160116: Update mandoc to cvs snapshot 20160116

Modified: projects/release-pkg/bin/sh/input.c
==============================================================================
--- projects/release-pkg/bin/sh/input.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/bin/sh/input.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -242,7 +242,8 @@ again:
 		parsenleft = parselleft;
 		parselleft = 0;
 	} else /* *q == '\n' */ {
-		parsenleft = q - parsenextc + 1;
+		q++;
+		parsenleft = q - parsenextc;
 		parselleft -= parsenleft;
 	}
 	parsenleft--;

Modified: projects/release-pkg/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile	Wed Feb 24 03:08:58 2016	(r295957)
@@ -82,6 +82,7 @@ FILES+=		only-redir2.0
 FILES+=		only-redir3.0
 FILES+=		only-redir4.0
 FILES+=		pipe-not1.0
+FILES+=		set-v1.0 set-v1.0.stderr
 FILES+=		var-assign1.0
 
 .include <bsd.test.mk>

Copied: projects/release-pkg/bin/sh/tests/parser/set-v1.0 (from r295956, head/bin/sh/tests/parser/set-v1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/set-v1.0	Wed Feb 24 03:08:58 2016	(r295957, copy of r295956, head/bin/sh/tests/parser/set-v1.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+${SH} <<\EOF
+echo one >&2
+set -v
+echo two >&2
+echo three >&2
+EOF

Copied: projects/release-pkg/bin/sh/tests/parser/set-v1.0.stderr (from r295956, head/bin/sh/tests/parser/set-v1.0.stderr)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/set-v1.0.stderr	Wed Feb 24 03:08:58 2016	(r295957, copy of r295956, head/bin/sh/tests/parser/set-v1.0.stderr)
@@ -0,0 +1,5 @@
+one
+echo two >&2
+two
+echo three >&2
+three

Modified: projects/release-pkg/etc/defaults/rc.conf
==============================================================================
--- projects/release-pkg/etc/defaults/rc.conf	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/etc/defaults/rc.conf	Wed Feb 24 03:08:58 2016	(r295957)
@@ -253,6 +253,7 @@ hostapd_enable="NO"		# Run hostap daemon
 syslogd_enable="YES"		# Run syslog daemon (or NO).
 syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
 syslogd_flags="-s"		# Flags to syslogd (if enabled).
+syslogd_oomprotect="YES"	# Don't kill syslogd when swap space is exhausted. 
 altlog_proglist=""		# List of chrooted applicatioins in /var
 inetd_enable="NO"		# Run the network daemon dispatcher (YES/NO).
 inetd_program="/usr/sbin/inetd"	# path to inetd, if you want a different one.

Modified: projects/release-pkg/etc/rc.subr
==============================================================================
--- projects/release-pkg/etc/rc.subr	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/etc/rc.subr	Wed Feb 24 03:08:58 2016	(r295957)
@@ -45,6 +45,7 @@ _rc_subr_loaded="YES"
 SYSCTL="/sbin/sysctl"
 SYSCTL_N="${SYSCTL} -n"
 SYSCTL_W="${SYSCTL}"
+PROTECT="/usr/bin/protect"
 ID="/usr/bin/id"
 IDCMD="if [ -x $ID ]; then $ID -un; fi"
 PS="/bin/ps -ww"
@@ -755,6 +756,8 @@ check_startmsgs()
 #
 #	${name}_nice	n	Nice level to run ${command} at.
 #
+#	${name}_oomprotect n	Don't kill ${command} when swap space is exhausted.
+#
 #	${name}_user	n	User to run ${command} as, using su(1) if not
 #				using ${name}_chroot.
 #				Requires /usr to be mounted.
@@ -944,7 +947,8 @@ run_rc_command()
 	    _nice=\$${name}_nice	_user=\$${name}_user \
 	    _group=\$${name}_group	_groups=\$${name}_groups \
 	    _fib=\$${name}_fib		_env=\$${name}_env \
-	    _prepend=\$${name}_prepend	_login_class=\${${name}_login_class:-daemon}
+	    _prepend=\$${name}_prepend	_login_class=\${${name}_login_class:-daemon} \
+	    _oomprotect=\$${name}_oomprotect
 
 	if [ -n "$_user" ]; then	# unset $_user if running as that user
 		if [ "$_user" = "$(eval $IDCMD)" ]; then
@@ -1182,6 +1186,26 @@ $command $rc_flags $command_args"
 			;;
 
 		esac
+
+		# Apply protect(1) to the PID if ${name}_oomprotect is set.
+		case "$rc_arg" in
+		start)
+			if [ -n "$_oomprotect" ]; then
+				if [ -f "${PROTECT}" ]; then
+					pid=$(check_process $command)
+					case $_oomprotect in
+					[Aa][Ll][Ll])
+						${PROTECT} -i -p ${pid}
+						;;
+					[Yy][Ee][Ss])
+						${PROTECT} -p ${pid}
+						;;
+					esac
+				fi
+			fi	
+		;;
+		esac
+
 		return $_return
 	done
 

Modified: projects/release-pkg/lib/libsysdecode/Makefile
==============================================================================
--- projects/release-pkg/lib/libsysdecode/Makefile	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/lib/libsysdecode/Makefile	Wed Feb 24 03:08:58 2016	(r295957)
@@ -5,15 +5,17 @@
 PACKAGE=lib${LIB}
 LIB=	sysdecode
 
-SRCS=	ioctl.c syscallnames.c utrace.c
+SRCS=	errno.c ioctl.c syscallnames.c utrace.c
 INCS=	sysdecode.h
 
 CFLAGS+= -I${.CURDIR}/../../sys
 
 MAN+=	sysdecode.3 \
+	sysdecode_abi_to_freebsd_errno.3 \
 	sysdecode_ioctlname.3 \
 	sysdecode_syscallnames.3 \
 	sysdecode_utrace.3
+MLINKS+= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3
 
 CLEANFILES= ioctl.c
 

Copied: projects/release-pkg/lib/libsysdecode/errno.c (from r295956, head/lib/libsysdecode/errno.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/lib/libsysdecode/errno.c	Wed Feb 24 03:08:58 2016	(r295957, copy of r295956, head/lib/libsysdecode/errno.c)
@@ -0,0 +1,209 @@
+/*-
+ * Copyright (c) 2015 John H. Baldwin <jhb@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$");
+
+#include <sys/param.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <sysdecode.h>
+
+#if defined(__i386__) || defined(__amd64__)
+/*
+ * Linux syscalls return negative errno's, we do positive and map them
+ * Reference:
+ *   FreeBSD: src/sys/sys/errno.h
+ *   Linux:   linux-2.6.17.8/include/asm-generic/errno-base.h
+ *            linux-2.6.17.8/include/asm-generic/errno.h
+ */
+static int bsd_to_linux_errno[ELAST + 1] = {
+	-0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,
+	-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
+	-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
+	-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
+	-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
+	-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
+	-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
+	-116, -66,  -6,  -6,  -6,  -6,  -6, -37, -38,  -9,
+	  -6,  -6, -43, -42, -75,-125, -84, -95, -16, -74,
+	 -72, -67, -71
+};
+#endif
+
+#if defined(__aarch64__) || defined(__amd64__)
+#include <compat/cloudabi/cloudabi_syscalldefs.h>
+
+static const int cloudabi_errno_table[] = {
+	[CLOUDABI_E2BIG]		= E2BIG,
+	[CLOUDABI_EACCES]		= EACCES,
+	[CLOUDABI_EADDRINUSE]		= EADDRINUSE,
+	[CLOUDABI_EADDRNOTAVAIL]	= EADDRNOTAVAIL,
+	[CLOUDABI_EAFNOSUPPORT]		= EAFNOSUPPORT,
+	[CLOUDABI_EAGAIN]		= EAGAIN,
+	[CLOUDABI_EALREADY]		= EALREADY,
+	[CLOUDABI_EBADF]		= EBADF,
+	[CLOUDABI_EBADMSG]		= EBADMSG,
+	[CLOUDABI_EBUSY]		= EBUSY,
+	[CLOUDABI_ECANCELED]		= ECANCELED,
+	[CLOUDABI_ECHILD]		= ECHILD,
+	[CLOUDABI_ECONNABORTED]		= ECONNABORTED,
+	[CLOUDABI_ECONNREFUSED]		= ECONNREFUSED,
+	[CLOUDABI_ECONNRESET]		= ECONNRESET,
+	[CLOUDABI_EDEADLK]		= EDEADLK,
+	[CLOUDABI_EDESTADDRREQ]		= EDESTADDRREQ,
+	[CLOUDABI_EDOM]			= EDOM,
+	[CLOUDABI_EDQUOT]		= EDQUOT,
+	[CLOUDABI_EEXIST]		= EEXIST,
+	[CLOUDABI_EFAULT]		= EFAULT,
+	[CLOUDABI_EFBIG]		= EFBIG,
+	[CLOUDABI_EHOSTUNREACH]		= EHOSTUNREACH,
+	[CLOUDABI_EIDRM]		= EIDRM,
+	[CLOUDABI_EILSEQ]		= EILSEQ,
+	[CLOUDABI_EINPROGRESS]		= EINPROGRESS,
+	[CLOUDABI_EINTR]		= EINTR,
+	[CLOUDABI_EINVAL]		= EINVAL,
+	[CLOUDABI_EIO]			= EIO,
+	[CLOUDABI_EISCONN]		= EISCONN,
+	[CLOUDABI_EISDIR]		= EISDIR,
+	[CLOUDABI_ELOOP]		= ELOOP,
+	[CLOUDABI_EMFILE]		= EMFILE,
+	[CLOUDABI_EMLINK]		= EMLINK,
+	[CLOUDABI_EMSGSIZE]		= EMSGSIZE,
+	[CLOUDABI_EMULTIHOP]		= EMULTIHOP,
+	[CLOUDABI_ENAMETOOLONG]		= ENAMETOOLONG,
+	[CLOUDABI_ENETDOWN]		= ENETDOWN,
+	[CLOUDABI_ENETRESET]		= ENETRESET,
+	[CLOUDABI_ENETUNREACH]		= ENETUNREACH,
+	[CLOUDABI_ENFILE]		= ENFILE,
+	[CLOUDABI_ENOBUFS]		= ENOBUFS,
+	[CLOUDABI_ENODEV]		= ENODEV,
+	[CLOUDABI_ENOENT]		= ENOENT,
+	[CLOUDABI_ENOEXEC]		= ENOEXEC,
+	[CLOUDABI_ENOLCK]		= ENOLCK,
+	[CLOUDABI_ENOLINK]		= ENOLINK,
+	[CLOUDABI_ENOMEM]		= ENOMEM,
+	[CLOUDABI_ENOMSG]		= ENOMSG,
+	[CLOUDABI_ENOPROTOOPT]		= ENOPROTOOPT,
+	[CLOUDABI_ENOSPC]		= ENOSPC,
+	[CLOUDABI_ENOSYS]		= ENOSYS,
+	[CLOUDABI_ENOTCONN]		= ENOTCONN,
+	[CLOUDABI_ENOTDIR]		= ENOTDIR,
+	[CLOUDABI_ENOTEMPTY]		= ENOTEMPTY,
+	[CLOUDABI_ENOTRECOVERABLE]	= ENOTRECOVERABLE,
+	[CLOUDABI_ENOTSOCK]		= ENOTSOCK,
+	[CLOUDABI_ENOTSUP]		= ENOTSUP,
+	[CLOUDABI_ENOTTY]		= ENOTTY,
+	[CLOUDABI_ENXIO]		= ENXIO,
+	[CLOUDABI_EOVERFLOW]		= EOVERFLOW,
+	[CLOUDABI_EOWNERDEAD]		= EOWNERDEAD,
+	[CLOUDABI_EPERM]		= EPERM,
+	[CLOUDABI_EPIPE]		= EPIPE,
+	[CLOUDABI_EPROTO]		= EPROTO,
+	[CLOUDABI_EPROTONOSUPPORT]	= EPROTONOSUPPORT,
+	[CLOUDABI_EPROTOTYPE]		= EPROTOTYPE,
+	[CLOUDABI_ERANGE]		= ERANGE,
+	[CLOUDABI_EROFS]		= EROFS,
+	[CLOUDABI_ESPIPE]		= ESPIPE,
+	[CLOUDABI_ESRCH]		= ESRCH,
+	[CLOUDABI_ESTALE]		= ESTALE,
+	[CLOUDABI_ETIMEDOUT]		= ETIMEDOUT,
+	[CLOUDABI_ETXTBSY]		= ETXTBSY,
+	[CLOUDABI_EXDEV]		= EXDEV,
+	[CLOUDABI_ENOTCAPABLE]		= ENOTCAPABLE,
+};
+#endif
+
+int
+sysdecode_abi_to_freebsd_errno(enum sysdecode_abi abi, int error)
+{
+
+	switch (abi) {
+	case SYSDECODE_ABI_FREEBSD:
+	case SYSDECODE_ABI_FREEBSD32:
+		return (error);
+#if defined(__i386__) || defined(__amd64__)
+	case SYSDECODE_ABI_LINUX:
+	case SYSDECODE_ABI_LINUX32: {
+		unsigned int i;
+
+		/*
+		 * This is imprecise since it returns the first
+		 * matching errno.
+		 */
+		for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
+			if (error == bsd_to_linux_errno[i])
+				return (i);
+		}
+		break;
+	}
+#endif
+#if defined(__aarch64__) || defined(__amd64__)
+	case SYSDECODE_ABI_CLOUDABI64:
+		if (error >= 0 &&
+		    (unsigned int)error < nitems(cloudabi_errno_table))
+			return (cloudabi_errno_table[error]);
+		break;
+#endif
+	default:
+		break;
+	}
+	return (INT_MAX);
+}
+
+int
+sysdecode_freebsd_to_abi_errno(enum sysdecode_abi abi, int error)
+{
+
+	switch (abi) {
+	case SYSDECODE_ABI_FREEBSD:
+	case SYSDECODE_ABI_FREEBSD32:
+		return (error);
+#if defined(__i386__) || defined(__amd64__)
+	case SYSDECODE_ABI_LINUX:
+	case SYSDECODE_ABI_LINUX32:
+		if (error >= 0 && error <= ELAST)
+			return (bsd_to_linux_errno[error]);
+		break;
+#endif
+#if defined(__aarch64__) || defined(__amd64__)
+	case SYSDECODE_ABI_CLOUDABI64: {
+		unsigned int i;
+
+		for (i = 0; i < nitems(cloudabi_errno_table); i++) {
+			if (error == cloudabi_errno_table[i])
+				return (i);
+		}
+		break;
+	}
+#endif
+	default:
+		break;
+	}
+	return (INT_MAX);
+}
+

Modified: projects/release-pkg/lib/libsysdecode/sysdecode.3
==============================================================================
--- projects/release-pkg/lib/libsysdecode/sysdecode.3	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/lib/libsysdecode/sysdecode.3	Wed Feb 24 03:08:58 2016	(r295957)
@@ -64,6 +64,7 @@ Supported on aarch64 and amd64.
 A placeholder for use when the ABI is not known.
 .El
 .Sh SEE ALSO
+.Xr sysdecode_abi_to_freebsd_errno 3 ,
 .Xr sysdecode_ioctlname 3 ,
 .Xr sysdecode_syscallnames 3 ,
 .Xr sysdecode_utrace 3

Modified: projects/release-pkg/lib/libsysdecode/sysdecode.h
==============================================================================
--- projects/release-pkg/lib/libsysdecode/sysdecode.h	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/lib/libsysdecode/sysdecode.h	Wed Feb 24 03:08:58 2016	(r295957)
@@ -38,6 +38,8 @@ enum sysdecode_abi {
 	SYSDECODE_ABI_CLOUDABI64
 };
 
+int	sysdecode_abi_to_freebsd_errno(enum sysdecode_abi _abi, int _error);
+int	sysdecode_freebsd_to_abi_errno(enum sysdecode_abi _abi, int _error);
 const char *sysdecode_ioctlname(unsigned long _val);
 const char *sysdecode_syscallname(enum sysdecode_abi _abi, unsigned int _code);
 int	sysdecode_utrace(FILE *_fp, void *_buf, size_t _len);

Copied: projects/release-pkg/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 (from r295956, head/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3	Wed Feb 24 03:08:58 2016	(r295957, copy of r295956, head/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3)
@@ -0,0 +1,94 @@
+.\"
+.\" Copyright (c) 2016 John Baldwin <jhb@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 23, 2016
+.Dt sysdecode_abi_to_freebsd_errno 3
+.Os
+.Sh NAME
+.Nm sysdecode_abi_to_freebsd_errno ,
+.Nm sysdecode_freebsd_to_abi_errno
+.Nd translate error numbers between process ABIs
+.Sh LIBRARY
+.Lb libsysdecode
+.Sh SYNOPSIS
+.Ft int
+.Fn sysdecode_abi_to_freebsd_errno "enum sysdecode_abi abi" "int error"
+.Ft int
+.Fn sysdecode_freebsd_to_abi_errno "enum sysdecode_abi abi" "int error"
+.Sh DESCRIPTION
+The
+.Fn sysdecode_abi_to_freebsd_errno
+function returns the native
+.Xr errno 3
+value that corresponds to the error indicated by
+.Fa error
+for the process ABI
+.Fa abi .
+If
+.Fa error
+does not identify a valid error for
+.Fa abi ,
+.Dv INT_MAX
+is returned.
+.Pp
+The
+.Fn sysdecode_freebsd_to_abi_errno
+function the error value for the process ABI
+.Fa abi
+that corresponds to the native
+.Xr errno 3
+value
+.Fa error .
+If
+.Fa error
+does not identify a valid
+.Xr errno 3
+error,
+.Dv INT_MAX
+is returned.
+.Pp
+Note that the mappings between native
+.Xr errno 3
+values and errors for other ABIs are not exhaustive.
+If a mapping does not exist,
+these functions return
+.Dv INT_MAX .
+In addition, multiple error values in one ABI may map to a single
+error in another ABI.
+.Sh RETURN VALUES
+These functions return an error value on success or
+.Dv INT_MAX
+if
+.Fa error
+is not valid.
+.Pp
+For the list of supported ABIs,
+see
+.Xr sysdecode 3 .
+.Sh SEE ALSO
+.Xr sysdecode 3 ,
+.Xr sysdecode_syscallnames 3

Modified: projects/release-pkg/lib/libsysdecode/sysdecode_syscallnames.3
==============================================================================
--- projects/release-pkg/lib/libsysdecode/sysdecode_syscallnames.3	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/lib/libsysdecode/sysdecode_syscallnames.3	Wed Feb 24 03:08:58 2016	(r295957)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 24, 2016
+.Dd January 30, 2016
 .Dt sysdecode_syscallnames 3
 .Os
 .Sh NAME
@@ -64,4 +64,5 @@ or
 .Fa ABI
 is invalid .
 .Sh SEE ALSO
-.Xr sysdecode 3
+.Xr sysdecode 3 ,
+.Xr sysdecode_abi_to_freebsd_errno 3

Modified: projects/release-pkg/share/man/man4/Makefile
==============================================================================
--- projects/release-pkg/share/man/man4/Makefile	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/share/man/man4/Makefile	Wed Feb 24 03:08:58 2016	(r295957)
@@ -167,7 +167,6 @@ MAN=	aac.4 \
 	geom_fox.4 \
 	geom_linux_lvm.4 \
 	geom_map.4 \
-	geom_uncompress.4 \
 	geom_uzip.4 \
 	gif.4 \
 	gpio.4 \

Modified: projects/release-pkg/share/man/man4/geom_map.4
==============================================================================
--- projects/release-pkg/share/man/man4/geom_map.4	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/share/man/man4/geom_map.4	Wed Feb 24 03:08:58 2016	(r295957)
@@ -78,7 +78,7 @@ or by using
 0 DISK cfid0 8388608 4 hd 0 sc 0
 1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
 1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
-2 UNCOMPRESS map/rootfs.uncompress 18677760 512
+2 UZIP map/rootfs.uzip 18677760 512
 1 MAP map/kernel 1114112 4 i 3 o 262144 entry 0 dsize 1114112
 1 MAP map/upgrade 7995392 4 i 2 o 262144 entry 0 dsize 7995392
 1 MAP map/factory 65536 4 i 1 o 196608 entry 0 dsize 65536

Modified: projects/release-pkg/share/man/man4/geom_uzip.4
==============================================================================
--- projects/release-pkg/share/man/man4/geom_uzip.4	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/share/man/man4/geom_uzip.4	Wed Feb 24 03:08:58 2016	(r295957)
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm geom_uzip
-.Nd "GEOM based compressed disk images"
+.Nd "GEOM based compressed disk images and partitions"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
@@ -51,7 +51,7 @@ The
 framework provides support for compressed read-only
 disk images.
 This allows significant storage savings at the expense of
-a little CPU time on each read.
+a some CPU time on each read.
 Data written in the GEOM label area allows
 .Nm
 to detect compressed images which have been created with
@@ -63,17 +63,53 @@ creates a unique
 .Pa md#.uzip
 device for each image.
 .Pp
+.Nm
+is not limited to supporting only
+.Xr md 4
+images.
+The image can also reside on a block device.
+.Pq For example, a disk, USB flash drive,  DVD-ROM, etc.
+The appropriate device node will appear with the
+.Pa .uzip
+suffix.
+.Bd -literal -offset indent
+# gpart show da0
+=>      0  7833600  da0  BSD  (3.7G)
+        0  2097152    1  freebsd-ufs  (1.0G)
+  2097152  5736448       - free -  (2.7G)
+# gpart add -t freebsd-ufs -s 1G da0
+da0b added
+# dd if=/tmp/20160217_dcomp_zcomp.uzip bs=256k of=/dev/da0b
+3190+1 records in
+3190+1 records out
+836331008 bytes transferred in 111.021489 secs (7533055 bytes/sec)
+# fsck -t ffs /dev/da0b.uzip
+** /dev/da0b.uzip (NO WRITE)
+** Last Mounted on /mnt
+** Phase 1 - Check Blocks and Sizes
+** Phase 2 - Check Pathnames
+** Phase 3 - Check Connectivity
+** Phase 4 - Check Reference Counts
+** Phase 5 - Check Cyl groups
+97455 files, 604242 used, 184741 free (2349 frags, 22799 blocks,
+   0.3% fragmentation)
+# mount -o ro /dev/da0b.uzip /mnt
+# df /dev/da0b.uzip
+Filesystem     1K-blocks    Used  Avail Capacity  Mounted on
+/dev/da0b.uzip   3155932 2416968 738964    77%    /mnt
+.Ed
+.Pp
 The
 .Nm
-device is subsequently used by the
+device is subsequently used by
 .Fx
-kernel to access the disk images.
+kernel to access the uncompressed data.
 The
 .Nm
 driver does not allow write operations to the underlying disk image.
 To check which
-.Xr md 4
-devices match a given
+.Dq providers
+match a given
 .Nm
 device:
 .Bd -literal -offset indent
@@ -83,13 +119,44 @@ Providers:
 1. Name: md1.uzip
    Mediasize: 22003712 (21M)
    Sectorsize: 512
-   Mode: r1w0e1
 Consumers:
 1. Name: md1
    Mediasize: 9563648 (9.1M)
    Sectorsize: 512
-   Mode: r1w0e1
+
+Geom name: da0b.uzip
+Providers:
+1. Name: da0b.uzip
+   Mediasize: 3355443200 (3.1G)
+   Sectorsize: 512
+Consumers:
+1. Name: da0b
+   Mediasize: 1073741824 (1.0G)
+   Sectorsize: 512
 .Ed
+.Pp
+.Nm
+allows mounting the root file system from a compressed disk partition by
+setting the
+.Dv vfs.root.mountfrom
+tunable.
+See
+.Xr loader.conf 5
+for details.
+.Sh DIAGNOSTICS
+Several flags are provided for tracing
+.Nm
+I/O operations and TOC parsing via the following sysctls.
+.Bl -tag -width indent
+.It Va kern.geom.uzip.debug
+Log level.
+Zero disables logging.
+Higher values enable more verbose debug logging for
+.Nm .
+Supported levels are from 0 (no logging) to 4 (maximum amount of logging).
+.It Va kern.geom.uzip.debug_block
+Log operations involving compressed cluster number.
+.El
 .Sh SEE ALSO
 .Xr GEOM 4 ,
 .Xr md 4 ,
@@ -101,5 +168,12 @@ The
 .Nm
 driver was written by
 .An Max Khon Aq Mt fjoe@FreeBSD.org .
+The block de-duplication code as well as some
+.Nm
+driver optimizations have been contributed by
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org .
+The LZMA decompression support and CLOOP 3.0 support have been added by
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
+.Pp
 This manual page was written by
 .An Ceri Davies Aq Mt ceri@FreeBSD.org .

Modified: projects/release-pkg/share/man/man8/rc.subr.8
==============================================================================
--- projects/release-pkg/share/man/man8/rc.subr.8	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/share/man/man8/rc.subr.8	Wed Feb 24 03:08:58 2016	(r295957)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 12, 2014
+.Dd February 4, 2016
 .Dt RC.SUBR 8
 .Os
 .Sh NAME
@@ -604,6 +604,16 @@ as.
 Only supported after
 .Pa /usr
 is mounted.
+.It Va ${name}_oomprotect
+.Xr protect 1
+.Va command
+from being killed when swap space is exhausted.
+If
+.Em YES
+is used, no child processes are protected.
+If
+.Em ALL ,
+protect all child processes.
 .It Va ${name}_program
 Full path to the command.
 Overrides

Modified: projects/release-pkg/sys/boot/forth/loader.conf
==============================================================================
--- projects/release-pkg/sys/boot/forth/loader.conf	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/boot/forth/loader.conf	Wed Feb 24 03:08:58 2016	(r295957)
@@ -238,7 +238,6 @@ geom_nop_load="NO"		# Transparent disk d
 geom_raid3_load="NO"		# RAID3 disk driver (see graid3(8))
 geom_shsec_load="NO"		# Shared secret disk driver (see gshsec(8))
 geom_stripe_load="NO"		# RAID0 disk driver (see gstripe(8))
-geom_uncompress_load="NO"	# Compressed disk images driver (see mkulzma(8))
 geom_uzip_load="NO"		# Compressed disk images driver (see mkuzip(8))
 geom_vinum_load="NO"		# Concatenated/mirror/raid driver (see vinum(4))
 

Modified: projects/release-pkg/sys/conf/files
==============================================================================
--- projects/release-pkg/sys/conf/files	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/conf/files	Wed Feb 24 03:08:58 2016	(r295957)
@@ -3081,23 +3081,25 @@ geom/raid3/g_raid3.c		optional geom_raid
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
-geom/uncompress/g_uncompress.c	optional geom_uncompress
 contrib/xz-embedded/freebsd/xz_malloc.c	\
-	optional xz_embedded | geom_uncompress \
+	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
-	optional xz_embedded | geom_uncompress \
+	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
-	optional xz_embedded | geom_uncompress \
+	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
-	optional xz_embedded | geom_uncompress \
+	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
-	optional xz_embedded | geom_uncompress \
+	optional xz_embedded | geom_uzip \
 	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 geom/uzip/g_uzip.c		optional geom_uzip
+geom/uzip/g_uzip_lzma.c		optional geom_uzip
+geom/uzip/g_uzip_wrkthr.c	optional geom_uzip
+geom/uzip/g_uzip_zlib.c		optional geom_uzip
 geom/vinum/geom_vinum.c		optional geom_vinum
 geom/vinum/geom_vinum_create.c	optional geom_vinum
 geom/vinum/geom_vinum_drive.c	optional geom_vinum
@@ -3455,7 +3457,7 @@ libkern/strvalid.c		standard
 libkern/timingsafe_bcmp.c	standard
 libkern/zlib.c			optional crypto | geom_uzip | ipsec | \
 					 mxge | netgraph_deflate | \
-					 ddb_ctf | gzio | geom_uncompress
+					 ddb_ctf | gzio
 net/altq/altq_cbq.c		optional altq
 net/altq/altq_cdnr.c		optional altq
 net/altq/altq_codel.c		optional altq

Modified: projects/release-pkg/sys/dev/acpica/acpi_ec.c
==============================================================================
--- projects/release-pkg/sys/dev/acpica/acpi_ec.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/acpica/acpi_ec.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -434,9 +434,7 @@ out:
 		 params->gpe_bit, (params->glk) ? ", GLK" : "",
 		 ecdt ? ", ECDT" : "");
 	device_set_desc_copy(dev, desc);
-    }
-
-    if (ret > 0 && params)
+    } else
 	free(params, M_TEMP);
     if (buf.Pointer)
 	AcpiOsFree(buf.Pointer);

Modified: projects/release-pkg/sys/dev/acpica/acpi_video.c
==============================================================================
--- projects/release-pkg/sys/dev/acpica/acpi_video.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/acpica/acpi_video.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -597,23 +597,28 @@ acpi_video_vo_bind(struct acpi_video_out
 {
 
 	ACPI_SERIAL_BEGIN(video_output);
-	if (vo->vo_levels != NULL)
+	if (vo->vo_levels != NULL) {
+		AcpiRemoveNotifyHandler(vo->handle, ACPI_DEVICE_NOTIFY,
+		    acpi_video_vo_notify_handler);
 		AcpiOsFree(vo->vo_levels);
+		vo->vo_levels = NULL;
+	}
 	vo->handle = handle;
 	vo->vo_numlevels = vo_get_brightness_levels(handle, &vo->vo_levels);
 	if (vo->vo_numlevels >= 2) {
-		if (vo->vo_fullpower == -1
-		    || acpi_video_vo_check_level(vo, vo->vo_fullpower) != 0)
+		if (vo->vo_fullpower == -1 ||
+		    acpi_video_vo_check_level(vo, vo->vo_fullpower) != 0) {
 			/* XXX - can't deal with rebinding... */
 			vo->vo_fullpower = vo->vo_levels[BCL_FULLPOWER];
-		if (vo->vo_economy == -1
-		    || acpi_video_vo_check_level(vo, vo->vo_economy) != 0)
+		}
+		if (vo->vo_economy == -1 ||
+		    acpi_video_vo_check_level(vo, vo->vo_economy) != 0) {
 			/* XXX - see above. */
 			vo->vo_economy = vo->vo_levels[BCL_ECONOMY];
-	}
-	if (vo->vo_levels != NULL)
+		}
 		AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY,
 		    acpi_video_vo_notify_handler, vo);
+	}
 	ACPI_SERIAL_END(video_output);
 }
 

Modified: projects/release-pkg/sys/dev/ixl/if_ixl.c
==============================================================================
--- projects/release-pkg/sys/dev/ixl/if_ixl.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/ixl/if_ixl.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -115,6 +115,8 @@ static int	ixl_init_msix(struct ixl_pf *
 static void	ixl_configure_msix(struct ixl_pf *);
 static void	ixl_configure_itr(struct ixl_pf *);
 static void	ixl_configure_legacy(struct ixl_pf *);
+static void	ixl_init_taskqueues(struct ixl_pf *);
+static void	ixl_free_taskqueues(struct ixl_pf *);
 static void	ixl_free_pci_resources(struct ixl_pf *);
 static void	ixl_local_timer(void *);
 static int	ixl_setup_interface(device_t, struct ixl_vsi *);
@@ -642,7 +644,7 @@ ixl_attach(device_t dev)
 	else
 		error = ixl_assign_vsi_legacy(pf);
 	if (error) 
-		goto err_late;
+		goto err_mac_hmc;
 
 	if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||
 	    (hw->aq.fw_maj_ver < 4)) {
@@ -667,7 +669,7 @@ ixl_attach(device_t dev)
 	error = ixl_switch_config(pf);
 	if (error) {
 		device_printf(dev, "Initial switch config failed: %d\n", error);
-		goto err_mac_hmc;
+		goto err_late;
 	}
 
 	/* Limit phy interrupts to link and modules failure */
@@ -680,6 +682,9 @@ ixl_attach(device_t dev)
 	bus = ixl_get_bus_info(hw, dev);
 	i40e_set_pci_config_data(hw, bus);
 
+	/* Initialize taskqueues */
+	ixl_init_taskqueues(pf);
+
 	/* Initialize statistics */
 	ixl_pf_reset_stats(pf);
 	ixl_update_stats_counters(pf);
@@ -748,7 +753,6 @@ ixl_detach(device_t dev)
 	struct ixl_pf		*pf = device_get_softc(dev);
 	struct i40e_hw		*hw = &pf->hw;
 	struct ixl_vsi		*vsi = &pf->vsi;
-	struct ixl_queue	*que = vsi->queues;
 	i40e_status		status;
 #ifdef PCI_IOV
 	int			error;
@@ -777,13 +781,7 @@ ixl_detach(device_t dev)
 		IXL_PF_UNLOCK(pf);
 	}
 
-	for (int i = 0; i < vsi->num_queues; i++, que++) {
-		if (que->tq) {
-			taskqueue_drain(que->tq, &que->task);
-			taskqueue_drain(que->tq, &que->tx_task);
-			taskqueue_free(que->tq);
-		}
-	}
+	ixl_free_taskqueues(pf);
 
 	/* Shutdown LAN HMC */
 	status = i40e_shutdown_lan_hmc(hw);
@@ -1990,6 +1988,58 @@ ixl_assign_vsi_legacy(struct ixl_pf *pf)
 	return (0);
 }
 
+static void
+ixl_init_taskqueues(struct ixl_pf *pf)
+{
+       struct ixl_vsi *vsi = &pf->vsi;
+       struct ixl_queue *que = vsi->queues;
+       device_t dev = pf->dev;
+
+       /* Tasklet for Admin Queue */
+       TASK_INIT(&pf->adminq, 0, ixl_do_adminq, pf);
+#ifdef PCI_IOV
+       /* VFLR Tasklet */
+       TASK_INIT(&pf->vflr_task, 0, ixl_handle_vflr, pf);
+#endif
+
+       /* Create and start PF taskqueue */
+       pf->tq = taskqueue_create_fast("ixl_adm", M_NOWAIT,
+           taskqueue_thread_enqueue, &pf->tq);
+       taskqueue_start_threads(&pf->tq, 1, PI_NET, "%s adminq",
+           device_get_nameunit(dev));
+
+       /* Create queue tasks and start queue taskqueues */
+       for (int i = 0; i < vsi->num_queues; i++, que++) {
+               TASK_INIT(&que->tx_task, 0, ixl_deferred_mq_start, que);
+               TASK_INIT(&que->task, 0, ixl_handle_que, que);
+               que->tq = taskqueue_create_fast("ixl_que", M_NOWAIT,
+                   taskqueue_thread_enqueue, &que->tq);
+#ifdef RSS
+               CPU_SETOF(cpu_id, &cpu_mask);
+               taskqueue_start_threads_cpuset(&que->tq, 1, PI_NET,
+                   &cpu_mask, "%s (bucket %d)",
+                   device_get_nameunit(dev), cpu_id);
+#else
+               taskqueue_start_threads(&que->tq, 1, PI_NET,
+                   "%s (que %d)", device_get_nameunit(dev), que->me);
+#endif
+       }
+
+}
+
+static void
+ixl_free_taskqueues(struct ixl_pf *pf)
+{
+       struct ixl_vsi          *vsi = &pf->vsi;
+       struct ixl_queue        *que = vsi->queues;
+
+       if (pf->tq)
+               taskqueue_free(pf->tq);
+       for (int i = 0; i < vsi->num_queues; i++, que++) {
+               if (que->tq)
+                       taskqueue_free(que->tq);
+       }
+}
 
 /*********************************************************************
  *
@@ -2028,17 +2078,6 @@ ixl_assign_vsi_msix(struct ixl_pf *pf)
 	}
 	bus_describe_intr(dev, pf->res, pf->tag, "aq");
 	pf->admvec = vector;
-	/* Tasklet for Admin Queue */
-	TASK_INIT(&pf->adminq, 0, ixl_do_adminq, pf);
-
-#ifdef PCI_IOV
-	TASK_INIT(&pf->vflr_task, 0, ixl_handle_vflr, pf);
-#endif
-
-	pf->tq = taskqueue_create_fast("ixl_adm", M_NOWAIT,
-	    taskqueue_thread_enqueue, &pf->tq);
-	taskqueue_start_threads(&pf->tq, 1, PI_NET, "%s adminq",
-	    device_get_nameunit(pf->dev));
 	++vector;
 
 	/* Now set up the stations */
@@ -2069,19 +2108,6 @@ ixl_assign_vsi_msix(struct ixl_pf *pf)
 #endif
 		bus_bind_intr(dev, que->res, cpu_id);
 		que->msix = vector;
-		TASK_INIT(&que->tx_task, 0, ixl_deferred_mq_start, que);
-		TASK_INIT(&que->task, 0, ixl_handle_que, que);
-		que->tq = taskqueue_create_fast("ixl_que", M_NOWAIT,
-		    taskqueue_thread_enqueue, &que->tq);
-#ifdef RSS
-		CPU_SETOF(cpu_id, &cpu_mask);
-		taskqueue_start_threads_cpuset(&que->tq, 1, PI_NET,
-		    &cpu_mask, "%s (bucket %d)",
-		    device_get_nameunit(dev), cpu_id);
-#else
-		taskqueue_start_threads(&que->tq, 1, PI_NET,
-		    "%s que", device_get_nameunit(dev));
-#endif
 	}
 
 	return (0);
@@ -2144,9 +2170,15 @@ ixl_init_msix(struct ixl_pf *pf)
 	/* Figure out a reasonable auto config value */
 	queues = (mp_ncpus > (available - 1)) ? (available - 1) : mp_ncpus;
 
-	/* Override with hardcoded value if sane */
+	/* Override with hardcoded value if it's less than autoconfig count */
 	if ((ixl_max_queues != 0) && (ixl_max_queues <= queues)) 
 		queues = ixl_max_queues;
+	else if ((ixl_max_queues != 0) && (ixl_max_queues > queues))
+		device_printf(dev, "ixl_max_queues > # of cpus, using "
+		    "autoconfig amount...\n");
+	/* Or limit maximum auto-configured queues to 8 */
+	else if ((ixl_max_queues == 0) && (queues > 8))
+		queues = 8;
 
 #ifdef  RSS
 	/* If we're doing RSS, clamp at the number of RSS buckets */
@@ -2880,7 +2912,6 @@ ixl_initialize_vsi(struct ixl_vsi *vsi)
 			device_printf(dev, "Fail in init_rx_ring %d\n", i);
 			break;
 		}
-		wr32(vsi->hw, I40E_QRX_TAIL(que->me), 0);
 #ifdef DEV_NETMAP
 		/* preserve queue */
 		if (vsi->ifp->if_capenable & IFCAP_NETMAP) {

Modified: projects/release-pkg/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- projects/release-pkg/sys/dev/ixl/ixl_txrx.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/ixl/ixl_txrx.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -390,7 +390,6 @@ ixl_xmit(struct ixl_queue *que, struct m
 	++txr->total_packets;
 	wr32(hw, txr->tail, i);
 
-	ixl_flush(hw);
 	/* Mark outstanding work */
 	if (que->busy == 0)
 		que->busy = 1;

Modified: projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -810,7 +810,7 @@ nvme_ctrlr_intx_handler(void *arg)
 
 	nvme_qpair_process_completions(&ctrlr->adminq);
 
-	if (ctrlr->ioq[0].cpl)
+	if (ctrlr->ioq && ctrlr->ioq[0].cpl)
 		nvme_qpair_process_completions(&ctrlr->ioq[0]);
 
 	nvme_mmio_write_4(ctrlr, intmc, 1);

Modified: projects/release-pkg/sys/dev/usb/controller/xhci.c
==============================================================================
--- projects/release-pkg/sys/dev/usb/controller/xhci.c	Wed Feb 24 03:06:26 2016	(r295956)
+++ projects/release-pkg/sys/dev/usb/controller/xhci.c	Wed Feb 24 03:08:58 2016	(r295957)
@@ -2358,6 +2358,8 @@ xhci_configure_endpoint(struct usb_devic
 
 	/* store endpoint mode */
 	pepext->trb_ep_mode = ep_mode;
+	/* store bMaxPacketSize for control endpoints */
+	pepext->trb_ep_maxp = edesc->wMaxPacketSize[0];
 	usb_pc_cpu_flush(pepext->page_cache);
 
 	if (ep_mode == USB_EP_MODE_STREAMS) {
@@ -2904,6 +2906,17 @@ xhci_transfer_insert(struct usb_xfer *xf
 		return (USB_ERR_NOMEM);
 	}
 
+	/* check if bMaxPacketSize changed */
+	if (xfer->flags_int.control_xfr != 0 &&

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

From owner-svn-src-projects@freebsd.org  Wed Feb 24 21:38:55 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BC73AB3E0A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 21:38:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1E19E204;
 Wed, 24 Feb 2016 21:38:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1OLcsWS067003;
 Wed, 24 Feb 2016 21:38:54 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1OLcqR7066984;
 Wed, 24 Feb 2016 21:38:52 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602242138.u1OLcqR7066984@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 24 Feb 2016 21:38:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r296007 - in projects/clang380-import: . bin/csh bin/expr
 bin/rmail bin/sh bin/sh/tests/parser cddl/lib/libdtrace
 contrib/libarchive/libarchive etc etc/defaults gnu/lib/csu gnu/lib/libg...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 21:38:55 -0000

Author: dim
Date: Wed Feb 24 21:38:51 2016
New Revision: 296007
URL: https://svnweb.freebsd.org/changeset/base/296007

Log:
  Merge ^/head r295902 through r296006.

Added:
  projects/clang380-import/bin/sh/tests/parser/set-v1.0
     - copied unchanged from r296006, head/bin/sh/tests/parser/set-v1.0
  projects/clang380-import/bin/sh/tests/parser/set-v1.0.stderr
     - copied unchanged from r296006, head/bin/sh/tests/parser/set-v1.0.stderr
  projects/clang380-import/gnu/usr.bin/binutils/ld/Makefile.depend
     - copied unchanged from r296006, head/gnu/usr.bin/binutils/ld/Makefile.depend
  projects/clang380-import/gnu/usr.bin/binutils/libbfd/Makefile.depend
     - copied unchanged from r296006, head/gnu/usr.bin/binutils/libbfd/Makefile.depend
  projects/clang380-import/gnu/usr.bin/gdb/kgdb/Makefile.depend
     - copied unchanged from r296006, head/gnu/usr.bin/gdb/kgdb/Makefile.depend
  projects/clang380-import/gnu/usr.bin/gdb/libgdb/Makefile.depend
     - copied unchanged from r296006, head/gnu/usr.bin/gdb/libgdb/Makefile.depend
  projects/clang380-import/lib/libsysdecode/errno.c
     - copied unchanged from r296006, head/lib/libsysdecode/errno.c
  projects/clang380-import/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
     - copied unchanged from r296006, head/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
  projects/clang380-import/sys/dev/hyperv/utilities/hv_heartbeat.c
     - copied unchanged from r296006, head/sys/dev/hyperv/utilities/hv_heartbeat.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_shutdown.c
     - copied unchanged from r296006, head/sys/dev/hyperv/utilities/hv_shutdown.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_timesync.c
     - copied unchanged from r296006, head/sys/dev/hyperv/utilities/hv_timesync.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_util.h
     - copied unchanged from r296006, head/sys/dev/hyperv/utilities/hv_util.h
  projects/clang380-import/sys/dev/pci/pci_host_generic.h
     - copied unchanged from r296006, head/sys/dev/pci/pci_host_generic.h
  projects/clang380-import/sys/geom/uzip/g_uzip.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip.h
  projects/clang380-import/sys/geom/uzip/g_uzip_cloop.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_cloop.h
  projects/clang380-import/sys/geom/uzip/g_uzip_dapi.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_dapi.h
  projects/clang380-import/sys/geom/uzip/g_uzip_lzma.c
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_lzma.c
  projects/clang380-import/sys/geom/uzip/g_uzip_lzma.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_lzma.h
  projects/clang380-import/sys/geom/uzip/g_uzip_softc.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_softc.h
  projects/clang380-import/sys/geom/uzip/g_uzip_wrkthr.c
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_wrkthr.c
  projects/clang380-import/sys/geom/uzip/g_uzip_wrkthr.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_wrkthr.h
  projects/clang380-import/sys/geom/uzip/g_uzip_zlib.c
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_zlib.c
  projects/clang380-import/sys/geom/uzip/g_uzip_zlib.h
     - copied unchanged from r296006, head/sys/geom/uzip/g_uzip_zlib.h
  projects/clang380-import/sys/riscv/riscv/mp_machdep.c
     - copied unchanged from r296006, head/sys/riscv/riscv/mp_machdep.c
  projects/clang380-import/usr.bin/mkesdb_static/Makefile.depend
     - copied unchanged from r296006, head/usr.bin/mkesdb_static/Makefile.depend
  projects/clang380-import/usr.bin/mkuzip/mkuz_blockcache.c
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_blockcache.c
  projects/clang380-import/usr.bin/mkuzip/mkuz_blockcache.h
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_blockcache.h
  projects/clang380-import/usr.bin/mkuzip/mkuz_cloop.h
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_cloop.h
  projects/clang380-import/usr.bin/mkuzip/mkuz_lzma.c
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_lzma.c
  projects/clang380-import/usr.bin/mkuzip/mkuz_lzma.h
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_lzma.h
  projects/clang380-import/usr.bin/mkuzip/mkuz_zlib.c
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_zlib.c
  projects/clang380-import/usr.bin/mkuzip/mkuz_zlib.h
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuz_zlib.h
  projects/clang380-import/usr.bin/mkuzip/mkuzip.h
     - copied unchanged from r296006, head/usr.bin/mkuzip/mkuzip.h
Deleted:
  projects/clang380-import/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
  projects/clang380-import/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64
  projects/clang380-import/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
  projects/clang380-import/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
  projects/clang380-import/share/man/man4/geom_uncompress.4
  projects/clang380-import/sys/arm64/cavium/thunder_pcie.c
  projects/clang380-import/sys/geom/uncompress/
  projects/clang380-import/sys/modules/geom/geom_uncompress/
  projects/clang380-import/usr.bin/mkulzma/
  projects/clang380-import/usr.bin/truss/cloudabi.c
  projects/clang380-import/usr.bin/truss/cloudabi.h
Modified:
  projects/clang380-import/Makefile
  projects/clang380-import/Makefile.inc1
  projects/clang380-import/ObsoleteFiles.inc
  projects/clang380-import/bin/csh/Makefile.depend
  projects/clang380-import/bin/expr/Makefile.depend
  projects/clang380-import/bin/rmail/Makefile.depend
  projects/clang380-import/bin/sh/Makefile.depend
  projects/clang380-import/bin/sh/input.c
  projects/clang380-import/bin/sh/tests/parser/Makefile
  projects/clang380-import/cddl/lib/libdtrace/Makefile.depend
  projects/clang380-import/contrib/libarchive/libarchive/archive_read.c
  projects/clang380-import/etc/defaults/rc.conf
  projects/clang380-import/etc/rc.subr
  projects/clang380-import/gnu/lib/csu/Makefile.depend
  projects/clang380-import/gnu/lib/libgcc/Makefile
  projects/clang380-import/gnu/lib/libgcc/Makefile.depend
  projects/clang380-import/gnu/lib/libgcov/Makefile.depend
  projects/clang380-import/gnu/lib/libgomp/Makefile.depend
  projects/clang380-import/gnu/lib/libregex/Makefile.depend
  projects/clang380-import/gnu/lib/libstdc++/Makefile.depend
  projects/clang380-import/gnu/lib/libsupc++/Makefile.depend
  projects/clang380-import/gnu/usr.bin/binutils/ld/Makefile.depend.host
  projects/clang380-import/gnu/usr.bin/binutils/libbfd/Makefile.depend.host
  projects/clang380-import/gnu/usr.bin/binutils/libbinutils/Makefile.depend
  projects/clang380-import/gnu/usr.bin/cc/cc1/Makefile.depend
  projects/clang380-import/gnu/usr.bin/cc/cc1plus/Makefile.depend
  projects/clang380-import/gnu/usr.bin/cc/cc_tools/Makefile.depend
  projects/clang380-import/gnu/usr.bin/cc/libcpp/Makefile.depend
  projects/clang380-import/gnu/usr.bin/diff3/Makefile.depend
  projects/clang380-import/gnu/usr.bin/dtc/Makefile.depend
  projects/clang380-import/gnu/usr.bin/gdb/gdb/Makefile.depend
  projects/clang380-import/gnu/usr.bin/gdb/gdbtui/Makefile.depend
  projects/clang380-import/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend
  projects/clang380-import/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
  projects/clang380-import/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
  projects/clang380-import/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
  projects/clang380-import/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
  projects/clang380-import/gnu/usr.bin/sdiff/Makefile.depend
  projects/clang380-import/kerberos5/lib/libasn1/Makefile
  projects/clang380-import/kerberos5/lib/libasn1/Makefile.depend
  projects/clang380-import/kerberos5/lib/libgssapi_krb5/Makefile.depend
  projects/clang380-import/kerberos5/lib/libgssapi_spnego/Makefile.depend
  projects/clang380-import/kerberos5/lib/libhdb/Makefile
  projects/clang380-import/kerberos5/lib/libhdb/Makefile.depend
  projects/clang380-import/kerberos5/lib/libheimntlm/Makefile
  projects/clang380-import/kerberos5/lib/libheimntlm/Makefile.depend
  projects/clang380-import/kerberos5/lib/libhx509/Makefile
  projects/clang380-import/kerberos5/lib/libhx509/Makefile.depend
  projects/clang380-import/kerberos5/lib/libkadm5clnt/Makefile.depend
  projects/clang380-import/kerberos5/lib/libkadm5srv/Makefile.depend
  projects/clang380-import/kerberos5/lib/libkafs5/Makefile.depend
  projects/clang380-import/kerberos5/lib/libkrb5/Makefile.depend
  projects/clang380-import/kerberos5/lib/libroken/Makefile.depend
  projects/clang380-import/kerberos5/lib/libvers/Makefile.depend
  projects/clang380-import/kerberos5/lib/libwind/Makefile.depend
  projects/clang380-import/kerberos5/libexec/ipropd-master/Makefile.depend
  projects/clang380-import/kerberos5/libexec/ipropd-slave/Makefile.depend
  projects/clang380-import/kerberos5/libexec/kdigest/Makefile.depend
  projects/clang380-import/kerberos5/tools/asn1_compile/Makefile.depend
  projects/clang380-import/kerberos5/tools/make-roken/Makefile.depend
  projects/clang380-import/kerberos5/tools/slc/Makefile.depend
  projects/clang380-import/kerberos5/usr.bin/hxtool/Makefile.depend
  projects/clang380-import/kerberos5/usr.bin/kadmin/Makefile.depend
  projects/clang380-import/kerberos5/usr.bin/kcc/Makefile.depend
  projects/clang380-import/kerberos5/usr.sbin/iprop-log/Makefile.depend
  projects/clang380-import/kerberos5/usr.sbin/ktutil/Makefile.depend
  projects/clang380-import/lib/clang/clang.build.mk
  projects/clang380-import/lib/clang/libclanganalysis/Makefile.depend
  projects/clang380-import/lib/clang/libclangarcmigrate/Makefile.depend
  projects/clang380-import/lib/clang/libclangast/Makefile.depend
  projects/clang380-import/lib/clang/libclangbasic/Makefile.depend
  projects/clang380-import/lib/clang/libclangcodegen/Makefile.depend
  projects/clang380-import/lib/clang/libclangdriver/Makefile.depend
  projects/clang380-import/lib/clang/libclangedit/Makefile.depend
  projects/clang380-import/lib/clang/libclangfrontend/Makefile.depend
  projects/clang380-import/lib/clang/libclangfrontendtool/Makefile.depend
  projects/clang380-import/lib/clang/libclanglex/Makefile.depend
  projects/clang380-import/lib/clang/libclangparse/Makefile.depend
  projects/clang380-import/lib/clang/libclangrewrite/Makefile.depend
  projects/clang380-import/lib/clang/libclangrewritefrontend/Makefile.depend
  projects/clang380-import/lib/clang/libclangsema/Makefile.depend
  projects/clang380-import/lib/clang/libclangserialization/Makefile.depend
  projects/clang380-import/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
  projects/clang380-import/lib/clang/libclangstaticanalyzercore/Makefile.depend
  projects/clang380-import/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
  projects/clang380-import/lib/clang/liblldbAPI/Makefile.depend
  projects/clang380-import/lib/clang/liblldbBreakpoint/Makefile.depend
  projects/clang380-import/lib/clang/liblldbCommands/Makefile.depend
  projects/clang380-import/lib/clang/liblldbCore/Makefile.depend
  projects/clang380-import/lib/clang/liblldbDataFormatters/Makefile.depend
  projects/clang380-import/lib/clang/liblldbExpression/Makefile.depend
  projects/clang380-import/lib/clang/liblldbInterpreter/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginProcessUtility/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
  projects/clang380-import/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
  projects/clang380-import/lib/clang/liblldbSymbol/Makefile.depend
  projects/clang380-import/lib/clang/liblldbTarget/Makefile.depend
  projects/clang380-import/lib/clang/libllvmaarch64asmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmaarch64codegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmaarch64desc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmaarch64disassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmaarch64utils/Makefile.depend
  projects/clang380-import/lib/clang/libllvmanalysis/Makefile.depend
  projects/clang380-import/lib/clang/libllvmarmasmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmarmcodegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmarmdesc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmarmdisassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmarminfo/Makefile.depend
  projects/clang380-import/lib/clang/libllvmasmprinter/Makefile.depend
  projects/clang380-import/lib/clang/libllvmbitreader/Makefile.depend
  projects/clang380-import/lib/clang/libllvmcodegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmcore/Makefile.depend
  projects/clang380-import/lib/clang/libllvminstcombine/Makefile.depend
  projects/clang380-import/lib/clang/libllvminstrumentation/Makefile.depend
  projects/clang380-import/lib/clang/libllvminterpreter/Makefile.depend
  projects/clang380-import/lib/clang/libllvmipo/Makefile.depend
  projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend
  projects/clang380-import/lib/clang/libllvmlto/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmipsasmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmipscodegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmipsdesc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmipsdisassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmmipsinfo/Makefile.depend
  projects/clang380-import/lib/clang/libllvmobjcarcopts/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpowerpcasmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpowerpccodegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpowerpcdesc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmpowerpcinfo/Makefile.depend
  projects/clang380-import/lib/clang/libllvmscalaropts/Makefile.depend
  projects/clang380-import/lib/clang/libllvmselectiondag/Makefile.depend
  projects/clang380-import/lib/clang/libllvmsparcasmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmsparccodegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmsparcdesc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmsparcdisassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmsparcinfo/Makefile.depend
  projects/clang380-import/lib/clang/libllvmtarget/Makefile.depend
  projects/clang380-import/lib/clang/libllvmtransformutils/Makefile.depend
  projects/clang380-import/lib/clang/libllvmvectorize/Makefile.depend
  projects/clang380-import/lib/clang/libllvmx86asmparser/Makefile.depend
  projects/clang380-import/lib/clang/libllvmx86codegen/Makefile.depend
  projects/clang380-import/lib/clang/libllvmx86desc/Makefile.depend
  projects/clang380-import/lib/clang/libllvmx86disassembler/Makefile.depend
  projects/clang380-import/lib/clang/libllvmx86info/Makefile.depend
  projects/clang380-import/lib/libc++/Makefile.depend
  projects/clang380-import/lib/libc/Makefile.depend
  projects/clang380-import/lib/libc/db/btree/bt_split.c
  projects/clang380-import/lib/libc/db/hash/hash.c
  projects/clang380-import/lib/libc/db/recno/rec_put.c
  projects/clang380-import/lib/libcxxrt/Makefile.depend.host
  projects/clang380-import/lib/libdwarf/Makefile.depend
  projects/clang380-import/lib/libedit/Makefile.depend
  projects/clang380-import/lib/libelf/Makefile.depend
  projects/clang380-import/lib/libfetch/Makefile.depend
  projects/clang380-import/lib/libipsec/Makefile.depend
  projects/clang380-import/lib/libmd/Makefile.depend
  projects/clang380-import/lib/libmilter/Makefile.depend
  projects/clang380-import/lib/libpcap/Makefile.depend
  projects/clang380-import/lib/librpcsvc/Makefile.depend
  projects/clang380-import/lib/libsm/Makefile.depend
  projects/clang380-import/lib/libsmdb/Makefile.depend
  projects/clang380-import/lib/libsmutil/Makefile.depend
  projects/clang380-import/lib/libstand/Makefile.depend
  projects/clang380-import/lib/libsysdecode/Makefile
  projects/clang380-import/lib/libsysdecode/Makefile.depend
  projects/clang380-import/lib/libsysdecode/sysdecode.3
  projects/clang380-import/lib/libsysdecode/sysdecode.h
  projects/clang380-import/lib/libsysdecode/sysdecode_syscallnames.3
  projects/clang380-import/lib/libunbound/Makefile.depend
  projects/clang380-import/lib/libypclnt/Makefile.depend
  projects/clang380-import/lib/ncurses/form/Makefile.depend
  projects/clang380-import/lib/ncurses/formw/Makefile.depend
  projects/clang380-import/lib/ncurses/menu/Makefile.depend
  projects/clang380-import/lib/ncurses/menuw/Makefile.depend
  projects/clang380-import/lib/ncurses/ncurses/Makefile.depend
  projects/clang380-import/lib/ncurses/ncursesw/Makefile.depend
  projects/clang380-import/lib/ncurses/panel/Makefile.depend
  projects/clang380-import/lib/ncurses/panelw/Makefile.depend
  projects/clang380-import/libexec/dma/dmagent/Makefile.depend
  projects/clang380-import/libexec/ftpd/Makefile.depend
  projects/clang380-import/libexec/mail.local/Makefile.depend
  projects/clang380-import/libexec/smrsh/Makefile.depend
  projects/clang380-import/libexec/ypxfr/Makefile.depend
  projects/clang380-import/sbin/atm/atmconfig/Makefile.depend
  projects/clang380-import/sbin/devd/Makefile.depend
  projects/clang380-import/sbin/gbde/Makefile.depend
  projects/clang380-import/sbin/hastctl/Makefile.depend
  projects/clang380-import/sbin/hastd/Makefile.depend
  projects/clang380-import/sbin/ipf/ipf/Makefile.depend
  projects/clang380-import/sbin/ipf/ipftest/Makefile.depend
  projects/clang380-import/sbin/ipf/ipmon/Makefile.depend
  projects/clang380-import/sbin/ipf/ipnat/Makefile.depend
  projects/clang380-import/sbin/ipf/ippool/Makefile.depend
  projects/clang380-import/sbin/ipfw/ipfw2.c
  projects/clang380-import/sbin/pfctl/Makefile.depend
  projects/clang380-import/sbin/route/Makefile.depend
  projects/clang380-import/sbin/setkey/Makefile.depend
  projects/clang380-import/secure/lib/libcrypto/Makefile.depend
  projects/clang380-import/share/man/man4/Makefile
  projects/clang380-import/share/man/man4/geom.4
  projects/clang380-import/share/man/man4/geom_map.4
  projects/clang380-import/share/man/man4/geom_uzip.4
  projects/clang380-import/share/man/man5/make.conf.5
  projects/clang380-import/share/man/man5/src.conf.5
  projects/clang380-import/share/man/man8/rc.subr.8
  projects/clang380-import/share/man/man9/vrele.9
  projects/clang380-import/share/mk/bsd.dep.mk
  projects/clang380-import/share/mk/bsd.lib.mk
  projects/clang380-import/share/mk/bsd.opts.mk
  projects/clang380-import/share/mk/bsd.prog.mk
  projects/clang380-import/share/mk/bsd.progs.mk
  projects/clang380-import/share/mk/bsd.subdir.mk
  projects/clang380-import/share/mk/local.meta.sys.mk
  projects/clang380-import/sys/amd64/amd64/support.S
  projects/clang380-import/sys/arm/arm/cpu_asm-v6.S
  projects/clang380-import/sys/arm/freescale/imx/imx6_machdep.c
  projects/clang380-import/sys/arm/include/cpu-v6.h
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.h
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.h
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem_fdt.c
  projects/clang380-import/sys/boot/efi/loader/Makefile.depend
  projects/clang380-import/sys/boot/fdt/dts/riscv/qemu.dts
  projects/clang380-import/sys/boot/fdt/dts/riscv/spike.dts
  projects/clang380-import/sys/boot/ficl/Makefile.depend
  projects/clang380-import/sys/boot/ficl32/Makefile.depend
  projects/clang380-import/sys/boot/forth/loader.conf
  projects/clang380-import/sys/boot/i386/loader/Makefile.depend
  projects/clang380-import/sys/boot/i386/zfsloader/Makefile.depend
  projects/clang380-import/sys/boot/libstand32/Makefile.depend
  projects/clang380-import/sys/boot/userboot/ficl/Makefile.depend
  projects/clang380-import/sys/boot/userboot/libstand/Makefile.depend
  projects/clang380-import/sys/boot/userboot/userboot/Makefile.depend
  projects/clang380-import/sys/compat/cloudabi/cloudabi_mem.c
  projects/clang380-import/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang380-import/sys/conf/NOTES
  projects/clang380-import/sys/conf/files
  projects/clang380-import/sys/conf/files.amd64
  projects/clang380-import/sys/conf/files.arm64
  projects/clang380-import/sys/conf/files.i386
  projects/clang380-import/sys/conf/files.riscv
  projects/clang380-import/sys/conf/kern.opts.mk
  projects/clang380-import/sys/conf/kern.post.mk
  projects/clang380-import/sys/conf/kmod.mk
  projects/clang380-import/sys/conf/options
  projects/clang380-import/sys/dev/acpica/acpi_ec.c
  projects/clang380-import/sys/dev/acpica/acpi_video.c
  projects/clang380-import/sys/dev/e1000/if_em.c
  projects/clang380-import/sys/dev/e1000/if_em.h
  projects/clang380-import/sys/dev/e1000/if_igb.c
  projects/clang380-import/sys/dev/e1000/if_igb.h
  projects/clang380-import/sys/dev/e1000/if_lem.h
  projects/clang380-import/sys/dev/hyperv/include/hyperv.h
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_kvp.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_kvp.h
  projects/clang380-import/sys/dev/hyperv/utilities/hv_util.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_connection.c
  projects/clang380-import/sys/dev/ixl/if_ixl.c
  projects/clang380-import/sys/dev/ixl/ixl_txrx.c
  projects/clang380-import/sys/dev/nvme/nvme_ctrlr.c
  projects/clang380-import/sys/dev/pci/pci_host_generic.c
  projects/clang380-import/sys/dev/uart/uart_cpu_fdt.c
  projects/clang380-import/sys/dev/uart/uart_dev_lpc.c
  projects/clang380-import/sys/dev/usb/controller/xhci.c
  projects/clang380-import/sys/dev/usb/controller/xhci.h
  projects/clang380-import/sys/dev/usb/usb_hid.c
  projects/clang380-import/sys/dev/usb/usbdevs
  projects/clang380-import/sys/dev/usb/wlan/if_urtwn.c
  projects/clang380-import/sys/geom/uzip/g_uzip.c
  projects/clang380-import/sys/kern/kern_mib.c
  projects/clang380-import/sys/kern/uipc_usrreq.c
  projects/clang380-import/sys/kern/vfs_cache.c
  projects/clang380-import/sys/kern/vfs_subr.c
  projects/clang380-import/sys/mips/conf/ALFA_HORNET_UB
  projects/clang380-import/sys/mips/conf/AP121
  projects/clang380-import/sys/mips/conf/AP135
  projects/clang380-import/sys/mips/conf/AP143
  projects/clang380-import/sys/mips/conf/AP91
  projects/clang380-import/sys/mips/conf/AP93
  projects/clang380-import/sys/mips/conf/AP96
  projects/clang380-import/sys/mips/conf/CARAMBOLA2
  projects/clang380-import/sys/mips/conf/DB120
  projects/clang380-import/sys/mips/conf/DIR-655A1
  projects/clang380-import/sys/mips/conf/DIR-825B1
  projects/clang380-import/sys/mips/conf/DIR-825C1
  projects/clang380-import/sys/mips/conf/ENH200
  projects/clang380-import/sys/mips/conf/MT7620
  projects/clang380-import/sys/mips/conf/ONIONOMEGA
  projects/clang380-import/sys/mips/conf/PB47
  projects/clang380-import/sys/mips/conf/PB92
  projects/clang380-import/sys/mips/conf/PICOSTATION_M2HP
  projects/clang380-import/sys/mips/conf/ROUTERSTATION
  projects/clang380-import/sys/mips/conf/RSPRO
  projects/clang380-import/sys/mips/conf/RT305X
  projects/clang380-import/sys/mips/conf/RT5350
  projects/clang380-import/sys/mips/conf/TL-ARCHERC7V2
  projects/clang380-import/sys/mips/conf/TL-WDR4300
  projects/clang380-import/sys/mips/conf/TL-WR1043NDv2
  projects/clang380-import/sys/mips/conf/TL-WR740Nv4
  projects/clang380-import/sys/mips/conf/TP-WN1043ND
  projects/clang380-import/sys/mips/conf/WZR-300HP
  projects/clang380-import/sys/mips/conf/WZR-HPAG300H
  projects/clang380-import/sys/modules/filemon/Makefile.depend
  projects/clang380-import/sys/modules/geom/Makefile
  projects/clang380-import/sys/modules/geom/geom_uzip/Makefile
  projects/clang380-import/sys/modules/hyperv/utilities/Makefile
  projects/clang380-import/sys/net80211/ieee80211_node.c
  projects/clang380-import/sys/netinet/tcp_stacks/fastpath.c
  projects/clang380-import/sys/netinet/tcp_subr.c
  projects/clang380-import/sys/netinet6/sctp6_usrreq.c
  projects/clang380-import/sys/netipsec/key.c
  projects/clang380-import/sys/netpfil/ipfw/ip_fw2.c
  projects/clang380-import/sys/powerpc/mpc85xx/mpc85xx.c
  projects/clang380-import/sys/riscv/conf/GENERIC
  projects/clang380-import/sys/riscv/htif/htif.c
  projects/clang380-import/sys/riscv/htif/htif_block.c
  projects/clang380-import/sys/riscv/htif/htif_console.c
  projects/clang380-import/sys/riscv/include/intr.h
  projects/clang380-import/sys/riscv/include/param.h
  projects/clang380-import/sys/riscv/include/pcpu.h
  projects/clang380-import/sys/riscv/include/riscvreg.h
  projects/clang380-import/sys/riscv/include/smp.h
  projects/clang380-import/sys/riscv/riscv/cpufunc_asm.S
  projects/clang380-import/sys/riscv/riscv/exception.S
  projects/clang380-import/sys/riscv/riscv/genassym.c
  projects/clang380-import/sys/riscv/riscv/intr_machdep.c
  projects/clang380-import/sys/riscv/riscv/locore.S
  projects/clang380-import/sys/riscv/riscv/machdep.c
  projects/clang380-import/sys/riscv/riscv/pmap.c
  projects/clang380-import/sys/riscv/riscv/swtch.S
  projects/clang380-import/sys/sys/vnode.h
  projects/clang380-import/sys/ufs/ffs/ffs_inode.c
  projects/clang380-import/sys/x86/isa/clock.c
  projects/clang380-import/targets/Makefile.xtras
  projects/clang380-import/targets/pseudo/hosttools/Makefile.depend
  projects/clang380-import/targets/pseudo/kernel/Makefile
  projects/clang380-import/targets/pseudo/userland/Makefile.depend
  projects/clang380-import/tools/tools/ath/ath_ee_9300_print/Makefile.depend
  projects/clang380-import/tools/tools/net80211/w00t/Makefile.inc
  projects/clang380-import/usr.bin/Makefile
  projects/clang380-import/usr.bin/ar/Makefile.depend
  projects/clang380-import/usr.bin/awk/Makefile.depend
  projects/clang380-import/usr.bin/bc/Makefile.depend
  projects/clang380-import/usr.bin/clang/bugpoint/Makefile.depend
  projects/clang380-import/usr.bin/clang/clang/Makefile.depend
  projects/clang380-import/usr.bin/clang/llc/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-dis/Makefile.depend
  projects/clang380-import/usr.bin/clang/llvm-lto/Makefile.depend
  projects/clang380-import/usr.bin/clang/opt/Makefile.depend
  projects/clang380-import/usr.bin/colldef/Makefile.depend
  projects/clang380-import/usr.bin/compile_et/Makefile.depend
  projects/clang380-import/usr.bin/find/Makefile.depend
  projects/clang380-import/usr.bin/getconf/Makefile.depend
  projects/clang380-import/usr.bin/iscsictl/Makefile.depend
  projects/clang380-import/usr.bin/kdump/Makefile.depend
  projects/clang380-import/usr.bin/kdump/kdump.c
  projects/clang380-import/usr.bin/lex/Makefile.depend
  projects/clang380-import/usr.bin/localedef/Makefile.depend
  projects/clang380-import/usr.bin/m4/Makefile.depend
  projects/clang380-import/usr.bin/mkcsmapper/Makefile.depend
  projects/clang380-import/usr.bin/mkcsmapper_static/Makefile
  projects/clang380-import/usr.bin/mkcsmapper_static/Makefile.depend
  projects/clang380-import/usr.bin/mkesdb/Makefile.depend
  projects/clang380-import/usr.bin/mkesdb_static/Makefile
  projects/clang380-import/usr.bin/mklocale/Makefile.depend
  projects/clang380-import/usr.bin/mkuzip/Makefile
  projects/clang380-import/usr.bin/mkuzip/Makefile.depend
  projects/clang380-import/usr.bin/mkuzip/mkuzip.8
  projects/clang380-import/usr.bin/mkuzip/mkuzip.c
  projects/clang380-import/usr.bin/netstat/Makefile.depend
  projects/clang380-import/usr.bin/top/Makefile.depend
  projects/clang380-import/usr.bin/truss/Makefile
  projects/clang380-import/usr.bin/truss/aarch64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/amd64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/amd64-linux32.c
  projects/clang380-import/usr.bin/truss/extern.h
  projects/clang380-import/usr.bin/truss/i386-linux.c
  projects/clang380-import/usr.bin/truss/main.c
  projects/clang380-import/usr.bin/truss/setup.c
  projects/clang380-import/usr.bin/truss/syscalls.c
  projects/clang380-import/usr.bin/truss/truss.1
  projects/clang380-import/usr.bin/truss/truss.h
  projects/clang380-import/usr.bin/vacation/Makefile.depend
  projects/clang380-import/usr.bin/xlint/lint1/Makefile.depend
  projects/clang380-import/usr.sbin/acpi/iasl/Makefile.depend
  projects/clang380-import/usr.sbin/amd/amd/Makefile.depend
  projects/clang380-import/usr.sbin/amd/fsinfo/Makefile.depend
  projects/clang380-import/usr.sbin/amd/libamu/Makefile.depend
  projects/clang380-import/usr.sbin/apmd/Makefile.depend
  projects/clang380-import/usr.sbin/auditdistd/Makefile.depend
  projects/clang380-import/usr.sbin/autofs/Makefile.depend
  projects/clang380-import/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
  projects/clang380-import/usr.sbin/bluetooth/bthidd/Makefile.depend
  projects/clang380-import/usr.sbin/bluetooth/hcsecd/Makefile.depend
  projects/clang380-import/usr.sbin/bootparamd/bootparamd/Makefile.depend
  projects/clang380-import/usr.sbin/bootparamd/callbootd/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
  projects/clang380-import/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
  projects/clang380-import/usr.sbin/config/Makefile.depend
  projects/clang380-import/usr.sbin/crunch/crunchgen/Makefile.depend
  projects/clang380-import/usr.sbin/ctld/Makefile.depend
  projects/clang380-import/usr.sbin/editmap/Makefile.depend
  projects/clang380-import/usr.sbin/fifolog/lib/Makefile.depend
  projects/clang380-import/usr.sbin/gssd/Makefile.depend
  projects/clang380-import/usr.sbin/jail/Makefile.depend
  projects/clang380-import/usr.sbin/kbdcontrol/Makefile.depend
  projects/clang380-import/usr.sbin/keyserv/Makefile.depend
  projects/clang380-import/usr.sbin/mailstats/Makefile.depend
  projects/clang380-import/usr.sbin/makemap/Makefile.depend
  projects/clang380-import/usr.sbin/ndiscvt/Makefile.depend
  projects/clang380-import/usr.sbin/ntp/libntp/Makefile.depend
  projects/clang380-import/usr.sbin/ntp/ntpd/Makefile.depend
  projects/clang380-import/usr.sbin/ntp/ntpdate/Makefile.depend
  projects/clang380-import/usr.sbin/ntp/ntpdc/Makefile.depend
  projects/clang380-import/usr.sbin/ntp/ntpq/Makefile.depend
  projects/clang380-import/usr.sbin/praliases/Makefile.depend
  projects/clang380-import/usr.sbin/pwd_mkdb/pwd_mkdb.c
  projects/clang380-import/usr.sbin/rpc.lockd/Makefile.depend
  projects/clang380-import/usr.sbin/rpc.statd/Makefile.depend
  projects/clang380-import/usr.sbin/rpc.yppasswdd/Makefile.depend
  projects/clang380-import/usr.sbin/rpc.ypupdated/Makefile.depend
  projects/clang380-import/usr.sbin/rpc.ypxfrd/Makefile.depend
  projects/clang380-import/usr.sbin/rrenumd/Makefile.depend
  projects/clang380-import/usr.sbin/sendmail/Makefile.depend
  projects/clang380-import/usr.sbin/tcpdump/tcpdump/Makefile.depend
  projects/clang380-import/usr.sbin/traceroute/Makefile.depend
  projects/clang380-import/usr.sbin/yppush/Makefile.depend
  projects/clang380-import/usr.sbin/ypserv/Makefile.depend
Directory Properties:
  projects/clang380-import/   (props changed)
  projects/clang380-import/cddl/   (props changed)
  projects/clang380-import/contrib/libarchive/   (props changed)
  projects/clang380-import/contrib/libarchive/libarchive/   (props changed)
  projects/clang380-import/gnu/lib/   (props changed)
  projects/clang380-import/gnu/usr.bin/binutils/   (props changed)
  projects/clang380-import/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/clang380-import/gnu/usr.bin/gdb/   (props changed)
  projects/clang380-import/lib/libc/   (props changed)
  projects/clang380-import/lib/libedit/   (props changed)
  projects/clang380-import/sbin/   (props changed)
  projects/clang380-import/sbin/ipfw/   (props changed)
  projects/clang380-import/share/   (props changed)
  projects/clang380-import/share/man/man4/   (props changed)
  projects/clang380-import/sys/   (props changed)
  projects/clang380-import/sys/boot/   (props changed)
  projects/clang380-import/sys/conf/   (props changed)
  projects/clang380-import/sys/dev/hyperv/   (props changed)
  projects/clang380-import/sys/modules/hyperv/   (props changed)
  projects/clang380-import/targets/   (props changed)
  projects/clang380-import/usr.bin/colldef/   (props changed)
  projects/clang380-import/usr.bin/mklocale/   (props changed)
  projects/clang380-import/usr.sbin/jail/   (props changed)
  projects/clang380-import/usr.sbin/ndiscvt/   (props changed)

Modified: projects/clang380-import/Makefile
==============================================================================
--- projects/clang380-import/Makefile	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/Makefile	Wed Feb 24 21:38:51 2016	(r296007)
@@ -297,11 +297,9 @@ kernel: buildkernel installkernel
 # Perform a few tests to determine if the installed tools are adequate
 # for building the world.
 #
-# Note: if we ever need to care about the version of bmake, simply testing
-# MAKE_VERSION against a required version should suffice.
-#
 upgrade_checks:
-.if ${HAVE_MAKE} != ${WANT_MAKE}
+.if ${HAVE_MAKE} != ${WANT_MAKE} || \
+    (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
 	@(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
 .endif
 

Modified: projects/clang380-import/Makefile.inc1
==============================================================================
--- projects/clang380-import/Makefile.inc1	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/Makefile.inc1	Wed Feb 24 21:38:51 2016	(r296007)
@@ -145,6 +145,16 @@ CLEANDIR=	clean cleandepend
 CLEANDIR=	cleandir
 .endif
 
+# FAST_DEPEND can skip depend tree-walks.
+.if ${MK_FAST_DEPEND} == "yes"
+NO_DEPEND=	t
+NO_KERNELDEPEND=t
+.endif
+# Ensure shell checks later have a value.
+.if defined(NO_DEPEND)
+NO_DEPEND=	t
+.endif
+
 LOCAL_TOOL_DIRS?=
 PACKAGEDIR?=	${DESTDIR}/${DISTDIR}
 
@@ -772,7 +782,11 @@ WMAKE_TGTS+=	_worldtmp _legacy
 WMAKE_TGTS+=	_bootstrap-tools
 .endif
 WMAKE_TGTS+=	_cleanobj _obj _build-tools _cross-tools
-WMAKE_TGTS+=	_includes _libraries _depend everything
+WMAKE_TGTS+=	_includes _libraries
+.if !defined(NO_DEPEND)
+WMAKE_TGTS+=	_depend
+.endif
+WMAKE_TGTS+=	everything
 .if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	build32
 .endif
@@ -1403,7 +1417,7 @@ legacy:
 	    cd ${.CURDIR}/${_tool}; \
 	    ${MAKE} DIRPRFX=${_tool}/ obj; \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
-	    ${MAKE} DIRPRFX=${_tool}/ depend; \
+	    if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
 	    ${MAKE} DIRPRFX=${_tool}/ all; \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
@@ -1551,7 +1565,7 @@ ${_bt}-${_tool}: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 
@@ -1600,7 +1614,7 @@ build-tools_${_tool}: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
 		${MAKE} DIRPRFX=${_tool}/ all
 build-tools: build-tools_${_tool}
 .endfor
@@ -1684,7 +1698,7 @@ cross-tools: .MAKE .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
@@ -1716,7 +1730,7 @@ native-xtools: .PHONY
 	${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \
 	cd ${.CURDIR}/${_gperf}; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ obj; \
-	${NXBMAKE} DIRPRFX=${_gperf}/ depend; \
+	if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_gperf}/ depend; fi; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ all; \
 	${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install
 .endif
@@ -1791,7 +1805,7 @@ native-xtools: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${NXBMAKE} DIRPRFX=${_tool}/ obj; \
-		${NXBMAKE} DIRPRFX=${_tool}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_tool}/ depend; fi; \
 		${NXBMAKE} DIRPRFX=${_tool}/ all; \
 		${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install
 .endfor
@@ -2021,7 +2035,7 @@ ${_lib}__PL: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
-		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
@@ -2035,7 +2049,7 @@ ${_lib}__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
-		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
@@ -2048,7 +2062,7 @@ lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam; \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj; \
-		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; \
+		if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; fi; \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
 		    -D_NO_LIBPAM_SO_YET all; \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
@@ -2346,7 +2360,7 @@ _xb-bootstrap-tools: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ obj; \
-	${CDMAKE} DIRPRFX=${_tool}/ depend; \
+	if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \
 	${CDMAKE} DIRPRFX=${_tool}/ all; \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
@@ -2366,7 +2380,7 @@ _xb-cross-tools: .PHONY
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ obj; \
-	${CDMAKE} DIRPRFX=${_tool}/ depend; \
+	if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 

Modified: projects/clang380-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang380-import/ObsoleteFiles.inc	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/ObsoleteFiles.inc	Wed Feb 24 21:38:51 2016	(r296007)
@@ -121,6 +121,8 @@ OLD_FILES+=usr/lib/clang/3.7.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.1/lib
 OLD_DIRS+=usr/lib/clang/3.7.1
+# 20160223: functionality from mkulzma(1) merged into mkuzip(1)
+OLD_FILES+=usr/bin/mkulzma
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160116: Update mandoc to cvs snapshot 20160116

Modified: projects/clang380-import/bin/csh/Makefile.depend
==============================================================================
--- projects/clang380-import/bin/csh/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/csh/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -18,226 +18,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-ed.chared.o: ed.defns.h
-ed.chared.o: sh.err.h
-ed.chared.o: tc.const.h
-ed.chared.po: ed.defns.h
-ed.chared.po: sh.err.h
-ed.chared.po: tc.const.h
-ed.defns.o: sh.err.h
-ed.defns.o: tc.const.h
-ed.defns.po: sh.err.h
-ed.defns.po: tc.const.h
-ed.init.o: ed.defns.h
-ed.init.o: sh.err.h
-ed.init.o: tc.const.h
-ed.init.po: ed.defns.h
-ed.init.po: sh.err.h
-ed.init.po: tc.const.h
-ed.inputl.o: ed.defns.h
-ed.inputl.o: sh.err.h
-ed.inputl.o: tc.const.h
-ed.inputl.po: ed.defns.h
-ed.inputl.po: sh.err.h
-ed.inputl.po: tc.const.h
-ed.refresh.o: sh.err.h
-ed.refresh.o: tc.const.h
-ed.refresh.po: sh.err.h
-ed.refresh.po: tc.const.h
-ed.screen.o: ed.defns.h
-ed.screen.o: sh.err.h
-ed.screen.o: tc.const.h
-ed.screen.po: ed.defns.h
-ed.screen.po: sh.err.h
-ed.screen.po: tc.const.h
-ed.term.o: sh.err.h
-ed.term.o: tc.const.h
-ed.term.po: sh.err.h
-ed.term.po: tc.const.h
-ed.xmap.o: ed.defns.h
-ed.xmap.o: sh.err.h
-ed.xmap.o: tc.const.h
-ed.xmap.po: ed.defns.h
-ed.xmap.po: sh.err.h
-ed.xmap.po: tc.const.h
-glob.o: sh.err.h
-glob.o: tc.const.h
-glob.po: sh.err.h
-glob.po: tc.const.h
-mi.termios.o: sh.err.h
-mi.termios.o: tc.const.h
-mi.termios.po: sh.err.h
-mi.termios.po: tc.const.h
-sh.char.o: sh.err.h
-sh.char.o: tc.const.h
-sh.char.po: sh.err.h
-sh.char.po: tc.const.h
-sh.dir.o: sh.err.h
-sh.dir.o: tc.const.h
-sh.dir.po: sh.err.h
-sh.dir.po: tc.const.h
-sh.dol.o: sh.err.h
-sh.dol.o: tc.const.h
-sh.dol.po: sh.err.h
-sh.dol.po: tc.const.h
-sh.err.o: sh.err.h
-sh.err.o: tc.const.h
-sh.err.po: sh.err.h
-sh.err.po: tc.const.h
-sh.exec.o: sh.err.h
-sh.exec.o: tc.const.h
-sh.exec.po: sh.err.h
-sh.exec.po: tc.const.h
-sh.exp.o: sh.err.h
-sh.exp.o: tc.const.h
-sh.exp.po: sh.err.h
-sh.exp.po: tc.const.h
-sh.file.o: sh.err.h
-sh.file.o: tc.const.h
-sh.file.po: sh.err.h
-sh.file.po: tc.const.h
-sh.func.o: sh.err.h
-sh.func.o: tc.const.h
-sh.func.po: sh.err.h
-sh.func.po: tc.const.h
-sh.glob.o: sh.err.h
-sh.glob.o: tc.const.h
-sh.glob.po: sh.err.h
-sh.glob.po: tc.const.h
-sh.hist.o: sh.err.h
-sh.hist.o: tc.const.h
-sh.hist.po: sh.err.h
-sh.hist.po: tc.const.h
-sh.init.o: sh.err.h
-sh.init.o: tc.const.h
-sh.init.po: sh.err.h
-sh.init.po: tc.const.h
-sh.lex.o: sh.err.h
-sh.lex.o: tc.const.h
-sh.lex.po: sh.err.h
-sh.lex.po: tc.const.h
-sh.misc.o: sh.err.h
-sh.misc.o: tc.const.h
-sh.misc.po: sh.err.h
-sh.misc.po: tc.const.h
-sh.o: sh.err.h
-sh.o: tc.const.h
-sh.parse.o: sh.err.h
-sh.parse.o: tc.const.h
-sh.parse.po: sh.err.h
-sh.parse.po: tc.const.h
-sh.po: sh.err.h
-sh.po: tc.const.h
-sh.print.o: sh.err.h
-sh.print.o: tc.const.h
-sh.print.po: sh.err.h
-sh.print.po: tc.const.h
-sh.proc.o: sh.err.h
-sh.proc.o: tc.const.h
-sh.proc.po: sh.err.h
-sh.proc.po: tc.const.h
-sh.sem.o: sh.err.h
-sh.sem.o: tc.const.h
-sh.sem.po: sh.err.h
-sh.sem.po: tc.const.h
-sh.set.o: sh.err.h
-sh.set.o: tc.const.h
-sh.set.po: sh.err.h
-sh.set.po: tc.const.h
-sh.time.o: sh.err.h
-sh.time.o: tc.const.h
-sh.time.po: sh.err.h
-sh.time.po: tc.const.h
-tc.alloc.o: sh.err.h
-tc.alloc.o: tc.const.h
-tc.alloc.po: sh.err.h
-tc.alloc.po: tc.const.h
-tc.bind.o: ed.defns.h
-tc.bind.o: sh.err.h
-tc.bind.o: tc.const.h
-tc.bind.po: ed.defns.h
-tc.bind.po: sh.err.h
-tc.bind.po: tc.const.h
-tc.const.o: sh.err.h
-tc.const.o: tc.const.h
-tc.const.po: sh.err.h
-tc.const.po: tc.const.h
-tc.defs.o: sh.err.h
-tc.defs.o: tc.const.h
-tc.defs.o: tc.defs.c
-tc.defs.po: sh.err.h
-tc.defs.po: tc.const.h
-tc.defs.po: tc.defs.c
-tc.disc.o: sh.err.h
-tc.disc.o: tc.const.h
-tc.disc.po: sh.err.h
-tc.disc.po: tc.const.h
-tc.func.o: ed.defns.h
-tc.func.o: sh.err.h
-tc.func.o: tc.const.h
-tc.func.po: ed.defns.h
-tc.func.po: sh.err.h
-tc.func.po: tc.const.h
-tc.nls.o: sh.err.h
-tc.nls.o: tc.const.h
-tc.nls.po: sh.err.h
-tc.nls.po: tc.const.h
-tc.os.o: ed.defns.h
-tc.os.o: sh.err.h
-tc.os.o: tc.const.h
-tc.os.po: ed.defns.h
-tc.os.po: sh.err.h
-tc.os.po: tc.const.h
-tc.printf.o: sh.err.h
-tc.printf.o: tc.const.h
-tc.printf.po: sh.err.h
-tc.printf.po: tc.const.h
-tc.prompt.o: sh.err.h
-tc.prompt.o: tc.const.h
-tc.prompt.po: sh.err.h
-tc.prompt.po: tc.const.h
-tc.sched.o: sh.err.h
-tc.sched.o: tc.const.h
-tc.sched.po: sh.err.h
-tc.sched.po: tc.const.h
-tc.sig.o: sh.err.h
-tc.sig.o: tc.const.h
-tc.sig.po: sh.err.h
-tc.sig.po: tc.const.h
-tc.str.o: sh.err.h
-tc.str.o: tc.const.h
-tc.str.po: sh.err.h
-tc.str.po: tc.const.h
-tc.vers.o: sh.err.h
-tc.vers.o: tc.const.h
-tc.vers.po: sh.err.h
-tc.vers.po: tc.const.h
-tc.who.o: sh.err.h
-tc.who.o: tc.const.h
-tc.who.po: sh.err.h
-tc.who.po: tc.const.h
-tw.color.o: sh.err.h
-tw.color.o: tc.const.h
-tw.color.po: sh.err.h
-tw.color.po: tc.const.h
-tw.comp.o: sh.err.h
-tw.comp.o: tc.const.h
-tw.comp.po: sh.err.h
-tw.comp.po: tc.const.h
-tw.help.o: sh.err.h
-tw.help.o: tc.const.h
-tw.help.po: sh.err.h
-tw.help.po: tc.const.h
-tw.init.o: sh.err.h
-tw.init.o: tc.const.h
-tw.init.po: sh.err.h
-tw.init.po: tc.const.h
-tw.parse.o: sh.err.h
-tw.parse.o: tc.const.h
-tw.parse.po: sh.err.h
-tw.parse.po: tc.const.h
-tw.spell.o: sh.err.h
-tw.spell.o: tc.const.h
-tw.spell.po: sh.err.h
-tw.spell.po: tc.const.h
 .endif

Modified: projects/clang380-import/bin/expr/Makefile.depend
==============================================================================
--- projects/clang380-import/bin/expr/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/expr/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -16,6 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-expr.o: expr.c
-expr.po: expr.c
 .endif

Modified: projects/clang380-import/bin/rmail/Makefile.depend
==============================================================================
--- projects/clang380-import/bin/rmail/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/rmail/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -16,6 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-rmail.o: sm_os.h
-rmail.po: sm_os.h
 .endif

Modified: projects/clang380-import/bin/sh/Makefile.depend
==============================================================================
--- projects/clang380-import/bin/sh/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/sh/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -17,98 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-alias.o: builtins.h
-alias.po: builtins.h
-arith_yylex.o: syntax.h
-arith_yylex.po: syntax.h
-builtins.o: builtins.c
-builtins.o: builtins.h
-builtins.po: builtins.c
-builtins.po: builtins.h
-cd.o: builtins.h
-cd.o: nodes.h
-cd.po: builtins.h
-cd.po: nodes.h
-echo.o: builtins.h
-echo.po: builtins.h
-error.o: nodes.h
-error.po: nodes.h
-eval.o: builtins.h
-eval.o: nodes.h
-eval.o: syntax.h
-eval.po: builtins.h
-eval.po: nodes.h
-eval.po: syntax.h
-exec.o: builtins.h
-exec.o: nodes.h
-exec.o: syntax.h
-exec.po: builtins.h
-exec.po: nodes.h
-exec.po: syntax.h
-expand.o: builtins.h
-expand.o: nodes.h
-expand.o: syntax.h
-expand.po: builtins.h
-expand.po: nodes.h
-expand.po: syntax.h
-histedit.o: builtins.h
-histedit.po: builtins.h
-input.o: syntax.h
-input.po: syntax.h
-jobs.o: builtins.h
-jobs.o: nodes.h
-jobs.o: syntax.h
-jobs.po: builtins.h
-jobs.po: nodes.h
-jobs.po: syntax.h
-kill.o: builtins.h
-kill.po: builtins.h
-main.o: builtins.h
-main.o: nodes.h
-main.po: builtins.h
-main.po: nodes.h
-miscbltin.o: syntax.h
-miscbltin.po: syntax.h
-mystring.o: syntax.h
-mystring.po: syntax.h
-nodes.o: nodes.c
-nodes.o: nodes.h
-nodes.po: nodes.c
-nodes.po: nodes.h
-options.o: builtins.h
-options.o: nodes.h
-options.po: builtins.h
-options.po: nodes.h
-output.o: syntax.h
-output.po: syntax.h
-parser.o: nodes.h
-parser.o: syntax.h
-parser.o: token.h
-parser.po: nodes.h
-parser.po: syntax.h
-parser.po: token.h
-printf.o: builtins.h
-printf.po: builtins.h
-redir.o: nodes.h
-redir.po: nodes.h
-show.o: nodes.h
-show.po: nodes.h
-syntax.o: syntax.c
-syntax.o: syntax.h
-syntax.po: syntax.c
-syntax.po: syntax.h
-test.o: builtins.h
-test.po: builtins.h
-trap.o: builtins.h
-trap.o: nodes.h
-trap.o: syntax.h
-trap.po: builtins.h
-trap.po: nodes.h
-trap.po: syntax.h
-var.o: builtins.h
-var.o: nodes.h
-var.o: syntax.h
-var.po: builtins.h
-var.po: nodes.h
-var.po: syntax.h
 .endif

Modified: projects/clang380-import/bin/sh/input.c
==============================================================================
--- projects/clang380-import/bin/sh/input.c	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/sh/input.c	Wed Feb 24 21:38:51 2016	(r296007)
@@ -242,7 +242,8 @@ again:
 		parsenleft = parselleft;
 		parselleft = 0;
 	} else /* *q == '\n' */ {
-		parsenleft = q - parsenextc + 1;
+		q++;
+		parsenleft = q - parsenextc;
 		parselleft -= parsenleft;
 	}
 	parsenleft--;

Modified: projects/clang380-import/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/clang380-import/bin/sh/tests/parser/Makefile	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/bin/sh/tests/parser/Makefile	Wed Feb 24 21:38:51 2016	(r296007)
@@ -79,6 +79,7 @@ FILES+=		only-redir2.0
 FILES+=		only-redir3.0
 FILES+=		only-redir4.0
 FILES+=		pipe-not1.0
+FILES+=		set-v1.0 set-v1.0.stderr
 FILES+=		var-assign1.0
 
 .include <bsd.test.mk>

Copied: projects/clang380-import/bin/sh/tests/parser/set-v1.0 (from r296006, head/bin/sh/tests/parser/set-v1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/sh/tests/parser/set-v1.0	Wed Feb 24 21:38:51 2016	(r296007, copy of r296006, head/bin/sh/tests/parser/set-v1.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+${SH} <<\EOF
+echo one >&2
+set -v
+echo two >&2
+echo three >&2
+EOF

Copied: projects/clang380-import/bin/sh/tests/parser/set-v1.0.stderr (from r296006, head/bin/sh/tests/parser/set-v1.0.stderr)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang380-import/bin/sh/tests/parser/set-v1.0.stderr	Wed Feb 24 21:38:51 2016	(r296007, copy of r296006, head/bin/sh/tests/parser/set-v1.0.stderr)
@@ -0,0 +1,5 @@
+one
+echo two >&2
+two
+echo three >&2
+three

Modified: projects/clang380-import/cddl/lib/libdtrace/Makefile.depend
==============================================================================
--- projects/clang380-import/cddl/lib/libdtrace/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/cddl/lib/libdtrace/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -22,31 +22,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-dt_cc.So: dt_grammar.h
-dt_cc.o: dt_grammar.h
-dt_cc.po: dt_grammar.h
-dt_cg.So: dt_grammar.h
-dt_cg.o: dt_grammar.h
-dt_cg.po: dt_grammar.h
-dt_errtags.So: dt_errtags.c
-dt_errtags.o: dt_errtags.c
-dt_errtags.po: dt_errtags.c
-dt_grammar.So: dt_grammar.c
-dt_grammar.o: dt_grammar.c
-dt_grammar.po: dt_grammar.c
-dt_lex.So: dt_grammar.h
-dt_lex.So: dt_lex.c
-dt_lex.o: dt_grammar.h
-dt_lex.o: dt_lex.c
-dt_lex.po: dt_grammar.h
-dt_lex.po: dt_lex.c
-dt_names.So: dt_names.c
-dt_names.o: dt_names.c
-dt_names.po: dt_names.c
-dt_parser.So: dt_grammar.h
-dt_parser.o: dt_grammar.h
-dt_parser.po: dt_grammar.h
-dt_xlator.So: dt_grammar.h
-dt_xlator.o: dt_grammar.h
-dt_xlator.po: dt_grammar.h
 .endif

Modified: projects/clang380-import/contrib/libarchive/libarchive/archive_read.c
==============================================================================
--- projects/clang380-import/contrib/libarchive/libarchive/archive_read.c	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/contrib/libarchive/libarchive/archive_read.c	Wed Feb 24 21:38:51 2016	(r296007)
@@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
 static int
 choose_filters(struct archive_read *a)
 {
-	int number_bidders, i, bid, best_bid;
+	int number_bidders, i, bid, best_bid, n;
 	struct archive_read_filter_bidder *bidder, *best_bidder;
 	struct archive_read_filter *filter;
 	ssize_t avail;
 	int r;
 
-	for (;;) {
+	for (n = 0; n < 25; ++n) {
 		number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
 		best_bid = 0;
@@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
 			return (ARCHIVE_FATAL);
 		}
 	}
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Input requires too many filters for decoding");
+	return (ARCHIVE_FATAL);
 }
 
 /*

Modified: projects/clang380-import/etc/defaults/rc.conf
==============================================================================
--- projects/clang380-import/etc/defaults/rc.conf	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/etc/defaults/rc.conf	Wed Feb 24 21:38:51 2016	(r296007)
@@ -253,6 +253,7 @@ hostapd_enable="NO"		# Run hostap daemon
 syslogd_enable="YES"		# Run syslog daemon (or NO).
 syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
 syslogd_flags="-s"		# Flags to syslogd (if enabled).
+syslogd_oomprotect="YES"	# Don't kill syslogd when swap space is exhausted. 
 altlog_proglist=""		# List of chrooted applicatioins in /var
 inetd_enable="NO"		# Run the network daemon dispatcher (YES/NO).
 inetd_program="/usr/sbin/inetd"	# path to inetd, if you want a different one.

Modified: projects/clang380-import/etc/rc.subr
==============================================================================
--- projects/clang380-import/etc/rc.subr	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/etc/rc.subr	Wed Feb 24 21:38:51 2016	(r296007)
@@ -45,6 +45,7 @@ _rc_subr_loaded="YES"
 SYSCTL="/sbin/sysctl"
 SYSCTL_N="${SYSCTL} -n"
 SYSCTL_W="${SYSCTL}"
+PROTECT="/usr/bin/protect"
 ID="/usr/bin/id"
 IDCMD="if [ -x $ID ]; then $ID -un; fi"
 PS="/bin/ps -ww"
@@ -755,6 +756,8 @@ check_startmsgs()
 #
 #	${name}_nice	n	Nice level to run ${command} at.
 #
+#	${name}_oomprotect n	Don't kill ${command} when swap space is exhausted.
+#
 #	${name}_user	n	User to run ${command} as, using su(1) if not
 #				using ${name}_chroot.
 #				Requires /usr to be mounted.
@@ -944,7 +947,8 @@ run_rc_command()
 	    _nice=\$${name}_nice	_user=\$${name}_user \
 	    _group=\$${name}_group	_groups=\$${name}_groups \
 	    _fib=\$${name}_fib		_env=\$${name}_env \
-	    _prepend=\$${name}_prepend	_login_class=\${${name}_login_class:-daemon}
+	    _prepend=\$${name}_prepend	_login_class=\${${name}_login_class:-daemon} \
+	    _oomprotect=\$${name}_oomprotect
 
 	if [ -n "$_user" ]; then	# unset $_user if running as that user
 		if [ "$_user" = "$(eval $IDCMD)" ]; then
@@ -1182,6 +1186,26 @@ $command $rc_flags $command_args"
 			;;
 
 		esac
+
+		# Apply protect(1) to the PID if ${name}_oomprotect is set.
+		case "$rc_arg" in
+		start)
+			if [ -n "$_oomprotect" ]; then
+				if [ -f "${PROTECT}" ]; then
+					pid=$(check_process $command)
+					case $_oomprotect in
+					[Aa][Ll][Ll])
+						${PROTECT} -i -p ${pid}
+						;;
+					[Yy][Ee][Ss])
+						${PROTECT} -p ${pid}
+						;;
+					esac
+				fi
+			fi	
+		;;
+		esac
+
 		return $_return
 	done
 

Modified: projects/clang380-import/gnu/lib/csu/Makefile.depend
==============================================================================
--- projects/clang380-import/gnu/lib/csu/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/gnu/lib/csu/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -10,34 +10,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-crtbegin.o: options.h
-crtbegin.o: tconfig.h
-crtbegin.o: tm.h
-crtbegin.po: options.h
-crtbegin.po: tconfig.h
-crtbegin.po: tm.h
-crtbeginS.o: options.h
-crtbeginS.o: tconfig.h
-crtbeginS.o: tm.h
-crtbeginS.po: options.h
-crtbeginS.po: tconfig.h
-crtbeginS.po: tm.h
-crtbeginT.o: options.h
-crtbeginT.o: tconfig.h
-crtbeginT.o: tm.h
-crtbeginT.po: options.h
-crtbeginT.po: tconfig.h
-crtbeginT.po: tm.h
-crtend.o: options.h
-crtend.o: tconfig.h
-crtend.o: tm.h
-crtend.po: options.h
-crtend.po: tconfig.h
-crtend.po: tm.h
-crtendS.o: options.h
-crtendS.o: tconfig.h
-crtendS.o: tm.h
-crtendS.po: options.h
-crtendS.po: tconfig.h
-crtendS.po: tm.h
 .endif

Modified: projects/clang380-import/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/clang380-import/gnu/lib/libgcc/Makefile	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/gnu/lib/libgcc/Makefile	Wed Feb 24 21:38:51 2016	(r296007)
@@ -380,7 +380,7 @@ CLEANFILES +=	libgcc.map
 libgcc_eh.a:	${EH_OBJS_T}
 	@${ECHO} building static gcc_eh library
 	@rm -f ${.TARGET}
-	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
+	${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 
 _LIBS+= libgcc_eh.a
@@ -389,7 +389,7 @@ _LIBS+= libgcc_eh.a
 libgcc_eh_p.a:	${EH_OBJS_P}
 	@${ECHO} building profiled gcc_eh library
 	@rm -f ${.TARGET}
-	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
+	${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 
 _LIBS+= libgcc_eh_p.a

Modified: projects/clang380-import/gnu/lib/libgcc/Makefile.depend
==============================================================================
--- projects/clang380-import/gnu/lib/libgcc/Makefile.depend	Wed Feb 24 21:33:56 2016	(r296006)
+++ projects/clang380-import/gnu/lib/libgcc/Makefile.depend	Wed Feb 24 21:38:51 2016	(r296007)
@@ -13,274 +13,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-__main.So: options.h
-__main.So: tconfig.h
-__main.So: tm.h
-_absvdi2.So: options.h
-_absvdi2.So: tconfig.h
-_absvdi2.So: tm.h
-_absvsi2.So: options.h
-_absvsi2.So: tconfig.h
-_absvsi2.So: tm.h
-_addvdi3.So: options.h
-_addvdi3.So: tconfig.h
-_addvdi3.So: tm.h
-_addvsi3.So: options.h
-_addvsi3.So: tconfig.h
-_addvsi3.So: tm.h
-_ashldi3.So: options.h
-_ashldi3.So: tconfig.h
-_ashldi3.So: tm.h
-_ashrdi3.So: options.h
-_ashrdi3.So: tconfig.h
-_ashrdi3.So: tm.h
-_bswapdi2.So: options.h
-_bswapdi2.So: tconfig.h
-_bswapdi2.So: tm.h
-_bswapsi2.So: options.h
-_bswapsi2.So: tconfig.h
-_bswapsi2.So: tm.h
-_clear_cache.So: options.h
-_clear_cache.So: tconfig.h
-_clear_cache.So: tm.h
-_clz.So: options.h
-_clz.So: tconfig.h
-_clz.So: tm.h
-_clzdi2.So: options.h
-_clzdi2.So: tconfig.h
-_clzdi2.So: tm.h
-_clzsi2.So: options.h
-_clzsi2.So: tconfig.h
-_clzsi2.So: tm.h
-_cmpdi2.So: options.h
-_cmpdi2.So: tconfig.h
-_cmpdi2.So: tm.h
-_ctors.So: options.h
-_ctors.So: tconfig.h
-_ctors.So: tm.h
-_ctzdi2.So: options.h
-_ctzdi2.So: tconfig.h
-_ctzdi2.So: tm.h
-_ctzsi2.So: options.h
-_ctzsi2.So: tconfig.h
-_ctzsi2.So: tm.h
-_divdc3.So: options.h
-_divdc3.So: tconfig.h
-_divdc3.So: tm.h
-_divdi3.So: options.h
-_divdi3.So: tconfig.h
-_divdi3.So: tm.h
-_divsc3.So: options.h
-_divsc3.So: tconfig.h
-_divsc3.So: tm.h
-_divtc3.So: options.h
-_divtc3.So: tconfig.h
-_divtc3.So: tm.h
-_divxc3.So: options.h
-_divxc3.So: tconfig.h
-_divxc3.So: tm.h
-_enable_execute_stack.So: options.h
-_enable_execute_stack.So: tconfig.h
-_enable_execute_stack.So: tm.h
-_ffsdi2.So: options.h
-_ffsdi2.So: tconfig.h
-_ffsdi2.So: tm.h
-_ffssi2.So: options.h
-_ffssi2.So: tconfig.h
-_ffssi2.So: tm.h
-_fixdfdi.So: options.h
-_fixdfdi.So: tconfig.h
-_fixdfdi.So: tm.h
-_fixsfdi.So: options.h
-_fixsfdi.So: tconfig.h
-_fixsfdi.So: tm.h
-_fixtfdi.So: options.h
-_fixtfdi.So: tconfig.h
-_fixtfdi.So: tm.h
-_fixunsdfdi.So: options.h
-_fixunsdfdi.So: tconfig.h
-_fixunsdfdi.So: tm.h
-_fixunsdfsi.So: options.h
-_fixunsdfsi.So: tconfig.h
-_fixunsdfsi.So: tm.h
-_fixunssfdi.So: options.h
-_fixunssfdi.So: tconfig.h
-_fixunssfdi.So: tm.h
-_fixunssfsi.So: options.h
-_fixunssfsi.So: tconfig.h
-_fixunssfsi.So: tm.h
-_fixunstfdi.So: options.h
-_fixunstfdi.So: tconfig.h
-_fixunstfdi.So: tm.h
-_fixunsxfdi.So: options.h
-_fixunsxfdi.So: tconfig.h
-_fixunsxfdi.So: tm.h
-_fixunsxfsi.So: options.h
-_fixunsxfsi.So: tconfig.h
-_fixunsxfsi.So: tm.h
-_fixxfdi.So: options.h
-_fixxfdi.So: tconfig.h
-_fixxfdi.So: tm.h
-_floatdidf.So: options.h
-_floatdidf.So: tconfig.h
-_floatdidf.So: tm.h
-_floatdisf.So: options.h
-_floatdisf.So: tconfig.h
-_floatdisf.So: tm.h
-_floatditf.So: options.h
-_floatditf.So: tconfig.h
-_floatditf.So: tm.h
-_floatdixf.So: options.h
-_floatdixf.So: tconfig.h
-_floatdixf.So: tm.h
-_floatundidf.So: options.h
-_floatundidf.So: tconfig.h
-_floatundidf.So: tm.h
-_floatundisf.So: options.h
-_floatundisf.So: tconfig.h
-_floatundisf.So: tm.h
-_floatunditf.So: options.h
-_floatunditf.So: tconfig.h
-_floatunditf.So: tm.h
-_floatundixf.So: options.h
-_floatundixf.So: tconfig.h
-_floatundixf.So: tm.h
-_lshrdi3.So: options.h
-_lshrdi3.So: tconfig.h
-_lshrdi3.So: tm.h
-_moddi3.So: options.h
-_moddi3.So: tconfig.h
-_moddi3.So: tm.h
-_muldc3.So: options.h
-_muldc3.So: tconfig.h
-_muldc3.So: tm.h
-_muldi3.So: options.h
-_muldi3.So: tconfig.h
-_muldi3.So: tm.h
-_mulsc3.So: options.h
-_mulsc3.So: tconfig.h
-_mulsc3.So: tm.h
-_multc3.So: options.h
-_multc3.So: tconfig.h
-_multc3.So: tm.h
-_mulvdi3.So: options.h
-_mulvdi3.So: tconfig.h
-_mulvdi3.So: tm.h
-_mulvsi3.So: options.h
-_mulvsi3.So: tconfig.h
-_mulvsi3.So: tm.h
-_mulxc3.So: options.h
-_mulxc3.So: tconfig.h
-_mulxc3.So: tm.h
-_negdi2.So: options.h
-_negdi2.So: tconfig.h
-_negdi2.So: tm.h
-_negvdi2.So: options.h
-_negvdi2.So: tconfig.h
-_negvdi2.So: tm.h
-_negvsi2.So: options.h
-_negvsi2.So: tconfig.h
-_negvsi2.So: tm.h
-_paritydi2.So: options.h
-_paritydi2.So: tconfig.h
-_paritydi2.So: tm.h
-_paritysi2.So: options.h
-_paritysi2.So: tconfig.h
-_paritysi2.So: tm.h
-_popcount_tab.So: options.h
-_popcount_tab.So: tconfig.h
-_popcount_tab.So: tm.h
-_popcountdi2.So: options.h
-_popcountdi2.So: tconfig.h
-_popcountdi2.So: tm.h
-_popcountsi2.So: options.h
-_popcountsi2.So: tconfig.h
-_popcountsi2.So: tm.h
-_powidf2.So: options.h
-_powidf2.So: tconfig.h
-_powidf2.So: tm.h
-_powisf2.So: options.h
-_powisf2.So: tconfig.h
-_powisf2.So: tm.h
-_powitf2.So: options.h
-_powitf2.So: tconfig.h
-_powitf2.So: tm.h
-_powixf2.So: options.h
-_powixf2.So: tconfig.h
-_powixf2.So: tm.h
-_subvdi3.So: options.h
-_subvdi3.So: tconfig.h
-_subvdi3.So: tm.h
-_subvsi3.So: options.h
-_subvsi3.So: tconfig.h
-_subvsi3.So: tm.h
-_trampoline.So: options.h
-_trampoline.So: tconfig.h
-_trampoline.So: tm.h
-_ucmpdi2.So: options.h
-_ucmpdi2.So: tconfig.h
-_ucmpdi2.So: tm.h
-_udiv_w_sdiv.So: options.h
-_udiv_w_sdiv.So: tconfig.h
-_udiv_w_sdiv.So: tm.h
-_udivdi3.So: options.h
-_udivdi3.So: tconfig.h
-_udivdi3.So: tm.h
-_udivmoddi4.So: options.h
-_udivmoddi4.So: tconfig.h
-_udivmoddi4.So: tm.h
-_umoddi3.So: options.h
-_umoddi3.So: tconfig.h
-_umoddi3.So: tm.h
-unwind-c.So: tconfig.h
-unwind-c.So: unwind.h
-unwind-c.o: tconfig.h
-unwind-c.o: unwind.h
-unwind-c.po: tconfig.h
-unwind-c.po: unwind.h
-unwind-dw2-fde-glibc.So: gthr-default.h
-unwind-dw2-fde-glibc.So: options.h
-unwind-dw2-fde-glibc.So: tconfig.h
-unwind-dw2-fde-glibc.So: tm.h
-unwind-dw2-fde-glibc.So: unwind.h
-unwind-dw2-fde-glibc.o: gthr-default.h
-unwind-dw2-fde-glibc.o: options.h
-unwind-dw2-fde-glibc.o: tconfig.h
-unwind-dw2-fde-glibc.o: tm.h
-unwind-dw2-fde-glibc.o: unwind.h
-unwind-dw2-fde-glibc.po: gthr-default.h
-unwind-dw2-fde-glibc.po: options.h
-unwind-dw2-fde-glibc.po: tconfig.h
-unwind-dw2-fde-glibc.po: tm.h
-unwind-dw2-fde-glibc.po: unwind.h
-unwind-dw2.So: gthr-default.h
-unwind-dw2.So: options.h
-unwind-dw2.So: tconfig.h
-unwind-dw2.So: tm.h
-unwind-dw2.So: unwind.h
-unwind-dw2.o: gthr-default.h
-unwind-dw2.o: options.h
-unwind-dw2.o: tconfig.h
-unwind-dw2.o: tm.h
-unwind-dw2.o: unwind.h
-unwind-dw2.po: gthr-default.h
-unwind-dw2.po: options.h
-unwind-dw2.po: tconfig.h
-unwind-dw2.po: tm.h
-unwind-dw2.po: unwind.h
-unwind-sjlj.So: gthr-default.h
-unwind-sjlj.So: options.h
-unwind-sjlj.So: tconfig.h
-unwind-sjlj.So: tm.h
-unwind-sjlj.So: unwind.h
-unwind-sjlj.o: gthr-default.h
-unwind-sjlj.o: options.h

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

From owner-svn-src-projects@freebsd.org  Wed Feb 24 21:41:29 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C0EAAB3F97
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 21:41:29 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A8F869B;
 Wed, 24 Feb 2016 21:41:29 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1OLfSYa067764;
 Wed, 24 Feb 2016 21:41:28 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1OLfSnt067763;
 Wed, 24 Feb 2016 21:41:28 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602242141.u1OLfSnt067763@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 24 Feb 2016 21:41:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r296008 -
 projects/clang380-import/contrib/llvm/lib/Target/X86
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 21:41:29 -0000

Author: dim
Date: Wed Feb 24 21:41:28 2016
New Revision: 296008
URL: https://svnweb.freebsd.org/changeset/base/296008

Log:
  Undo r295543, since the shrink wrapping bug was fixed upstream by Davide
  Italiano and Quentin Colombet.

Modified:
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Wed Feb 24 21:38:51 2016	(r296007)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Wed Feb 24 21:41:28 2016	(r296008)
@@ -2592,9 +2592,6 @@ bool X86FrameLowering::canUseAsEpilogue(
 bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const {
   // If we may need to emit frameless compact unwind information, give
   // up as this is currently broken: PR25614.
-#if 1
-  return false;
-#else
   return (MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF)) &&
          // The lowering of segmented stack and HiPE only support entry blocks
          // as prologue blocks: PR26107.
@@ -2603,7 +2600,6 @@ bool X86FrameLowering::enableShrinkWrapp
          // - adjustForHiPEPrologue
          MF.getFunction()->getCallingConv() != CallingConv::HiPE &&
          !MF.shouldSplitStack();
-#endif
 }
 
 MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers(

From owner-svn-src-projects@freebsd.org  Wed Feb 24 22:07:59 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00BC5AB2CAC
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 24 Feb 2016 22:07:59 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C2077153A;
 Wed, 24 Feb 2016 22:07:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1OM7v2Q075849;
 Wed, 24 Feb 2016 22:07:57 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1OM7uJB075837;
 Wed, 24 Feb 2016 22:07:56 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602242207.u1OM7uJB075837@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 24 Feb 2016 22:07:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r296011 - in projects/clang380-import:
 contrib/llvm/lib/CodeGen contrib/llvm/lib/Target/AArch64
 contrib/llvm/lib/Target/PowerPC contrib/llvm/lib/Target/X86
 contrib/llvm/tools/clang/lib/...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 22:07:59 -0000

Author: dim
Date: Wed Feb 24 22:07:56 2016
New Revision: 296011
URL: https://svnweb.freebsd.org/changeset/base/296011

Log:
  Update llvm and clang to release_38 branch r261684.

Modified:
  projects/clang380-import/contrib/llvm/lib/CodeGen/RegAllocFast.cpp
  projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
  projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.h
  projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.h
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
  projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  projects/clang380-import/lib/clang/include/clang/Basic/Version.inc
Directory Properties:
  projects/clang380-import/contrib/llvm/   (props changed)
  projects/clang380-import/contrib/llvm/tools/clang/   (props changed)

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/RegAllocFast.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/RegAllocFast.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/RegAllocFast.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -1002,11 +1002,13 @@ void RAFast::AllocateBasicBlock() {
 
     unsigned DefOpEnd = MI->getNumOperands();
     if (MI->isCall()) {
-      // Spill all virtregs before a call. This serves two purposes: 1. If an
+      // Spill all virtregs before a call. This serves one purpose: If an
       // exception is thrown, the landing pad is going to expect to find
-      // registers in their spill slots, and 2. we don't have to wade through
-      // all the <imp-def> operands on the call instruction.
-      DefOpEnd = VirtOpEnd;
+      // registers in their spill slots.
+      // Note: although this is appealing to just consider all definitions
+      // as call-clobbered, this is not correct because some of those
+      // definitions may be used later on and we do not want to reuse
+      // those for virtual registers in between.
       DEBUG(dbgs() << "  Spilling remaining registers before call.\n");
       spillAll(MI);
 

Modified: projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -275,6 +275,18 @@ static bool isCSSave(MachineInstr *MBBI)
          MBBI->getOpcode() == AArch64::STPDpre;
 }
 
+bool AArch64FrameLowering::canUseAsPrologue(
+    const MachineBasicBlock &MBB) const {
+  const MachineFunction *MF = MBB.getParent();
+  const AArch64Subtarget &Subtarget = MF->getSubtarget<AArch64Subtarget>();
+  const AArch64RegisterInfo *RegInfo = Subtarget.getRegisterInfo();
+
+  // Don't need a scratch register if we're not going to re-align the stack.
+  // Otherwise, we may need a scratch register to be available and we do not
+  // support that for now.
+  return !RegInfo->needsStackRealignment(*MF);
+}
+
 void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
                                         MachineBasicBlock &MBB) const {
   MachineBasicBlock::iterator MBBI = MBB.begin();

Modified: projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.h
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.h	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.h	Wed Feb 24 22:07:56 2016	(r296011)
@@ -37,6 +37,8 @@ public:
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
+  bool canUseAsPrologue(const MachineBasicBlock &MBB) const override;
+
   int getFrameIndexReference(const MachineFunction &MF, int FI,
                              unsigned &FrameReg) const override;
   int resolveFrameIndexReference(const MachineFunction &MF, int FI,

Modified: projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -556,16 +556,42 @@ void PPCFrameLowering::replaceFPWithReal
     }
 }
 
-bool PPCFrameLowering::findScratchRegister(MachineBasicBlock *MBB,
-                                           bool UseAtEnd,
-                                           unsigned *ScratchRegister) const {
+/*  This function will do the following:
+    - If MBB is an entry or exit block, set SR1 and SR2 to R0 and R12
+      respectively (defaults recommended by the ABI) and return true
+    - If MBB is not an entry block, initialize the register scavenger and look
+      for available registers.
+    - If the defaults (R0/R12) are available, return true
+    - If TwoUniqueRegsRequired is set to true, it looks for two unique
+      registers. Otherwise, look for a single available register.
+      - If the required registers are found, set SR1 and SR2 and return true.
+      - If the required registers are not found, set SR2 or both SR1 and SR2 to
+        PPC::NoRegister and return false.
+
+    Note that if both SR1 and SR2 are valid parameters and TwoUniqueRegsRequired
+    is not set, this function will attempt to find two different registers, but
+    still return true if only one register is available (and set SR1 == SR2).
+*/
+bool
+PPCFrameLowering::findScratchRegister(MachineBasicBlock *MBB,
+                                      bool UseAtEnd,
+                                      bool TwoUniqueRegsRequired,
+                                      unsigned *SR1,
+                                      unsigned *SR2) const {
   RegScavenger RS;
-  unsigned     R0 = Subtarget.isPPC64() ? PPC::X0 : PPC::R0;
+  unsigned R0 =  Subtarget.isPPC64() ? PPC::X0 : PPC::R0;
+  unsigned R12 = Subtarget.isPPC64() ? PPC::X12 : PPC::R12;
+
+  // Set the defaults for the two scratch registers.
+  if (SR1)
+    *SR1 = R0;
 
-  if (ScratchRegister)
-    *ScratchRegister = R0;
+  if (SR2) {
+    assert (SR1 && "Asking for the second scratch register but not the first?");
+    *SR2 = R12;
+  }
 
-  // If MBB is an entry or exit block, use R0 as the scratch register
+  // If MBB is an entry or exit block, use R0 and R12 as the scratch registers.
   if ((UseAtEnd && MBB->isReturnBlock()) ||
       (!UseAtEnd && (&MBB->getParent()->front() == MBB)))
     return true;
@@ -573,8 +599,8 @@ bool PPCFrameLowering::findScratchRegist
   RS.enterBasicBlock(MBB);
 
   if (UseAtEnd && !MBB->empty()) {
-    // The scratch register will be used at the end of the block, so must consider
-    // all registers used within the block
+    // The scratch register will be used at the end of the block, so must
+    // consider all registers used within the block
 
     MachineBasicBlock::iterator MBBI = MBB->getFirstTerminator();
     // If no terminator, back iterator up to previous instruction.
@@ -584,35 +610,86 @@ bool PPCFrameLowering::findScratchRegist
     if (MBBI != MBB->begin())
       RS.forward(MBBI);
   }
-  
-  if (!RS.isRegUsed(R0)) 
+
+  // If the two registers are available, we're all good.
+  // Note that we only return here if both R0 and R12 are available because
+  // although the function may not require two unique registers, it may benefit
+  // from having two so we should try to provide them.
+  if (!RS.isRegUsed(R0) && !RS.isRegUsed(R12))
     return true;
 
-  unsigned Reg = RS.FindUnusedReg(Subtarget.isPPC64() ? &PPC::G8RCRegClass
-                                  : &PPC::GPRCRegClass);
-  
-  // Make sure the register scavenger was able to find an available register
-  // If not, use R0 but return false to indicate no register was available and
-  // R0 must be used (as recommended by the ABI)
-  if (Reg == 0)
-    return false;
+  // Get the list of callee-saved registers for the target.
+  const PPCRegisterInfo *RegInfo =
+      static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
+  const MCPhysReg *CSRegs = RegInfo->getCalleeSavedRegs(MBB->getParent());
 
-  if (ScratchRegister)
-    *ScratchRegister = Reg;
+  // Get all the available registers in the block.
+  BitVector BV = RS.getRegsAvailable(Subtarget.isPPC64() ? &PPC::G8RCRegClass :
+                                     &PPC::GPRCRegClass);
+
+  // We shouldn't use callee-saved registers as scratch registers as they may be
+  // available when looking for a candidate block for shrink wrapping but not
+  // available when the actual prologue/epilogue is being emitted because they
+  // were added as live-in to the prologue block by PrologueEpilogueInserter.
+  for (int i = 0; CSRegs[i]; ++i)
+    BV.reset(CSRegs[i]);
+
+  // Set the first scratch register to the first available one.
+  if (SR1) {
+    int FirstScratchReg = BV.find_first();
+    *SR1 = FirstScratchReg == -1 ? (unsigned)PPC::NoRegister : FirstScratchReg;
+  }
+
+  // If there is another one available, set the second scratch register to that.
+  // Otherwise, set it to either PPC::NoRegister if this function requires two
+  // or to whatever SR1 is set to if this function doesn't require two.
+  if (SR2) {
+    int SecondScratchReg = BV.find_next(*SR1);
+    if (SecondScratchReg != -1)
+      *SR2 = SecondScratchReg;
+    else
+      *SR2 = TwoUniqueRegsRequired ? (unsigned)PPC::NoRegister : *SR1;
+  }
+
+  // Now that we've done our best to provide both registers, double check
+  // whether we were unable to provide enough.
+  if (BV.count() < (TwoUniqueRegsRequired ? 2 : 1))
+    return false;
 
   return true;
 }
 
+// We need a scratch register for spilling LR and for spilling CR. By default,
+// we use two scratch registers to hide latency. However, if only one scratch
+// register is available, we can adjust for that by not overlapping the spill
+// code. However, if we need to realign the stack (i.e. have a base pointer)
+// and the stack frame is large, we need two scratch registers.
+bool
+PPCFrameLowering::twoUniqueScratchRegsRequired(MachineBasicBlock *MBB) const {
+  const PPCRegisterInfo *RegInfo =
+      static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
+  MachineFunction &MF = *(MBB->getParent());
+  bool HasBP = RegInfo->hasBasePointer(MF);
+  unsigned FrameSize = determineFrameLayout(MF, false);
+  int NegFrameSize = -FrameSize;
+  bool IsLargeFrame = !isInt<16>(NegFrameSize);
+  MachineFrameInfo *MFI = MF.getFrameInfo();
+  unsigned MaxAlign = MFI->getMaxAlignment();
+
+  return IsLargeFrame && HasBP && MaxAlign > 1;
+}
+
 bool PPCFrameLowering::canUseAsPrologue(const MachineBasicBlock &MBB) const {
   MachineBasicBlock *TmpMBB = const_cast<MachineBasicBlock *>(&MBB);
 
-  return findScratchRegister(TmpMBB, false, nullptr);
+  return findScratchRegister(TmpMBB, false,
+                             twoUniqueScratchRegsRequired(TmpMBB));
 }
 
 bool PPCFrameLowering::canUseAsEpilogue(const MachineBasicBlock &MBB) const {
   MachineBasicBlock *TmpMBB = const_cast<MachineBasicBlock *>(&MBB);
 
-  return findScratchRegister(TmpMBB, true, nullptr);
+  return findScratchRegister(TmpMBB, true);
 }
 
 void PPCFrameLowering::emitPrologue(MachineFunction &MF,
@@ -664,6 +741,7 @@ void PPCFrameLowering::emitPrologue(Mach
   PPCFunctionInfo *FI = MF.getInfo<PPCFunctionInfo>();
   bool MustSaveLR = FI->mustSaveLR();
   const SmallVectorImpl<unsigned> &MustSaveCRs = FI->getMustSaveCRs();
+  bool MustSaveCR = !MustSaveCRs.empty();
   // Do we have a frame pointer and/or base pointer for this function?
   bool HasFP = hasFP(MF);
   bool HasBP = RegInfo->hasBasePointer(MF);
@@ -701,9 +779,15 @@ void PPCFrameLowering::emitPrologue(Mach
   assert((isPPC64 || !isSVR4ABI || !(!FrameSize && (MustSaveLR || HasFP))) &&
          "FrameSize must be >0 to save/restore the FP or LR for 32-bit SVR4.");
 
-  findScratchRegister(&MBB, false, &ScratchReg);
-  assert(ScratchReg && "No scratch register!");
-         
+  // Using the same bool variable as below to supress compiler warnings.
+  bool SingleScratchReg =
+    findScratchRegister(&MBB, false, twoUniqueScratchRegsRequired(&MBB),
+                        &ScratchReg, &TempReg);
+  assert(SingleScratchReg &&
+         "Required number of registers not available in this block");
+
+  SingleScratchReg = ScratchReg == TempReg;
+
   int LROffset = getReturnSaveOffset();
 
   int FPOffset = 0;
@@ -748,13 +832,30 @@ void PPCFrameLowering::emitPrologue(Mach
   // indexed into with a simple STDU/STWU/STD/STW immediate offset operand.
   bool isLargeFrame = !isInt<16>(NegFrameSize);
 
+  assert((isPPC64 || !MustSaveCR) &&
+         "Prologue CR saving supported only in 64-bit mode");
+
+  // If we need to spill the CR and the LR but we don't have two separate
+  // registers available, we must spill them one at a time
+  if (MustSaveCR && SingleScratchReg && MustSaveLR) {
+    // FIXME: In the ELFv2 ABI, we are not required to save all CR fields.
+    // If only one or two CR fields are clobbered, it could be more
+    // efficient to use mfocrf to selectively save just those fields.
+    MachineInstrBuilder MIB =
+      BuildMI(MBB, MBBI, dl, TII.get(PPC::MFCR8), TempReg);
+    for (unsigned i = 0, e = MustSaveCRs.size(); i != e; ++i)
+      MIB.addReg(MustSaveCRs[i], RegState::ImplicitKill);
+    BuildMI(MBB, MBBI, dl, TII.get(PPC::STW8))
+      .addReg(TempReg, getKillRegState(true))
+      .addImm(8)
+      .addReg(SPReg);
+  }
+
   if (MustSaveLR)
     BuildMI(MBB, MBBI, dl, MFLRInst, ScratchReg);
 
-  assert((isPPC64 || MustSaveCRs.empty()) &&
-         "Prologue CR saving supported only in 64-bit mode");
-
-  if (!MustSaveCRs.empty()) { // will only occur for PPC64
+  if (MustSaveCR &&
+      !(SingleScratchReg && MustSaveLR)) { // will only occur for PPC64
     // FIXME: In the ELFv2 ABI, we are not required to save all CR fields.
     // If only one or two CR fields are clobbered, it could be more
     // efficient to use mfocrf to selectively save just those fields.
@@ -792,7 +893,8 @@ void PPCFrameLowering::emitPrologue(Mach
       .addImm(LROffset)
       .addReg(SPReg);
 
-  if (!MustSaveCRs.empty()) // will only occur for PPC64
+  if (MustSaveCR &&
+      !(SingleScratchReg && MustSaveLR)) // will only occur for PPC64
     BuildMI(MBB, MBBI, dl, TII.get(PPC::STW8))
       .addReg(TempReg, getKillRegState(true))
       .addImm(8)
@@ -811,6 +913,7 @@ void PPCFrameLowering::emitPrologue(Mach
       .addReg(SPReg);
   }
 
+  // This condition must be kept in sync with canUseAsPrologue.
   if (HasBP && MaxAlign > 1) {
     if (isPPC64)
       BuildMI(MBB, MBBI, dl, TII.get(PPC::RLDICL), ScratchReg)
@@ -828,6 +931,7 @@ void PPCFrameLowering::emitPrologue(Mach
         .addReg(ScratchReg, RegState::Kill)
         .addImm(NegFrameSize);
     } else {
+      assert(!SingleScratchReg && "Only a single scratch reg available");
       BuildMI(MBB, MBBI, dl, LoadImmShiftedInst, TempReg)
         .addImm(NegFrameSize >> 16);
       BuildMI(MBB, MBBI, dl, OrImmInst, TempReg)
@@ -951,7 +1055,7 @@ void PPCFrameLowering::emitPrologue(Mach
       // For SVR4, don't emit a move for the CR spill slot if we haven't
       // spilled CRs.
       if (isSVR4ABI && (PPC::CR2 <= Reg && Reg <= PPC::CR4)
-          && MustSaveCRs.empty())
+          && !MustSaveCR)
         continue;
 
       // For 64-bit SVR4 when we have spilled CRs, the spill location
@@ -1005,6 +1109,7 @@ void PPCFrameLowering::emitEpilogue(Mach
   PPCFunctionInfo *FI = MF.getInfo<PPCFunctionInfo>();
   bool MustSaveLR = FI->mustSaveLR();
   const SmallVectorImpl<unsigned> &MustSaveCRs = FI->getMustSaveCRs();
+  bool MustSaveCR = !MustSaveCRs.empty();
   // Do we have a frame pointer and/or base pointer for this function?
   bool HasFP = hasFP(MF);
   bool HasBP = RegInfo->hasBasePointer(MF);
@@ -1026,14 +1131,19 @@ void PPCFrameLowering::emitEpilogue(Mach
                                                    : PPC::ADDI );
   const MCInstrDesc& AddInst = TII.get( isPPC64 ? PPC::ADD8
                                                 : PPC::ADD4 );
-  
+
   int LROffset = getReturnSaveOffset();
 
   int FPOffset = 0;
 
-  findScratchRegister(&MBB, true, &ScratchReg);
-  assert(ScratchReg && "No scratch register!");
-  
+  // Using the same bool variable as below to supress compiler warnings.
+  bool SingleScratchReg = findScratchRegister(&MBB, true, false, &ScratchReg,
+                                              &TempReg);
+  assert(SingleScratchReg &&
+         "Could not find an available scratch register");
+
+  SingleScratchReg = ScratchReg == TempReg;
+
   if (HasFP) {
     if (isSVR4ABI) {
       MachineFrameInfo *FFI = MF.getFrameInfo();
@@ -1130,15 +1240,27 @@ void PPCFrameLowering::emitEpilogue(Mach
     }
   }
 
+  assert((isPPC64 || !MustSaveCR) &&
+         "Epilogue CR restoring supported only in 64-bit mode");
+
+  // If we need to save both the LR and the CR and we only have one available
+  // scratch register, we must do them one at a time.
+  if (MustSaveCR && SingleScratchReg && MustSaveLR) {
+    BuildMI(MBB, MBBI, dl, TII.get(PPC::LWZ8), TempReg)
+      .addImm(8)
+      .addReg(SPReg);
+    for (unsigned i = 0, e = MustSaveCRs.size(); i != e; ++i)
+      BuildMI(MBB, MBBI, dl, TII.get(PPC::MTOCRF8), MustSaveCRs[i])
+        .addReg(TempReg, getKillRegState(i == e-1));
+  }
+
   if (MustSaveLR)
     BuildMI(MBB, MBBI, dl, LoadInst, ScratchReg)
       .addImm(LROffset)
       .addReg(SPReg);
 
-  assert((isPPC64 || MustSaveCRs.empty()) &&
-         "Epilogue CR restoring supported only in 64-bit mode");
-
-  if (!MustSaveCRs.empty()) // will only occur for PPC64
+  if (MustSaveCR &&
+      !(SingleScratchReg && MustSaveLR)) // will only occur for PPC64
     BuildMI(MBB, MBBI, dl, TII.get(PPC::LWZ8), TempReg)
       .addImm(8)
       .addReg(SPReg);
@@ -1160,7 +1282,8 @@ void PPCFrameLowering::emitEpilogue(Mach
       .addImm(BPOffset)
       .addReg(SPReg);
 
-  if (!MustSaveCRs.empty()) // will only occur for PPC64
+  if (MustSaveCR &&
+      !(SingleScratchReg && MustSaveLR)) // will only occur for PPC64
     for (unsigned i = 0, e = MustSaveCRs.size(); i != e; ++i)
       BuildMI(MBB, MBBI, dl, TII.get(PPC::MTOCRF8), MustSaveCRs[i])
         .addReg(TempReg, getKillRegState(i == e-1));

Modified: projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	Wed Feb 24 22:07:56 2016	(r296011)
@@ -30,28 +30,41 @@ class PPCFrameLowering: public TargetFra
   const unsigned BasePointerSaveOffset;
 
   /**
-   * \brief Find a register that can be used in function prologue and epilogue
+   * \brief Find register[s] that can be used in function prologue and epilogue
    *
-   * Find a register that can be use as the scratch register in function
+   * Find register[s] that can be use as scratch register[s] in function
    * prologue and epilogue to save various registers (Link Register, Base
-   * Pointer, etc.). Prefer R0, if it is available. If it is not available,
-   * then choose a different register.
+   * Pointer, etc.). Prefer R0/R12, if available. Otherwise choose whatever
+   * register[s] are available.
    *
-   * This method will return true if an available register was found (including
-   * R0). If no available registers are found, the method returns false and sets
-   * ScratchRegister to R0, as per the recommendation in the ABI.
+   * This method will return true if it is able to find enough unique scratch
+   * registers (1 or 2 depending on the requirement). If it is unable to find
+   * enough available registers in the block, it will return false and set
+   * any passed output parameter that corresponds to a required unique register
+   * to PPC::NoRegister.
    *
    * \param[in] MBB The machine basic block to find an available register for
    * \param[in] UseAtEnd Specify whether the scratch register will be used at
    *                     the end of the basic block (i.e., will the scratch
    *                     register kill a register defined in the basic block)
-   * \param[out] ScratchRegister The scratch register to use
-   * \return true if a scratch register was found. false of a scratch register
-   *         was not found and R0 is being used as the default.
+   * \param[in] TwoUniqueRegsRequired Specify whether this basic block will
+   *                                  require two unique scratch registers.
+   * \param[out] SR1 The scratch register to use
+   * \param[out] SR2 The second scratch register. If this pointer is not null
+   *                 the function will attempt to set it to an available
+   *                 register regardless of whether there is a hard requirement
+   *                 for two unique scratch registers.
+   * \return true if the required number of registers was found.
+   *         false if the required number of scratch register weren't available.
+   *         If either output parameter refers to a required scratch register
+   *         that isn't available, it will be set to an invalid value.
    */
   bool findScratchRegister(MachineBasicBlock *MBB,
                            bool UseAtEnd,
-                           unsigned *ScratchRegister) const;
+                           bool TwoUniqueRegsRequired = false,
+                           unsigned *SR1 = nullptr,
+                           unsigned *SR2 = nullptr) const;
+  bool twoUniqueScratchRegsRequired(MachineBasicBlock *MBB) const;
 
 public:
   PPCFrameLowering(const PPCSubtarget &STI);

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -22228,6 +22228,35 @@ X86TargetLowering::EmitLoweredCatchPad(M
 }
 
 MachineBasicBlock *
+X86TargetLowering::EmitLoweredTLSAddr(MachineInstr *MI,
+                                      MachineBasicBlock *BB) const {
+  // So, here we replace TLSADDR with the sequence:
+  // adjust_stackdown -> TLSADDR -> adjust_stackup.
+  // We need this because TLSADDR is lowered into calls
+  // inside MC, therefore without the two markers shrink-wrapping
+  // may push the prologue/epilogue pass them.
+  const TargetInstrInfo &TII = *Subtarget->getInstrInfo();
+  DebugLoc DL = MI->getDebugLoc();
+  MachineFunction &MF = *BB->getParent();
+
+  // Emit CALLSEQ_START right before the instruction.
+  unsigned AdjStackDown = TII.getCallFrameSetupOpcode();
+  MachineInstrBuilder CallseqStart =
+    BuildMI(MF, DL, TII.get(AdjStackDown)).addImm(0);
+  BB->insert(MachineBasicBlock::iterator(MI), CallseqStart);
+
+  // Emit CALLSEQ_END right after the instruction.
+  // We don't call erase from parent because we want to keep the
+  // original instruction around.
+  unsigned AdjStackUp = TII.getCallFrameDestroyOpcode();
+  MachineInstrBuilder CallseqEnd =
+    BuildMI(MF, DL, TII.get(AdjStackUp)).addImm(0).addImm(0);
+  BB->insertAfter(MachineBasicBlock::iterator(MI), CallseqEnd);
+
+  return BB;
+}
+
+MachineBasicBlock *
 X86TargetLowering::EmitLoweredTLSCall(MachineInstr *MI,
                                       MachineBasicBlock *BB) const {
   // This is pretty easy.  We're taking the value that we received from
@@ -22607,6 +22636,11 @@ X86TargetLowering::EmitInstrWithCustomIn
   case X86::TCRETURNri64:
   case X86::TCRETURNmi64:
     return BB;
+  case X86::TLS_addr32:
+  case X86::TLS_addr64:
+  case X86::TLS_base_addr32:
+  case X86::TLS_base_addr64:
+    return EmitLoweredTLSAddr(MI, BB);
   case X86::WIN_ALLOCA:
     return EmitLoweredWinAlloca(MI, BB);
   case X86::CATCHRET:

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.h
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.h	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.h	Wed Feb 24 22:07:56 2016	(r296011)
@@ -1129,6 +1129,9 @@ namespace llvm {
     MachineBasicBlock *EmitLoweredSegAlloca(MachineInstr *MI,
                                             MachineBasicBlock *BB) const;
 
+    MachineBasicBlock *EmitLoweredTLSAddr(MachineInstr *MI,
+                                          MachineBasicBlock *BB) const;
+
     MachineBasicBlock *EmitLoweredTLSCall(MachineInstr *MI,
                                           MachineBasicBlock *BB) const;
 

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Wed Feb 24 22:07:56 2016	(r296011)
@@ -436,7 +436,7 @@ let Defs = [EAX, ECX, EDX, FP0, FP1, FP2
             MM0, MM1, MM2, MM3, MM4, MM5, MM6, MM7,
             XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
             XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
-    Uses = [ESP] in {
+    usesCustomInserter = 1, Uses = [ESP] in {
 def TLS_addr32 : I<0, Pseudo, (outs), (ins i32mem:$sym),
                   "# TLS_addr32",
                   [(X86tlsaddr tls32addr:$sym)]>,
@@ -456,7 +456,7 @@ let Defs = [RAX, RCX, RDX, RSI, RDI, R8,
             MM0, MM1, MM2, MM3, MM4, MM5, MM6, MM7,
             XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
             XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
-    Uses = [RSP] in {
+    usesCustomInserter = 1, Uses = [RSP] in {
 def TLS_addr64 : I<0, Pseudo, (outs), (ins i64mem:$sym),
                    "# TLS_addr64",
                   [(X86tlsaddr tls64addr:$sym)]>,

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -3475,6 +3475,7 @@ public:
 
 Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
                                       QualType Ty) const {
+  const unsigned OverflowLimit = 8;
   if (const ComplexType *CTy = Ty->getAs<ComplexType>()) {
     // TODO: Implement this. For now ignore.
     (void)CTy;
@@ -3517,7 +3518,7 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(Co
   }
 
   llvm::Value *CC =
-      Builder.CreateICmpULT(NumRegs, Builder.getInt8(8), "cond");
+      Builder.CreateICmpULT(NumRegs, Builder.getInt8(OverflowLimit), "cond");
 
   llvm::BasicBlock *UsingRegs = CGF.createBasicBlock("using_regs");
   llvm::BasicBlock *UsingOverflow = CGF.createBasicBlock("using_overflow");
@@ -3569,6 +3570,8 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(Co
   {
     CGF.EmitBlock(UsingOverflow);
 
+    Builder.CreateStore(Builder.getInt8(OverflowLimit), NumRegsAddr);
+
     // Everything in the overflow area is rounded up to a size of at least 4.
     CharUnits OverflowAreaAlign = CharUnits::fromQuantity(4);
 

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp	Wed Feb 24 22:07:56 2016	(r296011)
@@ -1365,10 +1365,13 @@ Sema::CreateGenericSelectionExpr(SourceL
 
   // Decay and strip qualifiers for the controlling expression type, and handle
   // placeholder type replacement. See committee discussion from WG14 DR423.
-  ExprResult R = DefaultFunctionArrayLvalueConversion(ControllingExpr);
-  if (R.isInvalid())
-    return ExprError();
-  ControllingExpr = R.get();
+  {
+    EnterExpressionEvaluationContext Unevaluated(*this, Sema::Unevaluated);
+    ExprResult R = DefaultFunctionArrayLvalueConversion(ControllingExpr);
+    if (R.isInvalid())
+      return ExprError();
+    ControllingExpr = R.get();
+  }
 
   // The controlling expression is an unevaluated operand, so side effects are
   // likely unintended.

Modified: projects/clang380-import/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- projects/clang380-import/lib/clang/include/clang/Basic/Version.inc	Wed Feb 24 22:01:45 2016	(r296010)
+++ projects/clang380-import/lib/clang/include/clang/Basic/Version.inc	Wed Feb 24 22:07:56 2016	(r296011)
@@ -7,4 +7,4 @@
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"261369"
+#define	SVN_REVISION			"261684"