svn commit: r272921 - in projects/bhyve_svm: . bin/sh bin/sh/tests/builtins bin/sleep bin/sleep/tests cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf cddl/contrib/opensolaris/cmd/lockstat ...

Neel Natu neel at FreeBSD.org
Fri Oct 10 23:53:05 UTC 2014 

Author: neel
Date: Fri Oct 10 23:52:56 2014
New Revision: 272921
URL: https://svnweb.freebsd.org/changeset/base/272921

Log:
  IFC @r272887

Added:
  projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0
     - copied unchanged from r272887, head/bin/sh/tests/builtins/lineno3.0
  projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout
     - copied unchanged from r272887, head/bin/sh/tests/builtins/lineno3.0.stdout
  projects/bhyve_svm/bin/sleep/tests/
     - copied from r272887, head/bin/sleep/tests/
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.error
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.error
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.output
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.output
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.error
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.output
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.error
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.output
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.error
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.output
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
  projects/bhyve_svm/contrib/byacc/test/btyacc_destroy1.y
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy1.y
  projects/bhyve_svm/contrib/byacc/test/btyacc_destroy2.y
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy2.y
  projects/bhyve_svm/contrib/byacc/test/btyacc_destroy3.y
     - copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy3.y
  projects/bhyve_svm/etc/devd/ulpt.conf
     - copied unchanged from r272887, head/etc/devd/ulpt.conf
  projects/bhyve_svm/gnu/usr.bin/diff/tests/
     - copied from r272887, head/gnu/usr.bin/diff/tests/
  projects/bhyve_svm/lib/libc/string/explicit_bzero.c
     - copied unchanged from r272887, head/lib/libc/string/explicit_bzero.c
  projects/bhyve_svm/lib/libpcap/pcap-netmap.c
     - copied unchanged from r272887, head/lib/libpcap/pcap-netmap.c
  projects/bhyve_svm/sbin/ipfw/tables.c
     - copied unchanged from r272887, head/sbin/ipfw/tables.c
  projects/bhyve_svm/sys/dev/mmc/host/
     - copied from r272887, head/sys/dev/mmc/host/
  projects/bhyve_svm/sys/dev/mrsas/mrsas_linux.c
     - copied unchanged from r272887, head/sys/dev/mrsas/mrsas_linux.c
  projects/bhyve_svm/sys/libkern/explicit_bzero.c
     - copied unchanged from r272887, head/sys/libkern/explicit_bzero.c
  projects/bhyve_svm/sys/modules/mrsas/mrsas_linux/
     - copied from r272887, head/sys/modules/mrsas/mrsas_linux/
  projects/bhyve_svm/sys/netinet/sctp_syscalls.c
     - copied unchanged from r272887, head/sys/netinet/sctp_syscalls.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_iface.c
     - copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_iface.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table.h
     - copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table.h
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table_algo.c
     - copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table_algo.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table_value.c
     - copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table_value.c
  projects/bhyve_svm/sys/sys/seq.h
     - copied unchanged from r272887, head/sys/sys/seq.h
  projects/bhyve_svm/tools/tools/bootparttest/stub.c
     - copied unchanged from r272887, head/tools/tools/bootparttest/stub.c
  projects/bhyve_svm/usr.bin/basename/tests/
     - copied from r272887, head/usr.bin/basename/tests/
  projects/bhyve_svm/usr.bin/cmp/tests/
     - copied from r272887, head/usr.bin/cmp/tests/
  projects/bhyve_svm/usr.bin/cut/tests/
     - copied from r272887, head/usr.bin/cut/tests/
  projects/bhyve_svm/usr.bin/dirname/tests/
     - copied from r272887, head/usr.bin/dirname/tests/
  projects/bhyve_svm/usr.bin/grep/tests/
     - copied from r272887, head/usr.bin/grep/tests/
  projects/bhyve_svm/usr.bin/gzip/tests/
     - copied from r272887, head/usr.bin/gzip/tests/
  projects/bhyve_svm/usr.sbin/nmtree/tests/
     - copied from r272887, head/usr.sbin/nmtree/tests/
  projects/bhyve_svm/usr.sbin/pw/tests/pw_modify.sh
     - copied unchanged from r272887, head/usr.sbin/pw/tests/pw_modify.sh
Deleted:
  projects/bhyve_svm/sys/pc98/pc98/machdep.c
  projects/bhyve_svm/tools/tools/bootparttest/malloc.c
