svn commit: r304848 - in projects/hps_head: . bin/dd bin/ls/tests cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opensolaris/cmd/dtrace/test/t...

Hans Petter Selasky hselasky at FreeBSD.org
Fri Aug 26 12:37:41 UTC 2016 

Author: hselasky
Date: Fri Aug 26 12:37:36 2016
New Revision: 304848
URL: https://svnweb.freebsd.org/changeset/base/304848

Log:
  Merge ^/head r304171 through r304847.

Added:
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d
     - copied unchanged from r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d
     - copied unchanged from r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sugar/
     - copied from r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sugar/
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c
     - copied unchanged from r304243, head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c
  projects/hps_head/cddl/usr.sbin/dtrace/tests/common/sugar/
     - copied from r304243, head/cddl/usr.sbin/dtrace/tests/common/sugar/
  projects/hps_head/contrib/sqlite3/Makefile.msc
     - copied unchanged from r304847, head/contrib/sqlite3/Makefile.msc
  projects/hps_head/contrib/sqlite3/Replace.cs
     - copied unchanged from r304847, head/contrib/sqlite3/Replace.cs
  projects/hps_head/contrib/sqlite3/compile
     - copied unchanged from r304847, head/contrib/sqlite3/compile
  projects/hps_head/contrib/sqlite3/sqlite3.rc
     - copied unchanged from r304847, head/contrib/sqlite3/sqlite3.rc
  projects/hps_head/contrib/sqlite3/tea/
     - copied from r304847, head/contrib/sqlite3/tea/
  projects/hps_head/lib/libc/sys/fdatasync.c
     - copied unchanged from r304243, head/lib/libc/sys/fdatasync.c
  projects/hps_head/lib/libc/x86/
     - copied from r304847, head/lib/libc/x86/
  projects/hps_head/lib/libifc/
     - copied from r304847, head/lib/libifc/
  projects/hps_head/secure/lib/libcrypto/arm/
     - copied from r304847, head/secure/lib/libcrypto/arm/
  projects/hps_head/secure/lib/libcrypto/opensslconf-aarch64.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-aarch64.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-arm.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-arm.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-mips.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-mips.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-powerpc.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-powerpc.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-riscv.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-riscv.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-sparc64.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-sparc64.h.in
  projects/hps_head/secure/lib/libcrypto/opensslconf-x86.h.in
     - copied unchanged from r304847, head/secure/lib/libcrypto/opensslconf-x86.h.in
  projects/hps_head/share/examples/libifc/
     - copied from r304847, head/share/examples/libifc/
  projects/hps_head/sys/amd64/cloudabi32/
     - copied from r304847, head/sys/amd64/cloudabi32/
  projects/hps_head/sys/arm/allwinner/a10/a10_padconf.c
     - copied unchanged from r304847, head/sys/arm/allwinner/a10/a10_padconf.c
  projects/hps_head/sys/arm/allwinner/a10/files.a10
     - copied unchanged from r304847, head/sys/arm/allwinner/a10/files.a10
  projects/hps_head/sys/arm/allwinner/aw_machdep.c
     - copied unchanged from r304847, head/sys/arm/allwinner/aw_machdep.c
  projects/hps_head/sys/arm/allwinner/aw_machdep.h
     - copied unchanged from r304847, head/sys/arm/allwinner/aw_machdep.h
  projects/hps_head/sys/arm/allwinner/aw_ts.c
     - copied unchanged from r304847, head/sys/arm/allwinner/aw_ts.c
  projects/hps_head/sys/arm/allwinner/files.allwinner_up
     - copied unchanged from r304847, head/sys/arm/allwinner/files.allwinner_up
  projects/hps_head/sys/arm/allwinner/std.allwinner_up
     - copied unchanged from r304847, head/sys/arm/allwinner/std.allwinner_up
  projects/hps_head/sys/arm/conf/ALLWINNER_UP
     - copied unchanged from r304847, head/sys/arm/conf/ALLWINNER_UP
  projects/hps_head/sys/cddl/boot/zfs/skein_zfs.c
     - copied unchanged from r304847, head/sys/cddl/boot/zfs/skein_zfs.c
  projects/hps_head/sys/compat/cloudabi/cloudabi_vdso.lds
     - copied unchanged from r304847, head/sys/compat/cloudabi/cloudabi_vdso.lds
  projects/hps_head/sys/compat/cloudabi32/
     - copied from r304847, head/sys/compat/cloudabi32/
  projects/hps_head/sys/contrib/cloudabi/cloudabi32_types.h
     - copied unchanged from r304847, head/sys/contrib/cloudabi/cloudabi32_types.h
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
     - copied unchanged from r304847, head/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_i686.S
     - copied unchanged from r304847, head/sys/contrib/cloudabi/cloudabi_vdso_i686.S
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
     - copied unchanged from r304847, head/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
     - copied unchanged from r304847, head/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
  projects/hps_head/sys/contrib/cloudabi/syscalls32.master
     - copied unchanged from r304847, head/sys/contrib/cloudabi/syscalls32.master
  projects/hps_head/sys/contrib/cloudabi/syscalls64.master
     - copied unchanged from r304847, head/sys/contrib/cloudabi/syscalls64.master
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram.c
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_cfe.c
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_cfe.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_common.c
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_common.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_common.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_common.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_parser.c
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_parser.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_parser.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_parser.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_parserreg.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_parserreg.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_parservar.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvram_parservar.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvramvar.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_nvramvar.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_sprom_parser.c
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_sprom_parser.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_sprom_parser.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_sprom_parser.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_sprom_parservar.h
     - copied unchanged from r304243, head/sys/dev/bhnd/nvram/bhnd_sprom_parservar.h
  projects/hps_head/sys/dev/hyperv/netvsc/ndis.h
     - copied unchanged from r304847, head/sys/dev/hyperv/netvsc/ndis.h
  projects/hps_head/sys/dev/hyperv/utilities/vmbus_icreg.h
     - copied unchanged from r304847, head/sys/dev/hyperv/utilities/vmbus_icreg.h
  projects/hps_head/sys/dev/qlxgbe/ql_minidump.h
     - copied unchanged from r304847, head/sys/dev/qlxgbe/ql_minidump.h
  projects/hps_head/sys/i386/cloudabi32/
     - copied from r304847, head/sys/i386/cloudabi32/
  projects/hps_head/sys/modules/cloudabi32/
     - copied from r304847, head/sys/modules/cloudabi32/
  projects/hps_head/sys/net/rndis.h
     - copied unchanged from r304847, head/sys/net/rndis.h
Deleted:
  projects/hps_head/lib/libc/amd64/sys/__vdso_gettc.c
  projects/hps_head/lib/libc/i386/sys/__vdso_gettc.c
  projects/hps_head/secure/lib/libcrypto/opensslconf-aarch64.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-arm.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-mips.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-powerpc.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-riscv.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-sparc64.h
  projects/hps_head/secure/lib/libcrypto/opensslconf-x86.h
  projects/hps_head/share/man/man4/man4.i386/ie.4
  projects/hps_head/share/man/man4/man4.i386/wl.4
  projects/hps_head/share/man/man4/mcd.4
  projects/hps_head/share/man/man4/scd.4
  projects/hps_head/share/man/man4/si.4
  projects/hps_head/share/man/man4/spic.4
  projects/hps_head/sys/arm/allwinner/a10_padconf.c
  projects/hps_head/sys/arm/allwinner/allwinner_machdep.c
  projects/hps_head/sys/arm/allwinner/allwinner_machdep.h
  projects/hps_head/sys/arm/allwinner/files.a10
  projects/hps_head/sys/arm/allwinner/std.a10
  projects/hps_head/sys/arm/conf/A10
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
  projects/hps_head/sys/contrib/cloudabi/cloudabi_types.h
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_aarch64.c
  projects/hps_head/sys/contrib/cloudabi/cloudabi_vdso_x86_64.c
  projects/hps_head/sys/contrib/cloudabi/syscalls.master
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_sprom_subr.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_spromreg.h
  projects/hps_head/sys/dev/bhnd/nvram/nvram_subr.c
  projects/hps_head/sys/dev/bhnd/nvram/nvramvar.h
  projects/hps_head/sys/dev/ie/
  projects/hps_head/sys/dev/mcd/
  projects/hps_head/sys/dev/scd/
  projects/hps_head/sys/dev/si/
  projects/hps_head/sys/dev/wds/
  projects/hps_head/sys/dev/wl/
  projects/hps_head/sys/i386/isa/spic.c
  projects/hps_head/sys/i386/isa/spicreg.h
  projects/hps_head/sys/modules/ie/
  projects/hps_head/sys/modules/mcd/
  projects/hps_head/sys/modules/scd/
  projects/hps_head/sys/modules/si/
  projects/hps_head/sys/modules/wds/
  projects/hps_head/sys/modules/wl/
  projects/hps_head/tools/kerneldoc/subsys/Doxyfile-dev_mcd
  projects/hps_head/tools/kerneldoc/subsys/Doxyfile-dev_scd
  projects/hps_head/tools/kerneldoc/subsys/Doxyfile-dev_si
  projects/hps_head/tools/kerneldoc/subsys/Doxyfile-dev_wds
  projects/hps_head/tools/kerneldoc/subsys/Doxyfile-dev_wl
  projects/hps_head/usr.sbin/sicontrol/
  projects/hps_head/usr.sbin/wlconfig/
