svn commit: r265006 - in projects/bmake: . cddl cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc cddl/contrib/opensolaris/cmd/d...

Sun Apr 27 08:13:47 UTC 2014

Author: sjg
Date: Sun Apr 27 08:13:43 2014
New Revision: 265006
URL: http://svnweb.freebsd.org/changeset/base/265006

Log:
  Merge head

Added:
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
     - copied unchanged from r264956, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
  projects/bmake/cddl/lib/tests/
     - copied from r264956, head/cddl/lib/tests/
  projects/bmake/cddl/sbin/tests/
     - copied from r264956, head/cddl/sbin/tests/
  projects/bmake/cddl/tests/
     - copied from r264956, head/cddl/tests/
  projects/bmake/cddl/usr.bin/tests/
     - copied from r264956, head/cddl/usr.bin/tests/
  projects/bmake/cddl/usr.sbin/tests/
     - copied from r264956, head/cddl/usr.sbin/tests/
  projects/bmake/lib/atf/common.mk
     - copied unchanged from r264956, head/lib/atf/common.mk
  projects/bmake/lib/atf/libatf-c++/Makefile.inc
     - copied unchanged from r264956, head/lib/atf/libatf-c++/Makefile.inc
  projects/bmake/lib/atf/libatf-c++/tests/
     - copied from r264956, head/lib/atf/libatf-c++/tests/
  projects/bmake/lib/atf/libatf-c/Makefile.inc
     - copied unchanged from r264956, head/lib/atf/libatf-c/Makefile.inc
  projects/bmake/lib/atf/libatf-c/tests/
     - copied from r264956, head/lib/atf/libatf-c/tests/
  projects/bmake/lib/atf/tests/
     - copied from r264956, head/lib/atf/tests/
  projects/bmake/lib/libbsdstat/
     - copied from r264956, head/lib/libbsdstat/
  projects/bmake/lib/libc/arm/aeabi/aeabi_vfp.h
     - copied unchanged from r264956, head/lib/libc/arm/aeabi/aeabi_vfp.h
  projects/bmake/lib/libc/arm/aeabi/aeabi_vfp_double.S
     - copied unchanged from r264956, head/lib/libc/arm/aeabi/aeabi_vfp_double.S
  projects/bmake/lib/libc/arm/aeabi/aeabi_vfp_float.S
     - copied unchanged from r264956, head/lib/libc/arm/aeabi/aeabi_vfp_float.S
  projects/bmake/lib/libc/arm/gen/fpgetmask_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpgetmask_vfp.c
  projects/bmake/lib/libc/arm/gen/fpgetround_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpgetround_vfp.c
  projects/bmake/lib/libc/arm/gen/fpgetsticky_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpgetsticky_vfp.c
  projects/bmake/lib/libc/arm/gen/fpsetmask_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpsetmask_vfp.c
  projects/bmake/lib/libc/arm/gen/fpsetround_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpsetround_vfp.c
  projects/bmake/lib/libc/arm/gen/fpsetsticky_vfp.c
     - copied unchanged from r264956, head/lib/libc/arm/gen/fpsetsticky_vfp.c
  projects/bmake/lib/libc/capability/cap_rights_init.3
     - copied unchanged from r264956, head/lib/libc/capability/cap_rights_init.3
  projects/bmake/lib/libc/gen/cap_rights_get.3
     - copied unchanged from r264956, head/lib/libc/gen/cap_rights_get.3
  projects/bmake/lib/libc/gen/scandir_b.c
     - copied unchanged from r264956, head/lib/libc/gen/scandir_b.c
  projects/bmake/lib/libc/iconv/__iconv.c
     - copied unchanged from r264956, head/lib/libc/iconv/__iconv.c
  projects/bmake/lib/libc/iconv/__iconv_free_list.c
     - copied unchanged from r264956, head/lib/libc/iconv/__iconv_free_list.c
  projects/bmake/lib/libc/iconv/__iconv_get_list.c
     - copied unchanged from r264956, head/lib/libc/iconv/__iconv_get_list.c
  projects/bmake/lib/libc/iconv/bsd_iconv.c
     - copied unchanged from r264956, head/lib/libc/iconv/bsd_iconv.c
  projects/bmake/lib/libc/iconv/iconv-internal.h
     - copied unchanged from r264956, head/lib/libc/iconv/iconv-internal.h
  projects/bmake/lib/libc/iconv/iconv_canonicalize.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_canonicalize.c
  projects/bmake/lib/libc/iconv/iconv_close.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_close.c
  projects/bmake/lib/libc/iconv/iconv_compat.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_compat.c
  projects/bmake/lib/libc/iconv/iconv_open.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_open.c
  projects/bmake/lib/libc/iconv/iconv_open_into.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_open_into.c
  projects/bmake/lib/libc/iconv/iconv_set_relocation_prefix.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv_set_relocation_prefix.c
  projects/bmake/lib/libc/iconv/iconvctl.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconvctl.c
  projects/bmake/lib/libc/iconv/iconvlist.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconvlist.c
  projects/bmake/lib/libc/include/block_abi.h
     - copied unchanged from r264956, head/lib/libc/include/block_abi.h
  projects/bmake/lib/libc/stdlib/bsearch_b.c
     - copied unchanged from r264956, head/lib/libc/stdlib/bsearch_b.c
  projects/bmake/lib/libc/stdlib/heapsort_b.c
     - copied unchanged from r264956, head/lib/libc/stdlib/heapsort_b.c
  projects/bmake/lib/libc/stdlib/mergesort_b.c
     - copied unchanged from r264956, head/lib/libc/stdlib/mergesort_b.c
  projects/bmake/lib/libc/sys/aio_fsync.2
     - copied unchanged from r264956, head/lib/libc/sys/aio_fsync.2
  projects/bmake/lib/libc_nonshared/
     - copied from r264956, head/lib/libc_nonshared/
  projects/bmake/lib/libcasper/
     - copied from r264956, head/lib/libcasper/
  projects/bmake/lib/libnv/
     - copied from r264956, head/lib/libnv/
  projects/bmake/lib/libpjdlog/
     - copied from r264956, head/lib/libpjdlog/
  projects/bmake/lib/libpmc/pmc.atomsilvermont.3
     - copied unchanged from r264956, head/lib/libpmc/pmc.atomsilvermont.3
  projects/bmake/lib/libucl/
     - copied from r264956, head/lib/libucl/
  projects/bmake/lib/libz/zopen.3
     - copied unchanged from r264956, head/lib/libz/zopen.3
  projects/bmake/lib/msun/arm/fenv-mangle.h
     - copied unchanged from r264956, head/lib/msun/arm/fenv-mangle.h
  projects/bmake/lib/msun/arm/fenv-softfp.c
     - copied unchanged from r264956, head/lib/msun/arm/fenv-softfp.c
  projects/bmake/lib/msun/arm/fenv-vfp.c
     - copied unchanged from r264956, head/lib/msun/arm/fenv-vfp.c
  projects/bmake/lib/msun/ld128/k_expl.h
     - copied unchanged from r264956, head/lib/msun/ld128/k_expl.h
  projects/bmake/lib/msun/ld80/k_expl.h
     - copied unchanged from r264956, head/lib/msun/ld80/k_expl.h
  projects/bmake/lib/msun/src/e_coshl.c
     - copied unchanged from r264956, head/lib/msun/src/e_coshl.c
  projects/bmake/lib/msun/src/e_sinhl.c
     - copied unchanged from r264956, head/lib/msun/src/e_sinhl.c
  projects/bmake/lib/msun/src/s_tanhl.c
     - copied unchanged from r264956, head/lib/msun/src/s_tanhl.c
  projects/bmake/lib/tests/
     - copied from r264956, head/lib/tests/