Modified:
  projects/bhyve_svm/Makefile.inc1
  projects/bhyve_svm/ObsoleteFiles.inc
  projects/bhyve_svm/UPDATING
  projects/bhyve_svm/bin/sh/eval.c
  projects/bhyve_svm/bin/sh/expand.c
  projects/bhyve_svm/bin/sh/jobs.c
  projects/bhyve_svm/bin/sh/parser.c
  projects/bhyve_svm/bin/sh/redir.c
  projects/bhyve_svm/bin/sh/tests/builtins/Makefile
  projects/bhyve_svm/bin/sh/trap.c
  projects/bhyve_svm/bin/sleep/Makefile
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h
  projects/bhyve_svm/cddl/lib/libzfs/Makefile
  projects/bhyve_svm/cddl/lib/libzpool/Makefile
  projects/bhyve_svm/contrib/binutils/bfd/config.bfd
  projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c
  projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
  projects/bhyve_svm/contrib/binutils/include/elf/arm.h
  projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c
  projects/bhyve_svm/contrib/byacc/CHANGES
  projects/bhyve_svm/contrib/byacc/MANIFEST
  projects/bhyve_svm/contrib/byacc/VERSION
  projects/bhyve_svm/contrib/byacc/aclocal.m4
  projects/bhyve_svm/contrib/byacc/btyaccpar.c
  projects/bhyve_svm/contrib/byacc/closure.c
  projects/bhyve_svm/contrib/byacc/config.sub
  projects/bhyve_svm/contrib/byacc/configure
  projects/bhyve_svm/contrib/byacc/configure.in
  projects/bhyve_svm/contrib/byacc/defs.h
  projects/bhyve_svm/contrib/byacc/lalr.c
  projects/bhyve_svm/contrib/byacc/main.c
  projects/bhyve_svm/contrib/byacc/output.c
  projects/bhyve_svm/contrib/byacc/package/byacc.spec
  projects/bhyve_svm/contrib/byacc/package/debian/changelog
  projects/bhyve_svm/contrib/byacc/package/debian/source/format
  projects/bhyve_svm/contrib/byacc/package/mingw-byacc.spec
  projects/bhyve_svm/contrib/byacc/package/pkgsrc/Makefile
  projects/bhyve_svm/contrib/byacc/reader.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/calc.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/calc1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/calc2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/calc3.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/code_calc.code.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/code_calc.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/code_error.code.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/code_error.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/empty.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit3.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit4.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit5.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax10.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax11.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax12.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax13.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax14.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax15.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax16.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax17.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax18.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax19.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax20.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax21.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax22.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax23.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax24.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax25.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax26.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax27.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax3.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax4.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax5.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax6.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7a.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7b.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax8.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax8a.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax9.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/error.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/grammar.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/inherit0.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/inherit1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/inherit2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/ok_syntax1.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/pure_calc.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/pure_error.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc-s.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc2.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc3.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc4.tab.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/rename_debug.c
  projects/bhyve_svm/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
  projects/bhyve_svm/contrib/byacc/test/yacc/calc2.tab.c
  projects/bhyve_svm/contrib/byacc/test/yacc/calc3.tab.c
  projects/bhyve_svm/contrib/byacc/test/yacc/ok_syntax1.tab.c
  projects/bhyve_svm/contrib/byacc/yacc.1
  projects/bhyve_svm/contrib/libpcap/inet.c
  projects/bhyve_svm/contrib/libpcap/pcap.c
  projects/bhyve_svm/contrib/tcpdump/tcpdump.c
  projects/bhyve_svm/etc/devd/Makefile
  projects/bhyve_svm/etc/mtree/BSD.tests.dist
  projects/bhyve_svm/gnu/usr.bin/Makefile
  projects/bhyve_svm/gnu/usr.bin/diff/Makefile
  projects/bhyve_svm/include/rpcsvc/nis.x
  projects/bhyve_svm/include/strings.h
  projects/bhyve_svm/lib/libc/gen/dl_iterate_phdr.3
  projects/bhyve_svm/lib/libc/stdtime/strptime.3
  projects/bhyve_svm/lib/libc/stdtime/strptime.c
  projects/bhyve_svm/lib/libc/string/Makefile.inc
  projects/bhyve_svm/lib/libc/string/Symbol.map
  projects/bhyve_svm/lib/libc/string/bzero.3
  projects/bhyve_svm/lib/libc/sys/accept.2
  projects/bhyve_svm/lib/libcrypt/crypt.c
  projects/bhyve_svm/lib/libnv/nvlist.c
  projects/bhyve_svm/lib/libnv/nvlist_impl.h
  projects/bhyve_svm/lib/libnv/nvpair.c
  projects/bhyve_svm/lib/libnv/nvpair_impl.h
  projects/bhyve_svm/lib/libpcap/Makefile
  projects/bhyve_svm/lib/libpcap/config.h
  projects/bhyve_svm/lib/libproc/Makefile
  projects/bhyve_svm/lib/libproc/libproc.h
  projects/bhyve_svm/lib/libproc/proc_sym.c
  projects/bhyve_svm/lib/libproc/tests/proc_test.c
  projects/bhyve_svm/lib/librtld_db/rtld_db.c
  projects/bhyve_svm/lib/msun/ld128/e_lgammal_r.c
  projects/bhyve_svm/lib/msun/ld80/e_lgammal_r.c
  projects/bhyve_svm/lib/msun/src/e_lgamma_r.c
  projects/bhyve_svm/lib/msun/src/e_lgammaf_r.c
  projects/bhyve_svm/libexec/rtld-elf/rtld.c
  projects/bhyve_svm/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/bhyve_svm/sbin/dumpon/dumpon.8
  projects/bhyve_svm/sbin/ifconfig/iflagg.c
  projects/bhyve_svm/sbin/ipfw/Makefile
  projects/bhyve_svm/sbin/ipfw/ipfw.8
  projects/bhyve_svm/sbin/ipfw/ipfw2.c
  projects/bhyve_svm/sbin/ipfw/ipfw2.h
  projects/bhyve_svm/sbin/ipfw/main.c
  projects/bhyve_svm/sbin/ipfw/nat.c
  projects/bhyve_svm/sbin/swapon/swapon.c
  projects/bhyve_svm/share/man/man4/alc.4
  projects/bhyve_svm/share/man/man5/rc.conf.5
  projects/bhyve_svm/share/man/man9/timeout.9
  projects/bhyve_svm/share/mk/sys.mk
  projects/bhyve_svm/sys/amd64/amd64/minidump_machdep.c
  projects/bhyve_svm/sys/amd64/amd64/pmap.c
  projects/bhyve_svm/sys/amd64/include/md_var.h
  projects/bhyve_svm/sys/amd64/include/pmap.h
  projects/bhyve_svm/sys/amd64/include/vmm.h   (contents, props changed)
  projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
  projects/bhyve_svm/sys/amd64/vmm/intel/vmx_msr.c
  projects/bhyve_svm/sys/amd64/vmm/vmm.c
  projects/bhyve_svm/sys/arm/altera/socfpga/files.socfpga
  projects/bhyve_svm/sys/arm/altera/socfpga/socfpga_machdep.c
  projects/bhyve_svm/sys/arm/arm/dump_machdep.c
  projects/bhyve_svm/sys/arm/arm/minidump_machdep.c
  projects/bhyve_svm/sys/arm/conf/EXYNOS5.common
  projects/bhyve_svm/sys/arm/conf/SOCKIT
  projects/bhyve_svm/sys/arm/include/md_var.h
  projects/bhyve_svm/sys/arm/samsung/exynos/exynos5_machdep.c
  projects/bhyve_svm/sys/arm/samsung/exynos/files.exynos5
  projects/bhyve_svm/sys/boot/common/disk.c
  projects/bhyve_svm/sys/boot/common/disk.h
  projects/bhyve_svm/sys/boot/common/part.c
  projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
  projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
  projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420.dtsi
  projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga-sockit.dts
  projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga.dtsi
  projects/bhyve_svm/sys/boot/i386/gptboot/gptboot.c
  projects/bhyve_svm/sys/cam/cam_xpt.c
  projects/bhyve_svm/sys/cam/ctl/ctl.c
  projects/bhyve_svm/sys/cam/ctl/ctl_backend.h
  projects/bhyve_svm/sys/cam/ctl/ctl_backend_block.c
  projects/bhyve_svm/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/bhyve_svm/sys/cam/ctl/ctl_cmd_table.c
  projects/bhyve_svm/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/bhyve_svm/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/bhyve_svm/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/bhyve_svm/sys/cam/ctl/ctl_private.h
  projects/bhyve_svm/sys/cam/ctl/scsi_ctl.c
  projects/bhyve_svm/sys/cam/scsi/scsi_all.h
  projects/bhyve_svm/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  projects/bhyve_svm/sys/cddl/compat/opensolaris/sys/assfail.h
  projects/bhyve_svm/sys/cddl/compat/opensolaris/sys/kmem.h
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/bhyve_svm/sys/compat/freebsd32/freebsd32_proto.h
  projects/bhyve_svm/sys/compat/freebsd32/freebsd32_syscall.h
  projects/bhyve_svm/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/bhyve_svm/sys/compat/freebsd32/freebsd32_sysent.c
  projects/bhyve_svm/sys/compat/freebsd32/syscalls.master
  projects/bhyve_svm/sys/conf/Makefile.arm
  projects/bhyve_svm/sys/conf/NOTES
  projects/bhyve_svm/sys/conf/files
  projects/bhyve_svm/sys/conf/files.pc98
  projects/bhyve_svm/sys/conf/kern.mk
  projects/bhyve_svm/sys/conf/newvers.sh
  projects/bhyve_svm/sys/conf/options
  projects/bhyve_svm/sys/conf/options.pc98
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/fil.c
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_dstlist.c
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/bhyve_svm/sys/dev/acpica/acpi.c
  projects/bhyve_svm/sys/dev/acpica/acpi_pci.c
  projects/bhyve_svm/sys/dev/acpica/acpivar.h
  projects/bhyve_svm/sys/dev/ahci/ahci.c
  projects/bhyve_svm/sys/dev/alc/if_alc.c
  projects/bhyve_svm/sys/dev/alc/if_alcreg.h
  projects/bhyve_svm/sys/dev/alc/if_alcvar.h
  projects/bhyve_svm/sys/dev/ale/if_ale.c
  projects/bhyve_svm/sys/dev/ale/if_alereg.h
  projects/bhyve_svm/sys/dev/cxgbe/common/t4_msg.h
  projects/bhyve_svm/sys/dev/cxgbe/tom/t4_connect.c
  projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom.c
  projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom.h
  projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom_l2t.c
  projects/bhyve_svm/sys/dev/drm2/i915/intel_ringbuffer.c
  projects/bhyve_svm/sys/dev/hwpmc/hwpmc_core.c
  projects/bhyve_svm/sys/dev/iscsi/icl.c
  projects/bhyve_svm/sys/dev/iscsi/icl.h
  projects/bhyve_svm/sys/dev/iscsi/iscsi.c
  projects/bhyve_svm/sys/dev/mmc/mmc.c
  projects/bhyve_svm/sys/dev/mpr/mpr_sas.c
  projects/bhyve_svm/sys/dev/mpr/mpr_table.c
  projects/bhyve_svm/sys/dev/mrsas/mrsas.c
  projects/bhyve_svm/sys/dev/mrsas/mrsas.h
  projects/bhyve_svm/sys/dev/mrsas/mrsas_cam.c
  projects/bhyve_svm/sys/dev/mrsas/mrsas_fp.c
  projects/bhyve_svm/sys/dev/mrsas/mrsas_ioctl.c
  projects/bhyve_svm/sys/dev/mrsas/mrsas_ioctl.h
  projects/bhyve_svm/sys/dev/pci/pci.c
  projects/bhyve_svm/sys/dev/uart/uart_bus_fdt.c
  projects/bhyve_svm/sys/dev/usb/usb_freebsd.h
  projects/bhyve_svm/sys/dev/usb/usb_freebsd_loader.h
  projects/bhyve_svm/sys/dev/usb/usb_hub.c
  projects/bhyve_svm/sys/dev/usb/usbdevs
  projects/bhyve_svm/sys/dev/vt/vt_core.c
  projects/bhyve_svm/sys/fs/autofs/autofs.c
  projects/bhyve_svm/sys/fs/autofs/autofs.h
  projects/bhyve_svm/sys/fs/autofs/autofs_vfsops.c
  projects/bhyve_svm/sys/fs/autofs/autofs_vnops.c
  projects/bhyve_svm/sys/fs/devfs/devfs_vnops.c
  projects/bhyve_svm/sys/geom/geom_dev.c
  projects/bhyve_svm/sys/i386/i386/machdep.c
  projects/bhyve_svm/sys/i386/i386/minidump_machdep.c
  projects/bhyve_svm/sys/i386/i386/pmap.c
  projects/bhyve_svm/sys/i386/i386/vm_machdep.c
  projects/bhyve_svm/sys/i386/include/md_var.h
  projects/bhyve_svm/sys/i386/include/pmap.h
  projects/bhyve_svm/sys/kern/bus_if.m
  projects/bhyve_svm/sys/kern/imgact_elf.c
  projects/bhyve_svm/sys/kern/init_sysent.c
  projects/bhyve_svm/sys/kern/kern_descrip.c
  projects/bhyve_svm/sys/kern/kern_event.c
  projects/bhyve_svm/sys/kern/kern_exit.c
  projects/bhyve_svm/sys/kern/kern_intr.c
  projects/bhyve_svm/sys/kern/kern_proc.c
  projects/bhyve_svm/sys/kern/kern_prot.c
  projects/bhyve_svm/sys/kern/kern_racct.c
  projects/bhyve_svm/sys/kern/kern_sig.c
  projects/bhyve_svm/sys/kern/kern_timeout.c
  projects/bhyve_svm/sys/kern/subr_bus.c
  projects/bhyve_svm/sys/kern/syscalls.c
  projects/bhyve_svm/sys/kern/syscalls.master
  projects/bhyve_svm/sys/kern/tty.c
  projects/bhyve_svm/sys/kern/uipc_syscalls.c
  projects/bhyve_svm/sys/kern/vfs_bio.c
  projects/bhyve_svm/sys/kern/vfs_vnops.c
  projects/bhyve_svm/sys/mips/include/md_var.h
  projects/bhyve_svm/sys/mips/mips/dump_machdep.c
  projects/bhyve_svm/sys/mips/mips/minidump_machdep.c
  projects/bhyve_svm/sys/modules/Makefile
  projects/bhyve_svm/sys/modules/ipfw/Makefile
  projects/bhyve_svm/sys/modules/mrsas/Makefile
  projects/bhyve_svm/sys/net/ieee8023ad_lacp.c
  projects/bhyve_svm/sys/net/ieee8023ad_lacp.h
  projects/bhyve_svm/sys/net/if_bridge.c
  projects/bhyve_svm/sys/net/if_disc.c
  projects/bhyve_svm/sys/net/if_edsc.c
  projects/bhyve_svm/sys/net/if_enc.c
  projects/bhyve_svm/sys/net/if_gif.c
  projects/bhyve_svm/sys/net/if_lagg.c
  projects/bhyve_svm/sys/net/if_lagg.h
  projects/bhyve_svm/sys/netgraph/ng_ipfw.c
  projects/bhyve_svm/sys/netinet/ip6.h
  projects/bhyve_svm/sys/netinet/ip_fw.h
  projects/bhyve_svm/sys/netinet/ip_gre.c
  projects/bhyve_svm/sys/netinet/sctp_input.c
  projects/bhyve_svm/sys/netinet/sctp_output.c
  projects/bhyve_svm/sys/netinet/sctp_output.h
  projects/bhyve_svm/sys/netinet/sctp_usrreq.c
  projects/bhyve_svm/sys/netinet/sctputil.c
  projects/bhyve_svm/sys/netinet/tcp_output.c
  projects/bhyve_svm/sys/netinet/tcp_timer.c
  projects/bhyve_svm/sys/netinet/tcp_var.h
  projects/bhyve_svm/sys/netinet/udp_usrreq.c
  projects/bhyve_svm/sys/netinet/udp_var.h
  projects/bhyve_svm/sys/netinet6/udp6_usrreq.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_dummynet.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw2.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_dynamic.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_log.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_nat.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_private.h
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mlx4.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/device.h
  projects/bhyve_svm/sys/sys/bus.h
  projects/bhyve_svm/sys/sys/cdefs.h
  projects/bhyve_svm/sys/sys/event.h
  projects/bhyve_svm/sys/sys/filedesc.h
  projects/bhyve_svm/sys/sys/mbuf.h
  projects/bhyve_svm/sys/sys/param.h
  projects/bhyve_svm/sys/sys/racct.h
  projects/bhyve_svm/sys/sys/socketvar.h
  projects/bhyve_svm/sys/sys/syscall.h
  projects/bhyve_svm/sys/sys/syscall.mk
  projects/bhyve_svm/sys/sys/sysproto.h
  projects/bhyve_svm/sys/sys/systm.h
  projects/bhyve_svm/sys/sys/ucred.h
  projects/bhyve_svm/sys/sys/vnode.h
  projects/bhyve_svm/sys/ufs/ufs/dir.h
  projects/bhyve_svm/sys/vm/uma_core.c
  projects/bhyve_svm/sys/vm/vm_glue.c
  projects/bhyve_svm/sys/vm/vm_pageout.c
  projects/bhyve_svm/sys/x86/acpica/srat.c
  projects/bhyve_svm/sys/x86/include/specialreg.h
  projects/bhyve_svm/sys/x86/x86/dump_machdep.c
  projects/bhyve_svm/sys/x86/x86/local_apic.c
  projects/bhyve_svm/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_svm/tools/sched/schedgraph.py
  projects/bhyve_svm/tools/tools/ath/athalq/ar9300_ds.c
  projects/bhyve_svm/tools/tools/bootparttest/Makefile
  projects/bhyve_svm/tools/tools/bootparttest/bootparttest.c
  projects/bhyve_svm/usr.bin/basename/Makefile
  projects/bhyve_svm/usr.bin/cmp/Makefile
  projects/bhyve_svm/usr.bin/cut/Makefile
  projects/bhyve_svm/usr.bin/dirname/Makefile
  projects/bhyve_svm/usr.bin/find/function.c
  projects/bhyve_svm/usr.bin/grep/Makefile
  projects/bhyve_svm/usr.bin/gzip/Makefile
  projects/bhyve_svm/usr.bin/mkimg/Makefile
  projects/bhyve_svm/usr.bin/mkimg/ebr.c
  projects/bhyve_svm/usr.bin/mkimg/mbr.c
  projects/bhyve_svm/usr.bin/mkimg/mkimg.c
  projects/bhyve_svm/usr.bin/mkimg/mkimg.h
  projects/bhyve_svm/usr.bin/mkimg/pc98.c
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
  projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
  projects/bhyve_svm/usr.bin/w/w.c
  projects/bhyve_svm/usr.sbin/autofs/common.c
  projects/bhyve_svm/usr.sbin/bhyve/acpi.c
  projects/bhyve_svm/usr.sbin/bhyve/pci_virtio_block.c
  projects/bhyve_svm/usr.sbin/bhyve/xmsr.c
  projects/bhyve_svm/usr.sbin/ctladm/ctladm.8
  projects/bhyve_svm/usr.sbin/newsyslog/newsyslog.c
  projects/bhyve_svm/usr.sbin/nmtree/Makefile
  projects/bhyve_svm/usr.sbin/nscd/query.c
  projects/bhyve_svm/usr.sbin/pw/pw_user.c
  projects/bhyve_svm/usr.sbin/pw/tests/Makefile
