svn commit: r321831 - in projects/make-check-sandbox: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensol...

Mon Jul 31 23:04:17 UTC 2017

Author: ngie
Date: Mon Jul 31 23:04:12 2017
New Revision: 321831
URL: https://svnweb.freebsd.org/changeset/base/321831

Log:
  MFhead at r321829

Added:
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c
     - copied unchanged from r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe
     - copied unchanged from r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe
  projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfattach
     - copied unchanged from r321829, head/contrib/hyperv/tools/scripts/hyperv_vfattach
  projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfup
     - copied unchanged from r321829, head/contrib/hyperv/tools/scripts/hyperv_vfup
  projects/make-check-sandbox/contrib/mdocml/compat_recallocarray.c
     - copied unchanged from r321829, head/contrib/mdocml/compat_recallocarray.c
  projects/make-check-sandbox/contrib/mdocml/mandoc_xr.c
     - copied unchanged from r321829, head/contrib/mdocml/mandoc_xr.c
  projects/make-check-sandbox/contrib/mdocml/mandoc_xr.h
     - copied unchanged from r321829, head/contrib/mdocml/mandoc_xr.h
  projects/make-check-sandbox/contrib/mdocml/test-recallocarray.c
     - copied unchanged from r321829, head/contrib/mdocml/test-recallocarray.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslparseop.c
     - copied unchanged from r321829, head/sys/contrib/dev/acpica/compiler/aslparseop.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c
     - copied unchanged from r321829, head/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c
  projects/make-check-sandbox/sys/dev/iicbus/nxprtc.c
     - copied unchanged from r321829, head/sys/dev/iicbus/nxprtc.c
  projects/make-check-sandbox/sys/modules/i2c/ds1307/
     - copied from r321829, head/sys/modules/i2c/ds1307/
  projects/make-check-sandbox/sys/modules/i2c/ds3231/
     - copied from r321829, head/sys/modules/i2c/ds3231/
  projects/make-check-sandbox/sys/modules/i2c/nxprtc/
     - copied from r321829, head/sys/modules/i2c/nxprtc/
Deleted:
  projects/make-check-sandbox/sys/dev/iicbus/pcf8563.c
  projects/make-check-sandbox/sys/dev/iicbus/pcf8563reg.h
  projects/make-check-sandbox/sys/net/flowtable.c
  projects/make-check-sandbox/sys/net/flowtable.h
  projects/make-check-sandbox/usr.bin/netstat/flowtable.c
