Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jun 2015 08:00:07 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r284675 - in user/ngie/more-tests: . bin/cat bin/ls cddl/lib/libzfs cddl/lib/libzfs_core contrib/gcc contrib/libcxxrt contrib/sendmail/src contrib/tzdata etc/devd gnu/lib/libgcc gnu/usr...
Message-ID:  <201506210800.t5L8075O090625@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Jun 21 08:00:05 2015
New Revision: 284675
URL: https://svnweb.freebsd.org/changeset/base/284675

Log:
  MFhead @ r284674

Added:
  user/ngie/more-tests/lib/clang/liblldb/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldb/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbAPI/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbAPI/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbBreakpoint/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbBreakpoint/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbCommands/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbCommands/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbCore/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbCore/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbDataFormatters/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbDataFormatters/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbExpression/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbExpression/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbHostCommon/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbHostCommon/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbHostFreeBSD/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbHostFreeBSD/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbHostPOSIX/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbHostPOSIX/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbInterpreter/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbInterpreter/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginInstructionARM/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginInstructionARM/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginInstructionARM64/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginObjectFileELF/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginPlatformGDB/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginProcessElfCore/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginProcessUtility/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginProcessUtility/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbSymbol/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbSymbol/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbTarget/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbTarget/Makefile.depend
  user/ngie/more-tests/lib/clang/liblldbUtility/Makefile.depend
     - copied unchanged from r284674, head/lib/clang/liblldbUtility/Makefile.depend
  user/ngie/more-tests/lib/libelftc/Makefile.depend
     - copied unchanged from r284674, head/lib/libelftc/Makefile.depend
  user/ngie/more-tests/release/Makefile.azure
     - copied unchanged from r284674, head/release/Makefile.azure
  user/ngie/more-tests/share/doc/usd/13.viref/merge.awk
     - copied unchanged from r284674, head/share/doc/usd/13.viref/merge.awk
  user/ngie/more-tests/share/mk/local.sys.env.mk
     - copied unchanged from r284674, head/share/mk/local.sys.env.mk
  user/ngie/more-tests/share/mk/src.sys.env.mk
     - copied unchanged from r284674, head/share/mk/src.sys.env.mk
  user/ngie/more-tests/sys/arm/ti/am335x/hdmi.h
     - copied unchanged from r284674, head/sys/arm/ti/am335x/hdmi.h
  user/ngie/more-tests/sys/arm/ti/am335x/hdmi_if.m
     - copied unchanged from r284674, head/sys/arm/ti/am335x/hdmi_if.m
  user/ngie/more-tests/sys/arm/ti/am335x/tda19988.c
     - copied unchanged from r284674, head/sys/arm/ti/am335x/tda19988.c
  user/ngie/more-tests/sys/boot/common/Makefile
     - copied unchanged from r284674, head/sys/boot/common/Makefile
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acclib.h
     - copied unchanged from r284674, head/sys/contrib/dev/acpica/include/acclib.h
  user/ngie/more-tests/usr.bin/addr2line/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/addr2line/Makefile.depend
  user/ngie/more-tests/usr.bin/clang/lldb/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/clang/lldb/Makefile.depend
  user/ngie/more-tests/usr.bin/elfcopy/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/elfcopy/Makefile.depend
  user/ngie/more-tests/usr.bin/nm/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/nm/Makefile.depend
  user/ngie/more-tests/usr.bin/readelf/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/readelf/Makefile.depend
  user/ngie/more-tests/usr.bin/size/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/size/Makefile.depend
  user/ngie/more-tests/usr.bin/strings/Makefile.depend
     - copied unchanged from r284674, head/usr.bin/strings/Makefile.depend
  user/ngie/more-tests/usr.sbin/bhyve/bootrom.c
     - copied unchanged from r284674, head/usr.sbin/bhyve/bootrom.c
  user/ngie/more-tests/usr.sbin/bhyve/bootrom.h
     - copied unchanged from r284674, head/usr.sbin/bhyve/bootrom.h
  user/ngie/more-tests/usr.sbin/fstyp/geli.c
     - copied unchanged from r284674, head/usr.sbin/fstyp/geli.c
  user/ngie/more-tests/usr.sbin/fstyp/zfs.c
     - copied unchanged from r284674, head/usr.sbin/fstyp/zfs.c
Deleted:
  user/ngie/more-tests/usr.bin/make/