Modified:
  projects/hps_head/Makefile.inc1
  projects/hps_head/Makefile.libcompat
  projects/hps_head/ObsoleteFiles.inc
  projects/hps_head/UPDATING
  projects/hps_head/bin/dd/dd.1
  projects/hps_head/bin/ls/tests/ls_tests.sh
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h
  projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
  projects/hps_head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/hps_head/cddl/lib/libdtrace/Makefile
  projects/hps_head/cddl/lib/libdtrace/psinfo.d
  projects/hps_head/cddl/usr.sbin/dtrace/tests/common/Makefile
  projects/hps_head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
  projects/hps_head/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
  projects/hps_head/contrib/binutils/bfd/config.bfd
  projects/hps_head/contrib/dma/VERSION
  projects/hps_head/contrib/dma/dma-mbox-create.c
  projects/hps_head/contrib/dma/dma.c
  projects/hps_head/contrib/dma/dma.h
  projects/hps_head/contrib/dma/dns.c
  projects/hps_head/contrib/dma/local.c
  projects/hps_head/contrib/dma/net.c
  projects/hps_head/contrib/elftoolchain/elfcopy/ascii.c
  projects/hps_head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
  projects/hps_head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h
  projects/hps_head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
  projects/hps_head/contrib/llvm/lib/Target/X86/X86.td
  projects/hps_head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/hps_head/contrib/netbsd-tests/lib/libc/gen/t_basedirname.c
  projects/hps_head/contrib/sqlite3/Makefile.am
  projects/hps_head/contrib/sqlite3/Makefile.in
  projects/hps_head/contrib/sqlite3/configure
  projects/hps_head/contrib/sqlite3/configure.ac
  projects/hps_head/contrib/sqlite3/shell.c
  projects/hps_head/contrib/sqlite3/sqlite3.c
  projects/hps_head/contrib/sqlite3/sqlite3.h
  projects/hps_head/contrib/sqlite3/sqlite3ext.h
  projects/hps_head/crypto/heimdal/lib/hx509/version-script.map
  projects/hps_head/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
  projects/hps_head/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
  projects/hps_head/etc/devd.conf
  projects/hps_head/etc/mtree/BSD.tests.dist
  projects/hps_head/etc/newsyslog.conf
  projects/hps_head/etc/ntp/leap-seconds   (contents, props changed)
  projects/hps_head/etc/rc.d/ntpd
  projects/hps_head/include/unistd.h
  projects/hps_head/include/xlocale/_locale.h
  projects/hps_head/lib/Makefile
  projects/hps_head/lib/clang/freebsd_cc_version.h
  projects/hps_head/lib/libc/Makefile
  projects/hps_head/lib/libc/aarch64/sys/Makefile.inc
  projects/hps_head/lib/libc/aarch64/sys/__vdso_gettc.c
  projects/hps_head/lib/libc/amd64/sys/Makefile.inc
  projects/hps_head/lib/libc/arm/sys/Makefile.inc
  projects/hps_head/lib/libc/arm/sys/__vdso_gettc.c
  projects/hps_head/lib/libc/gen/__getosreldate.c
  projects/hps_head/lib/libc/gen/sem_timedwait.3
  projects/hps_head/lib/libc/i386/sys/Makefile.inc
  projects/hps_head/lib/libc/include/libc_private.h
  projects/hps_head/lib/libc/mips/sys/Makefile.inc
  projects/hps_head/lib/libc/net/inet_net.3
  projects/hps_head/lib/libc/net/nss_compat.c
  projects/hps_head/lib/libc/nls/msgcat.c
  projects/hps_head/lib/libc/powerpc/sys/Makefile.inc
  projects/hps_head/lib/libc/powerpc64/sys/Makefile.inc
  projects/hps_head/lib/libc/riscv/sys/Makefile.inc
  projects/hps_head/lib/libc/sparc64/sys/Makefile.inc
  projects/hps_head/lib/libc/stdio/fgetln.c
  projects/hps_head/lib/libc/stdio/fgetwc.c
  projects/hps_head/lib/libc/stdio/fgetwln.c
  projects/hps_head/lib/libc/stdio/fputwc.c
  projects/hps_head/lib/libc/stdio/getdelim.c
  projects/hps_head/lib/libc/stdio/vfprintf.c
  projects/hps_head/lib/libc/stdio/vfwprintf.c
  projects/hps_head/lib/libc/sys/Makefile.inc
  projects/hps_head/lib/libc/sys/Symbol.map
  projects/hps_head/lib/libc/sys/__vdso_gettimeofday.c
  projects/hps_head/lib/libc/sys/aio_fsync.2
  projects/hps_head/lib/libc/sys/aio_mlock.2
  projects/hps_head/lib/libc/sys/aio_read.2
  projects/hps_head/lib/libc/sys/aio_write.2
  projects/hps_head/lib/libc/sys/bind.2
  projects/hps_head/lib/libc/sys/connect.2
  projects/hps_head/lib/libc/sys/fsync.2
  projects/hps_head/lib/libc/sys/interposing_table.c
  projects/hps_head/lib/libc/sys/listen.2
  projects/hps_head/lib/libc/sys/recv.2
  projects/hps_head/lib/libc/sys/send.2
  projects/hps_head/lib/libc/sys/socket.2
  projects/hps_head/lib/libc/sys/trivial-vdso_tc.c
  projects/hps_head/lib/libpam/modules/pam_ssh/pam_ssh.8
  projects/hps_head/lib/libpam/modules/pam_ssh/pam_ssh.c
  projects/hps_head/lib/libthr/thread/thr_syscalls.c
  projects/hps_head/libexec/dma/Makefile.inc
  projects/hps_head/libexec/rtld-elf/mips/reloc.c
  projects/hps_head/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/hps_head/sbin/camcontrol/camcontrol.c
  projects/hps_head/sbin/fsck_ffs/fsck.h
  projects/hps_head/sbin/fsck_ffs/globs.c
  projects/hps_head/sbin/fsck_ffs/main.c
  projects/hps_head/sbin/fsck_ffs/setup.c
  projects/hps_head/sbin/ggate/ggatec/ggatec.8
  projects/hps_head/sbin/ggate/ggated/ggated.8
  projects/hps_head/sbin/ipfw/ipfw.8
  projects/hps_head/sbin/resolvconf/Makefile
  projects/hps_head/secure/lib/libcrypto/Makefile
  projects/hps_head/secure/lib/libcrypto/Makefile.asm
  projects/hps_head/secure/lib/libcrypto/Makefile.inc
  projects/hps_head/secure/lib/libcrypto/amd64/aes-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/aesni-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/bsaes-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/cmll-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/ghash-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/md5-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/rc4-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/rsaz-avx2.S
  projects/hps_head/secure/lib/libcrypto/amd64/rsaz-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/sha1-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/sha256-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/sha512-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/vpaes-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/wp-x86_64.S
  projects/hps_head/secure/lib/libcrypto/amd64/x86_64-gf2m.S
  projects/hps_head/secure/lib/libcrypto/amd64/x86_64-mont.S
  projects/hps_head/secure/lib/libcrypto/amd64/x86_64-mont5.S
  projects/hps_head/secure/lib/libcrypto/amd64/x86_64cpuid.S
  projects/hps_head/secure/lib/libcrypto/i386/aes-586.S
  projects/hps_head/secure/lib/libcrypto/i386/aesni-x86.S
  projects/hps_head/secure/lib/libcrypto/i386/bf-586.S
  projects/hps_head/secure/lib/libcrypto/i386/bf-686.S
  projects/hps_head/secure/lib/libcrypto/i386/bn-586.S
  projects/hps_head/secure/lib/libcrypto/i386/cmll-x86.S
  projects/hps_head/secure/lib/libcrypto/i386/co-586.S
  projects/hps_head/secure/lib/libcrypto/i386/crypt586.S
  projects/hps_head/secure/lib/libcrypto/i386/des-586.S
  projects/hps_head/secure/lib/libcrypto/i386/ghash-x86.S
  projects/hps_head/secure/lib/libcrypto/i386/md5-586.S
  projects/hps_head/secure/lib/libcrypto/i386/rc4-586.S
  projects/hps_head/secure/lib/libcrypto/i386/rc5-586.S
  projects/hps_head/secure/lib/libcrypto/i386/rmd-586.S
  projects/hps_head/secure/lib/libcrypto/i386/sha1-586.S
  projects/hps_head/secure/lib/libcrypto/i386/sha256-586.S
  projects/hps_head/secure/lib/libcrypto/i386/sha512-586.S
  projects/hps_head/secure/lib/libcrypto/i386/vpaes-x86.S
  projects/hps_head/secure/lib/libcrypto/i386/wp-mmx.S
  projects/hps_head/secure/lib/libcrypto/i386/x86-gf2m.S
  projects/hps_head/secure/lib/libcrypto/i386/x86-mont.S
  projects/hps_head/secure/lib/libcrypto/i386/x86cpuid.S
  projects/hps_head/share/i18n/esdb/Makefile.part
  projects/hps_head/share/man/man3/pthread_testcancel.3
  projects/hps_head/share/man/man3/queue.3
  projects/hps_head/share/man/man4/Makefile
  projects/hps_head/share/man/man4/alc.4
  projects/hps_head/share/man/man4/cloudabi.4
  projects/hps_head/share/man/man4/man4.i386/Makefile
  projects/hps_head/share/man/man4/man4.i386/ep.4
  projects/hps_head/share/man/man4/rights.4
  projects/hps_head/share/man/man4/sn.4
  projects/hps_head/share/man/man4/tcp.4
  projects/hps_head/share/man/man5/src.conf.5
  projects/hps_head/share/man/man9/tcp_functions.9
  projects/hps_head/share/mk/bsd.dep.mk
  projects/hps_head/share/mk/bsd.libnames.mk
  projects/hps_head/share/mk/bsd.obj.mk
  projects/hps_head/share/mk/bsd.subdir.mk
  projects/hps_head/share/mk/src.libnames.mk
  projects/hps_head/share/mk/src.opts.mk
  projects/hps_head/share/mk/src.sys.env.mk
  projects/hps_head/share/timedef/ko_KR.UTF-8.src
  projects/hps_head/share/timedef/ko_KR.eucKR.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_CN.GB2312.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_CN.GBK.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_CN.UTF-8.src
  projects/hps_head/share/timedef/zh_CN.eucCN.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_HK.UTF-8.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_TW.Big5.src   (contents, props changed)
  projects/hps_head/share/timedef/zh_TW.UTF-8.src   (contents, props changed)
  projects/hps_head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/hps_head/sys/amd64/conf/NOTES
  projects/hps_head/sys/amd64/include/intr_machdep.h
  projects/hps_head/sys/arm/allwinner/a10_ehci.c
  projects/hps_head/sys/arm/allwinner/a10_gpio.c
  projects/hps_head/sys/arm/allwinner/a10_mmc.c
  projects/hps_head/sys/arm/allwinner/aw_if_dwc.c
  projects/hps_head/sys/arm/allwinner/aw_mp.c
  projects/hps_head/sys/arm/allwinner/aw_rtc.c
  projects/hps_head/sys/arm/allwinner/axp81x.c
  projects/hps_head/sys/arm/allwinner/clk/aw_gate.c
  projects/hps_head/sys/arm/allwinner/clk/aw_modclk.c
  projects/hps_head/sys/arm/allwinner/clk/aw_pll.c
  projects/hps_head/sys/arm/allwinner/files.allwinner
  projects/hps_head/sys/arm/allwinner/if_emac.c
  projects/hps_head/sys/arm/allwinner/timer.c
  projects/hps_head/sys/arm/arm/elf_trampoline.c
  projects/hps_head/sys/arm/arm/generic_timer.c
  projects/hps_head/sys/arm/arm/machdep.c
  projects/hps_head/sys/arm/arm/nexus.c
  projects/hps_head/sys/arm/include/md_var.h
  projects/hps_head/sys/arm/include/vdso.h
  projects/hps_head/sys/arm/nvidia/tegra_lic.c
  projects/hps_head/sys/arm/nvidia/tegra_pcie.c
  projects/hps_head/sys/arm/ti/omap4/omap4_wugen.c
  projects/hps_head/sys/arm64/arm64/busdma_bounce.c
  projects/hps_head/sys/arm64/arm64/gic_v3.c
  projects/hps_head/sys/arm64/arm64/machdep.c
  projects/hps_head/sys/arm64/arm64/nexus.c
  projects/hps_head/sys/arm64/arm64/pmap.c
  projects/hps_head/sys/arm64/arm64/trap.c
  projects/hps_head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  projects/hps_head/sys/arm64/conf/GENERIC
  projects/hps_head/sys/arm64/include/md_var.h
  projects/hps_head/sys/arm64/include/pmap.h
  projects/hps_head/sys/arm64/include/vdso.h
  projects/hps_head/sys/boot/common/boot.c
  projects/hps_head/sys/boot/common/bootstrap.h
  projects/hps_head/sys/boot/common/commands.c
  projects/hps_head/sys/boot/common/dev_net.c
  projects/hps_head/sys/boot/common/interp.c
  projects/hps_head/sys/boot/common/ls.c
  projects/hps_head/sys/boot/common/module.c
  projects/hps_head/sys/boot/efi/boot1/Makefile
  projects/hps_head/sys/boot/efi/boot1/boot1.c
  projects/hps_head/sys/boot/efi/boot1/ufs_module.c
  projects/hps_head/sys/boot/efi/boot1/zfs_module.c
  projects/hps_head/sys/boot/efi/libefi/Makefile
  projects/hps_head/sys/boot/efi/libefi/efi_console.c
  projects/hps_head/sys/boot/efi/loader/Makefile
  projects/hps_head/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/hps_head/sys/boot/efi/loader/conf.c
  projects/hps_head/sys/boot/efi/loader/devicename.c
  projects/hps_head/sys/boot/fdt/dts/arm/bananapi.dts
  projects/hps_head/sys/boot/fdt/fdt_loader_cmd.c
  projects/hps_head/sys/boot/i386/boot2/Makefile
  projects/hps_head/sys/boot/i386/gptboot/Makefile
  projects/hps_head/sys/boot/i386/gptboot/gptldr.S
  projects/hps_head/sys/boot/i386/gptzfsboot/Makefile
  projects/hps_head/sys/boot/i386/zfsboot/Makefile
  projects/hps_head/sys/boot/i386/zfsboot/zfsboot.c
  projects/hps_head/sys/boot/i386/zfsboot/zfsldr.S
  projects/hps_head/sys/boot/userboot/ficl/Makefile
  projects/hps_head/sys/boot/userboot/userboot/Makefile
  projects/hps_head/sys/boot/userboot/userboot/main.c
  projects/hps_head/sys/boot/userboot/zfs/Makefile
  projects/hps_head/sys/boot/zfs/Makefile
  projects/hps_head/sys/boot/zfs/zfsimpl.c
  projects/hps_head/sys/cam/cam.c
  projects/hps_head/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/hps_head/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/hps_head/sys/cam/ctl/ctl_ioctl.h
  projects/hps_head/sys/cddl/boot/zfs/fletcher.c
  projects/hps_head/sys/cddl/boot/zfs/sha256.c
  projects/hps_head/sys/cddl/boot/zfs/zfsimpl.h
  projects/hps_head/sys/cddl/boot/zfs/zfssubr.c
  projects/hps_head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/hps_head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  projects/hps_head/sys/compat/cloudabi/cloudabi_clock.c
  projects/hps_head/sys/compat/cloudabi/cloudabi_fd.c
  projects/hps_head/sys/compat/cloudabi/cloudabi_thread.c
  projects/hps_head/sys/compat/cloudabi64/Makefile
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_fd.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_poll.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_sock.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/hps_head/sys/compat/cloudabi64/cloudabi64_util.h
  projects/hps_head/sys/compat/freebsd32/freebsd32_proto.h
  projects/hps_head/sys/compat/freebsd32/freebsd32_syscall.h
  projects/hps_head/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/hps_head/sys/compat/freebsd32/freebsd32_sysent.c
  projects/hps_head/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/hps_head/sys/compat/freebsd32/syscalls.master
  projects/hps_head/sys/compat/ia32/ia32_signal.h
  projects/hps_head/sys/compat/linux/linux_file.c
  projects/hps_head/sys/conf/NOTES
  projects/hps_head/sys/conf/files
  projects/hps_head/sys/conf/files.amd64
  projects/hps_head/sys/conf/files.arm64
  projects/hps_head/sys/conf/files.i386
  projects/hps_head/sys/conf/kern.post.mk
  projects/hps_head/sys/conf/options
  projects/hps_head/sys/contrib/cloudabi/cloudabi64_types.h
  projects/hps_head/sys/contrib/cloudabi/cloudabi_types_common.h
  projects/hps_head/sys/ddb/db_command.c
  projects/hps_head/sys/dev/acpica/acpi_hpet.c
  projects/hps_head/sys/dev/acpica/acpi_hpet.h
  projects/hps_head/sys/dev/ahci/ahci_pci.c
  projects/hps_head/sys/dev/alc/if_alc.c
  projects/hps_head/sys/dev/alc/if_alcreg.h
  projects/hps_head/sys/dev/alc/if_alcvar.h
  projects/hps_head/sys/dev/bhnd/bhnd.c
  projects/hps_head/sys/dev/bhnd/bhnd.h
  projects/hps_head/sys/dev/bhnd/bhnd_bus_if.m
  projects/hps_head/sys/dev/bhnd/bhnd_subr.c
  projects/hps_head/sys/dev/bhnd/bhnd_types.h
  projects/hps_head/sys/dev/bhnd/bhndb/bhndb.c
  projects/hps_head/sys/dev/bhnd/bhndb/bhndb_private.h
  projects/hps_head/sys/dev/bhnd/bhndb/bhndb_subr.c
  projects/hps_head/sys/dev/bhnd/bhndvar.h
  projects/hps_head/sys/dev/bhnd/cores/chipc/chipc.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram.h
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_nvram_if.m
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_sprom.c
  projects/hps_head/sys/dev/bhnd/nvram/bhnd_spromvar.h
  projects/hps_head/sys/dev/bhnd/tools/nvram_map_gen.awk
  projects/hps_head/sys/dev/bwn/bwn_mac.c
  projects/hps_head/sys/dev/cxgbe/common/common.h
  projects/hps_head/sys/dev/cxgbe/common/t4_hw.c
  projects/hps_head/sys/dev/cxgbe/cxgbei/cxgbei.c
  projects/hps_head/sys/dev/cxgbe/cxgbei/cxgbei.h
  projects/hps_head/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
  projects/hps_head/sys/dev/cxgbe/t4_main.c
  projects/hps_head/sys/dev/fdt/simplebus.c
  projects/hps_head/sys/dev/gpio/gpiobus.c
  projects/hps_head/sys/dev/gpio/gpiobusvar.h
  projects/hps_head/sys/dev/gpio/ofw_gpiobus.c
  projects/hps_head/sys/dev/hyperv/include/vmbus.h
  projects/hps_head/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/hps_head/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/hps_head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/hps_head/sys/dev/hyperv/netvsc/hv_rndis.h
  projects/hps_head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/hps_head/sys/dev/hyperv/netvsc/hv_rndis_filter.h
  projects/hps_head/sys/dev/hyperv/netvsc/if_hnreg.h
  projects/hps_head/sys/dev/hyperv/netvsc/if_hnvar.h
  projects/hps_head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/hps_head/sys/dev/hyperv/storvsc/hv_vstorage.h
  projects/hps_head/sys/dev/hyperv/utilities/hv_heartbeat.c
  projects/hps_head/sys/dev/hyperv/utilities/hv_kvp.c
  projects/hps_head/sys/dev/hyperv/utilities/hv_shutdown.c
  projects/hps_head/sys/dev/hyperv/utilities/hv_timesync.c
  projects/hps_head/sys/dev/hyperv/utilities/hv_util.c
  projects/hps_head/sys/dev/hyperv/utilities/hv_util.h
  projects/hps_head/sys/dev/hyperv/vmbus/vmbus_brvar.h
  projects/hps_head/sys/dev/hyperv/vmbus/vmbus_chan.c
  projects/hps_head/sys/dev/iicbus/ofw_iicbus.c
  projects/hps_head/sys/dev/intpm/intpm.c
  projects/hps_head/sys/dev/ioat/ioat.c
  projects/hps_head/sys/dev/iscsi/icl.c
  projects/hps_head/sys/dev/iscsi/icl.h
  projects/hps_head/sys/dev/iscsi/icl_soft.c
  projects/hps_head/sys/dev/iscsi/iscsi.c
  projects/hps_head/sys/dev/iscsi/iscsi.h
  projects/hps_head/sys/dev/iscsi/iscsi_ioctl.h
  projects/hps_head/sys/dev/iser/icl_iser.c
  projects/hps_head/sys/dev/ixl/if_ixlv.c
  projects/hps_head/sys/dev/mlx5/mlx5_en/en.h
  projects/hps_head/sys/dev/ofw/ofw_bus_subr.c
  projects/hps_head/sys/dev/ofw/ofw_bus_subr.h
  projects/hps_head/sys/dev/ofw/ofwbus.c
  projects/hps_head/sys/dev/pci/pci.c
  projects/hps_head/sys/dev/pci/pci_host_generic.c
  projects/hps_head/sys/dev/pci/pci_pci.c
  projects/hps_head/sys/dev/qlxgbe/ql_boot.c
  projects/hps_head/sys/dev/qlxgbe/ql_dbg.h
  projects/hps_head/sys/dev/qlxgbe/ql_def.h
  projects/hps_head/sys/dev/qlxgbe/ql_fw.c
  projects/hps_head/sys/dev/qlxgbe/ql_glbl.h
  projects/hps_head/sys/dev/qlxgbe/ql_hw.c
  projects/hps_head/sys/dev/qlxgbe/ql_hw.h
  projects/hps_head/sys/dev/qlxgbe/ql_ioctl.c
  projects/hps_head/sys/dev/qlxgbe/ql_ioctl.h
  projects/hps_head/sys/dev/qlxgbe/ql_isr.c
  projects/hps_head/sys/dev/qlxgbe/ql_minidump.c
  projects/hps_head/sys/dev/qlxgbe/ql_os.c
  projects/hps_head/sys/dev/qlxgbe/ql_reset.c
  projects/hps_head/sys/dev/qlxgbe/ql_ver.h
  projects/hps_head/sys/dev/syscons/syscons.c
  projects/hps_head/sys/dev/syscons/syscons.h
  projects/hps_head/sys/dev/usb/controller/xhci.c
  projects/hps_head/sys/dev/usb/input/uep.c
  projects/hps_head/sys/dev/usb/input/ukbd.c
  projects/hps_head/sys/dev/usb/net/if_axge.c
  projects/hps_head/sys/dev/usb/net/if_axgereg.h
  projects/hps_head/sys/dev/usb/net/if_urndis.c
  projects/hps_head/sys/dev/usb/net/if_urndisreg.h
  projects/hps_head/sys/dev/vnic/mrml_bridge.c
  projects/hps_head/sys/dev/vnic/thunder_mdio_fdt.c
  projects/hps_head/sys/dev/vt/vt_core.c
  projects/hps_head/sys/fs/msdosfs/msdosfs_vnops.c
  projects/hps_head/sys/i386/conf/NOTES
  projects/hps_head/sys/i386/include/intr_machdep.h
  projects/hps_head/sys/kern/bus_if.m
  projects/hps_head/sys/kern/capabilities.conf
  projects/hps_head/sys/kern/init_sysent.c
  projects/hps_head/sys/kern/kern_fork.c
  projects/hps_head/sys/kern/kern_prot.c
  projects/hps_head/sys/kern/kern_sig.c
  projects/hps_head/sys/kern/kern_tc.c
  projects/hps_head/sys/kern/kern_umtx.c
  projects/hps_head/sys/kern/pic_if.m
  projects/hps_head/sys/kern/subr_bus.c
  projects/hps_head/sys/kern/subr_intr.c
  projects/hps_head/sys/kern/subr_witness.c
  projects/hps_head/sys/kern/sys_generic.c
  projects/hps_head/sys/kern/sys_process.c
  projects/hps_head/sys/kern/syscalls.c
  projects/hps_head/sys/kern/syscalls.master
  projects/hps_head/sys/kern/systrace_args.c
  projects/hps_head/sys/kern/vfs_aio.c
  projects/hps_head/sys/kern/vfs_default.c
  projects/hps_head/sys/kern/vfs_syscalls.c
  projects/hps_head/sys/kern/vfs_vnops.c
  projects/hps_head/sys/kern/vnode_if.src
  projects/hps_head/sys/mips/broadcom/bcm_machdep.c
  projects/hps_head/sys/mips/conf/BCM
  projects/hps_head/sys/mips/conf/BCM.hints
  projects/hps_head/sys/mips/conf/SENTRY5
  projects/hps_head/sys/mips/conf/SENTRY5.hints
  projects/hps_head/sys/mips/mips/cpu.c
  projects/hps_head/sys/mips/mips/elf_machdep.c
  projects/hps_head/sys/mips/mips/nexus.c
  projects/hps_head/sys/modules/Makefile
  projects/hps_head/sys/modules/bhnd/Makefile
  projects/hps_head/sys/modules/cloudabi64/Makefile
  projects/hps_head/sys/modules/dtb/allwinner/Makefile
  projects/hps_head/sys/net/if_epair.c
  projects/hps_head/sys/net/netisr.c
  projects/hps_head/sys/net80211/ieee80211_ioctl.c
  projects/hps_head/sys/netinet/cc/cc.h
  projects/hps_head/sys/netinet/cc/cc_newreno.c
  projects/hps_head/sys/netinet/in.c
  projects/hps_head/sys/netinet/in.h
  projects/hps_head/sys/netinet/ip_ipsec.c
  projects/hps_head/sys/netinet/ip_output.c
  projects/hps_head/sys/netinet/sctp_input.c
  projects/hps_head/sys/netinet/sctp_output.c
  projects/hps_head/sys/netinet/sctp_usrreq.c
  projects/hps_head/sys/netinet/sctputil.c
  projects/hps_head/sys/netinet/tcp_input.c
  projects/hps_head/sys/netinet/tcp_lro.c
  projects/hps_head/sys/netinet/tcp_subr.c
  projects/hps_head/sys/netinet/tcp_syncache.c
  projects/hps_head/sys/netinet/tcp_timer.c
  projects/hps_head/sys/netinet/tcp_timer.h
  projects/hps_head/sys/netinet/tcp_usrreq.c
  projects/hps_head/sys/netinet/tcp_var.h
  projects/hps_head/sys/netinet/udp_usrreq.c
  projects/hps_head/sys/netinet6/ip6_ipsec.c
  projects/hps_head/sys/netinet6/ip6_output.c
  projects/hps_head/sys/netpfil/ipfw/nat64/nat64_translate.c
  projects/hps_head/sys/ofed/drivers/infiniband/core/iwcm.c
  projects/hps_head/sys/ofed/drivers/infiniband/core/ucma.c
  projects/hps_head/sys/pc98/conf/NOTES
  projects/hps_head/sys/powerpc/booke/booke_machdep.c
  projects/hps_head/sys/powerpc/booke/locore.S
  projects/hps_head/sys/powerpc/booke/pmap.c
  projects/hps_head/sys/powerpc/include/pmap.h
  projects/hps_head/sys/powerpc/powerpc/machdep.c
  projects/hps_head/sys/powerpc/pseries/platform_chrp.c
  projects/hps_head/sys/security/audit/audit.h
  projects/hps_head/sys/security/audit/audit_bsm.c
  projects/hps_head/sys/sparc64/conf/NOTES
  projects/hps_head/sys/sys/buf.h
  projects/hps_head/sys/sys/bus.h
  projects/hps_head/sys/sys/intr.h
  projects/hps_head/sys/sys/mbuf.h
  projects/hps_head/sys/sys/param.h
  projects/hps_head/sys/sys/proc.h
  projects/hps_head/sys/sys/queue.h
  projects/hps_head/sys/sys/syscall.h
  projects/hps_head/sys/sys/syscall.mk
  projects/hps_head/sys/sys/syscallsubr.h
  projects/hps_head/sys/sys/sysproto.h
  projects/hps_head/sys/sys/timetc.h
  projects/hps_head/sys/sys/vdso.h
  projects/hps_head/sys/sys/vnode.h
  projects/hps_head/sys/ufs/ffs/ffs_balloc.c
  projects/hps_head/sys/ufs/ffs/ffs_extern.h
  projects/hps_head/sys/ufs/ffs/ffs_softdep.c
  projects/hps_head/sys/ufs/ffs/ffs_vnops.c
  projects/hps_head/sys/ufs/ffs/softdep.h
  projects/hps_head/sys/x86/include/vdso.h
  projects/hps_head/sys/x86/x86/msi.c
  projects/hps_head/sys/x86/x86/tsc.c
  projects/hps_head/sys/x86/xen/hvm.c
  projects/hps_head/targets/pseudo/userland/Makefile.depend
  projects/hps_head/tests/sys/kern/acct/acct_test.c
  projects/hps_head/tests/sys/kqueue/kqueue_test.sh
  projects/hps_head/tests/sys/kqueue/vnode.c
  projects/hps_head/tools/build/mk/OptionalObsoleteFiles.inc
  projects/hps_head/tools/tools/nanobsd/defaults.sh
  projects/hps_head/usr.bin/bsdiff/bspatch/bspatch.c
  projects/hps_head/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan
  projects/hps_head/usr.bin/getconf/getconf.c
  projects/hps_head/usr.bin/getconf/pathconf.gperf
  projects/hps_head/usr.bin/indent/args.c
  projects/hps_head/usr.bin/indent/indent.c
  projects/hps_head/usr.bin/indent/io.c
  projects/hps_head/usr.bin/indent/lexi.c
  projects/hps_head/usr.bin/indent/parse.c
  projects/hps_head/usr.bin/iscsictl/iscsictl.c
  projects/hps_head/usr.bin/netstat/inet6.c
  projects/hps_head/usr.bin/nfsstat/nfsstat.c
  projects/hps_head/usr.bin/rpcgen/rpc_main.c
  projects/hps_head/usr.bin/systat/main.c
  projects/hps_head/usr.bin/truss/syscalls.c
  projects/hps_head/usr.bin/tty/tty.c
  projects/hps_head/usr.sbin/Makefile.amd64
  projects/hps_head/usr.sbin/Makefile.i386
  projects/hps_head/usr.sbin/cdcontrol/cdcontrol.1
  projects/hps_head/usr.sbin/cdcontrol/cdcontrol.c
  projects/hps_head/usr.sbin/cron/cron/cron.8
  projects/hps_head/usr.sbin/cron/cron/cron.c
  projects/hps_head/usr.sbin/ctladm/ctladm.c
  projects/hps_head/usr.sbin/ctld/chap.c
  projects/hps_head/usr.sbin/ctld/ctld.c
  projects/hps_head/usr.sbin/ctld/ctld.h
  projects/hps_head/usr.sbin/ctld/kernel.c
  projects/hps_head/usr.sbin/ctld/keys.c
  projects/hps_head/usr.sbin/ctld/login.c
  projects/hps_head/usr.sbin/ctld/pdu.c
  projects/hps_head/usr.sbin/fifolog/lib/fifolog_int.c
  projects/hps_head/usr.sbin/fifolog/lib/fifolog_reader.c
  projects/hps_head/usr.sbin/iscsid/chap.c
  projects/hps_head/usr.sbin/iscsid/iscsid.c
  projects/hps_head/usr.sbin/iscsid/iscsid.h
  projects/hps_head/usr.sbin/iscsid/keys.c
  projects/hps_head/usr.sbin/iscsid/login.c
  projects/hps_head/usr.sbin/iscsid/pdu.c
  projects/hps_head/usr.sbin/kldxref/kldxref.c
  projects/hps_head/usr.sbin/ntp/doc/sntp.8
  projects/hps_head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
