svn commit: r304538 - in projects/clang390-import: . cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/lib/libzfs/common contrib/dma etc lib/clang lib/libc lib/libc/aarch64/sys lib/libc/...

Sat Aug 20 18:52:10 UTC 2016

Author: dim
Date: Sat Aug 20 18:52:03 2016
New Revision: 304538
URL: https://svnweb.freebsd.org/changeset/base/304538

Log:
  Merge ^/head r304236 through r304536.

Added:
  projects/clang390-import/lib/libc/x86/
     - copied from r304536, head/lib/libc/x86/
  projects/clang390-import/secure/lib/libcrypto/opensslconf-aarch64.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-aarch64.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-arm.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-arm.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-mips.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-mips.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-powerpc.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-powerpc.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-riscv.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-riscv.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-sparc64.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-sparc64.h.in
  projects/clang390-import/secure/lib/libcrypto/opensslconf-x86.h.in
     - copied unchanged from r304536, head/secure/lib/libcrypto/opensslconf-x86.h.in
  projects/clang390-import/sys/arm/allwinner/a10/a10_padconf.c
     - copied unchanged from r304536, head/sys/arm/allwinner/a10/a10_padconf.c
  projects/clang390-import/sys/arm/allwinner/a10/files.a10
     - copied unchanged from r304536, head/sys/arm/allwinner/a10/files.a10
  projects/clang390-import/sys/arm/allwinner/aw_machdep.c
     - copied unchanged from r304536, head/sys/arm/allwinner/aw_machdep.c
  projects/clang390-import/sys/arm/allwinner/aw_machdep.h
     - copied unchanged from r304536, head/sys/arm/allwinner/aw_machdep.h
  projects/clang390-import/sys/arm/allwinner/files.allwinner_up
     - copied unchanged from r304536, head/sys/arm/allwinner/files.allwinner_up
  projects/clang390-import/sys/arm/allwinner/std.allwinner_up
     - copied unchanged from r304536, head/sys/arm/allwinner/std.allwinner_up
  projects/clang390-import/sys/arm/conf/ALLWINNER_UP
     - copied unchanged from r304536, head/sys/arm/conf/ALLWINNER_UP
  projects/clang390-import/sys/cddl/boot/zfs/skein_zfs.c
     - copied unchanged from r304536, head/sys/cddl/boot/zfs/skein_zfs.c
  projects/clang390-import/sys/contrib/cloudabi/syscalls64.master
     - copied unchanged from r304536, head/sys/contrib/cloudabi/syscalls64.master
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram.c
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_cfe.c
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_cfe.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_common.c
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_common.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_common.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_common.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_parser.c
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_parser.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_parser.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_parser.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_parserreg.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_parserreg.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_parservar.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvram_parservar.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvramvar.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_nvramvar.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_sprom_parser.c
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_sprom_parser.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_sprom_parser.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_sprom_parser.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_sprom_parservar.h
     - copied unchanged from r304536, head/sys/dev/bhnd/nvram/bhnd_sprom_parservar.h
  projects/clang390-import/sys/dev/qlxgbe/ql_minidump.h
     - copied unchanged from r304536, head/sys/dev/qlxgbe/ql_minidump.h
Deleted:
  projects/clang390-import/lib/libc/amd64/sys/__vdso_gettc.c
  projects/clang390-import/lib/libc/i386/sys/__vdso_gettc.c
  projects/clang390-import/secure/lib/libcrypto/opensslconf-aarch64.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-arm.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-mips.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-powerpc.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-riscv.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-sparc64.h
  projects/clang390-import/secure/lib/libcrypto/opensslconf-x86.h
  projects/clang390-import/share/man/man4/man4.i386/ie.4
  projects/clang390-import/share/man/man4/man4.i386/wl.4
  projects/clang390-import/share/man/man4/scd.4
  projects/clang390-import/share/man/man4/si.4
  projects/clang390-import/share/man/man4/spic.4
  projects/clang390-import/sys/arm/allwinner/a10_padconf.c
  projects/clang390-import/sys/arm/allwinner/allwinner_machdep.c
  projects/clang390-import/sys/arm/allwinner/allwinner_machdep.h
  projects/clang390-import/sys/arm/allwinner/files.a10
  projects/clang390-import/sys/arm/allwinner/std.a10
  projects/clang390-import/sys/arm/conf/A10
  projects/clang390-import/sys/contrib/cloudabi/syscalls.master
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_sprom_subr.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_spromreg.h
  projects/clang390-import/sys/dev/bhnd/nvram/nvram_subr.c
  projects/clang390-import/sys/dev/bhnd/nvram/nvramvar.h
  projects/clang390-import/sys/dev/ie/
  projects/clang390-import/sys/dev/scd/
  projects/clang390-import/sys/dev/si/
  projects/clang390-import/sys/dev/wds/
  projects/clang390-import/sys/dev/wl/
  projects/clang390-import/sys/i386/isa/spic.c
  projects/clang390-import/sys/i386/isa/spicreg.h
  projects/clang390-import/sys/modules/ie/
  projects/clang390-import/sys/modules/scd/
  projects/clang390-import/sys/modules/si/
  projects/clang390-import/sys/modules/wds/
  projects/clang390-import/sys/modules/wl/
  projects/clang390-import/tools/kerneldoc/subsys/Doxyfile-dev_mcd
  projects/clang390-import/tools/kerneldoc/subsys/Doxyfile-dev_scd
  projects/clang390-import/tools/kerneldoc/subsys/Doxyfile-dev_si
  projects/clang390-import/tools/kerneldoc/subsys/Doxyfile-dev_wds
  projects/clang390-import/tools/kerneldoc/subsys/Doxyfile-dev_wl
  projects/clang390-import/usr.sbin/sicontrol/
  projects/clang390-import/usr.sbin/wlconfig/