Directory Properties:
  projects/bhyve_svm/   (props changed)
  projects/bhyve_svm/cddl/   (props changed)
  projects/bhyve_svm/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/bhyve_svm/contrib/binutils/   (props changed)
  projects/bhyve_svm/contrib/byacc/   (props changed)
  projects/bhyve_svm/contrib/libpcap/   (props changed)
  projects/bhyve_svm/contrib/tcpdump/   (props changed)
  projects/bhyve_svm/etc/   (props changed)
  projects/bhyve_svm/include/   (props changed)
  projects/bhyve_svm/lib/libc/   (props changed)
  projects/bhyve_svm/lib/libc/stdtime/   (props changed)
  projects/bhyve_svm/sbin/   (props changed)
  projects/bhyve_svm/sbin/dumpon/   (props changed)
  projects/bhyve_svm/sbin/ipfw/   (props changed)
  projects/bhyve_svm/share/   (props changed)
  projects/bhyve_svm/share/man/man4/   (props changed)
  projects/bhyve_svm/sys/   (props changed)
  projects/bhyve_svm/sys/amd64/vmm/   (props changed)
  projects/bhyve_svm/sys/boot/   (props changed)
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_svm/sys/conf/   (props changed)
  projects/bhyve_svm/sys/contrib/ipfilter/   (props changed)
  projects/bhyve_svm/usr.bin/mkimg/   (props changed)
  projects/bhyve_svm/usr.sbin/bhyve/   (props changed)