Directory Properties:
  projects/hps_head/   (props changed)
  projects/hps_head/MAINTAINERS   (props changed)
  projects/hps_head/cddl/   (props changed)
  projects/hps_head/cddl/contrib/opensolaris/   (props changed)
  projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/hps_head/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  projects/hps_head/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/hps_head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/hps_head/contrib/amd/   (props changed)
  projects/hps_head/contrib/apr/   (props changed)
  projects/hps_head/contrib/apr-util/   (props changed)
  projects/hps_head/contrib/atf/   (props changed)
  projects/hps_head/contrib/binutils/   (props changed)
  projects/hps_head/contrib/bmake/   (props changed)
  projects/hps_head/contrib/byacc/   (props changed)
  projects/hps_head/contrib/bzip2/   (props changed)
  projects/hps_head/contrib/com_err/   (props changed)
  projects/hps_head/contrib/compiler-rt/   (props changed)
  projects/hps_head/contrib/dialog/   (props changed)
  projects/hps_head/contrib/dma/   (props changed)
  projects/hps_head/contrib/dtc/   (props changed)
  projects/hps_head/contrib/ee/   (props changed)
  projects/hps_head/contrib/elftoolchain/   (props changed)
  projects/hps_head/contrib/elftoolchain/ar/   (props changed)
  projects/hps_head/contrib/elftoolchain/brandelf/   (props changed)
  projects/hps_head/contrib/elftoolchain/elfdump/   (props changed)
  projects/hps_head/contrib/expat/   (props changed)
  projects/hps_head/contrib/file/   (props changed)
  projects/hps_head/contrib/gcc/   (props changed)
  projects/hps_head/contrib/gcclibs/libgomp/   (props changed)
  projects/hps_head/contrib/gdb/   (props changed)
  projects/hps_head/contrib/gdtoa/   (props changed)
  projects/hps_head/contrib/groff/   (props changed)
  projects/hps_head/contrib/ipfilter/   (props changed)
  projects/hps_head/contrib/ldns/   (props changed)
  projects/hps_head/contrib/ldns-host/   (props changed)
  projects/hps_head/contrib/less/   (props changed)
  projects/hps_head/contrib/libarchive/   (props changed)
  projects/hps_head/contrib/libarchive/cpio/   (props changed)
  projects/hps_head/contrib/libarchive/libarchive/   (props changed)
  projects/hps_head/contrib/libarchive/libarchive_fe/   (props changed)
  projects/hps_head/contrib/libarchive/tar/   (props changed)
  projects/hps_head/contrib/libc++/   (props changed)
  projects/hps_head/contrib/libc-vis/   (props changed)
  projects/hps_head/contrib/libcxxrt/   (props changed)
  projects/hps_head/contrib/libexecinfo/   (props changed)
  projects/hps_head/contrib/libpcap/   (props changed)
  projects/hps_head/contrib/libstdc++/   (props changed)
  projects/hps_head/contrib/libucl/   (props changed)
  projects/hps_head/contrib/libxo/   (props changed)
  projects/hps_head/contrib/llvm/   (props changed)
  projects/hps_head/contrib/llvm/projects/libunwind/   (props changed)
  projects/hps_head/contrib/llvm/tools/clang/   (props changed)
  projects/hps_head/contrib/llvm/tools/lldb/   (props changed)
  projects/hps_head/contrib/llvm/tools/llvm-dwarfdump/   (props changed)
  projects/hps_head/contrib/llvm/tools/llvm-lto/   (props changed)
  projects/hps_head/contrib/mdocml/   (props changed)
  projects/hps_head/contrib/mtree/   (props changed)
  projects/hps_head/contrib/ncurses/   (props changed)
  projects/hps_head/contrib/netcat/   (props changed)
  projects/hps_head/contrib/ntp/   (props changed)
  projects/hps_head/contrib/nvi/   (props changed)
  projects/hps_head/contrib/one-true-awk/   (props changed)
  projects/hps_head/contrib/openbsm/   (props changed)
  projects/hps_head/contrib/openpam/   (props changed)
  projects/hps_head/contrib/openresolv/   (props changed)
  projects/hps_head/contrib/pf/   (props changed)
  projects/hps_head/contrib/sendmail/   (props changed)
  projects/hps_head/contrib/serf/   (props changed)
  projects/hps_head/contrib/sqlite3/   (props changed)
  projects/hps_head/contrib/subversion/   (props changed)
  projects/hps_head/contrib/tcpdump/   (props changed)
  projects/hps_head/contrib/tcsh/   (props changed)
  projects/hps_head/contrib/tnftp/   (props changed)
  projects/hps_head/contrib/top/   (props changed)
  projects/hps_head/contrib/top/install-sh   (props changed)
  projects/hps_head/contrib/tzcode/stdtime/   (props changed)
  projects/hps_head/contrib/tzcode/zic/   (props changed)
  projects/hps_head/contrib/tzdata/   (props changed)
  projects/hps_head/contrib/unbound/   (props changed)
  projects/hps_head/contrib/vis/   (props changed)
  projects/hps_head/contrib/wpa/   (props changed)
  projects/hps_head/contrib/xz/   (props changed)
  projects/hps_head/crypto/heimdal/   (props changed)
  projects/hps_head/crypto/openssh/   (props changed)
  projects/hps_head/crypto/openssl/   (props changed)
  projects/hps_head/gnu/lib/   (props changed)
  projects/hps_head/gnu/usr.bin/binutils/   (props changed)
  projects/hps_head/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/hps_head/gnu/usr.bin/gdb/   (props changed)
  projects/hps_head/lib/libc/locale/ascii.c   (props changed)
  projects/hps_head/sys/cddl/contrib/opensolaris/   (props changed)
  projects/hps_head/sys/contrib/dev/acpica/   (props changed)
  projects/hps_head/sys/contrib/ipfilter/   (props changed)
  projects/hps_head/sys/contrib/libfdt/   (props changed)
  projects/hps_head/sys/contrib/octeon-sdk/   (props changed)
  projects/hps_head/sys/contrib/x86emu/   (props changed)
  projects/hps_head/sys/contrib/xz-embedded/   (props changed)
  projects/hps_head/usr.sbin/bhyve/atkbdc.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/bhyvegc.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/bhyvegc.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/console.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/console.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/pci_fbuf.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/pci_xhci.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/pci_xhci.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/ps2kbd.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/ps2kbd.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/ps2mouse.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/ps2mouse.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/rfb.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/rfb.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/sockstream.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/sockstream.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/usb_emul.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/usb_emul.h   (props changed)
  projects/hps_head/usr.sbin/bhyve/usb_mouse.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/vga.c   (props changed)
  projects/hps_head/usr.sbin/bhyve/vga.h   (props changed)

