svn commit: r286422 - in projects/clang-trunk: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip cddl/contrib/opensolaris/cmd/zfs cd...

Fri Aug 7 20:19:14 UTC 2015

Author: dim
Date: Fri Aug  7 20:18:55 2015
New Revision: 286422
URL: https://svnweb.freebsd.org/changeset/base/286422

Log:
  Merge ^/head r285924 through r286421.

Added:
     - copied from r286421, head/contrib/elftoolchain/ar/
     - copied from r286421, head/contrib/elftoolchain/brandelf/
     - copied from r286421, head/contrib/elftoolchain/elfdump/
  projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
     - copied unchanged from r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
  projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
     - copied unchanged from r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
  projects/clang-trunk/share/man/man4/cloudabi.4
     - copied unchanged from r286421, head/share/man/man4/cloudabi.4
  projects/clang-trunk/share/man/man9/pmap_quick_enter_page.9
     - copied unchanged from r286421, head/share/man/man9/pmap_quick_enter_page.9
  projects/clang-trunk/sys/arm64/arm64/uma_machdep.c
     - copied unchanged from r286421, head/sys/arm64/arm64/uma_machdep.c
  projects/clang-trunk/sys/contrib/alpine-hal/
     - copied from r286421, head/sys/contrib/alpine-hal/
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw-1.14.4.0.bin.uu
     - copied unchanged from r286421, head/sys/dev/cxgbe/firmware/t4fw-1.14.4.0.bin.uu
  projects/clang-trunk/sys/dev/cxgbe/firmware/t5fw-1.14.4.0.bin.uu
     - copied unchanged from r286421, head/sys/dev/cxgbe/firmware/t5fw-1.14.4.0.bin.uu
  projects/clang-trunk/sys/dev/gpio/gpiobacklight.c
     - copied unchanged from r286421, head/sys/dev/gpio/gpiobacklight.c
  projects/clang-trunk/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
     - copied unchanged from r286421, head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
  projects/clang-trunk/tools/build/options/WITH_DTRACE_TESTS
     - copied unchanged from r286421, head/tools/build/options/WITH_DTRACE_TESTS
  projects/clang-trunk/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
     - copied unchanged from r286421, head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
  projects/clang-trunk/tools/bus_space/examples/
     - copied from r286421, head/tools/bus_space/examples/
  projects/clang-trunk/usr.sbin/pw/pw_utils.c
     - copied unchanged from r286421, head/usr.sbin/pw/pw_utils.c
  projects/clang-trunk/usr.sbin/pw/strtounum.c
     - copied unchanged from r286421, head/usr.sbin/pw/strtounum.c
  projects/clang-trunk/usr.sbin/pw/tests/pw_groupadd.sh
     - copied unchanged from r286421, head/usr.sbin/pw/tests/pw_groupadd.sh
Directory Properties:
  projects/clang-trunk/contrib/elftoolchain/ar/   (props changed)
  projects/clang-trunk/contrib/elftoolchain/brandelf/   (props changed)
  projects/clang-trunk/contrib/elftoolchain/elfdump/   (props changed)
Deleted:
  projects/clang-trunk/gnu/usr.bin/binutils/addr2line/
  projects/clang-trunk/gnu/usr.bin/binutils/ar/
  projects/clang-trunk/gnu/usr.bin/binutils/nm/
  projects/clang-trunk/gnu/usr.bin/binutils/ranlib/
  projects/clang-trunk/gnu/usr.bin/binutils/readelf/
  projects/clang-trunk/gnu/usr.bin/binutils/size/
  projects/clang-trunk/gnu/usr.bin/binutils/strings/
  projects/clang-trunk/gnu/usr.bin/binutils/strip/
  projects/clang-trunk/gnu/usr.bin/cc/c++filt/Makefile
  projects/clang-trunk/gnu/usr.bin/cc/c++filt/Makefile.depend
  projects/clang-trunk/sys/amd64/include/xen/xenfunc.h
  projects/clang-trunk/sys/amd64/include/xen/xenvar.h
  projects/clang-trunk/sys/arm/annapurna/alpine/hal/
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw-1.14.2.0.bin.uu
  projects/clang-trunk/sys/dev/cxgbe/firmware/t5fw-1.14.2.0.bin.uu
  projects/clang-trunk/sys/i386/include/privatespace.h
  projects/clang-trunk/sys/i386/include/xen/xenfunc.h
  projects/clang-trunk/sys/i386/include/xen/xenvar.h
  projects/clang-trunk/sys/mips/rmi/dev/iic/ds1374u.c
  projects/clang-trunk/sys/pc98/include/privatespace.h
  projects/clang-trunk/usr.bin/vgrind/vgrindefs.c
