svn commit: r325120 - in projects/runtime-coverage: . cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libcmdutils cddl/contrib/opensolaris/lib/libdt...

Mon Oct 30 05:52:30 UTC 2017

Author: ngie
Date: Mon Oct 30 05:52:26 2017
New Revision: 325120
URL: https://svnweb.freebsd.org/changeset/base/325120

Log:
  MFhead at r325119

Added:
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libcmdutils/
     - copied from r325119, head/cddl/contrib/opensolaris/lib/libcmdutils/
  projects/runtime-coverage/contrib/tzdata/calendars
     - copied unchanged from r325119, head/contrib/tzdata/calendars
  projects/runtime-coverage/contrib/tzdata/theory.html
     - copied unchanged from r325119, head/contrib/tzdata/theory.html
  projects/runtime-coverage/contrib/tzdata/zishrink.awk
     - copied unchanged from r325119, head/contrib/tzdata/zishrink.awk
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec_mii_acc.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec_mii_acc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac_mii_acc.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac_mii_acc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fman_tgec.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_tgec.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/memac.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/memac.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/memac.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/memac.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MACSEC/
     - copied from r325119, head/sys/contrib/ncsw/Peripherals/FM/MACSEC/
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/crc64.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/crc64.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_kg.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_kg.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_prs.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_prs.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_kg.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_kg.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_prs.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_prs.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Port/fm_port_dsar.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port_dsar.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Port/fman_port.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Port/fman_port.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Rtc/fman_rtc.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/Rtc/fman_rtc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/SP/
     - copied from r325119, head/sys/contrib/ncsw/Peripherals/FM/SP/
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fman_ncsw.c
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/fman_ncsw.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/inc/fm_sp_common.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/Peripherals/FM/inc/fm_sp_common.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_macsec_ext.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/inc/Peripherals/fm_macsec_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_vsp_ext.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/inc/Peripherals/fm_vsp_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/mii_acc_ext.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/inc/Peripherals/mii_acc_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/cores/arm_ext.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/inc/cores/arm_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/flib/
     - copied from r325119, head/sys/contrib/ncsw/inc/flib/
  projects/runtime-coverage/sys/contrib/ncsw/inc/xx_common.h
     - copied unchanged from r325119, head/sys/contrib/ncsw/inc/xx_common.h
  projects/runtime-coverage/tests/sys/netpfil/pf/fragmentation.sh
     - copied unchanged from r325119, head/tests/sys/netpfil/pf/fragmentation.sh
Deleted:
  projects/runtime-coverage/contrib/tzdata/Theory
  projects/runtime-coverage/share/examples/printing/README
  projects/runtime-coverage/sys/boot/arm/at91/
  projects/runtime-coverage/sys/boot/arm/ixp425/
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm_guest.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/sprint.c
  projects/runtime-coverage/sys/contrib/ncsw/inc/math_ext.h