Modified:
  user/ngie/more-tests/Makefile
  user/ngie/more-tests/ObsoleteFiles.inc
  user/ngie/more-tests/UPDATING
  user/ngie/more-tests/bin/cat/Makefile.depend
  user/ngie/more-tests/bin/ls/Makefile.depend
  user/ngie/more-tests/bin/ls/print.c
  user/ngie/more-tests/cddl/lib/libzfs/Makefile
  user/ngie/more-tests/cddl/lib/libzfs_core/Makefile
  user/ngie/more-tests/contrib/gcc/longlong.h
  user/ngie/more-tests/contrib/libcxxrt/FREEBSD-upgrade
  user/ngie/more-tests/contrib/libcxxrt/libelftc_dem_gnu3.c
  user/ngie/more-tests/contrib/sendmail/src/tls.c
  user/ngie/more-tests/contrib/tzdata/africa
  user/ngie/more-tests/contrib/tzdata/northamerica
  user/ngie/more-tests/contrib/tzdata/southamerica
  user/ngie/more-tests/contrib/tzdata/zone1970.tab
  user/ngie/more-tests/etc/devd/usb.conf
  user/ngie/more-tests/gnu/lib/libgcc/Makefile
  user/ngie/more-tests/gnu/lib/libgcc/Makefile.depend
  user/ngie/more-tests/gnu/usr.bin/binutils/as/Makefile.depend
  user/ngie/more-tests/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
  user/ngie/more-tests/gnu/usr.bin/binutils/libbfd/Makefile
  user/ngie/more-tests/gnu/usr.bin/binutils/libbinutils/Makefile.depend
  user/ngie/more-tests/include/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libasn1/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libheimbase/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libheimipcc/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libhx509/Makefile
  user/ngie/more-tests/kerberos5/lib/libhx509/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libkrb5/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libroken/Makefile.depend
  user/ngie/more-tests/kerberos5/lib/libwind/Makefile.depend
  user/ngie/more-tests/lib/clang/libllvmexecutionengine/Makefile.depend
  user/ngie/more-tests/lib/clang/libllvmmcdisassembler/Makefile.depend
  user/ngie/more-tests/lib/clang/libllvmmcjit/Makefile.depend
  user/ngie/more-tests/lib/clang/libllvmruntimedyld/Makefile.depend
  user/ngie/more-tests/lib/libbegemot/Makefile.depend
  user/ngie/more-tests/lib/libc/Makefile.depend
  user/ngie/more-tests/lib/libc/arm/aeabi/Makefile.inc
  user/ngie/more-tests/lib/libc/arm/aeabi/Symbol.map
  user/ngie/more-tests/lib/libc/gen/fts.c
  user/ngie/more-tests/lib/libc/net/sctp_bindx.3
  user/ngie/more-tests/lib/libc/sys/stack_protector.c
  user/ngie/more-tests/lib/libcom_err/Makefile.depend
  user/ngie/more-tests/lib/libcrypt/Makefile.depend
  user/ngie/more-tests/lib/libdwarf/Makefile.depend
  user/ngie/more-tests/lib/libfetch/Makefile.depend
  user/ngie/more-tests/lib/libipsec/Makefile.depend
  user/ngie/more-tests/lib/libldns/Makefile.depend
  user/ngie/more-tests/lib/liblzma/Makefile.depend
  user/ngie/more-tests/lib/libmagic/Makefile.depend
  user/ngie/more-tests/lib/libmd/Makefile.depend
  user/ngie/more-tests/lib/libmd/Makefile.depend.host
  user/ngie/more-tests/lib/libmp/Makefile.depend
  user/ngie/more-tests/lib/libopie/Makefile.depend
  user/ngie/more-tests/lib/libpam/libpam/Makefile.depend
  user/ngie/more-tests/lib/libradius/Makefile.depend
  user/ngie/more-tests/lib/libsbuf/Makefile.depend
  user/ngie/more-tests/lib/libthr/Makefile.depend
  user/ngie/more-tests/lib/libthr/thread/thr_sig.c
  user/ngie/more-tests/lib/libthread_db/Makefile.depend
  user/ngie/more-tests/lib/libutil/Makefile.depend
  user/ngie/more-tests/lib/libvmmapi/vmmapi.c
  user/ngie/more-tests/lib/libvmmapi/vmmapi.h
  user/ngie/more-tests/lib/libypclnt/Makefile.depend
  user/ngie/more-tests/lib/libz/Makefile.depend
  user/ngie/more-tests/lib/msun/Makefile.depend
  user/ngie/more-tests/lib/msun/src/s_ccosh.c
  user/ngie/more-tests/lib/msun/src/s_ccoshf.c
  user/ngie/more-tests/lib/msun/src/s_csinh.c
  user/ngie/more-tests/lib/msun/src/s_csinhf.c
  user/ngie/more-tests/lib/msun/src/s_ctanh.c
  user/ngie/more-tests/lib/msun/src/s_ctanhf.c
  user/ngie/more-tests/lib/ncurses/ncurses/Makefile.depend
  user/ngie/more-tests/lib/ncurses/ncursesw/Makefile.depend
  user/ngie/more-tests/lib/ncurses/panel/Makefile.depend
  user/ngie/more-tests/lib/ncurses/panelw/Makefile.depend
  user/ngie/more-tests/libexec/ftpd/Makefile.depend
  user/ngie/more-tests/libexec/rtld-elf/Makefile.depend
  user/ngie/more-tests/release/Makefile.vm
  user/ngie/more-tests/release/arm/BEAGLEBONE.conf
  user/ngie/more-tests/release/arm/CUBOX-HUMMINGBOARD.conf
  user/ngie/more-tests/release/arm/GUMSTIX.conf
  user/ngie/more-tests/release/arm/PANDABOARD.conf
  user/ngie/more-tests/release/arm/RPI-B.conf
  user/ngie/more-tests/release/arm/RPI2.conf
  user/ngie/more-tests/release/arm/WANDBOARD.conf
  user/ngie/more-tests/release/tools/azure.conf
  user/ngie/more-tests/sbin/atm/atmconfig/Makefile.depend
  user/ngie/more-tests/sbin/devd/Makefile.depend
  user/ngie/more-tests/sbin/init/Makefile.depend
  user/ngie/more-tests/sbin/umount/umount.8
  user/ngie/more-tests/secure/lib/libcrypt/crypt-blowfish.c
  user/ngie/more-tests/secure/lib/libcrypto/Makefile.depend
  user/ngie/more-tests/secure/lib/libssh/Makefile.depend
  user/ngie/more-tests/secure/lib/libssl/Makefile.depend
  user/ngie/more-tests/share/doc/usd/13.viref/Makefile
  user/ngie/more-tests/share/examples/bhyve/vmrun.sh
  user/ngie/more-tests/share/i18n/csmapper/Makefile.depend
  user/ngie/more-tests/share/i18n/esdb/Makefile.depend
  user/ngie/more-tests/share/man/man4/aacraid.4
  user/ngie/more-tests/share/man/man4/acpi_hp.4
  user/ngie/more-tests/share/man/man4/acpi_ibm.4
  user/ngie/more-tests/share/man/man4/acpi_panasonic.4
  user/ngie/more-tests/share/man/man4/ada.4
  user/ngie/more-tests/share/man/man9/atomic.9
  user/ngie/more-tests/share/man/man9/ifnet.9
  user/ngie/more-tests/share/man/man9/pci_iov_schema.9
  user/ngie/more-tests/share/man/man9/sbuf.9
  user/ngie/more-tests/share/man/man9/taskqueue.9
  user/ngie/more-tests/share/mk/bsd.doc.mk
  user/ngie/more-tests/share/mk/bsd.init.mk
  user/ngie/more-tests/share/mk/bsd.test.mk
  user/ngie/more-tests/share/mk/local.dirdeps.mk
  user/ngie/more-tests/share/mk/local.gendirdeps.mk
  user/ngie/more-tests/share/mk/local.init.mk
  user/ngie/more-tests/share/mk/local.meta.sys.mk
  user/ngie/more-tests/share/mk/local.sys.mk
  user/ngie/more-tests/share/mk/meta.stage.mk
  user/ngie/more-tests/share/mk/src.libnames.mk
  user/ngie/more-tests/share/mk/src.opts.mk
  user/ngie/more-tests/share/mk/src.sys.mk
  user/ngie/more-tests/share/mk/sys.mk
  user/ngie/more-tests/sys/amd64/include/vmm.h   (contents, props changed)
  user/ngie/more-tests/sys/amd64/include/vmm_dev.h   (contents, props changed)
  user/ngie/more-tests/sys/amd64/vmm/amd/svm.c
  user/ngie/more-tests/sys/amd64/vmm/intel/vmx.c
  user/ngie/more-tests/sys/amd64/vmm/io/ppt.c
  user/ngie/more-tests/sys/amd64/vmm/vmm.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_dev.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_instruction_emul.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_mem.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_mem.h
  user/ngie/more-tests/sys/arm/arm/locore-v6.S
  user/ngie/more-tests/sys/arm/arm/trap.c
  user/ngie/more-tests/sys/arm/conf/BEAGLEBONE
  user/ngie/more-tests/sys/arm/ti/am335x/am335x_lcd.c
  user/ngie/more-tests/sys/arm/ti/am335x/am335x_lcd.h
  user/ngie/more-tests/sys/arm/ti/am335x/am335x_prcm.c
  user/ngie/more-tests/sys/arm/ti/am335x/files.am335x
  user/ngie/more-tests/sys/arm/ti/omap4/omap4_prcm_clks.c
  user/ngie/more-tests/sys/arm/ti/ti_prcm.c
  user/ngie/more-tests/sys/arm/ti/ti_prcm.h
  user/ngie/more-tests/sys/boot/Makefile
  user/ngie/more-tests/sys/boot/common/Makefile.inc
  user/ngie/more-tests/sys/boot/fdt/dts/arm/beaglebone-black.dts
  user/ngie/more-tests/sys/boot/forth/Makefile
  user/ngie/more-tests/sys/boot/i386/loader/Makefile
  user/ngie/more-tests/sys/boot/mips/beri/loader/Makefile
  user/ngie/more-tests/sys/boot/pc98/loader/Makefile
  user/ngie/more-tests/sys/boot/powerpc/kboot/Makefile
  user/ngie/more-tests/sys/boot/powerpc/ofw/Makefile
  user/ngie/more-tests/sys/boot/powerpc/ps3/Makefile
  user/ngie/more-tests/sys/boot/sparc64/loader/Makefile
  user/ngie/more-tests/sys/boot/uboot/lib/copy.c
  user/ngie/more-tests/sys/boot/uboot/lib/glue.c
  user/ngie/more-tests/sys/cam/ctl/ctl.c
  user/ngie/more-tests/sys/cam/ctl/ctl_frontend.c
  user/ngie/more-tests/sys/cam/ctl/ctl_frontend.h
  user/ngie/more-tests/sys/cam/ctl/ctl_frontend_cam_sim.c
  user/ngie/more-tests/sys/cam/ctl/ctl_frontend_internal.c
  user/ngie/more-tests/sys/cam/ctl/ctl_frontend_iscsi.c
  user/ngie/more-tests/sys/cam/ctl/ctl_private.h
  user/ngie/more-tests/sys/cam/ctl/ctl_tpc.c
  user/ngie/more-tests/sys/cam/ctl/ctl_tpc_local.c
  user/ngie/more-tests/sys/cam/ctl/scsi_ctl.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  user/ngie/more-tests/sys/compat/linux/linux_event.c
  user/ngie/more-tests/sys/compat/linux/linux_event.h
  user/ngie/more-tests/sys/compat/linux/linux_file.c
  user/ngie/more-tests/sys/compat/svr4/svr4_misc.c
  user/ngie/more-tests/sys/conf/NOTES
  user/ngie/more-tests/sys/conf/files
  user/ngie/more-tests/sys/conf/files.mips
  user/ngie/more-tests/sys/conf/kmod.mk
  user/ngie/more-tests/sys/contrib/dev/acpica/acpica_prep.sh
  user/ngie/more-tests/sys/contrib/dev/acpica/changes.txt
  user/ngie/more-tests/sys/contrib/dev/acpica/common/adisasm.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/ahids.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/ahpredef.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/ahuuids.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/dmextern.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/dmrestag.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/dmtable.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/dmtbdump.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/ngie/more-tests/sys/contrib/dev/acpica/common/getopt.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslascii.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslcompiler.l
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/asldefine.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslerror.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslfileio.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslfiles.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslfold.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslmain.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslmapenter.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslmethod.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/asloperands.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslopt.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/asloptions.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslprintf.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslsupport.l
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/asltypes.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/aslutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/asluuid.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtcompile.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtcompiler.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtexpress.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtfield.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtio.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtparser.y
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dttable.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dttemplate.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dttemplate.h
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/dtutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/prparser.y
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/prscan.c
  user/ngie/more-tests/sys/contrib/dev/acpica/compiler/prutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbnames.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbtest.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/debugger/dbxface.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/events/evgpe.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exdebug.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exdump.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exfield.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exfldio.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exnames.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exoparg2.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exoparg3.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exregion.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exstorob.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/executer/exutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nseval.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsparse.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nssearch.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/parser/psutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/resources/rscreate.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/resources/rsmisc.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/resources/rsutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/resources/rsxface.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbdata.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbfadt.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbfind.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbprint.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbxface.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utalloc.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utcache.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utcopy.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utids.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utmisc.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utosi.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utpredef.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utprint.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utstring.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utxface.c
  user/ngie/more-tests/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  user/ngie/more-tests/sys/contrib/dev/acpica/include/accommon.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acglobal.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acinterp.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/aclocal.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acnames.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acnamesp.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acobject.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acoutput.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acpixf.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acstruct.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/actbl.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/actbl1.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/actbl2.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/actbl3.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/actypes.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/acutils.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/platform/acenv.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/platform/acenvex.h
  user/ngie/more-tests/sys/contrib/dev/acpica/include/platform/acgcc.h
  user/ngie/more-tests/sys/ddb/db_sym.c
  user/ngie/more-tests/sys/dev/atkbdc/psm.c
  user/ngie/more-tests/sys/dev/bxe/bxe.c
  user/ngie/more-tests/sys/dev/bxe/ecore_sp.c
  user/ngie/more-tests/sys/dev/cxgbe/adapter.h
  user/ngie/more-tests/sys/dev/cxgbe/common/t4_hw.c
  user/ngie/more-tests/sys/dev/cxgbe/t4_main.c
  user/ngie/more-tests/sys/dev/drm2/ttm/ttm_page_alloc.c
  user/ngie/more-tests/sys/dev/filemon/filemon.h
  user/ngie/more-tests/sys/dev/filemon/filemon_wrapper.c
  user/ngie/more-tests/sys/dev/gpio/ofw_gpiobus.c
  user/ngie/more-tests/sys/dev/isp/isp_freebsd.c
  user/ngie/more-tests/sys/dev/iwn/if_iwn.c
  user/ngie/more-tests/sys/dev/iwn/if_iwnvar.h
  user/ngie/more-tests/sys/dev/ixl/if_ixl.c
  user/ngie/more-tests/sys/dev/mii/mii.h
  user/ngie/more-tests/sys/dev/ofw/ofw_bus_subr.c
  user/ngie/more-tests/sys/dev/ofw/ofw_bus_subr.h
  user/ngie/more-tests/sys/dev/uart/uart_bus_pci.c
  user/ngie/more-tests/sys/dev/videomode/videomode.h
  user/ngie/more-tests/sys/dev/virtio/mmio/virtio_mmio.h
  user/ngie/more-tests/sys/dev/xen/blkfront/blkfront.c
  user/ngie/more-tests/sys/dev/xen/blkfront/block.h
  user/ngie/more-tests/sys/fs/fdescfs/fdesc_vnops.c
  user/ngie/more-tests/sys/fs/nfsclient/nfs_clbio.c
  user/ngie/more-tests/sys/fs/tmpfs/tmpfs_subr.c
  user/ngie/more-tests/sys/geom/label/g_label.c
  user/ngie/more-tests/sys/geom/label/g_label.h
  user/ngie/more-tests/sys/geom/label/g_label_iso9660.c
  user/ngie/more-tests/sys/geom/label/g_label_msdosfs.c
  user/ngie/more-tests/sys/i386/ibcs2/ibcs2_misc.c
  user/ngie/more-tests/sys/kern/imgact_binmisc.c
  user/ngie/more-tests/sys/kern/kern_descrip.c
  user/ngie/more-tests/sys/kern/kern_jail.c
  user/ngie/more-tests/sys/kern/kern_racct.c
  user/ngie/more-tests/sys/kern/stack_protector.c
  user/ngie/more-tests/sys/kern/uipc_usrreq.c
  user/ngie/more-tests/sys/kern/vfs_acl.c
  user/ngie/more-tests/sys/kern/vfs_extattr.c
  user/ngie/more-tests/sys/kern/vfs_subr.c
  user/ngie/more-tests/sys/kern/vfs_syscalls.c
  user/ngie/more-tests/sys/modules/usb/Makefile
  user/ngie/more-tests/sys/netinet/if_ether.c
  user/ngie/more-tests/sys/netinet/ip_encap.c
  user/ngie/more-tests/sys/netinet/sctp_asconf.c
  user/ngie/more-tests/sys/netinet/sctp_input.c
  user/ngie/more-tests/sys/netinet/sctp_input.h
  user/ngie/more-tests/sys/netinet/sctp_os_bsd.h
  user/ngie/more-tests/sys/netinet/sctp_output.c
  user/ngie/more-tests/sys/netinet/sctp_output.h
  user/ngie/more-tests/sys/netinet/sctp_pcb.c
  user/ngie/more-tests/sys/netinet/sctp_pcb.h
  user/ngie/more-tests/sys/netinet/sctp_syscalls.c
  user/ngie/more-tests/sys/netinet/sctp_usrreq.c
  user/ngie/more-tests/sys/netinet/sctp_var.h
  user/ngie/more-tests/sys/netinet/sctputil.c
  user/ngie/more-tests/sys/netinet/sctputil.h
  user/ngie/more-tests/sys/netinet6/sctp6_usrreq.c
  user/ngie/more-tests/sys/ofed/include/linux/file.h
  user/ngie/more-tests/sys/opencrypto/crypto.c
  user/ngie/more-tests/sys/security/audit/audit_arg.c
  user/ngie/more-tests/sys/sys/filedesc.h
  user/ngie/more-tests/sys/ufs/ffs/ffs_alloc.c
  user/ngie/more-tests/sys/ufs/ffs/ffs_vfsops.c
  user/ngie/more-tests/sys/vm/swap_pager.c
  user/ngie/more-tests/sys/vm/vm_pageout.c
  user/ngie/more-tests/sys/vm/vm_pager.c
  user/ngie/more-tests/sys/vm/vm_pager.h
  user/ngie/more-tests/sys/x86/acpica/acpi_wakeup.c
  user/ngie/more-tests/sys/xen/interface/io/blkif.h
  user/ngie/more-tests/targets/pseudo/clang/Makefile.depend
  user/ngie/more-tests/targets/pseudo/toolchain/Makefile.depend
  user/ngie/more-tests/targets/pseudo/userland/Makefile.depend
  user/ngie/more-tests/targets/pseudo/userland/gnu/Makefile.depend
  user/ngie/more-tests/tools/build/mk/OptionalObsoleteFiles.inc
  user/ngie/more-tests/usr.bin/Makefile
  user/ngie/more-tests/usr.bin/ar/Makefile.depend
  user/ngie/more-tests/usr.bin/bmake/Makefile.depend
  user/ngie/more-tests/usr.bin/calendar/calendars/calendar.freebsd
  user/ngie/more-tests/usr.bin/clang/clang-tblgen/Makefile.depend
  user/ngie/more-tests/usr.bin/clang/clang/Makefile.depend
  user/ngie/more-tests/usr.bin/clang/lldb/Makefile
  user/ngie/more-tests/usr.bin/clang/tblgen/Makefile.depend
  user/ngie/more-tests/usr.bin/colldef/Makefile.depend
  user/ngie/more-tests/usr.bin/ee/Makefile.depend
  user/ngie/more-tests/usr.bin/find/Makefile.depend
  user/ngie/more-tests/usr.bin/getconf/Makefile.depend
  user/ngie/more-tests/usr.bin/grep/Makefile.depend
  user/ngie/more-tests/usr.bin/kdump/Makefile
  user/ngie/more-tests/usr.bin/kdump/Makefile.depend
  user/ngie/more-tests/usr.bin/kdump/mkioctls
  user/ngie/more-tests/usr.bin/less/Makefile.depend
  user/ngie/more-tests/usr.bin/lessecho/Makefile.depend
  user/ngie/more-tests/usr.bin/lesskey/Makefile.depend
  user/ngie/more-tests/usr.bin/mandoc/Makefile.depend
  user/ngie/more-tests/usr.bin/mkcsmapper_static/Makefile
  user/ngie/more-tests/usr.bin/mkesdb_static/Makefile
  user/ngie/more-tests/usr.bin/mkimg/Makefile
  user/ngie/more-tests/usr.bin/mkimg/format.c
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
  user/ngie/more-tests/usr.bin/mkimg/vhd.c
  user/ngie/more-tests/usr.bin/mklocale/Makefile.depend
  user/ngie/more-tests/usr.bin/sockstat/sockstat.1
  user/ngie/more-tests/usr.bin/sockstat/sockstat.c
  user/ngie/more-tests/usr.bin/sort/Makefile.depend
  user/ngie/more-tests/usr.bin/top/Makefile.depend
  user/ngie/more-tests/usr.bin/truss/Makefile.depend.amd64
  user/ngie/more-tests/usr.bin/xinstall/Makefile.depend.host
  user/ngie/more-tests/usr.bin/xlint/lint1/Makefile.depend
  user/ngie/more-tests/usr.bin/xlint/llib/Makefile
  user/ngie/more-tests/usr.bin/xlint/llib/Makefile.depend
  user/ngie/more-tests/usr.sbin/bhyve/Makefile
  user/ngie/more-tests/usr.sbin/bhyve/bhyve.8
  user/ngie/more-tests/usr.sbin/bhyve/bhyverun.c
  user/ngie/more-tests/usr.sbin/bhyve/dbgport.c
  user/ngie/more-tests/usr.sbin/bhyve/pci_lpc.c
  user/ngie/more-tests/usr.sbin/bhyve/pci_lpc.h
  user/ngie/more-tests/usr.sbin/bhyve/pci_passthru.c
  user/ngie/more-tests/usr.sbin/bhyvectl/Makefile
  user/ngie/more-tests/usr.sbin/bhyvectl/bhyvectl.c
  user/ngie/more-tests/usr.sbin/bhyveload/bhyveload.8
  user/ngie/more-tests/usr.sbin/bhyveload/bhyveload.c
  user/ngie/more-tests/usr.sbin/bsdconfig/usermgmt/share/group.subr
  user/ngie/more-tests/usr.sbin/bsdconfig/usermgmt/share/user.subr
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
  user/ngie/more-tests/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
  user/ngie/more-tests/usr.sbin/crunch/crunchgen/Makefile.depend
  user/ngie/more-tests/usr.sbin/crunch/crunchgen/crunchgen.c
  user/ngie/more-tests/usr.sbin/ctld/token.l
  user/ngie/more-tests/usr.sbin/freebsd-update/freebsd-update.sh
  user/ngie/more-tests/usr.sbin/fstyp/Makefile
  user/ngie/more-tests/usr.sbin/fstyp/cd9660.c
  user/ngie/more-tests/usr.sbin/fstyp/fstyp.8
  user/ngie/more-tests/usr.sbin/fstyp/fstyp.c
  user/ngie/more-tests/usr.sbin/fstyp/fstyp.h
  user/ngie/more-tests/usr.sbin/fstyp/msdosfs.c
  user/ngie/more-tests/usr.sbin/nologin/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/libntp/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/ntp-keygen/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/ntpd/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/ntpdate/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/ntpdc/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/ntpq/Makefile.depend
  user/ngie/more-tests/usr.sbin/ntp/sntp/Makefile.depend
  user/ngie/more-tests/usr.sbin/pw/pw.8
  user/ngie/more-tests/usr.sbin/syslogd/syslogd.8
  user/ngie/more-tests/usr.sbin/syslogd/syslogd.c