Modified:
  projects/make-check-sandbox/Makefile
  projects/make-check-sandbox/Makefile.inc1
  projects/make-check-sandbox/UPDATING
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
  projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.d
  projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
  projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
  projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
  projects/make-check-sandbox/contrib/ipfilter/arc4random.c
  projects/make-check-sandbox/contrib/libarchive/libarchive/archive_cryptor_private.h
  projects/make-check-sandbox/contrib/libarchive/libarchive/archive_write_set_format_ar.c
  projects/make-check-sandbox/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
  projects/make-check-sandbox/contrib/llvm/include/llvm/Support/CommandLine.h
  projects/make-check-sandbox/contrib/llvm/include/llvm/Support/TargetRegistry.h
  projects/make-check-sandbox/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h
  projects/make-check-sandbox/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp
  projects/make-check-sandbox/contrib/llvm/lib/CodeGen/InlineSpiller.cpp
  projects/make-check-sandbox/contrib/llvm/lib/CodeGen/RegAllocBase.cpp
  projects/make-check-sandbox/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Option/OptTable.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Support/CommandLine.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Support/ErrorHandling.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Support/TargetRegistry.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.td
  projects/make-check-sandbox/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Target/SystemZ/SystemZScheduleZ14.td
  projects/make-check-sandbox/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Transforms/Utils/LoopUtils.cpp
  projects/make-check-sandbox/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/include/clang/AST/Type.h
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/AST/Type.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Headers/unwind.h
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Lex/ScratchBuffer.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp
  projects/make-check-sandbox/contrib/llvm/tools/clang/tools/clang-format/ClangFormat.cpp
  projects/make-check-sandbox/contrib/llvm/tools/lld/COFF/Config.h
  projects/make-check-sandbox/contrib/llvm/tools/lld/COFF/Driver.cpp
  projects/make-check-sandbox/contrib/llvm/tools/lld/ELF/InputFiles.cpp
  projects/make-check-sandbox/contrib/llvm/tools/lld/ELF/InputFiles.h
  projects/make-check-sandbox/contrib/llvm/tools/lld/ELF/SymbolTable.cpp
  projects/make-check-sandbox/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
  projects/make-check-sandbox/contrib/llvm/tools/lldb/include/lldb/API/SBAttachInfo.h
  projects/make-check-sandbox/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h
  projects/make-check-sandbox/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h
  projects/make-check-sandbox/contrib/mdocml/INSTALL
  projects/make-check-sandbox/contrib/mdocml/LICENSE
  projects/make-check-sandbox/contrib/mdocml/Makefile
  projects/make-check-sandbox/contrib/mdocml/Makefile.depend
  projects/make-check-sandbox/contrib/mdocml/NEWS
  projects/make-check-sandbox/contrib/mdocml/TODO
  projects/make-check-sandbox/contrib/mdocml/apropos.1
  projects/make-check-sandbox/contrib/mdocml/att.c
  projects/make-check-sandbox/contrib/mdocml/cgi.c
  projects/make-check-sandbox/contrib/mdocml/chars.c
  projects/make-check-sandbox/contrib/mdocml/config.h
  projects/make-check-sandbox/contrib/mdocml/configure
  projects/make-check-sandbox/contrib/mdocml/configure.local.example
  projects/make-check-sandbox/contrib/mdocml/demandoc.c
  projects/make-check-sandbox/contrib/mdocml/eqn.7
  projects/make-check-sandbox/contrib/mdocml/eqn.c
  projects/make-check-sandbox/contrib/mdocml/eqn_html.c
  projects/make-check-sandbox/contrib/mdocml/eqn_term.c
  projects/make-check-sandbox/contrib/mdocml/gmdiff
  projects/make-check-sandbox/contrib/mdocml/html.c
  projects/make-check-sandbox/contrib/mdocml/html.h
  projects/make-check-sandbox/contrib/mdocml/lib.c
  projects/make-check-sandbox/contrib/mdocml/libmandoc.h
  projects/make-check-sandbox/contrib/mdocml/libroff.h
  projects/make-check-sandbox/contrib/mdocml/main.c
  projects/make-check-sandbox/contrib/mdocml/man.7
  projects/make-check-sandbox/contrib/mdocml/man.c
  projects/make-check-sandbox/contrib/mdocml/man.options.1
  projects/make-check-sandbox/contrib/mdocml/man_html.c
  projects/make-check-sandbox/contrib/mdocml/man_macro.c
  projects/make-check-sandbox/contrib/mdocml/man_term.c
  projects/make-check-sandbox/contrib/mdocml/man_validate.c
  projects/make-check-sandbox/contrib/mdocml/manconf.h
  projects/make-check-sandbox/contrib/mdocml/mandoc.1
  projects/make-check-sandbox/contrib/mdocml/mandoc.3
  projects/make-check-sandbox/contrib/mdocml/mandoc.c
  projects/make-check-sandbox/contrib/mdocml/mandoc.css
  projects/make-check-sandbox/contrib/mdocml/mandoc.h
  projects/make-check-sandbox/contrib/mdocml/mandoc_aux.c
  projects/make-check-sandbox/contrib/mdocml/mandoc_aux.h
  projects/make-check-sandbox/contrib/mdocml/mandoc_char.7
  projects/make-check-sandbox/contrib/mdocml/mandoc_escape.3
  projects/make-check-sandbox/contrib/mdocml/mandoc_headers.3
  projects/make-check-sandbox/contrib/mdocml/mandoc_html.3
  projects/make-check-sandbox/contrib/mdocml/mandocd.c
  projects/make-check-sandbox/contrib/mdocml/mandocdb.c
  projects/make-check-sandbox/contrib/mdocml/manpath.c
  projects/make-check-sandbox/contrib/mdocml/mansearch.c
  projects/make-check-sandbox/contrib/mdocml/mdoc.7
  projects/make-check-sandbox/contrib/mdocml/mdoc.c
  projects/make-check-sandbox/contrib/mdocml/mdoc_html.c
  projects/make-check-sandbox/contrib/mdocml/mdoc_man.c
  projects/make-check-sandbox/contrib/mdocml/mdoc_markdown.c
  projects/make-check-sandbox/contrib/mdocml/mdoc_term.c
  projects/make-check-sandbox/contrib/mdocml/mdoc_validate.c
  projects/make-check-sandbox/contrib/mdocml/msec.in
  projects/make-check-sandbox/contrib/mdocml/out.c
  projects/make-check-sandbox/contrib/mdocml/out.h
  projects/make-check-sandbox/contrib/mdocml/read.c
  projects/make-check-sandbox/contrib/mdocml/roff.7
  projects/make-check-sandbox/contrib/mdocml/roff.c
  projects/make-check-sandbox/contrib/mdocml/roff.h
  projects/make-check-sandbox/contrib/mdocml/roff_html.c
  projects/make-check-sandbox/contrib/mdocml/roff_int.h
  projects/make-check-sandbox/contrib/mdocml/roff_term.c
  projects/make-check-sandbox/contrib/mdocml/roff_validate.c
  projects/make-check-sandbox/contrib/mdocml/soelim.1
  projects/make-check-sandbox/contrib/mdocml/st.c
  projects/make-check-sandbox/contrib/mdocml/st.in
  projects/make-check-sandbox/contrib/mdocml/tbl.7
  projects/make-check-sandbox/contrib/mdocml/tbl.c
  projects/make-check-sandbox/contrib/mdocml/tbl_data.c
  projects/make-check-sandbox/contrib/mdocml/tbl_html.c
  projects/make-check-sandbox/contrib/mdocml/tbl_layout.c
  projects/make-check-sandbox/contrib/mdocml/tbl_term.c
  projects/make-check-sandbox/contrib/mdocml/term.c
  projects/make-check-sandbox/contrib/mdocml/term.h
  projects/make-check-sandbox/contrib/mdocml/term_ascii.c
  projects/make-check-sandbox/contrib/mdocml/term_tab.c
  projects/make-check-sandbox/contrib/mdocml/tree.c
  projects/make-check-sandbox/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/make-check-sandbox/etc/Makefile
  projects/make-check-sandbox/etc/devd/hyperv.conf
  projects/make-check-sandbox/etc/mtree/Makefile
  projects/make-check-sandbox/etc/rc.d/nfsd
  projects/make-check-sandbox/kerberos5/lib/libkafs5/Makefile
  projects/make-check-sandbox/lib/clang/include/clang/Basic/Version.inc
  projects/make-check-sandbox/lib/clang/include/clang/Config/config.h
  projects/make-check-sandbox/lib/clang/include/lld/Config/Version.inc
  projects/make-check-sandbox/lib/clang/include/llvm/Support/VCSRevision.h
  projects/make-check-sandbox/lib/clang/libllvm/Makefile
  projects/make-check-sandbox/lib/libc/x86/sys/__vdso_gettc.c
  projects/make-check-sandbox/lib/libprocstat/libprocstat.3
  projects/make-check-sandbox/lib/libtelnet/Makefile
  projects/make-check-sandbox/lib/msun/tests/Makefile
  projects/make-check-sandbox/lib/msun/tests/trig_test.c
  projects/make-check-sandbox/libexec/hyperv/Makefile
  projects/make-check-sandbox/libexec/rtld-elf/rtld.c
  projects/make-check-sandbox/release/arm/BANANAPI.conf
  projects/make-check-sandbox/release/arm/CUBIEBOARD2.conf
  projects/make-check-sandbox/sbin/sysctl/sysctl.c
  projects/make-check-sandbox/sbin/umount/umount.8
  projects/make-check-sandbox/sbin/umount/umount.c
  projects/make-check-sandbox/share/man/man4/rtwn.4
  projects/make-check-sandbox/share/man/man9/taskqueue.9
  projects/make-check-sandbox/share/misc/pci_vendors
  projects/make-check-sandbox/share/mk/bsd.dep.mk
  projects/make-check-sandbox/share/mk/bsd.obj.mk
  projects/make-check-sandbox/share/mk/bsd.stand.mk
  projects/make-check-sandbox/sys/amd64/amd64/genassym.c
  projects/make-check-sandbox/sys/amd64/linux/linux_sysvec.c
  projects/make-check-sandbox/sys/amd64/linux32/linux32_sysvec.c
  projects/make-check-sandbox/sys/arm/allwinner/clkng/ccu_a64.c
  projects/make-check-sandbox/sys/arm/arm/mpcore_timer.c
  projects/make-check-sandbox/sys/arm/arm/pmap-v6.c
  projects/make-check-sandbox/sys/arm/conf/GENERIC
  projects/make-check-sandbox/sys/arm/freescale/imx/imx_i2c.c
  projects/make-check-sandbox/sys/arm/include/pte-v6.h
  projects/make-check-sandbox/sys/arm/include/ucontext.h
  projects/make-check-sandbox/sys/arm/mv/mv_machdep.c
  projects/make-check-sandbox/sys/arm64/arm64/trap.c
  projects/make-check-sandbox/sys/boot/efi/libefi/efinet.c
  projects/make-check-sandbox/sys/cam/ata/ata_da.c
  projects/make-check-sandbox/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/make-check-sandbox/sys/compat/cloudabi/cloudabi_fd.c
  projects/make-check-sandbox/sys/compat/cloudabi/cloudabi_mem.c
  projects/make-check-sandbox/sys/compat/cloudabi/cloudabi_sock.c
  projects/make-check-sandbox/sys/compat/cloudabi/cloudabi_util.h
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_proto.h
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_sock.c
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_syscall.h
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_syscalls.c
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_sysent.c
  projects/make-check-sandbox/sys/compat/cloudabi32/cloudabi32_systrace_args.c
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_sock.c
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/make-check-sandbox/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/make-check-sandbox/sys/compat/linux/linux_vdso.c
  projects/make-check-sandbox/sys/compat/linux/linux_vdso.h
  projects/make-check-sandbox/sys/compat/linuxkpi/common/include/linux/clocksource.h
  projects/make-check-sandbox/sys/compat/linuxkpi/common/src/linux_hrtimer.c
  projects/make-check-sandbox/sys/conf/NOTES
  projects/make-check-sandbox/sys/conf/files
  projects/make-check-sandbox/sys/conf/kern.post.mk
  projects/make-check-sandbox/sys/conf/options
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi32_types.h
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi64_types.h
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_types_common.h
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_vdso_i686.S
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
  projects/make-check-sandbox/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
  projects/make-check-sandbox/sys/contrib/cloudabi/syscalls32.master
  projects/make-check-sandbox/sys/contrib/cloudabi/syscalls64.master
  projects/make-check-sandbox/sys/contrib/dev/acpica/acpica_prep.sh
  projects/make-check-sandbox/sys/contrib/dev/acpica/changes.txt
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/acfileio.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/adisasm.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/adwalk.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/ahpredef.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/ahtable.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/dmtable.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslbtypes.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslcstyle.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslexternal.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslhelp.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslhelpers.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslkeywords.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asllength.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslload.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslmethod.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslpld.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslprimaries.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslprintf.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslresources.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslsupport.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asltokens.y
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asltree.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/cvcompiler.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/cvdisasm.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/cvparser.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/compiler/prmacros.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/executer/excreate.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/executer/exmisc.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/executer/exoparg2.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/hardware/hwregs.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/namespace/nsinit.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/parser/psloop.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/resources/rsxface.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/tables/tbdata.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/tables/tbutils.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/tables/tbxface.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/tables/tbxfload.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/uthex.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utmath.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utobject.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utresrc.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utstate.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/components/utilities/uttrack.c
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acapps.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acdisasm.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acdispat.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/aclocal.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acnames.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acobject.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acpi.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acpixf.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/actables.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/actbl.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/actbl2.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/actypes.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/acutils.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/make-check-sandbox/sys/contrib/dev/acpica/include/platform/acgcc.h
  projects/make-check-sandbox/sys/dev/acpica/acpi.c
  projects/make-check-sandbox/sys/dev/bnxt/bnxt.h
  projects/make-check-sandbox/sys/dev/bnxt/bnxt_hwrm.c
  projects/make-check-sandbox/sys/dev/bnxt/bnxt_hwrm.h
  projects/make-check-sandbox/sys/dev/bnxt/bnxt_sysctl.c
  projects/make-check-sandbox/sys/dev/bnxt/if_bnxt.c
  projects/make-check-sandbox/sys/dev/cxgbe/common/common.h
  projects/make-check-sandbox/sys/dev/cxgbe/common/t4_hw.c
  projects/make-check-sandbox/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/make-check-sandbox/sys/dev/cxgbe/t4_main.c
  projects/make-check-sandbox/sys/dev/cxgbe/t4_sge.c
  projects/make-check-sandbox/sys/dev/etherswitch/e6000sw/e6000sw.c
  projects/make-check-sandbox/sys/dev/etherswitch/e6000sw/e6000swreg.h
  projects/make-check-sandbox/sys/dev/ichwd/ichwd.c
  projects/make-check-sandbox/sys/dev/iicbus/ds1307.c
  projects/make-check-sandbox/sys/dev/iicbus/ds1307reg.h
  projects/make-check-sandbox/sys/dev/iicbus/ds3231.c
  projects/make-check-sandbox/sys/dev/iicbus/ds3231reg.h
  projects/make-check-sandbox/sys/dev/iicbus/iicbus.h
  projects/make-check-sandbox/sys/dev/iicbus/iiconf.c
  projects/make-check-sandbox/sys/dev/iicbus/iiconf.h
  projects/make-check-sandbox/sys/dev/isp/isp.c
  projects/make-check-sandbox/sys/dev/iwm/if_iwm.c
  projects/make-check-sandbox/sys/dev/iwm/if_iwm_scan.c
  projects/make-check-sandbox/sys/dev/iwm/if_iwm_sta.c
  projects/make-check-sandbox/sys/dev/iwm/if_iwm_util.c
  projects/make-check-sandbox/sys/dev/iwm/if_iwm_util.h
  projects/make-check-sandbox/sys/dev/iwm/if_iwmreg.h
  projects/make-check-sandbox/sys/dev/iwm/if_iwmvar.h
  projects/make-check-sandbox/sys/dev/ixgbe/ix_txrx.c
  projects/make-check-sandbox/sys/dev/ixl/ixl_txrx.c
  projects/make-check-sandbox/sys/dev/ksyms/ksyms.c
  projects/make-check-sandbox/sys/dev/mlx4/device.h
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_core/mlx4_main.c
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_core/mlx4_port.c
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_en/en.h
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_ib/mlx4_ib_mad.c
  projects/make-check-sandbox/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
  projects/make-check-sandbox/sys/dev/mlx4/stats.h
  projects/make-check-sandbox/sys/dev/mmc/mmc.c
  projects/make-check-sandbox/sys/dev/mmc/mmcsd.c
  projects/make-check-sandbox/sys/dev/mpr/mpr.c
  projects/make-check-sandbox/sys/dev/mpr/mpr_pci.c
  projects/make-check-sandbox/sys/dev/mpr/mpr_sas.c
  projects/make-check-sandbox/sys/dev/mpr/mpr_sas_lsi.c
  projects/make-check-sandbox/sys/dev/mpr/mpr_table.c
  projects/make-check-sandbox/sys/dev/mpr/mpr_table.h
  projects/make-check-sandbox/sys/dev/mpr/mprvar.h
  projects/make-check-sandbox/sys/dev/mps/mps.c
  projects/make-check-sandbox/sys/dev/mps/mps_pci.c
  projects/make-check-sandbox/sys/dev/mps/mps_sas_lsi.c
  projects/make-check-sandbox/sys/dev/mps/mps_table.c
  projects/make-check-sandbox/sys/dev/mps/mps_table.h
  projects/make-check-sandbox/sys/dev/mps/mpsvar.h
  projects/make-check-sandbox/sys/dev/ow/owc_gpiobus.c
  projects/make-check-sandbox/sys/dev/rtwn/if_rtwnreg.h
  projects/make-check-sandbox/sys/dev/rtwn/rtl8188e/r88e_rx.c
  projects/make-check-sandbox/sys/dev/rtwn/usb/rtwn_usb_attach.c
  projects/make-check-sandbox/sys/dev/rtwn/usb/rtwn_usb_ep.c
  projects/make-check-sandbox/sys/dev/rtwn/usb/rtwn_usb_rx.c
  projects/make-check-sandbox/sys/dev/rtwn/usb/rtwn_usb_var.h
  projects/make-check-sandbox/sys/dev/sdhci/sdhci.c
  projects/make-check-sandbox/sys/dev/sdhci/sdhci.h
  projects/make-check-sandbox/sys/dev/sdhci/sdhci_acpi.c
  projects/make-check-sandbox/sys/dev/sdhci/sdhci_pci.c
  projects/make-check-sandbox/sys/dev/uart/uart_bus_pci.c
  projects/make-check-sandbox/sys/dev/usb/wlan/if_rsu.c
  projects/make-check-sandbox/sys/dev/usb/wlan/if_zyd.c
  projects/make-check-sandbox/sys/dev/virtio/network/if_vtnetvar.h
  projects/make-check-sandbox/sys/fs/fdescfs/fdesc.h
  projects/make-check-sandbox/sys/fs/nfs/nfs_commonkrpc.c
  projects/make-check-sandbox/sys/fs/nfs/nfs_commonsubs.c
  projects/make-check-sandbox/sys/fs/nfs/nfscl.h
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clbio.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clport.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clrpcops.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clstate.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clvfsops.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfs_clvnops.c
  projects/make-check-sandbox/sys/fs/nfsclient/nfsmount.h
  projects/make-check-sandbox/sys/fs/nfsserver/nfs_fha_new.c
  projects/make-check-sandbox/sys/fs/smbfs/smbfs_io.c
  projects/make-check-sandbox/sys/i386/i386/genassym.c
  projects/make-check-sandbox/sys/i386/linux/linux_sysvec.c
  projects/make-check-sandbox/sys/kern/kern_linker.c
  projects/make-check-sandbox/sys/kern/kern_mutex.c
  projects/make-check-sandbox/sys/kern/kern_sig.c
  projects/make-check-sandbox/sys/kern/subr_pctrie.c
  projects/make-check-sandbox/sys/kern/subr_rtc.c
  projects/make-check-sandbox/sys/kern/subr_taskqueue.c
  projects/make-check-sandbox/sys/kern/vfs_bio.c
  projects/make-check-sandbox/sys/mips/conf/TL-WDR4300
  projects/make-check-sandbox/sys/modules/i2c/Makefile
  projects/make-check-sandbox/sys/net/if_enc.c
  projects/make-check-sandbox/sys/net/if_enc.h
  projects/make-check-sandbox/sys/net/if_lagg.c
  projects/make-check-sandbox/sys/net/if_stf.c
  projects/make-check-sandbox/sys/net/iflib.c
  projects/make-check-sandbox/sys/net/iflib.h
  projects/make-check-sandbox/sys/net/route.c
  projects/make-check-sandbox/sys/netinet/cc/cc_cdg.c
  projects/make-check-sandbox/sys/netinet/cc/cc_chd.c
  projects/make-check-sandbox/sys/netinet/cc/cc_cubic.c
  projects/make-check-sandbox/sys/netinet/cc/cc_dctcp.c
  projects/make-check-sandbox/sys/netinet/cc/cc_htcp.c
  projects/make-check-sandbox/sys/netinet/cc/cc_newreno.c
  projects/make-check-sandbox/sys/netinet/ip_output.c
  projects/make-check-sandbox/sys/netinet/sctp_indata.c
  projects/make-check-sandbox/sys/netinet/tcp_input.c
  projects/make-check-sandbox/sys/netinet/tcp_stacks/fastpath.c
  projects/make-check-sandbox/sys/netinet6/ip6_output.c
  projects/make-check-sandbox/sys/netipsec/ipsec.h
  projects/make-check-sandbox/sys/netipsec/ipsec_input.c
  projects/make-check-sandbox/sys/netipsec/ipsec_output.c
  projects/make-check-sandbox/sys/nfs/nfs_fha.c
  projects/make-check-sandbox/sys/nfs/nfs_fha.h
  projects/make-check-sandbox/sys/nfs/nfs_nfssvc.c
  projects/make-check-sandbox/sys/nfs/nfssvc.h
  projects/make-check-sandbox/sys/sys/ata.h
  projects/make-check-sandbox/sys/sys/clock.h
  projects/make-check-sandbox/sys/sys/copyright.h
  projects/make-check-sandbox/sys/sys/param.h
  projects/make-check-sandbox/sys/sys/pctrie.h
  projects/make-check-sandbox/sys/sys/taskqueue.h
  projects/make-check-sandbox/sys/sys/time.h
  projects/make-check-sandbox/sys/ufs/ffs/ffs_snapshot.c
  projects/make-check-sandbox/sys/vm/vnode_pager.c
  projects/make-check-sandbox/sys/vm/vnode_pager.h
  projects/make-check-sandbox/sys/x86/x86/stack_machdep.c
  projects/make-check-sandbox/tests/sys/file/newfileops_on_fork_test.c
  projects/make-check-sandbox/tests/sys/geom/class/gate/ggate_test.sh
  projects/make-check-sandbox/tools/tools/nanobsd/defaults.sh
  projects/make-check-sandbox/tools/tools/nanobsd/legacy.sh
  projects/make-check-sandbox/tools/tools/net80211/wlanwds/wlanwds.c
  projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd
  projects/make-check-sandbox/usr.bin/grep/util.c
  projects/make-check-sandbox/usr.bin/indent/args.c
  projects/make-check-sandbox/usr.bin/indent/indent.1
  projects/make-check-sandbox/usr.bin/indent/indent.c
  projects/make-check-sandbox/usr.bin/indent/indent_globs.h
  projects/make-check-sandbox/usr.bin/indent/io.c
  projects/make-check-sandbox/usr.bin/indent/pr_comment.c
  projects/make-check-sandbox/usr.bin/mandoc/Makefile
  projects/make-check-sandbox/usr.bin/netstat/Makefile
  projects/make-check-sandbox/usr.bin/netstat/main.c
  projects/make-check-sandbox/usr.bin/netstat/netstat.h
  projects/make-check-sandbox/usr.bin/truss/syscalls.c
  projects/make-check-sandbox/usr.bin/w/w.c
  projects/make-check-sandbox/usr.sbin/acpi/acpidb/Makefile
  projects/make-check-sandbox/usr.sbin/acpi/iasl/Makefile
  projects/make-check-sandbox/usr.sbin/bhyve/pci_e82545.c
  projects/make-check-sandbox/usr.sbin/bhyve/vga.c   (contents, props changed)
  projects/make-check-sandbox/usr.sbin/binmiscctl/binmiscctl.c
  projects/make-check-sandbox/usr.sbin/bsdinstall/scripts/zfsboot
  projects/make-check-sandbox/usr.sbin/mpsutil/mps_cmd.c
  projects/make-check-sandbox/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