Modified:
  projects/clang390-import/ObsoleteFiles.inc
  projects/clang390-import/UPDATING
  projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/clang390-import/contrib/dma/VERSION
  projects/clang390-import/contrib/dma/dma-mbox-create.c
  projects/clang390-import/contrib/dma/dma.c
  projects/clang390-import/contrib/dma/dma.h
  projects/clang390-import/contrib/dma/dns.c
  projects/clang390-import/contrib/dma/local.c
  projects/clang390-import/contrib/dma/net.c
  projects/clang390-import/etc/devd.conf
  projects/clang390-import/lib/clang/freebsd_cc_version.h
  projects/clang390-import/lib/libc/Makefile
  projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc
  projects/clang390-import/lib/libc/aarch64/sys/__vdso_gettc.c
  projects/clang390-import/lib/libc/amd64/sys/Makefile.inc
  projects/clang390-import/lib/libc/arm/sys/Makefile.inc
  projects/clang390-import/lib/libc/arm/sys/__vdso_gettc.c
  projects/clang390-import/lib/libc/gen/sem_timedwait.3
  projects/clang390-import/lib/libc/i386/sys/Makefile.inc
  projects/clang390-import/lib/libc/mips/sys/Makefile.inc
  projects/clang390-import/lib/libc/net/inet_net.3
  projects/clang390-import/lib/libc/powerpc/sys/Makefile.inc
  projects/clang390-import/lib/libc/powerpc64/sys/Makefile.inc
  projects/clang390-import/lib/libc/riscv/sys/Makefile.inc
  projects/clang390-import/lib/libc/sparc64/sys/Makefile.inc
  projects/clang390-import/lib/libc/sys/Makefile.inc
  projects/clang390-import/lib/libc/sys/Symbol.map
  projects/clang390-import/lib/libc/sys/__vdso_gettimeofday.c
  projects/clang390-import/lib/libc/sys/aio_fsync.2
  projects/clang390-import/lib/libc/sys/aio_mlock.2
  projects/clang390-import/lib/libc/sys/aio_read.2
  projects/clang390-import/lib/libc/sys/aio_write.2
  projects/clang390-import/lib/libc/sys/bind.2
  projects/clang390-import/lib/libc/sys/connect.2
  projects/clang390-import/lib/libc/sys/fsync.2
  projects/clang390-import/lib/libc/sys/listen.2
  projects/clang390-import/lib/libc/sys/recv.2
  projects/clang390-import/lib/libc/sys/send.2
  projects/clang390-import/lib/libc/sys/socket.2
  projects/clang390-import/lib/libc/sys/trivial-vdso_tc.c
  projects/clang390-import/libexec/dma/Makefile.inc
  projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/clang390-import/sbin/fsck_ffs/fsck.h
  projects/clang390-import/sbin/fsck_ffs/globs.c
  projects/clang390-import/sbin/fsck_ffs/main.c
  projects/clang390-import/sbin/fsck_ffs/setup.c
  projects/clang390-import/secure/lib/libcrypto/Makefile
  projects/clang390-import/secure/lib/libcrypto/Makefile.asm
  projects/clang390-import/secure/lib/libcrypto/Makefile.inc
  projects/clang390-import/share/man/man4/Makefile
  projects/clang390-import/share/man/man4/man4.i386/Makefile
  projects/clang390-import/share/man/man4/rights.4
  projects/clang390-import/sys/amd64/conf/NOTES
  projects/clang390-import/sys/arm/allwinner/a10_ehci.c
  projects/clang390-import/sys/arm/allwinner/a10_gpio.c
  projects/clang390-import/sys/arm/allwinner/a10_mmc.c
  projects/clang390-import/sys/arm/allwinner/aw_if_dwc.c
  projects/clang390-import/sys/arm/allwinner/aw_mp.c
  projects/clang390-import/sys/arm/allwinner/aw_rtc.c
  projects/clang390-import/sys/arm/allwinner/clk/aw_pll.c
  projects/clang390-import/sys/arm/allwinner/files.allwinner
  projects/clang390-import/sys/arm/allwinner/if_emac.c
  projects/clang390-import/sys/arm/allwinner/timer.c
  projects/clang390-import/sys/arm/arm/elf_trampoline.c
  projects/clang390-import/sys/arm/arm/generic_timer.c
  projects/clang390-import/sys/arm/arm/machdep.c
  projects/clang390-import/sys/arm/arm/nexus.c
  projects/clang390-import/sys/arm/include/md_var.h
  projects/clang390-import/sys/arm/include/vdso.h
  projects/clang390-import/sys/arm/nvidia/tegra_lic.c
  projects/clang390-import/sys/arm/nvidia/tegra_pcie.c
  projects/clang390-import/sys/arm/ti/omap4/omap4_wugen.c
  projects/clang390-import/sys/arm64/arm64/machdep.c
  projects/clang390-import/sys/arm64/arm64/nexus.c
  projects/clang390-import/sys/arm64/include/md_var.h
  projects/clang390-import/sys/arm64/include/vdso.h
  projects/clang390-import/sys/boot/common/boot.c
  projects/clang390-import/sys/boot/common/bootstrap.h
  projects/clang390-import/sys/boot/common/commands.c
  projects/clang390-import/sys/boot/common/interp.c
  projects/clang390-import/sys/boot/common/ls.c
  projects/clang390-import/sys/boot/common/module.c
  projects/clang390-import/sys/boot/efi/boot1/Makefile
  projects/clang390-import/sys/boot/efi/boot1/boot1.c
  projects/clang390-import/sys/boot/efi/boot1/ufs_module.c
  projects/clang390-import/sys/boot/efi/boot1/zfs_module.c
  projects/clang390-import/sys/boot/efi/loader/Makefile
  projects/clang390-import/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/clang390-import/sys/boot/fdt/dts/arm/bananapi.dts
  projects/clang390-import/sys/boot/fdt/fdt_loader_cmd.c
  projects/clang390-import/sys/boot/i386/boot2/Makefile
  projects/clang390-import/sys/boot/i386/gptboot/Makefile
  projects/clang390-import/sys/boot/i386/gptboot/gptldr.S
  projects/clang390-import/sys/boot/i386/gptzfsboot/Makefile
  projects/clang390-import/sys/boot/i386/zfsboot/Makefile
  projects/clang390-import/sys/boot/i386/zfsboot/zfsboot.c
  projects/clang390-import/sys/boot/i386/zfsboot/zfsldr.S
  projects/clang390-import/sys/boot/userboot/ficl/Makefile
  projects/clang390-import/sys/boot/userboot/userboot/Makefile
  projects/clang390-import/sys/boot/userboot/zfs/Makefile
  projects/clang390-import/sys/boot/zfs/Makefile
  projects/clang390-import/sys/boot/zfs/zfsimpl.c
  projects/clang390-import/sys/cam/cam.c
  projects/clang390-import/sys/cddl/boot/zfs/fletcher.c
  projects/clang390-import/sys/cddl/boot/zfs/sha256.c
  projects/clang390-import/sys/cddl/boot/zfs/zfsimpl.h
  projects/clang390-import/sys/cddl/boot/zfs/zfssubr.c
  projects/clang390-import/sys/compat/cloudabi/cloudabi_thread.c
  projects/clang390-import/sys/compat/cloudabi64/Makefile
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/clang390-import/sys/compat/freebsd32/freebsd32_proto.h
  projects/clang390-import/sys/compat/freebsd32/freebsd32_syscall.h
  projects/clang390-import/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/clang390-import/sys/compat/freebsd32/freebsd32_sysent.c
  projects/clang390-import/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/clang390-import/sys/compat/freebsd32/syscalls.master
  projects/clang390-import/sys/conf/NOTES
  projects/clang390-import/sys/conf/files
  projects/clang390-import/sys/conf/files.i386
  projects/clang390-import/sys/conf/options
  projects/clang390-import/sys/contrib/cloudabi/cloudabi64_types.h
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_types.h
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_types_common.h
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_aarch64.c
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_x86_64.c
  projects/clang390-import/sys/dev/acpica/acpi_hpet.c
  projects/clang390-import/sys/dev/acpica/acpi_hpet.h
  projects/clang390-import/sys/dev/ahci/ahci_pci.c
  projects/clang390-import/sys/dev/bhnd/bhnd.c
  projects/clang390-import/sys/dev/bhnd/bhnd.h
  projects/clang390-import/sys/dev/bhnd/bhnd_bus_if.m
  projects/clang390-import/sys/dev/bhnd/bhnd_subr.c
  projects/clang390-import/sys/dev/bhnd/bhnd_types.h
  projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_private.h
  projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_subr.c
  projects/clang390-import/sys/dev/bhnd/bhndvar.h
  projects/clang390-import/sys/dev/bhnd/cores/chipc/chipc.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram.h
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_nvram_if.m
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_sprom.c
  projects/clang390-import/sys/dev/bhnd/nvram/bhnd_spromvar.h
  projects/clang390-import/sys/dev/bhnd/tools/nvram_map_gen.awk
  projects/clang390-import/sys/dev/bwn/bwn_mac.c
  projects/clang390-import/sys/dev/cxgbe/common/common.h
  projects/clang390-import/sys/dev/cxgbe/common/t4_hw.c
  projects/clang390-import/sys/dev/cxgbe/t4_main.c
  projects/clang390-import/sys/dev/fdt/simplebus.c
  projects/clang390-import/sys/dev/gpio/gpiobus.c
  projects/clang390-import/sys/dev/gpio/gpiobusvar.h
  projects/clang390-import/sys/dev/gpio/ofw_gpiobus.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis.h
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.h
  projects/clang390-import/sys/dev/hyperv/netvsc/if_hnreg.h
  projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h
  projects/clang390-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/clang390-import/sys/dev/hyperv/storvsc/hv_vstorage.h
  projects/clang390-import/sys/dev/hyperv/utilities/hv_heartbeat.c
  projects/clang390-import/sys/dev/hyperv/utilities/hv_kvp.c
  projects/clang390-import/sys/dev/hyperv/utilities/hv_shutdown.c
  projects/clang390-import/sys/dev/hyperv/utilities/hv_timesync.c
  projects/clang390-import/sys/dev/hyperv/utilities/hv_util.c
  projects/clang390-import/sys/dev/hyperv/utilities/hv_util.h
  projects/clang390-import/sys/dev/iicbus/ofw_iicbus.c
  projects/clang390-import/sys/dev/ixl/if_ixlv.c
  projects/clang390-import/sys/dev/ofw/ofw_bus_subr.c
  projects/clang390-import/sys/dev/ofw/ofw_bus_subr.h
  projects/clang390-import/sys/dev/ofw/ofwbus.c
  projects/clang390-import/sys/dev/pci/pci_host_generic.c
  projects/clang390-import/sys/dev/pci/pci_pci.c
  projects/clang390-import/sys/dev/qlxgbe/ql_boot.c
  projects/clang390-import/sys/dev/qlxgbe/ql_dbg.h
  projects/clang390-import/sys/dev/qlxgbe/ql_def.h
  projects/clang390-import/sys/dev/qlxgbe/ql_fw.c
  projects/clang390-import/sys/dev/qlxgbe/ql_glbl.h
  projects/clang390-import/sys/dev/qlxgbe/ql_hw.c
  projects/clang390-import/sys/dev/qlxgbe/ql_hw.h
  projects/clang390-import/sys/dev/qlxgbe/ql_ioctl.c
  projects/clang390-import/sys/dev/qlxgbe/ql_ioctl.h
  projects/clang390-import/sys/dev/qlxgbe/ql_isr.c
  projects/clang390-import/sys/dev/qlxgbe/ql_minidump.c
  projects/clang390-import/sys/dev/qlxgbe/ql_os.c
  projects/clang390-import/sys/dev/qlxgbe/ql_reset.c
  projects/clang390-import/sys/dev/qlxgbe/ql_ver.h
  projects/clang390-import/sys/dev/usb/net/if_axge.c
  projects/clang390-import/sys/dev/usb/net/if_axgereg.h
  projects/clang390-import/sys/dev/vnic/mrml_bridge.c
  projects/clang390-import/sys/dev/vnic/thunder_mdio_fdt.c
  projects/clang390-import/sys/dev/vt/vt_core.c
  projects/clang390-import/sys/i386/conf/NOTES
  projects/clang390-import/sys/kern/bus_if.m
  projects/clang390-import/sys/kern/capabilities.conf
  projects/clang390-import/sys/kern/init_sysent.c
  projects/clang390-import/sys/kern/kern_fork.c
  projects/clang390-import/sys/kern/kern_sig.c
  projects/clang390-import/sys/kern/kern_tc.c
  projects/clang390-import/sys/kern/kern_timeout.c
  projects/clang390-import/sys/kern/pic_if.m
  projects/clang390-import/sys/kern/subr_bus.c
  projects/clang390-import/sys/kern/subr_intr.c
  projects/clang390-import/sys/kern/sys_generic.c
  projects/clang390-import/sys/kern/sys_process.c
  projects/clang390-import/sys/kern/syscalls.c
  projects/clang390-import/sys/kern/syscalls.master
  projects/clang390-import/sys/kern/systrace_args.c
  projects/clang390-import/sys/kern/vfs_aio.c
  projects/clang390-import/sys/mips/broadcom/bcm_machdep.c
  projects/clang390-import/sys/mips/conf/BCM
  projects/clang390-import/sys/mips/conf/BCM.hints
  projects/clang390-import/sys/mips/conf/SENTRY5
  projects/clang390-import/sys/mips/conf/SENTRY5.hints
  projects/clang390-import/sys/mips/mips/nexus.c
  projects/clang390-import/sys/modules/Makefile
  projects/clang390-import/sys/modules/bhnd/Makefile
  projects/clang390-import/sys/modules/dtb/allwinner/Makefile
  projects/clang390-import/sys/net/if_epair.c
  projects/clang390-import/sys/net/netisr.c
  projects/clang390-import/sys/net80211/ieee80211_ioctl.c
  projects/clang390-import/sys/netinet/in.c
  projects/clang390-import/sys/netinet/in.h
  projects/clang390-import/sys/netinet/ip_output.c
  projects/clang390-import/sys/netinet/udp_usrreq.c
  projects/clang390-import/sys/netpfil/ipfw/nat64/nat64_translate.c
  projects/clang390-import/sys/ofed/drivers/infiniband/core/ucma.c
  projects/clang390-import/sys/pc98/conf/NOTES
  projects/clang390-import/sys/powerpc/booke/locore.S
  projects/clang390-import/sys/sparc64/conf/NOTES
  projects/clang390-import/sys/sys/bus.h
  projects/clang390-import/sys/sys/intr.h
  projects/clang390-import/sys/sys/param.h
  projects/clang390-import/sys/sys/proc.h
  projects/clang390-import/sys/sys/syscall.h
  projects/clang390-import/sys/sys/syscall.mk
  projects/clang390-import/sys/sys/sysproto.h
  projects/clang390-import/sys/sys/timetc.h
  projects/clang390-import/sys/sys/vdso.h
  projects/clang390-import/sys/ufs/ffs/ffs_softdep.c
  projects/clang390-import/sys/ufs/ffs/softdep.h
  projects/clang390-import/sys/x86/include/vdso.h
  projects/clang390-import/sys/x86/x86/tsc.c
  projects/clang390-import/targets/pseudo/userland/Makefile.depend
  projects/clang390-import/tests/sys/kern/acct/acct_test.c
  projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang390-import/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan
  projects/clang390-import/usr.bin/netstat/inet6.c
  projects/clang390-import/usr.bin/truss/syscalls.c
  projects/clang390-import/usr.sbin/Makefile.amd64
  projects/clang390-import/usr.sbin/Makefile.i386