Modified:
  projects/runtime-coverage/Makefile
  projects/runtime-coverage/Makefile.inc1
  projects/runtime-coverage/Makefile.libcompat
  projects/runtime-coverage/README
  projects/runtime-coverage/README.md
  projects/runtime-coverage/UPDATING
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/util.c
  projects/runtime-coverage/cddl/lib/libzfs/Makefile
  projects/runtime-coverage/cddl/lib/libzpool/Makefile
  projects/runtime-coverage/cddl/usr.bin/ztest/Makefile
  projects/runtime-coverage/cddl/usr.sbin/zdb/Makefile
  projects/runtime-coverage/cddl/usr.sbin/zfsd/case_file.cc
  projects/runtime-coverage/cddl/usr.sbin/zfsd/case_file.h
  projects/runtime-coverage/cddl/usr.sbin/zfsd/vdev_iterator.cc
  projects/runtime-coverage/contrib/dma/dma.c
  projects/runtime-coverage/contrib/tzdata/CONTRIBUTING
  projects/runtime-coverage/contrib/tzdata/LICENSE
  projects/runtime-coverage/contrib/tzdata/Makefile
  projects/runtime-coverage/contrib/tzdata/NEWS
  projects/runtime-coverage/contrib/tzdata/africa
  projects/runtime-coverage/contrib/tzdata/antarctica
  projects/runtime-coverage/contrib/tzdata/asia
  projects/runtime-coverage/contrib/tzdata/australasia
  projects/runtime-coverage/contrib/tzdata/backward
  projects/runtime-coverage/contrib/tzdata/backzone
  projects/runtime-coverage/contrib/tzdata/checklinks.awk
  projects/runtime-coverage/contrib/tzdata/europe
  projects/runtime-coverage/contrib/tzdata/leap-seconds.list
  projects/runtime-coverage/contrib/tzdata/leapseconds
  projects/runtime-coverage/contrib/tzdata/leapseconds.awk
  projects/runtime-coverage/contrib/tzdata/northamerica
  projects/runtime-coverage/contrib/tzdata/southamerica
  projects/runtime-coverage/contrib/tzdata/version
  projects/runtime-coverage/contrib/tzdata/zone.tab
  projects/runtime-coverage/contrib/tzdata/zone1970.tab
  projects/runtime-coverage/etc/printcap
  projects/runtime-coverage/lib/Makefile
  projects/runtime-coverage/lib/csu/arm/crt1.c
  projects/runtime-coverage/lib/csu/powerpc/crt1.c
  projects/runtime-coverage/lib/csu/powerpc64/crt1.c
  projects/runtime-coverage/lib/libc/regex/regcomp.c
  projects/runtime-coverage/lib/libc/stdio/gets.c
  projects/runtime-coverage/lib/libcasper/Makefile.inc
  projects/runtime-coverage/lib/libcasper/libcasper/Makefile
  projects/runtime-coverage/lib/libcasper/libcasper/libcasper.3
  projects/runtime-coverage/lib/libcasper/libcasper/libcasper.h
  projects/runtime-coverage/lib/libcasper/services/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_dns/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_dns/cap_dns.h
  projects/runtime-coverage/lib/libcasper/services/cap_dns/tests/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_dns/tests/dns_test.c
  projects/runtime-coverage/lib/libcasper/services/cap_grp/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_grp/cap_grp.h
  projects/runtime-coverage/lib/libcasper/services/cap_grp/tests/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_grp/tests/grp_test.c
  projects/runtime-coverage/lib/libcasper/services/cap_pwd/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_pwd/cap_pwd.h
  projects/runtime-coverage/lib/libcasper/services/cap_pwd/tests/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_pwd/tests/pwd_test.c
  projects/runtime-coverage/lib/libcasper/services/cap_random/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_random/cap_random.h
  projects/runtime-coverage/lib/libcasper/services/cap_sysctl/Makefile
  projects/runtime-coverage/lib/libcasper/services/cap_sysctl/cap_sysctl.h
  projects/runtime-coverage/lib/libcasper/services/cap_sysctl/tests/Makefile
  projects/runtime-coverage/lib/libdevdctl/guid.h
  projects/runtime-coverage/lib/libpam/modules/pam_unix/pam_unix.c
  projects/runtime-coverage/lib/libthr/arch/arm/include/pthread_md.h
  projects/runtime-coverage/lib/libusb/libusb10.c
  projects/runtime-coverage/libexec/rtld-elf/libmap.c
  projects/runtime-coverage/release/amd64/mkisoimages.sh
  projects/runtime-coverage/release/i386/mkisoimages.sh
  projects/runtime-coverage/release/powerpc/mkisoimages.sh
  projects/runtime-coverage/release/scripts/mm-mtree.sh
  projects/runtime-coverage/release/sparc64/mkisoimages.sh
  projects/runtime-coverage/rescue/README
  projects/runtime-coverage/sbin/ping/ping.c
  projects/runtime-coverage/share/doc/papers/contents/contents.ms
  projects/runtime-coverage/share/examples/BSD_daemon/poster.sh
  projects/runtime-coverage/share/examples/Makefile
  projects/runtime-coverage/share/man/man4/lge.4
  projects/runtime-coverage/share/man/man4/mac.4
  projects/runtime-coverage/share/man/man7/build.7
  projects/runtime-coverage/share/man/man7/ports.7
  projects/runtime-coverage/share/man/man7/release.7
  projects/runtime-coverage/share/man/man7/tests.7
  projects/runtime-coverage/share/man/man8/crash.8
  projects/runtime-coverage/share/man/man9/cnv.9
  projects/runtime-coverage/share/man/man9/mac.9
  projects/runtime-coverage/share/man/man9/own.9
  projects/runtime-coverage/share/man/man9/pci.9
  projects/runtime-coverage/share/misc/bsd-family-tree
  projects/runtime-coverage/share/misc/iso3166
  projects/runtime-coverage/share/misc/organization.dot
  projects/runtime-coverage/share/mk/local.meta.sys.mk
  projects/runtime-coverage/share/mk/local.sys.env.mk
  projects/runtime-coverage/sys/amd64/conf/GENERIC
  projects/runtime-coverage/sys/amd64/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/amd64/conf/MINIMAL
  projects/runtime-coverage/sys/amd64/vmm/io/iommu.c
  projects/runtime-coverage/sys/amd64/vmm/io/ppt.c
  projects/runtime-coverage/sys/amd64/vmm/io/vhpet.c
  projects/runtime-coverage/sys/arm/conf/ALLWINNER_UP
  projects/runtime-coverage/sys/arm/conf/ALPINE
  projects/runtime-coverage/sys/arm/conf/AML8726
  projects/runtime-coverage/sys/arm/conf/APALIS-IMX6
  projects/runtime-coverage/sys/arm/conf/ARMADAXP
  projects/runtime-coverage/sys/arm/conf/ARNDALE
  projects/runtime-coverage/sys/arm/conf/ARNDALE-OCTA
  projects/runtime-coverage/sys/arm/conf/AVILA
  projects/runtime-coverage/sys/arm/conf/BEAGLEBONE
  projects/runtime-coverage/sys/arm/conf/BWCT
  projects/runtime-coverage/sys/arm/conf/CAMBRIA
  projects/runtime-coverage/sys/arm/conf/CHROMEBOOK
  projects/runtime-coverage/sys/arm/conf/CHROMEBOOK-PEACH-PIT
  projects/runtime-coverage/sys/arm/conf/CHROMEBOOK-SNOW
  projects/runtime-coverage/sys/arm/conf/CHROMEBOOK-SPRING
  projects/runtime-coverage/sys/arm/conf/CNS11XXNAS
  projects/runtime-coverage/sys/arm/conf/COLIBRI-VF50
  projects/runtime-coverage/sys/arm/conf/COSMIC
  projects/runtime-coverage/sys/arm/conf/CRB
  projects/runtime-coverage/sys/arm/conf/DOCKSTAR
  projects/runtime-coverage/sys/arm/conf/DREAMPLUG-1001
  projects/runtime-coverage/sys/arm/conf/EB9200
  projects/runtime-coverage/sys/arm/conf/EFIKA_MX
  projects/runtime-coverage/sys/arm/conf/ETHERNUT5
  projects/runtime-coverage/sys/arm/conf/EXYNOS5.common
  projects/runtime-coverage/sys/arm/conf/EXYNOS5250
  projects/runtime-coverage/sys/arm/conf/EXYNOS5420
  projects/runtime-coverage/sys/arm/conf/GENERIC
  projects/runtime-coverage/sys/arm/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/arm/conf/GUMSTIX
  projects/runtime-coverage/sys/arm/conf/GUMSTIX-QEMU
  projects/runtime-coverage/sys/arm/conf/HL200
  projects/runtime-coverage/sys/arm/conf/HL201
  projects/runtime-coverage/sys/arm/conf/IMX53
  projects/runtime-coverage/sys/arm/conf/IMX6
  projects/runtime-coverage/sys/arm/conf/JETSON-TK1
  projects/runtime-coverage/sys/arm/conf/KB920X
  projects/runtime-coverage/sys/arm/conf/NSLU
  projects/runtime-coverage/sys/arm/conf/ODROIDC1
  projects/runtime-coverage/sys/arm/conf/PANDABOARD
  projects/runtime-coverage/sys/arm/conf/QILA9G20
  projects/runtime-coverage/sys/arm/conf/QUARTZ
  projects/runtime-coverage/sys/arm/conf/RADXA
  projects/runtime-coverage/sys/arm/conf/RADXA-LITE
  projects/runtime-coverage/sys/arm/conf/RK3188
  projects/runtime-coverage/sys/arm/conf/RPI-B
  projects/runtime-coverage/sys/arm/conf/RPI2
  projects/runtime-coverage/sys/arm/conf/SAM9260EK
  projects/runtime-coverage/sys/arm/conf/SAM9G20EK
  projects/runtime-coverage/sys/arm/conf/SAM9X25EK
  projects/runtime-coverage/sys/arm/conf/SN9G45
  projects/runtime-coverage/sys/arm/conf/SOCDK
  projects/runtime-coverage/sys/arm/conf/SOCFPGA
  projects/runtime-coverage/sys/arm/conf/SOCKIT
  projects/runtime-coverage/sys/arm/conf/SOCKIT-BERI
  projects/runtime-coverage/sys/arm/conf/TEGRA124
  projects/runtime-coverage/sys/arm/conf/VERSATILEPB
  projects/runtime-coverage/sys/arm/conf/VIRT
  projects/runtime-coverage/sys/arm/conf/VSATV102
  projects/runtime-coverage/sys/arm/conf/VYBRID
  projects/runtime-coverage/sys/arm/conf/YYHD18
  projects/runtime-coverage/sys/arm/conf/ZEDBOARD
  projects/runtime-coverage/sys/arm/include/metadata.h
  projects/runtime-coverage/sys/arm64/conf/GENERIC
  projects/runtime-coverage/sys/arm64/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/arm64/conf/GENERIC-UP
  projects/runtime-coverage/sys/boot/defs.mk
  projects/runtime-coverage/sys/boot/efi/boot1/Makefile
  projects/runtime-coverage/sys/boot/efi/fdt/Makefile
  projects/runtime-coverage/sys/boot/efi/libefi/Makefile
  projects/runtime-coverage/sys/boot/efi/loader/Makefile
  projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc
  projects/runtime-coverage/sys/boot/efi/loader/arch/arm64/Makefile.inc
  projects/runtime-coverage/sys/boot/efi/loader/arch/i386/Makefile.inc
  projects/runtime-coverage/sys/boot/fdt/Makefile
  projects/runtime-coverage/sys/boot/ficl.mk
  projects/runtime-coverage/sys/boot/ficl/Makefile
  projects/runtime-coverage/sys/boot/geli/Makefile
  projects/runtime-coverage/sys/boot/mips/beri/boot2/Makefile
  projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile
  projects/runtime-coverage/sys/boot/mips/uboot/Makefile
  projects/runtime-coverage/sys/boot/ofw/libofw/Makefile
  projects/runtime-coverage/sys/boot/powerpc/boot1.chrp/Makefile
  projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile
  projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile
  projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile
  projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile
  projects/runtime-coverage/sys/boot/sparc64/boot1/Makefile
  projects/runtime-coverage/sys/boot/sparc64/loader/Makefile
  projects/runtime-coverage/sys/boot/uboot/fdt/Makefile
  projects/runtime-coverage/sys/boot/uboot/lib/Makefile
  projects/runtime-coverage/sys/boot/zfs/Makefile
  projects/runtime-coverage/sys/cam/ata/ata_da.c
  projects/runtime-coverage/sys/cam/nvme/nvme_da.c
  projects/runtime-coverage/sys/compat/linux/linux_file.c
  projects/runtime-coverage/sys/contrib/libnv/cnvlist.c
  projects/runtime-coverage/sys/contrib/libnv/nvlist.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/BM/bm.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/BM/bm_pool.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/BM/bman_low.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/BM/bman_private.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/HC/hc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec_mii_acc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec_mii_acc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fm_mac.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/fm_mac.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/tgec.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/tgec.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/tgec_mii_acc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/MAC/tgec_mii_acc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_kg.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_manip.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_manip.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd_ipc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_prs.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Port/fm_port_im.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Rtc/fm_rtc.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/Rtc/fm_rtc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm_ipc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm_muram.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/inc/fm_common.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/inc/fm_hc.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/fsl_qman.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/qm.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/qm.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/qman_low.h
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/QM/qman_private.h
  projects/runtime-coverage/sys/contrib/ncsw/etc/error.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/list.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/memcpy.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/mm.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/mm.h
  projects/runtime-coverage/sys/contrib/ncsw/etc/ncsw_mem.c
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/bm_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/crc_mac_addr_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_mac_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_muram_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_pcd_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_port_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/fm_rtc_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/Peripherals/qm_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/core_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/cores/e500v2_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/cores/ppc_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/ddr_std_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/debug_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/endian_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/enet_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/error_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/etc/list_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/etc/mem_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/etc/memcpy_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/etc/mm_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/etc/sprint_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/integrations/dpaa_integration_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/integrations/part_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/ncsw_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/net_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/std_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/stdarg_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/stdlib_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/string_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/types_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/inc/xx_ext.h
  projects/runtime-coverage/sys/contrib/ncsw/user/env/xx.c
  projects/runtime-coverage/sys/dev/dpaa/bman.c
  projects/runtime-coverage/sys/dev/dpaa/fman.c
  projects/runtime-coverage/sys/dev/dpaa/fman.h
  projects/runtime-coverage/sys/dev/dpaa/fman_fdt.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec_im.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec_rm.c
  projects/runtime-coverage/sys/dev/dpaa/portals.h
  projects/runtime-coverage/sys/dev/ffec/if_ffec.c
  projects/runtime-coverage/sys/dev/ffec/if_ffecreg.h
  projects/runtime-coverage/sys/dev/flash/mx25l.c
  projects/runtime-coverage/sys/dev/ipmi/ipmi.c
  projects/runtime-coverage/sys/dev/ipmi/ipmivars.h
  projects/runtime-coverage/sys/dev/isp/DriverManual.txt
  projects/runtime-coverage/sys/dev/sdhci/fsl_sdhci.c
  projects/runtime-coverage/sys/dev/sk/if_sk.c
  projects/runtime-coverage/sys/dev/usb/net/if_smsc.c
  projects/runtime-coverage/sys/geom/mirror/g_mirror.c
  projects/runtime-coverage/sys/geom/mountver/g_mountver.c
  projects/runtime-coverage/sys/i386/conf/GENERIC
  projects/runtime-coverage/sys/i386/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/kern/sys_process.c
  projects/runtime-coverage/sys/kern/vfs_aio.c
  projects/runtime-coverage/sys/mips/conf/ADM5120
  projects/runtime-coverage/sys/mips/conf/ALCHEMY
  projects/runtime-coverage/sys/mips/conf/ERL
  projects/runtime-coverage/sys/mips/conf/MT7620
  projects/runtime-coverage/sys/mips/conf/OCTEON1
  projects/runtime-coverage/sys/mips/conf/QEMU
  projects/runtime-coverage/sys/mips/conf/RT305X
  projects/runtime-coverage/sys/mips/conf/RT5350
  projects/runtime-coverage/sys/mips/conf/XLP
  projects/runtime-coverage/sys/mips/conf/XLP64
  projects/runtime-coverage/sys/mips/conf/XLPN32
  projects/runtime-coverage/sys/mips/conf/XLR
  projects/runtime-coverage/sys/mips/conf/XLR64
  projects/runtime-coverage/sys/mips/conf/XLRN32
  projects/runtime-coverage/sys/netinet/sctp_output.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_fifo.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_fq_codel.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_fq_pie.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_prio.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_qfq.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_rr.c
  projects/runtime-coverage/sys/netpfil/ipfw/dn_sched_wf2q.c
  projects/runtime-coverage/sys/netpfil/ipfw/ip_dn_io.c
  projects/runtime-coverage/sys/netpfil/ipfw/ip_dn_private.h
  projects/runtime-coverage/sys/powerpc/conf/GENERIC
  projects/runtime-coverage/sys/powerpc/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/powerpc/conf/GENERIC64
  projects/runtime-coverage/sys/powerpc/conf/dpaa/config.dpaa
  projects/runtime-coverage/sys/powerpc/conf/dpaa/files.dpaa
  projects/runtime-coverage/sys/powerpc/include/spr.h
  projects/runtime-coverage/sys/riscv/conf/GENERIC
  projects/runtime-coverage/sys/sparc64/conf/GENERIC
  projects/runtime-coverage/sys/sparc64/conf/GENERIC-NODEBUG
  projects/runtime-coverage/sys/sys/bus.h
  projects/runtime-coverage/sys/sys/cnv.h
  projects/runtime-coverage/sys/sys/ipmi.h
  projects/runtime-coverage/sys/sys/param.h
  projects/runtime-coverage/sys/ufs/ffs/ffs_softdep.c
  projects/runtime-coverage/tests/sys/kern/ptrace_test.c
  projects/runtime-coverage/tests/sys/netpfil/pf/Makefile
  projects/runtime-coverage/tests/sys/netpfil/pf/utils.subr
  projects/runtime-coverage/tools/boot/universe.sh
  projects/runtime-coverage/tools/tools/cd2dvd/cd2dvd.sh
  projects/runtime-coverage/tools/tools/portsinfo/portsinfo.sh
  projects/runtime-coverage/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative
  projects/runtime-coverage/usr.bin/calendar/sunpos.c
  projects/runtime-coverage/usr.bin/fortune/datfiles/fortunes
  projects/runtime-coverage/usr.bin/fortune/datfiles/freebsd-tips
  projects/runtime-coverage/usr.bin/mkcsmapper/mkcsmapper.1
  projects/runtime-coverage/usr.bin/ruptime/ruptime.1
  projects/runtime-coverage/usr.bin/rwho/rwho.1
  projects/runtime-coverage/usr.bin/unifdef/unifdef.1
  projects/runtime-coverage/usr.bin/unifdef/unifdef.c
  projects/runtime-coverage/usr.bin/units/definitions.units
  projects/runtime-coverage/usr.bin/xohtml/xohtml.sh
  projects/runtime-coverage/usr.sbin/bhyve/xmsr.c
  projects/runtime-coverage/usr.sbin/bsdconfig/networking/share/hostname.subr
  projects/runtime-coverage/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
  projects/runtime-coverage/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
  projects/runtime-coverage/usr.sbin/mergemaster/mergemaster.8
  projects/runtime-coverage/usr.sbin/ppp/ppp.8
  projects/runtime-coverage/usr.sbin/rwhod/rwhod.8