Directory Properties:
  projects/make-check-sandbox/   (props changed)
  projects/make-check-sandbox/cddl/   (props changed)
  projects/make-check-sandbox/cddl/contrib/opensolaris/   (props changed)
  projects/make-check-sandbox/contrib/compiler-rt/   (props changed)
  projects/make-check-sandbox/contrib/ipfilter/   (props changed)
  projects/make-check-sandbox/contrib/libarchive/   (props changed)
  projects/make-check-sandbox/contrib/libc++/   (props changed)
  projects/make-check-sandbox/contrib/llvm/   (props changed)
  projects/make-check-sandbox/contrib/llvm/tools/clang/   (props changed)
  projects/make-check-sandbox/contrib/llvm/tools/lld/   (props changed)
  projects/make-check-sandbox/contrib/llvm/tools/lldb/   (props changed)
  projects/make-check-sandbox/contrib/mdocml/   (props changed)
  projects/make-check-sandbox/contrib/netbsd-tests/   (props changed)
  projects/make-check-sandbox/sys/cddl/contrib/opensolaris/   (props changed)
  projects/make-check-sandbox/sys/contrib/dev/acpica/   (props changed)

Modified: projects/make-check-sandbox/Makefile
==============================================================================

--- projects/make-check-sandbox/Makefile	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/Makefile	Mon Jul 31 23:04:12 2017	(r321831)
@@ -441,14 +441,22 @@ TARGET_ARCHES_${target}?= ${target}
 
 MAKE_PARAMS_riscv?=	CROSS_TOOLCHAIN=riscv64-gcc
 