Replaced:
  projects/bmake/lib/libc/iconv/iconv.c
     - copied unchanged from r264956, head/lib/libc/iconv/iconv.c
Deleted:
  projects/bmake/lib/libc/rpc/LICENSE
  projects/bmake/lib/libelf/README
  projects/bmake/lib/libelf/Version.map
  projects/bmake/lib/libelf/_libelf.h
  projects/bmake/lib/libelf/elf.3
  projects/bmake/lib/libelf/elf_begin.3
  projects/bmake/lib/libelf/elf_begin.c
  projects/bmake/lib/libelf/elf_cntl.3
  projects/bmake/lib/libelf/elf_cntl.c
  projects/bmake/lib/libelf/elf_data.c
  projects/bmake/lib/libelf/elf_end.3
  projects/bmake/lib/libelf/elf_end.c
  projects/bmake/lib/libelf/elf_errmsg.3
  projects/bmake/lib/libelf/elf_errmsg.c
  projects/bmake/lib/libelf/elf_errno.c
  projects/bmake/lib/libelf/elf_fill.3
  projects/bmake/lib/libelf/elf_fill.c
  projects/bmake/lib/libelf/elf_flag.c
  projects/bmake/lib/libelf/elf_flagdata.3
  projects/bmake/lib/libelf/elf_getarhdr.3
  projects/bmake/lib/libelf/elf_getarhdr.c
  projects/bmake/lib/libelf/elf_getarsym.3
  projects/bmake/lib/libelf/elf_getarsym.c
  projects/bmake/lib/libelf/elf_getbase.3
  projects/bmake/lib/libelf/elf_getbase.c
  projects/bmake/lib/libelf/elf_getdata.3
  projects/bmake/lib/libelf/elf_getident.3
  projects/bmake/lib/libelf/elf_getident.c
  projects/bmake/lib/libelf/elf_getphdrnum.3
  projects/bmake/lib/libelf/elf_getphnum.3
  projects/bmake/lib/libelf/elf_getscn.3
  projects/bmake/lib/libelf/elf_getshdrnum.3
  projects/bmake/lib/libelf/elf_getshdrstrndx.3
  projects/bmake/lib/libelf/elf_getshnum.3
  projects/bmake/lib/libelf/elf_getshstrndx.3
  projects/bmake/lib/libelf/elf_hash.3
  projects/bmake/lib/libelf/elf_hash.c
  projects/bmake/lib/libelf/elf_kind.3
  projects/bmake/lib/libelf/elf_kind.c
  projects/bmake/lib/libelf/elf_memory.3
  projects/bmake/lib/libelf/elf_memory.c
  projects/bmake/lib/libelf/elf_next.3
  projects/bmake/lib/libelf/elf_next.c
  projects/bmake/lib/libelf/elf_phnum.c
  projects/bmake/lib/libelf/elf_rand.3
  projects/bmake/lib/libelf/elf_rand.c
  projects/bmake/lib/libelf/elf_rawfile.3
  projects/bmake/lib/libelf/elf_rawfile.c
  projects/bmake/lib/libelf/elf_scn.c
  projects/bmake/lib/libelf/elf_shnum.c
  projects/bmake/lib/libelf/elf_shstrndx.c
  projects/bmake/lib/libelf/elf_strptr.3
  projects/bmake/lib/libelf/elf_strptr.c
  projects/bmake/lib/libelf/elf_types.m4
  projects/bmake/lib/libelf/elf_update.3
  projects/bmake/lib/libelf/elf_update.c
  projects/bmake/lib/libelf/elf_version.3
  projects/bmake/lib/libelf/elf_version.c
  projects/bmake/lib/libelf/gelf.3
  projects/bmake/lib/libelf/gelf.h
  projects/bmake/lib/libelf/gelf_cap.c
  projects/bmake/lib/libelf/gelf_checksum.3
  projects/bmake/lib/libelf/gelf_checksum.c
  projects/bmake/lib/libelf/gelf_dyn.c
  projects/bmake/lib/libelf/gelf_ehdr.c
  projects/bmake/lib/libelf/gelf_fsize.3
  projects/bmake/lib/libelf/gelf_fsize.c
  projects/bmake/lib/libelf/gelf_getcap.3
  projects/bmake/lib/libelf/gelf_getclass.3
  projects/bmake/lib/libelf/gelf_getclass.c
  projects/bmake/lib/libelf/gelf_getdyn.3
  projects/bmake/lib/libelf/gelf_getehdr.3
  projects/bmake/lib/libelf/gelf_getmove.3
  projects/bmake/lib/libelf/gelf_getphdr.3
  projects/bmake/lib/libelf/gelf_getrel.3
  projects/bmake/lib/libelf/gelf_getrela.3
  projects/bmake/lib/libelf/gelf_getshdr.3
  projects/bmake/lib/libelf/gelf_getsym.3
  projects/bmake/lib/libelf/gelf_getsyminfo.3
  projects/bmake/lib/libelf/gelf_getsymshndx.3
  projects/bmake/lib/libelf/gelf_move.c
  projects/bmake/lib/libelf/gelf_newehdr.3
  projects/bmake/lib/libelf/gelf_newphdr.3
  projects/bmake/lib/libelf/gelf_phdr.c
  projects/bmake/lib/libelf/gelf_rel.c
  projects/bmake/lib/libelf/gelf_rela.c
  projects/bmake/lib/libelf/gelf_shdr.c
  projects/bmake/lib/libelf/gelf_sym.c
  projects/bmake/lib/libelf/gelf_syminfo.c
  projects/bmake/lib/libelf/gelf_symshndx.c
  projects/bmake/lib/libelf/gelf_update_ehdr.3
  projects/bmake/lib/libelf/gelf_xlate.c
  projects/bmake/lib/libelf/gelf_xlatetof.3
  projects/bmake/lib/libelf/libelf.c
  projects/bmake/lib/libelf/libelf.h
  projects/bmake/lib/libelf/libelf_align.c
  projects/bmake/lib/libelf/libelf_allocate.c
  projects/bmake/lib/libelf/libelf_ar.c
  projects/bmake/lib/libelf/libelf_ar_util.c
  projects/bmake/lib/libelf/libelf_checksum.c
  projects/bmake/lib/libelf/libelf_convert.m4
  projects/bmake/lib/libelf/libelf_data.c
  projects/bmake/lib/libelf/libelf_ehdr.c
  projects/bmake/lib/libelf/libelf_extended.c
  projects/bmake/lib/libelf/libelf_fsize.m4
  projects/bmake/lib/libelf/libelf_msize.m4
  projects/bmake/lib/libelf/libelf_phdr.c
  projects/bmake/lib/libelf/libelf_shdr.c
  projects/bmake/lib/libelf/libelf_xlate.c
  projects/bmake/lib/libiconv_compat/
  projects/bmake/lib/libipx/
  projects/bmake/lib/libkse/
  projects/bmake/lib/libyaml/
