svn commit: r271388 - in projects/sendfile: bin/sh cddl/contrib/opensolaris/cmd/zpool contrib/libc-vis contrib/llvm/lib/Target/ARM contrib/llvm/patches contrib/llvm/tools/clang/lib/CodeGen contrib/...

Gleb Smirnoff glebius at FreeBSD.org
Wed Sep 10 12:55:39 UTC 2014 

Author: glebius
Date: Wed Sep 10 12:55:34 2014
New Revision: 271388
URL: http://svnweb.freebsd.org/changeset/base/271388

Log:
  Merge head r258543 through r271387.

Added:
  projects/sendfile/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff
     - copied unchanged from r271387, head/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff
  projects/sendfile/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff
     - copied unchanged from r271387, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff
  projects/sendfile/lib/libc/arm/Symbol_vfp.map
     - copied unchanged from r271387, head/lib/libc/arm/Symbol_vfp.map
  projects/sendfile/share/man/man4/uled.4
     - copied unchanged from r271387, head/share/man/man4/uled.4
  projects/sendfile/sys/arm/altera/
     - copied from r271387, head/sys/arm/altera/
  projects/sendfile/sys/arm/conf/IMX53
     - copied unchanged from r271387, head/sys/arm/conf/IMX53
  projects/sendfile/sys/arm/conf/SOCKIT
     - copied unchanged from r271387, head/sys/arm/conf/SOCKIT
  projects/sendfile/sys/arm/freescale/imx/imx6_iomux.c
     - copied unchanged from r271387, head/sys/arm/freescale/imx/imx6_iomux.c
  projects/sendfile/sys/arm/freescale/imx/imx6_iomuxreg.h
     - copied unchanged from r271387, head/sys/arm/freescale/imx/imx6_iomuxreg.h
  projects/sendfile/sys/arm/freescale/imx/imx_iomuxvar.h
     - copied unchanged from r271387, head/sys/arm/freescale/imx/imx_iomuxvar.h
  projects/sendfile/sys/boot/fdt/dts/arm/socfpga-sockit.dts
     - copied unchanged from r271387, head/sys/boot/fdt/dts/arm/socfpga-sockit.dts
  projects/sendfile/sys/boot/fdt/dts/arm/socfpga.dtsi
     - copied unchanged from r271387, head/sys/boot/fdt/dts/arm/socfpga.dtsi
  projects/sendfile/sys/dev/ahci/ahci_pci.c
     - copied unchanged from r271387, head/sys/dev/ahci/ahci_pci.c
  projects/sendfile/sys/dev/fdt/fdt_clock.c
     - copied unchanged from r271387, head/sys/dev/fdt/fdt_clock.c
  projects/sendfile/sys/dev/fdt/fdt_clock.h
     - copied unchanged from r271387, head/sys/dev/fdt/fdt_clock.h
  projects/sendfile/sys/dev/fdt/fdt_clock_if.m
     - copied unchanged from r271387, head/sys/dev/fdt/fdt_clock_if.m
  projects/sendfile/sys/dev/smc/if_smc_fdt.c
     - copied unchanged from r271387, head/sys/dev/smc/if_smc_fdt.c
  projects/sendfile/sys/dev/usb/misc/uled.c
     - copied unchanged from r271387, head/sys/dev/usb/misc/uled.c
  projects/sendfile/sys/dev/usb/uled_ioctl.h
     - copied unchanged from r271387, head/sys/dev/usb/uled_ioctl.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/at91.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/at91.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/berlin2.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/berlin2.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/mfd/palmas.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/mfd/palmas.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/phy/
     - copied from r271387, head/sys/gnu/dts/include/dt-bindings/phy/
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset-controller/
     - copied from r271387, head/sys/gnu/dts/include/dt-bindings/reset-controller/
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/soc/
     - copied from r271387, head/sys/gnu/dts/include/dt-bindings/soc/
  projects/sendfile/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h
     - copied unchanged from r271387, head/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h
  projects/sendfile/sys/gnu/dts/include/dt-bindings/spmi/
     - copied from r271387, head/sys/gnu/dts/include/dt-bindings/spmi/
  projects/sendfile/sys/libkern/memmem.c
     - copied unchanged from r271387, head/sys/libkern/memmem.c
  projects/sendfile/sys/modules/usb/uled/
     - copied from r271387, head/sys/modules/usb/uled/
  projects/sendfile/sys/x86/x86/identcpu.c
     - copied unchanged from r271387, head/sys/x86/x86/identcpu.c
  projects/sendfile/tools/tools/tscdrift/
     - copied from r271387, head/tools/tools/tscdrift/
Replaced:
     - copied from r271387, head/sys/gnu/dts/arm/
Directory Properties:
  projects/sendfile/sys/gnu/dts/arm/   (props changed)
Deleted:
  projects/sendfile/sys/amd64/amd64/identcpu.c
  projects/sendfile/sys/arm/freescale/imx/imx51_iomuxvar.h
  projects/sendfile/sys/arm/versatile/if_smc_fdt.c
  projects/sendfile/sys/i386/i386/identcpu.c