-# XXX Remove riscv from universe if the required toolchain package is missing.
-.if !exists(/usr/local/share/toolchains/riscv64-gcc.mk) && ${TARGETS:Mriscv}
-_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Nriscv}
-universe: universe_riscv_skip .PHONY
-universe_epilogue: universe_riscv_skip .PHONY
-universe_riscv_skip: universe_prologue .PHONY
-	@echo ">> riscv skipped - install riscv64-xtoolchain-gcc port or package to build"
+# XXX Remove architectures only supported by external toolchain from universe
+# if required toolchain packages are missing.
+TOOLCHAINS_riscv=	riscv64
+.for target in riscv
+.if ${_UNIVERSE_TARGETS:M${target}}
+.for toolchain in ${TOOLCHAINS_${target}}
+.if !exists(/usr/local/share/toolchains/${toolchain}-gcc.mk)
+_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:N${target}}
+universe: universe_${toolchain}_skip .PHONY
+universe_epilogue: universe_${toolchain}_skip .PHONY
+universe_${toolchain}_skip: universe_prologue .PHONY
+	@echo ">> ${target} skipped - install ${toolchain}-xtoolchain-gcc port or package to build"
 .endif
+.endfor
+.endif
+.endfor
 
 .if defined(UNIVERSE_TARGET)
 MAKE_JUST_WORLDS=	YES

Modified: projects/make-check-sandbox/Makefile.inc1
==============================================================================
--- projects/make-check-sandbox/Makefile.inc1	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/Makefile.inc1	Mon Jul 31 23:04:12 2017	(r321831)
@@ -624,8 +624,7 @@ XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTM
 # combined with --sysroot.
 XCFLAGS+=	-B${WORLDTMP}/usr/lib
 # Force using libc++ for external GCC.
-# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800
+.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++
 .endif
@@ -761,6 +760,14 @@ _worldtmp: .PHONY
 	rm -rf ${LIBCOMPATTMP}
 .endif
 .else
+	@echo ">>> Deleting stale files in build tree..."
+	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
+	    delete-old delete-old-libs >/dev/null
+.if defined(LIBCOMPAT)
+	${_+_}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++
@@ -770,7 +777,6 @@ _worldtmp: .PHONY
 	fi
 .endfor
 .endif	# ${USING_SYSTEM_COMPILER} == "yes"
-.endif	# !defined(NO_CLEAN)
 
 # Our current approach to dependency tracking cannot cope with certain source
 # tree changes, particularly with respect to removing source files and
@@ -813,16 +819,9 @@ _worldtmp: .PHONY
 	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
 .endif
 .endfor
-# 20170724 remove stale lib/clang/libllvm/Options.inc file, of which there are
-# two different versions after r308421, one for llvm-lib, one for llvm-dlltool
-.for d in ${OBJTREE} ${WORLDTMP}
-.for f in ${d}${.CURDIR}/lib/clang/libllvm/Options.inc
-.if exists(${f}) || exists(${f}.d)
-	@echo Removing stale generated ${f} files
-	@rm -f ${f} ${f}.d
-.endif
-.endfor
-.endfor
+
+.endif	# !defined(NO_CLEAN)
+
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
@@ -2337,11 +2336,12 @@ _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
 _cddl_lib_libuutil= cddl/lib/libuutil
+.if ${MK_ZFS} != "no"
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
+cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+.endif
 _cddl_lib_libctf= cddl/lib/libctf
 _cddl_lib= cddl/lib
-cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
-cddl/lib/libzfs__L: lib/libgeom__L
 cddl/lib/libctf__L: lib/libz__L
 .endif
 # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built