Modified:
  projects/clang-trunk/ObsoleteFiles.inc
  projects/clang-trunk/UPDATING
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/clang-trunk/cddl/lib/libdtrace/io.d
  projects/clang-trunk/cddl/lib/libdtrace/ip.d
  projects/clang-trunk/cddl/lib/libdtrace/nfs.d
  projects/clang-trunk/cddl/lib/libdtrace/nfssrv.d
  projects/clang-trunk/cddl/lib/libdtrace/psinfo.d
  projects/clang-trunk/cddl/lib/libdtrace/regs_x86.d
  projects/clang-trunk/cddl/lib/libdtrace/sched.d
  projects/clang-trunk/cddl/lib/libdtrace/siftr.d
  projects/clang-trunk/cddl/lib/libdtrace/tcp.d
  projects/clang-trunk/cddl/lib/libdtrace/udp.d
  projects/clang-trunk/cddl/usr.sbin/dtrace/Makefile
  projects/clang-trunk/contrib/bsnmp/snmp_mibII/mibII_ip.c
  projects/clang-trunk/contrib/gcc/c-cppbuiltin.c
  projects/clang-trunk/contrib/gcc/cfgexpand.c
  projects/clang-trunk/contrib/gcc/common.opt
  projects/clang-trunk/contrib/gcc/doc/cpp.texi
  projects/clang-trunk/contrib/gcc/doc/gcc.1
  projects/clang-trunk/contrib/gcc/doc/invoke.texi
  projects/clang-trunk/contrib/gcc/gcc.c
  projects/clang-trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c
  projects/clang-trunk/contrib/llvm/tools/lldb/docs/lldb.1
  projects/clang-trunk/contrib/sendmail/FREEBSD-upgrade
  projects/clang-trunk/crypto/openssh/auth2-chall.c
  projects/clang-trunk/crypto/openssh/sshconnect.c
  projects/clang-trunk/etc/defaults/rc.conf
  projects/clang-trunk/etc/network.subr
  projects/clang-trunk/etc/portsnap.conf
  projects/clang-trunk/etc/rc.d/netif
  projects/clang-trunk/etc/rc.d/rctl
  projects/clang-trunk/etc/rc.subr
  projects/clang-trunk/gnu/usr.bin/binutils/Makefile
  projects/clang-trunk/gnu/usr.bin/cc/Makefile
  projects/clang-trunk/lib/libarchive/test/Makefile
  projects/clang-trunk/lib/libc/amd64/sys/__vdso_gettc.c
  projects/clang-trunk/lib/libc/i386/sys/__vdso_gettc.c
  projects/clang-trunk/lib/libc/stdio/open_memstream.3
  projects/clang-trunk/lib/libc/sys/__vdso_gettimeofday.c
  projects/clang-trunk/lib/libc/sys/kqueue.2
  projects/clang-trunk/lib/libc/sys/unlink.2
  projects/clang-trunk/lib/libthr/arch/amd64/Makefile.inc
  projects/clang-trunk/lib/libthr/arch/i386/Makefile.inc
  projects/clang-trunk/libexec/rtld-elf/amd64/Makefile.inc
  projects/clang-trunk/libexec/rtld-elf/i386/Makefile.inc
  projects/clang-trunk/libexec/ypxfr/ypxfr_getmap.c
  projects/clang-trunk/libexec/ypxfr/ypxfr_main.c
  projects/clang-trunk/libexec/ypxfr/ypxfrd_getmap.c
  projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/clang-trunk/release/tools/ec2.conf
  projects/clang-trunk/sbin/ipfw/ipfw2.c
  projects/clang-trunk/sbin/mdconfig/mdconfig.8
  projects/clang-trunk/sbin/routed/input.c
  projects/clang-trunk/sbin/setkey/parse.y
  projects/clang-trunk/sbin/setkey/setkey.8
  projects/clang-trunk/sbin/setkey/token.l
  projects/clang-trunk/sbin/sysctl/sysctl.c
  projects/clang-trunk/share/man/man4/Makefile
  projects/clang-trunk/share/man/man4/bwi.4
  projects/clang-trunk/share/man/man4/pms.4
  projects/clang-trunk/share/man/man4/ral.4
  projects/clang-trunk/share/man/man4/uftdi.4
  projects/clang-trunk/share/man/man5/src.conf.5
  projects/clang-trunk/share/man/man9/CTASSERT.9
  projects/clang-trunk/share/man/man9/Makefile
  projects/clang-trunk/share/man/man9/pmap.9
  projects/clang-trunk/share/man/man9/sysctl.9
  projects/clang-trunk/share/misc/committers-ports.dot
  projects/clang-trunk/share/misc/committers-src.dot
  projects/clang-trunk/share/mk/bsd.cpu.mk
  projects/clang-trunk/share/mk/src.opts.mk
  projects/clang-trunk/sys/amd64/amd64/mp_machdep.c
  projects/clang-trunk/sys/amd64/amd64/pmap.c
  projects/clang-trunk/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/clang-trunk/sys/amd64/include/atomic.h
  projects/clang-trunk/sys/amd64/include/in_cksum.h
  projects/clang-trunk/sys/amd64/include/md_var.h
  projects/clang-trunk/sys/arm/arm/pmap-v6-new.c
  projects/clang-trunk/sys/arm/arm/pmap-v6.c
  projects/clang-trunk/sys/arm/arm/pmap.c
  projects/clang-trunk/sys/arm/conf/BEAGLEBONE
  projects/clang-trunk/sys/arm/include/float.h
  projects/clang-trunk/sys/arm/include/pcpu.h
  projects/clang-trunk/sys/arm/ti/ti_gpio.c
  projects/clang-trunk/sys/arm64/arm64/elf_machdep.c
  projects/clang-trunk/sys/arm64/arm64/gic_v3.c
  projects/clang-trunk/sys/arm64/arm64/gic_v3_its.c
  projects/clang-trunk/sys/arm64/arm64/gic_v3_var.h
  projects/clang-trunk/sys/arm64/arm64/machdep.c
  projects/clang-trunk/sys/arm64/arm64/mem.c
  projects/clang-trunk/sys/arm64/arm64/pmap.c
  projects/clang-trunk/sys/arm64/arm64/stack_machdep.c
  projects/clang-trunk/sys/arm64/arm64/swtch.S
  projects/clang-trunk/sys/arm64/arm64/trap.c
  projects/clang-trunk/sys/arm64/arm64/uio_machdep.c
  projects/clang-trunk/sys/arm64/arm64/vfp.c
  projects/clang-trunk/sys/arm64/arm64/vm_machdep.c
  projects/clang-trunk/sys/arm64/conf/GENERIC
  projects/clang-trunk/sys/arm64/include/atomic.h
  projects/clang-trunk/sys/arm64/include/cpu.h
  projects/clang-trunk/sys/arm64/include/float.h
  projects/clang-trunk/sys/arm64/include/in_cksum.h
  projects/clang-trunk/sys/arm64/include/vfp.h
  projects/clang-trunk/sys/arm64/include/vmparam.h
  projects/clang-trunk/sys/boot/common/module.c
  projects/clang-trunk/sys/boot/forth/loader.conf
  projects/clang-trunk/sys/boot/forth/loader.rc
  projects/clang-trunk/sys/boot/forth/menu.rc
  projects/clang-trunk/sys/boot/i386/loader/Makefile
  projects/clang-trunk/sys/boot/mips/beri/loader/Makefile
  projects/clang-trunk/sys/boot/pc98/loader/Makefile
  projects/clang-trunk/sys/boot/powerpc/kboot/Makefile
  projects/clang-trunk/sys/boot/powerpc/ofw/Makefile
  projects/clang-trunk/sys/boot/powerpc/ps3/Makefile
  projects/clang-trunk/sys/boot/sparc64/loader/Makefile
  projects/clang-trunk/sys/cam/ctl/ctl.c
  projects/clang-trunk/sys/cam/ctl/ctl.h
  projects/clang-trunk/sys/cam/ctl/ctl_backend_block.c
  projects/clang-trunk/sys/cam/ctl/ctl_cmd_table.c
  projects/clang-trunk/sys/cam/ctl/ctl_private.h
  projects/clang-trunk/sys/cam/ctl/ctl_ser_table.c
  projects/clang-trunk/sys/cam/ctl/ctl_tpc.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang-trunk/sys/cddl/dev/fbt/aarch64/fbt_isa.c
  projects/clang-trunk/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/clang-trunk/sys/cddl/dev/fbt/fbt.h
  projects/clang-trunk/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  projects/clang-trunk/sys/cddl/dev/fbt/x86/fbt_isa.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_fd.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_file.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_futex.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_proc.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_util.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_poll.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/clang-trunk/sys/compat/cloudabi64/syscalls.master
  projects/clang-trunk/sys/compat/linux/linux_event.c
  projects/clang-trunk/sys/compat/linux/linux_file.c
  projects/clang-trunk/sys/compat/linux/linux_fork.c
  projects/clang-trunk/sys/conf/files
  projects/clang-trunk/sys/conf/files.arm64
  projects/clang-trunk/sys/conf/options.arm64
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_md.h
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_mi.h
  projects/clang-trunk/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/clang-trunk/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
  projects/clang-trunk/sys/crypto/aesni/aesni.h
  projects/clang-trunk/sys/crypto/aesni/aesni_ghash.c
  projects/clang-trunk/sys/dev/ata/ata-all.c
  projects/clang-trunk/sys/dev/ata/ata-lowlevel.c
  projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.c
  projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.h
  projects/clang-trunk/sys/dev/ath/if_ath.c
  projects/clang-trunk/sys/dev/ath/if_ath_beacon.c
  projects/clang-trunk/sys/dev/ath/if_ath_debug.h
  projects/clang-trunk/sys/dev/ath/if_ath_keycache.c
  projects/clang-trunk/sys/dev/ath/if_ath_misc.h
  projects/clang-trunk/sys/dev/ath/if_ath_rx.c
  projects/clang-trunk/sys/dev/ath/if_ath_rx_edma.c
  projects/clang-trunk/sys/dev/ath/if_ath_sysctl.c
  projects/clang-trunk/sys/dev/ath/if_ath_tdma.c
  projects/clang-trunk/sys/dev/ath/if_ath_tx.c
  projects/clang-trunk/sys/dev/ath/if_ath_tx_edma.c
  projects/clang-trunk/sys/dev/ath/if_athvar.h
  projects/clang-trunk/sys/dev/bwi/bwimac.c
  projects/clang-trunk/sys/dev/bwi/bwiphy.c
  projects/clang-trunk/sys/dev/bwi/bwirf.c
  projects/clang-trunk/sys/dev/bwi/if_bwi.c
  projects/clang-trunk/sys/dev/bwi/if_bwivar.h
  projects/clang-trunk/sys/dev/bwn/if_bwn.c
  projects/clang-trunk/sys/dev/bwn/if_bwnvar.h
  projects/clang-trunk/sys/dev/bxe/bxe.c
  projects/clang-trunk/sys/dev/bxe/bxe.h
  projects/clang-trunk/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/clang-trunk/sys/dev/cxgb/ulp/tom/cxgb_listen.c
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/clang-trunk/sys/dev/cxgbe/t4_main.c
  projects/clang-trunk/sys/dev/cxgbe/tom/t4_connect.c
  projects/clang-trunk/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang-trunk/sys/dev/cxgbe/tom/t4_listen.c
  projects/clang-trunk/sys/dev/cxgbe/tom/t4_tom.c
  projects/clang-trunk/sys/dev/drm2/i915/i915_drv.h
  projects/clang-trunk/sys/dev/drm2/i915/i915_gem.c
  projects/clang-trunk/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/clang-trunk/sys/dev/e1000/if_em.c
  projects/clang-trunk/sys/dev/e1000/if_igb.c
  projects/clang-trunk/sys/dev/if_ndis/if_ndis.c
  projects/clang-trunk/sys/dev/if_ndis/if_ndisvar.h
  projects/clang-trunk/sys/dev/ipw/if_ipw.c
  projects/clang-trunk/sys/dev/ipw/if_ipwvar.h
  projects/clang-trunk/sys/dev/iscsi/iscsi.c
  projects/clang-trunk/sys/dev/iwi/if_iwi.c
  projects/clang-trunk/sys/dev/iwi/if_iwivar.h
  projects/clang-trunk/sys/dev/iwn/if_iwn.c
  projects/clang-trunk/sys/dev/iwn/if_iwnvar.h
  projects/clang-trunk/sys/dev/ixgbe/if_ix.c
  projects/clang-trunk/sys/dev/malo/if_malo.c
  projects/clang-trunk/sys/dev/malo/if_malo.h
  projects/clang-trunk/sys/dev/mii/brgphy.c
  projects/clang-trunk/sys/dev/mii/miidevs
  projects/clang-trunk/sys/dev/mmc/host/dwmmc.c
  projects/clang-trunk/sys/dev/mwl/if_mwl.c
  projects/clang-trunk/sys/dev/mwl/if_mwl_pci.c
  projects/clang-trunk/sys/dev/mwl/if_mwlvar.h
  projects/clang-trunk/sys/dev/nand/nfc_rb.c
  projects/clang-trunk/sys/dev/nvme/nvme.c
  projects/clang-trunk/sys/dev/ofw/ofw_cpu.c
  projects/clang-trunk/sys/dev/pms/freebsd/driver/common/lxutil.c
  projects/clang-trunk/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  projects/clang-trunk/sys/dev/proto/proto_busdma.c
  projects/clang-trunk/sys/dev/ral/if_ral_pci.c
  projects/clang-trunk/sys/dev/ral/rt2560.c
  projects/clang-trunk/sys/dev/ral/rt2560var.h
  projects/clang-trunk/sys/dev/ral/rt2661.c
  projects/clang-trunk/sys/dev/ral/rt2661var.h
  projects/clang-trunk/sys/dev/ral/rt2860.c
  projects/clang-trunk/sys/dev/ral/rt2860var.h
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.c
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.h
  projects/clang-trunk/sys/dev/usb/serial/uftdi.c
  projects/clang-trunk/sys/dev/usb/serial/uftdi_reg.h
  projects/clang-trunk/sys/dev/usb/uftdiio.h
  projects/clang-trunk/sys/dev/usb/wlan/if_rsu.c
  projects/clang-trunk/sys/dev/usb/wlan/if_rsureg.h
  projects/clang-trunk/sys/dev/usb/wlan/if_rum.c
  projects/clang-trunk/sys/dev/usb/wlan/if_rumvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_run.c
  projects/clang-trunk/sys/dev/usb/wlan/if_runvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_uath.c
  projects/clang-trunk/sys/dev/usb/wlan/if_uathvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_upgt.c
  projects/clang-trunk/sys/dev/usb/wlan/if_upgtvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_ural.c
  projects/clang-trunk/sys/dev/usb/wlan/if_uralvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_urtw.c
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwn.c
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwnreg.h
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_zyd.c
  projects/clang-trunk/sys/dev/usb/wlan/if_zydreg.h
  projects/clang-trunk/sys/dev/wi/if_wi.c
  projects/clang-trunk/sys/dev/wi/if_wi_pccard.c
  projects/clang-trunk/sys/dev/wi/if_wi_pci.c
  projects/clang-trunk/sys/dev/wi/if_wivar.h
  projects/clang-trunk/sys/dev/wpi/if_wpi.c
  projects/clang-trunk/sys/dev/wpi/if_wpivar.h
  projects/clang-trunk/sys/dev/wtap/if_wtap.c
  projects/clang-trunk/sys/dev/wtap/if_wtapvar.h
  projects/clang-trunk/sys/dev/xen/balloon/balloon.c
  projects/clang-trunk/sys/dev/xen/blkfront/blkfront.c
  projects/clang-trunk/sys/dev/xen/blkfront/block.h
  projects/clang-trunk/sys/dev/xen/control/control.c
  projects/clang-trunk/sys/dev/xen/netback/netback.c
  projects/clang-trunk/sys/dev/xen/netfront/netfront.c
  projects/clang-trunk/sys/dev/xen/pcifront/pcifront.c
  projects/clang-trunk/sys/fs/devfs/devfs_vnops.c
  projects/clang-trunk/sys/fs/ext2fs/ext2_subr.c
  projects/clang-trunk/sys/fs/nfsclient/nfs_clport.c
  projects/clang-trunk/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang-trunk/sys/geom/eli/g_eli_integrity.c
  projects/clang-trunk/sys/geom/eli/g_eli_privacy.c
  projects/clang-trunk/sys/geom/geom_dev.c
  projects/clang-trunk/sys/geom/geom_io.c
  projects/clang-trunk/sys/geom/uzip/g_uzip.c
  projects/clang-trunk/sys/i386/i386/genassym.c
  projects/clang-trunk/sys/i386/i386/locore.s
  projects/clang-trunk/sys/i386/i386/machdep.c
  projects/clang-trunk/sys/i386/i386/mp_machdep.c
  projects/clang-trunk/sys/i386/i386/pmap.c
  projects/clang-trunk/sys/i386/i386/vm_machdep.c
  projects/clang-trunk/sys/i386/include/atomic.h
  projects/clang-trunk/sys/i386/include/in_cksum.h
  projects/clang-trunk/sys/i386/include/md_var.h
  projects/clang-trunk/sys/i386/include/param.h
  projects/clang-trunk/sys/i386/include/pcpu.h
  projects/clang-trunk/sys/kern/init_main.c
  projects/clang-trunk/sys/kern/kern_descrip.c
  projects/clang-trunk/sys/kern/kern_event.c
  projects/clang-trunk/sys/kern/kern_exec.c
  projects/clang-trunk/sys/kern/kern_fork.c
  projects/clang-trunk/sys/kern/kern_kthread.c
  projects/clang-trunk/sys/kern/kern_linker.c
  projects/clang-trunk/sys/kern/kern_lock.c
  projects/clang-trunk/sys/kern/kern_mutex.c
  projects/clang-trunk/sys/kern/kern_rmlock.c
  projects/clang-trunk/sys/kern/kern_rwlock.c
  projects/clang-trunk/sys/kern/kern_sharedpage.c
  projects/clang-trunk/sys/kern/kern_shutdown.c
  projects/clang-trunk/sys/kern/kern_sx.c
  projects/clang-trunk/sys/kern/kern_sysctl.c
  projects/clang-trunk/sys/kern/kern_umtx.c
  projects/clang-trunk/sys/kern/sched_4bsd.c
  projects/clang-trunk/sys/kern/sched_ule.c
  projects/clang-trunk/sys/kern/subr_param.c
  projects/clang-trunk/sys/kern/sys_pipe.c
  projects/clang-trunk/sys/kern/sys_process.c
  projects/clang-trunk/sys/kern/uipc_shm.c
  projects/clang-trunk/sys/kern/vfs_bio.c
  projects/clang-trunk/sys/kern/vfs_init.c
  projects/clang-trunk/sys/kern/vfs_subr.c
  projects/clang-trunk/sys/kern/vfs_vnops.c
  projects/clang-trunk/sys/mips/conf/XLR
  projects/clang-trunk/sys/mips/conf/XLR64
  projects/clang-trunk/sys/mips/conf/XLRN32
  projects/clang-trunk/sys/mips/include/float.h
  projects/clang-trunk/sys/mips/include/in_cksum.h
  projects/clang-trunk/sys/mips/mips/pmap.c
  projects/clang-trunk/sys/mips/rmi/files.xlr
  projects/clang-trunk/sys/mips/rmi/xlr_i2c.c
  projects/clang-trunk/sys/modules/Makefile
  projects/clang-trunk/sys/modules/cxgbe/t4_firmware/Makefile
  projects/clang-trunk/sys/modules/cxgbe/t5_firmware/Makefile
  projects/clang-trunk/sys/modules/if_stf/Makefile
  projects/clang-trunk/sys/modules/zfs/Makefile
  projects/clang-trunk/sys/net/bpf.c
  projects/clang-trunk/sys/net/bpf.h
  projects/clang-trunk/sys/net/bpf_buffer.c
  projects/clang-trunk/sys/net/if_gif.c
  projects/clang-trunk/sys/net/if_spppsubr.c
  projects/clang-trunk/sys/net/if_stf.c
  projects/clang-trunk/sys/net/pfkeyv2.h
  projects/clang-trunk/sys/net/radix.c
  projects/clang-trunk/sys/net/radix.h
  projects/clang-trunk/sys/net/route.c
  projects/clang-trunk/sys/net80211/ieee80211.c
  projects/clang-trunk/sys/net80211/ieee80211_ddb.c
  projects/clang-trunk/sys/net80211/ieee80211_freebsd.c
  projects/clang-trunk/sys/net80211/ieee80211_ioctl.c
  projects/clang-trunk/sys/net80211/ieee80211_output.c
  projects/clang-trunk/sys/net80211/ieee80211_power.c
  projects/clang-trunk/sys/net80211/ieee80211_proto.c
  projects/clang-trunk/sys/net80211/ieee80211_proto.h
  projects/clang-trunk/sys/net80211/ieee80211_regdomain.c
  projects/clang-trunk/sys/net80211/ieee80211_scan_sta.c
  projects/clang-trunk/sys/net80211/ieee80211_var.h
  projects/clang-trunk/sys/netinet/if_ether.c
  projects/clang-trunk/sys/netinet/igmp.c
  projects/clang-trunk/sys/netinet/in.c
  projects/clang-trunk/sys/netinet/in_gif.c
  projects/clang-trunk/sys/netinet/in_mcast.c
  projects/clang-trunk/sys/netinet/in_pcb.c
  projects/clang-trunk/sys/netinet/in_pcb.h
  projects/clang-trunk/sys/netinet/in_var.h
  projects/clang-trunk/sys/netinet/ip_ecn.h
  projects/clang-trunk/sys/netinet/ip_icmp.c
  projects/clang-trunk/sys/netinet/ip_input.c
  projects/clang-trunk/sys/netinet/ip_output.c
  projects/clang-trunk/sys/netinet/raw_ip.c
  projects/clang-trunk/sys/netinet/sctp_asconf.c
  projects/clang-trunk/sys/netinet/sctp_indata.c
  projects/clang-trunk/sys/netinet/sctp_indata.h
  projects/clang-trunk/sys/netinet/sctp_input.c
  projects/clang-trunk/sys/netinet/sctp_output.c
  projects/clang-trunk/sys/netinet/sctp_pcb.c
  projects/clang-trunk/sys/netinet/sctp_timer.c
  projects/clang-trunk/sys/netinet/sctputil.c
  projects/clang-trunk/sys/netinet/tcp_input.c
  projects/clang-trunk/sys/netinet/tcp_reass.c
  projects/clang-trunk/sys/netinet/tcp_subr.c
  projects/clang-trunk/sys/netinet/tcp_syncache.c
  projects/clang-trunk/sys/netinet/tcp_timer.c
  projects/clang-trunk/sys/netinet/tcp_timewait.c
  projects/clang-trunk/sys/netinet/tcp_usrreq.c
  projects/clang-trunk/sys/netinet/tcp_var.h
  projects/clang-trunk/sys/netinet/toecore.c
  projects/clang-trunk/sys/netinet6/in6.c
  projects/clang-trunk/sys/netinet6/in6_gif.c
  projects/clang-trunk/sys/netinet6/in6_ifattach.c
  projects/clang-trunk/sys/netinet6/in6_pcb.c
  projects/clang-trunk/sys/netinet6/in6_src.c
  projects/clang-trunk/sys/netinet6/in6_var.h
  projects/clang-trunk/sys/netinet6/ip6_input.c
  projects/clang-trunk/sys/netipsec/ipsec_output.c
  projects/clang-trunk/sys/netipsec/key.c
  projects/clang-trunk/sys/netipsec/key_debug.c
  projects/clang-trunk/sys/netipsec/keydb.h
  projects/clang-trunk/sys/netipsec/xform.h
  projects/clang-trunk/sys/netipsec/xform_ah.c
  projects/clang-trunk/sys/netipsec/xform_esp.c
  projects/clang-trunk/sys/netpfil/ipfw/ip_fw2.c
  projects/clang-trunk/sys/netpfil/pf/pf.c
  projects/clang-trunk/sys/netpfil/pf/pf_norm.c
  projects/clang-trunk/sys/ofed/drivers/infiniband/core/mad.c
  projects/clang-trunk/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/clang-trunk/sys/ofed/include/linux/in.h
  projects/clang-trunk/sys/opencrypto/cryptodev.h
  projects/clang-trunk/sys/opencrypto/cryptosoft.c
  projects/clang-trunk/sys/opencrypto/xform.c
  projects/clang-trunk/sys/powerpc/aim/mmu_oea.c
  projects/clang-trunk/sys/powerpc/aim/mmu_oea64.c
  projects/clang-trunk/sys/powerpc/booke/pmap.c
  projects/clang-trunk/sys/powerpc/include/float.h
  projects/clang-trunk/sys/powerpc/include/in_cksum.h
  projects/clang-trunk/sys/powerpc/include/pcpu.h
  projects/clang-trunk/sys/powerpc/powerpc/mmu_if.m
  projects/clang-trunk/sys/powerpc/powerpc/pmap_dispatch.c
  projects/clang-trunk/sys/rpc/svc_vc.c
  projects/clang-trunk/sys/sparc64/include/float.h
  projects/clang-trunk/sys/sparc64/include/in_cksum.h
  projects/clang-trunk/sys/sparc64/include/pcpu.h
  projects/clang-trunk/sys/sparc64/sparc64/pmap.c
  projects/clang-trunk/sys/sys/buf.h
  projects/clang-trunk/sys/sys/event.h
  projects/clang-trunk/sys/sys/filedesc.h
  projects/clang-trunk/sys/sys/mbuf.h
  projects/clang-trunk/sys/sys/msg.h
  projects/clang-trunk/sys/sys/proc.h
  projects/clang-trunk/sys/sys/sem.h
  projects/clang-trunk/sys/sys/shm.h
  projects/clang-trunk/sys/sys/syscallsubr.h
  projects/clang-trunk/sys/sys/sysctl.h
  projects/clang-trunk/sys/sys/sysent.h
  projects/clang-trunk/sys/sys/umtx.h
  projects/clang-trunk/sys/ufs/ffs/ffs_subr.c
  projects/clang-trunk/sys/vm/pmap.h
  projects/clang-trunk/sys/vm/vm_fault.c
  projects/clang-trunk/sys/vm/vm_map.c
  projects/clang-trunk/sys/vm/vm_map.h
  projects/clang-trunk/sys/vm/vm_pager.c
  projects/clang-trunk/sys/vm/vm_reserv.c
  projects/clang-trunk/sys/x86/include/_types.h
  projects/clang-trunk/sys/x86/include/float.h
  projects/clang-trunk/sys/x86/include/specialreg.h
  projects/clang-trunk/sys/x86/x86/identcpu.c
  projects/clang-trunk/sys/x86/x86/mp_x86.c
  projects/clang-trunk/sys/x86/xen/xen_intr.c
  projects/clang-trunk/sys/xen/interface/io/blkif.h
  projects/clang-trunk/tests/sys/kern/ptrace_test.c
  projects/clang-trunk/tests/sys/kern/unix_seqpacket_test.c
  projects/clang-trunk/tests/sys/vm/Makefile
  projects/clang-trunk/tests/sys/vm/mmap_test.c
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/tools/build/options/WITHOUT_BINUTILS
  projects/clang-trunk/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
  projects/clang-trunk/tools/bus_space/C/lang.c
  projects/clang-trunk/tools/bus_space/C/libbus.h
  projects/clang-trunk/tools/bus_space/Python/lang.c
  projects/clang-trunk/tools/bus_space/busdma.c
  projects/clang-trunk/tools/bus_space/busdma.h
  projects/clang-trunk/tools/tools/iwn/iwnstats/main.c
  projects/clang-trunk/usr.bin/ar/ar.1
  projects/clang-trunk/usr.bin/ar/ar.c
  projects/clang-trunk/usr.bin/brandelf/brandelf.1
  projects/clang-trunk/usr.bin/calendar/calendars/calendar.freebsd
  projects/clang-trunk/usr.bin/elfcopy/Makefile
  projects/clang-trunk/usr.bin/find/extern.h
  projects/clang-trunk/usr.bin/find/misc.c
  projects/clang-trunk/usr.bin/getopt/getopt.1
  projects/clang-trunk/usr.bin/ipcrm/ipcrm.c
  projects/clang-trunk/usr.bin/mkimg/image.c
  projects/clang-trunk/usr.bin/mkimg/image.h
  projects/clang-trunk/usr.bin/mkimg/mkimg.1
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
  projects/clang-trunk/usr.bin/mkimg/vhd.c
  projects/clang-trunk/usr.bin/patch/common.h
  projects/clang-trunk/usr.bin/patch/inp.c
  projects/clang-trunk/usr.bin/patch/pathnames.h
  projects/clang-trunk/usr.bin/patch/pch.c
  projects/clang-trunk/usr.bin/truss/syscall.h
  projects/clang-trunk/usr.bin/truss/syscalls.c
  projects/clang-trunk/usr.bin/wall/ttymsg.c
  projects/clang-trunk/usr.bin/xargs/xargs.1
  projects/clang-trunk/usr.bin/xargs/xargs.c
  projects/clang-trunk/usr.bin/ypcat/ypcat.c
  projects/clang-trunk/usr.bin/ypmatch/ypmatch.c
  projects/clang-trunk/usr.bin/ypwhich/ypwhich.c
  projects/clang-trunk/usr.sbin/bhyve/bhyve.8
  projects/clang-trunk/usr.sbin/bsdinstall/scripts/auto
  projects/clang-trunk/usr.sbin/chkgrp/chkgrp.c
  projects/clang-trunk/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/clang-trunk/usr.sbin/pw/Makefile
  projects/clang-trunk/usr.sbin/pw/cpdir.c
  projects/clang-trunk/usr.sbin/pw/grupd.c
  projects/clang-trunk/usr.sbin/pw/psdate.c
  projects/clang-trunk/usr.sbin/pw/pw.8
  projects/clang-trunk/usr.sbin/pw/pw.c
  projects/clang-trunk/usr.sbin/pw/pw.h
  projects/clang-trunk/usr.sbin/pw/pw_conf.c
  projects/clang-trunk/usr.sbin/pw/pw_group.c
  projects/clang-trunk/usr.sbin/pw/pw_log.c
  projects/clang-trunk/usr.sbin/pw/pw_nis.c
  projects/clang-trunk/usr.sbin/pw/pw_user.c
  projects/clang-trunk/usr.sbin/pw/pwupd.c
  projects/clang-trunk/usr.sbin/pw/pwupd.h
  projects/clang-trunk/usr.sbin/pw/rm_r.c
  projects/clang-trunk/usr.sbin/pw/tests/Makefile
  projects/clang-trunk/usr.sbin/pw/tests/pw_groupdel.sh
  projects/clang-trunk/usr.sbin/pw/tests/pw_useradd.sh
  projects/clang-trunk/usr.sbin/pw/tests/pw_userdel.sh
  projects/clang-trunk/usr.sbin/pw/tests/pw_usermod.sh
  projects/clang-trunk/usr.sbin/syslogd/syslogd.c
  projects/clang-trunk/usr.sbin/yp_mkdb/yp_mkdb.c
  projects/clang-trunk/usr.sbin/yppush/yppush_main.c
  projects/clang-trunk/usr.sbin/ypserv/yp_access.c
  projects/clang-trunk/usr.sbin/ypserv/yp_dblookup.c
  projects/clang-trunk/usr.sbin/ypserv/yp_error.c
  projects/clang-trunk/usr.sbin/ypserv/yp_main.c