Directory Properties:
  projects/clang390-import/   (props changed)
  projects/clang390-import/cddl/   (props changed)
  projects/clang390-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang390-import/contrib/dma/   (props changed)
  projects/clang390-import/contrib/llvm/   (props changed)

Modified: projects/clang390-import/ObsoleteFiles.inc
==============================================================================

--- projects/clang390-import/ObsoleteFiles.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/ObsoleteFiles.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -38,6 +38,20 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160819: Remove ie(4)
+OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
+# 20160819: Remove spic(4)
+OLD_FILES+=usr/share/man/man4/spic.4.gz
+# 20160819: Remove wl(4) and wlconfig(8)
+OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
+OLD_FILES+=usr/sbin/wlconfig
+OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
+# 20160819: Remove si(4) and sicontrol(8)
+OLD_FILES+=usr/share/man/man4/si.4.gz
+OLD_FILES+=usr/sbin/sicontrol
+OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
+# 20160819: Remove scd(4)
+OLD_FILES+=usr/share/man/man4/scd.4.gz
 # 20160815: Remove mcd(4)
 OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160703: POSIXify locales with variants

Modified: projects/clang390-import/UPDATING
==============================================================================
--- projects/clang390-import/UPDATING	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/UPDATING	Sat Aug 20 18:52:03 2016	(r304538)
@@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160818:
+	The UDP receive code has been updated to only treat incoming UDP
+	packets that were addressed to an L2 broadcast address as L3
+	broadcast packets.  It is not expected that this will affect any
+	standards-conforming UDP application.  The new behaviour can be
+	disabled by setting the sysctl net.inet.udp.require_l2_bcast to
+	0.
+
+20160818:
+	Remove the openbsd_poll system call.
+        __FreeBSD_version has been bumped because of this.
+
 20160622:
 	The libc stub for the pipe(2) system call has been replaced with
 	a wrapper that calls the pipe2(2) system call and the pipe(2)