Modified: projects/make-check-sandbox/UPDATING
==============================================================================
--- projects/make-check-sandbox/UPDATING	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/UPDATING	Mon Jul 31 23:04:12 2017	(r321831)
@@ -51,6 +51,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170728:
+	As of r321665, an NFSv4 server configuration that services
+	Kerberos mounts or clients that do not support the uid/gid in
+	owner/owner_group string capability, must explicitly enable
+	the nfsuserd daemon by adding nfsuserd_enable="YES" to the
+	machine's /etc/rc.conf file.
+
 20170722:
 	Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 5.0.0.
 	Please see the 20141231 entry below for information about prerequisites

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh	Mon Jul 31 23:04:12 2017	(r321831)
@@ -38,6 +38,14 @@
 ##
 
 
+reader()
+{
+	while true
+	do
+		sleep 0.1
+		cat /etc/motd > /dev/null
+	done
+}
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
@@ -46,11 +54,16 @@ fi
 
 dtrace=$1
 
+reader &
+child=$!
+
 $dtrace -qwf read'{chill(15); printf("Done chilling"); exit(0);}'
 status=$?
 
 if [ "$status" -ne 0 ]; then
 	echo $tst: dtrace failed
 fi
+
+kill $child
 
 exit $status

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh	Mon Jul 31 23:04:12 2017	(r321831)
@@ -39,6 +39,15 @@
 ##
 
 
+reader()
+{
+	while true
+	do
+		sleep 0.1
+		cat /etc/motd > /dev/null
+	done
+}
+
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
@@ -46,6 +55,9 @@ fi
 
 dtrace=$1
 
+reader &
+child=$!
+
 $dtrace -qZf wassup'{printf("Iamkool");}' \
 -qf read'{printf("I am done"); exit(0);}'
 
@@ -54,5 +66,7 @@ status=$?
 if [ "$status" -ne 0 ]; then
 	echo $tst: dtrace failed
 fi
+
+kill $child
 
 exit $status

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d	Mon Jul 31 23:04:12 2017	(r321831)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #pragma D option quiet
+#pragma D option dynvarsize=2m
 
 /*
  * This test verifies that the basename() and dirname() functions are working
@@ -54,12 +55,16 @@ BEGIN
 	dir[i++] = "f";
 	dir[i++] = "f/";
 	dir[i++] = "/////";
+	/*
+	 * basename(3) and basename(1) return different results for the empty
+	 * string on FreeBSD, so we need special handling.
 	dir[i++] = "";
+	*/
 
 	end = i;
 	i = 0;
 
-	printf("#!/usr/bin/ksh\n\n");
+	printf("#!/usr/bin/env ksh\n\n");
 }
 
 tick-1ms
@@ -83,5 +88,19 @@ tick-1ms
 tick-1ms
 /i == end/
 {
+	dir[i] = "";
+	printf("if [ \"`basename \"%s\"`\" != \"%s\" -a \".\" != \"%s\" ]; then\n",
+	    dir[i], basename(dir[i]), basename(dir[i]));
+	printf("	echo \"basename(\\\"%s\\\") is \\\"%s\\\"; ",
+	    dir[i], basename(dir[i]));
+	printf("expected \\\"`basename \"%s\"`\\\" or \\\".\\\"\"\n", dir[i]);
+	printf("fi\n\n");
+	printf("if [ `dirname \"%s\"` != \"%s\" ]; then\n",
+	    dir[i], dirname(dir[i]));
+	printf("	echo \"dirname(\\\"%s\\\") is \\\"%s\\\"; ",
+	    dir[i], dirname(dir[i]));
+	printf("expected \\\"`dirname \"%s\"`\"\\\"\n", dir[i]);
+	printf("fi\n\n");
+
 	exit(0);
 }

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out	Mon Jul 31 23:04:12 2017	(r321831)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
 
 if [ `basename "/foo/bar/baz"` != "baz" ]; then
 	echo "basename(\"/foo/bar/baz\") is \"baz\"; expected \"`basename "/foo/bar/baz"`"\"
@@ -152,8 +152,8 @@ if [ `dirname "/////"` != "/" ]; then
 	echo "dirname(\"/////\") is \"/\"; expected \"`dirname "/////"`"\"
 fi
 
-if [ `basename ""` != "." ]; then
-	echo "basename(\"\") is \".\"; expected \"`basename ""`"\"
+if [ "`basename ""`" != "." -a "." != "." ]; then
+	echo "basename(\"\") is \".\"; expected \"`basename ""`\" or \".\""
 fi
 
 if [ `dirname ""` != "." ]; then

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d	Mon Jul 31 23:04:12 2017	(r321831)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #pragma D option quiet
+#pragma D option dynvarsize=2m
 
 BEGIN
 {

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh	Mon Jul 31 23:04:12 2017	(r321831)
@@ -31,11 +31,12 @@ fi
 
 dtrace=$1
 
-$dtrace -ln 'syscall::*$1:entry' read | awk '{print $(NF-1),$NF}' | sort
-$dtrace -ln 'syscall::$1*:entry' read | awk '{print $(NF-1),$NF}' | sort
-$dtrace -ln 'syscall::re$1*:entry' ad | awk '{print $(NF-1),$NF}' | sort
-$dtrace -ln 'syscall::$1l*:entry' read | awk '{print $(NF-1),$NF}' | sort
-$dtrace -ln 'syscall::p$1[0-9][0-9]:entry' read | awk '{print $(NF-1),$NF}' | \
- sort
+$dtrace -ln 'syscall:freebsd:*$1:entry' read | \
+	awk '{print $(NF-1),$NF}' | grep -v -E 'compat.\.' | sort
+$dtrace -ln 'syscall:freebsd:$1*:entry' read | awk '{print $(NF-1),$NF}' | sort
+$dtrace -ln 'syscall:freebsd:re$1*:entry' ad | awk '{print $(NF-1),$NF}' | sort
+$dtrace -ln 'syscall:freebsd:$1l*:entry' read | awk '{print $(NF-1),$NF}' | sort
+$dtrace -ln 'syscall:freebsd:w$1[0-9]:entry' ait | \
+	awk '{print $(NF-1),$NF}' | sort
 
 exit $status

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out	Mon Jul 31 23:04:12 2017	(r321831)
@@ -1,15 +1,22 @@
 FUNCTION NAME
+aio_read entry
+obs_vread entry
 pread entry
 read entry
+rtprio_thread entry
 FUNCTION NAME
 read entry
 readlink entry
+readlinkat entry
 readv entry
 FUNCTION NAME
 read entry
 readlink entry
+readlinkat entry
 readv entry
 FUNCTION NAME
 readlink entry
+readlinkat entry
 FUNCTION NAME
-pread64 entry
+wait4 entry
+wait6 entry

Copied: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c (from r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c	Mon Jul 31 23:04:12 2017	(r321831, copy of r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.c)
@@ -0,0 +1,47 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2017 Li-Wen Hsu <lwhsu at FreeBSD.org>
+ */
+
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+
+    sigset_t set;
+    siginfo_t info;
+    struct timespec timeout;
+
+    (void)sigemptyset(&set);
+    (void)sigaddset(&set, SIGHUP);
+    timeout.tv_sec = 1;
+    timeout.tv_nsec = 0;
+
+    for (;;)
+        (void)sigtimedwait(&set, &info, &timeout);
+
+    return (0);
+}

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d	Mon Jul 31 23:04:12 2017	(r321831)
@@ -45,6 +45,7 @@ BEGIN
 }
 
 syscall::*wait*:entry
+/pid == $1/
 {
 	exit(0);
 }

Modified: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.d
==============================================================================
--- projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.d	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.d	Mon Jul 31 23:04:12 2017	(r321831)
@@ -39,6 +39,7 @@
 BEGIN
 {
 	i = 0;
+	notused = $1;
 }
 
 syscall::open:entry