Directory Properties:
  user/ngie/more-tests/   (props changed)
  user/ngie/more-tests/cddl/   (props changed)
  user/ngie/more-tests/contrib/gcc/   (props changed)
  user/ngie/more-tests/contrib/libcxxrt/   (props changed)
  user/ngie/more-tests/contrib/sendmail/   (props changed)
  user/ngie/more-tests/contrib/tzdata/   (props changed)
  user/ngie/more-tests/etc/   (props changed)
  user/ngie/more-tests/gnu/lib/   (props changed)
  user/ngie/more-tests/gnu/usr.bin/binutils/   (props changed)
  user/ngie/more-tests/include/   (props changed)
  user/ngie/more-tests/lib/libc/   (props changed)
  user/ngie/more-tests/lib/libutil/   (props changed)
  user/ngie/more-tests/lib/libvmmapi/   (props changed)
  user/ngie/more-tests/lib/libz/   (props changed)
  user/ngie/more-tests/sbin/   (props changed)
  user/ngie/more-tests/share/   (props changed)
  user/ngie/more-tests/share/man/man4/   (props changed)
  user/ngie/more-tests/sys/   (props changed)
  user/ngie/more-tests/sys/amd64/vmm/   (props changed)
  user/ngie/more-tests/sys/boot/   (props changed)
  user/ngie/more-tests/sys/boot/powerpc/kboot/   (props changed)
  user/ngie/more-tests/sys/boot/powerpc/ofw/   (props changed)
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests/sys/conf/   (props changed)
  user/ngie/more-tests/sys/contrib/dev/acpica/   (props changed)
  user/ngie/more-tests/targets/   (props changed)
  user/ngie/more-tests/usr.bin/calendar/   (props changed)
  user/ngie/more-tests/usr.bin/mkimg/   (props changed)
  user/ngie/more-tests/usr.sbin/bhyve/   (props changed)
  user/ngie/more-tests/usr.sbin/bhyvectl/   (props changed)
  user/ngie/more-tests/usr.sbin/bhyveload/   (props changed)