Modified: projects/hps_head/Makefile.inc1
==============================================================================
--- projects/hps_head/Makefile.inc1	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/Makefile.inc1	Fri Aug 26 12:37:36 2016	(r304848)
@@ -550,8 +550,18 @@ CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="$
 BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
-# External compiler needs sysroot and target flags.
-.if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
+
+# The internal bootstrap compiler has a default sysroot set by TOOLS_PREFIX
+# and target set by TARGET/TARGET_ARCH.  However, there are several needs to
+# always pass an explicit --sysroot and -target.
+# - External compiler needs sysroot and target flags.
+# - External ld needs sysroot.
+# - To be clear about the use of a sysroot when using the internal compiler.
+# - Easier debugging.
+# - Allowing WITH_SYSTEM_COMPILER+WITH_META_MODE to work together due to
+#   the flip-flopping build command when sometimes using external and
+#   sometimes using internal.
+# - Allow using lld which has no support for default paths.
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
@@ -562,24 +572,28 @@ TARGET_ABI=	gnueabihf
 TARGET_ABI=	gnueabi
 .endif
 .endif
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+.if ${WANT_COMPILER_TYPE} == gcc || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem and -L when using a cross-compiler.  --sysroot
 # won't set header path and -L is used to ensure the base library path
 # is added before the port PREFIX library path.
 XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+# GCC requires -B to find /usr/lib/crti.o when using a cross-compiler