Modified:
  projects/bmake/Makefile.inc1
  projects/bmake/cddl/Makefile
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
  projects/bmake/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
  projects/bmake/cddl/contrib/opensolaris/cmd/lockstat/sym.c
  projects/bmake/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/bmake/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
  projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zhack/zhack.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zinject/zinject.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bmake/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  projects/bmake/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  projects/bmake/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/bmake/cddl/contrib/opensolaris/common/ctf/ctf_create.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
  projects/bmake/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  projects/bmake/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
  projects/bmake/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py
  projects/bmake/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
  projects/bmake/cddl/lib/Makefile
  projects/bmake/cddl/lib/libctf/Makefile
  projects/bmake/cddl/lib/libdtrace/Makefile
  projects/bmake/cddl/lib/libdtrace/psinfo.d
  projects/bmake/cddl/lib/libnvpair/Makefile
  projects/bmake/cddl/lib/libzpool/Makefile
  projects/bmake/cddl/sbin/Makefile
  projects/bmake/cddl/usr.bin/Makefile
  projects/bmake/cddl/usr.bin/sgsmsg/Makefile
  projects/bmake/cddl/usr.bin/zinject/Makefile
  projects/bmake/cddl/usr.bin/zlook/Makefile
  projects/bmake/cddl/usr.bin/ztest/Makefile
  projects/bmake/cddl/usr.sbin/Makefile
  projects/bmake/cddl/usr.sbin/lockstat/Makefile
  projects/bmake/cddl/usr.sbin/zhack/Makefile
  projects/bmake/lib/Makefile
  projects/bmake/lib/atf/Makefile
  projects/bmake/lib/atf/Makefile.inc
  projects/bmake/lib/atf/libatf-c++/Makefile
  projects/bmake/lib/atf/libatf-c/Makefile
  projects/bmake/lib/csu/arm/crt1.c
  projects/bmake/lib/libarchive/test/Makefile
  projects/bmake/lib/libauditd/Makefile
  projects/bmake/lib/libc++/Makefile
  projects/bmake/lib/libc/Makefile
  projects/bmake/lib/libc/Versions.def
  projects/bmake/lib/libc/amd64/Makefile.inc
  projects/bmake/lib/libc/amd64/SYS.h
  projects/bmake/lib/libc/amd64/gen/_setjmp.S
  projects/bmake/lib/libc/amd64/gen/setjmp.S
  projects/bmake/lib/libc/amd64/gen/sigsetjmp.S
  projects/bmake/lib/libc/amd64/sys/Makefile.inc
  projects/bmake/lib/libc/amd64/sys/getcontext.S
  projects/bmake/lib/libc/amd64/sys/pipe.S
  projects/bmake/lib/libc/amd64/sys/reboot.S
  projects/bmake/lib/libc/amd64/sys/setlogin.S
  projects/bmake/lib/libc/amd64/sys/vfork.S
  projects/bmake/lib/libc/arm/Makefile.inc
  projects/bmake/lib/libc/arm/Symbol.map
  projects/bmake/lib/libc/arm/aeabi/Makefile.inc
  projects/bmake/lib/libc/arm/aeabi/aeabi_double.c
  projects/bmake/lib/libc/arm/aeabi/aeabi_float.c
  projects/bmake/lib/libc/arm/gen/Makefile.inc
  projects/bmake/lib/libc/arm/gen/flt_rounds.c
  projects/bmake/lib/libc/arm/sys/Makefile.inc
  projects/bmake/lib/libc/capability/Makefile.inc
  projects/bmake/lib/libc/compat-43/Makefile.inc
  projects/bmake/lib/libc/db/Makefile.inc
  projects/bmake/lib/libc/db/btree/Makefile.inc
  projects/bmake/lib/libc/db/btree/bt_put.c
  projects/bmake/lib/libc/db/db/Makefile.inc
  projects/bmake/lib/libc/db/hash/Makefile.inc
  projects/bmake/lib/libc/db/man/Makefile.inc
  projects/bmake/lib/libc/db/mpool/Makefile.inc
  projects/bmake/lib/libc/db/recno/Makefile.inc
  projects/bmake/lib/libc/gdtoa/Makefile.inc
  projects/bmake/lib/libc/gen/Makefile.inc
  projects/bmake/lib/libc/gen/Symbol.map
  projects/bmake/lib/libc/gen/cap_sandboxed.3
  projects/bmake/lib/libc/gen/cap_sandboxed.c
  projects/bmake/lib/libc/gen/fts.3
  projects/bmake/lib/libc/gen/fts.c
  projects/bmake/lib/libc/gen/getlogin.c
  projects/bmake/lib/libc/gen/getttyent.c
  projects/bmake/lib/libc/gen/getutxent.c
  projects/bmake/lib/libc/gen/pmadvise.c
  projects/bmake/lib/libc/gen/popen.c
  projects/bmake/lib/libc/gen/scandir.3
  projects/bmake/lib/libc/gen/scandir.c
  projects/bmake/lib/libc/gen/sem_new.c
  projects/bmake/lib/libc/gen/syslog.c
  projects/bmake/lib/libc/gen/tls.c
  projects/bmake/lib/libc/gmon/Makefile.inc
  projects/bmake/lib/libc/i386/Makefile.inc
  projects/bmake/lib/libc/i386/SYS.h
  projects/bmake/lib/libc/i386/gen/_setjmp.S
  projects/bmake/lib/libc/i386/gen/setjmp.S
  projects/bmake/lib/libc/i386/gen/sigsetjmp.S
  projects/bmake/lib/libc/i386/string/strchr.S
  projects/bmake/lib/libc/i386/string/strrchr.S
  projects/bmake/lib/libc/i386/sys/Makefile.inc
  projects/bmake/lib/libc/i386/sys/Ovfork.S
  projects/bmake/lib/libc/i386/sys/getcontext.S
  projects/bmake/lib/libc/ia64/Makefile.inc
  projects/bmake/lib/libc/ia64/sys/Makefile.inc
  projects/bmake/lib/libc/iconv/Makefile.inc
  projects/bmake/lib/libc/iconv/Symbol.map
  projects/bmake/lib/libc/iconv/__iconv_get_list.3
  projects/bmake/lib/libc/iconv/citrus_bcs_strtol.c
  projects/bmake/lib/libc/iconv/citrus_bcs_strtoul.c
  projects/bmake/lib/libc/iconv/citrus_csmapper.c
  projects/bmake/lib/libc/iconv/citrus_csmapper.h
  projects/bmake/lib/libc/iconv/citrus_db_factory.c
  projects/bmake/lib/libc/iconv/citrus_iconv.c
  projects/bmake/lib/libc/iconv/citrus_iconv_local.h
  projects/bmake/lib/libc/iconv/citrus_lookup.c
  projects/bmake/lib/libc/iconv/citrus_mapper.c
  projects/bmake/lib/libc/iconv/citrus_memstream.c
  projects/bmake/lib/libc/iconv/citrus_mmap.c
  projects/bmake/lib/libc/iconv/citrus_prop.c
  projects/bmake/lib/libc/iconv/citrus_prop.h
  projects/bmake/lib/libc/iconv/citrus_stdenc.c
  projects/bmake/lib/libc/iconv/iconv_canonicalize.3
  projects/bmake/lib/libc/iconv/iconvctl.3
  projects/bmake/lib/libc/iconv/iconvlist.3
  projects/bmake/lib/libc/include/port_before.h
  projects/bmake/lib/libc/inet/Makefile.inc
  projects/bmake/lib/libc/inet/inet_ntop.c
  projects/bmake/lib/libc/isc/Makefile.inc
  projects/bmake/lib/libc/libc.ldscript
  projects/bmake/lib/libc/locale/Makefile.inc
  projects/bmake/lib/libc/locale/setrunelocale.c
  projects/bmake/lib/libc/locale/xlocale.c
  projects/bmake/lib/libc/mips/Makefile.inc
  projects/bmake/lib/libc/mips/sys/Makefile.inc
  projects/bmake/lib/libc/nameser/Makefile.inc
  projects/bmake/lib/libc/net/Makefile.inc
  projects/bmake/lib/libc/net/ether_addr.c
  projects/bmake/lib/libc/net/getaddrinfo.c
  projects/bmake/lib/libc/net/ip6opt.c
  projects/bmake/lib/libc/net/sctp_sys_calls.c
  projects/bmake/lib/libc/nls/Makefile.inc
  projects/bmake/lib/libc/posix1e/Makefile.inc
  projects/bmake/lib/libc/posix1e/acl.3
  projects/bmake/lib/libc/posix1e/acl_is_trivial_np.3
  projects/bmake/lib/libc/posix1e/posix1e.3
  projects/bmake/lib/libc/powerpc/Makefile.inc
  projects/bmake/lib/libc/powerpc/SYS.h
  projects/bmake/lib/libc/powerpc/sys/Makefile.inc
  projects/bmake/lib/libc/powerpc64/Makefile.inc
  projects/bmake/lib/libc/powerpc64/SYS.h
  projects/bmake/lib/libc/powerpc64/sys/Makefile.inc
  projects/bmake/lib/libc/quad/Makefile.inc
  projects/bmake/lib/libc/regex/Makefile.inc
  projects/bmake/lib/libc/resolv/Makefile.inc
  projects/bmake/lib/libc/resolv/res_send.c
  projects/bmake/lib/libc/rpc/DISCLAIMER
  projects/bmake/lib/libc/rpc/Makefile.inc
  projects/bmake/lib/libc/rpc/auth_des.c
  projects/bmake/lib/libc/rpc/auth_none.c
  projects/bmake/lib/libc/rpc/auth_unix.c
  projects/bmake/lib/libc/rpc/authdes_prot.c
  projects/bmake/lib/libc/rpc/authunix_prot.c
  projects/bmake/lib/libc/rpc/bindresvport.c
  projects/bmake/lib/libc/rpc/clnt_bcast.c
  projects/bmake/lib/libc/rpc/clnt_dg.c
  projects/bmake/lib/libc/rpc/clnt_generic.c
  projects/bmake/lib/libc/rpc/clnt_perror.c
  projects/bmake/lib/libc/rpc/clnt_raw.c
  projects/bmake/lib/libc/rpc/clnt_simple.c
  projects/bmake/lib/libc/rpc/clnt_vc.c
  projects/bmake/lib/libc/rpc/des_crypt.c
  projects/bmake/lib/libc/rpc/des_soft.c
  projects/bmake/lib/libc/rpc/getnetconfig.c
  projects/bmake/lib/libc/rpc/getnetpath.c
  projects/bmake/lib/libc/rpc/getpublickey.c
  projects/bmake/lib/libc/rpc/getrpcent.c
  projects/bmake/lib/libc/rpc/getrpcport.c
  projects/bmake/lib/libc/rpc/key_call.c
  projects/bmake/lib/libc/rpc/key_prot_xdr.c
  projects/bmake/lib/libc/rpc/netname.c
  projects/bmake/lib/libc/rpc/netnamer.c
  projects/bmake/lib/libc/rpc/pmap_clnt.c
  projects/bmake/lib/libc/rpc/pmap_getmaps.c
  projects/bmake/lib/libc/rpc/pmap_getport.c
  projects/bmake/lib/libc/rpc/pmap_prot.c
  projects/bmake/lib/libc/rpc/pmap_prot2.c
  projects/bmake/lib/libc/rpc/pmap_rmt.c
  projects/bmake/lib/libc/rpc/rpc_callmsg.c
  projects/bmake/lib/libc/rpc/rpc_com.h
  projects/bmake/lib/libc/rpc/rpc_commondata.c
  projects/bmake/lib/libc/rpc/rpc_dtablesize.c
  projects/bmake/lib/libc/rpc/rpc_generic.c
  projects/bmake/lib/libc/rpc/rpc_prot.c
  projects/bmake/lib/libc/rpc/rpc_soc.c
  projects/bmake/lib/libc/rpc/rpcb_clnt.c
  projects/bmake/lib/libc/rpc/rpcb_prot.c
  projects/bmake/lib/libc/rpc/rpcb_st_xdr.c
  projects/bmake/lib/libc/rpc/rpcdname.c
  projects/bmake/lib/libc/rpc/rtime.c
  projects/bmake/lib/libc/rpc/svc.c
  projects/bmake/lib/libc/rpc/svc_auth.c
  projects/bmake/lib/libc/rpc/svc_auth_des.c
  projects/bmake/lib/libc/rpc/svc_auth_unix.c
  projects/bmake/lib/libc/rpc/svc_dg.c
  projects/bmake/lib/libc/rpc/svc_generic.c
  projects/bmake/lib/libc/rpc/svc_raw.c
  projects/bmake/lib/libc/rpc/svc_run.c
  projects/bmake/lib/libc/rpc/svc_simple.c
  projects/bmake/lib/libc/rpc/svc_vc.c
  projects/bmake/lib/libc/softfloat/Makefile.inc
  projects/bmake/lib/libc/sparc64/Makefile.inc
  projects/bmake/lib/libc/sparc64/fpu/Makefile.inc
  projects/bmake/lib/libc/sparc64/fpu/fpu.c
  projects/bmake/lib/libc/sparc64/fpu/fpu_sqrt.c
  projects/bmake/lib/libc/sparc64/sys/Makefile.inc
  projects/bmake/lib/libc/sparc64/sys/__sparc_utrap_setup.c
  projects/bmake/lib/libc/stdio/Makefile.inc
  projects/bmake/lib/libc/stdio/fdopen.c
  projects/bmake/lib/libc/stdio/freopen.c
  projects/bmake/lib/libc/stdio/printf_l.3
  projects/bmake/lib/libc/stdio/scanf_l.3
  projects/bmake/lib/libc/stdio/tmpnam.3
  projects/bmake/lib/libc/stdlib/Makefile.inc
  projects/bmake/lib/libc/stdlib/Symbol.map
  projects/bmake/lib/libc/stdlib/atexit.3
  projects/bmake/lib/libc/stdlib/atexit.c
  projects/bmake/lib/libc/stdlib/bsearch.c
  projects/bmake/lib/libc/stdlib/getopt_long.3
  projects/bmake/lib/libc/stdlib/getsubopt.c
  projects/bmake/lib/libc/stdlib/heapsort.c
  projects/bmake/lib/libc/stdlib/jemalloc/Makefile.inc
  projects/bmake/lib/libc/stdlib/jemalloc/Symbol.map
  projects/bmake/lib/libc/stdlib/merge.c
  projects/bmake/lib/libc/stdlib/qsort.3
  projects/bmake/lib/libc/stdlib/qsort_r.c
  projects/bmake/lib/libc/stdlib/realpath.c
  projects/bmake/lib/libc/stdtime/Makefile.inc
  projects/bmake/lib/libc/string/Makefile.inc
  projects/bmake/lib/libc/string/strcasecmp.3
  projects/bmake/lib/libc/string/strcat.3
  projects/bmake/lib/libc/string/strcpy.3
  projects/bmake/lib/libc/string/strlcpy.3
  projects/bmake/lib/libc/sys/Makefile.inc
  projects/bmake/lib/libc/sys/accept.2
  projects/bmake/lib/libc/sys/aio_mlock.2
  projects/bmake/lib/libc/sys/cap_enter.2
  projects/bmake/lib/libc/sys/cap_fcntls_limit.2
  projects/bmake/lib/libc/sys/cap_ioctls_limit.2
  projects/bmake/lib/libc/sys/cap_rights_limit.2
  projects/bmake/lib/libc/sys/chflags.2
  projects/bmake/lib/libc/sys/chmod.2
  projects/bmake/lib/libc/sys/cpuset.2
  projects/bmake/lib/libc/sys/getrlimit.2
  projects/bmake/lib/libc/sys/kqueue.2
  projects/bmake/lib/libc/sys/madvise.2
  projects/bmake/lib/libc/sys/mq_getattr.2
  projects/bmake/lib/libc/sys/pdfork.2
  projects/bmake/lib/libc/sys/pipe.2
  projects/bmake/lib/libc/sys/posix_fadvise.2
  projects/bmake/lib/libc/sys/posix_fallocate.2
  projects/bmake/lib/libc/sys/procctl.2
  projects/bmake/lib/libc/sys/shm_open.2
  projects/bmake/lib/libc/sys/swapon.2
  projects/bmake/lib/libc/sys/sync.2
  projects/bmake/lib/libc/sys/wait.2
  projects/bmake/lib/libc/uuid/Makefile.inc
  projects/bmake/lib/libc/xdr/Makefile.inc
  projects/bmake/lib/libc/xdr/xdr.c
  projects/bmake/lib/libc/xdr/xdr_array.c
  projects/bmake/lib/libc/xdr/xdr_float.c
  projects/bmake/lib/libc/xdr/xdr_mem.c
  projects/bmake/lib/libc/xdr/xdr_rec.c
  projects/bmake/lib/libc/xdr/xdr_reference.c
  projects/bmake/lib/libc/xdr/xdr_sizeof.c
  projects/bmake/lib/libc/xdr/xdr_stdio.c
  projects/bmake/lib/libc/yp/Makefile.inc
  projects/bmake/lib/libcam/Makefile
  projects/bmake/lib/libcam/camlib.c
  projects/bmake/lib/libcxxrt/Version.map
  projects/bmake/lib/libdevstat/devstat.c
  projects/bmake/lib/libedit/chartype.h
  projects/bmake/lib/libelf/Makefile
  projects/bmake/lib/libfetch/common.c
  projects/bmake/lib/libfetch/common.h
  projects/bmake/lib/libfetch/http.c
  projects/bmake/lib/libiconv_modules/BIG5/Makefile
  projects/bmake/lib/libiconv_modules/BIG5/citrus_big5.c
  projects/bmake/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
  projects/bmake/lib/libiconv_modules/EUC/Makefile
  projects/bmake/lib/libiconv_modules/EUC/citrus_euc.c
  projects/bmake/lib/libiconv_modules/EUCTW/Makefile
  projects/bmake/lib/libiconv_modules/EUCTW/citrus_euctw.c
  projects/bmake/lib/libiconv_modules/GBK2K/Makefile
  projects/bmake/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
  projects/bmake/lib/libiconv_modules/HZ/citrus_hz.c
  projects/bmake/lib/libiconv_modules/ISO2022/Makefile
  projects/bmake/lib/libiconv_modules/ISO2022/citrus_iso2022.c
  projects/bmake/lib/libiconv_modules/JOHAB/Makefile
  projects/bmake/lib/libiconv_modules/JOHAB/citrus_johab.c
  projects/bmake/lib/libiconv_modules/MSKanji/citrus_mskanji.c
  projects/bmake/lib/libiconv_modules/Makefile.inc
  projects/bmake/lib/libiconv_modules/UES/Makefile
  projects/bmake/lib/libiconv_modules/UES/citrus_ues.c
  projects/bmake/lib/libiconv_modules/UTF1632/Makefile
  projects/bmake/lib/libiconv_modules/UTF7/Makefile
  projects/bmake/lib/libiconv_modules/UTF7/citrus_utf7.c
  projects/bmake/lib/libiconv_modules/UTF8/citrus_utf8.c
  projects/bmake/lib/libiconv_modules/VIQR/citrus_viqr.c
  projects/bmake/lib/libiconv_modules/ZW/citrus_zw.c
  projects/bmake/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
  projects/bmake/lib/libiconv_modules/iconv_std/Makefile
  projects/bmake/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
  projects/bmake/lib/libiconv_modules/mapper_parallel/Makefile
  projects/bmake/lib/libiconv_modules/mapper_serial/Makefile
  projects/bmake/lib/libiconv_modules/mapper_std/Makefile
  projects/bmake/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
  projects/bmake/lib/libiconv_modules/mapper_zone/Makefile
  projects/bmake/lib/libipsec/ipsec_dump_policy.c
  projects/bmake/lib/libkvm/Makefile
  projects/bmake/lib/libkvm/kvm.c
  projects/bmake/lib/libkvm/kvm.h
  projects/bmake/lib/libkvm/kvm_arm.c
  projects/bmake/lib/libkvm/kvm_getpcpu.3
  projects/bmake/lib/libkvm/kvm_ia64.c
  projects/bmake/lib/libkvm/kvm_minidump_amd64.c
  projects/bmake/lib/libkvm/kvm_minidump_arm.c
  projects/bmake/lib/libkvm/kvm_pcpu.c
  projects/bmake/lib/libmandoc/Makefile
  projects/bmake/lib/libmemstat/libmemstat.3
  projects/bmake/lib/libmemstat/memstat.c
  projects/bmake/lib/libmemstat/memstat.h
  projects/bmake/lib/libmemstat/memstat_internal.h
  projects/bmake/lib/libmemstat/memstat_uma.c
  projects/bmake/lib/libnetgraph/debug.c
  projects/bmake/lib/libnetgraph/netgraph.3
  projects/bmake/lib/libnetgraph/sock.c
  projects/bmake/lib/libpam/libpam/Makefile
  projects/bmake/lib/libpam/modules/Makefile.inc
  projects/bmake/lib/libpam/modules/pam_radius/pam_radius.8
  projects/bmake/lib/libpam/modules/pam_tacplus/pam_tacplus.8
  projects/bmake/lib/libpmc/Makefile
  projects/bmake/lib/libpmc/libpmc.c
  projects/bmake/lib/libpmc/pmc.atom.3
  projects/bmake/lib/libpmc/pmc.h
  projects/bmake/lib/libproc/Makefile
  projects/bmake/lib/libproc/_libproc.h
  projects/bmake/lib/libproc/proc_bkpt.c
  projects/bmake/lib/libproc/proc_create.c
  projects/bmake/lib/libproc/proc_regs.c
  projects/bmake/lib/libproc/proc_sym.c
  projects/bmake/lib/libproc/proc_util.c
  projects/bmake/lib/libproc/test/t1-bkpt/Makefile
  projects/bmake/lib/libproc/test/t2-name2map/Makefile
  projects/bmake/lib/libproc/test/t3-name2sym/Makefile
  projects/bmake/lib/libprocstat/libprocstat.c
  projects/bmake/lib/libprocstat/zfs/Makefile
  projects/bmake/lib/librpcsec_gss/Makefile
  projects/bmake/lib/libsm/Makefile
  projects/bmake/lib/libsmb/Makefile
  projects/bmake/lib/libstand/Makefile
  projects/bmake/lib/libstand/close.c
  projects/bmake/lib/libstand/dosfs.c
  projects/bmake/lib/libstand/dosfs.h
  projects/bmake/lib/libstand/environment.c
  projects/bmake/lib/libstand/powerpc/_setjmp.S
  projects/bmake/lib/libstand/sbrk.c
  projects/bmake/lib/libstand/zalloc.c
  projects/bmake/lib/libstand/zalloc_defs.h
  projects/bmake/lib/libstand/zalloc_mem.h
  projects/bmake/lib/libthr/Makefile
  projects/bmake/lib/libthr/thread/thr_kill.c
  projects/bmake/lib/libthr/thread/thr_private.h
  projects/bmake/lib/libthr/thread/thr_sig.c
  projects/bmake/lib/libusb/Makefile
  projects/bmake/lib/libusb/libusb.3
  projects/bmake/lib/libusb/libusb.h
  projects/bmake/lib/libusb/libusb01.c
  projects/bmake/lib/libusb/libusb10.c
  projects/bmake/lib/libusb/libusb10_io.c
  projects/bmake/lib/libutil/expand_number.3
  projects/bmake/lib/libutil/login.conf.5
  projects/bmake/lib/libutil/login_class.3
  projects/bmake/lib/libutil/login_class.c
  projects/bmake/lib/libutil/pw_util.3
  projects/bmake/lib/libvmmapi/vmmapi.c
  projects/bmake/lib/libvmmapi/vmmapi.h
  projects/bmake/lib/libz/FREEBSD-upgrade   (contents, props changed)
  projects/bmake/lib/libz/Makefile   (contents, props changed)
  projects/bmake/lib/libz/Symbol.map   (contents, props changed)
  projects/bmake/lib/libz/Versions.def   (contents, props changed)
  projects/bmake/lib/libz/zopen.c   (contents, props changed)
  projects/bmake/lib/msun/Makefile
  projects/bmake/lib/msun/Symbol.map
  projects/bmake/lib/msun/arm/Makefile.inc
  projects/bmake/lib/msun/arm/Symbol.map
  projects/bmake/lib/msun/arm/fenv.c
  projects/bmake/lib/msun/arm/fenv.h
  projects/bmake/lib/msun/ld128/s_expl.c
  projects/bmake/lib/msun/ld80/s_expl.c
  projects/bmake/lib/msun/man/cosh.3
  projects/bmake/lib/msun/man/sinh.3
  projects/bmake/lib/msun/man/tanh.3
  projects/bmake/lib/msun/src/e_cosh.c
  projects/bmake/lib/msun/src/e_sinh.c
  projects/bmake/lib/msun/src/fenv-softfloat.h
  projects/bmake/lib/msun/src/imprecise.c
  projects/bmake/lib/msun/src/math.h
  projects/bmake/lib/msun/src/s_round.c
  projects/bmake/lib/msun/src/s_roundf.c
  projects/bmake/lib/msun/src/s_roundl.c
  projects/bmake/lib/msun/src/s_tanh.c
  projects/bmake/lib/ncurses/Makefile
  projects/bmake/lib/ncurses/form/Makefile
  projects/bmake/lib/ncurses/menu/Makefile
  projects/bmake/lib/ncurses/ncurses/Makefile
  projects/bmake/lib/ncurses/ncurses/ncurses_cfg.h
  projects/bmake/lib/ncurses/panel/Makefile
