svn commit: r272692 - in projects/sendfile: . bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf cddl/contrib/opensolaris/cmd/...

Gleb Smirnoff glebius at FreeBSD.org
Tue Oct 7 13:26:08 UTC 2014


Author: glebius
Date: Tue Oct  7 13:25:59 2014
New Revision: 272692
URL: https://svnweb.freebsd.org/changeset/base/272692

Log:
  Merge head r258543 through r272687.

Added:
  projects/sendfile/bin/sh/tests/builtins/lineno3.0
     - copied unchanged from r272687, head/bin/sh/tests/builtins/lineno3.0
  projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout
     - copied unchanged from r272687, head/bin/sh/tests/builtins/lineno3.0.stdout
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.error
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.error
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.output
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.output
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.error
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.output
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.error
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.output
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.error
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.output
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
  projects/sendfile/contrib/byacc/test/btyacc_destroy1.y
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy1.y
  projects/sendfile/contrib/byacc/test/btyacc_destroy2.y
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy2.y
  projects/sendfile/contrib/byacc/test/btyacc_destroy3.y
     - copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy3.y
  projects/sendfile/contrib/netbsd-tests/
     - copied from r272687, head/contrib/netbsd-tests/
  projects/sendfile/lib/libc/string/explicit_bzero.c
     - copied unchanged from r272687, head/lib/libc/string/explicit_bzero.c
  projects/sendfile/lib/libpcap/pcap-netmap.c
     - copied unchanged from r272687, head/lib/libpcap/pcap-netmap.c
  projects/sendfile/release/amd64/mk-vmimage.sh
     - copied unchanged from r272687, head/release/amd64/mk-vmimage.sh
  projects/sendfile/release/i386/mk-vmimage.sh
     - copied unchanged from r272687, head/release/i386/mk-vmimage.sh
  projects/sendfile/sys/contrib/dev/acpica/common/acgetline.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/common/acgetline.c
  projects/sendfile/sys/contrib/dev/acpica/common/ahids.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/common/ahids.c
  projects/sendfile/sys/contrib/dev/acpica/common/ahuuids.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/common/ahuuids.c
  projects/sendfile/sys/contrib/dev/acpica/common/cmfsize.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/common/cmfsize.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslascii.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslascii.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapenter.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmapenter.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapoutput.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmaputils.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmaputils.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmessages.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslparser.y
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslparser.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrules.y
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslsupport.y
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslsupport.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltokens.y
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/asltokens.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.y
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/asltypes.y
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbtest.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/debugger/dbtest.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbdata.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/tables/tbdata.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utfileio.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utfileio.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/uthex.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/uthex.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utprint.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utprint.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utuuid.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utuuid.c
  projects/sendfile/sys/contrib/dev/acpica/include/platform/acenvex.h
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/include/platform/acenvex.h
  projects/sendfile/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
     - copied unchanged from r272687, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
  projects/sendfile/sys/libkern/explicit_bzero.c
     - copied unchanged from r272687, head/sys/libkern/explicit_bzero.c
  projects/sendfile/sys/sys/seq.h
     - copied unchanged from r272687, head/sys/sys/seq.h
  projects/sendfile/tools/tools/bootparttest/stub.c
     - copied unchanged from r272687, head/tools/tools/bootparttest/stub.c
  projects/sendfile/usr.sbin/pw/tests/
     - copied from r272687, head/usr.sbin/pw/tests/
Deleted:
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/sendfile/sys/modules/acpi/acpi/
  projects/sendfile/sys/pc98/pc98/machdep.c
  projects/sendfile/tools/tools/bootparttest/malloc.c
