Date: Wed, 1 Jun 2016 10:24:09 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r301116 - in projects/vnet: . bin/ls/tests bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/usr.sbin cddl/usr.sbin/zfsd contrib/binutils/include contrib/g... Message-ID: <201606011024.u51AO90Z094068@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Wed Jun 1 10:24:08 2016 New Revision: 301116 URL: https://svnweb.freebsd.org/changeset/base/301116 Log: MfH @r301115 After merging the removal or pr_destroy. Sponsored by: The FreeBSD Foundation Added: projects/vnet/cddl/usr.sbin/zfsd/ - copied from r301115, head/cddl/usr.sbin/zfsd/ projects/vnet/contrib/libc++/include/__nullptr - copied unchanged from r301115, head/contrib/libc++/include/__nullptr projects/vnet/contrib/libc++/include/ctype.h - copied unchanged from r301115, head/contrib/libc++/include/ctype.h projects/vnet/contrib/libc++/include/errno.h - copied unchanged from r301115, head/contrib/libc++/include/errno.h projects/vnet/contrib/libc++/include/experimental/any - copied unchanged from r301115, head/contrib/libc++/include/experimental/any projects/vnet/contrib/libc++/include/experimental/functional - copied unchanged from r301115, head/contrib/libc++/include/experimental/functional projects/vnet/contrib/libc++/include/float.h - copied unchanged from r301115, head/contrib/libc++/include/float.h projects/vnet/contrib/libc++/include/inttypes.h - copied unchanged from r301115, head/contrib/libc++/include/inttypes.h projects/vnet/contrib/libc++/include/math.h - copied unchanged from r301115, head/contrib/libc++/include/math.h projects/vnet/contrib/libc++/include/setjmp.h - copied unchanged from r301115, head/contrib/libc++/include/setjmp.h projects/vnet/contrib/libc++/include/stddef.h - copied unchanged from r301115, head/contrib/libc++/include/stddef.h projects/vnet/contrib/libc++/include/stdio.h - copied unchanged from r301115, head/contrib/libc++/include/stdio.h projects/vnet/contrib/libc++/include/stdlib.h - copied unchanged from r301115, head/contrib/libc++/include/stdlib.h projects/vnet/contrib/libc++/include/wchar.h - copied unchanged from r301115, head/contrib/libc++/include/wchar.h projects/vnet/contrib/libc++/include/wctype.h - copied unchanged from r301115, head/contrib/libc++/include/wctype.h projects/vnet/contrib/libc++/src/any.cpp - copied unchanged from r301115, head/contrib/libc++/src/any.cpp projects/vnet/contrib/libc++/src/include/ - copied from r301115, head/contrib/libc++/src/include/ projects/vnet/etc/rc.d/zfsd - copied unchanged from r301115, head/etc/rc.d/zfsd projects/vnet/lib/libdevdctl/ - copied from r301115, head/lib/libdevdctl/ projects/vnet/lib/libmd/skein.3 - copied unchanged from r301115, head/lib/libmd/skein.3 projects/vnet/lib/libmd/skeindriver.c - copied unchanged from r301115, head/lib/libmd/skeindriver.c projects/vnet/rescue/rescue/Makefile.depend - copied unchanged from r301115, head/rescue/rescue/Makefile.depend projects/vnet/sys/arm/allwinner/axp209reg.h - copied unchanged from r301115, head/sys/arm/allwinner/axp209reg.h projects/vnet/sys/boot/efi/libefi/devpath.c - copied unchanged from r301115, head/sys/boot/efi/libefi/devpath.c projects/vnet/sys/boot/fdt/dts/arm/xpowers-axp209.dtsi - copied unchanged from r301115, head/sys/boot/fdt/dts/arm/xpowers-axp209.dtsi projects/vnet/sys/crypto/sha2/sha512t.h - copied unchanged from r301115, head/sys/crypto/sha2/sha512t.h projects/vnet/sys/crypto/skein/ - copied from r301115, head/sys/crypto/skein/ projects/vnet/sys/dev/ath/ath_hal/ah_btcoex.h - copied unchanged from r301115, head/sys/dev/ath/ath_hal/ah_btcoex.h projects/vnet/sys/dev/gpio/gpiopps.c - copied unchanged from r301115, head/sys/dev/gpio/gpiopps.c projects/vnet/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S projects/vnet/sys/dev/hyperv/vmbus/hyperv.c - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/hyperv.c projects/vnet/sys/dev/hyperv/vmbus/hyperv_var.h - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/hyperv_var.h projects/vnet/sys/dev/hyperv/vmbus/i386/vmbus_vector.S - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S projects/vnet/sys/dev/hyperv/vmbus/vmbus.c - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/vmbus.c projects/vnet/sys/dev/hyperv/vmbus/vmbus_et.c - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/vmbus_et.c projects/vnet/sys/dev/hyperv/vmbus/vmbus_reg.h - copied unchanged from r301115, head/sys/dev/hyperv/vmbus/vmbus_reg.h projects/vnet/sys/modules/gpio/gpiopps/ - copied from r301115, head/sys/modules/gpio/gpiopps/ projects/vnet/sys/netpfil/ipfw/dn_aqm.h - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_aqm.h projects/vnet/sys/netpfil/ipfw/dn_aqm_codel.c - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_aqm_codel.c projects/vnet/sys/netpfil/ipfw/dn_aqm_codel.h - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_aqm_codel.h projects/vnet/sys/netpfil/ipfw/dn_aqm_pie.c - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_aqm_pie.c projects/vnet/sys/netpfil/ipfw/dn_aqm_pie.h - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_aqm_pie.h projects/vnet/sys/netpfil/ipfw/dn_sched_fq_codel.c - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_sched_fq_codel.c projects/vnet/sys/netpfil/ipfw/dn_sched_fq_codel.h - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_sched_fq_codel.h projects/vnet/sys/netpfil/ipfw/dn_sched_fq_codel_helper.h - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_sched_fq_codel_helper.h projects/vnet/sys/netpfil/ipfw/dn_sched_fq_pie.c - copied unchanged from r301115, head/sys/netpfil/ipfw/dn_sched_fq_pie.c projects/vnet/sys/sys/spigenio.h - copied unchanged from r301115, head/sys/sys/spigenio.h projects/vnet/tools/bsdbox/Makefile.depend - copied unchanged from r301115, head/tools/bsdbox/Makefile.depend Deleted: projects/vnet/contrib/libc++/src/config_elast.h projects/vnet/contrib/libc++/src/support/ projects/vnet/sys/dev/hyperv/vmbus/amd64/hv_vector.S projects/vnet/sys/dev/hyperv/vmbus/hv_et.c projects/vnet/sys/dev/hyperv/vmbus/hv_hv.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/vnet/sys/dev/hyperv/vmbus/i386/hv_vector.S Modified: projects/vnet/Makefile.inc1 projects/vnet/Makefile.libcompat projects/vnet/ObsoleteFiles.inc projects/vnet/UPDATING projects/vnet/bin/ls/tests/ls_tests.sh projects/vnet/bin/sh/sh.1 projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/vnet/cddl/usr.sbin/Makefile projects/vnet/contrib/binutils/include/libiberty.h projects/vnet/contrib/gcc/c-decl.c projects/vnet/contrib/libc++/include/__config projects/vnet/contrib/libc++/include/__functional_03 projects/vnet/contrib/libc++/include/__functional_base projects/vnet/contrib/libc++/include/__functional_base_03 projects/vnet/contrib/libc++/include/__hash_table projects/vnet/contrib/libc++/include/__locale projects/vnet/contrib/libc++/include/__mutex_base projects/vnet/contrib/libc++/include/__split_buffer projects/vnet/contrib/libc++/include/__tree projects/vnet/contrib/libc++/include/__tuple projects/vnet/contrib/libc++/include/algorithm projects/vnet/contrib/libc++/include/array projects/vnet/contrib/libc++/include/atomic projects/vnet/contrib/libc++/include/bitset projects/vnet/contrib/libc++/include/cctype projects/vnet/contrib/libc++/include/cerrno projects/vnet/contrib/libc++/include/cfenv projects/vnet/contrib/libc++/include/cfloat projects/vnet/contrib/libc++/include/chrono projects/vnet/contrib/libc++/include/cinttypes projects/vnet/contrib/libc++/include/cmath projects/vnet/contrib/libc++/include/complex.h projects/vnet/contrib/libc++/include/condition_variable projects/vnet/contrib/libc++/include/csetjmp projects/vnet/contrib/libc++/include/cstddef projects/vnet/contrib/libc++/include/cstdio projects/vnet/contrib/libc++/include/cstdlib projects/vnet/contrib/libc++/include/cwchar projects/vnet/contrib/libc++/include/cwctype projects/vnet/contrib/libc++/include/deque projects/vnet/contrib/libc++/include/exception projects/vnet/contrib/libc++/include/experimental/algorithm projects/vnet/contrib/libc++/include/experimental/dynarray projects/vnet/contrib/libc++/include/ext/hash_map projects/vnet/contrib/libc++/include/forward_list projects/vnet/contrib/libc++/include/functional projects/vnet/contrib/libc++/include/future projects/vnet/contrib/libc++/include/ios projects/vnet/contrib/libc++/include/istream projects/vnet/contrib/libc++/include/iterator projects/vnet/contrib/libc++/include/limits projects/vnet/contrib/libc++/include/list projects/vnet/contrib/libc++/include/locale projects/vnet/contrib/libc++/include/map projects/vnet/contrib/libc++/include/memory projects/vnet/contrib/libc++/include/module.modulemap projects/vnet/contrib/libc++/include/mutex projects/vnet/contrib/libc++/include/random projects/vnet/contrib/libc++/include/ratio projects/vnet/contrib/libc++/include/regex projects/vnet/contrib/libc++/include/scoped_allocator projects/vnet/contrib/libc++/include/set projects/vnet/contrib/libc++/include/string projects/vnet/contrib/libc++/include/thread projects/vnet/contrib/libc++/include/tuple projects/vnet/contrib/libc++/include/type_traits projects/vnet/contrib/libc++/include/unordered_map projects/vnet/contrib/libc++/include/utility projects/vnet/contrib/libc++/include/valarray projects/vnet/contrib/libc++/include/vector projects/vnet/contrib/libc++/src/exception.cpp projects/vnet/contrib/libc++/src/future.cpp projects/vnet/contrib/libc++/src/ios.cpp projects/vnet/contrib/libc++/src/locale.cpp projects/vnet/contrib/libc++/src/memory.cpp projects/vnet/contrib/libc++/src/mutex.cpp projects/vnet/contrib/libc++/src/new.cpp projects/vnet/contrib/libc++/src/stdexcept.cpp projects/vnet/contrib/libc++/src/system_error.cpp projects/vnet/contrib/libc++/src/typeinfo.cpp projects/vnet/contrib/libxo/configure.ac projects/vnet/contrib/libxo/doc/libxo-manual.html projects/vnet/contrib/libxo/doc/libxo.txt projects/vnet/contrib/libxo/libxo/libxo.c projects/vnet/contrib/libxo/libxo/xo_buf.h projects/vnet/contrib/libxo/libxo/xo_encoder.c projects/vnet/contrib/libxo/libxo/xo_format.5 projects/vnet/contrib/libxo/libxo/xo_syslog.c projects/vnet/contrib/libxo/tests/core/saved/test_03.E.out projects/vnet/contrib/libxo/tests/core/saved/test_03.H.out projects/vnet/contrib/libxo/tests/core/saved/test_03.HIPx.out projects/vnet/contrib/libxo/tests/core/saved/test_03.HP.out projects/vnet/contrib/libxo/tests/core/saved/test_03.J.out projects/vnet/contrib/libxo/tests/core/saved/test_03.JP.out projects/vnet/contrib/libxo/tests/core/saved/test_03.T.out projects/vnet/contrib/libxo/tests/core/saved/test_03.X.out projects/vnet/contrib/libxo/tests/core/saved/test_03.XP.out projects/vnet/contrib/libxo/tests/core/test_03.c projects/vnet/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp projects/vnet/etc/defaults/rc.conf projects/vnet/etc/mtree/BSD.include.dist projects/vnet/etc/mtree/BSD.tests.dist projects/vnet/etc/mtree/BSD.var.dist projects/vnet/etc/periodic/daily/480.leapfile-ntpd projects/vnet/etc/rc.d/Makefile projects/vnet/etc/rc.d/dhclient projects/vnet/etc/rc.d/ldconfig projects/vnet/etc/rc.d/mountcritremote projects/vnet/etc/rc.d/netif projects/vnet/etc/rc.d/random projects/vnet/etc/rc.d/routing projects/vnet/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/vnet/include/dirent.h projects/vnet/include/libgen.h projects/vnet/include/monetary.h projects/vnet/include/ndbm.h projects/vnet/include/netdb.h projects/vnet/include/signal.h projects/vnet/include/wchar.h projects/vnet/lib/Makefile projects/vnet/lib/clang/include/clang/Basic/Version.inc projects/vnet/lib/libc++/Makefile projects/vnet/lib/libc/db/hash/ndbm.c projects/vnet/lib/libc/db/man/dbm.3 projects/vnet/lib/libc/gen/psignal.3 projects/vnet/lib/libc/gen/psignal.c projects/vnet/lib/libc/locale/ascii.c (contents, props changed) projects/vnet/lib/libc/locale/none.c projects/vnet/lib/libc/stdlib/div.c projects/vnet/lib/libc/stdlib/imaxdiv.c projects/vnet/lib/libc/stdlib/l64a.c projects/vnet/lib/libc/stdlib/ldiv.c projects/vnet/lib/libc/stdlib/lldiv.c projects/vnet/lib/libc/stdlib/rand.c projects/vnet/lib/libc/stdlib/random.c projects/vnet/lib/libc/sys/_umtx_op.2 projects/vnet/lib/libc/sys/jail.2 projects/vnet/lib/libc/sys/thr_exit.2 projects/vnet/lib/libc/sys/thr_kill.2 projects/vnet/lib/libc/sys/thr_new.2 projects/vnet/lib/libc/sys/thr_self.2 projects/vnet/lib/libc/sys/thr_set_name.2 projects/vnet/lib/libcrypt/Makefile projects/vnet/lib/libcxxrt/Makefile projects/vnet/lib/libfetch/http.c projects/vnet/lib/libmd/Makefile projects/vnet/lib/libmd/md5.h projects/vnet/lib/libmd/mdX.3 projects/vnet/lib/libmd/ripemd.3 projects/vnet/lib/libmd/sha.3 projects/vnet/lib/libmd/sha256.3 projects/vnet/lib/libmd/sha512.3 projects/vnet/lib/libmd/shadriver.c projects/vnet/lib/libthr/libthr.3 projects/vnet/lib/libthr/thread/thr_cond.c projects/vnet/lib/libthr/thread/thr_private.h projects/vnet/lib/libxo/add.man projects/vnet/lib/libxo/xo_config.h projects/vnet/release/Makefile projects/vnet/release/Makefile.mirrors projects/vnet/release/Makefile.vm projects/vnet/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/vnet/release/release.conf.sample projects/vnet/release/scripts/pkg-stage.sh projects/vnet/release/tools/arm.subr projects/vnet/sbin/ifconfig/af_inet.c projects/vnet/sbin/ifconfig/af_inet6.c projects/vnet/sbin/ifconfig/af_link.c projects/vnet/sbin/ifconfig/ifconfig.8 projects/vnet/sbin/ifconfig/ifconfig.c projects/vnet/sbin/ipfw/dummynet.c projects/vnet/sbin/ipfw/ipfw2.h projects/vnet/sbin/md5/Makefile projects/vnet/sbin/md5/md5.1 projects/vnet/sbin/md5/md5.c projects/vnet/sbin/swapon/swapon.c projects/vnet/share/man/man3/pthread_attr_get_np.3 projects/vnet/share/man/man3/pthread_barrier_destroy.3 projects/vnet/share/man/man3/pthread_barrierattr.3 projects/vnet/share/man/man3/pthread_condattr.3 projects/vnet/share/man/man3/pthread_resume_np.3 projects/vnet/share/man/man3/pthread_rwlock_init.3 projects/vnet/share/man/man3/pthread_rwlockattr_setpshared.3 projects/vnet/share/man/man3/pthread_spin_init.3 projects/vnet/share/man/man3/pthread_suspend_np.3 projects/vnet/share/man/man4/pfsync.4 projects/vnet/share/man/man9/domain.9 projects/vnet/share/misc/organization.dot projects/vnet/share/mk/bsd.crunchgen.mk projects/vnet/share/mk/bsd.dep.mk projects/vnet/share/mk/bsd.info.mk projects/vnet/share/mk/bsd.kmod.mk projects/vnet/share/mk/bsd.lib.mk projects/vnet/share/mk/bsd.libnames.mk projects/vnet/share/mk/bsd.man.mk projects/vnet/share/mk/bsd.nls.mk projects/vnet/share/mk/bsd.own.mk projects/vnet/share/mk/bsd.prog.mk projects/vnet/share/mk/local.meta.sys.mk projects/vnet/share/mk/meta.autodep.mk projects/vnet/share/mk/src.libnames.mk projects/vnet/share/mk/src.sys.env.mk projects/vnet/share/mk/sys.mk projects/vnet/share/timedef/am_ET.UTF-8.src projects/vnet/share/timedef/be_BY.CP1131.src projects/vnet/share/timedef/be_BY.CP1251.src projects/vnet/share/timedef/be_BY.ISO8859-5.src projects/vnet/share/timedef/be_BY.UTF-8.src projects/vnet/share/timedef/bg_BG.CP1251.src projects/vnet/share/timedef/bg_BG.UTF-8.src projects/vnet/share/timedef/ca_IT.ISO8859-15.src projects/vnet/share/timedef/ca_IT.UTF-8.src projects/vnet/share/timedef/el_GR.ISO8859-7.src projects/vnet/share/timedef/el_GR.UTF-8.src projects/vnet/share/timedef/en_CA.UTF-8.src projects/vnet/share/timedef/en_GB.UTF-8.src projects/vnet/share/timedef/en_HK.UTF-8.src projects/vnet/share/timedef/en_IE.UTF-8.src projects/vnet/share/timedef/en_PH.UTF-8.src projects/vnet/share/timedef/en_SG.UTF-8.src projects/vnet/share/timedef/en_US.UTF-8.src projects/vnet/share/timedef/fr_BE.ISO8859-15.src projects/vnet/share/timedef/fr_BE.UTF-8.src projects/vnet/share/timedef/fr_CA.ISO8859-15.src projects/vnet/share/timedef/fr_CA.UTF-8.src projects/vnet/share/timedef/fr_CH.ISO8859-15.src projects/vnet/share/timedef/fr_CH.UTF-8.src projects/vnet/share/timedef/fr_FR.ISO8859-15.src projects/vnet/share/timedef/fr_FR.UTF-8.src projects/vnet/share/timedef/hi_IN.ISCII-DEV.src projects/vnet/share/timedef/hi_IN.UTF-8.src projects/vnet/share/timedef/hy_AM.ARMSCII-8.src projects/vnet/share/timedef/hy_AM.UTF-8.src projects/vnet/share/timedef/it_CH.ISO8859-15.src projects/vnet/share/timedef/it_CH.UTF-8.src projects/vnet/share/timedef/it_IT.ISO8859-15.src projects/vnet/share/timedef/it_IT.UTF-8.src projects/vnet/share/timedef/kk_Cyrl_KZ.UTF-8.src projects/vnet/share/timedef/nl_BE.UTF-8.src projects/vnet/share/timedef/nl_NL.UTF-8.src projects/vnet/share/timedef/pl_PL.ISO8859-2.src projects/vnet/share/timedef/pl_PL.UTF-8.src projects/vnet/share/timedef/ro_RO.ISO8859-2.src projects/vnet/share/timedef/ro_RO.UTF-8.src projects/vnet/share/timedef/ru_RU.CP1251.src projects/vnet/share/timedef/ru_RU.CP866.src projects/vnet/share/timedef/ru_RU.ISO8859-5.src projects/vnet/share/timedef/ru_RU.KOI8-R.src projects/vnet/share/timedef/ru_RU.UTF-8.src projects/vnet/share/timedef/sv_FI.ISO8859-15.src projects/vnet/share/timedef/sv_FI.UTF-8.src projects/vnet/share/timedef/sv_SE.ISO8859-15.src projects/vnet/share/timedef/sv_SE.UTF-8.src projects/vnet/share/timedef/tr_TR.ISO8859-9.src projects/vnet/share/timedef/tr_TR.UTF-8.src projects/vnet/share/timedef/uk_UA.CP1251.src projects/vnet/share/timedef/uk_UA.ISO8859-5.src projects/vnet/share/timedef/uk_UA.KOI8-U.src projects/vnet/share/timedef/uk_UA.UTF-8.src projects/vnet/sys/amd64/amd64/pmap.c projects/vnet/sys/amd64/amd64/trap.c projects/vnet/sys/arm/allwinner/aw_ccu.c projects/vnet/sys/arm/allwinner/axp209.c projects/vnet/sys/arm/arm/debug_monitor.c projects/vnet/sys/arm/arm/gic.c projects/vnet/sys/arm/arm/mp_machdep.c projects/vnet/sys/arm/freescale/imx/imx_gpio.c projects/vnet/sys/arm/include/debug_monitor.h projects/vnet/sys/arm/ti/ti_adc.c projects/vnet/sys/arm64/arm64/busdma_bounce.c projects/vnet/sys/arm64/arm64/gic_v3_fdt.c projects/vnet/sys/arm64/arm64/mp_machdep.c projects/vnet/sys/arm64/cavium/thunder_pcie_fdt.c projects/vnet/sys/arm64/cavium/thunder_pcie_pem.c projects/vnet/sys/arm64/cavium/thunder_pcie_pem.h projects/vnet/sys/boot/efi/include/efilib.h projects/vnet/sys/boot/efi/libefi/Makefile projects/vnet/sys/boot/efi/libefi/efinet.c projects/vnet/sys/boot/efi/libefi/efipart.c projects/vnet/sys/boot/efi/loader/Makefile projects/vnet/sys/boot/efi/loader/main.c projects/vnet/sys/boot/fdt/dts/arm/bananapi.dts projects/vnet/sys/boot/fdt/dts/arm/cubieboard.dts projects/vnet/sys/boot/fdt/dts/arm/cubieboard2.dts projects/vnet/sys/boot/fdt/dts/arm/olimex-a20-som-evb.dts projects/vnet/sys/boot/fdt/dts/arm/olinuxino-lime.dts projects/vnet/sys/boot/geli/geliboot_crypto.c projects/vnet/sys/cam/scsi/scsi_xpt.c projects/vnet/sys/cddl/boot/zfs/lz4.c projects/vnet/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/vnet/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/vnet/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/skein_zfs.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h projects/vnet/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S projects/vnet/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c projects/vnet/sys/cddl/dev/dtrace/riscv/dtrace_asm.S projects/vnet/sys/compat/linux/linux_ioctl.c projects/vnet/sys/compat/linux/linux_misc.c projects/vnet/sys/compat/linuxkpi/common/include/linux/wait.h projects/vnet/sys/compat/linuxkpi/common/src/linux_compat.c projects/vnet/sys/conf/NOTES projects/vnet/sys/conf/dtb.mk projects/vnet/sys/conf/files projects/vnet/sys/conf/files.amd64 projects/vnet/sys/conf/files.arm64 projects/vnet/sys/conf/files.i386 projects/vnet/sys/conf/kern.opts.mk projects/vnet/sys/conf/kern.post.mk projects/vnet/sys/conf/kern.pre.mk projects/vnet/sys/conf/kmod.mk projects/vnet/sys/conf/newvers.sh projects/vnet/sys/conf/options projects/vnet/sys/contrib/dev/acpica/changes.txt projects/vnet/sys/contrib/dev/acpica/compiler/asloptions.c projects/vnet/sys/contrib/dev/acpica/components/debugger/dbobject.c projects/vnet/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/vnet/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/vnet/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/vnet/sys/contrib/dev/acpica/components/executer/exfldio.c projects/vnet/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/vnet/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/vnet/sys/contrib/dev/acpica/include/acglobal.h projects/vnet/sys/contrib/dev/acpica/include/acmacros.h projects/vnet/sys/contrib/dev/acpica/include/acpixf.h projects/vnet/sys/contrib/dev/acpica/include/acutils.h projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/vnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300reg.h projects/vnet/sys/crypto/aesni/aesni.h projects/vnet/sys/crypto/aesni/aesni_wrap.c projects/vnet/sys/crypto/sha1.c projects/vnet/sys/crypto/sha1.h projects/vnet/sys/crypto/sha2/sha256.h projects/vnet/sys/crypto/sha2/sha256c.c projects/vnet/sys/crypto/sha2/sha384.h projects/vnet/sys/crypto/sha2/sha512.h projects/vnet/sys/crypto/sha2/sha512c.c projects/vnet/sys/crypto/siphash/siphash.c projects/vnet/sys/crypto/siphash/siphash.h projects/vnet/sys/dev/ath/ath_hal/ah.h projects/vnet/sys/dev/ath/ath_hal/ah_desc.h projects/vnet/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/vnet/sys/dev/ath/if_ath_btcoex.c projects/vnet/sys/dev/ath/if_ath_debug.h projects/vnet/sys/dev/bge/if_bge.c projects/vnet/sys/dev/bge/if_bgereg.h projects/vnet/sys/dev/bwi/if_bwi.c projects/vnet/sys/dev/cxgbe/iw_cxgbe/cm.c projects/vnet/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/vnet/sys/dev/cxgbe/iw_cxgbe/resource.c projects/vnet/sys/dev/cxgbe/tom/t4_cpl_io.c projects/vnet/sys/dev/extres/regulator/regulator_fixed.c projects/vnet/sys/dev/ffec/if_ffec.c projects/vnet/sys/dev/filemon/filemon.c projects/vnet/sys/dev/filemon/filemon_wrapper.c projects/vnet/sys/dev/gpio/gpiobus.c projects/vnet/sys/dev/gpio/gpiobusvar.h projects/vnet/sys/dev/gpio/ofw_gpiobus.c projects/vnet/sys/dev/hwpmc/hwpmc_mod.c projects/vnet/sys/dev/hyperv/include/hyperv.h projects/vnet/sys/dev/hyperv/utilities/hv_kvp.c projects/vnet/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/vnet/sys/dev/hyperv/vmbus/hv_connection.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/vnet/sys/dev/hyperv/vmbus/hyperv_reg.h projects/vnet/sys/dev/hyperv/vmbus/vmbus_var.h projects/vnet/sys/dev/ichiic/ig4_iic.c projects/vnet/sys/dev/iicbus/twsi/a10_twsi.c projects/vnet/sys/dev/iscsi/iscsi.c projects/vnet/sys/dev/iscsi/iscsi_ioctl.h projects/vnet/sys/dev/iser/iser_verbs.c projects/vnet/sys/dev/iwm/if_iwm.c projects/vnet/sys/dev/iwm/if_iwmvar.h projects/vnet/sys/dev/ixl/i40e_prototype.h projects/vnet/sys/dev/ofw/ofw_bus_subr.h projects/vnet/sys/dev/pci/pci_host_generic.c projects/vnet/sys/dev/pci/pci_host_generic.h projects/vnet/sys/dev/ral/rt2560.c projects/vnet/sys/dev/ral/rt2661.c projects/vnet/sys/dev/ral/rt2860.c projects/vnet/sys/dev/rtwn/if_rtwn.c projects/vnet/sys/dev/rtwn/if_rtwnreg.h projects/vnet/sys/dev/sfxge/common/ef10_mcdi.c projects/vnet/sys/dev/sfxge/common/ef10_nic.c projects/vnet/sys/dev/sfxge/common/ef10_nvram.c projects/vnet/sys/dev/sfxge/common/ef10_rx.c projects/vnet/sys/dev/sfxge/common/ef10_tx.c projects/vnet/sys/dev/sfxge/common/efx_ev.c projects/vnet/sys/dev/sfxge/common/efx_mon.c projects/vnet/sys/dev/sfxge/common/efx_regs_mcdi.h projects/vnet/sys/dev/sfxge/common/efx_rx.c projects/vnet/sys/dev/sfxge/common/efx_tx.c projects/vnet/sys/dev/sfxge/common/hunt_phy.c projects/vnet/sys/dev/sfxge/common/mcdi_mon.c projects/vnet/sys/dev/sfxge/common/siena_mac.c projects/vnet/sys/dev/sfxge/common/siena_mcdi.c projects/vnet/sys/dev/sfxge/sfxge.h projects/vnet/sys/dev/sfxge/sfxge_ev.c projects/vnet/sys/dev/sfxge/sfxge_rx.c projects/vnet/sys/dev/sfxge/sfxge_rx.h projects/vnet/sys/dev/siba/siba_bwn.c projects/vnet/sys/dev/sound/usb/uaudio.c projects/vnet/sys/dev/urtwn/if_urtwn.c projects/vnet/sys/dev/urtwn/if_urtwnreg.h projects/vnet/sys/dev/urtwn/if_urtwnvar.h projects/vnet/sys/dev/usb/wlan/if_rsu.c projects/vnet/sys/dev/usb/wlan/if_run.c projects/vnet/sys/dev/usb/wlan/if_runreg.h projects/vnet/sys/dev/usb/wlan/if_ural.c projects/vnet/sys/dev/usb/wlan/if_urtw.c projects/vnet/sys/dev/usb/wlan/if_urtwreg.h projects/vnet/sys/dev/usb/wlan/if_zyd.c projects/vnet/sys/dev/usb/wlan/if_zydreg.h projects/vnet/sys/geom/geom_dev.c projects/vnet/sys/kern/kern_descrip.c projects/vnet/sys/kern/kern_exec.c projects/vnet/sys/kern/kern_jail.c projects/vnet/sys/kern/kern_shutdown.c projects/vnet/sys/kern/md4c.c projects/vnet/sys/kern/md5c.c projects/vnet/sys/kern/vfs_subr.c projects/vnet/sys/kern/vfs_syscalls.c projects/vnet/sys/modules/Makefile projects/vnet/sys/modules/crypto/Makefile projects/vnet/sys/modules/dummynet/Makefile projects/vnet/sys/modules/gpio/Makefile projects/vnet/sys/modules/gpio/gpiobus/Makefile projects/vnet/sys/modules/gpio/gpioiic/Makefile projects/vnet/sys/modules/gpio/gpioled/Makefile projects/vnet/sys/modules/gpio/gpiospi/Makefile projects/vnet/sys/modules/hyperv/vmbus/Makefile projects/vnet/sys/modules/iscsi/Makefile projects/vnet/sys/modules/zfs/Makefile projects/vnet/sys/net80211/ieee80211_input.c projects/vnet/sys/net80211/ieee80211_output.c projects/vnet/sys/netgraph/netflow/netflow.c projects/vnet/sys/netinet/in_proto.c projects/vnet/sys/netinet/ip_divert.c projects/vnet/sys/netinet/ip_dummynet.h projects/vnet/sys/netinet/ip_output.c projects/vnet/sys/netinet/sctp_output.c projects/vnet/sys/netinet/tcp_output.c projects/vnet/sys/netinet/tcp_subr.c projects/vnet/sys/netinet6/in6_proto.c projects/vnet/sys/netinet6/ip6_output.c projects/vnet/sys/netpfil/ipfw/dn_sched.h projects/vnet/sys/netpfil/ipfw/dn_sched_fifo.c projects/vnet/sys/netpfil/ipfw/dn_sched_prio.c projects/vnet/sys/netpfil/ipfw/dn_sched_qfq.c projects/vnet/sys/netpfil/ipfw/dn_sched_rr.c projects/vnet/sys/netpfil/ipfw/dn_sched_wf2q.c projects/vnet/sys/netpfil/ipfw/ip_dn_glue.c projects/vnet/sys/netpfil/ipfw/ip_dn_io.c projects/vnet/sys/netpfil/ipfw/ip_dn_private.h projects/vnet/sys/netpfil/ipfw/ip_dummynet.c projects/vnet/sys/rpc/svc_vc.c projects/vnet/sys/sys/aio.h projects/vnet/sys/sys/cdefs.h projects/vnet/sys/sys/elf_common.h projects/vnet/sys/sys/imgact.h projects/vnet/sys/sys/kernel.h projects/vnet/sys/sys/mbuf.h projects/vnet/sys/sys/md4.h projects/vnet/sys/sys/md5.h projects/vnet/sys/sys/param.h projects/vnet/sys/sys/resource.h projects/vnet/sys/sys/sched.h projects/vnet/sys/sys/shm.h projects/vnet/sys/sys/signal.h projects/vnet/sys/sys/socket.h projects/vnet/sys/sys/taskqueue.h projects/vnet/sys/sys/vmmeter.h projects/vnet/sys/vm/vm_fault.c projects/vnet/sys/vm/vm_object.c projects/vnet/sys/vm/vm_page.c projects/vnet/sys/vm/vm_pageout.c projects/vnet/sys/vm/vm_pageout.h projects/vnet/sys/x86/include/_align.h projects/vnet/sys/x86/include/_stdint.h projects/vnet/sys/x86/include/_types.h projects/vnet/sys/x86/include/apicvar.h projects/vnet/targets/pseudo/kernel/Makefile projects/vnet/targets/pseudo/userland/misc/Makefile.depend projects/vnet/tests/etc/rc.d/routing_test.sh projects/vnet/tools/build/mk/OptionalObsoleteFiles.inc projects/vnet/tools/tools/ioat/Makefile projects/vnet/tools/tools/ioat/ioatcontrol.8 projects/vnet/tools/tools/ioat/ioatcontrol.c projects/vnet/tools/tools/locale/tools/cldr2def.pl projects/vnet/usr.bin/ar/write.c projects/vnet/usr.bin/iscsictl/iscsi.conf.5 projects/vnet/usr.bin/iscsictl/iscsictl.8 projects/vnet/usr.bin/iscsictl/iscsictl.c projects/vnet/usr.bin/iscsictl/iscsictl.h projects/vnet/usr.bin/iscsictl/parse.y projects/vnet/usr.bin/iscsictl/token.l projects/vnet/usr.bin/mkimg/image.c projects/vnet/usr.bin/xlint/llib/Makefile projects/vnet/usr.sbin/bhyve/block_if.c projects/vnet/usr.sbin/crunch/crunchgen/crunchgen.c projects/vnet/usr.sbin/extattr/Makefile.depend projects/vnet/usr.sbin/extattr/rmextattr.8 projects/vnet/usr.sbin/keyserv/crypt_server.c projects/vnet/usr.sbin/rpc.statd/statd.c projects/vnet/usr.sbin/rpcbind/check_bound.c projects/vnet/usr.sbin/rpcbind/rpcbind.c projects/vnet/usr.sbin/rpcbind/util.c projects/vnet/usr.sbin/services_mkdb/services_mkdb.c Directory Properties: projects/vnet/ (props changed) projects/vnet/cddl/ (props changed) projects/vnet/cddl/contrib/opensolaris/ (props changed) projects/vnet/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/vnet/contrib/binutils/ (props changed) projects/vnet/contrib/gcc/ (props changed) projects/vnet/contrib/libc++/ (props changed) projects/vnet/contrib/libxo/ (props changed) projects/vnet/contrib/llvm/ (props changed) projects/vnet/gnu/usr.bin/cc/cc_tools/ (props changed) projects/vnet/sys/cddl/contrib/opensolaris/ (props changed) projects/vnet/sys/contrib/dev/acpica/ (props changed) Modified: projects/vnet/Makefile.inc1 ============================================================================== --- projects/vnet/Makefile.inc1 Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/Makefile.inc1 Wed Jun 1 10:24:08 2016 (r301116) @@ -300,7 +300,7 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH: .endif .if !defined(PKG_VERSION) -.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} +.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MALPHA*} TIMENOW= %Y%m%d%H%M%S EXTRA_REVISION= .s${TIMENOW:gmtime} .endif @@ -500,7 +500,7 @@ HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MT HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif -CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ +CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \ @@ -539,7 +539,6 @@ TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x8 XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} -.else .endif # ${MK_CROSS_COMPILER} == "no" .if !empty(BFLAGS) @@ -591,11 +590,6 @@ IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLA # kernel stage KMAKEENV= ${WMAKEENV} KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} -.if ${MK_META_MODE} == "yes" -# meta mode normally is disallowed when building from curdir==objdir, but we -# want to allow it for the kernel build. -KMAKEENV+= META_MODE="${.MAKE.MODE} curdirOk=yes" -.endif # # buildworld @@ -1575,9 +1569,15 @@ _dd= bin/dd # r277259 crunchide: Correct 64-bit section header offset # r281674 crunchide: always include both 32- and 64-bit ELF support -# r285986 crunchen: use STRIPBIN rather than STRIP .if ${BOOTSTRAPPING} < 1100078 -_crunch= usr.sbin/crunch +_crunchide= usr.sbin/crunch/crunchide +.endif + +# r285986 crunchen: use STRIPBIN rather than STRIP +# 1100113: Support MK_AUTO_OBJ +.if ${BOOTSTRAPPING} < 1100078 || \ + (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) +_crunchgen= usr.sbin/crunch/crunchgen .endif .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 @@ -1666,7 +1666,8 @@ bootstrap-tools: .PHONY usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunch} \ + ${_crunchide} \ + ${_crunchgen} \ ${_nmtree} \ ${_vtfontcvt} \ usr.bin/localedef @@ -1798,7 +1799,6 @@ cross-tools: .MAKE .PHONY ${_dtrace_tools} \ ${_cc} \ ${_btxld} \ - ${_crunchide} \ ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ Modified: projects/vnet/Makefile.libcompat ============================================================================== --- projects/vnet/Makefile.libcompat Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/Makefile.libcompat Wed Jun 1 10:24:08 2016 (r301116) @@ -72,10 +72,9 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ # -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for # Clang/GCC. LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} +.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc # GCC requires -isystem when using a cross-compiler. LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include - -.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc # Force using libc++ for external GCC. LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++ @@ -93,7 +92,7 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${L LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA_CMP .endif LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ - CXX="${XCXX} ${LIBCOMPATCFLAGS} ${LIBCOMPATCXXFLAGS}" \ + CXX="${XCXX} ${LIBCOMPATCXXFLAGS} ${LIBCOMPATCFLAGS}" \ CPP="${XCPP} ${LIBCOMPATCFLAGS}" \ DESTDIR=${LIBCOMPATTMP} \ -DNO_CPU_CFLAGS \ Modified: projects/vnet/ObsoleteFiles.inc ============================================================================== --- projects/vnet/ObsoleteFiles.inc Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/ObsoleteFiles.inc Wed Jun 1 10:24:08 2016 (r301116) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20160523: remove extranous ALTQ files +OLD_FILES+=usr/include/altq/altq_codel.h +OLD_FILES+=usr/include/altq/altq_fairq.h # 20160519: remove DTrace Toolkit from base OLD_FILES+=usr/share/dtrace/toolkit/execsnoop OLD_FILES+=usr/share/dtrace/toolkit/hotkernel Modified: projects/vnet/UPDATING ============================================================================== --- projects/vnet/UPDATING Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/UPDATING Wed Jun 1 10:24:08 2016 (r301116) @@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160527: + CAM will now strip leading spaces from SCSI disks' serial numbers. + This will effect users who create UFS filesystems on SCSI disks using + those disk's diskid device nodes. For example, if /etc/fstab + previously contained a line like + "/dev/diskid/DISK-%20%20%20%20%20%20%20ABCDEFG0123456", you should + change it to "/dev/diskid/DISK-ABCDEFG0123456". Users of geom + transforms like gmirror may also be affected. ZFS users should + generally be fine. + 20160523: The bitstring(3) API has been updated with new functionality and improved performance. But it is binary-incompatible with the old API. Modified: projects/vnet/bin/ls/tests/ls_tests.sh ============================================================================== --- projects/vnet/bin/ls/tests/ls_tests.sh Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/bin/ls/tests/ls_tests.sh Wed Jun 1 10:24:08 2016 (r301116) @@ -535,7 +535,7 @@ atf_test_case h_flag h_flag_head() { atf_set "descr" "Verify that -h prints out the humanized units for file sizes with ls -l" - atf_set "require.files" "/usr/bin/bc" + atf_set "require.progs" "bc" } h_flag_body() Modified: projects/vnet/bin/sh/sh.1 ============================================================================== --- projects/vnet/bin/sh/sh.1 Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/bin/sh/sh.1 Wed Jun 1 10:24:08 2016 (r301116) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd May 24, 2016 +.Dd May 30, 2016 .Dt SH 1 .Os .Sh NAME @@ -1403,9 +1403,9 @@ may include any of the following formatt which are replaced by the given information: .Bl -tag -width indent .It Li \eH -The fully-qualified hostname. +This system's fully-qualified hostname (FQDN). .It Li \eh -The local hostname. +This system's hostname. .It Li \eW The final component of the current working directory. .It Li \ew Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Jun 1 10:24:08 2016 (r301116) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 24, 2015 +.Dd May 31, 2016 .Dt ZFS 8 .Os .Sh NAME @@ -940,7 +940,7 @@ command or unmounted by the command. .Pp This property is not inherited. -.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256 | noparity +.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256 | noparity | sha512 | skein Controls the checksum used to verify data integrity. The default value is .Cm on , which automatically selects an appropriate algorithm (currently, @@ -957,6 +957,16 @@ not be used by any other dataset. Disabling checksums is .Em NOT a recommended practice. +The +.Sy sha512 , +and +.Sy skein +checksum algorithms require enabling the appropriate features on the pool. +Please see +.Xr zpool-features 7 +for more information on these algorithms. +.Pp +Changing this property affects only newly-written data. .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. Setting compression to @@ -1036,7 +1046,7 @@ Changing this property only affects newl property at file system creation time by using the .Fl o Cm copies= Ns Ar N option. -.It Sy dedup Ns = Ns Cm on | off | verify | sha256 Ns Op Cm ,verify +.It Sy dedup Ns = Ns Cm on | off | verify | sha256 Ns Oo Cm ,verify Oc | Sy sha512 Ns Oo Cm ,verify Oc | Sy skein Ns Oo Cm ,verify Oc Configures deduplication for a dataset. The default value is .Cm off . The default deduplication checksum is Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Wed Jun 1 10:24:08 2016 (r301116) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 10, 2014 +.Dd May 31, 2016 .Dt ZPOOL-FEATURES 7 .Os .Sh NAME @@ -454,6 +454,97 @@ Please note that booting from datasets t supported by the .Fx boot loader. +.It Sy sha512 +.Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:sha512" +.It GUID Ta org.illumos:sha512 +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +The +.Sy sha512 +feature enables the use of the SHA-512/256 truncated hash algorithm +.Pq FIPS 180-4 +for checksum and dedup. +The native 64-bit arithmetic of SHA-512 provides an approximate 50% +performance boost over SHA-256 on 64-bit hardware and is thus a good +minimum-change replacement candidate for systems where hash performance is +important, but these systems cannot for whatever reason utilize the faster +.Sy skein +algorithms. +.Pp +When the +.Sy sha512 +feature is set to +.Sy enabled , +the administrator can turn on the +.Sy sha512 +checksum on any dataset using the +.Dl # zfs set checksum=sha512 Ar dataset +command. +This feature becomes +.Sy active +once a +.Sy checksum +property has been set to +.Sy sha512 , +and will return to being +.Sy enabled +once all filesystems that have ever had their checksum set to +.Sy sha512 +are destroyed. +.Pp +Booting off of a pools utilizing SHA-512/256 is +.Em NOT +yet supported. +.It Sy skein +.Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:skein" +.It GUID Ta org.illumos:skein +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +The +.Sy skein +feature enables the use of the Skein hash algorithm for checksum and dedup. +Skein is a high-performance secure hash algorithm that was a finalist in the +NIST SHA-3 competition. +It provides a very high security margin and high performance on 64-bit hardware +.Pq 80% faster than SHA-256 . +This implementation also utilizes the new salted checksumming functionality in +ZFS, which means that the checksum is pre-seeded with a secret 256-bit random +key +.Pq stored on the pool +before being fed the data block to be checksummed. +Thus the produced checksums are unique to a given pool, preventing hash +collision attacks on systems with dedup. +.Pp +When the +.Sy skein +feature is set to +.Sy enabled , +the administrator can turn on the +.Sy skein +checksum on any dataset using the +.Dl # zfs set checksum=skein Ar dataset +command. +This feature becomes +.Sy active +once a +.Sy checksum +property has been set to +.Sy skein , +and will return to being +.Sy enabled +once all filesystems that have ever had their checksum set to +.Sy skein +are destroyed. +.Pp +Booting off of pools using +.Sy skein +is +.Em NOT +supported. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/vnet/cddl/usr.sbin/Makefile ============================================================================== --- projects/vnet/cddl/usr.sbin/Makefile Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/cddl/usr.sbin/Makefile Wed Jun 1 10:24:08 2016 (r301116) @@ -7,6 +7,7 @@ SUBDIR= ${_dtrace} \ ${_plockstat} \ ${_tests} \ ${_zdb} \ + ${_zfsd} \ ${_zhack} .if ${MK_TESTS} != "no" @@ -18,6 +19,9 @@ _tests= tests _zdb= zdb _zhack= zhack .endif +. if ${MK_CXX} != "no" +_zfsd= zfsd +. endif .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" Modified: projects/vnet/contrib/binutils/include/libiberty.h ============================================================================== --- projects/vnet/contrib/binutils/include/libiberty.h Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/contrib/binutils/include/libiberty.h Wed Jun 1 10:24:08 2016 (r301116) @@ -102,7 +102,7 @@ extern int writeargv PARAMS ((char **, F is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_BASENAME #if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) -extern char *basename (const char *); +#include <libgen.h> #else /* Do not allow basename to be used if there is no prototype seen. We either need to use the above prototype or have one from Modified: projects/vnet/contrib/gcc/c-decl.c ============================================================================== --- projects/vnet/contrib/gcc/c-decl.c Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/contrib/gcc/c-decl.c Wed Jun 1 10:24:08 2016 (r301116) @@ -3150,20 +3150,14 @@ build_array_declarator (tree expr, struc /* Set the contained declarator of an array declarator. DECL is the declarator, as constructed by build_array_declarator; INNER is what - appears on the left of the []. ABSTRACT_P is true if it is an - abstract declarator, false otherwise; this is used to reject static - and type qualifiers in abstract declarators, where they are not in - the C99 grammar (subject to possible change in DR#289). */ + appears on the left of the []. */ struct c_declarator * set_array_declarator_inner (struct c_declarator *decl, - struct c_declarator *inner, bool abstract_p) + struct c_declarator *inner, + bool abstract_p __attribute__ ((__unused__))) { decl->declarator = inner; - if (abstract_p && (decl->u.array.quals != TYPE_UNQUALIFIED - || decl->u.array.attrs != NULL_TREE - || decl->u.array.static_p)) - error ("static or type qualifiers in abstract declarator"); return decl; } Modified: projects/vnet/contrib/libc++/include/__config ============================================================================== --- projects/vnet/contrib/libc++/include/__config Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/contrib/libc++/include/__config Wed Jun 1 10:24:08 2016 (r301116) @@ -11,19 +11,37 @@ #ifndef _LIBCPP_CONFIG #define _LIBCPP_CONFIG -#if !defined(_MSC_VER) || defined(__clang__) +#if defined(_MSC_VER) && !defined(__clang__) +#define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER +#endif + +#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER #pragma GCC system_header #endif +#ifdef __cplusplus + #ifdef __GNUC__ #define _GNUC_VER (__GNUC__ * 100 + __GNUC_MINOR__) #else #define _GNUC_VER 0 #endif -#define _LIBCPP_VERSION 3700 +#define _LIBCPP_VERSION 3800 +#ifndef _LIBCPP_ABI_VERSION #define _LIBCPP_ABI_VERSION 1 +#endif + +#if defined(_LIBCPP_ABI_UNSTABLE) || _LIBCPP_ABI_VERSION >= 2 +// Change short string represention so that string data starts at offset 0, +// improving its alignment in some cases. +#define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT +// Fix deque iterator type in order to support incomplete types. +#define _LIBCPP_ABI_INCOMPLETE_TYPES_IN_DEQUE +// Fix undefined behavior in how std::list stores it's linked nodes. +#define _LIBCPP_ABI_LIST_REMOVE_NODE_POINTER_UB +#endif #define _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_X##_LIBCPP_Y #define _LIBCPP_CONCAT(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y) @@ -37,6 +55,9 @@ #ifndef __has_builtin #define __has_builtin(__x) 0 #endif +#ifndef __has_extension +#define __has_extension(__x) 0 +#endif #ifndef __has_feature #define __has_feature(__x) 0 #endif @@ -61,6 +82,16 @@ #endif // __BIG_ENDIAN__ #endif // __BIG_ENDIAN__ +#ifdef __BYTE_ORDER__ +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define _LIBCPP_LITTLE_ENDIAN 1 +#define _LIBCPP_BIG_ENDIAN 0 +#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define _LIBCPP_LITTLE_ENDIAN 0 +#define _LIBCPP_BIG_ENDIAN 1 +#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#endif // __BYTE_ORDER__ + #ifdef __FreeBSD__ # include <sys/endian.h> # if _BYTE_ORDER == _LITTLE_ENDIAN @@ -227,9 +258,12 @@ #if defined(__clang__) -#if defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) && \ - !defined(__arm__) -#define _LIBCPP_ALTERNATE_STRING_LAYOUT +// _LIBCPP_ALTERNATE_STRING_LAYOUT is an old name for +// _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT left here for backward compatibility. +#if (defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) && \ + !defined(__arm__)) || \ + defined(_LIBCPP_ALTERNATE_STRING_LAYOUT) +#define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT #endif #if __has_feature(cxx_alignas) @@ -273,6 +307,10 @@ typedef __char32_t char32_t; #define _LIBCPP_UNUSED __attribute__((__unused__)) +#if !(__has_feature(cxx_default_function_template_args)) +#define _LIBCPP_HAS_NO_DEFAULT_FUNCTION_TEMPLATE_ARGS +#endif + #if !(__has_feature(cxx_defaulted_functions)) #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS #endif // !(__has_feature(cxx_defaulted_functions)) @@ -354,14 +392,19 @@ typedef __char32_t char32_t; #elif defined(__ANDROID__) #define _LIBCPP_HAS_QUICK_EXIT #elif defined(__linux__) -#include <features.h> +#if !defined(_LIBCPP_HAS_MUSL_LIBC) +# include <features.h> #if __GLIBC_PREREQ(2, 15) #define _LIBCPP_HAS_QUICK_EXIT #endif #if __GLIBC_PREREQ(2, 17) #define _LIBCPP_HAS_C11_FEATURES #endif +#else // defined(_LIBCPP_HAS_MUSL_LIBC) +#define _LIBCPP_HAS_QUICK_EXIT +#define _LIBCPP_HAS_C11_FEATURES #endif +#endif // __linux__ #endif #if !(__has_feature(cxx_noexcept)) @@ -390,6 +433,11 @@ namespace std { #define _LIBCPP_HAS_NO_ASAN #endif +// Allow for build-time disabling of unsigned integer sanitization +#ifndef _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK +#define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK __attribute((no_sanitize("unsigned-integer-overflow"))) +#endif + #elif defined(__GNUC__) #define _ALIGNAS(x) __attribute__((__aligned__(x))) @@ -437,6 +485,7 @@ namespace std { #define _LIBCPP_HAS_NO_ADVANCED_SFINAE #define _LIBCPP_HAS_NO_DECLTYPE +#define _LIBCPP_HAS_NO_DEFAULT_FUNCTION_TEMPLATE_ARGS #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS #define _LIBCPP_HAS_NO_NULLPTR @@ -444,22 +493,18 @@ namespace std { #define _LIBCPP_HAS_NO_UNICODE_CHARS #define _LIBCPP_HAS_NO_VARIADICS #define _LIBCPP_HAS_NO_RVALUE_REFERENCES -#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS #define _LIBCPP_HAS_NO_STRONG_ENUMS #define _LIBCPP_HAS_NO_NOEXCEPT #else // __GXX_EXPERIMENTAL_CXX0X__ -#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS - #if _GNUC_VER < 403 +#define _LIBCPP_HAS_NO_DEFAULT_FUNCTION_TEMPLATE_ARGS #define _LIBCPP_HAS_NO_RVALUE_REFERENCES -#endif - -#if _GNUC_VER < 403 #define _LIBCPP_HAS_NO_STATIC_ASSERT #endif + #if _GNUC_VER < 404 #define _LIBCPP_HAS_NO_DECLTYPE #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS @@ -498,7 +543,6 @@ using namespace _LIBCPP_NAMESPACE __attr #elif defined(_LIBCPP_MSVC) #define _LIBCPP_HAS_NO_TEMPLATE_ALIASES -#define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER #define _LIBCPP_HAS_NO_CONSTEXPR #define _LIBCPP_HAS_NO_CXX14_CONSTEXPR #define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES @@ -532,9 +576,9 @@ namespace std { #define _LIBCPP_NORETURN __attribute__((noreturn)) #define _LIBCPP_UNUSED +#define _LIBCPP_HAS_NO_DEFAULT_FUNCTION_TEMPLATE_ARGS #define _LIBCPP_HAS_NO_TEMPLATE_ALIASES #define _LIBCPP_HAS_NO_ADVANCED_SFINAE -#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS #define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #define _LIBCPP_HAS_NO_NOEXCEPT #define _LIBCPP_HAS_NO_NULLPTR @@ -579,9 +623,11 @@ typedef unsigned int char32_t; #ifdef _LIBCPP_HAS_NO_STATIC_ASSERT +extern "C++" { template <bool> struct __static_assert_test; template <> struct __static_assert_test<true> {}; template <unsigned> struct __static_assert_check {}; +} #define static_assert(__b, __m) \ typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \ _LIBCPP_CONCAT(__t, __LINE__) @@ -724,6 +770,12 @@ template <unsigned> struct __static_asse #define _LIBCPP_CONSTEXPR_AFTER_CXX11 #endif +#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES +# define _LIBCPP_EXPLICIT_MOVE(x) _VSTD::move(x) +#else +# define _LIBCPP_EXPLICIT_MOVE(x) (x) +#endif + #ifndef _LIBCPP_HAS_NO_ASAN extern "C" void __sanitizer_annotate_contiguous_container( const void *, const void *, const void *, const void *); @@ -733,7 +785,7 @@ extern "C" void __sanitizer_annotate_con // g++ and cl.exe have RTTI on by default and define a macro when it is. // g++ only defines the macro in 4.3.2 and onwards. #if !defined(_LIBCPP_NO_RTTI) -# if defined(__GNUG__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \ +# if defined(__GNUC__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \ (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI) # define _LIBCPP_NO_RTTI # elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI) @@ -765,7 +817,7 @@ extern "C" void __sanitizer_annotate_con #define _LIBCPP_HAS_NO_STDOUT #endif -#if defined(__ANDROID__) || defined(__CloudABI__) +#if defined(__ANDROID__) || defined(__CloudABI__) || defined(_LIBCPP_HAS_MUSL_LIBC) #define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE #endif @@ -775,4 +827,21 @@ extern "C" void __sanitizer_annotate_con #define _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS #endif -#endif // _LIBCPP_CONFIG +#if __has_feature(cxx_atomic) || __has_extension(c_atomic) +#define _LIBCPP_HAS_C_ATOMIC_IMP +#elif _GNUC_VER > 407 +#define _LIBCPP_HAS_GCC_ATOMIC_IMP +#endif + +#if (!defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP)) \ + || defined(_LIBCPP_HAS_NO_THREADS) +#define _LIBCPP_HAS_NO_ATOMIC_HEADER +#endif + +#ifndef _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK +#define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK +#endif + +#endif // __cplusplus + +#endif // _LIBCPP_CONFIG Modified: projects/vnet/contrib/libc++/include/__functional_03 ============================================================================== --- projects/vnet/contrib/libc++/include/__functional_03 Wed Jun 1 10:14:25 2016 (r301115) +++ projects/vnet/contrib/libc++/include/__functional_03 Wed Jun 1 10:24:08 2016 (r301116) @@ -17,218 +17,7 @@ #pragma GCC system_header #endif -template <class _Tp> -class __mem_fn - : public __weak_result_type<_Tp> -{ -public: - // types - typedef _Tp type; -private: - type __f_; - -public: - _LIBCPP_INLINE_VISIBILITY __mem_fn(type __f) : __f_(__f) {} - - // invoke - - typename __invoke_return<type>::type - operator() () const - { - return __invoke(__f_); - } - - template <class _A0> - typename __invoke_return0<type, _A0>::type - operator() (_A0& __a0) const - { - return __invoke(__f_, __a0); - } - - template <class _A0, class _A1> - typename __invoke_return1<type, _A0, _A1>::type - operator() (_A0& __a0, _A1& __a1) const - { - return __invoke(__f_, __a0, __a1); - } - - template <class _A0, class _A1, class _A2> - typename __invoke_return2<type, _A0, _A1, _A2>::type - operator() (_A0& __a0, _A1& __a1, _A2& __a2) const - { - return __invoke(__f_, __a0, __a1, __a2); - } -}; - -template<class _Rp, class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp _Tp::*> -mem_fn(_Rp _Tp::* __pm) -{ - return __mem_fn<_Rp _Tp::*>(__pm); -} - -template<class _Rp, class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)()> -mem_fn(_Rp (_Tp::* __pm)()) -{ - return __mem_fn<_Rp (_Tp::*)()>(__pm); -} - -template<class _Rp, class _Tp, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0)> -mem_fn(_Rp (_Tp::* __pm)(_A0)) -{ - return __mem_fn<_Rp (_Tp::*)(_A0)>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1)> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1)) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1)>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2)) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)>(__pm); -} - -template<class _Rp, class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)() const> -mem_fn(_Rp (_Tp::* __pm)() const) -{ - return __mem_fn<_Rp (_Tp::*)() const>(__pm); -} - -template<class _Rp, class _Tp, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0) const> -mem_fn(_Rp (_Tp::* __pm)(_A0) const) -{ - return __mem_fn<_Rp (_Tp::*)(_A0) const>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1) const> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const>(__pm); -} - -template<class _Rp, class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)() volatile> -mem_fn(_Rp (_Tp::* __pm)() volatile) -{ - return __mem_fn<_Rp (_Tp::*)() volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0) volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0) volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0) volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile>(__pm); -} - -template<class _Rp, class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)() const volatile> -mem_fn(_Rp (_Tp::* __pm)() const volatile) -{ - return __mem_fn<_Rp (_Tp::*)() const volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0) const volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0) const volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0) const volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile>(__pm); -} - -template<class _Rp, class _Tp, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile> -mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const volatile) -{ - return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile>(__pm); -} - -// bad_function_call - -class _LIBCPP_EXCEPTION_ABI bad_function_call - : public exception -{ -}; - -template<class _Fp> class _LIBCPP_TYPE_VIS_ONLY function; // undefined - -namespace __function -{ - -template<class _Fp> -struct __maybe_derive_from_unary_function -{ -}; - -template<class _Rp, class _A1> -struct __maybe_derive_from_unary_function<_Rp(_A1)> - : public unary_function<_A1, _Rp> -{ -}; - -template<class _Fp> -struct __maybe_derive_from_binary_function -{ -}; - -template<class _Rp, class _A1, class _A2> -struct __maybe_derive_from_binary_function<_Rp(_A1, _A2)> - : public binary_function<_A1, _A2, _Rp> -{ -}; +namespace __function { template<class _Fp> class __base; @@ -662,15 +451,6 @@ class _LIBCPP_TYPE_VIS_ONLY function<_Rp aligned_storage<3*sizeof(void*)>::type __buf_; __base* __f_; - template <class _Fp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const _Fp&) {return true;} - template <class _R2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (*__p)()) {return __p;} - template <class _R2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const function<_R2()>& __p) {return __p;} public: typedef _Rp result_type; @@ -769,7 +549,7 @@ function<_Rp()>::function(_Fp __f, typename enable_if<!is_integral<_Fp>::value>::type*) : __f_(0) { - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, allocator<_Fp>, _Rp()> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -796,7 +576,7 @@ function<_Rp()>::function(allocator_arg_ : __f_(0) { typedef allocator_traits<_Alloc> __alloc_traits; - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, _Alloc, _Rp()> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -947,27 +727,6 @@ class _LIBCPP_TYPE_VIS_ONLY function<_Rp aligned_storage<3*sizeof(void*)>::type __buf_; __base* __f_; - template <class _Fp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const _Fp&) {return true;} - template <class _R2, class _B0> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (*__p)(_B0)) {return __p;} - template <class _R2, class _Cp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)()) {return __p;} - template <class _R2, class _Cp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)() const) {return __p;} - template <class _R2, class _Cp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)() volatile) {return __p;} - template <class _R2, class _Cp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)() const volatile) {return __p;} - template <class _R2, class _B0> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const function<_R2(_B0)>& __p) {return __p;} public: typedef _Rp result_type; @@ -1066,7 +825,7 @@ function<_Rp(_A0)>::function(_Fp __f, typename enable_if<!is_integral<_Fp>::value>::type*) : __f_(0) { - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0)> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -1093,7 +852,7 @@ function<_Rp(_A0)>::function(allocator_a : __f_(0) { typedef allocator_traits<_Alloc> __alloc_traits; - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, _Alloc, _Rp(_A0)> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -1244,27 +1003,6 @@ class _LIBCPP_TYPE_VIS_ONLY function<_Rp aligned_storage<3*sizeof(void*)>::type __buf_; __base* __f_; - template <class _Fp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const _Fp&) {return true;} - template <class _R2, class _B0, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (*__p)(_B0, _B1)) {return __p;} - template <class _R2, class _Cp, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1)) {return __p;} - template <class _R2, class _Cp, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1) const) {return __p;} - template <class _R2, class _Cp, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1) volatile) {return __p;} - template <class _R2, class _Cp, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1) const volatile) {return __p;} - template <class _R2, class _B0, class _B1> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const function<_R2(_B0, _B1)>& __p) {return __p;} public: typedef _Rp result_type; @@ -1363,7 +1101,7 @@ function<_Rp(_A0, _A1)>::function(_Fp __ typename enable_if<!is_integral<_Fp>::value>::type*) : __f_(0) { - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1)> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -1390,7 +1128,7 @@ function<_Rp(_A0, _A1)>::function(alloca : __f_(0) { typedef allocator_traits<_Alloc> __alloc_traits; - if (__not_null(__f)) + if (__function::__not_null(__f)) { typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1)> _FF; if (sizeof(_FF) <= sizeof(__buf_)) @@ -1540,27 +1278,6 @@ class _LIBCPP_TYPE_VIS_ONLY function<_Rp aligned_storage<3*sizeof(void*)>::type __buf_; __base* __f_; - template <class _Fp> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const _Fp&) {return true;} - template <class _R2, class _B0, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (*__p)(_B0, _B1, _B2)) {return __p;} - template <class _R2, class _Cp, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2)) {return __p;} - template <class _R2, class _Cp, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const) {return __p;} - template <class _R2, class _Cp, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) volatile) {return __p;} - template <class _R2, class _Cp, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const volatile) {return __p;} - template <class _R2, class _B0, class _B1, class _B2> - _LIBCPP_INLINE_VISIBILITY - static bool __not_null(const function<_R2(_B0, _B1, _B2)>& __p) {return __p;} public: typedef _Rp result_type; @@ -1660,7 +1377,7 @@ function<_Rp(_A0, _A1, _A2)>::function(_ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606011024.u51AO90Z094068>