Directory Properties:
  projects/bmake/cddl/   (props changed)
  projects/bmake/cddl/contrib/opensolaris/   (props changed)
  projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/bmake/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/bmake/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/bmake/lib/libc/   (props changed)

Modified: projects/bmake/Makefile.inc1
==============================================================================

--- projects/bmake/Makefile.inc1	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/Makefile.inc1	Sun Apr 27 08:13:43 2014	(r265006)
@@ -15,7 +15,7 @@
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_ROOT install without using root privilege
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
-#	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
+#	-DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
@@ -58,6 +58,7 @@
 # use that new version.  And the new (dynamically-linked) /bin/sh
 # will expect to find appropriate libraries in /lib and /libexec.
 #
+SRCDIR?=	${.CURDIR}
 .if defined(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
@@ -84,6 +85,9 @@ SUBDIR+=secure
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
@@ -128,11 +132,14 @@ OSRELDATE=	0
 .endif
 
 .if !defined(VERSION)
-VERSION!=	uname -srp
-VERSION+=	${OSRELDATE}
+REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
+BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
+SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+		${SRCDIR}/sys/sys/param.h
+VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
-KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -224,22 +231,24 @@ CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/le
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
 .endif
+.if defined(TARGET_CFLAGS)
+CROSSENV+=	${TARGET_CFLAGS}
+.endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}" \
-		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-		COMPILER_TYPE=${COMPILER_TYPE}
+		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
-		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -249,12 +258,26 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-DWITHOUT_GDB
+		MK_GDB=no MK_TESTS=no
+
+# kernel-tools stage
+KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${BPATH}:${PATH} \
+		WORLDTMP=${WORLDTMP} \
+		VERSION="${VERSION}"
+KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		DESTDIR= \
+		BOOTSTRAPPING=${OSRELDATE} \
+		SSP_CFLAGS= \
+		MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD
 
 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -271,7 +294,7 @@ HMAKE+=		PATH=${TMPPATH} METALOG=${METAL
 .endif
 
 .if ${MK_CDDL} == "no"
-WMAKEENV+=	NO_CTF=1
+WMAKEENV+=	MK_CTF=no
 .endif
 
 .if defined(CROSS_TOOLCHAIN_PREFIX)
@@ -299,17 +322,6 @@ WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
 		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
 
-.if ${XCC:T:Mgcc} == "gcc"
-WMAKE_COMPILER_TYPE=	gcc
-.elif ${XCC:T:Mclang} == "clang"
-WMAKE_COMPILER_TYPE=	clang
-.elif ${MK_CLANG_IS_CC} == "no"
-WMAKE_COMPILER_TYPE=	gcc
-.else
-WMAKE_COMPILER_TYPE=	clang
-.endif
-IMAKE_COMPILER_TYPE=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-
 .if ${XCC:M/*}
 XFLAGS=		--sysroot=${WORLDTMP}
 .if defined(CROSS_BINUTILS_PREFIX)
@@ -322,19 +334,18 @@ XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .else
 XFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
-${MK_ARM_EABI} != "no"
+.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_ARCH:M*eb*} == ""
 TARGET_ABI=	gnueabi
-.else
-TARGET_ABI=	unknown
+.elif ${TARGET_ARCH} == "armv6hf"
+TARGET_ABI=	gnueabihf
 .endif
+.endif
+TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
-.endif
 
-WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
@@ -382,27 +393,26 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
-		LIBPRIVATEDIR=/usr/lib32/private \
-		COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-LIB32WMAKEFLAGS+=	\
-		CC="${XCC} ${LIB32FLAGS}" \
+		LIBPRIVATEDIR=/usr/lib32/private
+LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
 		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
 		-DNO_CPU_CFLAGS \
-		-DNO_CTF \
-		-DNO_LINT
+		MK_CTF=no \
+		-DNO_LINT \
+		MK_TESTS=no
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-		-DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
-		${IMAKE_INSTALL}
+		MK_MAN=no MK_INFO=no MK_HTML=no
+LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+		MK_TOOLCHAIN=no ${IMAKE_INSTALL}
 .endif
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
-		${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
+		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
@@ -425,7 +435,7 @@ MTREEFLAGS+=	-W
 .endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)
 IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
-IMAKE_MTREE=	MTREE_CMD="nmtree ${MTREEFLAGS}"
+IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
 .endif
 
 # kernel stage
@@ -485,6 +495,10 @@ _worldtmp:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
+.if ${MK_TESTS} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+	    -p ${WORLDTMP}/usr >/dev/null
+.endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
@@ -529,6 +543,7 @@ _cross-tools:
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
+	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -541,8 +556,8 @@ _libraries:
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DWITHOUT_MAN -DNO_PROFILE libraries
+	    ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+	    MK_PROFILE=no  MK_TESTS=no libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -594,7 +609,7 @@ build32:
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no \
 	    -DEARLY_BUILD build-tools
 .endfor
 	cd ${.CURDIR}; \
@@ -737,14 +752,10 @@ _install-info=	install-info
 _zoneinfo=	zic tzsetup
 .endif
 
-.if exists(/usr/sbin/nmtree)
-_nmtree_itools=	nmtree
-.endif
-
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep id install ${_install-info} \
-	ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
-	rm sed sh sysctl test true uname wc ${_zoneinfo}
+	ln lockf make mkdir mtree mv pwd_mkdb \
+	rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo}
 
 #
 # distributeworld
@@ -806,11 +817,11 @@ distributeworld installworld: _installch
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
 .if defined(NO_ROOT)
-	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
+	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
 	    sed -e 's#^\./#./${dist}/#' >> ${METALOG}
-	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
+	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
-	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
+	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
 .endif
 .endfor
@@ -963,6 +974,8 @@ INSTALLKERNEL= ${_kernel}
 .endif
 .endfor
 
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
+
 #
 # buildkernel
 #
@@ -988,7 +1001,7 @@ buildkernel:
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
-			${KERNCONFDIR}/${_kernel}
+			-I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel}
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo
@@ -1008,20 +1021,7 @@ buildkernel:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
-	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
-# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
-.for target in obj depend all
-	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
-.endfor
-.endif
+	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1159,8 +1159,8 @@ update:
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
+.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1188,14 +1188,6 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
-.if ${BOOTSTRAPPING} < 800022
-_ar=		usr.bin/ar
-.endif
-
-.if ${BOOTSTRAPPING} < 800013
-_mklocale=	usr.bin/mklocale
-.endif
-
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
@@ -1234,7 +1226,9 @@ _awk=		usr.bin/awk
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
-.if ${MK_CLANG} != "no"
+# We need to build tlbgen when we're building clang either as
+# the bootstrap compiler, or as the part of the normal build.
+.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
@@ -1251,7 +1245,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
-# Default to building the BSDL DTC, but build the GPL one if users explicitly
+# Default to building the GPL DTC, but build the BSDL one if users explicitly
 # request it.
 _dtc= usr.bin/dtc
 .if ${MK_GPL_DTC} != "no"
@@ -1279,13 +1273,11 @@ bootstrap-tools: .MAKE
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
-    ${_ar} \
     ${_dtc} \
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
-    ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
@@ -1308,10 +1300,6 @@ bootstrap-tools: .MAKE
 #
 # build-tools: Build special purpose build tools
 #
-.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
-_aicasm= sys/modules/aic7xxx/aicasm
-.endif
-
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
@@ -1333,7 +1321,6 @@ build-tools: .MAKE
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
-    ${_aicasm} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
@@ -1354,9 +1341,20 @@ build-tools: .MAKE
 .endfor
 
 #
+# kernel-tools: Build kernel-building tools
+#
+kernel-tools: .MAKE
+	mkdir -p ${MAKEOBJDIRPREFIX}/usr
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+
+#
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
+TARGET_ARCH=	${XDEV_ARCH}
+.endif
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
@@ -1370,19 +1368,19 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
-.if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no"
+# If we're given an XAS, don't build binutils.
+.if ${XAS:M/*} == "" && ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
-.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
+.if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .endif
-
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
+.if ${MK_GCC_BOOTSTRAP} != "no"
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
@@ -1446,11 +1444,13 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARC
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
+_startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
+gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
@@ -1464,22 +1464,31 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
-		${_lib_libgssapi} ${_lib_libipx} \
-		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
+		${_lib_libgssapi} \
+		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
+		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libzfs_core} \
-		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
+		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
+.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+_prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
+.endif
 
-.if ${MK_ATF} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+.if defined(WITH_ATF) || ${MK_TESTS} != "no"
+.if !defined(WITH_ATF)
+# Ensure that the ATF libraries will be built during make libraries, even
+# though they will have WITHOUT_TESTS
+MAKE+=		-DWITH_ATF
+.endif
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"
@@ -1490,6 +1499,13 @@ _lib_libthr=	lib/libthr
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
+.if ${MK_CASPER} != "no"
+_lib_libcapsicum=lib/libcapsicum
+.endif
+
+lib/libcapsicum__L: lib/libnv__L
+lib/libpjdlog__L: lib/libutil__L
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
@@ -1556,10 +1572,6 @@ kerberos5/lib/libheimsqlite__L: lib/libt
 _lib_libgssapi=	lib/libgssapi
 .endif
 
-.if ${MK_IPX} != "no"
-_lib_libipx=	lib/libipx
-.endif
-
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
@@ -1588,10 +1600,12 @@ ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
+		    DIRPRFX=${_lib}/ all && \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
+		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1600,10 +1614,10 @@ ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} DIRPRFX=${_lib}/ all && \
-		${MAKE} DIRPRFX=${_lib}/ install
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all && \
+		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1613,10 +1627,12 @@ ${_lib}__L: .PHONY .MAKE
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
-		${MAKE} DIRPRFX=lib/libpam/ obj && \
-		${MAKE} DIRPRFX=lib/libpam/ depend && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj && \
+		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend && \
+		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET all && \
+		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
@@ -1672,6 +1688,7 @@ delete-old-files:
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
@@ -1694,7 +1711,8 @@ delete-old-files:
 
 check-old-files:
 	@echo ">>> Checking for old files"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
@@ -1715,6 +1733,7 @@ delete-old-libs:
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
@@ -1722,22 +1741,36 @@ delete-old-libs:
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
+		for ext in debug symbols; do \
+		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
+		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
+			      <&3; \
+		  fi; \
+		done; \
 	done
 	@echo ">>> Old libraries removed"
 
 check-old-libs:
 	@echo ">>> Checking for old libraries"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
+		for ext in debug symbols; do \
+		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
+		  fi; \
+		done; \
 	done
 
 delete-old-dirs:
 	@echo ">>> Removing old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
@@ -1750,7 +1783,8 @@ delete-old-dirs:
 
 check-old-dirs:
 	@echo ">>> Checking for old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
@@ -1799,7 +1833,7 @@ builddtb:
 		echo "ERROR: FDT_DTS_FILE must be specified!"; \
 		exit 1; \
 	fi;	\
-	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE} ]; then \
 		echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
 			exist!"; \
 		exit 1;	\
@@ -1809,9 +1843,9 @@ builddtb:
 			directory"; \
 	fi
 	@PATH=${TMPPATH} \
-	dtc -O dtb -o \
-	    ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
-	    -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
+	${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
+	    ${FDT_DTS_FILE} \
+	    ${DTBOUTPUTPATH}/`basename ${FDT_DTS_FILE} .dts`
 
 ###############
 
@@ -1823,28 +1857,34 @@ XDEV_CPUTYPE?=${CPUTYPE}
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
-NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
-	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
+NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
+	MK_MAN=no MK_NLS=no MK_PROFILE=no \
+	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
 XDDIR=${XDEV_ARCH}-freebsd
-XDTP=/usr/${XDDIR}
+XDTP?=/usr/${XDDIR}
+.if ${XDTP:N/*}
+.error XDTP variable should be an absolute path
+.endif
+
 CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDDESTDIR} \
-	TOOLS_PREFIX=${XDDESTDIR}
+	TOOLS_PREFIX=${XDTP}
 CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
-	-B${XDDESTDIR}/usr/lib
-CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \
+	--sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \
+	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
+CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
+	CPP="${CPP} ${CD2CFLAGS}" \
 	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-XDDESTDIR=${DESTDIR}${XDTP}
+CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
+XDDESTDIR=${DESTDIR}/${XDTP}
 .if !defined(OSREL)
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
@@ -1877,11 +1917,11 @@ _xb-build-tools:
 
 _xb-cross-tools:
 .for _tool in \
-    gnu/usr.bin/binutils \
-    gnu/usr.bin/cc \
+    ${_binutils} \
     usr.bin/ar \
     ${_clang_libs} \
-    ${_clang}
+    ${_clang} \
+    ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
 	cd ${.CURDIR}/${_tool} && \
 	${CDMAKE} DIRPRFX=${_tool}/ obj && \
@@ -1905,10 +1945,11 @@ xdev-install: xdev-build _xi-mtree _xi-c
 _xi-cross-tools:
 	@echo "_xi-cross-tools"
 .for _tool in \
-    gnu/usr.bin/binutils \
-    gnu/usr.bin/cc \
+    ${_binutils} \
     usr.bin/ar \
-    ${_clang}
+    ${_clang_libs} \
+    ${_clang} \
+    ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
@@ -1924,6 +1965,7 @@ _xi-libraries:
 
 _xi-links:
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
+       mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
@@ -1934,5 +1976,3 @@ _xi-links:
 xdev xdev-build xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
-
-buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE

Modified: projects/bmake/cddl/Makefile
==============================================================================
--- projects/bmake/cddl/Makefile	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/Makefile	Sun Apr 27 08:13:43 2014	(r265006)
@@ -1,5 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	lib sbin usr.bin usr.sbin
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d	Sun Apr 27 08:13:43 2014	(r265006)
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ASSERTION:
  *	Checks that setting "bufresize" to "auto" will cause buffer
@@ -34,14 +32,8 @@
  * SECTION: Buffers and Buffering/Buffer Resizing Policy;
  *	Options and Tunables/bufsize;
  *	Options and Tunables/bufresize
- *
- * NOTES:
- *	We use the undocumented "preallocate" option to make sure dtrace(1M)
- *	has enough space in its heap to allocate a buffer as large as the
- *	kernel's trace buffer.
  */
 
-#pragma D option preallocate=100t
 #pragma D option bufresize=auto
 #pragma D option bufsize=100t
 

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d	Sun Apr 27 08:13:43 2014	(r265006)
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ASSERTION:
  *	Checks that setting "bufresize" to "auto" will cause buffer
@@ -34,14 +32,8 @@
  * SECTION: Buffers and Buffering/Buffer Resizing Policy;
  *	Options and Tunables/aggsize;
  *	Options and Tunables/bufresize
- *
- * NOTES:
- *	We use the undocumented "preallocate" option to make sure dtrace(1M)
- *	has enough space in its heap to allocate a buffer as large as the
- *	kernel's trace buffer.
  */
 
-#pragma D option preallocate=100t
 #pragma D option bufresize=auto
 #pragma D option aggsize=100t
 

Copied: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh (from r264956, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh	Sun Apr 27 08:13:43 2014	(r265006, copy of r264956, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
@@ -0,0 +1,97 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+let j=8
+
+enable()
+{
+	prog=/var/tmp/dtest.$$.d
+	err=/var/tmp/dtest.$$.err
+
+	nawk -v nprobes=$1 'BEGIN { \
+		for (i = 0; i < nprobes - 1; i++) { 		\
+			printf("dtrace:::BEGIN,\n");		\
+		}						\
+								\
+		printf("dtrace:::BEGIN { exit(0); }\n");	\
+	}' /dev/null > $prog
+
+	dtrace -qs $prog > /dev/null 2> $err
+
+	if [[ "$?" -eq 0 ]]; then
+		return 0
+	else
+		if ! grep "DIF program exceeds maximum program size" $err \
+		    1> /dev/null 2>&1 ; then 
+			echo "failed to enable $prog: `cat $err`"
+			exit 1
+		fi
+
+		return 1
+	fi
+}
+
+#
+# First, establish an upper bound
+#
+let upper=1
+
+while enable $upper ; do
+	let lower=upper
+	let upper=upper+upper
+	echo success at $lower, raised to $upper
+done
+
+#
+# Now search for the highest value that can be enabled
+#
+while [[ "$lower" -lt "$upper" ]]; do
+	let guess=$(((lower + upper) / 2))
+	echo "lower is $lower; upper is $upper; guess is $guess\c"
+
+	if enable $guess ; then
+		if [[ $((upper - lower)) -le 2 ]]; then
+			let upper=guess
+		fi
+
+		echo " (success)"
+		let lower=guess
+	else
+		echo " (failure)"
+		let upper=guess
+	fi
+done
+
+let expected=10000
+
+if [[ "$lower" -lt "$expected" ]]; then
+	echo "expected support for enablings of at least $expected probes; \c"
+	echo "found $lower"
+	exit 1
+fi
+
+echo "maximum supported enabled probes found to be $lower"
+exit 0
+

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d	Sun Apr 27 08:13:43 2014	(r265006)
@@ -44,7 +44,7 @@ BEGIN
 
 	printf("\n");
 
-	printf("%%a = %a\n", &`kmem_alloc);
+	printf("%%a = %a\n", &`malloc);
 	printf("%%c = %c\n", i);
 	printf("%%d = %d\n", i);
 	printf("%%hd = %hd\n", (short)i);

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out	Sun Apr 27 08:13:43 2014	(r265006)
@@ -1,5 +1,5 @@
 
-%a = genunix`kmem_alloc
+%a = kernel`malloc
 %c = a
 %d = 97
 %hd = 97

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d	Sun Apr 27 08:13:43 2014	(r265006)
@@ -36,6 +36,6 @@
 
 BEGIN
 {
-	printf("sysname = %s", `utsname.sysname);
+	printf("sysname = %s", `ostype);
 	exit(0);
 }

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out	Sun Apr 27 08:13:43 2014	(r265006)
@@ -1 +1 @@
-sysname = SunOS
+sysname = FreeBSD

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d	Sun Apr 27 08:13:43 2014	(r265006)
@@ -38,6 +38,6 @@
 
 BEGIN
 {
-	printf("symbol = %a", &`kmem_alloc);
+	printf("symbol = %a", &`malloc);
 	exit(0);
 }

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out	Sun Apr 27 08:13:43 2014	(r265006)
@@ -1 +1 @@
-symbol = kernel`kmem_alloc
+symbol = kernel`malloc

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Sun Apr 27 08:13:43 2014	(r265006)
@@ -64,7 +64,7 @@ child=$!
 # ksh doing work.  (This actually goes one step further and assumes that we
 # catch some non-static function in ksh.)
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Sun Apr 27 08:13:43 2014	(r265006)
@@ -62,7 +62,7 @@ child=$!
 #
 # The only thing we can be sure of here is that ksh is doing some work.
 #
-script | tee /dev/fd/2 | grep -w ksh > /dev/null
+script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null
 status=$? 
 
 kill $child

Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
==============================================================================
--- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Sun Apr 27 08:02:55 2014	(r265005)
+++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Sun Apr 27 08:13:43 2014	(r265006)
@@ -63,7 +63,7 @@ child=$!
 # This test is essentially the same as that in the ufunc test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 

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