Modified:
  projects/sendfile/Makefile.inc1
  projects/sendfile/ObsoleteFiles.inc
  projects/sendfile/bin/sh/eval.c
  projects/sendfile/bin/sh/expand.c
  projects/sendfile/bin/sh/jobs.c
  projects/sendfile/bin/sh/parser.c
  projects/sendfile/bin/sh/redir.c
  projects/sendfile/bin/sh/tests/builtins/Makefile
  projects/sendfile/bin/sh/trap.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
  projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/sendfile/cddl/lib/libdtrace/libproc_compat.h
  projects/sendfile/cddl/lib/libzfs/Makefile
  projects/sendfile/cddl/lib/libzpool/Makefile
  projects/sendfile/contrib/binutils/bfd/config.bfd
  projects/sendfile/contrib/binutils/bfd/elf32-arm.c
  projects/sendfile/contrib/binutils/gas/config/tc-arm.c
  projects/sendfile/contrib/binutils/include/elf/arm.h
  projects/sendfile/contrib/byacc/CHANGES
  projects/sendfile/contrib/byacc/MANIFEST
  projects/sendfile/contrib/byacc/VERSION
  projects/sendfile/contrib/byacc/aclocal.m4
  projects/sendfile/contrib/byacc/btyaccpar.c
  projects/sendfile/contrib/byacc/closure.c
  projects/sendfile/contrib/byacc/config.sub
  projects/sendfile/contrib/byacc/configure
  projects/sendfile/contrib/byacc/defs.h
  projects/sendfile/contrib/byacc/lalr.c
  projects/sendfile/contrib/byacc/main.c
  projects/sendfile/contrib/byacc/output.c
  projects/sendfile/contrib/byacc/package/byacc.spec
  projects/sendfile/contrib/byacc/package/debian/changelog
  projects/sendfile/contrib/byacc/package/mingw-byacc.spec
  projects/sendfile/contrib/byacc/package/pkgsrc/Makefile
  projects/sendfile/contrib/byacc/reader.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/calc.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/calc1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/calc2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/calc3.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/code_calc.code.c
  projects/sendfile/contrib/byacc/test/btyacc/code_calc.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/code_error.code.c
  projects/sendfile/contrib/byacc/test/btyacc/code_error.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/empty.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_inherit1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_inherit2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_inherit3.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_inherit4.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_inherit5.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax10.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax11.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax12.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax13.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax14.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax15.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax16.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax17.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax18.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax19.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax20.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax21.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax22.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax23.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax24.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax25.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax26.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax27.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax3.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax4.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax5.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax6.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax7.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax7a.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax7b.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax8.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax8a.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/err_syntax9.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/error.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/grammar.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/inherit0.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/inherit1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/inherit2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/ok_syntax1.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/pure_calc.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/pure_error.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc-s.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc2.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc3.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/quote_calc4.tab.c
  projects/sendfile/contrib/byacc/test/btyacc/rename_debug.c
  projects/sendfile/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
  projects/sendfile/contrib/byacc/test/yacc/calc2.tab.c
  projects/sendfile/contrib/byacc/test/yacc/calc3.tab.c
  projects/sendfile/contrib/byacc/test/yacc/ok_syntax1.tab.c
  projects/sendfile/contrib/byacc/yacc.1
  projects/sendfile/contrib/libpcap/inet.c
  projects/sendfile/contrib/libpcap/pcap.c
  projects/sendfile/contrib/tcpdump/tcpdump.c
  projects/sendfile/etc/mtree/BSD.tests.dist
  projects/sendfile/include/strings.h
  projects/sendfile/lib/libc/stdtime/strptime.3
  projects/sendfile/lib/libc/stdtime/strptime.c
  projects/sendfile/lib/libc/string/Makefile.inc
  projects/sendfile/lib/libc/string/Symbol.map
  projects/sendfile/lib/libc/string/bzero.3
  projects/sendfile/lib/libpcap/Makefile
  projects/sendfile/lib/libpcap/config.h
  projects/sendfile/lib/libproc/Makefile
  projects/sendfile/lib/libproc/libproc.h
  projects/sendfile/lib/libproc/proc_sym.c
  projects/sendfile/lib/libproc/tests/proc_test.c
  projects/sendfile/lib/librtld_db/rtld_db.c
  projects/sendfile/lib/msun/src/e_lgamma_r.c
  projects/sendfile/release/Makefile
  projects/sendfile/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/sendfile/release/release.conf.sample
  projects/sendfile/release/release.sh
  projects/sendfile/sbin/ifconfig/ifconfig.c
  projects/sendfile/sbin/ifconfig/iflagg.c
  projects/sendfile/sbin/ipfw/ipfw2.c
  projects/sendfile/share/man/man4/ucom.4
  projects/sendfile/share/man/man4/urndis.4
  projects/sendfile/share/man/man4/urtwn.4
  projects/sendfile/share/man/man5/rc.conf.5
  projects/sendfile/share/man/man7/release.7
  projects/sendfile/share/man/man9/sleepqueue.9
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/boot/common/disk.c
  projects/sendfile/sys/boot/common/part.c
  projects/sendfile/sys/cam/ctl/ctl.c
  projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/sendfile/sys/cam/scsi/scsi_xpt.c
  projects/sendfile/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  projects/sendfile/sys/cddl/compat/opensolaris/sys/kmem.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/sendfile/sys/conf/Makefile.arm
  projects/sendfile/sys/conf/NOTES
  projects/sendfile/sys/conf/files
  projects/sendfile/sys/conf/files.pc98
  projects/sendfile/sys/conf/options
  projects/sendfile/sys/conf/options.pc98
  projects/sendfile/sys/contrib/dev/acpica/acpica_prep.sh
  projects/sendfile/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/sendfile/sys/contrib/dev/acpica/common/adfile.c
  projects/sendfile/sys/contrib/dev/acpica/common/adisasm.c
  projects/sendfile/sys/contrib/dev/acpica/common/adwalk.c
  projects/sendfile/sys/contrib/dev/acpica/common/ahpredef.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmextern.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmrestag.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtable.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/sendfile/sys/contrib/dev/acpica/common/getopt.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslbtypes.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/sendfile/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslfileio.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslhex.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asllength.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asllistsup.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslload.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmethod.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslnamesp.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslprepkg.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslsupport.l
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltree.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asluuid.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtexpress.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtio.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtparser.l
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtparser.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dttable.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/preprocess.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/prexpress.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/prmacros.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/prparser.l
  projects/sendfile/sys/contrib/dev/acpica/compiler/prparser.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/prscan.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/prutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbexec.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbstats.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmobject.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evevent.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evglock.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evgpe.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeblk.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeinit.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeutil.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evhandler.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evmisc.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evregion.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evrgnini.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evsci.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evxfevnt.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evxfgpe.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evxfregn.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exconfig.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exconvrt.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/excreate.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exdebug.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exfield.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exmisc.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exmutex.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exnames.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg1.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg2.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg3.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg6.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exprep.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exregion.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exresnte.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exresolv.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exresop.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exstore.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exstoren.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exstorob.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exsystem.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwpci.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwregs.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nseval.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsinit.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsload.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsobject.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsparse.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nspredef.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nssearch.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nswalk.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psargs.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psloop.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psopinfo.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psparse.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psscope.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/pstree.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/pswalk.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsaddr.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rscalc.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rscreate.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsinfo.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsio.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsirq.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rslist.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsmemory.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsmisc.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsserial.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbfadt.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbfind.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbprint.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfload.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utaddress.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utalloc.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utcache.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utcopy.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdebug.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdecode.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdelete.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/uterror.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/uteval.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utexcep.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utids.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utinit.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utlock.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmath.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmutex.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utobject.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utownerid.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utpredef.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utresrc.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstate.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstring.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/uttrack.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxferror.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  projects/sendfile/sys/contrib/dev/acpica/include/acapps.h
  projects/sendfile/sys/contrib/dev/acpica/include/acbuffer.h
  projects/sendfile/sys/contrib/dev/acpica/include/accommon.h
  projects/sendfile/sys/contrib/dev/acpica/include/acconfig.h
  projects/sendfile/sys/contrib/dev/acpica/include/acdebug.h
  projects/sendfile/sys/contrib/dev/acpica/include/acdisasm.h
  projects/sendfile/sys/contrib/dev/acpica/include/acdispat.h
  projects/sendfile/sys/contrib/dev/acpica/include/acevents.h
  projects/sendfile/sys/contrib/dev/acpica/include/acexcep.h
  projects/sendfile/sys/contrib/dev/acpica/include/acglobal.h
  projects/sendfile/sys/contrib/dev/acpica/include/achware.h
  projects/sendfile/sys/contrib/dev/acpica/include/acinterp.h
  projects/sendfile/sys/contrib/dev/acpica/include/aclocal.h
  projects/sendfile/sys/contrib/dev/acpica/include/acmacros.h
  projects/sendfile/sys/contrib/dev/acpica/include/acnames.h
  projects/sendfile/sys/contrib/dev/acpica/include/acnamesp.h
  projects/sendfile/sys/contrib/dev/acpica/include/acobject.h
  projects/sendfile/sys/contrib/dev/acpica/include/acopcode.h
  projects/sendfile/sys/contrib/dev/acpica/include/acoutput.h
  projects/sendfile/sys/contrib/dev/acpica/include/acparser.h
  projects/sendfile/sys/contrib/dev/acpica/include/acpi.h
  projects/sendfile/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/sendfile/sys/contrib/dev/acpica/include/acpixf.h
  projects/sendfile/sys/contrib/dev/acpica/include/acpredef.h
  projects/sendfile/sys/contrib/dev/acpica/include/acresrc.h
  projects/sendfile/sys/contrib/dev/acpica/include/acrestyp.h
  projects/sendfile/sys/contrib/dev/acpica/include/acstruct.h
  projects/sendfile/sys/contrib/dev/acpica/include/actables.h
  projects/sendfile/sys/contrib/dev/acpica/include/actbl.h
  projects/sendfile/sys/contrib/dev/acpica/include/actbl1.h
  projects/sendfile/sys/contrib/dev/acpica/include/actbl2.h
  projects/sendfile/sys/contrib/dev/acpica/include/actbl3.h
  projects/sendfile/sys/contrib/dev/acpica/include/actypes.h
  projects/sendfile/sys/contrib/dev/acpica/include/acutils.h
  projects/sendfile/sys/contrib/dev/acpica/include/amlcode.h
  projects/sendfile/sys/contrib/dev/acpica/include/amlresrc.h
  projects/sendfile/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/sendfile/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/sendfile/sys/contrib/dev/acpica/include/platform/acgcc.h
  projects/sendfile/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/sendfile/sys/contrib/ipfilter/netinet/fil.c
  projects/sendfile/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
  projects/sendfile/sys/contrib/ipfilter/netinet/ip_dstlist.c
  projects/sendfile/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/sendfile/sys/dev/acpica/Osd/OsdTable.c
  projects/sendfile/sys/dev/acpica/acpi.c
  projects/sendfile/sys/dev/ahci/ahci.c
  projects/sendfile/sys/dev/sfxge/sfxge_dma.c
  projects/sendfile/sys/dev/sfxge/sfxge_port.c
  projects/sendfile/sys/dev/uart/uart_bus_fdt.c
  projects/sendfile/sys/dev/usb/controller/xhci.c
  projects/sendfile/sys/dev/usb/controller/xhci.h
  projects/sendfile/sys/dev/usb/usb_dev.c
  projects/sendfile/sys/dev/usb/usbdevs
  projects/sendfile/sys/dev/usb/wlan/if_urtwn.c
  projects/sendfile/sys/dev/vt/vt.h
  projects/sendfile/sys/dev/vt/vt_core.c
  projects/sendfile/sys/fs/autofs/autofs.c
  projects/sendfile/sys/fs/autofs/autofs.h
  projects/sendfile/sys/fs/autofs/autofs_vfsops.c
  projects/sendfile/sys/fs/autofs/autofs_vnops.c
  projects/sendfile/sys/fs/devfs/devfs_vnops.c
  projects/sendfile/sys/fs/nfs/nfs_commonsubs.c
  projects/sendfile/sys/fs/nfs/nfs_var.h
  projects/sendfile/sys/fs/nfs/nfsproto.h
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdport.c
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/sendfile/sys/geom/geom_dev.c
  projects/sendfile/sys/i386/i386/machdep.c
  projects/sendfile/sys/kern/imgact_elf.c
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_event.c
  projects/sendfile/sys/kern/kern_exit.c
  projects/sendfile/sys/kern/kern_intr.c
  projects/sendfile/sys/kern/kern_proc.c
  projects/sendfile/sys/kern/kern_prot.c
  projects/sendfile/sys/kern/kern_racct.c
  projects/sendfile/sys/kern/kern_sig.c
  projects/sendfile/sys/kern/sys_process.c
  projects/sendfile/sys/kern/vfs_vnops.c
  projects/sendfile/sys/modules/Makefile
  projects/sendfile/sys/modules/ncr/Makefile
  projects/sendfile/sys/net/ieee8023ad_lacp.c
  projects/sendfile/sys/net/ieee8023ad_lacp.h
  projects/sendfile/sys/net/if_bridge.c
  projects/sendfile/sys/net/if_disc.c
  projects/sendfile/sys/net/if_edsc.c
  projects/sendfile/sys/net/if_lagg.c
  projects/sendfile/sys/net/if_lagg.h
  projects/sendfile/sys/netinet/ip6.h
  projects/sendfile/sys/netinet/sctp_output.c
  projects/sendfile/sys/netinet/tcp_output.c
  projects/sendfile/sys/netinet6/in6.h
  projects/sendfile/sys/netinet6/in6_cksum.c
  projects/sendfile/sys/netinet6/udp6_usrreq.c
  projects/sendfile/sys/netpfil/ipfw/ip_fw2.c
  projects/sendfile/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4.h
  projects/sendfile/sys/ofed/include/linux/mlx4/device.h
  projects/sendfile/sys/sys/event.h
  projects/sendfile/sys/sys/filedesc.h
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/sys/racct.h
  projects/sendfile/sys/sys/systm.h
  projects/sendfile/sys/sys/ucred.h
  projects/sendfile/sys/sys/vnode.h
  projects/sendfile/sys/vm/uma_core.c
  projects/sendfile/sys/vm/vm_glue.c
  projects/sendfile/sys/vm/vm_pageout.c
  projects/sendfile/sys/x86/x86/local_apic.c
  projects/sendfile/tools/tools/ath/athalq/ar9300_ds.c
  projects/sendfile/tools/tools/bootparttest/Makefile
  projects/sendfile/tools/tools/bootparttest/bootparttest.c
  projects/sendfile/usr.bin/mkimg/Makefile
  projects/sendfile/usr.bin/mkimg/ebr.c
  projects/sendfile/usr.bin/mkimg/mbr.c
  projects/sendfile/usr.bin/mkimg/mkimg.c
  projects/sendfile/usr.bin/mkimg/mkimg.h
  projects/sendfile/usr.bin/mkimg/pc98.c
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
  projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
  projects/sendfile/usr.sbin/acpi/acpiconf/Makefile
  projects/sendfile/usr.sbin/acpi/acpidb/Makefile
  projects/sendfile/usr.sbin/acpi/acpidb/acpidb.c
  projects/sendfile/usr.sbin/acpi/acpidump/Makefile
  projects/sendfile/usr.sbin/acpi/acpidump/acpi.c
  projects/sendfile/usr.sbin/acpi/iasl/Makefile
  projects/sendfile/usr.sbin/bhyve/acpi.c
  projects/sendfile/usr.sbin/nscd/query.c
  projects/sendfile/usr.sbin/pw/Makefile
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/sendfile/contrib/binutils/   (props changed)
  projects/sendfile/contrib/byacc/   (props changed)
  projects/sendfile/contrib/libpcap/   (props changed)
  projects/sendfile/contrib/tcpdump/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/include/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/lib/libc/stdtime/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/sbin/ipfw/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/common/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/parser/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/include/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/sendfile/sys/contrib/ipfilter/   (props changed)
  projects/sendfile/usr.bin/mkimg/   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)

Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/Makefile.inc1	Tue Oct  7 13:25:59 2014	(r272692)
@@ -1531,9 +1531,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 +1546,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 +1585,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/sendfile/ObsoleteFiles.inc
==============================================================================
--- projects/sendfile/ObsoleteFiles.inc	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/ObsoleteFiles.inc	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/eval.c
==============================================================================
--- projects/sendfile/bin/sh/eval.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/eval.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/expand.c
==============================================================================
--- projects/sendfile/bin/sh/expand.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/expand.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/jobs.c
==============================================================================
--- projects/sendfile/bin/sh/jobs.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/jobs.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/parser.c
==============================================================================
--- projects/sendfile/bin/sh/parser.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/parser.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/redir.c
==============================================================================
--- projects/sendfile/bin/sh/redir.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/redir.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/sendfile/bin/sh/tests/builtins/Makefile	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/tests/builtins/Makefile	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/bin/sh/tests/builtins/lineno3.0 (from r272687, head/bin/sh/tests/builtins/lineno3.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/builtins/lineno3.0	Tue Oct  7 13:25:59 2014	(r272692, copy of r272687, head/bin/sh/tests/builtins/lineno3.0)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO

Copied: projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout (from r272687, head/bin/sh/tests/builtins/lineno3.0.stdout)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout	Tue Oct  7 13:25:59 2014	(r272692, copy of r272687, head/bin/sh/tests/builtins/lineno3.0.stdout)
@@ -0,0 +1,2 @@
+before: 3
+after: 6

Modified: projects/sendfile/bin/sh/trap.c
==============================================================================
--- projects/sendfile/bin/sh/trap.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/bin/sh/trap.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtra
 	if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
 		print_probe_info(&p);
 
+	if (g_intr != 0)
+		return (1);
+
 	return (0);
 }
 