Modified: projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -93,6 +93,9 @@ static int g_flowindent;
 static int g_intr;
 static int g_impatient;
 static int g_newline;
+#ifdef __FreeBSD__
+static int g_siginfo;
+#endif
 static int g_total;
 static int g_cflags;
 static int g_oflags;
@@ -1260,6 +1263,16 @@ intr(int signo)
 		g_impatient = 1;
 }
 
+#ifdef __FreeBSD__
+static void
+siginfo(int signo __unused)
+{
+
+	g_siginfo++;
+	g_newline = 1;
+}
+#endif
+
 static void
 installsighands(void)
 {
@@ -1275,12 +1288,16 @@ installsighands(void)
 	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGTERM, &act, NULL);
 
-#ifndef illumos
+#ifdef __FreeBSD__
 	if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGPIPE, &act, NULL);
 
 	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGUSR1, &act, NULL);
+
+	act.sa_handler = siginfo;
+	if (sigaction(SIGINFO, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGINFO, &act, NULL);
 #endif
 }
 
@@ -1944,6 +1961,13 @@ main(int argc, char *argv[])
 		if (!g_intr && !done)
 			dtrace_sleep(g_dtp);
 
+#ifdef __FreeBSD__
+		if (g_siginfo) {
+			(void)dtrace_aggregate_print(g_dtp, g_ofp, NULL);
+			g_siginfo = 0;
+		}
+#endif
+
 		if (g_newline) {
 			/*
 			 * Output a newline just to make the output look

Modified: projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -1630,12 +1630,17 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl
 		assert(cl_idx < nvl_len);
 		/*
 		 * We don't want to unmount & remount the dataset when changing
-		 * its canmount property to 'on' or 'noauto'.  We only use
-		 * the changelist logic to unmount when setting canmount=off.
+		 * its canmount property.  We only use the changelist logic to
+		 * unmount when setting canmount=off for a mounted filesystem
+		 * or when setting canmount=on for an unmounted filesystem.
+		 * For all other changes to canmount property the filesystem
+		 * remains the same.
 		 */
 		if (prop != ZFS_PROP_CANMOUNT ||
 		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
-		     zfs_is_mounted(zhp, NULL))) {
+		     zfs_is_mounted(zhp, NULL)) ||
+		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_ON &&
+		     !zfs_is_mounted(zhp, NULL))) {
 			cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
 			if (cls[cl_idx] == NULL)
 				goto error;

Modified: projects/clang390-import/contrib/dma/VERSION
==============================================================================
--- projects/clang390-import/contrib/dma/VERSION	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/VERSION	Sat Aug 20 18:52:03 2016	(r304538)
@@ -1 +1 @@
-v0.10
+v0.11

Modified: projects/clang390-import/contrib/dma/dma-mbox-create.c
==============================================================================
--- projects/clang390-import/contrib/dma/dma-mbox-create.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/dma-mbox-create.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -142,7 +142,7 @@ main(int argc, char **argv)
 		logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user);
 	}
 