Modified: user/ngie/more-tests/Makefile
==============================================================================
--- user/ngie/more-tests/Makefile	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/Makefile	Sun Jun 21 08:00:05 2015	(r284675)
@@ -100,13 +100,9 @@
 # For more information, see the build(7) manual page.
 #
 
-# Allow bootstrapping with fmake from earlier versions of FreeBSD
-.if defined(.PARSEDIR) && ${MAKE_VERSION} >= 20150606
-MK_META_MODE?=	yes
-.else
-MK_META_MODE=	no
-.endif
-.if ${MK_META_MODE} == "yes"
+# Note: we use this awkward construct to be compatible with FreeBSD's
+# old make used in 10.0 and 9.2 and earlier.
+.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
 # targets/Makefile plays the role of top-level
 .include "targets/Makefile"
 .else
@@ -442,9 +438,12 @@ universe_epilogue: universe_${target}
 universe_${target}: universe_${target}_prologue
 universe_${target}_prologue: universe_prologue
 	@echo ">> ${target} started on `LC_ALL=C date`"
+universe_${target}_worlds:
+
 .if !defined(MAKE_JUST_KERNELS)
+universe_${target}_done: universe_${target}_worlds
 .for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}: universe_${target}_${target_arch}
+universe_${target}_worlds: universe_${target}_${target_arch}
 universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
 	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@@ -457,15 +456,11 @@ universe_${target}_${target_arch}: unive
 	    ${MAKEFAIL}))
 	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
 .endfor