Directory Properties:
  projects/runtime-coverage/   (props changed)
  projects/runtime-coverage/cddl/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/runtime-coverage/contrib/dma/   (props changed)
  projects/runtime-coverage/contrib/tzdata/   (props changed)

Modified: projects/runtime-coverage/Makefile
==============================================================================

--- projects/runtime-coverage/Makefile	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/Makefile	Mon Oct 30 05:52:26 2017	(r325120)
@@ -34,12 +34,16 @@
 #                       for world and kernel targets.
 # toolchains          - Build a toolchain for all world and kernel targets.
 # xdev                - xdev-build + xdev-install for the architecture
-#                       specified with XDEV and XDEV_ARCH.
+#                       specified with TARGET and TARGET_ARCH.
 # xdev-build          - Build cross-development tools.
 # xdev-install        - Install cross-development tools.
 # xdev-links          - Create traditional links in /usr/bin for cc, etc
 # native-xtools       - Create host binaries that produce target objects
-#                       for use in qemu user-mode jails.
+#                       for use in qemu user-mode jails.  TARGET and
+#                       TARGET_ARCH should be defined.
+# native-xtools-install
+#                     - Install the files to the given DESTDIR/NXTP where
+#                       NXTP defaults to /nxb-bin.
 # 
 # "quick" way to test all kernel builds:
 # 	_jflag=`sysctl -n hw.ncpu`