Directory Properties:
  projects/clang-trunk/   (props changed)
  projects/clang-trunk/cddl/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/clang-trunk/contrib/elftoolchain/   (props changed)
  projects/clang-trunk/contrib/gcc/   (props changed)
  projects/clang-trunk/contrib/libarchive/   (props changed)
  projects/clang-trunk/contrib/libarchive/libarchive/   (props changed)
  projects/clang-trunk/contrib/llvm/   (props changed)
  projects/clang-trunk/contrib/llvm/tools/lldb/   (props changed)
  projects/clang-trunk/contrib/sendmail/   (props changed)
  projects/clang-trunk/crypto/openssh/   (props changed)
  projects/clang-trunk/etc/   (props changed)
  projects/clang-trunk/gnu/usr.bin/binutils/   (props changed)
  projects/clang-trunk/lib/libc/   (props changed)
  projects/clang-trunk/sbin/   (props changed)
  projects/clang-trunk/sbin/ipfw/   (props changed)
  projects/clang-trunk/share/   (props changed)
  projects/clang-trunk/share/man/man4/   (props changed)
  projects/clang-trunk/sys/   (props changed)
  projects/clang-trunk/sys/amd64/include/xen/   (props changed)
  projects/clang-trunk/sys/boot/   (props changed)
  projects/clang-trunk/sys/boot/powerpc/kboot/   (props changed)
  projects/clang-trunk/sys/boot/powerpc/ofw/   (props changed)
  projects/clang-trunk/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/sys/conf/   (props changed)
  projects/clang-trunk/usr.bin/calendar/   (props changed)
  projects/clang-trunk/usr.bin/mkimg/   (props changed)
  projects/clang-trunk/usr.sbin/bhyve/   (props changed)