Modified: projects/bhyve_svm/Makefile.inc1
==============================================================================
--- projects/bhyve_svm/Makefile.inc1	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/Makefile.inc1	Fri Oct 10 23:52:56 2014	(r272921)
@@ -299,6 +299,10 @@ HMAKE+=		PATH=${TMPPATH} METALOG=${METAL
 WMAKEENV+=	MK_CTF=no
 .endif
 
+.if defined(CROSS_TOOLCHAIN)
+LOCALBASE?=	/usr/local
+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.endif
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
@@ -311,7 +315,7 @@ X${COMPILER}?=	${CROSS_COMPILER_PREFIX}$
 X${COMPILER}?=	${${COMPILER}}
 .endif
 .endfor
-XBINUTILS=	AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX)
 X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +326,9 @@ X${BINUTIL}?=	${${BINUTIL}}
 WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
 		CPP="${XCPP} ${XFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
-		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+		OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
+		SIZE="${XSIZE}"
 
 .if ${XCC:M/*}
 XFLAGS=		--sysroot=${WORLDTMP}
@@ -343,10 +349,14 @@ TARGET_ABI=	gnueabihf
 TARGET_ABI=	gnueabi
 .endif
 .endif
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+XFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+.else
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
+.endif
 
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
@@ -1531,9 +1541,12 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
+		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+		${_cddl_lib_libuutil} \
 		${_cddl_lib_libavl} \
 		${_cddl_lib_libzfs_core} \
+		${_cddl_lib_libctf} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1543,6 +1556,8 @@ gnu/lib/libstdc++__L: lib/msun__L
 gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
+lib/libgeom__L: lib/libexpat__L
+
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
 .if !defined(WITH_ATF)
 # Ensure that the ATF libraries will be built during make libraries, even
@@ -1580,9 +1595,13 @@ lib/libopie__L lib/libtacplus__L: lib/li
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
+_cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
+_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
 
 .if ${MK_CRYPT} != "no"

Modified: projects/bhyve_svm/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_svm/ObsoleteFiles.inc	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/ObsoleteFiles.inc	Fri Oct 10 23:52:56 2014	(r272921)
@@ -1496,6 +1496,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libproc.so.2
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3

Modified: projects/bhyve_svm/UPDATING
==============================================================================
--- projects/bhyve_svm/UPDATING	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/UPDATING	Fri Oct 10 23:52:56 2014	(r272921)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20141009:
+	gperf has been removed from the base system for architectures
+	that use clang. Ports that require gperf will obtain it from the
+	devel/gperf port.
+
 20140923:
 	pjdfstest has been moved from tools/regression/pjdfstest to
 	contrib/pjdfstest .

Modified: projects/bhyve_svm/bin/sh/eval.c
==============================================================================
--- projects/bhyve_svm/bin/sh/eval.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/eval.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -316,9 +316,10 @@ evalloop(union node *n, int flags)
 	loopnest++;
 	status = 0;
 	for (;;) {
-		evaltree(n->nbinary.ch1, EV_TESTED);
+		if (!evalskip)
+			evaltree(n->nbinary.ch1, EV_TESTED);
 		if (evalskip) {
-skipping:	  if (evalskip == SKIPCONT && --skipcount <= 0) {
+			if (evalskip == SKIPCONT && --skipcount <= 0) {
 				evalskip = 0;
 				continue;
 			}
@@ -337,8 +338,6 @@ skipping:	  if (evalskip == SKIPCONT && 
 		}
 		evaltree(n->nbinary.ch2, flags);
 		status = exitstatus;
-		if (evalskip)
-			goto skipping;
 	}
 	loopnest--;
 	exitstatus = status;
@@ -648,15 +647,15 @@ evalbackcmd(union node *n, struct backcm
 	struct jmploc *savehandler;
 	struct localvar *savelocalvars;
 
-	setstackmark(&smark);
 	result->fd = -1;
 	result->buf = NULL;
 	result->nleft = 0;
 	result->jp = NULL;
 	if (n == NULL) {
 		exitstatus = 0;
-		goto out;
+		return;
 	}
+	setstackmark(&smark);
 	exitstatus = oexitstatus;
 	if (is_valid_fast_cmdsubst(n)) {
 		savelocalvars = localvars;
@@ -698,7 +697,6 @@ evalbackcmd(union node *n, struct backcm
 		result->fd = pip[0];
 		result->jp = jp;
 	}
-out:
 	popstackmark(&smark);
 	TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n",
 		result->fd, result->buf, result->nleft, result->jp));

Modified: projects/bhyve_svm/bin/sh/expand.c
==============================================================================
--- projects/bhyve_svm/bin/sh/expand.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/expand.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -328,24 +328,19 @@ exptilde(char *p, int flag)
 done:
 	*p = '\0';
 	if (*(startp+1) == '\0') {
-		if ((home = lookupvar("HOME")) == NULL)
-			goto lose;
+		home = lookupvar("HOME");
 	} else {
-		if ((pw = getpwnam(startp+1)) == NULL)
-			goto lose;
-		home = pw->pw_dir;
+		pw = getpwnam(startp+1);
+		home = pw != NULL ? pw->pw_dir : NULL;
 	}
-	if (*home == '\0')
-		goto lose;
 	*p = c;
+	if (home == NULL || *home == '\0')
+		return (startp);
 	if (quotes)
 		STPUTS_QUOTES(home, SQSYNTAX, expdest);
 	else
 		STPUTS(home, expdest);
 	return (p);
-lose:
-	*p = c;
-	return (startp);
 }
 
 

Modified: projects/bhyve_svm/bin/sh/jobs.c
==============================================================================
--- projects/bhyve_svm/bin/sh/jobs.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/jobs.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -373,13 +373,13 @@ showjob(struct job *jp, int mode)
 			strcat(statestr, " (core dumped)");
 	}
 
-	for (ps = jp->ps ; ; ps++) {	/* for each process */
+	for (ps = jp->ps ; procno > 0 ; ps++, procno--) { /* for each process */
 		if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
 			out1fmt("%d\n", (int)ps->pid);
-			goto skip;
+			continue;
 		}
 		if (mode != SHOWJOBS_VERBOSE && ps != jp->ps)
-			goto skip;
+			continue;
 		if (jobno == curr && ps == jp->ps)
 			c = '+';
 		else if (jobno == prev && ps == jp->ps)
@@ -410,8 +410,6 @@ showjob(struct job *jp, int mode)
 			out1c('\n');
 		} else
 			printjobcmd(jp);