-	f = open(fn, O_RDONLY|O_CREAT, 0600);
+	f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600);
 	if (f < 0)
 		logfail(EX_NOINPUT, "cannt open mbox `%s'", fn);
 

Modified: projects/clang390-import/contrib/dma/dma.c
==============================================================================
--- projects/clang390-import/contrib/dma/dma.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/dma.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -321,7 +321,7 @@ deliver(struct qitem *it)
 	snprintf(errmsg, sizeof(errmsg), "unknown bounce reason");
 
 retry:
-	syslog(LOG_INFO, "trying delivery");
+	syslog(LOG_INFO, "<%s> trying delivery", it->addr);
 
 	if (it->remote)
 		error = deliver_remote(it);
@@ -331,7 +331,7 @@ retry:
 	switch (error) {
 	case 0:
 		delqueue(it);
-		syslog(LOG_INFO, "delivery successful");
+		syslog(LOG_INFO, "<%s> delivery successful", it->addr);
 		exit(EX_OK);
 
 	case 1:

Modified: projects/clang390-import/contrib/dma/dma.h
==============================================================================
--- projects/clang390-import/contrib/dma/dma.h	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/dma.h	Sat Aug 20 18:52:03 2016	(r304538)
@@ -49,7 +49,7 @@
 #define VERSION	"DragonFly Mail Agent " DMA_VERSION
 
 #define BUF_SIZE	2048
-#define ERRMSG_SIZE	200
+#define ERRMSG_SIZE	1024
 #define USERNAME_SIZE	50
 #define MIN_RETRY	300		/* 5 minutes */
 #define MAX_RETRY	(3*60*60)	/* retry at least every 3 hours */

Modified: projects/clang390-import/contrib/dma/dns.c
==============================================================================
--- projects/clang390-import/contrib/dma/dns.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/dns.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -34,6 +34,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>

Modified: projects/clang390-import/contrib/dma/local.c
==============================================================================
--- projects/clang390-import/contrib/dma/local.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/local.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -196,7 +196,7 @@ retry:
 		goto out;
 	}
 
-	error = snprintf(line, sizeof(line), "%sFrom %s\t%s", newline, sender, ctime(&now));
+	error = snprintf(line, sizeof(line), "%sFrom %s %s", newline, sender, ctime(&now));
 	if (error < 0 || (size_t)error >= sizeof(line)) {
 		syslog(LOG_NOTICE, "local delivery deferred: can not write header: %m");
 		goto out;

Modified: projects/clang390-import/contrib/dma/net.c
==============================================================================
--- projects/clang390-import/contrib/dma/net.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/contrib/dma/net.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -372,11 +372,13 @@ deliver_to_host(struct qitem *it, struct
 		       host->host, host->addr, c, neterr); \
 		snprintf(errmsg, sizeof(errmsg), "%s [%s] did not like our %s:\n%s", \
 			 host->host, host->addr, c, neterr); \
-		return (-1); \
+		error = -1; \
+		goto out; \
 	} else if (res != exp) { \
 		syslog(LOG_NOTICE, "remote delivery deferred: %s [%s] failed after %s: %s", \
 		       host->host, host->addr, c, neterr); \
-		return (1); \
+		error = 1; \
+		goto out; \
 	}
 
 	/* Check first reply from remote host */
@@ -426,7 +428,8 @@ deliver_to_host(struct qitem *it, struct
 			syslog(LOG_ERR, "remote delivery failed:"
 					" SMTP login failed: %m");
 			snprintf(errmsg, sizeof(errmsg), "SMTP login to %s failed", host->host);
-			return (-1);
+			error = -1;
+			goto out;
 		}
 		/* SMTP login is not available, so try without */
 		else if (error > 0) {

Modified: projects/clang390-import/etc/devd.conf
==============================================================================
--- projects/clang390-import/etc/devd.conf	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/etc/devd.conf	Sat Aug 20 18:52:03 2016	(r304538)
@@ -19,8 +19,8 @@ options {
 	# Setup some shorthand for regex that we use later in the file.
 	#XXX Yes, these are gross -- imp
 	set scsi-controller-regex
-		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
-		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
+		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amr|bt|ciss|ct|dpt|\
+		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm)\
 		[0-9]+";
 	set wifi-driver-regex
 		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\

Modified: projects/clang390-import/lib/clang/freebsd_cc_version.h
==============================================================================
--- projects/clang390-import/lib/clang/freebsd_cc_version.h	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/clang/freebsd_cc_version.h	Sat Aug 20 18:52:03 2016	(r304538)
@@ -1,3 +1,3 @@
 /* $FreeBSD$ */
 
-#define	FREEBSD_CC_VERSION		1200000
+#define	FREEBSD_CC_VERSION		1200002

Modified: projects/clang390-import/lib/libc/Makefile
==============================================================================
--- projects/clang390-import/lib/libc/Makefile	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/Makefile	Sat Aug 20 18:52:03 2016	(r304538)
@@ -110,6 +110,9 @@ NOASM=
      ${LIBC_ARCH} == "mips"
 .include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
 .endif
+.if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64"
+.include "${LIBC_SRCTOP}/x86/sys/Makefile.inc"
+.endif
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .include "${LIBC_SRCTOP}/yp/Makefile.inc"

Modified: projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -15,7 +15,6 @@ MDASM=	cerror.S \
 NOASM=	break.o \
 	exit.o \
 	getlogin.o \
-	openbsd_poll.o \
 	sbrk.o \
 	sstk.o \
 	vfork.o \

Modified: projects/clang390-import/lib/libc/aarch64/sys/__vdso_gettc.c
==============================================================================
--- projects/clang390-import/lib/libc/aarch64/sys/__vdso_gettc.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/aarch64/sys/__vdso_gettc.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/vdso.h>
 #include <machine/cpufunc.h>
+#include <errno.h>
 #include "libc_private.h"
 
 static inline uint64_t
@@ -55,14 +56,15 @@ cp15_cntpct_get(void)
 }
 
 #pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