Modified: projects/clang-trunk/ObsoleteFiles.inc
==============================================================================

--- projects/clang-trunk/ObsoleteFiles.inc	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/ObsoleteFiles.inc	Fri Aug  7 20:18:55 2015	(r286422)
@@ -99,6 +99,8 @@ OLD_FILES+=usr/lib/clang/3.6.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
+# 20150802: Remove netbsd's test on pw(8)
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages.

Modified: projects/clang-trunk/UPDATING
==============================================================================
--- projects/clang-trunk/UPDATING	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/UPDATING	Fri Aug  7 20:18:55 2015	(r286422)
@@ -36,6 +36,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	20141231 entry below for information about prerequisites and upgrading,
 	if you are not already using 3.5.0 or higher.
 
+20150806:
+	The menu.rc and loader.rc files will now be replaced during 
+	upgrades. Please migrate local changes to menu.rc.local and
+	loader.rc.local instead.
+
+20150805:
+	GNU Binutils versions of addr2line, c++filt, nm, readelf, size,
+	strings and strip have been removed. The src.conf(5) knob
+	WITHOUT_ELFTOOLCHAIN_TOOLS no longer provides the binutils tools.
+
+20150728:
+	As ZFS requires more kernel stack pages than is the default on some
+	architectures e.g. i386, it now warns if KSTACK_PAGES is less than
+	ZFS_MIN_KSTACK_PAGES (which is 4 at the time of writing).
+
+	Please consider using 'options KSTACK_PAGES=X' where X is greater
+	than or equal to ZFS_MIN_KSTACK_PAGES i.e. 4 in such configurations.
+
 20150706:
 	sendmail has been updated to 8.15.2.  Starting with FreeBSD 11.0
 	and sendmail 8.15, sendmail uses uncompressed IPv6 addresses by