Copied: projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe (from r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe	Mon Jul 31 23:04:12 2017	(r321831, copy of r321829, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe)
@@ -0,0 +1,30 @@
+#!/usr/bin/env ksh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2017 Li-Wen Hsu <lwhsu at FreeBSD.org>
+
+while true
+do
+	sleep 0.1
+	cat /etc/motd > /dev/null
+done

Modified: projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
==============================================================================
--- projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Mon Jul 31 23:04:12 2017	(r321831)
@@ -32,6 +32,7 @@ TESTEXES= \
 
 
 CFILES= \
+     tst.probestar.c  \
 
 
 

Modified: projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
==============================================================================
--- projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Mon Jul 31 23:04:12 2017	(r321831)
@@ -68,6 +68,7 @@ ${PACKAGE}FILES= \
      tst.zerosize.d  \
 
 TESTEXES= \
+     tst.NoSpecBuffer.exe  \
 
 
 CFILES= \

Modified: projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
==============================================================================
--- projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/tools/dtest.sh	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/cddl/usr.sbin/dtrace/tests/tools/dtest.sh	Mon Jul 31 23:04:12 2017	(r321831)
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # $FreeBSD$
 
 usage()
@@ -83,6 +85,12 @@ runtest()
         retval=1
         ;;
     esac
+
+    if [ $retval -eq 0 ] && \
+        head -n 1 $STDOUT | grep -q -E '^#!/.*ksh$'; then
+        ksh $STDOUT
+        retval=$?
+    fi
 
     return $retval
 }

Copied: projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfattach (from r321829, head/contrib/hyperv/tools/scripts/hyperv_vfattach)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfattach	Mon Jul 31 23:04:12 2017	(r321831, copy of r321829, head/contrib/hyperv/tools/scripts/hyperv_vfattach)
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+#
+# If transparent VF is enabled, don't do anything.
+#
+
+sysctl -n hw.hn.vf_transparent > /dev/null 2>&1
+if [ $? -ne 0 ]
+then
+	# Old kernel; no transparent VF.
+	vf_transparent=0
+else
+	vf_transparent=`sysctl -n hw.hn.vf_transparent`
+fi
+
+if [ $vf_transparent -ne 0 ]
+then
+	# Transparent VF; done!
+	exit 0
+fi
+
+iface=$1
+delay=$2
+
+if [ $delay -gt 0 ]
+then
+	#
+	# Delayed VF up.
+	#
+	sleep $delay
+	ifconfig $iface up
+	# Done!
+	exit $?
+fi
+
+#
+# Check to see whether $iface is a VF or not.
+# If $iface is a VF, bring it up now.
+#
+
+# for hyperv_vf_delay
+. /etc/rc.conf
+
+sysctl -n hw.hn.vflist > /dev/null 2>&1
+if [ $? -ne 0 ]
+then
+	# Old kernel; nothing could be done properly.
+	exit 0
+fi
+vf_list=`sysctl -n hw.hn.vflist`
+
+for vf in $vf_list
+do
+	if [ $vf = $iface ]
+	then
+		#
+		# Linger a little bit (at least 2 seconds) mainly to
+		# make sure that $iface is fully attached.
+		#
+		# NOTE:
+		# In Azure hyperv_vf_delay should be configured to a
+		# large value, e.g. 120 seconds, to avoid racing cloud
+		# agent goofs.
+		#
+		test $hyperv_vf_delay -ge 2 > /dev/null 2>&1
+		if [ $? -ne 0 ]
+		then
+			hyperv_vf_delay=2
+		fi
+		#
+		# NOTE:
+		# "(sleep ..; ifconfig .. up) > /dev/null 2>&1 &"
+		# does _not_ work.
+		#
+		daemon -f /usr/libexec/hyperv/hyperv_vfattach \
+		    $iface $hyperv_vf_delay
+		break
+	fi
+done

Copied: projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfup (from r321829, head/contrib/hyperv/tools/scripts/hyperv_vfup)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/contrib/hyperv/tools/scripts/hyperv_vfup	Mon Jul 31 23:04:12 2017	(r321831, copy of r321829, head/contrib/hyperv/tools/scripts/hyperv_vfup)
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+. /etc/rc.subr
+. /etc/network.subr
+
+load_rc_config netif
+
+#
+# Customized per-interface setup, e.g. hyperv_vfup.hn1
+#
+# NOTE-CUSTOMIZE:
+# Comment this out, if this script is used as template
+# for the customized per-interface setup.
+#
+if [ -f /usr/libexec/hyperv/hyperv_vfup.$1 ]
+then
+	/usr/libexec/hyperv/hyperv_vfup.$1
+	exit $?
+fi
+
+# NOTE-CUSTOMIZE:
+#hn=${0##*.}
+hn=$1
+hn_unit=`echo $hn | sed 's/[^0-9]*//g'`
+
+vf=`sysctl -n dev.hn.$hn_unit.vf`
+if [ ! $vf ]
+then
+	# Race happened; VF was removed, before we ran.
+	echo "$hn: VF was detached"
+	exit 0
+fi
+
+#
+# Create laggX for hnX.
+# Add VF and hnX to laggX.
+#
+
+lagg=lagg$hn_unit
+
+ifconfig $lagg > /dev/null 2>&1
+if [ $? -ne 0 ]
+then
+	#
+	# No laggX, create it now.
+	#
+	ifconfig $lagg create > /dev/null 2>&1
+	if [ $? -ne 0 ]
+	then
+		echo "$lagg creation failed"
+		exit 1
+	fi
+
+	#
+	# Configure laggX (failover), add hnX and VF to it.
+	#
+	ifconfig $lagg laggproto failover laggport $hn laggport $vf
+	ifconfig $lagg inet6 no_dad
+
+	#
+	# Stop dhclient on hnX, if any.
+	#
+	pidfile=/var/run/dhclient.$hn.pid
+	if [ -f $pidfile ]
+	then
+		kill -TERM `cat $pidfile`
+	fi
+
+	#
+	# Remove all configured IPv4 addresses on hnX, e.g.
+	# configured by dhclient.  laggX will take over the
+	# network operations.
+	#
+	while true
+	do
+		ifconfig $hn -alias > /dev/null 2>&1
+		if [ $? -ne 0 ]
+		then
+			break
+		fi
+	done
+
+	# TODO: Remove IPv6 addresses on hnX
+
+	#
+	# Use hnX's configuration for laggX
+	#
+	# NOTE-CUSTOMIZE:
+	# If this script is used as template for the customized
+	# per-interface setup, replace this with whatever you
+	# want to do with the laggX.
+	#
+	if dhcpif $hn;
+	then
+		ifconfig $lagg up
+		if syncdhcpif $hn;
+		then
+			dhclient $lagg
+		else
+			dhclient -b $lagg
+		fi
+	else
+		ifconfig_args=`ifconfig_getargs $hn`
+		if [ -n "$ifconfig_args" ]
+		then
+			ifconfig $lagg $ifconfig_args
+		fi
+	fi
+else
+	#
+	# laggX exists.  Check whether VF was there or not.
+	# If VF was not added to laggX, add it now.
+	#
+	ifconfig $lagg | grep "laggport: $vf" > /dev/null 2>&1
+	if [ $? -ne 0 ]
+	then
+		ifconfig $lagg laggport $vf
+	fi
+fi

Modified: projects/make-check-sandbox/contrib/ipfilter/arc4random.c
==============================================================================
--- projects/make-check-sandbox/contrib/ipfilter/arc4random.c	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/ipfilter/arc4random.c	Mon Jul 31 23:04:12 2017	(r321831)
@@ -109,9 +109,9 @@ arc4_randomstir (void)
 	/*
 	 * Throw away the first N words of output, as suggested in the
 	 * paper "Weaknesses in the Key Scheduling Algorithm of RC4"
-	 * by Fluher, Mantin, and Shamir.  (N = 256 in our case.)
+	 * by Fluher, Mantin, and Shamir.  (N = 768 in our case.)
 	 */
-	for (n = 0; n < 256*4; n++)
+	for (n = 0; n < 768*4; n++)
 		arc4_randbyte();
 	MUTEX_EXIT(&arc4_mtx);
 }

Modified: projects/make-check-sandbox/contrib/libarchive/libarchive/archive_cryptor_private.h
==============================================================================
--- projects/make-check-sandbox/contrib/libarchive/libarchive/archive_cryptor_private.h	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/libarchive/libarchive/archive_cryptor_private.h	Mon Jul 31 23:04:12 2017	(r321831)
@@ -64,7 +64,7 @@ typedef struct {
 } archive_crypto_ctx;
 
 #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-#include <Bcrypt.h>
+#include <bcrypt.h>
 
 /* Common in other bcrypt implementations, but missing from VS2008. */
 #ifndef BCRYPT_SUCCESS