+int
+__vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 {
-	uint64_t val;
 
+	if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM)
+		return (ENOSYS);
 	__asm __volatile("isb" : : : "memory");
-	val = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
-	return (val);
+	*tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
+	return (0);
 }
 
 #pragma weak __vdso_gettimekeep

Modified: projects/clang390-import/lib/libc/amd64/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/amd64/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/amd64/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 SRCS+=	amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \
-	amd64_set_gsbase.c __vdso_gettc.c
+	amd64_set_gsbase.c
 
 MDASM=	vfork.S brk.S cerror.S exect.S getcontext.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o

Modified: projects/clang390-import/lib/libc/arm/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/arm/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/arm/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -5,6 +5,6 @@ SRCS+=	__vdso_gettc.c
 MDASM= Ovfork.S brk.S cerror.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o

Modified: projects/clang390-import/lib/libc/arm/sys/__vdso_gettc.c
==============================================================================
--- projects/clang390-import/lib/libc/arm/sys/__vdso_gettc.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/arm/sys/__vdso_gettc.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vdso.h>
 #include <machine/cpufunc.h>
 #include <machine/acle-compat.h>
+#include <errno.h>
 #include "libc_private.h"
 
 #if __ARM_ARCH >= 6
@@ -58,11 +59,12 @@ cp15_cntpct_get(void)
 #endif
 
 #pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
+int
+__vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 {
-	uint64_t val;
 
+	if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM)
+		return (ENOSYS);
 #if __ARM_ARCH >= 6
 	/*
 	 * Userspace gettimeofday() is only enabled on ARMv7 CPUs, but
@@ -70,11 +72,12 @@ __vdso_gettc(const struct vdso_timehands
 	 * armv7-a directive does not work.
 	 */
 	__asm __volatile(".word\t0xf57ff06f" : : : "memory"); /* isb */
-	val = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
+	*tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
+	return (0);
 #else
-	val = 0;
+	*tc = 0;
+	return (ENOSYS);
 #endif
-	return (val);
 }
 
 #pragma weak __vdso_gettimekeep

Modified: projects/clang390-import/lib/libc/gen/sem_timedwait.3
==============================================================================
--- projects/clang390-import/lib/libc/gen/sem_timedwait.3	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/gen/sem_timedwait.3	Sat Aug 20 18:52:03 2016	(r304538)
@@ -34,18 +34,18 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 3, 2008
+.Dd August 17, 2016
 .Dt SEM_TIMEDWAIT 3
 .Os
 .Sh NAME
 .Nm sem_timedwait
 .Nd "lock a semaphore"
 .Sh LIBRARY
-.Lb libpthread
+.Lb libc
 .Sh SYNOPSIS
 .In semaphore.h
 .Ft int
-.Fn sem_timedwait "sem_t *sem" "const struct timespec *abs_timeout"
+.Fn sem_timedwait "sem_t * restrict sem" "const struct timespec * restrict abs_timeout"
 .Sh DESCRIPTION
 The
 .Fn sem_timedwait

Modified: projects/clang390-import/lib/libc/i386/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/i386/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/i386/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -5,14 +5,13 @@
 SRCS+=	i386_clr_watch.c i386_set_watch.c i386_vm86.c
 .endif
 SRCS+=	i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
-	i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \
-	__vdso_gettc.c
+	i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c
 
 MDASM=	Ovfork.S brk.S cerror.S exect.S getcontext.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
 

Modified: projects/clang390-import/lib/libc/mips/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/mips/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/mips/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -6,6 +6,6 @@ MDASM=  Ovfork.S brk.S cerror.S exect.S 
 	ptrace.S sbrk.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o

Modified: projects/clang390-import/lib/libc/net/inet_net.3
==============================================================================
--- projects/clang390-import/lib/libc/net/inet_net.3	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/net/inet_net.3	Sat Aug 20 18:52:03 2016	(r304538)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 26, 2006
+.Dd August 18, 2016
 .Dt INET_NET 3
 .Os
 .Sh NAME
@@ -42,7 +42,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .In netinet/in.h
 .In arpa/inet.h

Modified: projects/clang390-import/lib/libc/powerpc/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/powerpc/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/powerpc/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -3,6 +3,6 @@
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o

Modified: projects/clang390-import/lib/libc/powerpc64/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/powerpc64/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/powerpc64/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -3,6 +3,6 @@
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o

Modified: projects/clang390-import/lib/libc/riscv/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/riscv/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/riscv/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -13,7 +13,6 @@ MDASM=	cerror.S \
 NOASM=	break.o \
 	exit.o \
 	getlogin.o \
-	openbsd_poll.o \
 	sbrk.o \
 	sstk.o \
 	vfork.o \

Modified: projects/clang390-import/lib/libc/sparc64/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/sparc64/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sparc64/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -15,6 +15,6 @@ CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S sigaction1.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o

Modified: projects/clang390-import/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/clang390-import/lib/libc/sys/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -366,6 +366,7 @@ MLINKS+=ffclock.2 ffclock_getcounter.2 \
 	ffclock.2 ffclock_getestimate.2 \
 	ffclock.2 ffclock_setestimate.2
 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
+MLINKS+=fsync.2 fdatasync.2
 MLINKS+=getdirentries.2 getdents.2
 MLINKS+=getfh.2 lgetfh.2
 MLINKS+=getgid.2 getegid.2