+# combined with --sysroot.
+XCFLAGS+=	-B${WORLDTMP}/usr/lib
 # Force using libc++ for external GCC.
 # XXX: This should be checking MK_GNUCXX == no
 .if ${X_COMPILER_VERSION} >= 40800
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++ -L${WORLDTMP}/../lib/libc++
 .endif
-.else
+.elif ${WANT_COMPILER_TYPE} == clang || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd12.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
-.endif # ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}
@@ -1581,10 +1595,6 @@ _groff=		gnu/usr.bin/groff \
 _vtfontcvt=	usr.bin/vtfontcvt
 .endif
 
-.if ${BOOTSTRAPPING} < 900002
-_sed=		usr.bin/sed
-.endif
-
 .if ${BOOTSTRAPPING} < 1000033
 _libopenbsd=	lib/libopenbsd
 _m4=		usr.bin/m4
@@ -1623,10 +1633,6 @@ _crunchide=	usr.sbin/crunch/crunchide
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
-_awk=		usr.bin/awk
-.endif
-
 # r296926 -P keymap search path, MFC to stable/10 in r298297
 .if ${BOOTSTRAPPING} < 1003501 || \
 	(${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)
@@ -1694,7 +1700,6 @@ bootstrap-tools: .PHONY
     ${_gperf} \
     ${_groff} \
     ${_dtc} \
-    ${_awk} \
     ${_cat} \
     ${_dd} \
     ${_kbdcontrol} \
@@ -1702,7 +1707,6 @@ bootstrap-tools: .PHONY
     ${_libopenbsd} \
     ${_makewhatis} \
     usr.bin/rpcgen \
-    ${_sed} \
     ${_yacc} \
     ${_m4} \
     ${_lex} \

Modified: projects/hps_head/Makefile.libcompat
==============================================================================
--- projects/hps_head/Makefile.libcompat	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/Makefile.libcompat	Fri Aug 26 12:37:36 2016	(r304848)
@@ -73,7 +73,8 @@ LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 # Clang/GCC.
 LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat}
 
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+.if ${WANT_COMPILER_TYPE} == gcc || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem when using a cross-compiler and --sysroot.  Note that
 # Makefile.inc1 only applies this with an external compiler but libcompat
 # always does since even in-tree GCC 4.2 needs this to override the built-in