@@ -130,11 +134,16 @@ TGTS=	all all-man buildenv buildenvvars buildkernel bu
 	_build-tools _build-metadata _cross-tools _includes _libraries \
 	build32 distribute32 install32 buildsoft distributesoft installsoft \
 	builddtb xdev xdev-build xdev-install \
-	xdev-links native-xtools stageworld stagekernel stage-packages \
+	xdev-links native-xtools native-xtools-install stageworld stagekernel \
+	stage-packages \
 	create-packages-world create-packages-kernel create-packages \
 	packages installconfig real-packages sign-packages package-pkg \
 	print-dir test-system-compiler
 
+# These targets require a TARGET and TARGET_ARCH be defined.
+XTGTS=	native-xtools native-xtools-install xdev xdev-build xdev-install \
+	xdev-links
+
 # XXX: r156740: This can't work since bsd.subdir.mk is not included ever.
 # It will only work for SUBDIR_TARGETS in make.conf.
 TGTS+=	${SUBDIR_TARGETS}
@@ -179,7 +188,7 @@ META_TGT_WHITELIST+= \
 
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
-_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} MK_AUTO_OBJ=no ${MAKE} \
+_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
     ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
     -f /dev/null -V MAKEOBJDIRPREFIX dummy
 .if !empty(_MAKEOBJDIRPREFIX)
@@ -270,6 +279,11 @@ _TARGET=	${XDEV}
 .if defined(XDEV_ARCH)
 _TARGET_ARCH=	${XDEV_ARCH}
 .endif
+# Some targets require a set TARGET/TARGET_ARCH, check before the default
+# MACHINE and after the compatibility handling.
+.if !defined(_TARGET) || !defined(_TARGET_ARCH)
+${XTGTS}: _assert_target
+.endif
 # Otherwise, default to current machine type and architecture.
 _TARGET?=	${MACHINE}
 _TARGET_ARCH?=	${MACHINE_ARCH}
@@ -277,6 +291,14 @@ _TARGET_ARCH?=	${MACHINE_ARCH}
 .if make(print-dir)
 .SILENT:
 .endif
+
+_assert_target: .PHONY .MAKE
+.for _tgt in ${XTGTS}
+.if make(${_tgt})
+	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${_tgt}\" target"
+	@false
+.endif
+.endfor
 
 #
 # Make sure we have an up-to-date make(1). Only world and buildworld

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct 30 05:52:26 2017	(r325120)
@@ -365,11 +365,11 @@ OSRELDATE=	0
 
 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
 .if !defined(_REVISION)
-_REVISION!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION
+_REVISION!=	${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION
 .export _REVISION
 .endif
 .if !defined(_BRANCH)
-_BRANCH!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH
+_BRANCH!=	${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH
 .export _BRANCH
 .endif
 .if !defined(SRCRELDATE)
@@ -439,8 +439,8 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
-_CPUTYPE!=	MK_AUTO_OBJ=no MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
-		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
+_CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \
+		-m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
@@ -753,49 +753,26 @@ KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLA
 # Attempt to rebuild the entire system, with reasonable chance of
 # success, regardless of how old your existing system is.
 #
-_worldtmp: .PHONY
+_sanity_check: .PHONY .MAKE
 .if ${.CURDIR:C/[^,]//g} != ""
 #	The m4 build of sendmail files doesn't like it if ',' is used
 #	anywhere in the path of it's files.
 	@echo
 	@echo "*** Error: path to source tree contains a comma ','"
 	@echo
-	false
-.endif
+	@false
+.elif ${.CURDIR:M*\:*} != ""
+#	Using ':' leaks into PATH and breaks finding cross-tools.
 	@echo
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding the temporary build tree"
-	@echo "--------------------------------------------------------------"
-.if !defined(NO_CLEAN)
-	rm -rf ${WORLDTMP}
-.if defined(LIBCOMPAT)
-	rm -rf ${LIBCOMPATTMP}
+	@echo "*** Error: path to source tree contains a colon ':'"
+	@echo
+	@false
 .endif
-.else
-.if exists(${WORLDTMP})
-	@echo ">>> Deleting stale files in build tree..."
-	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
-	    delete-old delete-old-libs >/dev/null
-.endif
-.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP})
-	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
-	    DESTDIR=${LIBCOMPATTMP} \
-	    delete-old delete-old-libs >/dev/null
-.endif
-	rm -rf ${WORLDTMP}/legacy/usr/include
-.if ${USING_SYSTEM_COMPILER} == "yes"
-.for cc in cc c++
-	if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \
-		inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \
-		find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \
-	fi
-.endfor
-.endif	# ${USING_SYSTEM_COMPILER} == "yes"
 
 # Our current approach to dependency tracking cannot cope with certain source
 # tree changes, particularly with respect to removing source files and
 # replacing generated files.  Handle these cases here in an ad-hoc fashion.
-#
+_cleanobj_fast_depend_hack: .PHONY
 # Syscall stubs rewritten in C
 # Date      SVN Rev  Syscalls
 # 20160829  r305012  ptrace
@@ -806,7 +783,7 @@ _worldtmp: .PHONY
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
 		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
@@ -817,7 +794,7 @@ _worldtmp: .PHONY
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
 		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
@@ -829,11 +806,33 @@ _worldtmp: .PHONY
 	@echo Removing stale generated ${f} syscall files
 	@rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/${f}.* \
-	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/${f}.*} \
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}
 .endif
 .endfor
 
+_worldtmp: .PHONY
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Rebuilding the temporary build tree"
+	@echo "--------------------------------------------------------------"
+.if !defined(NO_CLEAN)
+	rm -rf ${WORLDTMP}
+.else
+.if exists(${WORLDTMP})
+	@echo ">>> Deleting stale files in build tree..."
+	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
+	    delete-old delete-old-libs >/dev/null
+.endif
+	rm -rf ${WORLDTMP}/legacy/usr/include
+.if ${USING_SYSTEM_COMPILER} == "yes"
+.for cc in cc c++
+	if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \
+		inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \
+		find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \
+	fi
+.endfor
+.endif	# ${USING_SYSTEM_COMPILER} == "yes"
 .endif	# !defined(NO_CLEAN)
 
 .for _dir in \