-.endif
+.endif # !MAKE_JUST_KERNELS
+
 .if !defined(MAKE_JUST_WORLDS)
-# If we are building world and kernels wait for the required worlds to finish
-.if !defined(MAKE_JUST_KERNELS)
-.for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}_kernels: universe_${target}_${target_arch}
-.endfor
-.endif
-universe_${target}: universe_${target}_kernels
+universe_${target}_done: universe_${target}_kernels
+universe_${target}_kernels: universe_${target}_worlds
 universe_${target}_kernels: universe_${target}_prologue .MAKE
 .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
 	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
@@ -475,7 +470,11 @@ universe_${target}_kernels: universe_${t
 .endif
 	@cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
-.endif
+.endif # !MAKE_JUST_WORLDS
+
+# Tell the user the worlds and kernels have completed
+universe_${target}: universe_${target}_done
+universe_${target}_done:
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe_kernels: universe_kernconfs
@@ -528,7 +527,7 @@ universe_epilogue:
 buildLINT:
 	${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
 
-.ifdef .PARSEDIR
+.if defined(.PARSEDIR)
 # This makefile does not run in meta mode
 .MAKE.MODE= normal
 # Normally the things we run from here don't either.
@@ -547,5 +546,6 @@ UPDATE_DEPENDFILE= NO
 MAKE_JOB_ERROR_TOKEN= no
 .export MAKE_JOB_ERROR_TOKEN
 .endif
+.endif # bmake
 
 .endif				# META_MODE

Modified: user/ngie/more-tests/ObsoleteFiles.inc
==============================================================================
--- user/ngie/more-tests/ObsoleteFiles.inc	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/ObsoleteFiles.inc	Sun Jun 21 08:00:05 2015	(r284675)
@@ -39,9 +39,9 @@
 # done
 
 # 20150528: PCI IOV device driver methods moved to a separate kobj interface.
-OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9
-OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9
-OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9
+OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
+OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
+OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
@@ -117,9 +117,13 @@ OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
+# 20150518: tzdata2015c update
+OLD_FILES+=usr/share/zoneinfo/America/Montreal
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
+OLD_FILES+=usr/share/examples/etc/libmap32.conf
+OLD_FILES+=usr/include/bsdstat.h
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
@@ -160,6 +164,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_add
 OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
@@ -168,6 +173,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_exi
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
@@ -176,6 +182,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_exi
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
@@ -184,6 +191,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_fre
 OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
@@ -204,10 +212,33 @@ OLD_FILES+=usr/share/man/man3/nvlist_get
 OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
-# 20150429:
-OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
+# 20150429: remove never written documentation
+OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
 OLD_FILES+=usr/tests/sys/kern/mmap_test
+# 20150422: zlib.c moved from net to libkern
+OLD_FILES+=usr/include/net/zlib.h
+OLD_FILES+=usr/include/net/zutil.h
 # 20150418
 OLD_FILES+=sbin/mount_oldnfs
 OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
@@ -226,6 +257,42 @@ OLD_FILES+=usr/include/altq/altq_rmclass
 OLD_FILES+=usr/include/altq/altq_cbq.h
 OLD_FILES+=usr/include/altq/altq_rio.h
 OLD_DIRS+=usr/include/altq
+# 20150330: ntp 4.2.8p1
+OLD_FILES+=usr/share/doc/ntp/driver1.html
+OLD_FILES+=usr/share/doc/ntp/driver10.html
+OLD_FILES+=usr/share/doc/ntp/driver11.html
+OLD_FILES+=usr/share/doc/ntp/driver12.html
+OLD_FILES+=usr/share/doc/ntp/driver16.html
+OLD_FILES+=usr/share/doc/ntp/driver18.html
+OLD_FILES+=usr/share/doc/ntp/driver19.html
+OLD_FILES+=usr/share/doc/ntp/driver2.html
+OLD_FILES+=usr/share/doc/ntp/driver20.html
+OLD_FILES+=usr/share/doc/ntp/driver22.html
+OLD_FILES+=usr/share/doc/ntp/driver26.html
+OLD_FILES+=usr/share/doc/ntp/driver27.html
+OLD_FILES+=usr/share/doc/ntp/driver28.html
+OLD_FILES+=usr/share/doc/ntp/driver29.html
+OLD_FILES+=usr/share/doc/ntp/driver3.html
+OLD_FILES+=usr/share/doc/ntp/driver30.html
+OLD_FILES+=usr/share/doc/ntp/driver32.html
+OLD_FILES+=usr/share/doc/ntp/driver33.html
+OLD_FILES+=usr/share/doc/ntp/driver34.html
+OLD_FILES+=usr/share/doc/ntp/driver35.html
+OLD_FILES+=usr/share/doc/ntp/driver36.html
+OLD_FILES+=usr/share/doc/ntp/driver37.html
+OLD_FILES+=usr/share/doc/ntp/driver4.html
+OLD_FILES+=usr/share/doc/ntp/driver5.html
+OLD_FILES+=usr/share/doc/ntp/driver6.html
+OLD_FILES+=usr/share/doc/ntp/driver7.html
+OLD_FILES+=usr/share/doc/ntp/driver8.html
+OLD_FILES+=usr/share/doc/ntp/driver9.html
+OLD_FILES+=usr/share/doc/ntp/ldisc.html
+OLD_FILES+=usr/share/doc/ntp/measure.html
+OLD_FILES+=usr/share/doc/ntp/mx4200data.html
+OLD_FILES+=usr/share/doc/ntp/notes.html
+OLD_FILES+=usr/share/doc/ntp/patches.html
+OLD_FILES+=usr/share/doc/ntp/porting.html
+OLD_FILES+=usr/share/man/man1/sntp.1.gz
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h
@@ -297,7 +364,7 @@ OLD_FILES+=usr/bin/ppt
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 # 20150217: Removed remnants of ar(4) driver
-OLD_FILES+=usr/include/sys/dev/ic/hd64570.h
+OLD_FILES+=usr/include/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
@@ -317,19 +384,23 @@ OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
-OLD_FILES+=usr/share/man/man9/spl.9
-OLD_FILES+=usr/share/man/man9/spl0.9
-OLD_FILES+=usr/share/man/man9/splbio.9
-OLD_FILES+=usr/share/man/man9/splclock.9
-OLD_FILES+=usr/share/man/man9/splhigh.9
-OLD_FILES+=usr/share/man/man9/splimp.9
-OLD_FILES+=usr/share/man/man9/splnet.9
-OLD_FILES+=usr/share/man/man9/splsoftclock.9
-OLD_FILES+=usr/share/man/man9/splsofttty.9
-OLD_FILES+=usr/share/man/man9/splstatclock.9
-OLD_FILES+=usr/share/man/man9/spltty.9
-OLD_FILES+=usr/share/man/man9/splvm.9
-OLD_FILES+=usr/share/man/man9/splx.9
+OLD_FILES+=usr/share/man/man9/spl.9.gz
+OLD_FILES+=usr/share/man/man9/spl0.9.gz
+OLD_FILES+=usr/share/man/man9/splbio.9.gz
+OLD_FILES+=usr/share/man/man9/splclock.9.gz
+OLD_FILES+=usr/share/man/man9/splhigh.9.gz
+OLD_FILES+=usr/share/man/man9/splimp.9.gz
+OLD_FILES+=usr/share/man/man9/splnet.9.gz
+OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
+OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
+OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
+OLD_FILES+=usr/share/man/man9/spltty.9.gz
+OLD_FILES+=usr/share/man/man9/splvm.9.gz
+OLD_FILES+=usr/share/man/man9/splx.9.gz
+# 20150122: callout changes reverted
+OLD_FILES+=usr/share/man/man9/callout_drain_async.9.gz
+# 20150118: toeplitz.c moved from netinet to net
+OLD_FILES+=usr/include/netinet/toeplitz.h
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
@@ -384,6 +455,8 @@ OLD_FILES+=usr/lib/clang/3.5.0/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.0/lib
 OLD_DIRS+=usr/lib/clang/3.5.0
+# 20150102: removal of asr(4)
+OLD_FILES+=usr/share/man/man4/asr.4.gz
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey
@@ -452,7 +525,7 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
-# 20141226: Remove gpib/ieee488
+# 20141225: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
@@ -465,22 +538,37 @@ OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/lib/libgpib_p.a
-OLD_FILES+=share/man/man4/pcii.4.gz
-OLD_FILES+=share/man/man4/gpib.4.gz
-OLD_FILES+=share/man/man4/tnt4882.4.gz
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgpib.a
 OLD_FILES+=usr/lib32/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.so
 OLD_LIBS+=usr/lib32/libgpib.so.3
-.endif
-
+OLD_FILES+=usr/share/man/man3/gpib.3.gz
+OLD_FILES+=usr/share/man/man3/ibclr.3.gz
+OLD_FILES+=usr/share/man/man3/ibdev.3.gz
+OLD_FILES+=usr/share/man/man3/ibdma.3.gz
+OLD_FILES+=usr/share/man/man3/ibeos.3.gz
+OLD_FILES+=usr/share/man/man3/ibeot.3.gz
+OLD_FILES+=usr/share/man/man3/ibloc.3.gz
+OLD_FILES+=usr/share/man/man3/ibonl.3.gz
+OLD_FILES+=usr/share/man/man3/ibpad.3.gz
+OLD_FILES+=usr/share/man/man3/ibrd.3.gz
+OLD_FILES+=usr/share/man/man3/ibsad.3.gz
+OLD_FILES+=usr/share/man/man3/ibsic.3.gz
+OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
+OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
+OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
+OLD_FILES+=usr/share/man/man4/gpib.4.gz
+OLD_FILES+=usr/share/man/man4/pcii.4.gz
+OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
 # 20141224: libxo moved to /lib
 OLD_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
 OLD_FILES+=usr/include/net/if_stf.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
+# 20141209: pw tests broken into a file per command
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=share/man/man1/preconv.1.gz
@@ -492,6 +580,11 @@ OLD_FILES+=usr/tests/sbin/mdconfig/mdcon
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
+# 20141122: mandoc updated to 1.13.1
+OLD_FILES+=usr/share/mdocml/external.png
+# 20141111: SF_KQUEUE code removed
+OLD_FILES+=usr/include/sys/sf_base.h
+OLD_FILES+=usr/include/sys/sf_sync.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
@@ -504,6 +597,8 @@ OLD_FILES+=usr/include/netinet/ip_gre.h
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
+# 20141030: atf 0.21 import
+OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
@@ -511,6 +606,9 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
+# 20141003: libproc version bump
+OLD_LIBS+=usr/lib/libproc.so.2
+OLD_LIBS+=usr/lib32/libproc.so.2
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
@@ -520,6 +618,10 @@ OLD_FILES+=etc/rc.d/hv_kvpd
 OLD_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
+# 20140827: tzdata2014f import
+OLD_FILES+=usr/share/zoneinfo/Asia/Chongqing
+OLD_FILES+=usr/share/zoneinfo/Asia/Harbin
+OLD_FILES+=usr/share/zoneinfo/Asia/Kashgar
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7
@@ -583,14 +685,19 @@ OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
+# 20140731
+OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version.
 OLD_LIBS+=lib/libsbuf.so.7
+OLD_LIBS+=usr/lib32/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
+# 20140722: browse_packages_ftp.sh removed
+OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
@@ -611,6 +718,14 @@ OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
+OLD_FILES+=usr/lib32/libhistory.a
+OLD_FILES+=usr/lib32/libhistory.so
+OLD_LIBS+=usr/lib32/libhistory.so.8
+OLD_FILES+=usr/lib32/libhistory_p.a
+OLD_FILES+=usr/lib32/libreadline.a
+OLD_FILES+=usr/lib32/libreadline.so
+OLD_LIBS+=usr/lib32/libreadline.so.8
+OLD_FILES+=usr/lib32/libreadline_p.a
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
@@ -623,6 +738,7 @@ OLD_FILES+=usr/include/readline/rltypede
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
+OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
@@ -683,6 +799,12 @@ OLD_FILES+=usr/share/mk/src.opts.mk
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
+# 20140425
+OLD_FILES+=usr/lib/libssp_p.a
+OLD_FILES+=usr/lib/libstand_p.a
+OLD_FILES+=usr/lib32/libc_pic.a
+OLD_FILES+=usr/lib32/libssp_p.a
+OLD_FILES+=usr/lib32/libstand_p.a
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
@@ -2001,7 +2123,6 @@ OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
-OLD_LIBS+=usr/lib/libproc.so.2
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3

Modified: user/ngie/more-tests/UPDATING
==============================================================================
--- user/ngie/more-tests/UPDATING	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/UPDATING	Sun Jun 21 08:00:05 2015	(r284675)
@@ -31,6 +31,64 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150616:
+	/etc/make.conf now included earlier.
+	sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier
+	than previously.
+	This makes it simple to interpose external toolchains etc.
+	However it may cause problems for users who have things like::
+
+		INSTALL+= something
+
+	in /etc/make.conf, since INSTALL is not yet defined.
+	A safe fix for that is to have::
+
+		INSTALL?= install
+		INSTALL+= something
+
+	which is equivalent to previous behavior.
+	
+20150616:
+	FreeBSD's old make (fmake) has been removed from the system. It is
+	available as the devel/fmake port or via pkg install fmake.
+	
+20150615:
+	The fix for the issue described in the 20150614 sendmail entry
+	below has been been committed in revision 284436.  The work
+	around described in that entry is no longer needed unless the
+	default setting is overridden by a confDH_PARAMETERS configuration
+	setting of '5' or pointing to a 512 bit DH parameter file.
+
+20150614:
+	ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from
+	atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf
+	and devel/kyua to version 0.20+ and adjust any calling code to work
+	with Kyuafile and kyua.
+
+20150614:
+	The import of openssl to address the FreeBSD-SA-15:10.openssl
+	security advisory includes a change which rejects handshakes
+	with DH parameters below 768 bits.  sendmail releases prior
+	to 8.15.2 (not yet released), defaulted to a 512 bit
+	DH parameter setting for client connections.  To work around
+	this interoperability, sendmail can be configured to use a
+	2048 bit DH parameter by:
+
+	1. Edit /etc/mail/`hostname`.mc 
+	2. If a setting for confDH_PARAMETERS does not exist or
+	   exists and is set to a string beginning with '5',
+	   replace it with '2'.
+	3. If a setting for confDH_PARAMETERS exists and is set to
+	   a file path, create a new file with:
+		openssl dhparam -out /path/to/file 2048
+	4. Rebuild the .cf file:
+		cd /etc/mail/; make; make install
+	5. Restart sendmail:
+		cd /etc/mail/; make restart
+
+	A sendmail patch is coming, at which time this file will be
+	updated.
+
 20150604:
 	Generation of legacy formatted entries have been disabled by default
 	in pwd_mkdb(8), as all base system consumers of the legacy formatted

Modified: user/ngie/more-tests/bin/cat/Makefile.depend
==============================================================================
--- user/ngie/more-tests/bin/cat/Makefile.depend	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/bin/cat/Makefile.depend	Sun Jun 21 08:00:05 2015	(r284675)
@@ -1,4 +1,4 @@
-# $FreeBSD$  
+# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \

Modified: user/ngie/more-tests/bin/ls/Makefile.depend
==============================================================================
--- user/ngie/more-tests/bin/ls/Makefile.depend	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/bin/ls/Makefile.depend	Sun Jun 21 08:00:05 2015	(r284675)
@@ -10,6 +10,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libutil \
+	lib/libxo \
 	lib/ncurses/ncursesw \
 
 

Modified: user/ngie/more-tests/bin/ls/print.c
==============================================================================
--- user/ngie/more-tests/bin/ls/print.c	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/bin/ls/print.c	Sun Jun 21 08:00:05 2015	(r284675)
@@ -178,7 +178,7 @@ printlong(const DISPLAY *dp)
 		sp = p->fts_statp;
 		name = getname(p->fts_name);
 		if (name)
-		    xo_emit("{ke:name}", name);
+		    xo_emit("{ke:name/%hs}", name);
 		if (f_inode)
 			xo_emit("{:inode/%*ju} ",
 			    dp->s_inode, (uintmax_t)sp->st_ino);
@@ -214,7 +214,7 @@ printlong(const DISPLAY *dp)
 #endif
 
 		if (name) {
-		    xo_emit("{dk:name}", name);
+		    xo_emit("{dk:name/%hs}", name);
 		    free(name);
 		}
 		
@@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim
 		format = d_first ? "%e %b  %Y" : "%b %e  %Y";
 	strftime(longstring, sizeof(longstring), format, localtime(&ftime));
 
-	snprintf(fmt, sizeof(fmt), "{:%s/%%s} ", field);
+	snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);
 	xo_emit(fmt, longstring);
 }