Modified: projects/hps_head/ObsoleteFiles.inc
==============================================================================
--- projects/hps_head/ObsoleteFiles.inc	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/ObsoleteFiles.inc	Fri Aug 26 12:37:36 2016	(r304848)
@@ -38,6 +38,22 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160819: Remove ie(4)
+OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
+# 20160819: Remove spic(4)
+OLD_FILES+=usr/share/man/man4/spic.4.gz
+# 20160819: Remove wl(4) and wlconfig(8)
+OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
+OLD_FILES+=usr/sbin/wlconfig
+OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
+# 20160819: Remove si(4) and sicontrol(8)
+OLD_FILES+=usr/share/man/man4/si.4.gz
+OLD_FILES+=usr/sbin/sicontrol
+OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
+# 20160819: Remove scd(4)
+OLD_FILES+=usr/share/man/man4/scd.4.gz
+# 20160815: Remove mcd(4)
+OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160703: POSIXify locales with variants
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE

Modified: projects/hps_head/UPDATING
==============================================================================
--- projects/hps_head/UPDATING	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/UPDATING	Fri Aug 26 12:37:36 2016	(r304848)
@@ -31,6 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160824:
+	r304787 changed some ioctl interfaces between the iSCSI userspace
+	programs and the kernel.  ctladm, ctld, iscsictl, and iscsid must be
+	rebuilt to work with new kernels.  __FreeBSD_version has been bumped
+	to 1200005.
+
+20160818:
+	The UDP receive code has been updated to only treat incoming UDP
+	packets that were addressed to an L2 broadcast address as L3
+	broadcast packets.  It is not expected that this will affect any
+	standards-conforming UDP application.  The new behaviour can be
+	disabled by setting the sysctl net.inet.udp.require_l2_bcast to
+	0.
+
+20160818:
+	Remove the openbsd_poll system call.
+        __FreeBSD_version has been bumped because of this.
+
 20160622:
 	The libc stub for the pipe(2) system call has been replaced with
 	a wrapper that calls the pipe2(2) system call and the pipe(2)

Modified: projects/hps_head/bin/dd/dd.1
==============================================================================
--- projects/hps_head/bin/dd/dd.1	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/bin/dd/dd.1	Fri Aug 26 12:37:36 2016	(r304848)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2016
+.Dd August 25, 2016
 .Dt DD 1
 .Os
 .Sh NAME
@@ -414,7 +414,7 @@ Check for (even) parity errors on a file
 To create an image of a Mode-1 CD-ROM, which is a commonly used format
 for data CD-ROM disks, use a block size of 2048 bytes:
 .Pp
-.Dl "dd if=/dev/acd0 of=filename.iso bs=2048"
+.Dl "dd if=/dev/cd0 of=filename.iso bs=2048"
 .Pp
 Write a filesystem image to a memory stick, padding the end with zeros,
 if necessary, to a 1MiB boundary:

Modified: projects/hps_head/bin/ls/tests/ls_tests.sh
==============================================================================
--- projects/hps_head/bin/ls/tests/ls_tests.sh	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/bin/ls/tests/ls_tests.sh	Fri Aug 26 12:37:36 2016	(r304848)
@@ -84,6 +84,14 @@ create_test_inputs2()
 {
 	create_test_dir
 
+	if ! getconf MIN_HOLE_SIZE "$(pwd)"; then
+	    echo "getconf MIN_HOLE_SIZE $(pwd) failed; sparse files probably" \
+	         "not supported by file system"
+	    mount
+	    atf_skip "Test's work directory does not support sparse files;" \
+	             "try with a different TMPDIR?"
+	fi
+
 	for filesize in 1 512 $(( 2 * $KB )) $(( 10 * $KB )) $(( 512 * $KB )); \
 	do
 		atf_check -e ignore -o empty -s exit:0 \

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

Modified: projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl	Fri Aug 26 12:37:36 2016	(r304848)
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
+#
+
 require 5.8.4;
 
 $PNAME = $0;
@@ -131,7 +135,8 @@ sub dstyle
 		}
 
 		if (!/^enum/ && !/^\t*struct/ && !/^\t*union/ && !/^typedef/ &&
-		    !/^translator/ && !/^provider/) {
+		    !/^translator/ && !/^provider/ && !/\tif / &&
+		    !/ else /) {
 			if (/[\w\s]+{/) {
 				err "left brace not on its own line";
 			}
@@ -141,7 +146,7 @@ sub dstyle
 			}
 		}
 
-		if (!/;$/) {
+		if (!/;$/ && !/\t*}$/ && !/ else /) {
 			if (/[\w\s]+}/) {
 				err "right brace not on its own line";
 			}