@@ -850,32 +849,11 @@ _worldtmp: .PHONY
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .if ${MK_DEBUG_FILES} != "no"
-	# We could instead disable debug files for these build stages
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
-.if defined(LIBCOMPAT)
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-	    -p ${WORLDTMP}/usr >/dev/null
-.if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-	    -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-	    -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
-.endif
-.endif
-.if ${MK_TESTS} != "no"
-	mkdir -p ${WORLDTMP}${TESTSBASE}
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
-.if ${MK_DEBUG_FILES} != "no"
-	mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE}
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null
-.endif
-.endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
@@ -901,7 +879,9 @@ _cleanobj:
 .if defined(LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
 .endif
-.endif
+.else
+	${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack
+.endif	# !defined(NO_CLEAN)
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -958,7 +938,7 @@ everything: .PHONY
 
 WMAKE_TGTS=
 .if !defined(WORLDFAST)
-WMAKE_TGTS+=	_worldtmp _legacy
+WMAKE_TGTS+=	_sanity_check _worldtmp _legacy
 .if empty(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_bootstrap-tools
 .endif
@@ -1012,8 +992,7 @@ buildenv: .PHONY
 .if ${BUILDENV_SHELL:M*zsh*}
 	@echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE}
 .endif
-	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \
-	    || true
+	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL}
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS} .PHONY
@@ -2123,7 +2102,11 @@ cross-tools: .MAKE .PHONY
 # to pickup.
 #
 NXBOBJDIR=	${MAKEOBJDIRPREFIX}/nxb/${TARGET}.${TARGET_ARCH}