@@ -221,7 +239,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	taken from the ELF Tool Chain project rather than GNU binutils. They
 	should be drop-in replacements, with the addition of arm64 support.
 	The WITHOUT_ELFTOOLCHAIN_TOOLS= knob may be used to obtain the
-	binutils tools, if necessary.
+	binutils tools, if necessary. See 20150805 for updated information.
 
 20150105:
 	The default Unbound configuration now enables remote control
@@ -575,6 +593,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
 
 20131010:
+	The stable/10 branch has been created in subversion from head
+	revision r256279.
+
+20131010:
 	The rc.d/jail script has been updated to support jail(8)
 	configuration file.  The "jail_<jname>_*" rc.conf(5) variables
 	for per-jail configuration are automatically converted to
@@ -1117,6 +1139,13 @@ COMMON ITEMS:
 	around can lead to problems if pam has changed too much from your
 	starting point to allow continued authentication after the upgrade.
 
+	This file should be read as a log of events. When a later event changes
+	information of a prior event, the prior event should not be deleted.
+	Instead, a pointer to the entry with the new information should be
+	placed in the old entry. Readers of this file should also sanity check
+	older entries before relying on them blindly. Authors of new entries
+	should write them with this in mind.
+
 	ZFS notes
 	---------
 	When upgrading the boot ZFS pool to a new version, always follow
@@ -1287,7 +1316,7 @@ FORMAT:
 
 This file contains a list, in reverse chronological order, of major
 breakages in tracking -current.  It is not guaranteed to be a complete
-list of such breakages, and only contains entries since October 10, 2007.
+list of such breakages, and only contains entries since September 23, 2011.
 If you need to see UPDATING entries from before that date, you will need
 to fetch an UPDATING file from an older FreeBSD release.
 

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -34,7 +34,7 @@
  *
  */
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_owned();
 	exit(1);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -34,7 +34,7 @@
  *
  */
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_owned((kmutex_t *)arg0, 99);
 	exit(1);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -36,7 +36,7 @@
  */
 
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_type_adaptive();
 	exit(1);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -35,7 +35,7 @@
  */
 
 
-lockstat:kernel:mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	mutex_type_adaptive((kmutex_t *)arg0, 99);
 	exit(1);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -48,7 +48,7 @@ BEGIN
 	i = 0;
 }
 
-lockstat::mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 
 	ptr = mutex_owner((struct mtx *)arg0);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -44,7 +44,7 @@ BEGIN
 	ret = -99;
 }
 