Modified: user/ngie/more-tests/cddl/lib/libzfs/Makefile
==============================================================================
--- user/ngie/more-tests/cddl/lib/libzfs/Makefile	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/cddl/lib/libzfs/Makefile	Sun Jun 21 08:00:05 2015	(r284675)
@@ -37,7 +37,6 @@ SRCS+=	libzfs_changelist.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
-	zfs_ioctl_compat.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zpool_prop.c \

Modified: user/ngie/more-tests/cddl/lib/libzfs_core/Makefile
==============================================================================
--- user/ngie/more-tests/cddl/lib/libzfs_core/Makefile	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/cddl/lib/libzfs_core/Makefile	Sun Jun 21 08:00:05 2015	(r284675)
@@ -11,7 +11,8 @@ DPADD=	${LIBNVPAIR}
 LDADD=	-lnvpair
 
 SRCS=	libzfs_core.c \
-	libzfs_core_compat.c
+	libzfs_core_compat.c \
+	zfs_ioctl_compat.c
 
 SRCS+=	libzfs_compat.c
 

Modified: user/ngie/more-tests/contrib/gcc/longlong.h
==============================================================================
--- user/ngie/more-tests/contrib/gcc/longlong.h	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/contrib/gcc/longlong.h	Sun Jun 21 08:00:05 2015	(r284675)
@@ -584,11 +584,11 @@ UDItype __umulsidi3 (USItype, USItype);
 
 #if defined (__mips__) && W_TYPE_SIZE == 32
 #define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("multu %2,%3"						\