-skip:		if (--procno <= 0)
-			break;
 	}
 }
 

Modified: projects/bhyve_svm/bin/sh/parser.c
==============================================================================
--- projects/bhyve_svm/bin/sh/parser.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/parser.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -1279,6 +1279,13 @@ readcstyleesc(char *out)
 				c = pgetc();
 			if (c == PEOF)
 				synerror("Unterminated quoted string");
+			if (c == '\n') {
+				plinno++;
+				if (doprompt)
+					setprompt(2);
+				else
+					setprompt(0);
+			}
 		}
 		pungetc();
 		return out;

Modified: projects/bhyve_svm/bin/sh/redir.c
==============================================================================
--- projects/bhyve_svm/bin/sh/redir.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/redir.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -173,21 +173,12 @@ openredirect(union node *redir, char mem
 		fname = redir->nfile.expfname;
 		if ((f = open(fname, O_RDONLY)) < 0)
 			error("cannot open %s: %s", fname, strerror(errno));
-movefd:
-		if (f != fd) {
-			if (dup2(f, fd) == -1) {
-				e = errno;
-				close(f);
-				error("%d: %s", fd, strerror(e));
-			}
-			close(f);
-		}
 		break;
 	case NFROMTO:
 		fname = redir->nfile.expfname;
 		if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
 			error("cannot create %s: %s", fname, strerror(errno));
-		goto movefd;
+		break;
 	case NTO:
 		if (Cflag) {
 			fname = redir->nfile.expfname;
@@ -205,19 +196,19 @@ movefd:
 			} else
 				error("cannot create %s: %s", fname,
 				    strerror(EEXIST));
-			goto movefd;
+			break;
 		}
 		/* FALLTHROUGH */
 	case NCLOBBER:
 		fname = redir->nfile.expfname;
 		if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
 			error("cannot create %s: %s", fname, strerror(errno));
-		goto movefd;
+		break;
 	case NAPPEND:
 		fname = redir->nfile.expfname;
 		if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
 			error("cannot create %s: %s", fname, strerror(errno));
-		goto movefd;
+		break;
 	case NTOFD:
 	case NFROMFD:
 		if (redir->ndup.dupfd >= 0) {	/* if not ">&-" */
@@ -231,14 +222,22 @@ movefd:
 		} else {
 			close(fd);
 		}
-		break;
+		return;
 	case NHERE:
 	case NXHERE:
 		f = openhere(redir);
-		goto movefd;
+		break;
 	default:
 		abort();
 	}
+	if (f != fd) {
+		if (dup2(f, fd) == -1) {
+			e = errno;
+			close(f);
+			error("%d: %s", fd, strerror(e));
+		}
+		close(f);
+	}
 }
 
 

Modified: projects/bhyve_svm/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/bhyve_svm/bin/sh/tests/builtins/Makefile	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/tests/builtins/Makefile	Fri Oct 10 23:52:56 2014	(r272921)
@@ -100,6 +100,7 @@ FILES+=		jobid2.0
 FILES+=		kill1.0 kill2.0
 FILES+=		lineno.0 lineno.0.stdout
 FILES+=		lineno2.0
+FILES+=		lineno3.0 lineno3.0.stdout
 FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		local3.0

Copied: projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0 (from r272887, head/bin/sh/tests/builtins/lineno3.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0	Fri Oct 10 23:52:56 2014	(r272921, copy of r272887, head/bin/sh/tests/builtins/lineno3.0)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO

Copied: projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout (from r272887, head/bin/sh/tests/builtins/lineno3.0.stdout)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout	Fri Oct 10 23:52:56 2014	(r272921, copy of r272887, head/bin/sh/tests/builtins/lineno3.0.stdout)
@@ -0,0 +1,2 @@
+before: 3
+after: 6

Modified: projects/bhyve_svm/bin/sh/trap.c
==============================================================================
--- projects/bhyve_svm/bin/sh/trap.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sh/trap.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -510,28 +510,25 @@ exitshell_savedstatus(void)
 			exiting_exitstatus = oexitstatus;
 	}
 	exitstatus = oexitstatus = exiting_exitstatus;