Modified: projects/make-check-sandbox/contrib/libarchive/libarchive/archive_write_set_format_ar.c
==============================================================================
--- projects/make-check-sandbox/contrib/libarchive/libarchive/archive_write_set_format_ar.c	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/libarchive/libarchive/archive_write_set_format_ar.c	Mon Jul 31 23:04:12 2017	(r321831)
@@ -374,13 +374,14 @@ archive_write_ar_data(struct archive_write *a, const v
 			return (ARCHIVE_WARN);
 		}
 
-		ar->strtab = (char *)malloc(s);
+		ar->strtab = (char *)malloc(s + 1);
 		if (ar->strtab == NULL) {
 			archive_set_error(&a->archive, ENOMEM,
 			    "Can't allocate strtab buffer");
 			return (ARCHIVE_FATAL);
 		}
-		strncpy(ar->strtab, buff, s);
+		memcpy(ar->strtab, buff, s);
+		ar->strtab[s] = '\0';
 		ar->has_strtab = 1;
 	}
 

Modified: projects/make-check-sandbox/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h	Mon Jul 31 23:04:12 2017	(r321831)
@@ -40,7 +40,8 @@ class TargetRegisterInfo;
 /// This is convenient because std::bitset does not have a constructor
 /// with an initializer list of set bits.
 ///
-/// Each InstructionSelector subclass should define a PredicateBitset class with:
+/// Each InstructionSelector subclass should define a PredicateBitset class
+/// with:
 ///   const unsigned MAX_SUBTARGET_PREDICATES = 192;
 ///   using PredicateBitset = PredicateBitsetImpl<MAX_SUBTARGET_PREDICATES>;
 /// and updating the constant to suit the target. Tablegen provides a suitable