Copied: projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d (from r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d	Fri Aug 26 12:37:36 2016	(r304848, copy of r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16kglobal.d)
@@ -0,0 +1,32 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2016, Joyent, Inc. All rights reserved.
+ */
+
+#pragma D option strsize=16k
+
+char *k;
+
+BEGIN
+{
+	j = probeprov;
+	k = j;
+	k[0] = 'D';
+	k[1] = 'T';
+}
+
+BEGIN
+{
+	trace(stringof(k));
+	exit(k == "DTrace" ? 0 : 1);
+}

Copied: projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d (from r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/hps_head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d	Fri Aug 26 12:37:36 2016	(r304848, copy of r304243, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.16klocal.d)
@@ -0,0 +1,29 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2016, Joyent, Inc. All rights reserved.
+ */
+
+#pragma D option strsize=16k
+
+BEGIN
+{
+	this->j = probeprov;
+	this->j[0] = 'D';
+	this->j[1] = 'T';
+}
+
+BEGIN
+{
+	trace(this->j);
+	exit(this->j == "DTrace" ? 0 : 1);
+}

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Fri Aug 26 12:37:36 2016	(r304848)
@@ -21,8 +21,9 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2015 Gary Mills
  */
 
 /*
@@ -119,7 +120,6 @@ static const dtrace_diftype_t dt_int_rty
 static void *dt_compile(dtrace_hdl_t *, int, dtrace_probespec_t, void *,
     uint_t, int, char *const[], FILE *, const char *);
 
-
 /*ARGSUSED*/
 static int
 dt_idreset(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
@@ -2435,7 +2435,7 @@ dt_compile(dtrace_hdl_t *dtp, int contex
 	dt_node_t *dnp;
 	dt_decl_t *ddp;
 	dt_pcb_t pcb;
-	void *rv;
+	void *volatile rv;
 	int err;
 
 	if ((fp == NULL && s == NULL) || (cflags & ~DTRACE_C_MASK) != 0) {
@@ -2518,6 +2518,28 @@ dt_compile(dtrace_hdl_t *dtp, int contex
 	}
 
 	/*
+	 * Perform sugar transformations (for "if" / "else") and replace the
+	 * existing clause chain with the new one.
+	 */
+	if (context == DT_CTX_DPROG) {
+		dt_node_t *dnp, *next_dnp;
+		dt_node_t *new_list = NULL;
+
+		for (dnp = yypcb->pcb_root->dn_list;
+		    dnp != NULL; dnp = next_dnp) {
+			/* remove this node from the list */
+			next_dnp = dnp->dn_list;
+			dnp->dn_list = NULL;
+
+			if (dnp->dn_kind == DT_NODE_CLAUSE)
+				dnp = dt_compile_sugar(dtp, dnp);
+			/* append node to the new list */
+			new_list = dt_node_link(new_list, dnp);
+		}
+		yypcb->pcb_root->dn_list = new_list;
+	}
+
+	/*
 	 * If we have successfully created a parse tree for a D program, loop
 	 * over the clauses and actions and instantiate the corresponding
 	 * libdtrace program.  If we are parsing a D expression, then we
@@ -2537,6 +2559,8 @@ dt_compile(dtrace_hdl_t *dtp, int contex
 		for (; dnp != NULL; dnp = dnp->dn_list) {
 			switch (dnp->dn_kind) {
 			case DT_NODE_CLAUSE:
+				if (DT_TREEDUMP_PASS(dtp, 4))
+					dt_printd(dnp, stderr, 0);
 				dt_compile_clause(dtp, dnp);
 				break;
 			case DT_NODE_XLATOR:

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Fri Aug 26 12:37:36 2016	(r304848)
@@ -23,8 +23,9 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2014, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
@@ -155,6 +156,8 @@
 %type	<l_node>	probe_specifier_list
 %type	<l_node>	probe_specifier
 %type	<l_node>	statement_list
+%type	<l_node>	statement_list_impl
+%type	<l_node>	statement_or_block
 %type	<l_node>	statement
 %type	<l_node>	declaration
 %type	<l_node>	init_declarator_list
@@ -319,9 +322,11 @@ probe_definition:
 				    "or actions following probe description\n");
 			}
 			$$ = dt_node_clause($1, NULL, NULL);
+			yybegin(YYS_CLAUSE);
 		}
 	|	probe_specifiers '{' statement_list '}' {
 			$$ = dt_node_clause($1, NULL, $3);
+			yybegin(YYS_CLAUSE);
 		}
 	|	probe_specifiers DT_TOK_DIV expression DT_TOK_EPRED {
 			dnerror($3, D_SYNTAX, "expected actions { } following "
@@ -330,6 +335,7 @@ probe_definition:
 	|	probe_specifiers DT_TOK_DIV expression DT_TOK_EPRED
 		    '{' statement_list '}' {
 			$$ = dt_node_clause($1, $3, $6);
+			yybegin(YYS_CLAUSE);
 		}
 	;
 
@@ -349,12 +355,30 @@ probe_specifier:
 	|	DT_TOK_INT   { $$ = dt_node_pdesc_by_id($1); }
 	;
 
-statement_list:	statement { $$ = $1; }
-	|	statement_list ';' statement { $$ = LINK($1, $3); }
+statement_list_impl: /* empty */ { $$ = NULL; }
+	|	statement_list_impl statement { $$ = LINK($1, $2); }
+	;
+
+statement_list:
+		statement_list_impl { $$ = $1; }
+	|	statement_list_impl expression {
+			$$ = LINK($1, dt_node_statement($2));
+		}
 	;
 
-statement:	/* empty */ { $$ = NULL; }
-	|	expression { $$ = dt_node_statement($1); }
+statement_or_block:
+		statement
+	|	'{' statement_list '}' { $$ = $2; }
+
+statement:	';' { $$ = NULL; }
+	|	expression ';' { $$ = dt_node_statement($1); }
+	|	DT_KEY_IF DT_TOK_LPAR expression DT_TOK_RPAR statement_or_block {
+			$$ = dt_node_if($3, $5, NULL);
+		}
+	|	DT_KEY_IF DT_TOK_LPAR expression DT_TOK_RPAR
+		statement_or_block DT_KEY_ELSE statement_or_block {
+			$$ = dt_node_if($3, $5, $7);
+		}
 	;
 
 argument_expression_list:

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Fri Aug 26 12:37:36 2016	(r304848)
@@ -26,7 +26,7 @@
 
 /*
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  */
 
 #ifndef	_DT_IMPL_H
@@ -362,6 +362,7 @@ struct dtrace_hdl {
 	int dt_indent;		/* recommended flow indent */
 	dtrace_epid_t dt_last_epid;	/* most recently consumed EPID */
 	uint64_t dt_last_timestamp;	/* most recently consumed timestamp */
+	boolean_t dt_has_sugar;	/* syntactic sugar used? */
 };
 
 /*

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Aug 26 12:37:36 2016	(r304848)
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -130,8 +130,9 @@
 #define	DT_VERS_1_11	DT_VERSION_NUMBER(1, 11, 0)
 #define	DT_VERS_1_12	DT_VERSION_NUMBER(1, 12, 0)
 #define	DT_VERS_1_12_1	DT_VERSION_NUMBER(1, 12, 1)
-#define	DT_VERS_LATEST	DT_VERS_1_12_1
-#define	DT_VERS_STRING	"Sun D 1.12.1"
+#define	DT_VERS_1_13	DT_VERSION_NUMBER(1, 13, 0)
+#define	DT_VERS_LATEST	DT_VERS_1_13
+#define	DT_VERS_STRING	"Sun D 1.13"
 
 const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_0,	/* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -157,6 +158,7 @@ const dt_version_t _dtrace_versions[] = 
 	DT_VERS_1_11,	/* D API 1.11 */
 	DT_VERS_1_12,	/* D API 1.12 */
 	DT_VERS_1_12_1,	/* D API 1.12.1 */
+	DT_VERS_1_13,	/* D API 1.13 */
 	0
 };
 

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c	Fri Aug 26 12:37:36 2016	(r304848)
@@ -23,7 +23,7 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2013, Joyent Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -2143,6 +2143,17 @@ dt_node_statement(dt_node_t *expr)
 }
 
 dt_node_t *
+dt_node_if(dt_node_t *pred, dt_node_t *acts, dt_node_t *else_acts)
+{
+	dt_node_t *dnp = dt_node_alloc(DT_NODE_IF);
+	dnp->dn_conditional = pred;
+	dnp->dn_body = acts;
+	dnp->dn_alternate_body = else_acts;
+
+	return (dnp);
+}
+
+dt_node_t *
 dt_node_pdesc_by_name(char *spec)
 {
 	dtrace_hdl_t *dtp = yypcb->pcb_hdl;
@@ -2211,7 +2222,6 @@ dt_node_clause(dt_node_t *pdescs, dt_nod
 	dnp->dn_pred = pred;
 	dnp->dn_acts = acts;
 
-	yybegin(YYS_CLAUSE);
 	return (dnp);
 }
 
@@ -3203,8 +3213,9 @@ dt_cook_op2(dt_node_t *dnp, uint_t idfla
 				dt_xcook_ident(lp, dhp, idkind, B_TRUE);
 			else
 				dt_xcook_ident(lp, dhp, idp->di_kind, B_FALSE);
-		} else
+		} else {
 			lp = dnp->dn_left = dt_node_cook(lp, 0);
+		}
 
 		/*
 		 * Switch op to '+' for *(E1 + E2) array mode in these cases:
@@ -3218,10 +3229,12 @@ dt_cook_op2(dt_node_t *dnp, uint_t idfla
 			if (lp->dn_ident->di_kind == DT_IDENT_ARRAY) {
 				if (lp->dn_args != NULL)
 					op = DT_TOK_ADD;
-			} else if (!dt_ident_unref(lp->dn_ident))
+			} else if (!dt_ident_unref(lp->dn_ident)) {
 				op = DT_TOK_ADD;
-		} else if (lp->dn_kind != DT_NODE_AGG)
+			}
+		} else if (lp->dn_kind != DT_NODE_AGG) {
 			op = DT_TOK_ADD;
+		}
 	}
 
 	switch (op) {
@@ -3645,45 +3658,34 @@ asgn_common:
 
 	case DT_TOK_PTR:
 		/*
-		 * If the left-hand side of operator -> is the name "self",
-		 * then we permit a TLS variable to be created or referenced.
+		 * If the left-hand side of operator -> is one of the scoping
+		 * keywords, permit a local or thread variable to be created or
+		 * referenced.
 		 */
-		if (lp->dn_kind == DT_NODE_IDENT &&
-		    strcmp(lp->dn_string, "self") == 0) {
-			if (rp->dn_kind != DT_NODE_VAR) {
-				dt_xcook_ident(rp, dtp->dt_tls,
-				    DT_IDENT_SCALAR, B_TRUE);
-			}
-
-			if (idflags != 0)
-				rp = dt_node_cook(rp, idflags);
-
-			dnp->dn_right = dnp->dn_left; /* avoid freeing rp */
-			dt_node_free(dnp);
-			return (rp);
-		}
+		if (lp->dn_kind == DT_NODE_IDENT) {
+			dt_idhash_t *dhp = NULL;
 
-		/*
-		 * If the left-hand side of operator -> is the name "this",
-		 * then we permit a local variable to be created or referenced.
-		 */
-		if (lp->dn_kind == DT_NODE_IDENT &&
-		    strcmp(lp->dn_string, "this") == 0) {
-			if (rp->dn_kind != DT_NODE_VAR) {
-				dt_xcook_ident(rp, yypcb->pcb_locals,
-				    DT_IDENT_SCALAR, B_TRUE);
+			if (strcmp(lp->dn_string, "self") == 0) {
+				dhp = dtp->dt_tls;
+			} else if (strcmp(lp->dn_string, "this") == 0) {
+				dhp = yypcb->pcb_locals;
 			}
+			if (dhp != NULL) {
+				if (rp->dn_kind != DT_NODE_VAR) {
+					dt_xcook_ident(rp, dhp,
+					    DT_IDENT_SCALAR, B_TRUE);
+				}
 
-			if (idflags != 0)
-				rp = dt_node_cook(rp, idflags);
+				if (idflags != 0)
+					rp = dt_node_cook(rp, idflags);
 
-			dnp->dn_right = dnp->dn_left; /* avoid freeing rp */
-			dt_node_free(dnp);
-			return (rp);
+				/* avoid freeing rp */
+				dnp->dn_right = dnp->dn_left;
+				dt_node_free(dnp);
+				return (rp);
+			}
 		}
-
 		/*FALLTHRU*/
-
 	case DT_TOK_DOT:
 		lp = dnp->dn_left = dt_node_cook(lp, DT_IDFLG_REF);
 
@@ -4502,7 +4504,8 @@ static dt_node_t *(*dt_cook_funcs[])(dt_
 	dt_cook_xlator,		/* DT_NODE_XLATOR */
 	dt_cook_none,		/* DT_NODE_PROBE */
 	dt_cook_provider,	/* DT_NODE_PROVIDER */
-	dt_cook_none		/* DT_NODE_PROG */
+	dt_cook_none,		/* DT_NODE_PROG */
+	dt_cook_none,		/* DT_NODE_IF */
 };
 
 /*
@@ -4517,6 +4520,8 @@ dt_node_cook(dt_node_t *dnp, uint_t idfl
 
 	yylineno = dnp->dn_line;
 
+	assert(dnp->dn_kind <
+	    sizeof (dt_cook_funcs) / sizeof (dt_cook_funcs[0]));
 	dnp = dt_cook_funcs[dnp->dn_kind](dnp, idflags);
 	dnp->dn_flags |= DT_NF_COOKED;
 
@@ -4619,6 +4624,181 @@ dt_node_diftype(dtrace_hdl_t *dtp, const
 	tp->dtdt_size = ctf_type_size(dnp->dn_ctfp, dnp->dn_type);
 }
 
+/*
+ * Output the parse tree as D.  The "-xtree=8" argument will call this
+ * function to print out the program after any syntactic sugar
+ * transformations have been applied (e.g. to implement "if").  The
+ * resulting output can be used to understand the transformations
+ * applied by these features, or to run such a script on a system that
+ * does not support these features
+ *
+ * Note that the output does not express precisely the same program as
+ * the input.  In particular:
+ *  - Only the clauses are output.  #pragma options, variable
+ *    declarations, etc. are excluded.
+ *  - Command argument substitution has already been done, so the output
+ *    will not contain e.g. $$1, but rather the substituted string.
+ */
+void
+dt_printd(dt_node_t *dnp, FILE *fp, int depth)
+{
+	dt_node_t *arg;
+
+	switch (dnp->dn_kind) {
+	case DT_NODE_INT:
+		(void) fprintf(fp, "0x%llx", (u_longlong_t)dnp->dn_value);
+		if (!(dnp->dn_flags & DT_NF_SIGNED))
+			(void) fprintf(fp, "u");
+		break;
+
+	case DT_NODE_STRING: {
+		char *escd = strchr2esc(dnp->dn_string, strlen(dnp->dn_string));
+		(void) fprintf(fp, "\"%s\"", escd);
+		free(escd);
+		break;
+	}
+
+	case DT_NODE_IDENT:
+		(void) fprintf(fp, "%s", dnp->dn_string);
+		break;
+
+	case DT_NODE_VAR:
+		(void) fprintf(fp, "%s%s",
+		    (dnp->dn_ident->di_flags & DT_IDFLG_LOCAL) ? "this->" :
+		    (dnp->dn_ident->di_flags & DT_IDFLG_TLS) ? "self->" : "",
+		    dnp->dn_ident->di_name);
+
+		if (dnp->dn_args != NULL) {
+			(void) fprintf(fp, "[");
+
+			for (arg = dnp->dn_args; arg != NULL;
+			    arg = arg->dn_list) {
+				dt_printd(arg, fp, 0);
+				if (arg->dn_list != NULL)
+					(void) fprintf(fp, ", ");
+			}
+
+			(void) fprintf(fp, "]");
+		}
+		break;
+
+	case DT_NODE_SYM: {
+		const dtrace_syminfo_t *dts = dnp->dn_ident->di_data;
+		(void) fprintf(fp, "%s`%s", dts->dts_object, dts->dts_name);
+		break;
+	}
+	case DT_NODE_FUNC:
+		(void) fprintf(fp, "%s(", dnp->dn_ident->di_name);
+
+		for (arg = dnp->dn_args; arg != NULL; arg = arg->dn_list) {
+			dt_printd(arg, fp, 0);
+			if (arg->dn_list != NULL)
+				(void) fprintf(fp, ", ");
+		}
+		(void) fprintf(fp, ")");
+		break;
+
+	case DT_NODE_OP1:
+		(void) fprintf(fp, "%s(", opstr(dnp->dn_op));
+		dt_printd(dnp->dn_child, fp, 0);
+		(void) fprintf(fp, ")");
+		break;
+
+	case DT_NODE_OP2:
+		(void) fprintf(fp, "(");
+		dt_printd(dnp->dn_left, fp, 0);
+		if (dnp->dn_op == DT_TOK_LPAR) {
+			(void) fprintf(fp, ")");
+			dt_printd(dnp->dn_right, fp, 0);
+			break;
+		}
+		if (dnp->dn_op == DT_TOK_PTR || dnp->dn_op == DT_TOK_DOT ||
+		    dnp->dn_op == DT_TOK_LBRAC)
+			(void) fprintf(fp, "%s", opstr(dnp->dn_op));
+		else
+			(void) fprintf(fp, " %s ", opstr(dnp->dn_op));
+		dt_printd(dnp->dn_right, fp, 0);
+		if (dnp->dn_op == DT_TOK_LBRAC) {
+			dt_node_t *ln = dnp->dn_right;
+			while (ln->dn_list != NULL) {
+				(void) fprintf(fp, ", ");
+				dt_printd(ln->dn_list, fp, depth);
+				ln = ln->dn_list;
+			}
+			(void) fprintf(fp, "]");
+		}
+		(void) fprintf(fp, ")");
+		break;
+
+	case DT_NODE_OP3:
+		(void) fprintf(fp, "(");
+		dt_printd(dnp->dn_expr, fp, 0);
+		(void) fprintf(fp, " ? ");
+		dt_printd(dnp->dn_left, fp, 0);
+		(void) fprintf(fp, " : ");
+		dt_printd(dnp->dn_right, fp, 0);
+		(void) fprintf(fp, ")");
+		break;
+
+	case DT_NODE_DEXPR:
+	case DT_NODE_DFUNC:
+		(void) fprintf(fp, "%*s", depth * 8, "");
+		dt_printd(dnp->dn_expr, fp, depth + 1);
+		(void) fprintf(fp, ";\n");
+		break;
+
+	case DT_NODE_PDESC:
+		(void) fprintf(fp, "%s:%s:%s:%s",
+		    dnp->dn_desc->dtpd_provider, dnp->dn_desc->dtpd_mod,
+		    dnp->dn_desc->dtpd_func, dnp->dn_desc->dtpd_name);
+		break;
+
+	case DT_NODE_CLAUSE:
+		for (arg = dnp->dn_pdescs; arg != NULL; arg = arg->dn_list) {
+			dt_printd(arg, fp, 0);
+			if (arg->dn_list != NULL)
+				(void) fprintf(fp, ",");
+			(void) fprintf(fp, "\n");
+		}
+
+		if (dnp->dn_pred != NULL) {
+			(void) fprintf(fp, "/");
+			dt_printd(dnp->dn_pred, fp, 0);
+			(void) fprintf(fp, "/\n");
+		}
+			(void) fprintf(fp, "{\n");
+
+		for (arg = dnp->dn_acts; arg != NULL; arg = arg->dn_list)
+			dt_printd(arg, fp, depth + 1);
+		(void) fprintf(fp, "}\n");
+		(void) fprintf(fp, "\n");
+		break;
+
+	case DT_NODE_IF:
+		(void) fprintf(fp, "%*sif (", depth * 8, "");
+		dt_printd(dnp->dn_conditional, fp, 0);
+		(void) fprintf(fp, ") {\n");
+
+		for (arg = dnp->dn_body; arg != NULL; arg = arg->dn_list)
+			dt_printd(arg, fp, depth + 1);
+		if (dnp->dn_alternate_body == NULL) {
+			(void) fprintf(fp, "%*s}\n", depth * 8, "");
+		} else {
+			(void) fprintf(fp, "%*s} else {\n", depth * 8, "");
+			for (arg = dnp->dn_alternate_body; arg != NULL;
+			    arg = arg->dn_list)
+				dt_printd(arg, fp, depth + 1);
+			(void) fprintf(fp, "%*s}\n", depth * 8, "");
+		}
+
+		break;
+
+	default:
+		(void) fprintf(fp, "/* bad node %p, kind %d */\n",
+		    (void *)dnp, dnp->dn_kind);
+	}
+}
+
 void
 dt_node_printr(dt_node_t *dnp, FILE *fp, int depth)
 {
@@ -4729,6 +4909,13 @@ dt_node_printr(dt_node_t *dnp, FILE *fp,
 		(void) fprintf(fp, "OP2 %s (%s)\n", opstr(dnp->dn_op), buf);
 		dt_node_printr(dnp->dn_left, fp, depth + 1);
 		dt_node_printr(dnp->dn_right, fp, depth + 1);
+		if (dnp->dn_op == DT_TOK_LBRAC) {
+			dt_node_t *ln = dnp->dn_right;
+			while (ln->dn_list != NULL) {
+				dt_node_printr(ln->dn_list, fp, depth + 1);
+				ln = ln->dn_list;
+			}
+		}
 		break;
 
 	case DT_NODE_OP3:
@@ -4790,6 +4977,7 @@ dt_node_printr(dt_node_t *dnp, FILE *fp,
 
 		for (arg = dnp->dn_acts; arg != NULL; arg = arg->dn_list)
 			dt_node_printr(arg, fp, depth + 1);
+		(void) fprintf(fp, "\n");
 		break;
 
 	case DT_NODE_INLINE:
@@ -4840,6 +5028,24 @@ dt_node_printr(dt_node_t *dnp, FILE *fp,
 			dt_node_printr(arg, fp, depth + 1);
 		break;
 
+	case DT_NODE_IF:
+		(void) fprintf(fp, "IF attr=%s CONDITION:\n", a);
+
+		dt_node_printr(dnp->dn_conditional, fp, depth + 1);
+
+		(void) fprintf(fp, "%*sIF BODY: \n", depth * 2, "");
+		for (arg = dnp->dn_body; arg != NULL; arg = arg->dn_list)
+			dt_node_printr(arg, fp, depth + 1);
+
+		if (dnp->dn_alternate_body != NULL) {
+			(void) fprintf(fp, "%*sIF ELSE: \n", depth * 2, "");
+			for (arg = dnp->dn_alternate_body; arg != NULL;
+			    arg = arg->dn_list)
+				dt_node_printr(arg, fp, depth + 1);
+		}
+
+		break;
+
 	default:
 		(void) fprintf(fp, "<bad node %p, kind %d>\n",
 		    (void *)dnp, dnp->dn_kind);

Modified: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h
==============================================================================
--- projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h	Fri Aug 26 12:08:27 2016	(r304847)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h	Fri Aug 26 12:37:36 2016	(r304848)
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013 Joyent, Inc. All rights reserved.
  */
 
@@ -105,6 +105,12 @@ typedef struct dt_node {
 			struct dt_node *_probes;  /* list of probe nodes */
 			int _redecl;		/* provider redeclared */
 		} _provider;
+
+		struct {
+			struct dt_node *_conditional;
+			struct dt_node *_body;
+			struct dt_node *_alternate_body;
+		} _conditional;
 	} dn_u;
 
 	struct dt_node *dn_list; /* parse tree list link */
@@ -140,6 +146,11 @@ typedef struct dt_node {
 #define	dn_provred	dn_u._provider._redecl	/* DT_NODE_PROVIDER */
 #define	dn_probes	dn_u._provider._probes	/* DT_NODE_PROVIDER */
 
+/* DT_NODE_IF: */
+#define	dn_conditional		dn_u._conditional._conditional
+#define	dn_body			dn_u._conditional._body
+#define	dn_alternate_body	dn_u._conditional._alternate_body
+
 #define	DT_NODE_FREE	0	/* unused node (waiting to be freed) */
 #define	DT_NODE_INT	1	/* integer value */
 #define	DT_NODE_STRING	2	/* string value */
@@ -162,6 +173,7 @@ typedef struct dt_node {
 #define	DT_NODE_PROBE	19	/* probe definition */
 #define	DT_NODE_PROVIDER 20	/* provider definition */
 #define	DT_NODE_PROG	21	/* program translation unit */
+#define	DT_NODE_IF	22	/* if statement */
 
 #define	DT_NF_SIGNED	0x01	/* data is a signed quantity (else unsigned) */
 #define	DT_NF_COOKED	0x02	/* data is a known type (else still cooking) */
@@ -213,6 +225,7 @@ extern dt_node_t *dt_node_xlator(dt_decl
 extern dt_node_t *dt_node_probe(char *, int, dt_node_t *, dt_node_t *);
 extern dt_node_t *dt_node_provider(char *, dt_node_t *);
 extern dt_node_t *dt_node_program(dt_node_t *);
+extern dt_node_t *dt_node_if(dt_node_t *, dt_node_t *, dt_node_t *);
 
 extern dt_node_t *dt_node_link(dt_node_t *, dt_node_t *);
 extern dt_node_t *dt_node_cook(dt_node_t *, uint_t);
@@ -237,6 +250,7 @@ extern void dt_node_promote(dt_node_t *,
 extern void dt_node_diftype(dtrace_hdl_t *,
     const dt_node_t *, dtrace_diftype_t *);
 extern void dt_node_printr(dt_node_t *, FILE *, int);
+extern void dt_printd(dt_node_t *, FILE *, int);
 extern const char *dt_node_name(const dt_node_t *, char *, size_t);
 extern int dt_node_root(dt_node_t *);
 

Copied: projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c (from r304243, head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/hps_head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c	Fri Aug 26 12:37:36 2016	(r304848, copy of r304243, head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_sugar.c)
@@ -0,0 +1,516 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at

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

More information about the svn-src-projects mailing list