-	if (setjmp(loc1.loc)) {
-		goto l1;
+	if (!setjmp(loc1.loc)) {
+		handler = &loc1;
+		if ((p = trap[0]) != NULL && *p != '\0') {
+			/*
+			 * Reset evalskip, or the trap on EXIT could be
+			 * interrupted if the last command was a "return".
+			 */
+			evalskip = 0;
+			trap[0] = NULL;
+			evalstring(p, 0);
+		}
 	}
-	if (setjmp(loc2.loc)) {
-		goto l2;
-	}
-	handler = &loc1;
-	if ((p = trap[0]) != NULL && *p != '\0') {
-		/*
-		 * Reset evalskip, or the trap on EXIT could be
-		 * interrupted if the last command was a "return".
-		 */
-		evalskip = 0;
-		trap[0] = NULL;
-		evalstring(p, 0);
-	}
-l1:   handler = &loc2;			/* probably unnecessary */
-	flushall();
+	if (!setjmp(loc2.loc)) {
+		handler = &loc2;		/* probably unnecessary */
+		flushall();
 #if JOBS
-	setjobctl(0);
+		setjobctl(0);
 #endif
-l2:
+	}
 	if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
 	    sig != SIGTTOU) {
 		signal(sig, SIG_DFL);

Modified: projects/bhyve_svm/bin/sleep/Makefile
==============================================================================
--- projects/bhyve_svm/bin/sleep/Makefile	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/bin/sleep/Makefile	Fri Oct 10 23:52:56 2014	(r272921)
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	sleep
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Fri Oct 10 23:52:56 2014	(r272921)
@@ -38,7 +38,7 @@ fi
 ./$exe &
 pid=$!
 
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
 typedef struct info {
         char    *zi_gamename;
         int     zi_ndungeons;

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Fri Oct 10 23:52:56 2014	(r272921)
@@ -21,7 +21,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 24, 2013
+.Dd October 8, 2014
 .Dt LOCKSTAT 1
 .Os
 .Sh NAME
@@ -238,10 +238,11 @@ Average duration of the events in nanose
 For the profiling event, duration means interrupt latency.
 .It Lock
 Address of the lock; displayed symbolically if possible.
-.It CPU+PIL
-CPU plus processor interrupt level (PIL).
-For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
-cpu[4]+6.
+.It CPU+Pri_Class
+CPU plus the priority class of the interrupted thread.
+For example, if CPU 4 is interrupted while running a timeshare thread, this
+will be reported as
+.Ql cpu[4]+TShar .
 .It Caller
 Address of the caller; displayed symbolically if possible.
 .El

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -76,8 +76,10 @@
 
 #ifndef lint
 extern boolean_t zfs_recover;
+extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
 #else
 boolean_t zfs_recover;
+uint64_t zfs_arc_max, zfs_arc_meta_limit;
 #endif
 
 const char cmdname[] = "zdb";
@@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *);
 uint64_t *zopt_object = NULL;
 int zopt_objects = 0;
 libzfs_handle_t *g_zfs;
-uint64_t max_inflight = 200;
+uint64_t max_inflight = 1000;
 
 /*
  * These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -1461,6 +1463,11 @@ dump_deadlist(dsl_deadlist_t *dl)
 	if (dump_opt['d'] < 3)
 		return;
 
+	if (dl->dl_oldfmt) {
+		dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+		return;
+	}
+
 	zdb_nicenum(dl->dl_phys->dl_used, bytes);
 	zdb_nicenum(dl->dl_phys->dl_comp, comp);
 	zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
@@ -2377,7 +2384,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 
 	zcb->zcb_readfails = 0;
 
-	if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+	if (dump_opt['b'] < 5 &&
 	    gethrtime() > zcb->zcb_lastprint + NANOSEC) {
 		uint64_t now = gethrtime();
 		char buf[10];
@@ -2462,9 +2469,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 
 	if (!dump_opt['L']) {
 		vdev_t *rvd = spa->spa_root_vdev;
-		for (int c = 0; c < rvd->vdev_children; c++) {
+		for (uint64_t c = 0; c < rvd->vdev_children; c++) {
 			vdev_t *vd = rvd->vdev_child[c];
-			for (int m = 0; m < vd->vdev_ms_count; m++) {
+			for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				mutex_enter(&msp->ms_lock);
 				metaslab_unload(msp);
@@ -2477,6 +2484,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 				 * interfaces.
 				 */
 				if (msp->ms_sm != NULL) {
+					(void) fprintf(stderr,
+					    "\rloading space map for "
+					    "vdev %llu of %llu, "
+					    "metaslab %llu of %llu ...",
+					    (longlong_t)c,
+					    (longlong_t)rvd->vdev_children,
+					    (longlong_t)m,
+					    (longlong_t)vd->vdev_ms_count);
+
 					msp->ms_ops = &zdb_metaslab_ops;
 					VERIFY0(space_map_load(msp->ms_sm,
 					    msp->ms_tree, SM_ALLOC));
@@ -2485,6 +2501,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 				mutex_exit(&msp->ms_lock);
 			}
 		}
+		(void) fprintf(stderr, "\n");
 	}
 
 	spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
@@ -2594,10 +2611,12 @@ dump_block_stats(spa_t *spa)
 	 * all async I/Os to complete.
 	 */
 	if (dump_opt['c']) {
-		(void) zio_wait(spa->spa_async_zio_root);
-		spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
-		    ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
-		    ZIO_FLAG_GODFATHER);
+		for (int i = 0; i < max_ncpus; i++) {
+			(void) zio_wait(spa->spa_async_zio_root[i]);
+			spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+			    ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+			    ZIO_FLAG_GODFATHER);
+		}
 	}
 
 	if (zcb.zcb_haderrors) {
@@ -3483,6 +3502,12 @@ main(int argc, char **argv)
 		usage();
 	}
 