Modified: projects/clang390-import/lib/libc/sys/Symbol.map
==============================================================================
--- projects/clang390-import/lib/libc/sys/Symbol.map	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/Symbol.map	Sat Aug 20 18:52:03 2016	(r304538)
@@ -34,9 +34,7 @@ FBSD_1.0 {
 	__setugid;
 	__syscall;
 	__sysctl;
-	_umtx_lock;
 	_umtx_op;
-	_umtx_unlock;
 	abort2;
 	accept;
 	access;
@@ -459,12 +457,8 @@ FBSDprivate_1.0 {
 	__sys___syscall;
 	___sysctl;
 	__sys___sysctl;
-	__umtx_lock;
-	__sys__umtx_lock;
 	__umtx_op;
 	__sys__umtx_op;
-	__umtx_unlock;
-	__sys__umtx_unlock;
 	_abort2;
 	__sys_abort2;
 	_accept;

Modified: projects/clang390-import/lib/libc/sys/__vdso_gettimeofday.c
==============================================================================
--- projects/clang390-import/lib/libc/sys/__vdso_gettimeofday.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/__vdso_gettimeofday.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -34,12 +34,16 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include "libc_private.h"
 
-static u_int
-tc_delta(const struct vdso_timehands *th)
+static int
+tc_delta(const struct vdso_timehands *th, u_int *delta)
 {
+	int error;
+	u_int tc;
 
-	return ((__vdso_gettc(th) - th->th_offset_count) &
-	    th->th_counter_mask);
+	error = __vdso_gettc(th, &tc);
+	if (error == 0)
+		*delta = (tc - th->th_offset_count) & th->th_counter_mask;
+	return (error);
 }
 
 /*
@@ -56,6 +60,8 @@ binuptime(struct bintime *bt, struct vds
 {
 	struct vdso_timehands *th;
 	uint32_t curr, gen;
+	u_int delta;
+	int error;
 
 	do {
 		if (!tk->tk_enabled)
@@ -63,11 +69,14 @@ binuptime(struct bintime *bt, struct vds
 
 		curr = atomic_load_acq_32(&tk->tk_current);
 		th = &tk->tk_th[curr];
-		if (th->th_algo != VDSO_TH_ALGO_1)
-			return (ENOSYS);
 		gen = atomic_load_acq_32(&th->th_gen);
 		*bt = th->th_offset;
-		bintime_addx(bt, th->th_scale * tc_delta(th));
+		error = tc_delta(th, &delta);
+		if (error == EAGAIN)
+			continue;
+		if (error != 0)
+			return (error);
+		bintime_addx(bt, th->th_scale * delta);
 		if (abs)
 			bintime_add(bt, &th->th_boottime);
 

Modified: projects/clang390-import/lib/libc/sys/aio_fsync.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/aio_fsync.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/aio_fsync.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2016
+.Dd August 19, 2016
 .Dt AIO_FSYNC 2
 .Os
 .Sh NAME
@@ -74,16 +74,14 @@ the call returns without having enqueued
 .Pp
 The
 .Fa iocb->aio_sigevent
-structure can be used to request notification of the request's
+structure can be used to request notification of the operation's
 completion as described in
 .Xr aio 4 .
 .Sh RESTRICTIONS
-The asynchronous I/O Control Block structure pointed to by
+The Asynchronous I/O Control Block structure pointed to by
 .Fa iocb
 must remain valid until the
 operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
 .Pp
 The asynchronous I/O control buffer
 .Fa iocb
@@ -91,9 +89,8 @@ should be zeroed before the
 .Fn aio_fsync
 call to avoid passing bogus context information to the kernel.
 .Pp
-Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
+Modification of the Asynchronous I/O Control Block structure is not allowed
+while the request is queued.
 .Sh RETURN VALUES
 .Rv -std aio_fsync
 .Sh ERRORS

Modified: projects/clang390-import/lib/libc/sys/aio_mlock.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/aio_mlock.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/aio_mlock.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2016
+.Dd August 19, 2016
 .Dt AIO_MLOCK 2
 .Os
 .Sh NAME
@@ -67,7 +67,7 @@ then the call returns without having enq
 .Pp
 The
 .Fa iocb->aio_sigevent
-structure can be used to request notification of the request's
+structure can be used to request notification of the operation's
 completion as described in
 .Xr aio 4 .
 .Sh RESTRICTIONS
@@ -77,8 +77,6 @@ and the buffer that the
 .Fa iocb->aio_buf
 member of that structure references must remain valid until the
 operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
 .Pp
 The asynchronous I/O control buffer
 .Fa iocb
@@ -87,8 +85,8 @@ should be zeroed before the
 call to avoid passing bogus context information to the kernel.
 .Pp
 Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
+memory mapping described by the virtual address range are not allowed
+while the request is queued.
 .Sh RETURN VALUES
 .Rv -std aio_mlock
 .Sh ERRORS

Modified: projects/clang390-import/lib/libc/sys/aio_read.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/aio_read.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/aio_read.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2016
+.Dd August 19, 2016
 .Dt AIO_READ 2
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@ not be referenced after the request is e
 .Pp
 The
 .Fa iocb->aio_sigevent
-structure can be used to request notification of the request's
+structure can be used to request notification of the operation's
 completion as described in
 .Xr aio 4 .
 .Sh RESTRICTIONS
@@ -92,8 +92,6 @@ and the buffer that the
 .Fa iocb->aio_buf
 member of that structure references must remain valid until the
 operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
 .Pp
 The asynchronous I/O control buffer
 .Fa iocb
@@ -102,8 +100,7 @@ should be zeroed before the
 call to avoid passing bogus context information to the kernel.
 .Pp
 Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
+buffer contents are not allowed while the request is queued.
 .Pp
 If the file offset in
 .Fa iocb->aio_offset

Modified: projects/clang390-import/lib/libc/sys/aio_write.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/aio_write.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/aio_write.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2016
+.Dd August 19, 2016
 .Dt AIO_WRITE 2
 .Os
 .Sh NAME
@@ -88,7 +88,7 @@ be referenced after the request is enque
 .Pp
 The
 .Fa iocb->aio_sigevent
-structure can be used to request notification of the request's
+structure can be used to request notification of the operation's
 completion as described in
 .Xr aio 4 .
 .Sh RESTRICTIONS
@@ -98,8 +98,6 @@ and the buffer that the
 .Fa iocb->aio_buf
 member of that structure references must remain valid until the
 operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
 .Pp
 The asynchronous I/O control buffer
 .Fa iocb
@@ -108,8 +106,7 @@ should be zeroed before the
 system call to avoid passing bogus context information to the kernel.
 .Pp
 Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
+buffer contents are not allowed while the request is queued.
 .Pp
 If the file offset in
 .Fa iocb->aio_offset

Modified: projects/clang390-import/lib/libc/sys/bind.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/bind.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/bind.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 26, 2014
+.Dd August 18, 2016
 .Dt BIND 2
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft int
 .Fn bind "int s" "const struct sockaddr *addr" "socklen_t addrlen"

Modified: projects/clang390-import/lib/libc/sys/connect.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/connect.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/connect.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd February 4, 2016
+.Dd August 18, 2016
 .Dt CONNECT 2
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft int
 .Fn connect "int s" "const struct sockaddr *name" "socklen_t namelen"

Modified: projects/clang390-import/lib/libc/sys/fsync.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/fsync.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/fsync.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -1,5 +1,11 @@
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
+.\" Copyright (c) 2016 The FreeBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" Parts of this documentation were written by
+.\" Konstantin Belousov <kib at FreeBSD.org> under sponsorship
+.\" from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -28,40 +34,65 @@
 .\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd August 17, 2016
 .Dt FSYNC 2
 .Os
 .Sh NAME
-.Nm fsync
+.Nm fdatasync, fsync
 .Nd "synchronise changes to a file"
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In unistd.h
 .Ft int
+.Fn fdatasync "int fd"
+.Ft int
 .Fn fsync "int fd"
 .Sh DESCRIPTION
 The
 .Fn fsync
 system call
-causes all modified data and attributes of
+causes all modified data and attributes of the file referenced by
+the file descriptor
 .Fa fd
 to be moved to a permanent storage device.
 This normally results in all in-core modified copies
 of buffers for the associated file to be written to a disk.
 .Pp
 The
+.Fn fdatasync
+system call causes all modified data of
+.Fa fd
+to be moved to a permanent storage device.
+Unlike
+.Fn fsync ,
+the system call does not guarantee that file attributes or
+metadata necessary to access the file are committed to the permanent storage.
+.Pp
+The
 .Fn fsync
 system call
 should be used by programs that require a file to be
 in a known state, for example, in building a simple transaction
 facility.
+If the file metadata has already been committed, using
+.Fn fdatasync
+can be more efficient than
+.Fn fsync .
+.Pp
+Both
+.Fn fdatasync
+and
+.Fn fsync
+calls are cancellation points.
 .Sh RETURN VALUES
 .Rv -std fsync
 .Sh ERRORS
 The
 .Fn fsync
-fails if:
+and
+.Fn fdatasync
+calls fail if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
@@ -85,3 +116,15 @@ The
 .Fn fsync
 system call appeared in
 .Bx 4.2 .
+The
+.Fn fdatasync
+system call appeared in
+.Fx 12.0
+.Sh BUGS
+The
+.Fn fdatasync
+system call currently does not guarantee that enqueued
+.Xr aio 4
+requests for the file referenced by
+.Fa fd
+are completed before the syscall returns.

Modified: projects/clang390-import/lib/libc/sys/listen.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/listen.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/listen.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2014
+.Dd August 18, 2016
 .Dt LISTEN 2
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft int
 .Fn listen "int s" "int backlog"

Modified: projects/clang390-import/lib/libc/sys/recv.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/recv.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/recv.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
 .\" $FreeBSD$
 .\"
-.Dd January 29, 2016
+.Dd August 18, 2016
 .Dt RECV 2
 .Os
 .Sh NAME
@@ -40,7 +40,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft ssize_t
 .Fn recv "int s" "void *buf" "size_t len" "int flags"

Modified: projects/clang390-import/lib/libc/sys/send.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/send.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/send.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
 .\" $FreeBSD$
 .\"
-.Dd January 29, 2016
+.Dd August 18, 2016
 .Dt SEND 2
 .Os
 .Sh NAME
@@ -40,7 +40,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft ssize_t
 .Fn send "int s" "const void *msg" "size_t len" "int flags"

Modified: projects/clang390-import/lib/libc/sys/socket.2
==============================================================================
--- projects/clang390-import/lib/libc/sys/socket.2	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/socket.2	Sat Aug 20 18:52:03 2016	(r304538)
@@ -28,7 +28,7 @@
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd March 19, 2013
+.Dd August 18, 2016
 .Dt SOCKET 2
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sys/types.h
 .In sys/socket.h
 .Ft int
 .Fn socket "int domain" "int type" "int protocol"

Modified: projects/clang390-import/lib/libc/sys/trivial-vdso_tc.c
==============================================================================
--- projects/clang390-import/lib/libc/sys/trivial-vdso_tc.c	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/lib/libc/sys/trivial-vdso_tc.c	Sat Aug 20 18:52:03 2016	(r304538)
@@ -32,11 +32,11 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 
 #pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
+int
+__vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 {
 
-	return (0);
+	return (ENOSYS);
 }
 
 #pragma weak __vdso_gettimekeep

Modified: projects/clang390-import/libexec/dma/Makefile.inc
==============================================================================
--- projects/clang390-import/libexec/dma/Makefile.inc	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/libexec/dma/Makefile.inc	Sat Aug 20 18:52:03 2016	(r304538)
@@ -7,7 +7,7 @@ DMA_SOURCES=	${.CURDIR}/../../../contrib
 CFLAGS+= -I${DMA_SOURCES} \
 	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
 	-DCONF_PATH='"/etc/dma"' \
-	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.10"' \
+	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.11+"' \
 	-DDMA_ROOT_USER='"mailnull"' \
 	-DDMA_GROUP='"mail"'
 BINGRP=	mail

Modified: projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Sat Aug 20 18:51:48 2016	(r304537)
+++ projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Sat Aug 20 18:52:03 2016	(r304538)
@@ -751,9 +751,6 @@
 
       &hwlist.vpo;
 
-      <para>[&arch.i386;] The wds(4) driver supports the WD7000 SCSI
-	controller.</para>
-
       <para>With all supported SCSI controllers, full support is
 	provided for SCSI-I, SCSI-II, and SCSI-III peripherals,
 	including hard disks, optical disks, tape drives (including
@@ -775,23 +772,9 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.i386;] Sony proprietary interface (all models)
-	    (&man.scd.4;)</para>
-	</listitem>
-
-	<listitem>
 	  <para>ATAPI IDE interface (&man.acd.4;)</para>
 	</listitem>
       </itemizedlist>
-
-      <para>[&arch.i386;] The following device is unmaintained:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Mitsumi proprietary CD-ROM interface (all models)
-	    (&man.mcd.4;)</para>
-	</listitem>
-      </itemizedlist>
     </sect2>
 

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