-NXBDESTDIR=	${NXBOBJDIR}${.CURDIR}/nxb-bin
+NXTP?=		/nxb-bin
+.if ${NXTP:N/*}
+.error NXTP variable should be an absolute path
+.endif
+NXBDESTDIR?=	${DESTDIR}${NXTP}
 
 # This is the list of tools to be built/installed as static and where
 # appropriate to build for the given TARGET.TARGET_ARCH.
@@ -2252,6 +2235,9 @@ native-xtools: .PHONY
 .endif
 	${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \
 	    everything
+	@echo ">> native-xtools done.  Use 'make native-xtools-install' to install to a given DESTDIR"
+
+native-xtools-install: .PHONY
 	mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${NXBDESTDIR}/usr >/dev/null
@@ -2804,8 +2790,6 @@ cleanworld: .PHONY
 	${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
 .endif
 
-.if defined(TARGET) && defined(TARGET_ARCH)
-
 .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
@@ -2856,7 +2840,7 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u
 # Don't rebuild build-tools targets during normal build.
 CD2MAKE+=	BUILD_TOOLS_META=.NOMETA
 .endif
-XDDESTDIR=${DESTDIR}/${XDTP}
+XDDESTDIR=${DESTDIR}${XDTP}
 
 .ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install .PHONY
@@ -2885,14 +2869,17 @@ _xb-build-tools: .PHONY
 	${_+_}@cd ${.CURDIR}; \
 	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
 
-_xb-cross-tools: .PHONY
-.for _tool in \
+XDEVDIRS= \
+    ${_lld} \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_gcc}
+
+_xb-cross-tools: .PHONY
+.for _tool in ${XDEVDIRS}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \
 	cd ${.CURDIR}/${_tool}; \
 	if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \
@@ -2923,19 +2910,17 @@ xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi
 
 _xi-cross-tools: .PHONY
 	@echo "_xi-cross-tools"
-.for _tool in \
-    ${_binutils} \
-    ${_elftctools} \
-    usr.bin/ar \
-    ${_clang_libs} \
-    ${_clang} \
-    ${_gcc}
+.for _tool in ${XDEVDIRS}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
 .endfor
 
 _xi-includes: .PHONY
+.if !defined(NO_OBJ)
+	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 _obj \
+		DESTDIR=${XDDESTDIR}
+.endif
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \
 		DESTDIR=${XDDESTDIR}
 
@@ -2952,7 +2937,3 @@ xdev-links: .PHONY
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \
 		done
-.else
-xdev xdev-build xdev-install xdev-links: .PHONY
-	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
-.endif

Modified: projects/runtime-coverage/Makefile.libcompat
==============================================================================
--- projects/runtime-coverage/Makefile.libcompat	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/Makefile.libcompat	Mon Oct 30 05:52:26 2017	(r325120)
@@ -79,8 +79,8 @@ LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
 .endfor
 
 # Shared flags
-LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/world${libcompat}
-LIBCOMPATTMP?=		${OBJTREE}${.CURDIR}/lib${libcompat}
+LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/obj-lib${libcompat}
+LIBCOMPATTMP?=		${LIBCOMPAT_OBJTREE}/tmp
 
 LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
@@ -149,6 +149,16 @@ build${libcompat}: .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building lib${libcompat} shim libraries"
 	@echo "--------------------------------------------------------------"
+.if !defined(NO_CLEAN)
+	rm -rf ${LIBCOMPATTMP}
+.else
+.if exists(${LIBCOMPATTMP})
+	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
+	    DESTDIR=${LIBCOMPATTMP} \
+	    delete-old delete-old-libs >/dev/null
+.endif
+.endif	# !defined(NO_CLEAN)
+
 	mkdir -p ${LIBCOMPATTMP}/usr/include
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${LIBCOMPATTMP}/usr >/dev/null

Modified: projects/runtime-coverage/README
==============================================================================
--- projects/runtime-coverage/README	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/README	Mon Oct 30 05:52:26 2017	(r325120)
@@ -9,7 +9,7 @@ more information).
 
 The Makefile in this directory supports a number of targets for
 building components (or all) of the FreeBSD source tree.  See build(7)
-and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
 for more information, including setting make(1) variables.
 
 The `buildkernel` and `installkernel` targets build and install
@@ -18,7 +18,7 @@ the Makefile in this directory for more information on
 standard build targets and compile-time flags.
 
 Building a kernel is a somewhat more involved process.  See build(7), config(8),
-and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
+and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
 for more information.
 
 Note: If you want to build and install the kernel with the
@@ -81,4 +81,4 @@ usr.sbin	System administration commands.
 For information on synchronizing your source tree with one or more of
 the FreeBSD Project's development branches, please see:
 
-  https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html
+  https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html

Modified: projects/runtime-coverage/README.md
==============================================================================
--- projects/runtime-coverage/README.md	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/README.md	Mon Oct 30 05:52:26 2017	(r325120)
@@ -11,7 +11,7 @@ more information).
 
 The Makefile in this directory supports a number of targets for
 building components (or all) of the FreeBSD source tree.  See build(7)
-and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
 for more information, including setting make(1) variables.
 
 The `buildkernel` and `installkernel` targets build and install
@@ -20,7 +20,7 @@ the Makefile in this directory for more information on
 standard build targets and compile-time flags.
 
 Building a kernel is a somewhat more involved process.  See build(7), config(8),
-and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
+and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
 for more information.
 
 Note: If you want to build and install the kernel with the
@@ -83,4 +83,4 @@ usr.sbin		System administration commands.
 For information on synchronizing your source tree with one or more of
 the FreeBSD Project's development branches, please see:
 
-   http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html
+   https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html

Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/UPDATING	Mon Oct 30 05:52:26 2017	(r325120)
@@ -6,7 +6,7 @@ COMMON ITEMS: section later in the file.  These instru
 basically know what you are doing.  If not, then please consult the FreeBSD
 handbook:
 
-    https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html
+    https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html
 
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20171028:
+	The native-xtools target no longer installs the files by default to the
+	OBJDIR.  Use the native-xtools-install target with a DESTDIR to install
+	to ${DESTDIR}/${NXTP} where NXTP defaults to /nxb-bin.
+
 20171021:
 	As part of the boot loader infrastructure cleanup, LOADER_*_SUPPORT
 	options are changing from controlling the build if defined / undefined
@@ -1838,21 +1843,6 @@ COMMON ITEMS:
 	make installkernel KERNCONF=YOUR_KERNEL_HERE KODIR=/boot/testkernel
 	nextboot -k testkernel
 
-	To just build a kernel when you know that it won't mess you up
-	--------------------------------------------------------------
-	This assumes you are already running a CURRENT system.  Replace
-	${arch} with the architecture of your machine (e.g. "i386",
-	"arm", "amd64", "ia64", "pc98", "sparc64", "powerpc", "mips", etc).
-
-	cd src/sys/${arch}/conf
-	config KERNEL_NAME_HERE
-	cd ../compile/KERNEL_NAME_HERE
-	make depend
-	make
-	make install
-
-	If this fails, go to the "To build a kernel" section.
-
 	To rebuild everything and install it on the current system.
 	-----------------------------------------------------------
 	# Note: sometimes if you are running current you gotta do more than
@@ -1860,7 +1850,8 @@ COMMON ITEMS:
 
 	<make sure you have good level 0 dumps>
 	make buildworld
-	make kernel KERNCONF=YOUR_KERNEL_HERE
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
 	mergemaster -Fp					[5]
@@ -1960,10 +1951,7 @@ COMMON ITEMS:
 	Make sure that you merge any new devices from GENERIC since the
 	last time you updated your kernel config file.
 
-	[9] When checking out sources, you must include the -P flag to have
-	cvs prune empty directories.
-
-	If CPUTYPE is defined in your /etc/make.conf, make sure to use the
+	[9] If CPUTYPE is defined in your /etc/make.conf, make sure to use the
 	"?=" instead of the "=" assignment operator, so that buildworld can
 	override the CPUTYPE if it needs to.
 

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct 30 05:52:26 2017	(r325120)
@@ -63,6 +63,7 @@
 #include <sys/abd.h>
 #include <sys/blkptr.h>
 #include <zfs_comutil.h>
+#include <libcmdutils.h>
 #undef verify
 #include <libzfs.h>
 
@@ -276,12 +277,12 @@ dump_history_offsets(objset_t *os, uint64_t object, vo
 }
 
 static void
-zdb_nicenum(uint64_t num, char *buf)
+zdb_nicenum(uint64_t num, char *buf, size_t buflen)
 {
 	if (dump_opt['P'])
-		(void) sprintf(buf, "%llu", (longlong_t)num);
+		(void) snprintf(buf, buflen, "%llu", (longlong_t)num);
 	else
-		nicenum(num, buf);
+		nicenum(num, buf, sizeof (buf));
 }
 
 const char histo_stars[] = "****************************************";
@@ -458,12 +459,17 @@ dump_bpobj(objset_t *os, uint64_t object, void *data, 
 	bpobj_phys_t *bpop = data;
 	char bytes[32], comp[32], uncomp[32];
 
+	/* make sure the output won't get truncated */
+	CTASSERT(sizeof (bytes) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (comp) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (uncomp) >= NN_NUMBUF_SZ);
+
 	if (bpop == NULL)
 		return;
 
-	zdb_nicenum(bpop->bpo_bytes, bytes);
-	zdb_nicenum(bpop->bpo_comp, comp);
-	zdb_nicenum(bpop->bpo_uncomp, uncomp);
+	zdb_nicenum(bpop->bpo_bytes, bytes, sizeof (bytes));
+	zdb_nicenum(bpop->bpo_comp, comp, sizeof (comp));
+	zdb_nicenum(bpop->bpo_uncomp, uncomp, sizeof (uncomp));
 
 	(void) printf("\t\tnum_blkptrs = %llu\n",
 	    (u_longlong_t)bpop->bpo_num_blkptrs);
@@ -756,8 +762,11 @@ dump_metaslab_stats(metaslab_t *msp)
 	avl_tree_t *t = &msp->ms_size_tree;
 	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
-	zdb_nicenum(metaslab_block_maxsize(msp), maxbuf);
+	/* max sure nicenum has enough space */
+	CTASSERT(sizeof (maxbuf) >= NN_NUMBUF_SZ);
 
+	zdb_nicenum(metaslab_block_maxsize(msp), maxbuf, sizeof (maxbuf));
+
 	(void) printf("\t %25s %10lu   %7s  %6s   %4s %4d%%\n",
 	    "segments", avl_numnodes(t), "maxsize", maxbuf,
 	    "freepct", free_pct);
@@ -773,7 +782,8 @@ dump_metaslab(metaslab_t *msp)
 	space_map_t *sm = msp->ms_sm;
 	char freebuf[32];
 
-	zdb_nicenum(msp->ms_size - space_map_allocated(sm), freebuf);
+	zdb_nicenum(msp->ms_size - space_map_allocated(sm), freebuf,
+	    sizeof (freebuf));
 
 	(void) printf(
 	    "\tmetaslab %6llu   offset %12llx   spacemap %6llu   free    %5s\n",
@@ -1356,6 +1366,9 @@ dump_dsl_dir(objset_t *os, uint64_t object, void *data
 	time_t crtime;
 	char nice[32];
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (nice) >= NN_NUMBUF_SZ);
+
 	if (dd == NULL)
 		return;
 
@@ -1371,15 +1384,15 @@ dump_dsl_dir(objset_t *os, uint64_t object, void *data
 	    (u_longlong_t)dd->dd_origin_obj);
 	(void) printf("\t\tchild_dir_zapobj = %llu\n",
 	    (u_longlong_t)dd->dd_child_dir_zapobj);
-	zdb_nicenum(dd->dd_used_bytes, nice);
+	zdb_nicenum(dd->dd_used_bytes, nice, sizeof (nice));
 	(void) printf("\t\tused_bytes = %s\n", nice);
-	zdb_nicenum(dd->dd_compressed_bytes, nice);
+	zdb_nicenum(dd->dd_compressed_bytes, nice, sizeof (nice));
 	(void) printf("\t\tcompressed_bytes = %s\n", nice);
-	zdb_nicenum(dd->dd_uncompressed_bytes, nice);
+	zdb_nicenum(dd->dd_uncompressed_bytes, nice, sizeof (nice));
 	(void) printf("\t\tuncompressed_bytes = %s\n", nice);
-	zdb_nicenum(dd->dd_quota, nice);
+	zdb_nicenum(dd->dd_quota, nice, sizeof (nice));
 	(void) printf("\t\tquota = %s\n", nice);
-	zdb_nicenum(dd->dd_reserved, nice);
+	zdb_nicenum(dd->dd_reserved, nice, sizeof (nice));
 	(void) printf("\t\treserved = %s\n", nice);
 	(void) printf("\t\tprops_zapobj = %llu\n",
 	    (u_longlong_t)dd->dd_props_zapobj);
@@ -1389,7 +1402,8 @@ dump_dsl_dir(objset_t *os, uint64_t object, void *data
 	    (u_longlong_t)dd->dd_flags);
 
 #define	DO(which) \
-	zdb_nicenum(dd->dd_used_breakdown[DD_USED_ ## which], nice); \
+	zdb_nicenum(dd->dd_used_breakdown[DD_USED_ ## which], nice, \
+	    sizeof (nice)); \
 	(void) printf("\t\tused_breakdown[" #which "] = %s\n", nice)
 	DO(HEAD);
 	DO(SNAP);
@@ -1408,15 +1422,22 @@ dump_dsl_dataset(objset_t *os, uint64_t object, void *
 	char used[32], compressed[32], uncompressed[32], unique[32];
 	char blkbuf[BP_SPRINTF_LEN];
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (used) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (compressed) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (uncompressed) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (unique) >= NN_NUMBUF_SZ);
+
 	if (ds == NULL)
 		return;
 
 	ASSERT(size == sizeof (*ds));
 	crtime = ds->ds_creation_time;
-	zdb_nicenum(ds->ds_referenced_bytes, used);
-	zdb_nicenum(ds->ds_compressed_bytes, compressed);
-	zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed);
-	zdb_nicenum(ds->ds_unique_bytes, unique);
+	zdb_nicenum(ds->ds_referenced_bytes, used, sizeof (used));
+	zdb_nicenum(ds->ds_compressed_bytes, compressed, sizeof (compressed));
+	zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed,
+	    sizeof (uncompressed));
+	zdb_nicenum(ds->ds_unique_bytes, unique, sizeof (unique));
 	snprintf_blkptr(blkbuf, sizeof (blkbuf), &ds->ds_bp);
 
 	(void) printf("\t\tdir_obj = %llu\n",
@@ -1475,12 +1496,15 @@ dump_bptree(objset_t *os, uint64_t obj, char *name)
 	bptree_phys_t *bt;
 	dmu_buf_t *db;
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (bytes) >= NN_NUMBUF_SZ);
+
 	if (dump_opt['d'] < 3)
 		return;
 
 	VERIFY3U(0, ==, dmu_bonus_hold(os, obj, FTAG, &db));
 	bt = db->db_data;
-	zdb_nicenum(bt->bt_bytes, bytes);
+	zdb_nicenum(bt->bt_bytes, bytes, sizeof (bytes));
 	(void) printf("\n    %s: %llu datasets, %s\n",
 	    name, (unsigned long long)(bt->bt_end - bt->bt_begin), bytes);
 	dmu_buf_rele(db, FTAG);
@@ -1512,13 +1536,18 @@ dump_full_bpobj(bpobj_t *bpo, char *name, int indent)
 	char comp[32];
 	char uncomp[32];
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (bytes) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (comp) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (uncomp) >= NN_NUMBUF_SZ);
+
 	if (dump_opt['d'] < 3)
 		return;
 
-	zdb_nicenum(bpo->bpo_phys->bpo_bytes, bytes);
+	zdb_nicenum(bpo->bpo_phys->bpo_bytes, bytes, sizeof (bytes));
 	if (bpo->bpo_havesubobj && bpo->bpo_phys->bpo_subobjs != 0) {
-		zdb_nicenum(bpo->bpo_phys->bpo_comp, comp);
-		zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp);
+		zdb_nicenum(bpo->bpo_phys->bpo_comp, comp, sizeof (comp));
+		zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp, sizeof (uncomp));
 		(void) printf("    %*s: object %llu, %llu local blkptrs, "
 		    "%llu subobjs in object %llu, %s (%s/%s comp)\n",
 		    indent * 8, name,
@@ -1572,6 +1601,11 @@ dump_deadlist(dsl_deadlist_t *dl)
 	char comp[32];
 	char uncomp[32];
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (bytes) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (comp) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (uncomp) >= NN_NUMBUF_SZ);
+
 	if (dump_opt['d'] < 3)
 		return;
 
@@ -1580,9 +1614,9 @@ dump_deadlist(dsl_deadlist_t *dl)
 		return;
 	}
 
-	zdb_nicenum(dl->dl_phys->dl_used, bytes);
-	zdb_nicenum(dl->dl_phys->dl_comp, comp);
-	zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
+	zdb_nicenum(dl->dl_phys->dl_used, bytes, sizeof (bytes));
+	zdb_nicenum(dl->dl_phys->dl_comp, comp, sizeof (comp));
+	zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp, sizeof (uncomp));
 	(void) printf("\n    Deadlist: %s (%s/%s comp)\n",
 	    bytes, comp, uncomp);
 