Modified:
  projects/sendfile/bin/sh/jobs.c
  projects/sendfile/bin/sh/sh.1
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  projects/sendfile/contrib/libc-vis/vis.c
  projects/sendfile/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
  projects/sendfile/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
  projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  projects/sendfile/contrib/smbfs/lib/smb/ctx.c
  projects/sendfile/contrib/smbfs/mount_smbfs/mount_smbfs.c
  projects/sendfile/crypto/heimdal/tools/krb5-config.in
  projects/sendfile/etc/mtree/BSD.root.dist
  projects/sendfile/etc/periodic/daily/110.clean-tmps
  projects/sendfile/etc/rc.d/jail
  projects/sendfile/etc/rc.d/syscons
  projects/sendfile/include/pthread.h
  projects/sendfile/include/stdlib.h
  projects/sendfile/lib/libc/arm/Makefile.inc
  projects/sendfile/lib/libc/arm/gen/__aeabi_read_tp.S
  projects/sendfile/lib/libc/arm/gen/_ctx_start.S
  projects/sendfile/lib/libc/arm/gen/_setjmp.S
  projects/sendfile/lib/libc/arm/gen/alloca.S
  projects/sendfile/lib/libc/arm/gen/divsi3.S
  projects/sendfile/lib/libc/arm/gen/setjmp.S
  projects/sendfile/lib/libc/arm/gen/sigsetjmp.S
  projects/sendfile/lib/libc/arm/string/ffs.S
  projects/sendfile/lib/libc/arm/string/memcmp.S
  projects/sendfile/lib/libc/arm/string/memcpy_arm.S
  projects/sendfile/lib/libc/arm/string/memcpy_xscale.S
  projects/sendfile/lib/libc/arm/string/memmove.S
  projects/sendfile/lib/libc/arm/string/memset.S
  projects/sendfile/lib/libc/arm/string/strcmp.S
  projects/sendfile/lib/libc/arm/string/strlen.S
  projects/sendfile/lib/libc/arm/string/strncmp.S
  projects/sendfile/lib/libc/arm/sys/Ovfork.S
  projects/sendfile/lib/libc/arm/sys/brk.S
  projects/sendfile/lib/libc/arm/sys/cerror.S
  projects/sendfile/lib/libc/arm/sys/pipe.S
  projects/sendfile/lib/libc/arm/sys/ptrace.S
  projects/sendfile/lib/libc/arm/sys/sbrk.S
  projects/sendfile/lib/libc/gen/rewinddir.c
  projects/sendfile/lib/libc/locale/lmonetary.c
  projects/sendfile/lib/libc/stdlib/Symbol.map
  projects/sendfile/lib/libc/sys/kqueue.2
  projects/sendfile/lib/libcuse/cuse_lib.c
  projects/sendfile/lib/libgeom/geom_getxml.c
  projects/sendfile/lib/libnv/Makefile
  projects/sendfile/lib/libnv/nvlist.c
  projects/sendfile/lib/libpam/modules/pam_login_access/pam_login_access.c
  projects/sendfile/lib/libstdthreads/threads.h
  projects/sendfile/lib/libthr/thread/thr_cond.c
  projects/sendfile/lib/msun/src/e_lgamma_r.c
  projects/sendfile/lib/msun/src/e_lgammaf_r.c
  projects/sendfile/release/doc/en_US.ISO8859-1/share/xml/release.xsl
  projects/sendfile/release/doc/share/mk/doc.relnotes.mk
  projects/sendfile/release/doc/share/xml/release.ent
  projects/sendfile/release/doc/share/xml/release.xsl
  projects/sendfile/sbin/conscontrol/conscontrol.8
  projects/sendfile/sbin/hastd/primary.c
  projects/sendfile/sbin/hastd/synch.h
  projects/sendfile/sbin/ifconfig/af_inet6.c
  projects/sendfile/sbin/ifconfig/ifconfig.8
  projects/sendfile/sbin/ifconfig/sfp.c
  projects/sendfile/share/man/man4/Makefile
  projects/sendfile/share/man/man4/filemon.4
  projects/sendfile/share/man/man4/ip.4
  projects/sendfile/share/man/man5/autofs.5
  projects/sendfile/share/man/man7/hier.7
  projects/sendfile/share/man/man9/sysctl.9
  projects/sendfile/share/mk/bsd.dep.mk
  projects/sendfile/share/mk/bsd.prog.mk
  projects/sendfile/share/mk/bsd.sys.mk
  projects/sendfile/share/zoneinfo/Makefile
  projects/sendfile/sys/amd64/amd64/cpu_switch.S
  projects/sendfile/sys/amd64/amd64/fpu.c
  projects/sendfile/sys/amd64/amd64/genassym.c
  projects/sendfile/sys/amd64/amd64/machdep.c
  projects/sendfile/sys/amd64/amd64/mp_machdep.c
  projects/sendfile/sys/amd64/amd64/pmap.c
  projects/sendfile/sys/amd64/conf/GENERIC
  projects/sendfile/sys/amd64/include/fpu.h
  projects/sendfile/sys/amd64/include/md_var.h
  projects/sendfile/sys/amd64/include/pcb.h
  projects/sendfile/sys/arm/arm/generic_timer.c
  projects/sendfile/sys/arm/arm/gic.c
  projects/sendfile/sys/arm/arm/locore.S
  projects/sendfile/sys/arm/arm/nexus.c
  projects/sendfile/sys/arm/at91/at91_pinctrl.c
  projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/sendfile/sys/arm/conf/BEAGLEBONE
  projects/sendfile/sys/arm/conf/CNS11XXNAS
  projects/sendfile/sys/arm/conf/CUBIEBOARD
  projects/sendfile/sys/arm/conf/CUBIEBOARD2
  projects/sendfile/sys/arm/conf/DB-78XXX
  projects/sendfile/sys/arm/conf/DB-88F5XXX
  projects/sendfile/sys/arm/conf/DB-88F6XXX
  projects/sendfile/sys/arm/conf/DIGI-CCWMX53
  projects/sendfile/sys/arm/conf/DOCKSTAR
  projects/sendfile/sys/arm/conf/DREAMPLUG-1001
  projects/sendfile/sys/arm/conf/EA3250
  projects/sendfile/sys/arm/conf/EB9200
  projects/sendfile/sys/arm/conf/EFIKA_MX
  projects/sendfile/sys/arm/conf/EXYNOS5.common
  projects/sendfile/sys/arm/conf/HL200
  projects/sendfile/sys/arm/conf/HL201
  projects/sendfile/sys/arm/conf/IMX53-QSB
  projects/sendfile/sys/arm/conf/IMX6
  projects/sendfile/sys/arm/conf/KB920X
  projects/sendfile/sys/arm/conf/NSLU
  projects/sendfile/sys/arm/conf/PANDABOARD
  projects/sendfile/sys/arm/conf/QILA9G20
  projects/sendfile/sys/arm/conf/RK3188
  projects/sendfile/sys/arm/conf/SAM9G20EK
  projects/sendfile/sys/arm/conf/SAM9X25EK
  projects/sendfile/sys/arm/conf/SN9G45
  projects/sendfile/sys/arm/conf/VYBRID
  projects/sendfile/sys/arm/conf/ZEDBOARD
  projects/sendfile/sys/arm/freescale/fsl_ocotp.c
  projects/sendfile/sys/arm/freescale/imx/files.imx51
  projects/sendfile/sys/arm/freescale/imx/files.imx53
  projects/sendfile/sys/arm/freescale/imx/files.imx6
  projects/sendfile/sys/arm/freescale/imx/imx51_ccm.c
  projects/sendfile/sys/arm/freescale/imx/imx51_iomux.c
  projects/sendfile/sys/arm/freescale/imx/imx6_anatop.c
  projects/sendfile/sys/arm/freescale/imx/imx6_ccm.c
  projects/sendfile/sys/arm/freescale/imx/imx_ccmvar.h
  projects/sendfile/sys/arm/freescale/imx/imx_sdhci.c
  projects/sendfile/sys/arm/freescale/vybrid/vf_sai.c
  projects/sendfile/sys/arm/include/asm.h
  projects/sendfile/sys/arm/include/atomic.h
  projects/sendfile/sys/arm/include/intr.h
  projects/sendfile/sys/arm/mv/gpio.c
  projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c
  projects/sendfile/sys/arm/ti/ti_sdhci.c
  projects/sendfile/sys/arm/versatile/files.versatile
  projects/sendfile/sys/arm/xilinx/files.zynq7
  projects/sendfile/sys/boot/arm/uboot/help.uboot
  projects/sendfile/sys/boot/common/module.c
  projects/sendfile/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/sendfile/sys/boot/fdt/dts/arm/imx6.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/wandboard-dual.dts
  projects/sendfile/sys/boot/fdt/dts/arm/wandboard-quad.dts
  projects/sendfile/sys/boot/fdt/dts/arm/wandboard-solo.dts
  projects/sendfile/sys/boot/uboot/common/main.c
  projects/sendfile/sys/cam/ctl/ctl.c
  projects/sendfile/sys/cam/ctl/ctl.h
  projects/sendfile/sys/cam/ctl/ctl_backend_block.c
  projects/sendfile/sys/cam/ctl/ctl_frontend.c
  projects/sendfile/sys/cam/ctl/ctl_io.h
  projects/sendfile/sys/cam/ctl/ctl_private.h
  projects/sendfile/sys/cam/scsi/scsi_all.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/sendfile/sys/conf/NOTES
  projects/sendfile/sys/conf/files
  projects/sendfile/sys/conf/files.amd64
  projects/sendfile/sys/conf/files.i386
  projects/sendfile/sys/conf/files.pc98
  projects/sendfile/sys/dev/acpica/acpi.c
  projects/sendfile/sys/dev/ahci/ahci.c
  projects/sendfile/sys/dev/ahci/ahci.h
  projects/sendfile/sys/dev/ahci/ahciem.c
  projects/sendfile/sys/dev/bce/if_bce.c
  projects/sendfile/sys/dev/cadence/if_cgem.c
  projects/sendfile/sys/dev/cadence/if_cgem_hw.h
  projects/sendfile/sys/dev/ce/if_ce.c
  projects/sendfile/sys/dev/cp/if_cp.c
  projects/sendfile/sys/dev/ctau/if_ct.c
  projects/sendfile/sys/dev/cx/if_cx.c
  projects/sendfile/sys/dev/cxgbe/t4_netmap.c
  projects/sendfile/sys/dev/drm/drm_sysctl.c
  projects/sendfile/sys/dev/fdt/fdt_common.c
  projects/sendfile/sys/dev/fdt/simplebus.c
  projects/sendfile/sys/dev/gpio/ofw_gpiobus.c
  projects/sendfile/sys/dev/iwn/if_iwn.c
  projects/sendfile/sys/dev/iwn/if_iwnreg.h
  projects/sendfile/sys/dev/ixgbe/ixgbe.c
  projects/sendfile/sys/dev/ixgbe/ixv.c
  projects/sendfile/sys/dev/mii/e1000phy.c
  projects/sendfile/sys/dev/mrsas/mrsas.h
  projects/sendfile/sys/dev/mrsas/mrsas_cam.c
  projects/sendfile/sys/dev/nmdm/nmdm.c
  projects/sendfile/sys/dev/ofw/ofw_bus_subr.c
  projects/sendfile/sys/dev/ofw/ofw_console.c
  projects/sendfile/sys/dev/ofw/ofw_fdt.c
  projects/sendfile/sys/dev/ofw/ofwbus.c
  projects/sendfile/sys/dev/ofw/openfirm.c
  projects/sendfile/sys/dev/ofw/openfirm.h
  projects/sendfile/sys/dev/sdhci/sdhci.c
  projects/sendfile/sys/dev/sdhci/sdhci.h
  projects/sendfile/sys/dev/sdhci/sdhci_fdt.c
  projects/sendfile/sys/dev/sdhci/sdhci_if.m
  projects/sendfile/sys/dev/sdhci/sdhci_pci.c
  projects/sendfile/sys/dev/sound/usb/uaudio.c
  projects/sendfile/sys/dev/tsec/if_tsec_fdt.c
  projects/sendfile/sys/dev/usb/controller/ehci_pci.c
  projects/sendfile/sys/dev/usb/net/if_aue.c
  projects/sendfile/sys/dev/usb/quirk/usb_quirk.c
  projects/sendfile/sys/dev/usb/usbdevs
  projects/sendfile/sys/dev/usb/wlan/if_urtwn.c
  projects/sendfile/sys/dev/vt/hw/vga/vt_vga.c
  projects/sendfile/sys/dev/vt/vt.h
  projects/sendfile/sys/dev/vt/vt_buf.c
  projects/sendfile/sys/dev/vt/vt_core.c
  projects/sendfile/sys/dev/xen/blkfront/blkfront.c
  projects/sendfile/sys/fs/fuse/fuse_vnops.c
  projects/sendfile/sys/fs/nfs/nfsm_subs.h
  projects/sendfile/sys/fs/smbfs/smbfs_io.c
  projects/sendfile/sys/gdb/gdb_int.h
  projects/sendfile/sys/gdb/gdb_main.c
  projects/sendfile/sys/gdb/gdb_packet.c
  projects/sendfile/sys/geom/eli/g_eli_crypto.c
  projects/sendfile/sys/geom/eli/g_eli_integrity.c
  projects/sendfile/sys/geom/eli/g_eli_privacy.c
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos4.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/mfd/as3722.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h   (contents, props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h   (contents, props changed)
  projects/sendfile/sys/i386/conf/GENERIC
  projects/sendfile/sys/i386/i386/initcpu.c
  projects/sendfile/sys/i386/i386/machdep.c
  projects/sendfile/sys/i386/i386/mp_machdep.c
  projects/sendfile/sys/i386/i386/trap.c
  projects/sendfile/sys/i386/include/md_var.h
  projects/sendfile/sys/i386/include/pcb.h
  projects/sendfile/sys/kern/imgact_binmisc.c
  projects/sendfile/sys/kern/imgact_shell.c
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_exit.c
  projects/sendfile/sys/kern/kern_jail.c
  projects/sendfile/sys/kern/kern_proc.c
  projects/sendfile/sys/kern/kern_synch.c
  projects/sendfile/sys/kern/kern_thread.c
  projects/sendfile/sys/kern/sysv_shm.c
  projects/sendfile/sys/kern/uipc_mbuf.c
  projects/sendfile/sys/kern/uipc_socket.c
  projects/sendfile/sys/kern/vfs_bio.c
  projects/sendfile/sys/kern/vfs_default.c
  projects/sendfile/sys/kern/vnode_if.src
  projects/sendfile/sys/mips/beri/beri_simplebus.c
  projects/sendfile/sys/mips/conf/WZR-300HP
  projects/sendfile/sys/mips/conf/WZR-300HP.hints
  projects/sendfile/sys/mips/include/sf_buf.h
  projects/sendfile/sys/mips/include/vmparam.h
  projects/sendfile/sys/modules/ahci/Makefile
  projects/sendfile/sys/modules/if_gif/Makefile
  projects/sendfile/sys/modules/usb/Makefile
  projects/sendfile/sys/net/if_vlan.c
  projects/sendfile/sys/net/netisr.h
  projects/sendfile/sys/netinet/in.h
  projects/sendfile/sys/netinet/in_pcb.c
  projects/sendfile/sys/netinet/in_pcb.h
  projects/sendfile/sys/netinet/in_pcbgroup.c
  projects/sendfile/sys/netinet/in_rss.c
  projects/sendfile/sys/netinet/in_rss.h
  projects/sendfile/sys/netinet/in_var.h
  projects/sendfile/sys/netinet/ip_fastfwd.c
  projects/sendfile/sys/netinet/ip_input.c
  projects/sendfile/sys/netinet/ip_output.c
  projects/sendfile/sys/netinet/ip_var.h
  projects/sendfile/sys/netinet/raw_ip.c
  projects/sendfile/sys/netinet/sctp_asconf.c
  projects/sendfile/sys/netinet/sctp_constants.h
  projects/sendfile/sys/netinet/sctp_input.c
  projects/sendfile/sys/netinet/sctp_os_bsd.h
  projects/sendfile/sys/netinet/sctp_output.c
  projects/sendfile/sys/netinet/sctp_pcb.c
  projects/sendfile/sys/netinet/sctp_sysctl.c
  projects/sendfile/sys/netinet/sctp_sysctl.h
  projects/sendfile/sys/netinet/sctp_usrreq.c
  projects/sendfile/sys/netinet/sctputil.c
  projects/sendfile/sys/netinet/tcp_input.c
  projects/sendfile/sys/netinet/tcp_reass.c
  projects/sendfile/sys/netinet/tcp_subr.c
  projects/sendfile/sys/netinet/tcp_syncache.c
  projects/sendfile/sys/netinet/udp_usrreq.c
  projects/sendfile/sys/netinet6/in6_pcb.c
  projects/sendfile/sys/netinet6/in6_src.c
  projects/sendfile/sys/netinet6/in6_var.h
  projects/sendfile/sys/netinet6/ip6_output.c
  projects/sendfile/sys/netinet6/sctp6_usrreq.c
  projects/sendfile/sys/netinet6/udp6_usrreq.c
  projects/sendfile/sys/netpfil/pf/pf.c
  projects/sendfile/sys/pc98/pc98/machdep.c
  projects/sendfile/sys/powerpc/ofw/ofw_pcibus.c
  projects/sendfile/sys/powerpc/powermac/macio.c
  projects/sendfile/sys/sparc64/pci/psycho.c
  projects/sendfile/sys/sys/cdefs.h
  projects/sendfile/sys/sys/imgact.h
  projects/sendfile/sys/sys/libkern.h
  projects/sendfile/sys/sys/mbuf.h
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/sys/proc.h
  projects/sendfile/sys/sys/sdt.h
  projects/sendfile/sys/vm/vm_map.c
  projects/sendfile/sys/vm/vm_map.h
  projects/sendfile/sys/vm/vm_reserv.c
  projects/sendfile/sys/vm/vnode_pager.c
  projects/sendfile/sys/x86/acpica/acpi_wakeup.c
  projects/sendfile/sys/x86/include/fpu.h
  projects/sendfile/sys/x86/include/specialreg.h
  projects/sendfile/sys/x86/x86/tsc.c
  projects/sendfile/tools/make_libdeps.sh
  projects/sendfile/tools/regression/lib/msun/test-cexp.c
  projects/sendfile/tools/regression/lib/msun/test-conj.c
  projects/sendfile/tools/regression/lib/msun/test-csqrt.c
  projects/sendfile/tools/regression/lib/msun/test-invctrig.c
  projects/sendfile/tools/tools/vt/keymaps/KBDFILES.map
  projects/sendfile/tools/tools/vt/keymaps/convert-keymap.pl
  projects/sendfile/usr.bin/netstat/inet6.c
  projects/sendfile/usr.sbin/auditdistd/Makefile
  projects/sendfile/usr.sbin/autofs/token.l
  projects/sendfile/usr.sbin/bhyve/pci_virtio_block.c
  projects/sendfile/usr.sbin/bhyve/pci_virtio_net.c
  projects/sendfile/usr.sbin/bhyve/pci_virtio_rnd.c
  projects/sendfile/usr.sbin/bhyve/virtio.c
  projects/sendfile/usr.sbin/bhyve/virtio.h
  projects/sendfile/usr.sbin/bsdconfig/share/dialog.subr
  projects/sendfile/usr.sbin/ctld/ctl.conf.5
  projects/sendfile/usr.sbin/ctld/ctld.c
  projects/sendfile/usr.sbin/ctld/login.c
  projects/sendfile/usr.sbin/iscsid/login.c
  projects/sendfile/usr.sbin/smbmsg/smbmsg.8
  projects/sendfile/usr.sbin/traceroute/Makefile
  projects/sendfile/usr.sbin/unbound/local-setup/local-unbound-setup.sh
  projects/sendfile/usr.sbin/vidcontrol/vidcontrol.1
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/contrib/libc-vis/   (props changed)
  projects/sendfile/contrib/llvm/   (props changed)
  projects/sendfile/contrib/llvm/tools/clang/   (props changed)
  projects/sendfile/crypto/heimdal/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/include/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/share/zoneinfo/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/gnu/dts/   (props changed)
  projects/sendfile/sys/gnu/dts/include/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clk/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clk/at91.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clk/exynos-audss-clk.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/efm32-cmu.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx5-clock.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/mpc512x-clock.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/tegra20-car.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/dma/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/dma/at91.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/gpio/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/gpio/gpio.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/gpio/tegra-gpio.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/input/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/input/input.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/interrupt-controller/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/interrupt-controller/arm-gic.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/mfd/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/mfd/dbx500-prcmu.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/am33xx.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/at91.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/nomadik.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pinctrl/rockchip.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pwm/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/pwm/pwm.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8660.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8974.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8974.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/sound/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/sound/fsl-imx-audmux.h   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/thermal/   (props changed)
  projects/sendfile/sys/gnu/dts/include/dt-bindings/thermal/thermal.h   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)