-	   : "=l" ((USItype) (w0)),					\
-	     "=h" ((USItype) (w1))					\
-	   : "d" ((USItype) (u)),					\
-	     "d" ((USItype) (v)))
+	do {								\
+	UDItype __x = (UDItype) (USItype) (u) * (USItype) (v);		\
+	 w1 = __x >> 32;						\
+	 w0 = __x;							\
+	} while (0)
 #define UMUL_TIME 10
 #define UDIV_TIME 100
 #endif /* __mips__ */

Modified: user/ngie/more-tests/contrib/libcxxrt/FREEBSD-upgrade
==============================================================================
--- user/ngie/more-tests/contrib/libcxxrt/FREEBSD-upgrade	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/contrib/libcxxrt/FREEBSD-upgrade	Sun Jun 21 08:00:05 2015	(r284675)
@@ -3,4 +3,4 @@ $FreeBSD$
 This is the FreeBSD copy of libcxxrt.  It contains the src directory from the 
 upstream repository.
 
-When updating, copy *.{c,cc,h} and typeinfo from the upstream src/.
+When updating, copy *.{c,cc,h} from the upstream src/.

Modified: user/ngie/more-tests/contrib/libcxxrt/libelftc_dem_gnu3.c
==============================================================================
--- user/ngie/more-tests/contrib/libcxxrt/libelftc_dem_gnu3.c	Sun Jun 21 07:00:54 2015	(r284674)
+++ user/ngie/more-tests/contrib/libcxxrt/libelftc_dem_gnu3.c	Sun Jun 21 08:00:05 2015	(r284675)
@@ -59,7 +59,7 @@ struct vector_str {
 
 enum type_qualifier {
 	TYPE_PTR, TYPE_REF, TYPE_CMX, TYPE_IMG, TYPE_EXT, TYPE_RST, TYPE_VAT,
-	TYPE_CST
+	TYPE_CST, TYPE_VEC
 };
 
 struct vector_type_qualifier {
@@ -397,6 +397,8 @@ static int	cpp_demangle_read_array(struc
 static int	cpp_demangle_read_encoding(struct cpp_demangle_data *);
 static int	cpp_demangle_read_expr_primary(struct cpp_demangle_data *);
 static int	cpp_demangle_read_expression(struct cpp_demangle_data *);
+static int	cpp_demangle_read_expression_flat(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_expression_binary(struct cpp_demangle_data *,
 		    const char *, size_t);
 static int	cpp_demangle_read_expression_unary(struct cpp_demangle_data *,
@@ -408,8 +410,12 @@ static int	cpp_demangle_read_function(st
 static int	cpp_demangle_local_source_name(struct cpp_demangle_data *ddata);
 static int	cpp_demangle_read_local_name(struct cpp_demangle_data *);
 static int	cpp_demangle_read_name(struct cpp_demangle_data *);
+static int	cpp_demangle_read_name_flat(struct cpp_demangle_data *,
+		    char**);
 static int	cpp_demangle_read_nested_name(struct cpp_demangle_data *);
 static int	cpp_demangle_read_number(struct cpp_demangle_data *, long *);
+static int	cpp_demangle_read_number_as_string(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_nv_offset(struct cpp_demangle_data *);
 static int	cpp_demangle_read_offset(struct cpp_demangle_data *);
 static int	cpp_demangle_read_offset_number(struct cpp_demangle_data *);
@@ -423,6 +429,8 @@ static int	cpp_demangle_read_tmpl_arg(st
 static int	cpp_demangle_read_tmpl_args(struct cpp_demangle_data *);
 static int	cpp_demangle_read_tmpl_param(struct cpp_demangle_data *);
 static int	cpp_demangle_read_type(struct cpp_demangle_data *, int);
+static int	cpp_demangle_read_type_flat(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_uqname(struct cpp_demangle_data *);
 static int	cpp_demangle_read_v_offset(struct cpp_demangle_data *);
 static char	*decode_fp_to_double(const char *, size_t);
@@ -601,17 +609,18 @@ cpp_demangle_push_fp(struct cpp_demangle
 	fp = ddata->cur;
 	while (*ddata->cur != 'E')
 		++ddata->cur;
-	++ddata->cur;
 
 	if ((f = decoder(fp, ddata->cur - fp)) == NULL)
 		return (0);
 
 	rtn = 0;
 	if ((len = strlen(f)) > 0)
-		rtn = cpp_demangle_push_str(ddata, f, len); 
+		rtn = cpp_demangle_push_str(ddata, f, len);
 
 	free(f);
 
+	++ddata->cur;
+
 	return (rtn);
 }
 
@@ -695,7 +704,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, "*", 1))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -706,7 +716,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, "&", 1))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -717,7 +728,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " complex", 8))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -726,23 +738,26 @@ cpp_demangle_push_type_qualifier(struct 
 			if (!cpp_demangle_push_str(ddata, " imaginary", 10))
 				goto clean;
 			if (type_str != NULL) {
-				if (!vector_str_push(&subst_v, " imaginary", 10))
+				if (!vector_str_push(&subst_v, " imaginary",
+				    10))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
 
 		case TYPE_EXT:
-			if (e_idx > v->ext_name.size - 1)
+			if (v->ext_name.size == 0 ||
+			    e_idx > v->ext_name.size - 1)
 				goto clean;
-			if ((e_len = strlen(v->ext_name.container[e_idx])) == 0)
+			if ((e_len = strlen(v->ext_name.container[e_idx])) ==
+			    0)
 				goto clean;
-			if ((buf = malloc(sizeof(char) * (e_len + 1))) == NULL)
+			if ((buf = malloc(e_len + 2)) == NULL)
 				goto clean;
-
-			memcpy(buf, " ", 1);
-			memcpy(buf + 1, v->ext_name.container[e_idx], e_len);
+			snprintf(buf, e_len + 2, " %s",
+			    v->ext_name.container[e_idx]);
 
 			if (!cpp_demangle_push_str(ddata, buf, e_len + 1)) {
 				free(buf);
@@ -755,7 +770,8 @@ cpp_demangle_push_type_qualifier(struct 
 					free(buf);
 					goto clean;
 				}
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v)) {
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v)) {
 					free(buf);
 					goto clean;
 				}
@@ -770,7 +786,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " restrict", 9))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -781,7 +798,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " volatile", 9))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -792,11 +810,42 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " const", 6))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
 