@@ -1883,6 +1917,13 @@ dump_object(objset_t *os, uint64_t object, int verbosi
 	char aux[50];
 	int error;
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (iblk) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (dblk) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (lsize) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (asize) >= NN_NUMBUF_SZ);
+	CTASSERT(sizeof (bonus_size) >= NN_NUMBUF_SZ);
+
 	if (*print_header) {
 		(void) printf("\n%10s  %3s  %5s  %5s  %5s  %5s  %6s  %s\n",
 		    "Object", "lvl", "iblk", "dblk", "dsize", "lsize",
@@ -1903,11 +1944,11 @@ dump_object(objset_t *os, uint64_t object, int verbosi
 	}
 	dmu_object_info_from_dnode(dn, &doi);
 
-	zdb_nicenum(doi.doi_metadata_block_size, iblk);
-	zdb_nicenum(doi.doi_data_block_size, dblk);
-	zdb_nicenum(doi.doi_max_offset, lsize);
-	zdb_nicenum(doi.doi_physical_blocks_512 << 9, asize);
-	zdb_nicenum(doi.doi_bonus_size, bonus_size);
+	zdb_nicenum(doi.doi_metadata_block_size, iblk, sizeof (iblk));
+	zdb_nicenum(doi.doi_data_block_size, dblk, sizeof (dblk));
+	zdb_nicenum(doi.doi_max_offset, lsize, sizeof (lsize));
+	zdb_nicenum(doi.doi_physical_blocks_512 << 9, asize, sizeof (asize));
+	zdb_nicenum(doi.doi_bonus_size, bonus_size, sizeof (bonus_size));
 	(void) sprintf(fill, "%6.2f", 100.0 * doi.doi_fill_count *
 	    doi.doi_data_block_size / (object == 0 ? DNODES_PER_BLOCK : 1) /
 	    doi.doi_max_offset);
@@ -1970,6 +2011,8 @@ dump_object(objset_t *os, uint64_t object, int verbosi
 
 		for (;;) {
 			char segsize[32];
+			/* make sure nicenum has enough space */
+			CTASSERT(sizeof (segsize) >= NN_NUMBUF_SZ);
 			error = dnode_next_offset(dn,
 			    0, &start, minlvl, blkfill, 0);
 			if (error)
@@ -1977,7 +2020,7 @@ dump_object(objset_t *os, uint64_t object, int verbosi
 			end = start;
 			error = dnode_next_offset(dn,
 			    DNODE_FIND_HOLE, &end, minlvl, blkfill, 0);
-			zdb_nicenum(end - start, segsize);
+			zdb_nicenum(end - start, segsize, sizeof (segsize));
 			(void) printf("\t\tsegment [%016llx, %016llx)"
 			    " size %5s\n", (u_longlong_t)start,
 			    (u_longlong_t)end, segsize);
@@ -2008,6 +2051,9 @@ dump_dir(objset_t *os)
 	int print_header = 1;
 	int i, error;
 
+	/* make sure nicenum has enough space */
+	CTASSERT(sizeof (numbuf) >= NN_NUMBUF_SZ);
+
 	dsl_pool_config_enter(dmu_objset_pool(os), FTAG);
 	dmu_objset_fast_stat(os, &dds);
 	dsl_pool_config_exit(dmu_objset_pool(os), FTAG);
@@ -2026,7 +2072,7 @@ dump_dir(objset_t *os)
 
 	ASSERT3U(usedobjs, ==, BP_GET_FILL(os->os_rootbp));
 
-	zdb_nicenum(refdbytes, numbuf);
+	zdb_nicenum(refdbytes, numbuf, sizeof (numbuf));
 
 	if (verbosity >= 4) {
 		(void) snprintf(blkbuf, sizeof (blkbuf), ", rootbp ");
@@ -2673,6 +2719,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr
 		int sec_remaining =
 		    (zcb->zcb_totalasize - bytes) / 1024 / kb_per_sec;
 
+		/* make sure nicenum has enough space */
+		CTASSERT(sizeof (buf) >= NN_NUMBUF_SZ);
+
 		zfs_nicenum(bytes, buf, sizeof (buf));
 		(void) fprintf(stderr,
 		    "\r%5s completed (%4dMB/s) "
@@ -3022,6 +3071,14 @@ dump_block_stats(spa_t *spa)
 			char avg[32], gang[32];
 			char *typename;
 
+			/* make sure nicenum has enough space */
+			CTASSERT(sizeof (csize) >= NN_NUMBUF_SZ);
+			CTASSERT(sizeof (lsize) >= NN_NUMBUF_SZ);
+			CTASSERT(sizeof (psize) >= NN_NUMBUF_SZ);
+			CTASSERT(sizeof (asize) >= NN_NUMBUF_SZ);
+			CTASSERT(sizeof (avg) >= NN_NUMBUF_SZ);
+			CTASSERT(sizeof (gang) >= NN_NUMBUF_SZ);
+
 			if (t < DMU_OT_NUMTYPES)
 				typename = dmu_ot[t].ot_name;
 			else
@@ -3055,12 +3112,17 @@ dump_block_stats(spa_t *spa)
 				    zcb.zcb_type[ZB_TOTAL][t].zb_asize)
 					continue;
 
-				zdb_nicenum(zb->zb_count, csize);
-				zdb_nicenum(zb->zb_lsize, lsize);
-				zdb_nicenum(zb->zb_psize, psize);
-				zdb_nicenum(zb->zb_asize, asize);
-				zdb_nicenum(zb->zb_asize / zb->zb_count, avg);
-				zdb_nicenum(zb->zb_gangs, gang);
+				zdb_nicenum(zb->zb_count, csize,
+				    sizeof (csize));
+				zdb_nicenum(zb->zb_lsize, lsize,
+				    sizeof (lsize));
+				zdb_nicenum(zb->zb_psize, psize,
+				    sizeof (psize));
+				zdb_nicenum(zb->zb_asize, asize,
+				    sizeof (asize));
+				zdb_nicenum(zb->zb_asize / zb->zb_count, avg,
+				    sizeof (avg));
+				zdb_nicenum(zb->zb_gangs, gang, sizeof (gang));
 
 				(void) printf("%6s\t%5s\t%5s\t%5s\t%5s"
 				    "\t%5.2f\t%6.2f\t",

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Oct 30 05:52:26 2017	(r325120)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>.  All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
+ * Copyright 2017 Joyent, Inc.
  */
 
 /*
@@ -125,6 +126,7 @@
 #include <errno.h>
 #include <sys/fs/zfs.h>
 #include <libnvpair.h>
+#include <libcmdutils.h>
 
 static int ztest_fd_data = -1;
 static int ztest_fd_rand = -1;
@@ -556,12 +558,13 @@ usage(boolean_t requested)
 {
 	const ztest_shared_opts_t *zo = &ztest_opts_defaults;
 
-	char nice_vdev_size[10];
-	char nice_gang_bang[10];
+	char nice_vdev_size[NN_NUMBUF_SZ];
+	char nice_gang_bang[NN_NUMBUF_SZ];
 	FILE *fp = requested ? stdout : stderr;
 
-	nicenum(zo->zo_vdev_size, nice_vdev_size);
-	nicenum(zo->zo_metaslab_gang_bang, nice_gang_bang);
+	nicenum(zo->zo_vdev_size, nice_vdev_size, sizeof (nice_vdev_size));
+	nicenum(zo->zo_metaslab_gang_bang, nice_gang_bang,
+	    sizeof (nice_gang_bang));
 
 	(void) fprintf(fp, "Usage: %s\n"
 	    "\t[-v vdevs (default: %llu)]\n"
@@ -3158,10 +3161,10 @@ ztest_vdev_LUN_growth(ztest_ds_t *zd, uint64_t id)
 		    old_class_space, new_class_space);
 
 	if (ztest_opts.zo_verbose >= 5) {
-		char oldnumbuf[6], newnumbuf[6];
+		char oldnumbuf[NN_NUMBUF_SZ], newnumbuf[NN_NUMBUF_SZ];
 
-		nicenum(old_class_space, oldnumbuf);
-		nicenum(new_class_space, newnumbuf);
+		nicenum(old_class_space, oldnumbuf, sizeof (oldnumbuf));
+		nicenum(new_class_space, newnumbuf, sizeof (newnumbuf));
 		(void) printf("%s grew from %s to %s\n",
 		    spa->spa_name, oldnumbuf, newnumbuf);
 	}
@@ -6204,7 +6207,7 @@ main(int argc, char **argv)
 	ztest_info_t *zi;
 	ztest_shared_callstate_t *zc;
 	char timebuf[100];
-	char numbuf[6];
+	char numbuf[NN_NUMBUF_SZ];
 	spa_t *spa;
 	char *cmd;
 	boolean_t hasalt;
@@ -6341,7 +6344,7 @@ main(int argc, char **argv)
 
 			now = MIN(now, zs->zs_proc_stop);
 			print_time(zs->zs_proc_stop - now, timebuf);
-			nicenum(zs->zs_space, numbuf);
+			nicenum(zs->zs_space, numbuf, sizeof (numbuf));
 
 			(void) printf("Pass %3d, %8s, %3llu ENOSPC, "
 			    "%4.1f%% of %5s used, %3.0f%% done, %8s to go\n",

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Oct 30 05:52:26 2017	(r325120)
@@ -229,10 +229,12 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof,
 		for (j = 0; j < nrel; j++) {
 #if defined(__aarch64__)
 /* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			printf("%s:%s(%d): aarch64 not implemented\n",
+			    __FUNCTION__, __FILE__, __LINE__);
 #elif defined(__arm__)
 /* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			printf("%s:%s(%d): arm not implemented\n",
+			    __FUNCTION__, __FILE__, __LINE__);
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -240,7 +242,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L
 			    R_386_PC32);
 #elif defined(__mips__)
 /* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			printf("%s:%s(%d): MIPS not implemented\n",
+			    __FUNCTION__, __FILE__, __LINE__);
 #elif defined(__powerpc__)
 			/*
 			 * Add 4 bytes to hit the low half of this 64-bit
@@ -252,7 +255,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L
 			    R_PPC_REL32);
 #elif defined(__riscv)
 /* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			printf("%s:%s(%d): RISC-V not implemented\n",
+			    __FUNCTION__, __FILE__, __LINE__);
 #else
 #error unknown ISA
 #endif
@@ -802,7 +806,8 @@ static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	printf("%s:%s(%d): aarch64 not implemented\n", __FUNCTION__, __FILE__,
+	    __LINE__);
 	return (0);
 }
 #elif defined(__arm__)
@@ -811,7 +816,8 @@ static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	printf("%s:%s(%d): arm not implemented\n", __FUNCTION__, __FILE__,
+	    __LINE__);
 	return (0);
 }
 #elif defined(__mips__)
@@ -820,7 +826,8 @@ static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	printf("%s:%s(%d): MIPS not implemented\n", __FUNCTION__, __FILE__,
+	    __LINE__);
 	return (0);
 }
 #elif defined(__powerpc__)
@@ -910,7 +917,8 @@ static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	printf("%s:%s(%d): RISC-V implementation required\n", __FUNCTION__,
+	    __FILE__, __LINE__);
 	return (0);
 }
 #elif defined(__sparc)

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c	Mon Oct 30 05:52:26 2017	(r325120)
@@ -426,7 +426,8 @@ dt_proc_attach(dt_proc_t *dpr, int exec)
 static void
 dt_proc_waitrun(dt_proc_t *dpr)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	printf("%s:%s(%d): not implemented\n", __FUNCTION__, __FILE__,
+	    __LINE__);
 #ifdef DOODAD
 	struct ps_prochandle *P = dpr->dpr_proc;
 	const lwpstatus_t *psp = &Pstatus(P)->pr_lwp;

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Mon Oct 30 04:30:34 2017	(r325119)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Mon Oct 30 05:52:26 2017	(r325120)
@@ -49,6 +49,7 @@
 #include <sys/mnttab.h>

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