Modified: projects/sendfile/bin/sh/jobs.c
==============================================================================
--- projects/sendfile/bin/sh/jobs.c	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/bin/sh/jobs.c	Wed Sep 10 12:55:34 2014	(r271388)
@@ -118,6 +118,24 @@ static void showjob(struct job *, int);
 static int jobctl;
 
 #if JOBS
+static void
+jobctl_notty(void)
+{
+	if (ttyfd >= 0) {
+		close(ttyfd);
+		ttyfd = -1;
+	}
+	if (!iflag) {
+		setsignal(SIGTSTP);
+		setsignal(SIGTTOU);
+		setsignal(SIGTTIN);
+		jobctl = 1;
+		return;
+	}
+	out2fmt_flush("sh: can't access tty; job control turned off\n");
+	mflag = 0;
+}
+
 void
 setjobctl(int on)
 {
@@ -133,8 +151,10 @@ setjobctl(int on)
 			while (i <= 2 && !isatty(i))
 				i++;
 			if (i > 2 ||
-			    (ttyfd = fcntl(i, F_DUPFD_CLOEXEC, 10)) < 0)
-				goto out;
+			    (ttyfd = fcntl(i, F_DUPFD_CLOEXEC, 10)) < 0) {
+				jobctl_notty();
+				return;
+			}
 		}
 		if (ttyfd < 10) {
 			/*
@@ -142,9 +162,8 @@ setjobctl(int on)
 			 * the user's redirections.
 			 */
 			if ((i = fcntl(ttyfd, F_DUPFD_CLOEXEC, 10)) < 0) {
-				close(ttyfd);
-				ttyfd = -1;
-				goto out;
+				jobctl_notty();
+				return;
 			}
 			close(ttyfd);
 			ttyfd = i;
@@ -152,11 +171,15 @@ setjobctl(int on)
 		do { /* while we are in the background */
 			initialpgrp = tcgetpgrp(ttyfd);
 			if (initialpgrp < 0) {
-out:				out2fmt_flush("sh: can't access tty; job control turned off\n");
-				mflag = 0;
+				jobctl_notty();
 				return;
 			}
 			if (initialpgrp != getpgrp()) {
+				if (!iflag) {
+					initialpgrp = -1;
+					jobctl_notty();
+					return;
+				}
 				kill(0, SIGTTIN);
 				continue;
 			}
@@ -168,9 +191,11 @@ out:				out2fmt_flush("sh: can't access 
 		tcsetpgrp(ttyfd, rootpid);
 	} else { /* turning job control off */
 		setpgid(0, initialpgrp);
-		tcsetpgrp(ttyfd, initialpgrp);
-		close(ttyfd);
-		ttyfd = -1;
+		if (ttyfd >= 0) {
+			tcsetpgrp(ttyfd, initialpgrp);
+			close(ttyfd);
+			ttyfd = -1;
+		}
 		setsignal(SIGTSTP);
 		setsignal(SIGTTOU);
 		setsignal(SIGTTIN);
@@ -195,7 +220,8 @@ fgcmd(int argc __unused, char **argv __u
 	printjobcmd(jp);
 	flushout(&output);
 	pgrp = jp->ps[0].pid;
-	tcsetpgrp(ttyfd, pgrp);
+	if (ttyfd >= 0)
+		tcsetpgrp(ttyfd, pgrp);
 	restartjob(jp);
 	jp->foreground = 1;
 	INTOFF;
@@ -847,7 +873,8 @@ forkshell(struct job *jp, union node *n,
 				pgrp = getpid();
 			else
 				pgrp = jp->ps[0].pid;
-			if (setpgid(0, pgrp) == 0 && mode == FORK_FG) {
+			if (setpgid(0, pgrp) == 0 && mode == FORK_FG &&
+			    ttyfd >= 0) {
 				/*** this causes superfluous TIOCSPGRPS ***/
 				if (tcsetpgrp(ttyfd, pgrp) < 0)
 					error("tcsetpgrp failed, errno=%d", errno);
@@ -1007,7 +1034,7 @@ waitforjob(struct job *jp, int *origstat
 			dotrap();
 #if JOBS
 	if (jp->jobctl) {
-		if (tcsetpgrp(ttyfd, rootpid) < 0)
+		if (ttyfd >= 0 && tcsetpgrp(ttyfd, rootpid) < 0)
 			error("tcsetpgrp failed, errno=%d\n", errno);
 	}
 	if (jp->state == JOBSTOPPED)

Modified: projects/sendfile/bin/sh/sh.1
==============================================================================
--- projects/sendfile/bin/sh/sh.1	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/bin/sh/sh.1	Wed Sep 10 12:55:34 2014	(r271388)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd January 26, 2014
+.Dd September 4, 2014
 .Dt SH 1
 .Os
 .Sh NAME
@@ -259,6 +259,12 @@ from input when in interactive mode.
 Force the shell to behave interactively.
 .It Fl m Li monitor
 Turn on job control (set automatically when interactive).
+A new process group is created for each pipeline (called a job).
+It is possible to suspend jobs or to have them run in the foreground or
+in the background.
+In a non-interactive shell,
+this option can be set even if no terminal is available
+and is useful to place processes in separate process groups.
 .It Fl n Li noexec
 If not interactive, read commands but do not
 execute them.

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Wed Sep 10 12:55:34 2014	(r271388)
@@ -414,7 +414,7 @@ or smaller can take advantage of this fe
 When this feature is enabled, the contents of highly-compressible blocks are
 stored in the block "pointer" itself
 .Po a misnomer in this case, as it contains
-the compresseed data, rather than a pointer to its location on disk
+the compressed data, rather than a pointer to its location on disk
 .Pc .
 Thus
 the space of the block

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Wed Sep 10 12:55:34 2014	(r271388)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 /*
@@ -1068,8 +1069,8 @@ is_spare(nvlist_t *config, const char *p
  * Go through and find any devices that are in use.  We rely on libdiskmgt for
  * the majority of this task.
  */
-static int
-check_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
+static boolean_t
+is_device_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
     boolean_t replacing, boolean_t isspare)
 {
 	nvlist_t **child;
@@ -1078,6 +1079,7 @@ check_in_use(nvlist_t *config, nvlist_t 
 	int ret;
 	char buf[MAXPATHLEN];
 	uint64_t wholedisk;
+	boolean_t anyinuse = B_FALSE;
 
 	verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0);
 
@@ -1102,38 +1104,37 @@ check_in_use(nvlist_t *config, nvlist_t 
 				(void) strlcpy(buf, path, sizeof (buf));
 
 			if (is_spare(config, buf))
-				return (0);
+				return (B_FALSE);
 		}
 
 		if (strcmp(type, VDEV_TYPE_DISK) == 0)
 			ret = check_device(path, force, isspare);
-
-		if (strcmp(type, VDEV_TYPE_FILE) == 0)
+		else if (strcmp(type, VDEV_TYPE_FILE) == 0)
 			ret = check_file(path, force, isspare);
 
-		return (ret);
+		return (ret != 0);
 	}
 
 	for (c = 0; c < children; c++)
-		if ((ret = check_in_use(config, child[c], force,
-		    replacing, B_FALSE)) != 0)
-			return (ret);
+		if (is_device_in_use(config, child[c], force, replacing,
+		    B_FALSE))
+			anyinuse = B_TRUE;
 
 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_SPARES,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = check_in_use(config, child[c], force,
-			    replacing, B_TRUE)) != 0)
-				return (ret);
+			if (is_device_in_use(config, child[c], force, replacing,
+			    B_TRUE))
+				anyinuse = B_TRUE;
 
 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_L2CACHE,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = check_in_use(config, child[c], force,
-			    replacing, B_FALSE)) != 0)
-				return (ret);
+			if (is_device_in_use(config, child[c], force, replacing,
+			    B_FALSE))
+				anyinuse = B_TRUE;
 
-	return (0);
+	return (anyinuse);
 }
 
 static const char *
@@ -1487,7 +1488,7 @@ make_root_vdev(zpool_handle_t *zhp, int 
 	 * uses (such as a dedicated dump device) that even '-f' cannot
 	 * override.
 	 */
-	if (check_in_use(poolconfig, newroot, force, replacing, B_FALSE) != 0) {
+	if (is_device_in_use(poolconfig, newroot, force, replacing, B_FALSE)) {
 		nvlist_free(newroot);
 		return (NULL);
 	}

Modified: projects/sendfile/contrib/libc-vis/vis.c
==============================================================================
--- projects/sendfile/contrib/libc-vis/vis.c	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/libc-vis/vis.c	Wed Sep 10 12:55:34 2014	(r271388)
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $	*/
+/*	$NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $");
+__RCSID("$NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
@@ -357,7 +357,7 @@ istrsenvisx(char *mbdst, size_t *dlen, c
 	ssize_t mbslength, maxolen;
 
 	_DIAGASSERT(mbdst != NULL);
-	_DIAGASSERT(mbsrc != NULL);
+	_DIAGASSERT(mbsrc != NULL || mblength == 0);
 	_DIAGASSERT(mbextra != NULL);
 
 	/*
@@ -375,8 +375,6 @@ istrsenvisx(char *mbdst, size_t *dlen, c
 
 	/* Allocate space for the wide char strings */
 	psrc = pdst = extra = NULL;
-	if (!mblength)
-		mblength = strlen(mbsrc);
 	if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
 		return -1;
 	if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
@@ -528,6 +526,15 @@ out:
 	free(psrc);
 	return error;
 }
+
+static int
+istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
+    int flags, const char *mbextra, int *cerr_ptr)
+{
+	return istrsenvisx(mbdst, dlen, mbsrc,
+	    mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
+}
+
 #endif
 
 #if !HAVE_SVIS
@@ -571,13 +578,13 @@ snvis(char *mbdst, size_t dlen, int c, i
 int
 strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
 {
-	return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, mbextra, NULL);
+	return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
 }
 
 int
 strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
 {
-	return istrsenvisx(mbdst, &dlen, mbsrc, 0, flags, mbextra, NULL);
+	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, mbextra, NULL);
 }
 
 int
@@ -646,13 +653,13 @@ nvis(char *mbdst, size_t dlen, int c, in
 int
 strvis(char *mbdst, const char *mbsrc, int flags)
 {
-	return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, "", NULL);
+	return istrsenvisxl(mbdst, NULL, mbsrc, flags, "", NULL);
 }
 
 int
 strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
 {
-	return istrsenvisx(mbdst, &dlen, mbsrc, 0, flags, "", NULL);
+	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
 }
 
 /*

Modified: projects/sendfile/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
==============================================================================
--- projects/sendfile/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td	Wed Sep 10 12:55:34 2014	(r271388)
@@ -3248,7 +3248,8 @@ def : ARMPat<(ARMaddc GPR:$src, imm0_655
 def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR),
              (SBCri   GPR:$src, so_imm_not:$imm)>;
 def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR),
-             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>;
+             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>,
+             Requires<[IsARM, HasV6T2]>;
 
 // Note: These are implemented in C++ code, because they have to generate
 // ADD/SUBrs instructions, which use a complex pattern that a xform function

Modified: projects/sendfile/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
==============================================================================
--- projects/sendfile/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff	Wed Sep 10 12:55:34 2014	(r271388)
@@ -1,7 +1,7 @@
-Index: contrib/llvm/include/llvm/Support/ELF.h
+Index: include/llvm/Support/ELF.h
 ===================================================================
---- contrib/llvm/include/llvm/Support/ELF.h	(revision 270019)
-+++ contrib/llvm/include/llvm/Support/ELF.h	(working copy)
+--- include/llvm/Support/ELF.h	(revision 270019)
++++ include/llvm/Support/ELF.h	(working copy)
 @@ -437,6 +437,7 @@
    R_PPC_GOT16_LO              = 15,
    R_PPC_GOT16_HI              = 16,
@@ -10,10 +10,10 @@ Index: contrib/llvm/include/llvm/Support
    R_PPC_REL32                 = 26,
    R_PPC_TLS                   = 67,
    R_PPC_DTPMOD32              = 68,
-Index: contrib/llvm/lib/Object/ELF.cpp
+Index: lib/Object/ELF.cpp
 ===================================================================
---- contrib/llvm/lib/Object/ELF.cpp	(revision 270019)
-+++ contrib/llvm/lib/Object/ELF.cpp	(working copy)
+--- lib/Object/ELF.cpp	(revision 270019)
++++ lib/Object/ELF.cpp	(working copy)
 @@ -507,6 +507,7 @@
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_LO);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HI);
@@ -22,10 +22,10 @@ Index: contrib/llvm/lib/Object/ELF.cpp
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_REL32);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_TLS);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_DTPMOD32);
-Index: contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
+Index: lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(working copy)
+--- lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(revision 270019)
++++ lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(working copy)
 @@ -18,6 +18,7 @@
  #include "llvm/MC/MCExpr.h"
  #include "llvm/MC/MCInst.h"
@@ -52,10 +52,10 @@ Index: contrib/llvm/lib/Target/PowerPC/I
  }
  
  
-Index: contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+Index: lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(working copy)
+--- lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(revision 270019)
++++ lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(working copy)
 @@ -64,7 +64,15 @@
        llvm_unreachable("Unimplemented");
      case PPC::fixup_ppc_br24:
@@ -123,10 +123,10 @@ Index: contrib/llvm/lib/Target/PowerPC/M
          break;
        }
        break;
-Index: contrib/llvm/lib/Target/PowerPC/PPC.h
+Index: lib/Target/PowerPC/PPC.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPC.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPC.h	(working copy)
+--- lib/Target/PowerPC/PPC.h	(revision 270019)
++++ lib/Target/PowerPC/PPC.h	(working copy)
 @@ -53,10 +53,11 @@
      // PPC Specific MachineOperand flags.
      MO_NO_FLAG,
@@ -143,10 +143,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
      
      /// MO_PIC_FLAG - If this bit is set, the symbol reference is relative to
      /// the function's picbase, e.g. lo16(symbol-picbase).
-Index: contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+Index: lib/Target/PowerPC/PPCAsmPrinter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	(working copy)
+--- lib/Target/PowerPC/PPCAsmPrinter.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCAsmPrinter.cpp	(working copy)
 @@ -19,6 +19,7 @@
  #define DEBUG_TYPE "asmprinter"
  #include "PPC.h"
@@ -578,10 +578,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
      }
    }
  
-Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
+Index: lib/Target/PowerPC/PPCFrameLowering.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	(working copy)
+--- lib/Target/PowerPC/PPCFrameLowering.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCFrameLowering.cpp	(working copy)
 @@ -299,7 +299,7 @@
    const PPCRegisterInfo *RegInfo =
      static_cast<const PPCRegisterInfo*>(MF.getTarget().getRegisterInfo());
@@ -664,10 +664,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
      // Allocate the frame index for the base pointer save area.
      BPSI = MFI->CreateFixedObject(isPPC64? 8 : 4, BPOffset, true);
      // Save the result.
-Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
+Index: lib/Target/PowerPC/PPCFrameLowering.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	(working copy)
+--- lib/Target/PowerPC/PPCFrameLowering.h	(revision 270019)
++++ lib/Target/PowerPC/PPCFrameLowering.h	(working copy)
 @@ -96,12 +96,14 @@
  
    /// getBasePointerSaveOffset - Return the previous frame offset to save the
@@ -685,10 +685,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
    }
  
    /// getLinkageSize - Return the size of the PowerPC ABI linkage area.
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+Index: lib/Target/PowerPC/PPCISelDAGToDAG.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(working copy)
+--- lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(working copy)
 @@ -15,6 +15,7 @@
  #define DEBUG_TYPE "ppc-codegen"
  #include "PPC.h"
@@ -748,10 +748,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
    case PPCISD::VADD_SPLAT: {
      // This expands into one of three sequences, depending on whether
      // the first operand is odd or even, positive or negative.
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+Index: lib/Target/PowerPC/PPCISelLowering.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp	(working copy)
+--- lib/Target/PowerPC/PPCISelLowering.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCISelLowering.cpp	(working copy)
 @@ -670,6 +670,7 @@
    case PPCISD::ADDIS_TOC_HA:    return "PPCISD::ADDIS_TOC_HA";
    case PPCISD::LD_TOC_L:        return "PPCISD::LD_TOC_L";
@@ -972,10 +972,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
  
    MachineInstrBuilder MIB;
  
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
+Index: lib/Target/PowerPC/PPCISelLowering.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h	(working copy)
+--- lib/Target/PowerPC/PPCISelLowering.h	(revision 270019)
++++ lib/Target/PowerPC/PPCISelLowering.h	(working copy)
 @@ -177,6 +177,12 @@
        CR6SET,
        CR6UNSET,
@@ -989,10 +989,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
        /// G8RC = ADDIS_GOT_TPREL_HA %X2, Symbol - Used by the initial-exec
        /// TLS model, produces an ADDIS8 instruction that adds the GOT
        /// base to sym\@got\@tprel\@ha.
-Index: contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
+Index: lib/Target/PowerPC/PPCInstr64Bit.td
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td	(working copy)
+--- lib/Target/PowerPC/PPCInstr64Bit.td	(revision 270019)
++++ lib/Target/PowerPC/PPCInstr64Bit.td	(working copy)
 @@ -36,10 +36,6 @@
  def tocentry : Operand<iPTR> {
    let MIOperandInfo = (ops i64imm:$imm);
@@ -1004,10 +1004,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
  def tlsreg : Operand<i64> {
    let EncoderMethod = "getTLSRegEncoding";
    let ParserMatchClass = PPCTLSRegOperand;
-Index: contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
+Index: lib/Target/PowerPC/PPCInstrInfo.td
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td	(working copy)
+--- lib/Target/PowerPC/PPCInstrInfo.td	(revision 270019)
++++ lib/Target/PowerPC/PPCInstrInfo.td	(working copy)
 @@ -57,6 +57,9 @@
    SDTCisPtrTy<0>, SDTCisVT<1, i32>
  ]>;
@@ -1130,10 +1130,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
  // Standard shifts.  These are represented separately from the real shifts above
  // so that we can distinguish between shifts that allow 5-bit and 6-bit shift
  // amounts.
-Index: contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
+Index: lib/Target/PowerPC/PPCMCInstLower.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp	(working copy)
+--- lib/Target/PowerPC/PPCMCInstLower.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCMCInstLower.cpp	(working copy)
 @@ -13,6 +13,7 @@
  //===----------------------------------------------------------------------===//
  
@@ -1188,10 +1188,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
    const MCExpr *Expr = MCSymbolRefExpr::Create(Symbol, RefKind, Ctx);
  
    if (!MO.isJTI() && MO.getOffset())
-Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
+Index: lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(working copy)
+--- lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(working copy)
 @@ -8,8 +8,16 @@
  //===----------------------------------------------------------------------===//
  
@@ -1209,10 +1209,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
 +  return MF.getContext().GetOrCreateSymbol(Twine(MAI->getPrivateGlobalPrefix())+
 +    Twine(MF.getFunctionNumber())+"$poff");
 +}
-Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
+Index: lib/Target/PowerPC/PPCMachineFunctionInfo.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h	(working copy)
+--- lib/Target/PowerPC/PPCMachineFunctionInfo.h	(revision 270019)
++++ lib/Target/PowerPC/PPCMachineFunctionInfo.h	(working copy)
 @@ -92,6 +92,12 @@
    /// 64-bit SVR4 ABI.
    SmallVector<unsigned, 3> MustSaveCRs;
@@ -1249,10 +1249,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
  };
  
  } // end of namespace llvm
-Index: contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
+Index: lib/Target/PowerPC/PPCRegisterInfo.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	(working copy)
+--- lib/Target/PowerPC/PPCRegisterInfo.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCRegisterInfo.cpp	(working copy)
 @@ -199,7 +199,16 @@
    if (PPCFI->needsFP(MF))
      Reserved.set(PPC::R31);
@@ -1287,10 +1287,10 @@ Index: contrib/llvm/lib/Target/PowerPC/P
  }
  
  bool PPCRegisterInfo::hasBasePointer(const MachineFunction &MF) const {
-Index: contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h
+Index: lib/Target/PowerPC/PPCSubtarget.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h	(working copy)
+--- lib/Target/PowerPC/PPCSubtarget.h	(revision 270019)
++++ lib/Target/PowerPC/PPCSubtarget.h	(working copy)
 @@ -189,6 +189,9 @@
    /// isBGQ - True if this is a BG/Q platform.
    bool isBGQ() const { return TargetTriple.getVendor() == Triple::BGQ; }

Copied: projects/sendfile/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff (from r271387, head/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff	Wed Sep 10 12:55:34 2014	(r271388, copy of r271387, head/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff)
@@ -0,0 +1,14 @@
+Index: lib/Target/ARM/ARMInstrInfo.td
+===================================================================
+--- lib/Target/ARM/ARMInstrInfo.td	(revision 271024)
++++ lib/Target/ARM/ARMInstrInfo.td	(revision 271026)
+@@ -3248,7 +3248,8 @@
+ def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR),
+              (SBCri   GPR:$src, so_imm_not:$imm)>;
+ def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR),
+-             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>;
++             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>,
++             Requires<[IsARM, HasV6T2]>;
+ 
+ // Note: These are implemented in C++ code, because they have to generate
+ // ADD/SUBrs instructions, which use a complex pattern that a xform function

Copied: projects/sendfile/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff (from r271387, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff	Wed Sep 10 12:55:34 2014	(r271388, copy of r271387, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff)
@@ -0,0 +1,51 @@
+diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
+index 59ba47c..dddc7e7 100644
+--- a/lib/CodeGen/CGDebugInfo.cpp
++++ b/lib/CodeGen/CGDebugInfo.cpp
+@@ -2251,9 +2251,10 @@ llvm::DICompositeType CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
+   if (T && (!T.isForwardDecl() || !RD->getDefinition()))
+       return T;
+ 
+-  // If this is just a forward declaration, construct an appropriately
+-  // marked node and just return it.
+-  if (!RD->getDefinition())
++  // If this is just a forward or incomplete declaration, construct an
++  // appropriately marked node and just return it.
++  const RecordDecl *D = RD->getDefinition();
++  if (!D || !D->isCompleteDefinition())
+     return getOrCreateRecordFwdDecl(Ty, RDContext);
+ 
+   uint64_t Size = CGM.getContext().getTypeSize(Ty);
+diff --git a/test/CodeGenCXX/debug-info-template-fwd.cpp b/test/CodeGenCXX/debug-info-template-fwd.cpp
+new file mode 100644
+index 0000000..b2b7073
+--- /dev/null
++++ b/test/CodeGenCXX/debug-info-template-fwd.cpp
+@@ -0,0 +1,27 @@
++// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -g -emit-llvm -o - | FileCheck %s
++// This test is for a crash when emitting debug info for not-yet-completed
++// types.
++// Test that we don't actually emit a forward decl for the offending class:
++// CHECK:  [ DW_TAG_structure_type ] [Derived<int>] {{.*}} [def]
++// rdar://problem/15931354
++template <class A> class Derived;
++
++template <class A> class Base {
++  static Derived<A> *create();
++};
++
++template <class A> struct Derived : Base<A> {
++};
++
++Base<int> *f;
++
++// During the instantiation of Derived<int>, Base<int> becomes required to be
++// complete - since the declaration has already been emitted (due to 'f',
++// above), we immediately try to build debug info for Base<int> which then
++// requires the (incomplete definition) of Derived<int> which is problematic.
++//
++// (if 'f' is not present, the point at which Base<int> becomes required to be
++// complete during the instantiation of Derived<int> is a no-op because
++// Base<int> was never emitted so we ignore it and carry on until we
++// wire up the base class of Derived<int> in the debug info later on)
++Derived<int> d;

Modified: projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Wed Sep 10 12:55:34 2014	(r271388)
@@ -2235,9 +2235,10 @@ llvm::DICompositeType CGDebugInfo::Creat
   if (T && (!T.isForwardDecl() || !RD->getDefinition()))
       return T;
 
-  // If this is just a forward declaration, construct an appropriately
-  // marked node and just return it.
-  if (!RD->getDefinition())
+  // If this is just a forward or incomplete declaration, construct an
+  // appropriately marked node and just return it.
+  const RecordDecl *D = RD->getDefinition();
+  if (!D || !D->isCompleteDefinition())
     return getOrCreateRecordFwdDecl(Ty, RDContext);
 
   uint64_t Size = CGM.getContext().getTypeSize(Ty);

Modified: projects/sendfile/contrib/smbfs/lib/smb/ctx.c
==============================================================================
--- projects/sendfile/contrib/smbfs/lib/smb/ctx.c	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/smbfs/lib/smb/ctx.c	Wed Sep 10 12:55:34 2014	(r271388)
@@ -191,10 +191,6 @@ smb_ctx_parseunc(struct smb_ctx *ctx, co
 			smb_error("no user name required", 0);
 			return EINVAL;
 		}
-		if (*p1 == 0) {
-			smb_error("empty user name", 0);
-			return EINVAL;
-		}
 		error = smb_ctx_setuser(ctx, tmp);
 		if (error)
 			return error;
@@ -521,11 +517,6 @@ smb_ctx_resolve(struct smb_ctx *ctx)
 		smb_error("no server name specified", 0);
 		return EINVAL;
 	}
-	if (ssn->ioc_user[0] == 0) {
-		smb_error("no user name specified for server %s",
-		    0, ssn->ioc_srvname);
-		return EINVAL;
-	}
 	if (ctx->ct_minlevel >= SMBL_SHARE && sh->ioc_share[0] == 0) {
 		smb_error("no share name specified for %s@%s",
 		    0, ssn->ioc_user, ssn->ioc_srvname);

Modified: projects/sendfile/contrib/smbfs/mount_smbfs/mount_smbfs.c
==============================================================================
--- projects/sendfile/contrib/smbfs/mount_smbfs/mount_smbfs.c	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/contrib/smbfs/mount_smbfs/mount_smbfs.c	Wed Sep 10 12:55:34 2014	(r271388)
@@ -81,7 +81,7 @@ main(int argc, char *argv[])
 #else
 	struct xvfsconf vfc;
 #endif
-	char *next;
+	char *next, *p, *val;
 	int opt, error, mntflags, caseopt, fd;
 	uid_t uid;
 	gid_t gid;
@@ -194,6 +194,13 @@ main(int argc, char *argv[])
 		    };
 		    case 'o':
 			getmntopts(optarg, mopts, &mntflags, 0);
+			p = strchr(optarg, '=');
+			val = NULL;
+			if (p != NULL) {
+				*p = '\0';
+				val = p + 1;
+			}
+			build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
 			break;
 		    case 'c':
 			switch (optarg[0]) {

Modified: projects/sendfile/crypto/heimdal/tools/krb5-config.in
==============================================================================
--- projects/sendfile/crypto/heimdal/tools/krb5-config.in	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/crypto/heimdal/tools/krb5-config.in	Wed Sep 10 12:55:34 2014	(r271388)
@@ -123,7 +123,7 @@ if test "$do_libs" = "yes"; then
     lib_flags="-L${libdir}"
     case $library in
     gssapi)
-	lib_flags="$lib_flags -lgssapi -lheimntlm"
+	lib_flags="$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm"
 	;;
     kadm-client)
 	lib_flags="$lib_flags -lkadm5clnt"

Modified: projects/sendfile/etc/mtree/BSD.root.dist
==============================================================================
--- projects/sendfile/etc/mtree/BSD.root.dist	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/etc/mtree/BSD.root.dist	Wed Sep 10 12:55:34 2014	(r271388)
@@ -10,6 +10,8 @@
     boot
         defaults
         ..
+        dtb
+        ..
         firmware
         ..
         kernel

Modified: projects/sendfile/etc/periodic/daily/110.clean-tmps
==============================================================================
--- projects/sendfile/etc/periodic/daily/110.clean-tmps	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/etc/periodic/daily/110.clean-tmps	Wed Sep 10 12:55:34 2014	(r271388)
@@ -45,8 +45,8 @@ case "$daily_clean_tmps_enable" in
 	    rc=$(for dir in $daily_clean_tmps_dirs
 		do
 		    [ ."${dir#/}" != ."$dir" -a -d $dir ] && cd $dir && {
-			find -d . -type f $args -delete $print
-			find -d . ! -name . -type d $dargs -delete $print
+			find -x -d . -type f $args -delete $print
+			find -x -d . ! -name . -type d $dargs -delete $print
 		    } | sed "s,^\\.,  $dir,"
 		done | tee /dev/stderr | wc -l)
 	    [ -z "$print" ] && rc=0

Modified: projects/sendfile/etc/rc.d/jail
==============================================================================
--- projects/sendfile/etc/rc.d/jail	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/etc/rc.d/jail	Wed Sep 10 12:55:34 2014	(r271388)
@@ -207,6 +207,10 @@ parse_options()
 		extract_var $_j consolelog exec.consolelog - \
 		    /var/log/jail_${_j}_console.log
 
+		if [ -r $_fstab ]; then
+			echo "	mount.fstab = \"$_fstab\";"
+		fi
+
 		eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}}
 		if checkyesno jail_${_j}_devfs_enable; then
 			echo "	mount.devfs;"
@@ -222,11 +226,7 @@ parse_options()
 			;;
 			*)	warn "devfs_ruleset must be an integer." ;;
 			esac
-			if [ -r $_fstab ]; then
-				echo "	mount.fstab = \"$_fstab\";"
-			fi
 		fi
-
 		eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
 		if checkyesno jail_${_j}_fdescfs_enable; then
 			echo "	mount.fdescfs;"
@@ -319,10 +319,8 @@ jail_extract_address()
 		_mask=${_mask:-/32}
 
 	elif [ "${_type}" = "inet6" ]; then
-		# In case _maske is not set for IPv6, use /128.
+		# In case _mask is not set for IPv6, use /128.
 		_mask=${_mask:-/128}
-		warn "$_type $_addr: an IPv6 address should always be " \
-		    "specified with a prefix length.  /128 is used."
 	fi
 }
 

Modified: projects/sendfile/etc/rc.d/syscons
==============================================================================
--- projects/sendfile/etc/rc.d/syscons	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/etc/rc.d/syscons	Wed Sep 10 12:55:34 2014	(r271388)
@@ -45,16 +45,122 @@ stop_cmd=":"
 kbddev=/dev/ttyv0
 viddev=/dev/ttyv0
 
-_sc_config="syscons"
+_sc_config=
+_sc_console=
 _sc_initdone=
+_sc_keymap_msg=
 sc_init()
 {
 	if [ -z "${_sc_initdone}" ]; then
+		if [ -z "${_sc_console}" ]; then
+			if [ x`sysctl -n kern.vty` = x"vt" ]; then
+				_sc_console="vt"
+			else
+				_sc_console="syscons"
+			fi
+			_sc_config="${_sc_console}"
+		fi
 		echo -n "Configuring ${_sc_config}:"
 		_sc_initdone=yes
 	fi
 }
 
+# syscons to vt migration helper
+lookup_keymap_for_vt()
+{
+	keymap=`basename $1 .kbd`
+	case $keymap in
+hy.armscii-8)			echo am;;
+be.iso.acc)			echo be.acc;;
+be.iso)				echo be;;
+bg.bds.ctrlcaps)		echo bg.bds;;
+bg.phonetic.ctrlcaps)		echo bg.phonetic;;
+br275.iso.acc)			echo br;;
+br275.*)			echo br.noacc;;
+by.*)				echo by;;
+fr_CA.iso.acc)			echo ca-fr;;
+swissgerman.macbook.acc)	echo ch.macbook.acc;;
+swissgerman.iso.acc)		echo ch.acc;;
+swissgerman.*)			echo ch;;
+swissfrench.iso.acc)		echo ch-fr.acc;;
+swissfrench.*)			echo ch-fr;;
+ce.iso2)			echo centraleuropean.qwerty;;
+colemak.iso15.acc)		echo colemak.acc;;
+cs.*|cz.*)			echo cz;;
+german.iso.acc)			echo de.acc;;
+german.*)			echo de;;
+danish.iso.acc)			echo dk.acc;;
+danish.iso.macbook)		echo dk.macbook;;
+danish.*)			echo dk;;
+estonian.*)			echo ee;;
+spanish.dvorak)			echo es.dvorak;;
+spanish.iso*.acc)		echo es.acc;;
+spanish.iso)			echo es;;
+finnish.*)			echo fi;;
+fr.macbook.acc)			echo fr.macbook;;
+fr.iso.acc)			echo fr.acc;;
+fr.iso)				echo fr;;
+el.iso07)			echo gr;;
+gr.us101.acc)			echo gr.101.acc;;
+hr.iso)				echo hr;;
+hu.iso2.101keys)		echo hu.101;;
+hu.iso2.102keys)		echo hu.102;;
+iw.iso8)			echo il;;
+icelandic.iso.acc)		echo is.acc;;
+icelandic.iso)			echo is;;
+it.iso)				echo it;;
+jp.106x)			echo jp.capsctrl;;
+jp.106)				echo jp;;
+#?? jp.pc98.iso)		echo jp.pc98;;
+kk.pt154.io)			echo kz.io;;
+kk.pt154.kst)			echo kz.kst;;
+latinamerican.iso.acc)		echo latinamerican.acc;;
+lt.iso4)			echo lt;;
+norwegian.iso)			echo no;;
+norwegian.dvorak)		echo no.dvorak;;
+dutch.iso.acc)			echo nl;;
+eee_nordic)			echo nordic.asus-eee;;
+pl_PL.dvorak)			echo pl.dvorak;;
+pl_PL.ISO8859-2)		echo pl;;
+pt.iso.acc)			echo pt.acc;;
+pt.iso)				echo pt;;
+ru.koi8-r.shift)		echo ru.shift;;
+ru.koi8-r.win)			echo ru.win;;
+ru.*)				echo ru;;
+swedish.*)			echo se;;
+si.iso)				echo si;;
+sk.iso2)			echo sk;;
+tr.iso9.q)			echo tr;;
+ua.koi8-u.shift.alt)		echo ua.shift.alt;;
+ua.*)				echo ua;;
+uk.*-ctrl)			echo uk.capsctrl;;
+uk.dvorak)			echo uk.dvorak;;
+uk.*)				echo uk;;
+us.iso.acc)			echo us.acc;;
+us.pc-ctrl)			echo us.ctrl;;
+us.iso)				echo us;;
+    esac
+}
+
+kbdcontrol_load_keymap()
+{
+	errmsg=`kbdcontrol < ${kbddev} -l ${keymap} 2>&1`
+	if [ -n "${errmsg}" -a "${_sc_console}" = "vt" ]; then
+		_sc_keymap_msg="${errmsg}"
+		keymap_vt=`lookup_keymap_for_vt ${keymap}`
+		if [ -n "${keymap_vt}" ]; then
+			errmsg=`kbdcontrol < ${kbddev} -l ${keymap_vt} 2>&1`
+			if [ -z "${errmsg}" ]; then
+		    		_sc_keymap_msg="New keymap: In /etc/rc.conf replace 'keymap=${keymap}' by 'keymap=${keymap_vt}'"
+			fi
+		else
+			_sc_keymap_msg="No replacement found for keymap '${keymap}'.
+You may try to convert your keymap file using 'convert-keymap.pl', which is
+part of the system sources and located in /usr/src/tools/tools/vt/keymaps/"
+		fi
+	fi
+}
+
 # helper
 syscons_configure_keyboard()
 {
@@ -65,7 +171,7 @@ syscons_configure_keyboard()
 		;;
 	*)
 		sc_init
-		echo -n ' keymap';	kbdcontrol < ${kbddev} -l ${keymap}
+		echo -n ' keymap';	kbdcontrol_load_keymap
 		;;
 	esac
 
@@ -139,10 +245,9 @@ syscons_setkeyboard()
 	#
 	if [ -n "${_sc_initdone}" ]; then
 		echo '.'
-		_sc_config="syscons"
+		_sc_config="${_sc_console}"
 		_sc_initdone=
 	fi
-
 }
 
 syscons_precmd()
@@ -256,6 +361,12 @@ syscons_start()
 	fi
 
 	[ -n "${_sc_initdone}" ] && echo '.'
+	if [ -n "${_sc_keymap_msg}" ]; then
+		echo
+		echo "WARNING:"
+		echo "${_sc_keymap_msg}."
+		echo
+	fi
 }
 
 load_rc_config $name

Modified: projects/sendfile/include/pthread.h
==============================================================================
--- projects/sendfile/include/pthread.h	Wed Sep 10 12:36:41 2014	(r271387)
+++ projects/sendfile/include/pthread.h	Wed Sep 10 12:55:34 2014	(r271388)
@@ -193,8 +193,10 @@ int		pthread_cond_init(pthread_cond_t *,
 			const pthread_condattr_t *);
 int		pthread_cond_signal(pthread_cond_t *);
 int		pthread_cond_timedwait(pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec *);
-int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
+			pthread_mutex_t *__mutex, const struct timespec *)
+		    __requires_exclusive(*__mutex);
+int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *__mutex)
+		    __requires_exclusive(*__mutex);
 int		pthread_create(pthread_t *, const pthread_attr_t *,
 			void *(*) (void *), void *);
 int		pthread_detach(pthread_t);
@@ -213,27 +215,42 @@ int		pthread_mutexattr_getpshared(const 
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int		pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
-int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init(pthread_mutex_t *,
-			const pthread_mutexattr_t *);
-int		pthread_mutex_lock(pthread_mutex_t *);
-int		pthread_mutex_trylock(pthread_mutex_t *);
-int		pthread_mutex_timedlock(pthread_mutex_t *,
-			const struct timespec *);
-int		pthread_mutex_unlock(pthread_mutex_t *);
+int		pthread_mutex_destroy(pthread_mutex_t *__mutex)
+		    __requires_unlocked(*__mutex);
+int		pthread_mutex_init(pthread_mutex_t *__mutex,
+			const pthread_mutexattr_t *)
+		    __requires_unlocked(*__mutex);
+int		pthread_mutex_lock(pthread_mutex_t *__mutex)
+                    __locks_exclusive(*__mutex);
+int		pthread_mutex_trylock(pthread_mutex_t *__mutex)
+                    __trylocks_exclusive(0, *__mutex);
+int		pthread_mutex_timedlock(pthread_mutex_t *__mutex,
+			const struct timespec *)
+                    __trylocks_exclusive(0, *__mutex);
+int		pthread_mutex_unlock(pthread_mutex_t *__mutex)
+		    __unlocks(*__mutex);
 int		pthread_once(pthread_once_t *, void (*) (void));
-int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init(pthread_rwlock_t *,
-			const pthread_rwlockattr_t *);
-int		pthread_rwlock_rdlock(pthread_rwlock_t *);

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

More information about the svn-src-projects mailing list