-mtx_lock:adaptive-acquire
+lockstat:::adaptive-acquire
 {
 	ret = mutex_type_adaptive((struct mtx *)arg0);
 	i++;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # CDDL HEADER START
 #

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # CDDL HEADER START
 #

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh	Fri Aug  7 20:18:55 2015	(r286422)
@@ -58,12 +58,25 @@ fi
 
 dtrace=$1
 local=127.0.0.1
-tcpport=22
 DIR=/var/tmp/dtest.$$
 
+tcpport=1024
+bound=5000
+while [ $tcpport -lt $bound ]; do
+	nc -z $local $tcpport >/dev/null || break
+	tcpport=$(($tcpport + 1))
+done
+if [ $tcpport -eq $bound ]; then
+	echo "couldn't find an available TCP port"
+	exit 1
+fi
+
 mkdir $DIR
 cd $DIR
 
+# nc will exit when the connection is closed.
+nc -l $local $tcpport &
+
 cat > test.pl <<-EOPERL
 	use IO::Socket;
 	my \$s = IO::Socket::INET->new(
@@ -76,7 +89,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh	Fri Aug  7 20:18:55 2015	(r286422)
@@ -79,7 +79,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh	Fri Aug  7 20:18:55 2015	(r286422)
@@ -82,7 +82,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh	Fri Aug  7 20:18:55 2015	(r286422)
@@ -87,7 +87,7 @@ cat > test.pl <<-EOPERL
 	sleep(2);
 EOPERL
 
-$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE
+$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE
 BEGIN
 {
 	ipsend = tcpsend = ipreceive = tcpreceive = 0;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Aug  7 20:18:55 2015	(r286422)
@@ -27,11 +27,11 @@
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
 .\" Copyright (c) 2014 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
-.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved.
+.\" Copyright (c) 2014-2015, The FreeBSD Foundation, All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 12, 2014
+.Dd July 30, 2015
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -938,7 +938,7 @@ not be used by any other dataset.
 Disabling checksums is
 .Em NOT
 a recommended practice.
-.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | zle | Cm lz4
+.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | Cm zle | Cm lz4
 Controls the compression algorithm used for this dataset. The
 .Cm lzjb
 compression algorithm is optimized for performance while providing decent data

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1348,6 +1348,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 	dtrace_aggdesc_t *agg;
 	caddr_t lim = (caddr_t)buf + len, limit;
 	char format[64] = "%";
+	size_t ret;
 	int i, aggrec, curagg = -1;
 	uint64_t normal;
 
@@ -1379,7 +1380,9 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		int prec = pfd->pfd_prec;
 		int rval;
 
+		const char *start;
 		char *f = format + 1; /* skip initial '%' */
+		size_t fmtsz = sizeof(format) - 1;
 		const dtrace_recdesc_t *rec;
 		dt_pfprint_f *func;
 		caddr_t addr;
@@ -1536,6 +1539,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 			break;
 		}
 
+		start = f;
 		if (pfd->pfd_flags & DT_PFCONV_ALT)
 			*f++ = '#';
 		if (pfd->pfd_flags & DT_PFCONV_ZPAD)
@@ -1548,6 +1552,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 			*f++ = '\'';
 		if (pfd->pfd_flags & DT_PFCONV_SPACE)
 			*f++ = ' ';
+		fmtsz -= f - start;
 
 		/*
 		 * If we're printing a stack and DT_PFCONV_LEFT is set, we
@@ -1558,13 +1563,20 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		if (func == pfprint_stack && (pfd->pfd_flags & DT_PFCONV_LEFT))
 			width = 0;
 
-		if (width != 0)
-			f += snprintf(f, sizeof (format), "%d", ABS(width));
+		if (width != 0) {
+			ret = snprintf(f, fmtsz, "%d", ABS(width));
+			f += ret;
+			fmtsz = MAX(0, fmtsz - ret);
+		}
 
-		if (prec > 0)
-			f += snprintf(f, sizeof (format), ".%d", prec);
+		if (prec > 0) {
+			ret = snprintf(f, fmtsz, ".%d", prec);
+			f += ret;
+			fmtsz = MAX(0, fmtsz - ret);
+		}
 
-		(void) strcpy(f, pfd->pfd_fmt);
+		if (strlcpy(f, pfd->pfd_fmt, fmtsz) >= fmtsz)
+			return (dt_set_errno(dtp, EDT_COMPILER));
 		pfd->pfd_rec = rec;
 
 		if (func(dtp, fp, format, pfd, addr, size, normal) < 0)

Modified: projects/clang-trunk/cddl/lib/libdtrace/io.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/io.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/io.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -25,8 +25,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
+#pragma D depends_on module kernel
 #pragma D depends_on provider io
 
 typedef struct devinfo {

Modified: projects/clang-trunk/cddl/lib/libdtrace/ip.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/ip.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/ip.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -25,6 +25,7 @@
  * Copyright (c) 2013 Mark Johnston <markj at freebsd.org>
  */
 
+#pragma D depends_on module kernel
 #pragma D depends_on provider ip
 
 /*

Modified: projects/clang-trunk/cddl/lib/libdtrace/nfs.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/nfs.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/nfs.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -30,6 +30,7 @@
 
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
+#pragma	D depends_on module kernel
 #pragma	D depends_on module nfs
 
 typedef struct nfsv4opinfo {

Modified: projects/clang-trunk/cddl/lib/libdtrace/nfssrv.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/nfssrv.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/nfssrv.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -30,7 +30,8 @@
 
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
-#pragma	D depends_on module nfs.d
+#pragma	D depends_on library nfs.d
+#pragma	D depends_on module kernel
 #pragma D depends_on module nfssrv
 
 #pragma D binding "1.5" translator

Modified: projects/clang-trunk/cddl/lib/libdtrace/psinfo.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/psinfo.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/psinfo.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -28,6 +28,8 @@
  * Use is subject to license terms.
  */
 
+#pragma D depends_on module kernel
+
 typedef struct psinfo {
 	int	pr_nlwp;	/* number of threads */
 	pid_t	pr_pid;		/* unique process id */

Modified: projects/clang-trunk/cddl/lib/libdtrace/regs_x86.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/regs_x86.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/regs_x86.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -28,8 +28,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"@(#)regs.d.in	1.1	04/09/28 SMI"
-
 inline int R_GS = 0;
 #pragma D binding "1.0" R_GS
 inline int R_FS = 1;

Modified: projects/clang-trunk/cddl/lib/libdtrace/sched.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/sched.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/sched.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#pragma D depends_on module unix
+#pragma D depends_on module kernel
 #pragma D depends_on provider sched
 
 struct cpuinfo {

Modified: projects/clang-trunk/cddl/lib/libdtrace/siftr.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/siftr.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/siftr.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -21,6 +21,7 @@
  * $FreeBSD$
  */
 
+#pragma D depends_on module kernel
 #pragma D depends_on module siftr
 #pragma D depends_on provider tcp
 

Modified: projects/clang-trunk/cddl/lib/libdtrace/tcp.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/tcp.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/tcp.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -26,6 +26,7 @@
  */
 
 #pragma D depends_on library ip.d
+#pragma D depends_on module kernel
 #pragma D depends_on provider tcp
 
 /*

Modified: projects/clang-trunk/cddl/lib/libdtrace/udp.d
==============================================================================
--- projects/clang-trunk/cddl/lib/libdtrace/udp.d	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/lib/libdtrace/udp.d	Fri Aug  7 20:18:55 2015	(r286422)
@@ -26,6 +26,7 @@
  */
 
 #pragma D depends_on library ip.d
+#pragma D depends_on module kernel
 #pragma D depends_on provider udp
 
 /*

Modified: projects/clang-trunk/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- projects/clang-trunk/cddl/usr.sbin/dtrace/Makefile	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/cddl/usr.sbin/dtrace/Makefile	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace
 
 PROG=		dtrace
@@ -22,4 +24,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 
 LIBADD=	dtrace
 
+.if ${MK_DTRACE_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/clang-trunk/contrib/bsnmp/snmp_mibII/mibII_ip.c
==============================================================================
--- projects/clang-trunk/contrib/bsnmp/snmp_mibII/mibII_ip.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/bsnmp/snmp_mibII/mibII_ip.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -151,7 +151,7 @@ int
 op_ip(struct snmp_context *ctx, struct snmp_value *value,
     u_int sub, u_int idx __unused, enum snmp_op op)
 {
-	int old;
+	int old = 0;
 
 	switch (op) {
 

Modified: projects/clang-trunk/contrib/gcc/c-cppbuiltin.c
==============================================================================
--- projects/clang-trunk/contrib/gcc/c-cppbuiltin.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/c-cppbuiltin.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -553,7 +553,9 @@ c_cpp_builtins (cpp_reader *pfile)
   /* Make the choice of the stack protector runtime visible to source code.
      The macro names and values here were chosen for compatibility with an
      earlier implementation, i.e. ProPolice.  */
-  if (flag_stack_protect == 2)
+  if (flag_stack_protect == 3)
+    cpp_define (pfile, "__SSP_STRONG__=3");
+  else if (flag_stack_protect == 2)
     cpp_define (pfile, "__SSP_ALL__=2");
   else if (flag_stack_protect == 1)
     cpp_define (pfile, "__SSP__=1");

Modified: projects/clang-trunk/contrib/gcc/cfgexpand.c
==============================================================================
--- projects/clang-trunk/contrib/gcc/cfgexpand.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/cfgexpand.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -810,6 +810,12 @@ clear_tree_used (tree block)
     clear_tree_used (t);
 }
 
+enum {
+  SPCT_FLAG_DEFAULT = 1,
+  SPCT_FLAG_ALL = 2,
+  SPCT_FLAG_STRONG = 3
+};
+
 /* Examine TYPE and determine a bit mask of the following features.  */
 
 #define SPCT_HAS_LARGE_CHAR_ARRAY	1
@@ -879,7 +885,8 @@ stack_protect_decl_phase (tree decl)
   if (bits & SPCT_HAS_SMALL_CHAR_ARRAY)
     has_short_buffer = true;
 
-  if (flag_stack_protect == 2)
+  if (flag_stack_protect == SPCT_FLAG_ALL
+      || flag_stack_protect == SPCT_FLAG_STRONG)
     {
       if ((bits & (SPCT_HAS_SMALL_CHAR_ARRAY | SPCT_HAS_LARGE_CHAR_ARRAY))
 	  && !(bits & SPCT_HAS_AGGREGATE))
@@ -947,12 +954,36 @@ create_stack_guard (void)
   cfun->stack_protect_guard = guard;
 }
 
+/* Helper routine to check if a record or union contains an array field. */
+
+static int
+record_or_union_type_has_array_p (tree tree_type)
+{
+  tree fields = TYPE_FIELDS (tree_type);
+  tree f;
+
+  for (f = fields; f; f = TREE_CHAIN (f))
+    if (TREE_CODE (f) == FIELD_DECL)
+      {
+	tree field_type = TREE_TYPE (f);
+	if ((TREE_CODE (field_type) == RECORD_TYPE
+	     || TREE_CODE (field_type) == UNION_TYPE
+	     || TREE_CODE (field_type) == QUAL_UNION_TYPE)
+	    && record_or_union_type_has_array_p (field_type))
+	  return 1;
+	if (TREE_CODE (field_type) == ARRAY_TYPE)
+	  return 1;
+      }
+  return 0;
+}
+
 /* Expand all variables used in the function.  */
 
 static void
 expand_used_vars (void)
 {
   tree t, outer_block = DECL_INITIAL (current_function_decl);
+  bool gen_stack_protect_signal = false;
 
   /* Compute the phase of the stack frame for this function.  */
   {
@@ -972,6 +1003,29 @@ expand_used_vars (void)
   has_protected_decls = false;
   has_short_buffer = false;
 
+  if (flag_stack_protect == SPCT_FLAG_STRONG)
+    for (t = cfun->unexpanded_var_list; t; t = TREE_CHAIN (t))
+      {
+	tree var = TREE_VALUE (t);
+	if (!is_global_var (var))
+	  {
+	    tree var_type = TREE_TYPE (var);
+	    /* Examine local referenced variables that have their addresses
+	     * taken, contain an array, or are arrays. */
+	    if (TREE_CODE (var) == VAR_DECL
+		&& (TREE_CODE (var_type) == ARRAY_TYPE
+		    || TREE_ADDRESSABLE (var)
+		    || ((TREE_CODE (var_type) == RECORD_TYPE
+			 || TREE_CODE (var_type) == UNION_TYPE
+			 || TREE_CODE (var_type) == QUAL_UNION_TYPE)
+			&& record_or_union_type_has_array_p (var_type))))
+	      {
+		gen_stack_protect_signal = true;
+		break;
+	      }
+	  }
+      }
+
   /* At this point all variables on the unexpanded_var_list with TREE_USED
      set are not associated with any block scope.  Lay them out.  */
   for (t = cfun->unexpanded_var_list; t; t = TREE_CHAIN (t))
@@ -1032,12 +1086,26 @@ expand_used_vars (void)
 	dump_stack_var_partition ();
     }
 
-  /* There are several conditions under which we should create a
-     stack guard: protect-all, alloca used, protected decls present.  */
-  if (flag_stack_protect == 2
-      || (flag_stack_protect
-	  && (current_function_calls_alloca || has_protected_decls)))
-    create_stack_guard ();
+  switch (flag_stack_protect)
+    {
+    case SPCT_FLAG_ALL:
+      create_stack_guard ();
+      break;
+
+    case SPCT_FLAG_STRONG:
+      if (gen_stack_protect_signal
+	  || current_function_calls_alloca || has_protected_decls)
+	create_stack_guard ();
+      break;
+
+    case SPCT_FLAG_DEFAULT:
+      if (current_function_calls_alloca || has_protected_decls)
+	create_stack_guard();
+      break;
+
+    default:
+      ;
+    }
 
   /* Assign rtl to each variable based on these partitions.  */
   if (stack_vars_num > 0)

Modified: projects/clang-trunk/contrib/gcc/common.opt
==============================================================================
--- projects/clang-trunk/contrib/gcc/common.opt	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/common.opt	Fri Aug  7 20:18:55 2015	(r286422)
@@ -878,6 +878,10 @@ fstack-protector-all
 Common Report RejectNegative Var(flag_stack_protect, 2) VarExists
 Use a stack protection method for every function
 
+fstack-protector-strong
+Common Report RejectNegative Var(flag_stack_protect, 3)
+Use a smart stack protection method for certain functions
+
 fstrength-reduce
 Common
 Does nothing.  Preserved for backward compatibility.

Modified: projects/clang-trunk/contrib/gcc/doc/cpp.texi
==============================================================================
--- projects/clang-trunk/contrib/gcc/doc/cpp.texi	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/doc/cpp.texi	Fri Aug  7 20:18:55 2015	(r286422)
@@ -2134,6 +2134,10 @@ use.
 This macro is defined, with value 2, when @option{-fstack-protector-all} is
 in use.
 
+ at item __SSP_STRONG__
+This macro is defined, with value 3, when @option{-fstack-protector-strong} is
+in use.
+
 @item __TIMESTAMP__
 This macro expands to a string constant that describes the date and time
 of the last modification of the current source file. The string constant

Modified: projects/clang-trunk/contrib/gcc/doc/gcc.1
==============================================================================
--- projects/clang-trunk/contrib/gcc/doc/gcc.1	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/doc/gcc.1	Fri Aug  7 20:18:55 2015	(r286422)
@@ -339,7 +339,7 @@ in the following sections.
 \&\fB\-fsched2\-use\-superblocks 
 \&\-fsched2\-use\-traces \-fsee \-freschedule\-modulo\-scheduled\-loops 
 \&\-fsection\-anchors  \-fsignaling\-nans  \-fsingle\-precision\-constant 
-\&\-fstack\-protector  \-fstack\-protector\-all 
+\&\-fstack\-protector  \-fstack\-protector\-all   \-fstack\-protector\-strong
 \&\-fstrict\-aliasing  \-fstrict\-overflow  \-ftracer  \-fthread\-jumps 
 \&\-funroll\-all\-loops  \-funroll\-loops  \-fpeel\-loops 
 \&\-fsplit\-ivs\-in\-unroller \-funswitch\-loops 
@@ -5193,6 +5193,11 @@ If a guard check fails, an error message
 .IP "\fB\-fstack\-protector\-all\fR" 4
 .IX Item "-fstack-protector-all"
 Like \fB\-fstack\-protector\fR except that all functions are protected.
+.IP "\fB\-fstack\-protector\-strong\fR" 4
+.IX Item "-fstack-protector-strong"
+Like \fB\-fstack\-protector\fR but includes additional functions to
+be protected \-\-\- those that have local array definitions, or have
+references to local frame addresses.
 .IP "\fB\-fsection\-anchors\fR" 4
 .IX Item "-fsection-anchors"
 Try to reduce the number of symbolic address calculations by using

Modified: projects/clang-trunk/contrib/gcc/doc/invoke.texi
==============================================================================
--- projects/clang-trunk/contrib/gcc/doc/invoke.texi	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/doc/invoke.texi	Fri Aug  7 20:18:55 2015	(r286422)
@@ -331,7 +331,7 @@ in the following sections.
 -fsched2-use-superblocks @gol
 -fsched2-use-traces -fsee -freschedule-modulo-scheduled-loops @gol
 -fsection-anchors  -fsignaling-nans  -fsingle-precision-constant @gol
--fstack-protector  -fstack-protector-all @gol
+-fstack-protector  -fstack-protector-all  -fstack-protector-strong @gol
 -fstrict-aliasing  -fstrict-overflow  -ftracer  -fthread-jumps @gol
 -funroll-all-loops  -funroll-loops  -fpeel-loops @gol
 -fsplit-ivs-in-unroller -funswitch-loops @gol
@@ -5810,6 +5810,11 @@ If a guard check fails, an error message
 @item -fstack-protector-all
 Like @option{-fstack-protector} except that all functions are protected.
 
+ at item -fstack-protector-strong
+Like @option{-fstack-protector} but includes additional functions to
+be protected --- those that have local array definitions, or have
+references to local frame addresses.
+
 @item -fsection-anchors
 @opindex fsection-anchors
 Try to reduce the number of symbolic address calculations by using

Modified: projects/clang-trunk/contrib/gcc/gcc.c
==============================================================================
--- projects/clang-trunk/contrib/gcc/gcc.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/gcc/gcc.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -680,7 +680,7 @@ proper position among the other output f
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector:}"
 #else
-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared -lssp}"
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-strong|fstack-protector-all:-lssp_nonshared -lssp}"
 #endif
 #endif
 

Modified: projects/clang-trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c
==============================================================================
--- projects/clang-trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -585,13 +585,23 @@ static int
 archive_read_format_tar_skip(struct archive_read *a)
 {
 	int64_t bytes_skipped;
+	int64_t request;
+	struct sparse_block *p;
 	struct tar* tar;
 
 	tar = (struct tar *)(a->format->data);
 
-	bytes_skipped = __archive_read_consume(a,
-	    tar->entry_bytes_remaining + tar->entry_padding + 
-	    tar->entry_bytes_unconsumed);
+	/* Do not consume the hole of a sparse file. */
+	request = 0;
+	for (p = tar->sparse_list; p != NULL; p = p->next) {
+		if (!p->hole)
+			request += p->remaining;
+	}
+	if (request > tar->entry_bytes_remaining)
+		request = tar->entry_bytes_remaining;
+	request += tar->entry_padding + tar->entry_bytes_unconsumed;
+
+	bytes_skipped = __archive_read_consume(a, request);
 	if (bytes_skipped < 0)
 		return (ARCHIVE_FATAL);
 

Copied: projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c (from r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c	Fri Aug  7 20:18:55 2015	(r286422, copy of r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c)
@@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD");
+
+/*
+ * To test skip a sparse file entry, this test does not read file data.
+ */
+DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
+{
+#ifndef __FreeBSD__ /* Backport test. */
+	const char *refname = "test_read_format_gtar_sparse_skip_entry.tar.Z.uu";
+#else
+	const char *refname = "test_read_format_gtar_sparse_skip_entry.tar.Z";
+#endif
+	struct archive *a;
+	struct archive_entry *ae;
+	const void *p;
+	size_t s;
+	int64_t o;
+
+#ifndef __FreeBSD__ /* Backport test. */
+	copy_reference_file(refname);
+#else
+	extract_reference_file(refname);
+#endif
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_read_open_filename(a, refname, 10240));
+
+	/* Verify regular first file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("a", archive_entry_pathname(ae));
+	assertEqualInt(10737418244, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a),
+	    ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
+
+	/* Verify regular second file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("b", archive_entry_pathname(ae));
+	assertEqualInt(4, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a),
+	    ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
+
+
+	/* End of archive. */
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+	/* Verify archive format. */
+	assertEqualIntA(a, ARCHIVE_FILTER_COMPRESS, archive_filter_code(a, 0));
+	assertEqualIntA(a, ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE,
+	    archive_format(a));
+
+	/* Close the archive. */
+	assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+
+
+	/*
+	 * Read just one block of a sparse file and skip it.
+	 */
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_read_open_filename(a, refname, 10240));
+
+	/* Verify regular first file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("a", archive_entry_pathname(ae));
+	assertEqualInt(10737418244, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a),
+	    ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
+	assertEqualInt(0, archive_read_data_block(a, &p, &s, &o));
+	assertEqualInt(4096, s);
+	assertEqualInt(0, o);
+
+
+	/* Verify regular second file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("b", archive_entry_pathname(ae));
+	assertEqualInt(4, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a),
+	    ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
+
+
+	/* End of archive. */
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+	/* Verify archive format. */
+	assertEqualIntA(a, ARCHIVE_FILTER_COMPRESS, archive_filter_code(a, 0));
+	assertEqualIntA(a, ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE,
+	    archive_format(a));
+
+	/* Close the archive. */
+	assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+

Copied: projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu (from r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu	Fri Aug  7 20:18:55 2015	(r286422, copy of r286421, head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu)
@@ -0,0 +1,15 @@
+begin 644 -
+M'YV04,+ at 05(F#)DR<EZ$`<"PH<.'$"-*G$BQHL6*,#+:L$$#!(",,6[4 at .$1
+MI$B2'S.JS#A#A at P0,63,L`$C!HP9-VB\K"FCAHT8`$#@N4BTJ-&C2"/6F4,G
+MC)R48^J424HQZE2J$E=F+*G5(]:O8,.*'3M6!LDY:?24Z6'S!DX:,7#(H$%#
+MP0R2;>BD:;,V!@T8-6)NE&'#10T<-#;>R(%CAEV28_3R9?LW\(P8-F[`<#%C
+M)@T<->#6>`PBC.2^E07;J#'#Q>J-F5DJ<`GBB),J+N;`<3JGC(LV8=2\D<-V
+M]DO;N'7S]MTFC9OA/6#,CE'[=N[=<GJ[<!-F<AB[-:HGQZY=3D$V:-6RA>$V
+M9]RY=<G*GT^_OOW[^/.#13Z%?!DC:;!1AD+Z%6B12AMUE%)((W'%($I:U603
+M#!W%-%---^6T4PPM8184#`:&"-9233V5D57SH2A?A%RMY)6(,,8HHPP*2/=7
+M#C8HT-9;[_VE0'PR!BGDD$06:>212"9YD1EOO*&`DE!&*>645%9IY9589JGE
+MEEQVZ>678(8IYIADEFGFF6BFJ>::;+;IYIMPQBGGG'36:>>=>.:IYYY\]NGG
+MGX`&*NB at A!9JJ)YB](D at 1PZ>U&B#*468484RT11###7<8!8(&-)4PX=^DN at 4
+B5%*E6.J*746JTHN'2LFDDZW&*NNLM-9JZZVXYJKKKKR&!0``
+`
+end

Modified: projects/clang-trunk/contrib/llvm/tools/lldb/docs/lldb.1
==============================================================================
--- projects/clang-trunk/contrib/llvm/tools/lldb/docs/lldb.1	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/llvm/tools/lldb/docs/lldb.1	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1,6 +1,6 @@
 .Dd June 7, 2012     \" DATE
 .Dt LLDB 1           \" Program name and manual section number
-.Os Darwin           \" Operating System
+.Os
 .Sh NAME             \" Section Header - required - don't modify
 .Nm lldb
 .Nd The debugger

Modified: projects/clang-trunk/contrib/sendmail/FREEBSD-upgrade
==============================================================================
--- projects/clang-trunk/contrib/sendmail/FREEBSD-upgrade	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/contrib/sendmail/FREEBSD-upgrade	Fri Aug  7 20:18:55 2015	(r286422)
@@ -86,6 +86,7 @@ infrastructure in FreeBSD:
 	share/man/man8/rc.sendmail.8
 	share/mk/bsd.libnames.mk
 	share/sendmail/Makefile
+	tools/build/mk/OptionalObsoleteFiles.inc
 	usr.bin/Makefile
 	usr.bin/vacation/Makefile
 	usr.sbin/Makefile

Modified: projects/clang-trunk/crypto/openssh/auth2-chall.c
==============================================================================
--- projects/clang-trunk/crypto/openssh/auth2-chall.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/crypto/openssh/auth2-chall.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -82,6 +82,7 @@ struct KbdintAuthctxt
 	void *ctxt;
 	KbdintDevice *device;
 	u_int nreq;
+	u_int devices_done;
 };
 
 #ifdef USE_PAM
@@ -168,11 +169,15 @@ kbdint_next_device(Authctxt *authctxt, K
 		if (len == 0)
 			break;
 		for (i = 0; devices[i]; i++) {
-			if (!auth2_method_allowed(authctxt,
+			if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
+			    !auth2_method_allowed(authctxt,
 			    "keyboard-interactive", devices[i]->name))
 				continue;
-			if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0)
+			if (strncmp(kbdintctxt->devices, devices[i]->name,
+			    len) == 0) {
 				kbdintctxt->device = devices[i];
+				kbdintctxt->devices_done |= 1 << i;
+			}
 		}
 		t = kbdintctxt->devices;
 		kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL;

Modified: projects/clang-trunk/crypto/openssh/sshconnect.c
==============================================================================
--- projects/clang-trunk/crypto/openssh/sshconnect.c	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/crypto/openssh/sshconnect.c	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1247,29 +1247,39 @@ verify_host_key(char *host, struct socka
 {
 	int flags = 0;
 	char *fp;
+	Key *plain = NULL;
 
 	fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
 	debug("Server host key: %s %s", key_type(host_key), fp);
 	free(fp);
 
-	/* XXX certs are not yet supported for DNS */
-	if (!key_is_cert(host_key) && options.verify_host_key_dns &&
-	    verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) {
-		if (flags & DNS_VERIFY_FOUND) {
-
-			if (options.verify_host_key_dns == 1 &&
-			    flags & DNS_VERIFY_MATCH &&
-			    flags & DNS_VERIFY_SECURE)
-				return 0;
-
-			if (flags & DNS_VERIFY_MATCH) {
-				matching_host_key_dns = 1;
-			} else {
-				warn_changed_key(host_key);
-				error("Update the SSHFP RR in DNS with the new "
-				    "host key to get rid of this message.");
+	if (options.verify_host_key_dns) {
+		/*
+		 * XXX certs are not yet supported for DNS, so downgrade
+		 * them and try the plain key.
+		 */
+		plain = key_from_private(host_key);
+		if (key_is_cert(plain))
+			key_drop_cert(plain);
+		if (verify_host_key_dns(host, hostaddr, plain, &flags) == 0) {
+			if (flags & DNS_VERIFY_FOUND) {
+				if (options.verify_host_key_dns == 1 &&
+				    flags & DNS_VERIFY_MATCH &&
+				    flags & DNS_VERIFY_SECURE) {
+					key_free(plain);
+					return 0;
+				}
+				if (flags & DNS_VERIFY_MATCH) {
+					matching_host_key_dns = 1;
+				} else {
+					warn_changed_key(plain);
+					error("Update the SSHFP RR in DNS "
+					    "with the new host key to get rid "
+					    "of this message.");
+				}
 			}
 		}
+		key_free(plain);
 	}
 
 	return check_host_key(host, hostaddr, options.port, host_key, RDRW,

Modified: projects/clang-trunk/etc/defaults/rc.conf
==============================================================================
--- projects/clang-trunk/etc/defaults/rc.conf	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/etc/defaults/rc.conf	Fri Aug  7 20:18:55 2015	(r286422)
@@ -664,7 +664,7 @@ opensm_enable="NO"	# Opensm(8) for infin
 casperd_enable="YES"	# casperd(8) daemon
 
 # rctl(8) requires kernel options RACCT and RCTL
-rctl_enable="NO"		# Load rctl(8) rules on boot
+rctl_enable="YES"		# Load rctl(8) rules on boot
 rctl_rules="/etc/rctl.conf"	# rctl(8) ruleset. See rctl.conf(5).
 
 iovctl_files=""		# Config files for iovctl(8)

Modified: projects/clang-trunk/etc/network.subr
==============================================================================
--- projects/clang-trunk/etc/network.subr	Fri Aug  7 20:13:04 2015	(r286421)
+++ projects/clang-trunk/etc/network.subr	Fri Aug  7 20:18:55 2015	(r286422)
@@ -1249,6 +1249,70 @@ ifscript_down()
 	fi
 }
 
+# wlan_up
+#	Create IEEE802.3 interfaces.
+#
+wlan_up()
+{
+	local _list _iflist wlan parent ifn
+	_list=
+	_iflist=$*
+
+	for wlan in `set | egrep ^wlans_[a-z]+[0-9]+=[a-z]+[0-9]+`; do
+		# Parse wlans_$parent=$ifn

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