@@ -1220,11 +1223,34 @@ intr(int signo)
 		g_impatient = 1;
 }
 
+static void
+installsighands(void)
+{
+	struct sigaction act, oact;
+
+	(void) sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	act.sa_handler = intr;
+
+	if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGINT, &act, NULL);
+
+	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGTERM, &act, NULL);
+
+#if !defined(sun)
+	if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGPIPE, &act, NULL);
+
+	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGUSR1, &act, NULL);
+#endif
+}
+
 int
 main(int argc, char *argv[])
 {
 	dtrace_bufdesc_t buf;
-	struct sigaction act, oact;
 	dtrace_status_t status[2];
 	dtrace_optval_t opt;
 	dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
 		if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
 			fatal("failed to open output file '%s'", g_ofile);
 
+		installsighands();
+
 		oprintf("%5s %10s %17s %33s %s\n",
 		    "ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
 
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
 	if (opt != DTRACEOPT_UNSET)
 		notice("allowing destructive actions\n");
 
-	(void) sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
-	act.sa_handler = intr;
-
-	if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGINT, &act, NULL);
-
-	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGTERM, &act, NULL);
-
-#if !defined(sun)
-	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGUSR1, &act, NULL);
-#endif
+	installsighands();
 
 	/*
 	 * Now that tracing is active and we are ready to consume trace data,

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -1461,6 +1461,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);
@@ -2594,10 +2599,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) {

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/sendfile/cddl/lib/libdtrace/libproc_compat.h	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/lib/libdtrace/libproc_compat.h	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/sendfile/cddl/lib/libzfs/Makefile	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/lib/libzfs/Makefile	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/sendfile/cddl/lib/libzpool/Makefile	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/cddl/lib/libzpool/Makefile	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/sendfile/contrib/binutils/bfd/config.bfd	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/contrib/binutils/bfd/config.bfd	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/sendfile/contrib/binutils/bfd/elf32-arm.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/contrib/binutils/bfd/elf32-arm.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -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/sendfile/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/sendfile/contrib/binutils/gas/config/tc-arm.c	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/contrib/binutils/gas/config/tc-arm.c	Tue Oct  7 13:25:59 2014	(r272692)
@@ -4688,6 +4688,23 @@ parse_address_main (char **str, int i, i
 	      return PARSE_OPERAND_FAIL;
 	}
     }
+  else if (skip_past_char (&p, ':') == SUCCESS)
+    {
+      /* FIXME: '@' should be used here, but it's filtered out by generic
+         code before we get to see it here. This may be subject to
+         change.  */
+      expressionS exp;
+      my_get_expression (&exp, &p, GE_NO_PREFIX);
+      if (exp.X_op != O_constant)
+        {
+          inst.error = _("alignment must be constant");
+          return PARSE_OPERAND_FAIL;
+        }
+      inst.operands[i].imm = exp.X_add_number << 8;
+      inst.operands[i].immisalign = 1;
+      /* Alignments are not pre-indexes.  */
+      inst.operands[i].preind = 0;
+    }
 
   if (skip_past_char (&p, ']') == FAIL)
     {
@@ -6571,6 +6588,7 @@ do_barrier (void)
   if (inst.operands[0].present)
     {
       constraint ((inst.instruction & 0xf0) != 0x40
+		  && (inst.instruction & 0xf0) != 0x50
 		  && inst.operands[0].imm != 0xf,
 		  "bad barrier type");
       inst.instruction |= inst.operands[0].imm;
@@ -14694,10 +14712,18 @@ static const struct asm_cond conds[] =
 
 static struct asm_barrier_opt barrier_opt_names[] =
 {
-  { "sy",   0xf },
-  { "un",   0x7 },
-  { "st",   0xe },
-  { "unst", 0x6 }
+  { "sy",    0xf },
+  { "un",    0x7 },
+  { "st",    0xe },
+  { "unst",  0x6 },
+  { "ish",   0xb },
+  { "sh",    0xb },
+  { "ishst", 0xa },
+  { "shst",  0xa },
+  { "nsh",   0x7 },
+  { "nshst", 0x6 },
+  { "osh",   0x3 },
+  { "oshst", 0x2 }
 };
 
 /* Table of ARM-format instructions.	*/
@@ -19369,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/sendfile/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/sendfile/contrib/binutils/include/elf/arm.h	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/contrib/binutils/include/elf/arm.h	Tue Oct  7 13:25:59 2014	(r272692)
@@ -271,6 +271,8 @@ enum
   Tag_ABI_optimization_goals,
   Tag_ABI_FP_optimization_goals,
   /* 32 is generic.  */
+
+  Tag_Virtualization_use = 68,
 };
 
 #endif

Modified: projects/sendfile/contrib/byacc/CHANGES
==============================================================================
--- projects/sendfile/contrib/byacc/CHANGES	Tue Oct  7 13:24:07 2014	(r272691)
+++ projects/sendfile/contrib/byacc/CHANGES	Tue Oct  7 13:25:59 2014	(r272692)
@@ -1,3 +1,125 @@
+2014-10-05  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* main.c:
+	make change to umask before calling mkstemp, as suggested in Coverity #56902
+
+	* reader.c:
+	adjust logic in copy_action to avoid potential null-pointer dereference
+	(Coverity #56901)
+
+	* reader.c:
+	adjust logic to avoid potential null-pointer dereference in compile_args
+	(Coverity #63407)
+
+	* reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408)
+
+	* yacc.1: document changes made with respect to %parse-param
+
+	* output.c:
+	add parameters from %parse-param to destructor.  The order of the parameters
+	is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
+	bison.
+
+	* test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+	regen
+
+	* output.c:
+	use puts_param_types/puts_param_names to output lex_param data.
+
+	* test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c
 , test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+	regen
+
+	* btyaccpar.c: add casts, change types to fix strict compiler warnings
+
+	* test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+	regen
+
+	* output.c: gcc-warning
+
+	* test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen
+
+	* output.c: fix limit when merging real/workaround tables
+
+	* output.c:
+	for btyacc, it is possible to have no conflicts - but in that case, the
+	"ctable" was not generated at all, while the skeleton uses the table.
+	The most straightforward (workaround) is generating a dummy table which
+	rejects any state.
+
+	* test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
+	fix "make check_make"
+
+	* test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+	regen

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


More information about the svn-src-projects mailing list