+	/*
+	 * ZDB does not typically re-read blocks; therefore limit the ARC
+	 * to 256 MB, which can be used entirely for metadata.
+	 */
+	zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
+
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
 	ASSERT(g_zfs != NULL);

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -2857,10 +2857,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
 
 		right_justify = B_FALSE;
 		if (pl->pl_prop != ZPROP_INVAL) {
-			if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
-			    zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
-				propstr = "-";
-			else if (zpool_get_prop(zhp, pl->pl_prop, property,
+			if (zpool_get_prop(zhp, pl->pl_prop, property,
 			    sizeof (property), NULL, cb->cb_literal) != 0)
 				propstr = "-";
 			else
@@ -2894,21 +2891,37 @@ print_pool(zpool_handle_t *zhp, list_cbd
 }
 
 static void
-print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted,
+    boolean_t valid)
 {
 	char propval[64];
 	boolean_t fixed;
 	size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
 
-
-	if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
-		(void) strlcpy(propval, "-", sizeof (propval));
-	else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
-		(void) strlcpy(propval, "-", sizeof (propval));
-	else if (prop == ZPOOL_PROP_FRAGMENTATION)
+	switch (prop) {
+	case ZPOOL_PROP_EXPANDSZ:
+		if (value == 0)
+			(void) strlcpy(propval, "-", sizeof (propval));
+		else
+			zfs_nicenum(value, propval, sizeof (propval));
+		break;
+	case ZPOOL_PROP_FRAGMENTATION:
+		if (value == ZFS_FRAG_INVALID) {
+			(void) strlcpy(propval, "-", sizeof (propval));
+		} else {
+			(void) snprintf(propval, sizeof (propval), "%llu%%",
+			    value);
+		}
+		break;
+	case ZPOOL_PROP_CAPACITY:
 		(void) snprintf(propval, sizeof (propval), "%llu%%", value);
-	else
+		break;
+	default:
 		zfs_nicenum(value, propval, sizeof (propval));
+	}
+
+	if (!valid)
+		(void) strlcpy(propval, "-", sizeof (propval));
 
 	if (scripted)
 		(void) printf("\t%s", propval);
@@ -2930,6 +2943,9 @@ print_list_stats(zpool_handle_t *zhp, co
 	    (uint64_t **)&vs, &c) == 0);
 
 	if (name != NULL) {
+		boolean_t toplevel = (vs->vs_space != 0);
+		uint64_t cap;
+
 		if (scripted)
 			(void) printf("\t%s", name);
 		else if (strlen(name) + depth > cb->cb_namewidth)
@@ -2938,24 +2954,26 @@ print_list_stats(zpool_handle_t *zhp, co
 			(void) printf("%*s%s%*s", depth, "", name,
 			    (int)(cb->cb_namewidth - strlen(name) - depth), "");
 
-		/* only toplevel vdevs have capacity stats */
-		if (vs->vs_space == 0) {
-			if (scripted)
-				(void) printf("\t-\t-\t-\t-");
-			else
-				(void) printf("      -      -      -      -");
-		} else {
-			print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
-			    scripted);
-			print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
-			    scripted);
-			print_one_column(ZPOOL_PROP_FREE,
-			    vs->vs_space - vs->vs_alloc, scripted);
-			print_one_column(ZPOOL_PROP_FRAGMENTATION,
-			    vs->vs_fragmentation, scripted);
-		}
-		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
-		    scripted);
+		/*
+		 * Print the properties for the individual vdevs. Some
+		 * properties are only applicable to toplevel vdevs. The
+		 * 'toplevel' boolean value is passed to the print_one_column()
+		 * to indicate that the value is valid.
+		 */
+		print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted,
+		    toplevel);
+		print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted,
+		    toplevel);
+		print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc,
+		    scripted, toplevel);
+		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted,
+		    B_TRUE);
+		print_one_column(ZPOOL_PROP_FRAGMENTATION,
+		    vs->vs_fragmentation, scripted,
+		    (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel));
+		cap = (vs->vs_space == 0) ? 0 :
+		    (vs->vs_alloc * 100 / vs->vs_space);
+		print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel);
 		(void) printf("\n");
 	}
 
@@ -3024,7 +3042,8 @@ list_callback(zpool_handle_t *zhp, void 
  *	-H	Scripted mode.  Don't display headers, and separate properties
  *		by a single tab.
  *	-o	List of properties to display.  Defaults to
- *		"name,size,allocated,free,capacity,health,altroot"
+ *		"name,size,allocated,free,expandsize,fragmentation,capacity,"
+ *		"dedupratio,health,altroot"
  * 	-p	Diplay values in parsable (exact) format.
  *	-T	Display a timestamp in date(1) or Unix format
  *
@@ -3038,7 +3057,7 @@ zpool_do_list(int argc, char **argv)
 	int ret;
 	list_cbdata_t cb = { 0 };
 	static char default_props[] =
-	    "name,size,allocated,free,fragmentation,expandsize,capacity,"
+	    "name,size,allocated,free,expandsize,fragmentation,capacity,"
 	    "dedupratio,health,altroot";
 	char *props = default_props;
 	unsigned long interval = 0, count = 0;

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Fri Oct 10 23:52:56 2014	(r272921)
@@ -207,6 +207,8 @@
 %type	<l_tok>		unary_operator
 %type	<l_tok>		struct_or_union
 
+%type	<l_str>		dtrace_keyword_ident
+
 %%
 
 dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
 	|	postfix_expression DT_TOK_DOT DT_TOK_TNAME {
 			$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
 		}
+	|	postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+			$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+		}
 	|	postfix_expression DT_TOK_PTR DT_TOK_IDENT {
 			$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
 		}
 	|	postfix_expression DT_TOK_PTR DT_TOK_TNAME {
 			$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
 		}
+	|	postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+			$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+		}
 	|	postfix_expression DT_TOK_ADDADD {
 			$$ = OP1(DT_TOK_POSTINC, $1);
 		}
@@ -411,6 +419,10 @@ postfix_expression:
 		    DT_TOK_TNAME DT_TOK_RPAR {
 			$$ = dt_node_offsetof($3, $5);
 		}
+	|	DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+		    dtrace_keyword_ident DT_TOK_RPAR {
+			$$ = dt_node_offsetof($3, $5);
+		}
 	|	DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
 		    DT_TOK_LPAR expression DT_TOK_RPAR {
 			$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
 	|	parameter_type_list	{ $$ = $1; }
 	;
 
+dtrace_keyword_ident:
+	  DT_KEY_PROBE { $$ = DUP("probe"); }
+	| DT_KEY_PROVIDER { $$ = DUP("provider"); }
+	| DT_KEY_SELF { $$ = DUP("self"); }
+	| DT_KEY_STRING { $$ = DUP("string"); }
+	| DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+	| DT_KEY_USERLAND { $$ = DUP("userland"); }
+	| DT_TOK_XLATE { $$ = DUP("xlate"); }
+	| DT_KEY_XLATOR { $$ = DUP("translator"); }
+	;
+
 %%

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -434,15 +434,10 @@ static const prmap_t *
 dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
 {
 	char m[MAXPATHLEN];
-#if defined(sun)
 	Lmid_t lmid = PR_LMID_EVERY;
-#else
-	Lmid_t lmid = 0;
-#endif
 	const char *obj;
 	const prmap_t *pmp;
 
-#if defined(sun)
 	/*
 	 * Pick apart the link map from the library name.
 	 */
@@ -463,20 +458,17 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp, 
 	} else {
 		obj = pdp->dtpd_mod;
 	}
-#else
-	obj = pdp->dtpd_mod;
-#endif
 
 	if ((pmp = Plmid_to_map(P, lmid, obj)) == NULL)
 		return (NULL);
 
-#if defined(sun)
 	(void) Pobjname(P, pmp->pr_vaddr, m, sizeof (m));
 	if ((obj = strrchr(m, '/')) == NULL)
 		obj = &m[0];
 	else
 		obj++;
 
+#if defined(sun)
 	(void) Plmid(P, pmp->pr_vaddr, &lmid);
 #endif
 
@@ -571,9 +563,7 @@ dt_pid_usdt_mapping(void *data, const pr
 {
 	struct ps_prochandle *P = data;
 	GElf_Sym sym;
-#if defined(sun)
 	prsyminfo_t sip;
-#endif
 	dof_helper_t dh;
 	GElf_Half e_type;
 	const char *mname;
@@ -852,11 +842,7 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
 	ctf_funcinfo_t f;
 	ctf_id_t argv[32];
 	GElf_Sym sym;
-#if defined(sun)
 	prsyminfo_t si;
-#else
-	void *si;
-#endif
 	struct ps_prochandle *p;
 	int i, args;
 	char buf[DTRACE_ARGTYPELEN];
@@ -941,13 +927,11 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
 		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
 		goto out;
 	}
-#if defined(sun)
 	if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
 		dt_dprintf("failed to get ctf information for %s in %s`%s\n",
 		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
 		goto out;
 	}
-#endif
 
 	(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
 	    pdp->dtpd_mod);
@@ -977,7 +961,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
 		(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
 		    ret, DTRACE_ARGTYPELEN - ret, buf);
 		*nargs = 2;
-#if defined(sun)
 	} else {
 		if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
 			goto out;
@@ -993,7 +976,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
 			(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
 			    ret, DTRACE_ARGTYPELEN - ret, buf);
 		}
-#endif
 	}
 out:
 	dt_proc_unlock(dtp, p);

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
@@ -304,7 +304,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
 		case ZPOOL_PROP_FREE:
 		case ZPOOL_PROP_FREEING:
 		case ZPOOL_PROP_LEAKED:
-		case ZPOOL_PROP_EXPANDSZ:
 			if (literal) {
 				(void) snprintf(buf, len, "%llu",
 				    (u_longlong_t)intval);
@@ -312,7 +311,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
 				(void) zfs_nicenum(intval, buf, len);
 			}
 			break;
-
+		case ZPOOL_PROP_EXPANDSZ:
+			if (intval == 0) {
+				(void) strlcpy(buf, "-", len);
+			} else if (literal) {
+				(void) snprintf(buf, len, "%llu",
+				    (u_longlong_t)intval);
+			} else {
+				(void) zfs_nicenum(intval, buf, len);
+			}
+			break;
 		case ZPOOL_PROP_CAPACITY:
 			if (literal) {
 				(void) snprintf(buf, len, "%llu",
@@ -330,13 +338,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
 				    (u_longlong_t)intval);
 			}
 			break;
-
 		case ZPOOL_PROP_DEDUPRATIO:
 			(void) snprintf(buf, len, "%llu.%02llux",
 			    (u_longlong_t)(intval / 100),
 			    (u_longlong_t)(intval % 100));
 			break;
-
 		case ZPOOL_PROP_HEALTH:
 			verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL),
 			    ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);

Modified: projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h	Fri Oct 10 23:52:56 2014	(r272921)
@@ -38,7 +38,7 @@
 #define	Pxlookup_by_addr(p, a, n, s, sym, i) \
     proc_addr2sym(p, a, n, s, sym)
 #define	Pxlookup_by_name(p, l, s1, s2, sym, a) \
-    proc_name2sym((p), (s1), (s2), (sym))
+    proc_name2sym(p, s1, s2, sym, a)
 #define	Paddr_to_map proc_addr2map
 #define	Pcreate_error strerror
 #define	Pdelbkpt proc_bkptdel
@@ -46,10 +46,10 @@
 #define	Plmid(p, a, l) (-1)
 #define	Plmid_to_map(p, l, o) proc_obj2map((p), (o))
 #define	Plookup_by_addr proc_addr2sym
-#define	Pname_to_ctf(p, obj) NULL
+#define	Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
 #define	Pname_to_map proc_name2map
 #define	Pobject_iter proc_iter_objs
-#define	Pobject_iter_resolved(p, f, arg) 1
+#define	Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
 #define	Pobjname proc_objname
 #define	Pread proc_read
 #define	Prd_agent proc_rdagent

Modified: projects/bhyve_svm/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/bhyve_svm/cddl/lib/libzfs/Makefile	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/lib/libzfs/Makefile	Fri Oct 10 23:52:56 2014	(r272921)
@@ -7,8 +7,11 @@
 
 LIB=	zfs
 DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
-	${LIBAVL} ${LIBZFS_CORE}
-LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
+	${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+	${LIBNVPAIR}
+
+LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+	-lbsdxml -lgeom -lnvpair -lzfs_core
 
 SRCS=	deviceid.c \
 	fsshare.c \

Modified: projects/bhyve_svm/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/bhyve_svm/cddl/lib/libzpool/Makefile	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/cddl/lib/libzpool/Makefile	Fri Oct 10 23:52:56 2014	(r272921)
@@ -56,8 +56,9 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpt
 CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
 CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
 
-DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
-LDADD=		-lmd -lpthread -lz
+DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+		${LIBAVL} ${LIBUMEM}
+LDADD=		-lmd -lpthread -lz -lnvpair -lavl -lumem
 
 # atomic.S doesn't like profiling.
 MK_PROFILE=	no

Modified: projects/bhyve_svm/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/bhyve_svm/contrib/binutils/bfd/config.bfd	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/contrib/binutils/bfd/config.bfd	Fri Oct 10 23:52:56 2014	(r272921)
@@ -273,19 +273,11 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
-  armeb-*-freebsd*)
+  arm*eb*-*-freebsd*)
     targ_defvec=bfd_elf32_bigarm_vec
     targ_selvecs=bfd_elf32_littlearm_vec
     ;;
-  armv6eb-*-freebsd*)
-    targ_defvec=bfd_elf32_bigarm_vec
-    targ_selvecs=bfd_elf32_littlearm_vec
-    ;;
-  armv6-*-freebsd* | armv6hf-*-freebsd*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+  arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
   arm*-*-eabi* )
     targ_defvec=bfd_elf32_littlearm_vec

Modified: projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
 
   for (; in_list; in_list = in_list->next)
     {
-      if ((in_list->tag & 128) < 64)
+      if ((in_list->tag & 128) < 64
+          && in_list->tag != Tag_Virtualization_use)
 	{
 	  _bfd_error_handler
 	    (_("Warning: %B: Unknown EABI object attribute %d"),

Modified: projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -19395,6 +19395,12 @@ arm_fix_adjustable (fixS * fixP)
       || fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0)
     return 0;
 
+  if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW
+      || fixP->fx_r_type == BFD_RELOC_ARM_MOVT
+      || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW
+      || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT)
+    return 0;
+
   return 1;
 }
 #endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */

Modified: projects/bhyve_svm/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/bhyve_svm/contrib/binutils/include/elf/arm.h	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/contrib/binutils/include/elf/arm.h	Fri Oct 10 23:52:56 2014	(r272921)
@@ -271,6 +271,8 @@ enum
   Tag_ABI_optimization_goals,
   Tag_ABI_FP_optimization_goals,
   /* 32 is generic.  */
+
+  Tag_Virtualization_use = 68,
 };
 
 #endif

Modified: projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c
==============================================================================
--- projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c	Fri Oct 10 23:22:20 2014	(r272920)
+++ projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c	Fri Oct 10 23:52:56 2014	(r272921)
@@ -301,6 +301,7 @@ op_snmp_target_addrs(struct snmp_context
 		default:
 			break;	
 		}
+		return (SNMP_ERR_NOERROR);
 
 	default:
 		abort();

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

More information about the svn-src-projects mailing list