@@ -102,7 +103,8 @@ enum {
   /// - OpIdx - Operand index
   /// - Expected integer
   GIM_CheckConstantInt,
-  /// Check the operand is a specific literal integer (i.e. MO.isImm() or MO.isCImm() is true).
+  /// Check the operand is a specific literal integer (i.e. MO.isImm() or
+  /// MO.isCImm() is true).
   /// - InsnID - Instruction ID
   /// - OpIdx - Operand index
   /// - Expected integer

Modified: projects/make-check-sandbox/contrib/llvm/include/llvm/Support/CommandLine.h
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/include/llvm/Support/CommandLine.h	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/include/llvm/Support/CommandLine.h	Mon Jul 31 23:04:12 2017	(r321831)
@@ -66,15 +66,12 @@ bool ParseCommandLineOptions(int argc, const char *con
 void ParseEnvironmentOptions(const char *progName, const char *envvar,
                              const char *Overview = "");
 
-// Function pointer type for printing version information.
-using VersionPrinterTy = std::function<void(raw_ostream &)>;
-
 ///===---------------------------------------------------------------------===//
 /// SetVersionPrinter - Override the default (LLVM specific) version printer
 ///                     used to print out the version when --version is given
 ///                     on the command line. This allows other systems using the
 ///                     CommandLine utilities to print their own version string.
-void SetVersionPrinter(VersionPrinterTy func);
+void SetVersionPrinter(void (*func)());
 
 ///===---------------------------------------------------------------------===//
 /// AddExtraVersionPrinter - Add an extra printer to use in addition to the
@@ -83,7 +80,7 @@ void SetVersionPrinter(VersionPrinterTy func);
 ///                          which will be called after the basic LLVM version
 ///                          printing is complete. Each can then add additional
 ///                          information specific to the tool.
-void AddExtraVersionPrinter(VersionPrinterTy func);
+void AddExtraVersionPrinter(void (*func)());
 
 // PrintOptionValues - Print option values.
 // With -print-options print the difference between option values and defaults.

Modified: projects/make-check-sandbox/contrib/llvm/include/llvm/Support/TargetRegistry.h
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/include/llvm/Support/TargetRegistry.h	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/include/llvm/Support/TargetRegistry.h	Mon Jul 31 23:04:12 2017	(r321831)
@@ -599,7 +599,7 @@ struct TargetRegistry {
 
   /// printRegisteredTargetsForVersion - Print the registered targets
   /// appropriately for inclusion in a tool's version output.
-  static void printRegisteredTargetsForVersion(raw_ostream &OS);
+  static void printRegisteredTargetsForVersion();
 
   /// @name Registry Access
   /// @{

Modified: projects/make-check-sandbox/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h	Mon Jul 31 23:04:12 2017	(r321831)
@@ -531,8 +531,10 @@ Value *createTargetReduction(IRBuilder<> &B, const Tar
 
 /// Get the intersection (logical and) of all of the potential IR flags
 /// of each scalar operation (VL) that will be converted into a vector (I).
+/// If OpValue is non-null, we only consider operations similar to OpValue
+/// when intersecting.
 /// Flag set: NSW, NUW, exact, and all of fast-math.
-void propagateIRFlags(Value *I, ArrayRef<Value *> VL);
+void propagateIRFlags(Value *I, ArrayRef<Value *> VL, Value *OpValue = nullptr);
 
 } // end namespace llvm
 

Modified: projects/make-check-sandbox/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -4016,14 +4016,18 @@ static bool IsOperandAMemoryOperand(CallInst *CI, Inli
   return true;
 }
 
+// Max number of memory uses to look at before aborting the search to conserve
+// compile time.
+static constexpr int MaxMemoryUsesToScan = 20;
+
 /// Recursively walk all the uses of I until we find a memory use.
 /// If we find an obviously non-foldable instruction, return true.
 /// Add the ultimately found memory instructions to MemoryUses.
 static bool FindAllMemoryUses(
     Instruction *I,
     SmallVectorImpl<std::pair<Instruction *, unsigned>> &MemoryUses,
-    SmallPtrSetImpl<Instruction *> &ConsideredInsts,
-    const TargetLowering &TLI, const TargetRegisterInfo &TRI) {
+    SmallPtrSetImpl<Instruction *> &ConsideredInsts, const TargetLowering &TLI,
+    const TargetRegisterInfo &TRI, int SeenInsts = 0) {
   // If we already considered this instruction, we're done.
   if (!ConsideredInsts.insert(I).second)
     return false;
@@ -4036,8 +4040,12 @@ static bool FindAllMemoryUses(
 
   // Loop over all the uses, recursively processing them.
   for (Use &U : I->uses()) {
-    Instruction *UserI = cast<Instruction>(U.getUser());
+    // Conservatively return true if we're seeing a large number or a deep chain
+    // of users. This avoids excessive compilation times in pathological cases.
+    if (SeenInsts++ >= MaxMemoryUsesToScan)
+      return true;
 
+    Instruction *UserI = cast<Instruction>(U.getUser());
     if (LoadInst *LI = dyn_cast<LoadInst>(UserI)) {
       MemoryUses.push_back(std::make_pair(LI, U.getOperandNo()));
       continue;
@@ -4082,7 +4090,8 @@ static bool FindAllMemoryUses(
       continue;
     }
 
-    if (FindAllMemoryUses(UserI, MemoryUses, ConsideredInsts, TLI, TRI))
+    if (FindAllMemoryUses(UserI, MemoryUses, ConsideredInsts, TLI, TRI,
+                          SeenInsts))
       return true;
   }
 

Modified: projects/make-check-sandbox/contrib/llvm/lib/CodeGen/InlineSpiller.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/CodeGen/InlineSpiller.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/CodeGen/InlineSpiller.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -643,8 +643,11 @@ void InlineSpiller::reMaterializeAll() {
       Edit->eraseVirtReg(Reg);
       continue;
     }
-    assert((LIS.hasInterval(Reg) && !LIS.getInterval(Reg).empty()) &&
-           "Reg with empty interval has reference");
+
+    assert(LIS.hasInterval(Reg) &&
+           (!LIS.getInterval(Reg).empty() || !MRI.reg_nodbg_empty(Reg)) &&
+           "Empty and not used live-range?!");
+
     RegsToSpill[ResultPos++] = Reg;
   }
   RegsToSpill.erase(RegsToSpill.begin() + ResultPos, RegsToSpill.end());

Modified: projects/make-check-sandbox/contrib/llvm/lib/CodeGen/RegAllocBase.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/CodeGen/RegAllocBase.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/CodeGen/RegAllocBase.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -133,18 +133,19 @@ void RegAllocBase::allocatePhysRegs() {
     if (AvailablePhysReg)
       Matrix->assign(*VirtReg, AvailablePhysReg);
 
-    for (VirtRegVec::iterator I = SplitVRegs.begin(), E = SplitVRegs.end();
-         I != E; ++I) {
-      LiveInterval *SplitVirtReg = &LIS->getInterval(*I);
+    for (unsigned Reg : SplitVRegs) {
+      assert(LIS->hasInterval(Reg));
+
+      LiveInterval *SplitVirtReg = &LIS->getInterval(Reg);
       assert(!VRM->hasPhys(SplitVirtReg->reg) && "Register already assigned");
       if (MRI->reg_nodbg_empty(SplitVirtReg->reg)) {
+        assert(SplitVirtReg->empty() && "Non-empty but used interval");
         DEBUG(dbgs() << "not queueing unused  " << *SplitVirtReg << '\n');
         aboutToRemoveInterval(*SplitVirtReg);
         LIS->removeInterval(SplitVirtReg->reg);
         continue;
       }
       DEBUG(dbgs() << "queuing new interval: " << *SplitVirtReg << "\n");
-      assert(!SplitVirtReg->empty() && "expecting non-empty interval");
       assert(TargetRegisterInfo::isVirtualRegister(SplitVirtReg->reg) &&
              "expect split value in virtual register");
       enqueue(SplitVirtReg);

Modified: projects/make-check-sandbox/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -2965,7 +2965,12 @@ static inline bool isSETCCorConvertedSETCC(SDValue N) 
   else if (N.getOpcode() == ISD::SIGN_EXTEND)
     N = N.getOperand(0);
 
-  return (N.getOpcode() == ISD::SETCC);
+  if (isLogicalMaskOp(N.getOpcode()))
+    return isSETCCorConvertedSETCC(N.getOperand(0)) &&
+           isSETCCorConvertedSETCC(N.getOperand(1));
+
+  return (N.getOpcode() == ISD::SETCC ||
+          ISD::isBuildVectorOfConstantSDNodes(N.getNode()));
 }
 #endif
 
@@ -2973,28 +2978,20 @@ static inline bool isSETCCorConvertedSETCC(SDValue N) 
 // to ToMaskVT if needed with vector extension or truncation.
 SDValue DAGTypeLegalizer::convertMask(SDValue InMask, EVT MaskVT,
                                       EVT ToMaskVT) {
-  LLVMContext &Ctx = *DAG.getContext();
-
   // Currently a SETCC or a AND/OR/XOR with two SETCCs are handled.
-  unsigned InMaskOpc = InMask->getOpcode();
-
   // FIXME: This code seems to be too restrictive, we might consider
   // generalizing it or dropping it.
-  assert((InMaskOpc == ISD::SETCC ||
-          ISD::isBuildVectorOfConstantSDNodes(InMask.getNode()) ||
-          (isLogicalMaskOp(InMaskOpc) &&
-           isSETCCorConvertedSETCC(InMask->getOperand(0)) &&
-           isSETCCorConvertedSETCC(InMask->getOperand(1)))) &&
-         "Unexpected mask argument.");
+  assert(isSETCCorConvertedSETCC(InMask) && "Unexpected mask argument.");
 
   // Make a new Mask node, with a legal result VT.
   SmallVector<SDValue, 4> Ops;
   for (unsigned i = 0; i < InMask->getNumOperands(); ++i)
     Ops.push_back(InMask->getOperand(i));
-  SDValue Mask = DAG.getNode(InMaskOpc, SDLoc(InMask), MaskVT, Ops);
+  SDValue Mask = DAG.getNode(InMask->getOpcode(), SDLoc(InMask), MaskVT, Ops);
 
   // If MaskVT has smaller or bigger elements than ToMaskVT, a vector sign
   // extend or truncate is needed.
+  LLVMContext &Ctx = *DAG.getContext();
   unsigned MaskScalarBits = MaskVT.getScalarSizeInBits();
   unsigned ToMaskScalBits = ToMaskVT.getScalarSizeInBits();
   if (MaskScalarBits < ToMaskScalBits) {

Modified: projects/make-check-sandbox/contrib/llvm/lib/Option/OptTable.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/Option/OptTable.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/Option/OptTable.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -235,7 +235,9 @@ OptTable::findByPrefix(StringRef Cur, unsigned short D
       continue;
 
     for (int I = 0; In.Prefixes[I]; I++) {
-      std::string S = std::string(In.Prefixes[I]) + std::string(In.Name);
+      std::string S = std::string(In.Prefixes[I]) + std::string(In.Name) + "\t";
+      if (In.HelpText)
+        S += In.HelpText;
       if (StringRef(S).startswith(Cur))
         Ret.push_back(S);
     }

Modified: projects/make-check-sandbox/contrib/llvm/lib/Support/CommandLine.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/Support/CommandLine.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/Support/CommandLine.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -2039,9 +2039,9 @@ void CommandLineParser::printOptionValues() {
     Opts[i].second->printOptionValue(MaxArgLen, PrintAllOptions);
 }
 
-static VersionPrinterTy OverrideVersionPrinter = nullptr;
+static void (*OverrideVersionPrinter)() = nullptr;
 
-static std::vector<VersionPrinterTy> *ExtraVersionPrinters = nullptr;
+static std::vector<void (*)()> *ExtraVersionPrinters = nullptr;
 
 namespace {
 class VersionPrinter {
@@ -2081,7 +2081,7 @@ class VersionPrinter { (public)
       return;
 
     if (OverrideVersionPrinter != nullptr) {
-      OverrideVersionPrinter(outs());
+      (*OverrideVersionPrinter)();
       exit(0);
     }
     print();
@@ -2090,8 +2090,10 @@ class VersionPrinter { (public)
     // information.
     if (ExtraVersionPrinters != nullptr) {
       outs() << '\n';
-      for (auto I : *ExtraVersionPrinters)
-        I(outs());
+      for (std::vector<void (*)()>::iterator I = ExtraVersionPrinters->begin(),
+                                             E = ExtraVersionPrinters->end();
+           I != E; ++I)
+        (*I)();
     }
 
     exit(0);
@@ -2129,11 +2131,11 @@ void cl::PrintHelpMessage(bool Hidden, bool Categorize
 /// Utility function for printing version number.
 void cl::PrintVersionMessage() { VersionPrinterInstance.print(); }
 
-void cl::SetVersionPrinter(VersionPrinterTy func) { OverrideVersionPrinter = func; }
+void cl::SetVersionPrinter(void (*func)()) { OverrideVersionPrinter = func; }
 
-void cl::AddExtraVersionPrinter(VersionPrinterTy func) {
+void cl::AddExtraVersionPrinter(void (*func)()) {
   if (!ExtraVersionPrinters)
-    ExtraVersionPrinters = new std::vector<VersionPrinterTy>;
+    ExtraVersionPrinters = new std::vector<void (*)()>;
 
   ExtraVersionPrinters->push_back(func);
 }

Modified: projects/make-check-sandbox/contrib/llvm/lib/Support/ErrorHandling.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/Support/ErrorHandling.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/Support/ErrorHandling.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -169,7 +169,8 @@ void llvm::report_bad_alloc_error(const char *Reason, 
   // Don't call the normal error handler. It may allocate memory. Directly write
   // an OOM to stderr and abort.
   char OOMMessage[] = "LLVM ERROR: out of memory\n";
-  (void)::write(2, OOMMessage, strlen(OOMMessage));
+  ssize_t written = ::write(2, OOMMessage, strlen(OOMMessage));
+  (void)written;
   abort();
 #endif
 }

Modified: projects/make-check-sandbox/contrib/llvm/lib/Support/TargetRegistry.cpp
==============================================================================
--- projects/make-check-sandbox/contrib/llvm/lib/Support/TargetRegistry.cpp	Mon Jul 31 23:03:10 2017	(r321830)
+++ projects/make-check-sandbox/contrib/llvm/lib/Support/TargetRegistry.cpp	Mon Jul 31 23:04:12 2017	(r321831)
@@ -114,7 +114,7 @@ static int TargetArraySortFn(const std::pair<StringRef
   return LHS->first.compare(RHS->first);
 }
 
-void TargetRegistry::printRegisteredTargetsForVersion(raw_ostream &OS) {
+void TargetRegistry::printRegisteredTargetsForVersion() {

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