+		case TYPE_VEC:
+			if (v->ext_name.size == 0 ||
+			    e_idx > v->ext_name.size - 1)
+				goto clean;
+			if ((e_len = strlen(v->ext_name.container[e_idx])) ==
+			    0)
+				goto clean;
+			if ((buf = malloc(e_len + 12)) == NULL)
+				goto clean;
+			snprintf(buf, e_len + 12, " __vector(%s)",
+			    v->ext_name.container[e_idx]);
+			if (!cpp_demangle_push_str(ddata, buf, e_len + 11)) {
+				free(buf);
+				goto clean;
+			}
+			if (type_str != NULL) {
+				if (!vector_str_push(&subst_v, buf,
+				    e_len + 11)) {
+					free(buf);
+					goto clean;
+				}
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v)) {
+					free(buf);
+					goto clean;
+				}
+			}
+			free(buf);
+			++e_idx;
+			break;
 		};
 		--idx;
 	}
@@ -947,10 +996,14 @@ cpp_demangle_read_expr_primary(struct cp
 
 	switch (*ddata->cur) {
 	case 'b':
+		if (*(ddata->cur + 2) != 'E')
+			return (0);
 		switch (*(++ddata->cur)) {
 		case '0':
+			ddata->cur += 2;
 			return (cpp_demangle_push_str(ddata, "false", 5));
 		case '1':
+			ddata->cur += 2;
 			return (cpp_demangle_push_str(ddata, "true", 4));
 		default:
 			return (0);
@@ -999,7 +1052,8 @@ cpp_demangle_read_expr_primary(struct cp
 			++ddata->cur;
 		}
 		++ddata->cur;
-		return (cpp_demangle_push_str(ddata, num, ddata->cur - num));
+		return (cpp_demangle_push_str(ddata, num,
+		    ddata->cur - num - 1));
 
 	default:
 		return (0);
@@ -1291,6 +1345,38 @@ cpp_demangle_read_expression(struct cpp_
 }
 
 static int
+cpp_demangle_read_expression_flat(struct cpp_demangle_data *ddata, char **str)
+{
+	struct vector_str *output;
+	size_t i, p_idx, idx, exp_len;
+	char *exp;
+
+	output = ddata->push_head > 0 ? &ddata->output_tmp :
+	    &ddata->output;
+
+	p_idx = output->size;
+
+	if (!cpp_demangle_read_expression(ddata))
+		return (0);
+
+	if ((exp = vector_str_substr(output, p_idx, output->size - 1,
+	    &exp_len)) == NULL)
+		return (0);
+
+	idx = output->size;
+	for (i = p_idx; i < idx; ++i) {
+		if (!vector_str_pop(output)) {
+			free(exp);
+			return (0);
+		}
+	}
+
+	*str = exp;
+
+	return (1);
+}
+
+static int
 cpp_demangle_read_expression_binary(struct cpp_demangle_data *ddata,
     const char *name, size_t len)
 {
@@ -1419,12 +1505,65 @@ cpp_demangle_read_function(struct cpp_de
 static int
 cpp_demangle_read_encoding(struct cpp_demangle_data *ddata)
 {
+	char *name, *type, *num_str;
+	long offset;
+	int rtn;
 
 	if (ddata == NULL || *ddata->cur == '\0')
 		return (0);
 
 	/* special name */
 	switch (SIMPLE_HASH(*ddata->cur, *(ddata->cur + 1))) {
+	case SIMPLE_HASH('G', 'A'):
+		if (!cpp_demangle_push_str(ddata, "hidden alias for ", 17))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		return (cpp_demangle_read_encoding(ddata));
+
+	case SIMPLE_HASH('G', 'R'):
+		if (!cpp_demangle_push_str(ddata, "reference temporary #", 21))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		if (!cpp_demangle_read_name_flat(ddata, &name))
+			return (0);
+		rtn = 0;
+		if (!cpp_demangle_read_number_as_string(ddata, &num_str))
+			goto clean1;
+		if (!cpp_demangle_push_str(ddata, num_str, strlen(num_str)))
+			goto clean2;
+		if (!cpp_demangle_push_str(ddata, " for ", 5))
+			goto clean2;
+		if (!cpp_demangle_push_str(ddata, name, strlen(name)))
+			goto clean2;
+		rtn = 1;
+	clean2:
+		free(num_str);
+	clean1:
+		free(name);
+		return (rtn);
+
+	case SIMPLE_HASH('G', 'T'):
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		switch (*ddata->cur) {
+		case 'n':
+			if (!cpp_demangle_push_str(ddata,
+			    "non-transaction clone for ", 26))
+				return (0);
+		case 't':
+		default:
+			if (!cpp_demangle_push_str(ddata,
+			    "transaction clone for ", 22))
+				return (0);
+		}
+		++ddata->cur;
+		return (cpp_demangle_read_encoding(ddata));
+
 	case SIMPLE_HASH('G', 'V'):
 		/* sentry object for 1 time init */
 		if (!cpp_demangle_push_str(ddata, "guard variable for ", 20))
@@ -1446,14 +1585,49 @@ cpp_demangle_read_encoding(struct cpp_de
 			return (0);
 		return (cpp_demangle_read_encoding(ddata));
 
+	case SIMPLE_HASH('T', 'C'):
+		/* construction vtable */
+		if (!cpp_demangle_push_str(ddata, "construction vtable for ",
+		    24))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		if (!cpp_demangle_read_type_flat(ddata, &type))
+			return (0);
+		rtn = 0;
+		if (!cpp_demangle_read_number(ddata, &offset))
+			goto clean3;
+		if (*ddata->cur++ != '_')
+			goto clean3;
+		if (!cpp_demangle_read_type(ddata, 0))
+			goto clean3;
+		if (!cpp_demangle_push_str(ddata, "-in-", 4))
+			goto clean3;
+		if (!cpp_demangle_push_str(ddata, type, strlen(type)))
+			goto clean3;
+		rtn = 1;
+	clean3:
+		free(type);
+		return (rtn);
+
 	case SIMPLE_HASH('T', 'D'):
 		/* typeinfo common proxy */
 		break;
 
+	case SIMPLE_HASH('T', 'F'):
+		/* typeinfo fn */
+		if (!cpp_demangle_push_str(ddata, "typeinfo fn for ", 16))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		return (cpp_demangle_read_type(ddata, 0));
+
 	case SIMPLE_HASH('T', 'h'):
 		/* virtual function non-virtual override thunk */
-		if (cpp_demangle_push_str(ddata,
-		    "virtual function non-virtual override ", 38) == 0)
+		if (!cpp_demangle_push_str(ddata,
+		    "virtual function non-virtual override ", 38))
 			return (0);
 		ddata->cur += 2;
 		if (*ddata->cur == '\0')
@@ -1462,24 +1636,51 @@ cpp_demangle_read_encoding(struct cpp_de
 			return (0);
 		return (cpp_demangle_read_encoding(ddata));
 
+	case SIMPLE_HASH('T', 'H'):
+		/* TLS init function */
+		if (!cpp_demangle_push_str(ddata, "TLS init function for ",
+		    22))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		break;
+
 	case SIMPLE_HASH('T', 'I'):
 		/* typeinfo structure */
-		/* FALLTHROUGH */

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506210800.t5L8075O090625>