svn commit: r283294 - in projects/ifnet: . bin/cp bin/date bin/pax cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib cddl/lib/libdtrace cddl/sbin cddl/usr.b...

[Gleb Smirnoff]

Author: glebius
Date: Fri May 22 18:23:21 2015
New Revision: 283294
URL: https://svnweb.freebsd.org/changeset/base/283294

Log:
  Merge head r257698 through r283293.

Added:
  projects/ifnet/cddl/lib/libdtrace/siftr.d
     - copied unchanged from r283293, head/cddl/lib/libdtrace/siftr.d
  projects/ifnet/contrib/bmake/unit-tests/cond2.exp
     - copied unchanged from r283293, head/contrib/bmake/unit-tests/cond2.exp
  projects/ifnet/contrib/bmake/unit-tests/cond2.mk
     - copied unchanged from r283293, head/contrib/bmake/unit-tests/cond2.mk
  projects/ifnet/lib/csu/i386/
     - copied from r283293, head/lib/csu/i386/
  projects/ifnet/lib/libc/aarch64/gen/fabs.S
     - copied unchanged from r283293, head/lib/libc/aarch64/gen/fabs.S
  projects/ifnet/release/Makefile.mirrors
     - copied unchanged from r283293, head/release/Makefile.mirrors
  projects/ifnet/release/arm/RPI2.conf
     - copied unchanged from r283293, head/release/arm/RPI2.conf
  projects/ifnet/release/arm/WANDBOARD.conf
     - copied unchanged from r283293, head/release/arm/WANDBOARD.conf
  projects/ifnet/release/tools/arm.subr
     - copied unchanged from r283293, head/release/tools/arm.subr
  projects/ifnet/sys/arm/allwinner/a10_mmc.c
     - copied unchanged from r283293, head/sys/arm/allwinner/a10_mmc.c
  projects/ifnet/sys/arm/allwinner/a10_mmc.h
     - copied unchanged from r283293, head/sys/arm/allwinner/a10_mmc.h
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c
     - copied unchanged from r283293, head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c
  projects/ifnet/sys/arm/annapurna/
     - copied from r283293, head/sys/arm/annapurna/
  projects/ifnet/sys/arm/broadcom/bcm2835/bcm2836_mp.c
     - copied unchanged from r283293, head/sys/arm/broadcom/bcm2835/bcm2836_mp.c
  projects/ifnet/sys/arm/conf/ALPINE
     - copied unchanged from r283293, head/sys/arm/conf/ALPINE
  projects/ifnet/sys/arm/conf/std.arm
     - copied unchanged from r283293, head/sys/arm/conf/std.arm
  projects/ifnet/sys/arm/conf/std.armv6
     - copied unchanged from r283293, head/sys/arm/conf/std.armv6
  projects/ifnet/sys/arm/ti/am335x/am335x_ecap.c
     - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_ecap.c
  projects/ifnet/sys/arm/ti/am335x/am335x_ehrpwm.c
     - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_ehrpwm.c
  projects/ifnet/sys/arm/ti/am335x/am335x_musb.c
     - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_musb.c
  projects/ifnet/sys/arm/ti/am335x/am335x_pwmss.c
     - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_pwmss.c
  projects/ifnet/sys/arm/ti/ti_hwmods.c
     - copied unchanged from r283293, head/sys/arm/ti/ti_hwmods.c
  projects/ifnet/sys/arm/ti/ti_hwmods.h
     - copied unchanged from r283293, head/sys/arm/ti/ti_hwmods.h
  projects/ifnet/sys/arm/ti/ti_pinmux.c
     - copied unchanged from r283293, head/sys/arm/ti/ti_pinmux.c
  projects/ifnet/sys/arm/ti/ti_pinmux.h
     - copied unchanged from r283293, head/sys/arm/ti/ti_pinmux.h
  projects/ifnet/sys/arm/ti/usb/omap_host.c
     - copied unchanged from r283293, head/sys/arm/ti/usb/omap_host.c
  projects/ifnet/sys/arm/ti/usb/omap_tll.c
     - copied unchanged from r283293, head/sys/arm/ti/usb/omap_tll.c
  projects/ifnet/sys/arm64/arm64/busdma_bounce.c
     - copied unchanged from r283293, head/sys/arm64/arm64/busdma_bounce.c
  projects/ifnet/sys/arm64/arm64/gic_v3.c
     - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3.c
  projects/ifnet/sys/arm64/arm64/gic_v3_fdt.c
     - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_fdt.c
  projects/ifnet/sys/arm64/arm64/gic_v3_reg.h
     - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_reg.h
  projects/ifnet/sys/arm64/arm64/gic_v3_var.h
     - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_var.h
  projects/ifnet/sys/arm64/include/bus_dma_impl.h
     - copied unchanged from r283293, head/sys/arm64/include/bus_dma_impl.h
  projects/ifnet/sys/boot/common/self_reloc.c
     - copied unchanged from r283293, head/sys/boot/common/self_reloc.c
  projects/ifnet/sys/boot/fdt/dts/arm/annapurna-alpine.dts
     - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/annapurna-alpine.dts
  projects/ifnet/sys/boot/fdt/dts/arm/beaglebone-common.dtsi
     - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi
  projects/ifnet/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
     - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
  projects/ifnet/sys/boot/fdt/dts/arm/pandaboard-es.dts
     - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/pandaboard-es.dts
  projects/ifnet/sys/contrib/dev/acpica/common/ahtable.c
     - copied unchanged from r283293, head/sys/contrib/dev/acpica/common/ahtable.c
  projects/ifnet/sys/contrib/dev/acpica/include/acuuid.h
     - copied unchanged from r283293, head/sys/contrib/dev/acpica/include/acuuid.h
  projects/ifnet/sys/dev/hwpmc/hwpmc_arm64.c
     - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_arm64.h
     - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64.h
  projects/ifnet/sys/dev/hwpmc/hwpmc_arm64_md.c
     - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64_md.c
  projects/ifnet/sys/mips/atheros/qca955x_pci.c
     - copied unchanged from r283293, head/sys/mips/atheros/qca955x_pci.c
  projects/ifnet/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
     - copied unchanged from r283293, head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
  projects/ifnet/sys/xen/xenmem/
     - copied from r283293, head/sys/xen/xenmem/
  projects/ifnet/tests/etc/
     - copied from r283293, head/tests/etc/
  projects/ifnet/tests/sys/kern/ptrace_test.c
     - copied unchanged from r283293, head/tests/sys/kern/ptrace_test.c
  projects/ifnet/tools/build/stdlib.h
     - copied unchanged from r283293, head/tools/build/stdlib.h
Deleted:
  projects/ifnet/etc/rc.d/tests/
  projects/ifnet/etc/tests/Makefile
  projects/ifnet/gnu/usr.bin/groff/src/preproc/soelim/
  projects/ifnet/kerberos5/lib/libheimsqlite/
  projects/ifnet/lib/csu/i386-elf/
  projects/ifnet/lib/libmandoc/
  projects/ifnet/release/arm/WANDBOARD-QUAD.conf
  projects/ifnet/release/arm/ZEDBOARD.conf
  projects/ifnet/release/arm/release.sh
  projects/ifnet/release/tools/arm/
  projects/ifnet/sys/arm/conf/WANDBOARD-DUAL
  projects/ifnet/sys/arm/conf/WANDBOARD-QUAD
  projects/ifnet/sys/arm/conf/WANDBOARD-SOLO
  projects/ifnet/sys/arm/ti/am335x/am335x_pwm.c
  projects/ifnet/sys/boot/efi/loader/reloc.c
  projects/ifnet/sys/boot/fdt/dts/arm/am335x.dtsi
  projects/ifnet/usr.bin/demandoc/
Modified:
  projects/ifnet/Makefile.inc1
  projects/ifnet/ObsoleteFiles.inc
  projects/ifnet/UPDATING
  projects/ifnet/bin/cp/cp.c
  projects/ifnet/bin/date/date.1
  projects/ifnet/bin/date/date.c
  projects/ifnet/bin/pax/ar_subs.c
  projects/ifnet/bin/pax/buf_subs.c
  projects/ifnet/bin/pax/cache.c
  projects/ifnet/bin/pax/cpio.c
  projects/ifnet/bin/pax/file_subs.c
  projects/ifnet/bin/pax/gen_subs.c
  projects/ifnet/bin/pax/getoldopt.c
  projects/ifnet/bin/pax/pat_rep.c
  projects/ifnet/bin/pax/pax.c
  projects/ifnet/bin/pax/sel_subs.c
  projects/ifnet/bin/pax/tar.c
  projects/ifnet/bin/pax/tty_subs.c
  projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/ifnet/cddl/lib/Makefile
  projects/ifnet/cddl/lib/libdtrace/Makefile
  projects/ifnet/cddl/lib/libdtrace/tcp.d
  projects/ifnet/cddl/sbin/Makefile
  projects/ifnet/cddl/usr.bin/Makefile
  projects/ifnet/cddl/usr.bin/ctfconvert/Makefile
  projects/ifnet/cddl/usr.bin/ctfdump/Makefile
  projects/ifnet/cddl/usr.sbin/Makefile
  projects/ifnet/cddl/usr.sbin/dtrace/Makefile
  projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
  projects/ifnet/cddl/usr.sbin/lockstat/Makefile
  projects/ifnet/cddl/usr.sbin/plockstat/Makefile
  projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh
  projects/ifnet/contrib/atf/atf-sh/misc_helpers.sh
  projects/ifnet/contrib/binutils/bfd/elf32-arm.c
  projects/ifnet/contrib/bmake/ChangeLog
  projects/ifnet/contrib/bmake/FILES
  projects/ifnet/contrib/bmake/Makefile
  projects/ifnet/contrib/bmake/cond.c
  projects/ifnet/contrib/bmake/machine.sh
  projects/ifnet/contrib/bmake/mk/ChangeLog
  projects/ifnet/contrib/bmake/mk/dirdeps.mk
  projects/ifnet/contrib/bmake/mk/install-mk
  projects/ifnet/contrib/bmake/nonints.h
  projects/ifnet/contrib/bmake/unit-tests/Makefile.in
  projects/ifnet/contrib/bmake/var.c
  projects/ifnet/contrib/elftoolchain/addr2line/addr2line.1
  projects/ifnet/contrib/elftoolchain/addr2line/addr2line.c
  projects/ifnet/contrib/elftoolchain/common/native-elf-format
  projects/ifnet/contrib/elftoolchain/cxxfilt/c++filt.1
  projects/ifnet/contrib/elftoolchain/elfcopy/elfcopy.1
  projects/ifnet/contrib/elftoolchain/elfcopy/sections.c
  projects/ifnet/contrib/elftoolchain/elfcopy/segments.c
  projects/ifnet/contrib/elftoolchain/elfcopy/symbols.c
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_add_line_entry.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_def_macro.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_expand_frame_instructions.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formblock.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formflag.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formref.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formsig8.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formudata.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_all_regs.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_reg.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_ranges.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_hasattr.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_next_cu_header.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_producer_init.3
  projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_whatattr.3
  projects/ifnet/contrib/elftoolchain/libelf/elf.3
  projects/ifnet/contrib/elftoolchain/libelf/elf_begin.3
  projects/ifnet/contrib/elftoolchain/libelf/elf_cntl.3
  projects/ifnet/contrib/elftoolchain/libelf/elf_getdata.3
  projects/ifnet/contrib/elftoolchain/libelf/elf_open.3
  projects/ifnet/contrib/elftoolchain/libelf/elf_update.c
  projects/ifnet/contrib/elftoolchain/libelf/gelf.3
  projects/ifnet/contrib/elftoolchain/libelftc/elftc_demangle.3
  projects/ifnet/contrib/elftoolchain/libelftc/elftc_symbol_table_create.3
  projects/ifnet/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  projects/ifnet/contrib/elftoolchain/nm/nm.1
  projects/ifnet/contrib/elftoolchain/readelf/readelf.1
  projects/ifnet/contrib/elftoolchain/readelf/readelf.c
  projects/ifnet/contrib/elftoolchain/size/size.1
  projects/ifnet/contrib/elftoolchain/size/size.c
  projects/ifnet/contrib/elftoolchain/strings/strings.1
  projects/ifnet/contrib/gcc/dwarf2.h
  projects/ifnet/contrib/gdb/gdb/c-valprint.c
  projects/ifnet/contrib/gdb/gdb/dwarf2expr.c
  projects/ifnet/contrib/gdb/gdb/dwarf2expr.h
  projects/ifnet/contrib/gdb/gdb/dwarf2loc.c
  projects/ifnet/contrib/gdb/gdb/dwarf2read.c
  projects/ifnet/contrib/gdb/gdb/value.h
  projects/ifnet/contrib/gdb/gdb/values.c
  projects/ifnet/contrib/libarchive/libarchive/archive_read.c
  projects/ifnet/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
  projects/ifnet/contrib/netcat/netcat.c
  projects/ifnet/contrib/tzdata/africa
  projects/ifnet/contrib/tzdata/antarctica
  projects/ifnet/contrib/tzdata/backward
  projects/ifnet/contrib/tzdata/europe
  projects/ifnet/contrib/tzdata/northamerica
  projects/ifnet/contrib/tzdata/southamerica
  projects/ifnet/etc/Makefile
  projects/ifnet/etc/etc.arm/ttys
  projects/ifnet/etc/rc.d/Makefile
  projects/ifnet/gnu/lib/Makefile
  projects/ifnet/include/stdlib.h
  projects/ifnet/include/stringlist.h
  projects/ifnet/kerberos5/lib/Makefile
  projects/ifnet/kerberos5/lib/libhdb/Makefile
  projects/ifnet/lib/Makefile
  projects/ifnet/lib/csu/Makefile
  projects/ifnet/lib/libc/aarch64/Symbol.map
  projects/ifnet/lib/libc/aarch64/gen/Makefile.inc
  projects/ifnet/lib/libc/arm/SYS.h
  projects/ifnet/lib/libc/arm/aeabi/aeabi_vfp_double.S
  projects/ifnet/lib/libc/arm/aeabi/aeabi_vfp_float.S
  projects/ifnet/lib/libc/arm/gen/_setjmp.S
  projects/ifnet/lib/libc/arm/gen/setjmp.S
  projects/ifnet/lib/libc/arm/sys/brk.S
  projects/ifnet/lib/libc/arm/sys/sbrk.S
  projects/ifnet/lib/libc/db/hash/hash.c
  projects/ifnet/lib/libc/gen/directory.3
  projects/ifnet/lib/libc/gen/dlfcn.c
  projects/ifnet/lib/libc/gen/readdir.c
  projects/ifnet/lib/libc/gen/rewinddir.c
  projects/ifnet/lib/libc/gen/stringlist.c
  projects/ifnet/lib/libc/gen/telldir.c
  projects/ifnet/lib/libc/gen/telldir.h
  projects/ifnet/lib/libc/net/recv.c
  projects/ifnet/lib/libc/net/send.c
  projects/ifnet/lib/libc/stdlib/reallocarray.3
  projects/ifnet/lib/libedit/chartype.c
  projects/ifnet/lib/libedit/chartype.h
  projects/ifnet/lib/libedit/edit/readline/readline.h
  projects/ifnet/lib/libedit/el.c
  projects/ifnet/lib/libedit/eln.c
  projects/ifnet/lib/libedit/map.c
  projects/ifnet/lib/libedit/readline.c
  projects/ifnet/lib/libedit/tty.c
  projects/ifnet/lib/libelftc/elftc_version.c
  projects/ifnet/lib/libmd/Makefile
  projects/ifnet/lib/libmd/md4.h
  projects/ifnet/lib/libmd/md4c.c
  projects/ifnet/lib/libmd/md5.h
  projects/ifnet/lib/libmd/md5c.c
  projects/ifnet/lib/libmd/mdXhl.c
  projects/ifnet/lib/libmd/ripemd.h
  projects/ifnet/lib/libmd/rmd160c.c
  projects/ifnet/lib/libmd/sha.h
  projects/ifnet/lib/libmd/sha1c.c
  projects/ifnet/lib/libmd/sha256.h
  projects/ifnet/lib/libmd/sha256c.c
  projects/ifnet/lib/libmd/sha512.h
  projects/ifnet/lib/libmd/sha512c.c
  projects/ifnet/lib/libmd/shadriver.c
  projects/ifnet/lib/libpmc/libpmc.c
  projects/ifnet/lib/libproc/Makefile
  projects/ifnet/lib/libprocstat/Makefile
  projects/ifnet/lib/libprocstat/libprocstat.3
  projects/ifnet/lib/libthr/thread/thr_spec.c
  projects/ifnet/lib/libufs/Makefile
  projects/ifnet/lib/libvmmapi/vmmapi.c
  projects/ifnet/lib/libvmmapi/vmmapi.h
  projects/ifnet/lib/msun/src/e_j0.c
  projects/ifnet/lib/msun/src/e_j0f.c
  projects/ifnet/lib/msun/src/e_j1.c
  projects/ifnet/lib/msun/src/e_j1f.c
  projects/ifnet/libexec/rtld-elf/debug.h
  projects/ifnet/libexec/rtld-elf/rtld.c
  projects/ifnet/release/Makefile.ec2
  projects/ifnet/release/arm/BEAGLEBONE.conf
  projects/ifnet/release/arm/PANDABOARD.conf
  projects/ifnet/release/arm/RPI-B.conf
  projects/ifnet/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/ifnet/release/doc/share/xml/sponsor.ent
  projects/ifnet/release/release.sh
  projects/ifnet/release/tools/vmimage.subr
  projects/ifnet/sbin/devd/devd.conf.5
  projects/ifnet/sbin/geom/class/mountver/geom_mountver.c
  projects/ifnet/sbin/geom/class/mountver/gmountver.8
  projects/ifnet/sbin/ifconfig/af_inet.c
  projects/ifnet/sbin/ifconfig/af_inet6.c
  projects/ifnet/sbin/ifconfig/ifconfig.8
  projects/ifnet/sbin/ifconfig/iffib.c
  projects/ifnet/sbin/ifconfig/ifgif.c
  projects/ifnet/sbin/ifconfig/sfp.c
  projects/ifnet/sbin/ipfw/tables.c
  projects/ifnet/share/man/man3/pthread_getspecific.3
  projects/ifnet/share/man/man4/acpi.4
  projects/ifnet/share/man/man4/ctl.4
  projects/ifnet/share/man/man4/iic.4
  projects/ifnet/share/man/man4/usb_quirk.4
  projects/ifnet/share/man/man9/Makefile
  projects/ifnet/share/man/man9/namei.9
  projects/ifnet/share/man/man9/psignal.9
  projects/ifnet/share/misc/bsd-family-tree
  projects/ifnet/share/mk/src.libnames.mk
  projects/ifnet/share/syscons/keymaps/INDEX.keymaps
  projects/ifnet/share/vt/keymaps/INDEX.keymaps
  projects/ifnet/sys/amd64/acpica/acpi_machdep.c
  projects/ifnet/sys/amd64/amd64/apic_vector.S
  projects/ifnet/sys/amd64/amd64/cpu_switch.S
  projects/ifnet/sys/amd64/amd64/db_disasm.c
  projects/ifnet/sys/amd64/amd64/genassym.c
  projects/ifnet/sys/amd64/amd64/machdep.c
  projects/ifnet/sys/amd64/amd64/mp_machdep.c
  projects/ifnet/sys/amd64/amd64/mp_watchdog.c
  projects/ifnet/sys/amd64/amd64/pmap.c
  projects/ifnet/sys/amd64/amd64/vm_machdep.c
  projects/ifnet/sys/amd64/conf/GENERIC
  projects/ifnet/sys/amd64/include/cpufunc.h
  projects/ifnet/sys/amd64/include/md_var.h
  projects/ifnet/sys/amd64/include/pcpu.h
  projects/ifnet/sys/amd64/include/pmap.h
  projects/ifnet/sys/amd64/include/smp.h
  projects/ifnet/sys/amd64/include/vmm.h   (contents, props changed)
  projects/ifnet/sys/amd64/include/vmm_instruction_emul.h   (contents, props changed)
  projects/ifnet/sys/amd64/linux32/linux32_machdep.c
  projects/ifnet/sys/amd64/vmm/amd/svm.c
  projects/ifnet/sys/amd64/vmm/intel/vmx.c
  projects/ifnet/sys/amd64/vmm/io/vatpit.c
  projects/ifnet/sys/amd64/vmm/vmm.c
  projects/ifnet/sys/amd64/vmm/vmm_dev.c
  projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c
  projects/ifnet/sys/amd64/vmm/x86.c
  projects/ifnet/sys/amd64/vmm/x86.h
  projects/ifnet/sys/arm/allwinner/a10_clk.c
  projects/ifnet/sys/arm/allwinner/a10_clk.h
  projects/ifnet/sys/arm/allwinner/a20/files.a20
  projects/ifnet/sys/arm/allwinner/files.allwinner
  projects/ifnet/sys/arm/allwinner/std.a10
  projects/ifnet/sys/arm/altera/socfpga/files.socfpga
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_ccm.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_machdep.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_pic.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_pinctrl.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_rng.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_rtc.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_uart.h
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c
  projects/ifnet/sys/arm/amlogic/aml8726/files.aml8726
  projects/ifnet/sys/arm/amlogic/aml8726/uart_dev_aml8726.c
  projects/ifnet/sys/arm/arm/cpufunc.c
  projects/ifnet/sys/arm/arm/cpufunc_asm_armv7.S
  projects/ifnet/sys/arm/arm/cpuinfo.c
  projects/ifnet/sys/arm/arm/db_disasm.c
  projects/ifnet/sys/arm/arm/exception.S
  projects/ifnet/sys/arm/arm/fusu.S
  projects/ifnet/sys/arm/arm/generic_timer.c
  projects/ifnet/sys/arm/arm/intr.c
  projects/ifnet/sys/arm/arm/machdep.c
  projects/ifnet/sys/arm/arm/mp_machdep.c
  projects/ifnet/sys/arm/arm/pmap-v6-new.c
  projects/ifnet/sys/arm/arm/pmap.c
  projects/ifnet/sys/arm/arm/pmu.c
  projects/ifnet/sys/arm/arm/stdatomic.c
  projects/ifnet/sys/arm/arm/swtch.S
  projects/ifnet/sys/arm/arm/syscall.c
  projects/ifnet/sys/arm/arm/undefined.c
  projects/ifnet/sys/arm/arm/vm_machdep.c
  projects/ifnet/sys/arm/at91/at91_pio.c
  projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
  projects/ifnet/sys/arm/broadcom/bcm2835/bcm2836.c
  projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2836
  projects/ifnet/sys/arm/broadcom/bcm2835/std.bcm2836
  projects/ifnet/sys/arm/conf/AML8726
  projects/ifnet/sys/arm/conf/APALIS-IMX6
  projects/ifnet/sys/arm/conf/ARMADAXP
  projects/ifnet/sys/arm/conf/ARNDALE
  projects/ifnet/sys/arm/conf/ARNDALE-OCTA
  projects/ifnet/sys/arm/conf/ATMEL
  projects/ifnet/sys/arm/conf/AVILA
  projects/ifnet/sys/arm/conf/BEAGLEBONE
  projects/ifnet/sys/arm/conf/BWCT
  projects/ifnet/sys/arm/conf/CAMBRIA
  projects/ifnet/sys/arm/conf/CHROMEBOOK
  projects/ifnet/sys/arm/conf/CHROMEBOOK-PEACH-PIT
  projects/ifnet/sys/arm/conf/CHROMEBOOK-SNOW
  projects/ifnet/sys/arm/conf/CHROMEBOOK-SPRING
  projects/ifnet/sys/arm/conf/CNS11XXNAS
  projects/ifnet/sys/arm/conf/COLIBRI-VF50
  projects/ifnet/sys/arm/conf/COSMIC
  projects/ifnet/sys/arm/conf/CRB
  projects/ifnet/sys/arm/conf/CUBIEBOARD
  projects/ifnet/sys/arm/conf/CUBIEBOARD2
  projects/ifnet/sys/arm/conf/DB-78XXX
  projects/ifnet/sys/arm/conf/DB-88F5XXX
  projects/ifnet/sys/arm/conf/DB-88F6XXX
  projects/ifnet/sys/arm/conf/DIGI-CCWMX53
  projects/ifnet/sys/arm/conf/DOCKSTAR
  projects/ifnet/sys/arm/conf/DREAMPLUG-1001
  projects/ifnet/sys/arm/conf/EA3250
  projects/ifnet/sys/arm/conf/EB9200
  projects/ifnet/sys/arm/conf/EFIKA_MX
  projects/ifnet/sys/arm/conf/EP80219
  projects/ifnet/sys/arm/conf/ETHERNUT5
  projects/ifnet/sys/arm/conf/EXYNOS5.common
  projects/ifnet/sys/arm/conf/EXYNOS5250
  projects/ifnet/sys/arm/conf/EXYNOS5420
  projects/ifnet/sys/arm/conf/GUMSTIX
  projects/ifnet/sys/arm/conf/HL200
  projects/ifnet/sys/arm/conf/HL201
  projects/ifnet/sys/arm/conf/IMX53
  projects/ifnet/sys/arm/conf/IMX53-QSB
  projects/ifnet/sys/arm/conf/IMX6
  projects/ifnet/sys/arm/conf/IQ31244
  projects/ifnet/sys/arm/conf/KB920X
  projects/ifnet/sys/arm/conf/LN2410SBC
  projects/ifnet/sys/arm/conf/NSLU
  projects/ifnet/sys/arm/conf/ODROIDC1
  projects/ifnet/sys/arm/conf/PANDABOARD
  projects/ifnet/sys/arm/conf/QILA9G20
  projects/ifnet/sys/arm/conf/QUARTZ
  projects/ifnet/sys/arm/conf/RADXA
  projects/ifnet/sys/arm/conf/RADXA-LITE
  projects/ifnet/sys/arm/conf/RK3188
  projects/ifnet/sys/arm/conf/RPI-B
  projects/ifnet/sys/arm/conf/RPI2
  projects/ifnet/sys/arm/conf/SAM9260EK
  projects/ifnet/sys/arm/conf/SAM9G20EK
  projects/ifnet/sys/arm/conf/SAM9X25EK
  projects/ifnet/sys/arm/conf/SHEEVAPLUG
  projects/ifnet/sys/arm/conf/SN9G45
  projects/ifnet/sys/arm/conf/SOCKIT.common
  projects/ifnet/sys/arm/conf/TS7800
  projects/ifnet/sys/arm/conf/VERSATILEPB
  projects/ifnet/sys/arm/conf/VIRT
  projects/ifnet/sys/arm/conf/VSATV102
  projects/ifnet/sys/arm/conf/VYBRID
  projects/ifnet/sys/arm/conf/ZEDBOARD
  projects/ifnet/sys/arm/freescale/imx/files.imx6
  projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c
  projects/ifnet/sys/arm/freescale/imx/imx6_ccm.c
  projects/ifnet/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/ifnet/sys/arm/freescale/imx/imx_ccmvar.h
  projects/ifnet/sys/arm/freescale/imx/imx_sdhci.c
  projects/ifnet/sys/arm/freescale/vybrid/files.vybrid
  projects/ifnet/sys/arm/include/armreg.h
  projects/ifnet/sys/arm/include/asm.h
  projects/ifnet/sys/arm/include/atomic.h
  projects/ifnet/sys/arm/include/cpu-v6.h
  projects/ifnet/sys/arm/include/cpufunc.h
  projects/ifnet/sys/arm/include/pl310.h
  projects/ifnet/sys/arm/include/pmap-v6.h
  projects/ifnet/sys/arm/include/proc.h
  projects/ifnet/sys/arm/include/smp.h
  projects/ifnet/sys/arm/include/sysreg.h
  projects/ifnet/sys/arm/qemu/files.qemu
  projects/ifnet/sys/arm/rockchip/files.rk30xx
  projects/ifnet/sys/arm/samsung/exynos/files.exynos5
  projects/ifnet/sys/arm/ti/aintc.c
  projects/ifnet/sys/arm/ti/am335x/am335x_dmtimer.c
  projects/ifnet/sys/arm/ti/am335x/am335x_gpio.c
  projects/ifnet/sys/arm/ti/am335x/am335x_lcd.c
  projects/ifnet/sys/arm/ti/am335x/am335x_lcd.h
  projects/ifnet/sys/arm/ti/am335x/am335x_pmic.c
  projects/ifnet/sys/arm/ti/am335x/am335x_prcm.c
  projects/ifnet/sys/arm/ti/am335x/am335x_pwm.h
  projects/ifnet/sys/arm/ti/am335x/am335x_scm_padconf.c
  projects/ifnet/sys/arm/ti/am335x/am335x_usbss.c
  projects/ifnet/sys/arm/ti/am335x/files.am335x
  projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c
  projects/ifnet/sys/arm/ti/cpsw/if_cpswreg.h
  projects/ifnet/sys/arm/ti/cpsw/if_cpswvar.h
  projects/ifnet/sys/arm/ti/files.ti
  projects/ifnet/sys/arm/ti/omap4/files.omap4
  projects/ifnet/sys/arm/ti/omap4/omap4_gpio.c
  projects/ifnet/sys/arm/ti/omap4/omap4_prcm_clks.c
  projects/ifnet/sys/arm/ti/omap4/omap4_scm_padconf.c
  projects/ifnet/sys/arm/ti/ti_adc.c
  projects/ifnet/sys/arm/ti/ti_common.c
  projects/ifnet/sys/arm/ti/ti_edma3.c
  projects/ifnet/sys/arm/ti/ti_gpio.c
  projects/ifnet/sys/arm/ti/ti_gpio.h
  projects/ifnet/sys/arm/ti/ti_i2c.c
  projects/ifnet/sys/arm/ti/ti_mbox.c
  projects/ifnet/sys/arm/ti/ti_prcm.h
  projects/ifnet/sys/arm/ti/ti_pruss.c
  projects/ifnet/sys/arm/ti/ti_pruss.h
  projects/ifnet/sys/arm/ti/ti_scm.c
  projects/ifnet/sys/arm/ti/ti_scm.h
  projects/ifnet/sys/arm/ti/ti_sdhci.c
  projects/ifnet/sys/arm/ti/ti_sdma.c
  projects/ifnet/sys/arm/ti/usb/omap_ehci.c
  projects/ifnet/sys/arm/ti/usb/omap_usb.h
  projects/ifnet/sys/arm/xilinx/files.zynq7
  projects/ifnet/sys/arm64/arm64/busdma_machdep.c
  projects/ifnet/sys/arm64/arm64/db_disasm.c
  projects/ifnet/sys/arm64/arm64/intr_machdep.c
  projects/ifnet/sys/arm64/arm64/locore.S
  projects/ifnet/sys/arm64/arm64/nexus.c
  projects/ifnet/sys/arm64/conf/GENERIC
  projects/ifnet/sys/arm64/include/armreg.h
  projects/ifnet/sys/arm64/include/pmc_mdep.h
  projects/ifnet/sys/boot/arm/uboot/Makefile
  projects/ifnet/sys/boot/arm/uboot/ldscript.arm
  projects/ifnet/sys/boot/arm/uboot/start.S
  projects/ifnet/sys/boot/common/dev_net.c
  projects/ifnet/sys/boot/common/dev_net.h
  projects/ifnet/sys/boot/common/load_elf.c
  projects/ifnet/sys/boot/efi/boot1/Makefile
  projects/ifnet/sys/boot/efi/libefi/Makefile
  projects/ifnet/sys/boot/efi/loader/Makefile
  projects/ifnet/sys/boot/efi/loader/arch/amd64/start.S
  projects/ifnet/sys/boot/efi/loader/arch/arm/ldscript.arm
  projects/ifnet/sys/boot/efi/loader/arch/arm/start.S
  projects/ifnet/sys/boot/efi/loader/arch/arm64/Makefile.inc
  projects/ifnet/sys/boot/efi/loader/arch/arm64/start.S
  projects/ifnet/sys/boot/efi/loader/arch/i386/start.S
  projects/ifnet/sys/boot/efi/loader/main.c
  projects/ifnet/sys/boot/fdt/dts/arm/am335x-evm.dts
  projects/ifnet/sys/boot/fdt/dts/arm/beaglebone-black.dts
  projects/ifnet/sys/boot/fdt/dts/arm/beaglebone.dts
  projects/ifnet/sys/boot/fdt/dts/arm/cubieboard.dts
  projects/ifnet/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/ifnet/sys/boot/fdt/dts/arm/odroidc1.dts
  projects/ifnet/sys/boot/fdt/dts/arm/pandaboard.dts
  projects/ifnet/sys/boot/fdt/dts/arm/rpi2.dts
  projects/ifnet/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  projects/ifnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/ifnet/sys/boot/fdt/dts/arm/vsatv102-m6.dts
  projects/ifnet/sys/boot/i386/boot0/boot0.S
  projects/ifnet/sys/boot/uboot/common/main.c
  projects/ifnet/sys/boot/uboot/lib/copy.c
  projects/ifnet/sys/boot/uboot/lib/elf_freebsd.c
  projects/ifnet/sys/boot/uboot/lib/libuboot.h
  projects/ifnet/sys/boot/uboot/lib/net.c
  projects/ifnet/sys/cam/ctl/ctl_backend_block.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/ifnet/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/ifnet/sys/cddl/dev/profile/profile.c
  projects/ifnet/sys/compat/freebsd32/freebsd32_misc.c
  projects/ifnet/sys/compat/ndis/subr_ntoskrnl.c
  projects/ifnet/sys/compat/svr4/svr4_misc.c
  projects/ifnet/sys/conf/NOTES
  projects/ifnet/sys/conf/files
  projects/ifnet/sys/conf/files.arm
  projects/ifnet/sys/conf/files.arm64
  projects/ifnet/sys/conf/files.powerpc
  projects/ifnet/sys/conf/options
  projects/ifnet/sys/conf/options.arm
  projects/ifnet/sys/contrib/dev/acpica/changes.txt
  projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c
  projects/ifnet/sys/contrib/dev/acpica/common/ahpredef.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmextern.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtable.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslascii.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/ifnet/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslprepkg.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dttable.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/preprocess.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/prscan.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/prutils.c
  projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwpci.c
  projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utfileio.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/uthex.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxferror.c
  projects/ifnet/sys/contrib/dev/acpica/include/acdebug.h
  projects/ifnet/sys/contrib/dev/acpica/include/acdisasm.h
  projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h
  projects/ifnet/sys/contrib/dev/acpica/include/acparser.h
  projects/ifnet/sys/contrib/dev/acpica/include/acpixf.h
  projects/ifnet/sys/contrib/dev/acpica/include/acpredef.h
  projects/ifnet/sys/contrib/dev/acpica/include/actbl.h
  projects/ifnet/sys/contrib/dev/acpica/include/actbl1.h
  projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h
  projects/ifnet/sys/contrib/dev/acpica/include/actbl3.h
  projects/ifnet/sys/contrib/dev/acpica/include/actypes.h
  projects/ifnet/sys/contrib/dev/acpica/include/acutils.h
  projects/ifnet/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/ifnet/sys/contrib/dev/acpica/include/platform/acenvex.h
  projects/ifnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/ifnet/sys/contrib/vchiq/interface/compat/vchi_bsd.c
  projects/ifnet/sys/ddb/db_access.c
  projects/ifnet/sys/ddb/db_access.h
  projects/ifnet/sys/ddb/db_break.c
  projects/ifnet/sys/ddb/db_capture.c
  projects/ifnet/sys/ddb/db_command.c
  projects/ifnet/sys/ddb/db_examine.c
  projects/ifnet/sys/ddb/db_expr.c
  projects/ifnet/sys/ddb/db_input.c
  projects/ifnet/sys/ddb/db_main.c
  projects/ifnet/sys/ddb/db_print.c
  projects/ifnet/sys/ddb/db_ps.c
  projects/ifnet/sys/ddb/db_run.c
  projects/ifnet/sys/ddb/db_script.c
  projects/ifnet/sys/ddb/db_sym.c
  projects/ifnet/sys/ddb/db_sym.h
  projects/ifnet/sys/ddb/db_textdump.c
  projects/ifnet/sys/ddb/db_thread.c
  projects/ifnet/sys/ddb/db_variables.c
  projects/ifnet/sys/ddb/db_watch.c
  projects/ifnet/sys/ddb/db_write_cmd.c
  projects/ifnet/sys/ddb/ddb.h
  projects/ifnet/sys/dev/acpi_support/acpi_ibm.c
  projects/ifnet/sys/dev/acpica/acpi.c
  projects/ifnet/sys/dev/acpica/acpi_cpu.c
  projects/ifnet/sys/dev/acpica/acpi_package.c
  projects/ifnet/sys/dev/acpica/acpi_throttle.c
  projects/ifnet/sys/dev/acpica/acpi_timer.c
  projects/ifnet/sys/dev/acpica/acpivar.h
  projects/ifnet/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
  projects/ifnet/sys/dev/ath/if_ath.c
  projects/ifnet/sys/dev/atkbdc/psm.c
  projects/ifnet/sys/dev/bxe/bxe.c
  projects/ifnet/sys/dev/bxe/bxe_stats.c
  projects/ifnet/sys/dev/bxe/bxe_stats.h
  projects/ifnet/sys/dev/ce/if_ce.c
  projects/ifnet/sys/dev/cp/if_cp.c
  projects/ifnet/sys/dev/ctau/if_ct.c
  projects/ifnet/sys/dev/cx/if_cx.c
  projects/ifnet/sys/dev/cxgb/cxgb_main.c
  projects/ifnet/sys/dev/cxgb/cxgb_sge.c
  projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  projects/ifnet/sys/dev/cxgbe/t4_main.c
  projects/ifnet/sys/dev/dcons/dcons_os.c
  projects/ifnet/sys/dev/drm2/drm_irq.c
  projects/ifnet/sys/dev/drm2/i915/intel_display.c
  projects/ifnet/sys/dev/e1000/if_em.c
  projects/ifnet/sys/dev/fdt/fdt_common.c
  projects/ifnet/sys/dev/fdt/fdt_common.h
  projects/ifnet/sys/dev/fdt/simplebus.c
  projects/ifnet/sys/dev/glxsb/glxsb.c
  projects/ifnet/sys/dev/gpio/ofw_gpiobus.c
  projects/ifnet/sys/dev/gxemul/cons/gxemul_cons.c
  projects/ifnet/sys/dev/hifn/hifn7751.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_amd.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_armv7.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_core.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_e500.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_intel.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_logging.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_mips.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_mips24k.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_mips74k.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_mod.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_mpc7xxx.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_octeon.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_piv.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_ppc970.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_ppro.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_soft.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_tsc.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_uncore.c
  projects/ifnet/sys/dev/hwpmc/hwpmc_xscale.c
  projects/ifnet/sys/dev/hwpmc/pmc_events.h
  projects/ifnet/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/ifnet/sys/dev/hyperv/storvsc/hv_vstorage.h
  projects/ifnet/sys/dev/if_ndis/if_ndis.c
  projects/ifnet/sys/dev/iicbus/iicbus.c
  projects/ifnet/sys/dev/iicbus/iicbus.h
  projects/ifnet/sys/dev/isci/isci_io_request.c
  projects/ifnet/sys/dev/iscsi/icl_soft.c
  projects/ifnet/sys/dev/iwn/if_iwn.c
  projects/ifnet/sys/dev/ixl/if_ixlv.c
  projects/ifnet/sys/dev/mfi/mfi.c
  projects/ifnet/sys/dev/mmc/mmc.c
  projects/ifnet/sys/dev/mrsas/mrsas.c
  projects/ifnet/sys/dev/mrsas/mrsas.h
  projects/ifnet/sys/dev/mrsas/mrsas_cam.c
  projects/ifnet/sys/dev/mrsas/mrsas_fp.c
  projects/ifnet/sys/dev/mrsas/mrsas_ioctl.c
  projects/ifnet/sys/dev/mrsas/mrsas_ioctl.h
  projects/ifnet/sys/dev/mrsas/mrsas_linux.c
  projects/ifnet/sys/dev/mwl/if_mwl.c
  projects/ifnet/sys/dev/nand/nandsim_chip.c
  projects/ifnet/sys/dev/netmap/netmap_mem2.c
  projects/ifnet/sys/dev/ntb/if_ntb/if_ntb.c
  projects/ifnet/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/ifnet/sys/dev/nxge/if_nxge.c
  projects/ifnet/sys/dev/oce/oce_if.c
  projects/ifnet/sys/dev/ofw/ofw_bus_subr.c
  projects/ifnet/sys/dev/ofw/ofw_bus_subr.h
  projects/ifnet/sys/dev/ofw/ofw_iicbus.c
  projects/ifnet/sys/dev/ofw/ofwbus.c
  projects/ifnet/sys/dev/patm/if_patm_attach.c
  projects/ifnet/sys/dev/pci/pci_pci.c
  projects/ifnet/sys/dev/pci/pcib_private.h
  projects/ifnet/sys/dev/qlxgb/qla_os.c
  projects/ifnet/sys/dev/qlxgbe/ql_os.c
  projects/ifnet/sys/dev/qlxge/qls_os.c
  projects/ifnet/sys/dev/rndtest/rndtest.c
  projects/ifnet/sys/dev/safe/safe.c
  projects/ifnet/sys/dev/sdhci/sdhci.c
  projects/ifnet/sys/dev/sdhci/sdhci.h
  projects/ifnet/sys/dev/sfxge/sfxge.c
  projects/ifnet/sys/dev/sfxge/sfxge_port.c
  projects/ifnet/sys/dev/sfxge/sfxge_rx.c
  projects/ifnet/sys/dev/sfxge/sfxge_tx.c
  projects/ifnet/sys/dev/sfxge/sfxge_tx.h
  projects/ifnet/sys/dev/sound/midi/mpu401.c
  projects/ifnet/sys/dev/sound/pci/atiixp.c
  projects/ifnet/sys/dev/sound/pci/es137x.c
  projects/ifnet/sys/dev/sound/pci/hda/hdaa.c
  projects/ifnet/sys/dev/sound/pci/hda/hdac.c
  projects/ifnet/sys/dev/sound/pci/via8233.c
  projects/ifnet/sys/dev/sound/pcm/channel.c
  projects/ifnet/sys/dev/sound/pcm/channel.h
  projects/ifnet/sys/dev/sound/pcm/feeder_chain.c
  projects/ifnet/sys/dev/sound/pcm/sound.h
  projects/ifnet/sys/dev/sound/usb/uaudio.c
  projects/ifnet/sys/dev/twa/tw_osl_freebsd.c
  projects/ifnet/sys/dev/tws/tws.c
  projects/ifnet/sys/dev/uart/uart_dev_ti8250.c
  projects/ifnet/sys/dev/ubsec/ubsec.c
  projects/ifnet/sys/dev/usb/controller/dwc_otg.c
  projects/ifnet/sys/dev/usb/controller/dwc_otg.h
  projects/ifnet/sys/dev/usb/quirk/usb_quirk.c
  projects/ifnet/sys/dev/usb/quirk/usb_quirk.h
  projects/ifnet/sys/dev/usb/serial/u3g.c
  projects/ifnet/sys/dev/usb/serial/uftdi.c
  projects/ifnet/sys/dev/usb/usb_device.c
  projects/ifnet/sys/dev/usb/usb_msctest.c
  projects/ifnet/sys/dev/usb/usb_msctest.h
  projects/ifnet/sys/dev/usb/usbdevs
  projects/ifnet/sys/dev/usb/video/udl.c
  projects/ifnet/sys/dev/usb/wlan/if_urtwn.c
  projects/ifnet/sys/dev/usb/wlan/if_urtwnreg.h
  projects/ifnet/sys/dev/virtio/random/virtio_random.c
  projects/ifnet/sys/dev/vt/vt.h
  projects/ifnet/sys/dev/vt/vt_core.c
  projects/ifnet/sys/dev/watchdog/watchdog.c
  projects/ifnet/sys/dev/xen/blkback/blkback.c
  projects/ifnet/sys/dev/xen/grant_table/grant_table.c
  projects/ifnet/sys/dev/xen/netback/netback.c
  projects/ifnet/sys/dev/xen/netfront/netfront.c
  projects/ifnet/sys/dev/xen/privcmd/privcmd.c
  projects/ifnet/sys/fs/nfs/nfs_commonport.c
  projects/ifnet/sys/fs/nfsclient/nfs_clbio.c
  projects/ifnet/sys/fs/nfsclient/nfs_clvnops.c
  projects/ifnet/sys/fs/procfs/procfs_ctl.c
  projects/ifnet/sys/gdb/gdb_cons.c
  projects/ifnet/sys/geom/gate/g_gate.c
  projects/ifnet/sys/geom/journal/g_journal.c
  projects/ifnet/sys/geom/mirror/g_mirror.c
  projects/ifnet/sys/geom/raid3/g_raid3.c
  projects/ifnet/sys/geom/sched/gs_rr.c
  projects/ifnet/sys/geom/uncompress/g_uncompress.c
  projects/ifnet/sys/i386/acpica/acpi_machdep.c
  projects/ifnet/sys/i386/conf/GENERIC
  projects/ifnet/sys/i386/i386/db_disasm.c
  projects/ifnet/sys/i386/i386/mp_watchdog.c
  projects/ifnet/sys/i386/ibcs2/ibcs2_misc.c
  projects/ifnet/sys/i386/include/md_var.h
  projects/ifnet/sys/i386/linux/linux_machdep.c
  projects/ifnet/sys/kern/init_main.c
  projects/ifnet/sys/kern/kern_cons.c
  projects/ifnet/sys/kern/kern_cpuset.c
  projects/ifnet/sys/kern/kern_descrip.c
  projects/ifnet/sys/kern/kern_event.c
  projects/ifnet/sys/kern/kern_exec.c
  projects/ifnet/sys/kern/kern_exit.c
  projects/ifnet/sys/kern/kern_fork.c
  projects/ifnet/sys/kern/kern_ktr.c
  projects/ifnet/sys/kern/kern_malloc.c
  projects/ifnet/sys/kern/kern_racct.c
  projects/ifnet/sys/kern/kern_shutdown.c
  projects/ifnet/sys/kern/kern_synch.c
  projects/ifnet/sys/kern/kern_thread.c
  projects/ifnet/sys/kern/subr_nvlist.c
  projects/ifnet/sys/kern/subr_nvpair.c
  projects/ifnet/sys/kern/subr_turnstile.c
  projects/ifnet/sys/kern/subr_vmem.c
  projects/ifnet/sys/kern/subr_witness.c
  projects/ifnet/sys/kern/uipc_domain.c
  projects/ifnet/sys/kern/uipc_mbuf.c
  projects/ifnet/sys/kern/vfs_syscalls.c
  projects/ifnet/sys/mips/atheros/files.ar71xx
  projects/ifnet/sys/mips/beri/beri_simplebus.c
  projects/ifnet/sys/mips/cavium/octe/ethernet.c
  projects/ifnet/sys/mips/cavium/octeon_rnd.c
  projects/ifnet/sys/mips/conf/AP135
  projects/ifnet/sys/mips/conf/AP135.hints
  projects/ifnet/sys/mips/conf/QCA955X_BASE
  projects/ifnet/sys/mips/conf/ROUTERSTATION
  projects/ifnet/sys/mips/conf/RSPRO
  projects/ifnet/sys/mips/include/intr_machdep.h
  projects/ifnet/sys/mips/mips/db_disasm.c
  projects/ifnet/sys/mips/mips/pmap.c
  projects/ifnet/sys/mips/mips/vm_machdep.c
  projects/ifnet/sys/mips/nlm/dev/net/xlpge.c
  projects/ifnet/sys/mips/rmi/dev/xlr/rge.c
  projects/ifnet/sys/modules/Makefile
  projects/ifnet/sys/net/if_bridge.c
  projects/ifnet/sys/net/if_gif.c
  projects/ifnet/sys/net/if_gif.h
  projects/ifnet/sys/net/if_gre.c
  projects/ifnet/sys/net/if_me.c
  projects/ifnet/sys/net/if_spppsubr.c
  projects/ifnet/sys/net/sff8436.h
  projects/ifnet/sys/net/sff8472.h
  projects/ifnet/sys/net80211/ieee80211.h
  projects/ifnet/sys/net80211/ieee80211_adhoc.c
  projects/ifnet/sys/net80211/ieee80211_freebsd.c
  projects/ifnet/sys/net80211/ieee80211_hostap.c
  projects/ifnet/sys/net80211/ieee80211_ht.c
  projects/ifnet/sys/net80211/ieee80211_hwmp.c
  projects/ifnet/sys/net80211/ieee80211_input.h
  projects/ifnet/sys/net80211/ieee80211_mesh.c
  projects/ifnet/sys/net80211/ieee80211_node.c
  projects/ifnet/sys/net80211/ieee80211_output.c
  projects/ifnet/sys/net80211/ieee80211_proto.c
  projects/ifnet/sys/net80211/ieee80211_scan.c
  projects/ifnet/sys/net80211/ieee80211_scan.h
  projects/ifnet/sys/net80211/ieee80211_scan_sta.c
  projects/ifnet/sys/net80211/ieee80211_scan_sw.c
  projects/ifnet/sys/net80211/ieee80211_scan_sw.h
  projects/ifnet/sys/net80211/ieee80211_sta.c
  projects/ifnet/sys/net80211/ieee80211_wds.c
  projects/ifnet/sys/netgraph/netflow/ng_netflow.c
  projects/ifnet/sys/netgraph/netgraph.h
  projects/ifnet/sys/netinet/in_gif.c
  projects/ifnet/sys/netinet/in_pcb.c
  projects/ifnet/sys/netinet/ip_mroute.c
  projects/ifnet/sys/netinet/sctp_input.c
  projects/ifnet/sys/netinet/tcp_hostcache.c
  projects/ifnet/sys/netinet/tcp_input.c
  projects/ifnet/sys/netinet/tcp_subr.c
  projects/ifnet/sys/netinet6/in6_gif.c
  projects/ifnet/sys/netinet6/in6_rmx.c
  projects/ifnet/sys/netinet6/ip6_ipsec.c
  projects/ifnet/sys/netinet6/ip6_output.c
  projects/ifnet/sys/netinet6/nd6.h
  projects/ifnet/sys/netinet6/nd6_nbr.c
  projects/ifnet/sys/netipsec/esp.h
  projects/ifnet/sys/netipsec/key.c
  projects/ifnet/sys/netipsec/keysock.c
  projects/ifnet/sys/netpfil/ipfw/dn_sched.h
  projects/ifnet/sys/netpfil/ipfw/ip_dn_private.h
  projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw2.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw_dynamic.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw_pfil.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw_sockopt.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw_table.c
  projects/ifnet/sys/netpfil/ipfw/ip_fw_table_value.c
  projects/ifnet/sys/netpfil/pf/if_pfsync.c
  projects/ifnet/sys/netpfil/pf/pf.c
  projects/ifnet/sys/netpfil/pf/pf_if.c
  projects/ifnet/sys/netpfil/pf/pf_ioctl.c
  projects/ifnet/sys/netpfil/pf/pf_norm.c
  projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/ifnet/sys/ofed/include/linux/bitops.h
  projects/ifnet/sys/ofed/include/linux/jiffies.h
  projects/ifnet/sys/ofed/include/linux/timer.h
  projects/ifnet/sys/ofed/include/linux/workqueue.h
  projects/ifnet/sys/pc98/conf/GENERIC
  projects/ifnet/sys/powerpc/conf/GENERIC
  projects/ifnet/sys/powerpc/mambo/mambo_console.c
  projects/ifnet/sys/powerpc/mpc85xx/pci_mpc85xx.c
  projects/ifnet/sys/powerpc/ofw/ofw_pcibus.c
  projects/ifnet/sys/powerpc/powerpc/db_disasm.c
  projects/ifnet/sys/powerpc/pseries/phyp_console.c
  projects/ifnet/sys/powerpc/pseries/vdevice.c
  projects/ifnet/sys/sparc64/conf/GENERIC
  projects/ifnet/sys/sparc64/sparc64/db_disasm.c
  projects/ifnet/sys/sys/callout.h
  projects/ifnet/sys/sys/cdefs.h
  projects/ifnet/sys/sys/elf_common.h
  projects/ifnet/sys/sys/imgact.h
  projects/ifnet/sys/sys/ktr.h
  projects/ifnet/sys/sys/malloc.h
  projects/ifnet/sys/sys/module.h
  projects/ifnet/sys/sys/mouse.h
  projects/ifnet/sys/sys/nvpair_impl.h
  projects/ifnet/sys/sys/param.h
  projects/ifnet/sys/sys/pmc.h
  projects/ifnet/sys/sys/proc.h
  projects/ifnet/sys/sys/sockio.h
  projects/ifnet/sys/sys/systm.h
  projects/ifnet/sys/vm/default_pager.c
  projects/ifnet/sys/vm/device_pager.c
  projects/ifnet/sys/vm/phys_pager.c
  projects/ifnet/sys/vm/sg_pager.c
  projects/ifnet/sys/vm/swap_pager.c
  projects/ifnet/sys/vm/uma.h
  projects/ifnet/sys/vm/uma_core.c
  projects/ifnet/sys/vm/vm_meter.c
  projects/ifnet/sys/vm/vm_object.c
  projects/ifnet/sys/vm/vm_page.c
  projects/ifnet/sys/vm/vm_pageout.c
  projects/ifnet/sys/vm/vm_phys.c
  projects/ifnet/sys/vm/vm_phys.h
  projects/ifnet/sys/vm/vnode_pager.c
  projects/ifnet/sys/x86/acpica/srat.c
  projects/ifnet/sys/x86/include/acpica_machdep.h   (contents, props changed)
  projects/ifnet/sys/x86/include/specialreg.h
  projects/ifnet/sys/x86/x86/cpu_machdep.c
  projects/ifnet/sys/x86/x86/mca.c
  projects/ifnet/sys/x86/xen/xen_apic.c
  projects/ifnet/sys/x86/xen/xenpv.c
  projects/ifnet/sys/xen/xen-os.h
  projects/ifnet/tests/Makefile
  projects/ifnet/tests/sys/kern/Makefile
  projects/ifnet/tools/bsdbox/Makefile.base
  projects/ifnet/tools/build/Makefile
  projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/ifnet/tools/regression/p1003_1b/main.c
  projects/ifnet/tools/regression/p1003_1b/prutil.c
  projects/ifnet/tools/tools/ath/athaggrstats/Makefile
  projects/ifnet/tools/tools/ath/athstats/Makefile
  projects/ifnet/tools/tools/mwl/mwlstats/Makefile
  projects/ifnet/tools/tools/net80211/wlanstats/Makefile
  projects/ifnet/tools/tools/npe/npestats/Makefile
  projects/ifnet/usr.bin/Makefile
  projects/ifnet/usr.bin/bmake/Makefile
  projects/ifnet/usr.bin/bmake/unit-tests/Makefile
  projects/ifnet/usr.bin/checknr/checknr.c
  projects/ifnet/usr.bin/col/col.1
  projects/ifnet/usr.bin/col/col.c
  projects/ifnet/usr.bin/ctlstat/ctlstat.8
  projects/ifnet/usr.bin/elfdump/elfdump.c
  projects/ifnet/usr.bin/m4/extern.h
  projects/ifnet/usr.bin/m4/gnum4.c
  projects/ifnet/usr.bin/m4/look.c
  projects/ifnet/usr.bin/m4/m4.1
  projects/ifnet/usr.bin/m4/main.c
  projects/ifnet/usr.bin/m4/mdef.h
  projects/ifnet/usr.bin/m4/misc.c
  projects/ifnet/usr.bin/m4/parser.y
  projects/ifnet/usr.bin/man/man.sh
  projects/ifnet/usr.bin/mandoc/Makefile
  projects/ifnet/usr.bin/netstat/if.c
  projects/ifnet/usr.bin/netstat/route.c
  projects/ifnet/usr.bin/procstat/procstat.1
  projects/ifnet/usr.bin/rctl/rctl.8
  projects/ifnet/usr.bin/soelim/soelim.1
  projects/ifnet/usr.bin/soelim/soelim.c
  projects/ifnet/usr.bin/ssh-copy-id/ssh-copy-id.sh
  projects/ifnet/usr.bin/tar/Makefile
  projects/ifnet/usr.bin/time/time.c
  projects/ifnet/usr.bin/vtfontcvt/vtfontcvt.c
  projects/ifnet/usr.bin/whois/whois.1
  projects/ifnet/usr.bin/whois/whois.c
  projects/ifnet/usr.sbin/acpi/acpidb/acpidb.c
  projects/ifnet/usr.sbin/acpi/iasl/Makefile
  projects/ifnet/usr.sbin/bhyve/bhyve.8
  projects/ifnet/usr.sbin/bhyve/block_if.c
  projects/ifnet/usr.sbin/bhyve/inout.c
  projects/ifnet/usr.sbin/bhyve/pci_ahci.c
  projects/ifnet/usr.sbin/bhyve/pci_hostbridge.c
  projects/ifnet/usr.sbin/bhyve/pci_virtio_block.c
  projects/ifnet/usr.sbin/bhyve/pci_virtio_net.c
  projects/ifnet/usr.sbin/bhyve/pci_virtio_rnd.c
  projects/ifnet/usr.sbin/bhyve/task_switch.c
  projects/ifnet/usr.sbin/bhyve/virtio.c
  projects/ifnet/usr.sbin/bhyvectl/bhyvectl.c
  projects/ifnet/usr.sbin/bhyveload/bhyveload.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/Makefile
  projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot
  projects/ifnet/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/ifnet/usr.sbin/ctladm/ctladm.8
  projects/ifnet/usr.sbin/ctld/ctld.8
  projects/ifnet/usr.sbin/iostat/iostat.8
  projects/ifnet/usr.sbin/kbdmap/kbdmap.c
  projects/ifnet/usr.sbin/mountd/mountd.c
  projects/ifnet/usr.sbin/pmcstat/pmcstat.8
  projects/ifnet/usr.sbin/pmcstat/pmcstat.c
  projects/ifnet/usr.sbin/pmcstat/pmcstat_log.c
  projects/ifnet/usr.sbin/pw/Makefile
  projects/ifnet/usr.sbin/pw/fileupd.c
  projects/ifnet/usr.sbin/pw/grupd.c
  projects/ifnet/usr.sbin/pw/pw_conf.c
  projects/ifnet/usr.sbin/pw/pw_nis.c
  projects/ifnet/usr.sbin/pw/pw_user.c
  projects/ifnet/usr.sbin/pw/pwupd.c
  projects/ifnet/usr.sbin/pw/pwupd.h
  projects/ifnet/usr.sbin/syslogd/pathnames.h
  projects/ifnet/usr.sbin/uefisign/pe.c
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/cddl/   (props changed)
  projects/ifnet/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/contrib/atf/   (props changed)
  projects/ifnet/contrib/binutils/   (props changed)
  projects/ifnet/contrib/bmake/   (props changed)
  projects/ifnet/contrib/elftoolchain/   (props changed)
  projects/ifnet/contrib/gcc/   (props changed)
  projects/ifnet/contrib/gdb/   (props changed)
  projects/ifnet/contrib/libarchive/   (props changed)
  projects/ifnet/contrib/libarchive/libarchive/   (props changed)
  projects/ifnet/contrib/netcat/   (props changed)
  projects/ifnet/contrib/tzdata/   (props changed)
  projects/ifnet/etc/   (props changed)
  projects/ifnet/gnu/lib/   (props changed)
  projects/ifnet/include/   (props changed)
  projects/ifnet/lib/libc/   (props changed)
  projects/ifnet/lib/libvmmapi/   (props changed)
  projects/ifnet/sbin/   (props changed)
  projects/ifnet/sbin/ipfw/   (props changed)
  projects/ifnet/share/   (props changed)
  projects/ifnet/share/man/man4/   (props changed)
  projects/ifnet/sys/   (props changed)
  projects/ifnet/sys/amd64/vmm/   (props changed)
  projects/ifnet/sys/boot/   (props changed)
  projects/ifnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/sys/conf/   (props changed)
  projects/ifnet/sys/contrib/dev/acpica/   (props changed)
  projects/ifnet/sys/contrib/ipfilter/   (props changed)
  projects/ifnet/sys/dev/hyperv/   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_adminq.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_adminq.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_adminq_cmd.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_alloc.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_common.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_hmc.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_hmc.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_lan_hmc.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_lan_hmc.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_nvm.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_osdep.c   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_osdep.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_prototype.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_register.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_status.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_type.h   (props changed)
  projects/ifnet/sys/dev/ixl/i40e_virtchnl.h   (props changed)
  projects/ifnet/sys/dev/ixl/if_ixl.c   (props changed)
  projects/ifnet/sys/dev/ixl/ixl_txrx.c   (props changed)
  projects/ifnet/usr.bin/procstat/   (props changed)
  projects/ifnet/usr.sbin/bhyve/   (props changed)
  projects/ifnet/usr.sbin/bhyvectl/   (props changed)
  projects/ifnet/usr.sbin/bhyveload/   (props changed)

Modified: projects/ifnet/Makefile.inc1
==============================================================================
--- projects/ifnet/Makefile.inc1	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/Makefile.inc1	Fri May 22 18:23:21 2015	(r283294)
@@ -1297,7 +1297,9 @@ _cat=		bin/cat
 _lex=		usr.bin/lex
 .endif
 
-.if ${BOOTSTRAPPING} < 1001507
+# r277259 crunchide: Correct 64-bit section header offset
+# r281674 crunchide: always include both 32- and 64-bit ELF support
+.if ${BOOTSTRAPPING} < 1100071
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1361,6 +1363,9 @@ _kerberos5_bootstrap_tools= \
 .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
+# Rebuild up-to-date libmd for xinstall
+${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
+
 bootstrap-tools: .PHONY
 
 #	Please document (add comment) why something is in 'bootstrap-tools'.
@@ -1463,11 +1468,6 @@ kernel-tools: .MAKE
 _btxld=		usr.sbin/btxld
 .endif
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-.if ${MK_RESCUE} != "no"
-_crunchide=	usr.sbin/crunch/crunchide
-.endif
-.endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""
@@ -1502,6 +1502,9 @@ _clang_libs=	lib/clang
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
+.if ${MK_USB} != "no"
+_usb_tools=	sys/boot/usb/tools
+.endif
 
 cross-tools: .MAKE
 .for _tool in \
@@ -1512,7 +1515,7 @@ cross-tools: .MAKE
     ${_cc} \
     ${_btxld} \
     ${_crunchide} \
-    sys/boot/usb/tools
+    ${_usb_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1657,13 +1660,7 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
-.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
-_startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
-.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
-_startup_libs+=	lib/csu/${MACHINE_ARCH}
-.else
-_startup_libs+=	lib/csu/${MACHINE_CPUARCH}
-.endif
+_startup_libs+=	lib/csu
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
@@ -1682,7 +1679,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
-		${_kerberos5_lib_libheimsqlite} \
+		${_libsqlite3} \
 		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
@@ -1758,6 +1755,13 @@ _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
+# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
+# on select architectures though (see cddl/lib/Makefile)
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
+	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+	${MACHINE_CPUARCH} == "arm"
+_prebuild_libs+=	lib/libproc lib/librtld_db
+.endif
 .endif
 
 .if ${MK_CRYPT} != "no"
@@ -1789,7 +1793,7 @@ _secure_lib=	secure/lib
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
-    kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L 
+    kerberos5/lib/libwind__L lib/libsqlite3__L
 kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
@@ -1802,7 +1806,7 @@ kerberos5/lib/libroken__L: lib/libcrypt_
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
-kerberos5/lib/libheimsqlite__L: lib/libthr__L
+lib/libsqlite3__L: lib/libthr__L
 .endif
 
 .if ${MK_GSSAPI} != "no"
@@ -1818,7 +1822,7 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
+_libsqlite3= lib/libsqlite3
 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
 _kerberos5_lib_libwind= kerberos5/lib/libwind
 _libcom_err= lib/libcom_err
@@ -1832,6 +1836,16 @@ _lib_libypclnt=	lib/libypclnt
 lib/libradius__L: lib/libmd__L
 .endif
 
+lib/libproc__L: \
+    ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L
+.if ${MK_CXX} != "no"
+.if ${MK_LIBCPLUSPLUS} != "no"
+lib/libproc__L: lib/libcxxrt__L
+.else # This implies MK_GNUCXX != "no"; see lib/libproc
+lib/libproc__L: gnu/lib/libsupc++__L
+.endif
+.endif
+
 gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}

Modified: projects/ifnet/ObsoleteFiles.inc
==============================================================================
--- projects/ifnet/ObsoleteFiles.inc	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/ObsoleteFiles.inc	Fri May 22 18:23:21 2015	(r283294)
@@ -38,6 +38,22 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150521
+OLD_FILES+=usr/bin/demandoc
+OLD_FILES+=usr/share/man/man1/demandoc.1.gz
+OLD_FILES+=usr/share/man/man3/mandoc.3.gz
+OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz
+# 20150520
+OLD_FILES+=usr/lib/libheimsqlite.a
+OLD_FILES+=usr/lib/libheimsqlite.so
+OLD_LIBS+=usr/lib/libheimsqlite.so.11
+OLD_FILES+=usr/lib/libheimsqlite_p.a
+OLD_FILES+=usr/lib32/libheimsqlite.a
+OLD_FILES+=usr/lib32/libheimsqlite.so
+OLD_LIBS+=usr/lib32/libheimsqlite.so.11
+OLD_FILES+=usr/lib32/libheimsqlite_p.a
+# 20150506
+OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
@@ -430,10 +446,6 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
-.if ${MK_GCC} == "no"
-# 20141009: gperf disabled by default
-OLD_FILES+=usr/bin/gperf
-.endif
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
@@ -450,6 +462,33 @@ OLD_LIBS+=usr/lib32/libopie.so.7
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed.
+OLD_FILES+=usr/lib32/private/libatf-c.a
+OLD_FILES+=usr/lib32/private/libatf-c.so
+OLD_FILES+=usr/lib32/private/libatf-c_p.a
+OLD_FILES+=usr/lib32/private/libatf-c++.a
+OLD_FILES+=usr/lib32/private/libatf-c++.so
+OLD_FILES+=usr/lib32/private/libatf-c++_p.a
+OLD_FILES+=usr/lib32/private/libbsdstat.a
+OLD_FILES+=usr/lib32/private/libbsdstat.so
+OLD_FILES+=usr/lib32/private/libbsdstat_p.a
+OLD_FILES+=usr/lib32/private/libheimipcc.a
+OLD_FILES+=usr/lib32/private/libheimipcc.so
+OLD_FILES+=usr/lib32/private/libheimipcc_p.a
+OLD_FILES+=usr/lib32/private/libheimipcs.a
+OLD_FILES+=usr/lib32/private/libheimipcs.so
+OLD_FILES+=usr/lib32/private/libheimipcs_p.a
+OLD_FILES+=usr/lib32/private/libldns.a
+OLD_FILES+=usr/lib32/private/libldns.so
+OLD_FILES+=usr/lib32/private/libldns_p.a
+OLD_FILES+=usr/lib32/private/libssh.a
+OLD_FILES+=usr/lib32/private/libssh.so
+OLD_FILES+=usr/lib32/private/libssh_p.a
+OLD_FILES+=usr/lib32/private/libunbound.a
+OLD_FILES+=usr/lib32/private/libunbound.so
+OLD_FILES+=usr/lib32/private/libunbound_p.a
+OLD_FILES+=usr/lib32/private/libucl.a
+OLD_FILES+=usr/lib32/private/libucl.so
+OLD_FILES+=usr/lib32/private/libucl_p.a
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
@@ -470,7 +509,7 @@ OLD_FILES+=usr/lib/private/libldns.so
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
-OLD_FILES+=usr/lib/private/libssh.p.a
+OLD_FILES+=usr/lib/private/libssh_p.a
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
@@ -622,8 +661,12 @@ OLD_FILES+=usr/libexec/bsdconfig/070.use
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
-OLD_FILES+=usr/lib/private/libyaml.so.1
+OLD_LIBS+=usr/lib/private/libyaml.so.1
 OLD_FILES+=usr/lib/private/libyaml_p.a
+OLD_FILES+=usr/lib32/private/libyaml.a
+OLD_FILES+=usr/lib32/private/libyaml.so
+OLD_LIBS+=usr/lib32/private/libyaml.so.1
+OLD_FILES+=usr/lib32/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4.
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/bin/llvm-ranlib

Modified: projects/ifnet/UPDATING
==============================================================================
--- projects/ifnet/UPDATING	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/UPDATING	Fri May 22 18:23:21 2015	(r283294)
@@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150521:
+	TI platform code switched to using vendor DTS files and this update
+	may break existing systems running on Beaglebone, Beaglebone Black,
+	and Pandaboard:
+
+	- dtb files should be regenerated/reinstalled. Filenames are the
+	  same but content is different now
+	- GPIO addressing was changed, now each GPIO bank (32 pins per bank)
+	  has its own /dev/gpiocX device, e.g. pin 121 on /dev/gpioc0 in old
+	  addressing scheme is now pin 25 on /dev/gpioc3.
+	- Pandaboard: /etc/ttys should be updated, serial console device is
+	  now /dev/ttyu2, not /dev/ttyu0
+
 20150501:
 	soelim(1) from gnu/usr.bin/groff has been replaced by usr.bin/soelim.
 	If you need the GNU extension from groff soelim(1), install groff

Modified: projects/ifnet/bin/cp/cp.c
==============================================================================
--- projects/ifnet/bin/cp/cp.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/cp/cp.c	Fri May 22 18:23:21 2015	(r283294)
@@ -90,7 +90,6 @@ volatile sig_atomic_t info;
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
 static int copy(char *[], enum op, int);
-static int mastercmp(const FTSENT * const *, const FTSENT * const *);
 static void siginfo(int __unused);
 
 int
@@ -274,7 +273,7 @@ copy(char *argv[], enum op type, int fts
 	mask = ~umask(0777);
 	umask(~mask);
 
-	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+	if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
 		err(1, "fts_open");
 	for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
 		switch (curr->fts_info) {
@@ -488,32 +487,6 @@ copy(char *argv[], enum op type, int fts
 	return (rval);
 }
 
-/*
- * mastercmp --
- *	The comparison function for the copy order.  The order is to copy
- *	non-directory files before directory files.  The reason for this
- *	is because files tend to be in the same cylinder group as their
- *	parent directory, whereas directories tend not to be.  Copying the
- *	files first reduces seeking.
- */
-static int
-mastercmp(const FTSENT * const *a, const FTSENT * const *b)
-{
-	int a_info, b_info;
-
-	a_info = (*a)->fts_info;
-	if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR)
-		return (0);
-	b_info = (*b)->fts_info;
-	if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR)
-		return (0);
-	if (a_info == FTS_D)
-		return (-1);
-	if (b_info == FTS_D)
-		return (1);
-	return (0);
-}
-
 static void
 siginfo(int sig __unused)
 {

Modified: projects/ifnet/bin/date/date.1
==============================================================================
--- projects/ifnet/bin/date/date.1	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/date/date.1	Fri May 22 18:23:21 2015	(r283294)
@@ -32,7 +32,7 @@
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd April 26, 2014
+.Dd May 7, 2015
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl jRu
-.Op Fl r Ar seconds
+.Op Fl r Ar seconds | Ar filename
 .Oo
 .Fl v
 .Sm off
@@ -150,6 +150,9 @@ is the number of seconds since the Epoch
 see
 .Xr time 3 ) ,
 and can be specified in decimal, octal, or hex.
+.It Fl r Ar filename
+Print the date and time of the last modification of
+.Ar filename .
 .It Fl t Ar minutes_west
 Set the system's value for minutes west of
 .Tn GMT .

Modified: projects/ifnet/bin/date/date.c
==============================================================================
--- projects/ifnet/bin/date/date.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/date/date.c	Fri May 22 18:23:21 2015	(r283294)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -85,6 +86,7 @@ main(int argc, char *argv[])
 	struct vary *v;
 	const struct vary *badv;
 	struct tm lt;
+	struct stat sb;
 
 	v = NULL;
 	fmt = NULL;
@@ -116,8 +118,12 @@ main(int argc, char *argv[])
 		case 'r':		/* user specified seconds */
 			rflag = 1;
 			tval = strtoq(optarg, &tmp, 0);
-			if (*tmp != 0)
-				usage();
+			if (*tmp != 0) {
+				if (stat(optarg, &sb) == 0)
+					tval = sb.st_mtim.tv_sec;
+				else
+					usage();
+			}
 			break;
 		case 't':		/* minutes west of UTC */
 					/* error check; don't allow "PST" */

Modified: projects/ifnet/bin/pax/ar_subs.c
==============================================================================
--- projects/ifnet/bin/pax/ar_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/ar_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include "pax.h"
 #include "extern.h"
 

Modified: projects/ifnet/bin/pax/buf_subs.c
==============================================================================
--- projects/ifnet/bin/pax/buf_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/buf_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "pax.h"
 #include "extern.h"

Modified: projects/ifnet/bin/pax/cache.c
==============================================================================
--- projects/ifnet/bin/pax/cache.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/cache.c	Fri May 22 18:23:21 2015	(r283294)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <pwd.h>
 #include <grp.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include "pax.h"
 #include "cache.h"

Modified: projects/ifnet/bin/pax/cpio.c
==============================================================================
--- projects/ifnet/bin/pax/cpio.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/cpio.c	Fri May 22 18:23:21 2015	(r283294)
@@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include "pax.h"
 #include "cpio.h"
 #include "extern.h"

Modified: projects/ifnet/bin/pax/file_subs.c
==============================================================================
--- projects/ifnet/bin/pax/file_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/file_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <errno.h>
 #include <sys/uio.h>
-#include <stdlib.h>
 #include "pax.h"
 #include "options.h"
 #include "extern.h"

Modified: projects/ifnet/bin/pax/gen_subs.c
==============================================================================
--- projects/ifnet/bin/pax/gen_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/gen_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <langinfo.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
 #include "pax.h"
 #include "extern.h"

Modified: projects/ifnet/bin/pax/getoldopt.c
==============================================================================
--- projects/ifnet/bin/pax/getoldopt.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/getoldopt.c	Fri May 22 18:23:21 2015	(r283294)
@@ -19,8 +19,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-#include "pax.h"
-#include "extern.h"
+int getoldopt(int, char **, const char *);
 
 int
 getoldopt(int argc, char **argv, const char *optstring)

Modified: projects/ifnet/bin/pax/pat_rep.c
==============================================================================
--- projects/ifnet/bin/pax/pat_rep.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/pat_rep.c	Fri May 22 18:23:21 2015	(r283294)
@@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <errno.h>
 #ifdef NET2_REGEX
 #include <regexp.h>
 #else

Modified: projects/ifnet/bin/pax/pax.c
==============================================================================
--- projects/ifnet/bin/pax/pax.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/pax.c	Fri May 22 18:23:21 2015	(r283294)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include "pax.h"
 #include "extern.h"
 static int gen_init(void);

Modified: projects/ifnet/bin/pax/sel_subs.c
==============================================================================
--- projects/ifnet/bin/pax/sel_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/sel_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include "pax.h"
 #include "sel_subs.h"

Modified: projects/ifnet/bin/pax/tar.c
==============================================================================
--- projects/ifnet/bin/pax/tar.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/tar.c	Fri May 22 18:23:21 2015	(r283294)
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include "pax.h"
 #include "extern.h"
 #include "tar.h"

Modified: projects/ifnet/bin/pax/tty_subs.c
==============================================================================
--- projects/ifnet/bin/pax/tty_subs.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/bin/pax/tty_subs.c	Fri May 22 18:23:21 2015	(r283294)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
 #include "pax.h"
 #include "extern.h"

Modified: projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Fri May 22 18:23:21 2015	(r283294)
@@ -1328,15 +1328,28 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil
 	 * we are looking for.  This is necessary to permit ctf_add_type() to
 	 * operate recursively on entities such as a struct that contains a
 	 * pointer member that refers to the same struct type.
+	 *
+	 * In the case of integer and floating point types, we match using the
+	 * type encoding as well - else we may incorrectly return a bitfield
+	 * type, for instance.
 	 */
 	if (dst_type == CTF_ERR && name[0] != '\0') {
 		for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL &&
 		    CTF_TYPE_TO_INDEX(dtd->dtd_type) > dst_fp->ctf_dtoldid;
 		    dtd = ctf_list_prev(dtd)) {
-			if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind &&
-			    dtd->dtd_name != NULL &&
-			    strcmp(dtd->dtd_name, name) == 0)
-				return (dtd->dtd_type);
+			if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) != kind ||
+			    dtd->dtd_name == NULL ||
+			    strcmp(dtd->dtd_name, name) != 0)
+				continue;
+			if (kind == CTF_K_INTEGER || kind == CTF_K_FLOAT) {
+				if (ctf_type_encoding(src_fp, src_type,
+				    &src_en) != 0)
+					continue;
+				if (bcmp(&src_en, &dtd->dtd_u.dtu_enc,
+				    sizeof (ctf_encoding_t)) != 0)
+					continue;
+			}
+			return (dtd->dtd_type);
 		}
 	}
 

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Fri May 22 18:23:21 2015	(r283294)
@@ -743,6 +743,7 @@ yyinit(dt_pcb_t *pcb)
 #ifdef illumos
 	yysptr = yysbuf;
 #endif
+	YY_FLUSH_BUFFER;
 }
 
 /*

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri May 22 18:23:21 2015	(r283294)
@@ -1785,17 +1785,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		    "failed to open %s: %s", file, strerror(errno)));
 	}
 #else
-	if (dtp->dt_lazyload) {
-		if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0)
-			return (dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to open %s: %s", file, strerror(errno)));
-	} else {
-		snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
-		if ((fd = mkstemp(tfile)) == -1)
-			return (dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to create temporary file %s: %s",
-			    tfile, strerror(errno)));
-	}
+	snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
+	if ((fd = mkostemp(tfile, O_CLOEXEC)) == -1)
+		return (dt_link_error(dtp, NULL, -1, NULL,
+		    "failed to create temporary file %s: %s",
+		    tfile, strerror(errno)));
 #endif
 
 	/*
@@ -1868,23 +1862,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti);
 #else
 		const char *fmt = "%s -o %s -r %s %s";
+		dt_dirpath_t *dp = dt_list_next(&dtp->dt_lib_path);
 
-#if defined(__amd64__)
-		/*
-		 * Arches which default to 64-bit need to explicitly use
-		 * the 32-bit library path.
-		 */
-		int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32);
-#else
-		/*
-		 * Arches which are 32-bit only just use the normal
-		 * library path.
-		 */
-		int use_32 = 0;
-#endif
-
-		(void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o",
-		    use_32 ? "32" : "");
+		(void) snprintf(drti, sizeof (drti), "%s/drti.o", dp->dir_path);
 
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;
@@ -1951,14 +1931,23 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		}
 #endif
 	} else {
+#ifdef __FreeBSD__
+		if (rename(tfile, file) != 0) {
+			ret = dt_link_error(dtp, NULL, fd, NULL,
+			    "failed to rename %s to %s: %s", tfile, file,
+			    strerror(errno));
+			goto done;
+		}
+#endif
 		(void) close(fd);
 	}
 
 done:
 	dtrace_dof_destroy(dtp, dof);
 
-#ifndef illumos
-	unlink(tfile);
+#ifdef __FreeBSD__
+	if (!dtp->dt_lazyload)
+		(void) unlink(tfile);
 #endif
 	return (ret);
 }

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri May 22 18:23:21 2015	(r283294)
@@ -792,6 +792,7 @@ const char *_dtrace_libdir = "/usr/lib/d
 #ifdef illumos
 const char *_dtrace_provdir = "/dev/dtrace/provider"; /* provider directory */
 #else
+const char *_dtrace_libdir32 = "/usr/lib32/dtrace";
 const char *_dtrace_provdir = "/dev/dtrace"; /* provider directory */
 #endif
 
@@ -1581,8 +1582,19 @@ alloc:
 	 * compile, and to provide better error reporting (because the full
 	 * reporting of compiler errors requires dtrace_open() to succeed).
 	 */
+#ifdef __FreeBSD__
+#ifdef __LP64__
+	if ((dtp->dt_oflags & DTRACE_O_ILP32) != 0) {
+		if (dtrace_setopt(dtp, "libdir", _dtrace_libdir32) != 0)
+			return (set_open_errno(dtp, errp, dtp->dt_errno));
+	}
+#endif
 	if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0)
 		return (set_open_errno(dtp, errp, dtp->dt_errno));
+#else
+	if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0)
+		return (set_open_errno(dtp, errp, dtp->dt_errno));
+#endif
 
 	return (dtp);
 }

Modified: projects/ifnet/cddl/lib/Makefile
==============================================================================
--- projects/ifnet/cddl/lib/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/lib/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -33,4 +33,11 @@ _drti=		drti
 _libdtrace=	libdtrace
 .endif
 
+SUBDIR_DEPEND_libdtrace=	libctf
+SUBDIR_DEPEND_libzfs_core=	libnvpair
+SUBDIR_DEPEND_libzfs=	libavl libnvpair libumem libuutil libzfs_core
+SUBDIR_DEPEND_libzpool=	libavl libnvpair libumem
+
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: projects/ifnet/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/ifnet/cddl/lib/libdtrace/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/lib/libdtrace/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -50,6 +50,7 @@ DSRCS=		errno.d			\
 		io.d			\
 		ip.d			\
 		psinfo.d		\
+		siftr.d			\
 		signal.d		\
 		tcp.d			\
 		udp.d			\
@@ -103,6 +104,8 @@ LFLAGS+=-l
 
 YFLAGS+=-d
 
+LIBADD=	ctf elf proc pthread rtld_db
+
 CLEANFILES=	dt_errtags.c dt_names.c
 
 dt_errtags.c:

Copied: projects/ifnet/cddl/lib/libdtrace/siftr.d (from r283293, head/cddl/lib/libdtrace/siftr.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/cddl/lib/libdtrace/siftr.d	Fri May 22 18:23:21 2015	(r283294, copy of r283293, head/cddl/lib/libdtrace/siftr.d)
@@ -0,0 +1,100 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * $FreeBSD$
+ */
+
+#pragma D depends_on module siftr
+#pragma D depends_on provider tcp
+
+/*
+ * Convert a SIFTR direction value to a string
+ */
+#pragma D binding "1.12.1" SIFTR_IN
+inline int SIFTR_IN =	1;
+#pragma D binding "1.12.1" SIFTR_OUT
+inline int SIFTR_OUT =	2;
+
+/* SIFTR direction strings. */
+#pragma D binding "1.12.1" siftr_dir_string
+inline string siftr_dir_string[uint8_t direction] =
+	direction == SIFTR_IN ?	"in" :
+	direction == SIFTR_OUT ? "out" :
+	"unknown" ;
+
+typedef struct siftrinfo {
+	struct timeval		tval;
+	uint8_t			direction;
+	uint8_t			ipver;
+	uint32_t		hash;
+	uint16_t		tcp_localport;
+	uint16_t		tcp_foreignport;
+	uint64_t		snd_cwnd;
+	u_long			snd_wnd;
+	u_long			rcv_wnd;
+	u_long			snd_bwnd;
+	u_long			snd_ssthresh;
+	int			conn_state;
+	u_int			max_seg_size;
+	int			smoothed_rtt;
+	u_char			sack_enabled;
+	u_char			snd_scale;
+	u_char			rcv_scale;
+	u_int			flags;
+	int			rxt_length;
+	u_int			snd_buf_hiwater;
+	u_int			snd_buf_cc;
+	u_int			rcv_buf_hiwater;
+	u_int			rcv_buf_cc;
+	u_int			sent_inflight_bytes;
+	int			t_segqlen;
+	u_int			flowid;
+	u_int			flowtype;
+} siftrinfo_t;
+
+#pragma D binding "1.12.1" translator
+translator siftrinfo_t < struct pkt_node *p > {
+	direction = 		p == NULL ? 0 : p->direction;
+	ipver =			p == NULL ? 0 : p->ipver;
+	hash = 			p == NULL ? 0 : p->hash;
+	tcp_localport =		p == NULL ? 0 : ntohs(p->tcp_localport);
+	tcp_foreignport =	p == NULL ? 0 : ntohs(p->tcp_foreignport);
+	snd_cwnd =		p == NULL ? 0 : p->snd_cwnd;
+	snd_wnd =		p == NULL ? 0 : p->snd_wnd;
+	rcv_wnd =		p == NULL ? 0 : p->rcv_wnd;
+	snd_bwnd =		p == NULL ? 0 : p->snd_bwnd;
+	snd_ssthresh =		p == NULL ? 0 : p->snd_ssthresh;
+	conn_state =		p == NULL ? 0 : p->conn_state;
+	max_seg_size = 		p == NULL ? 0 : p->max_seg_size;
+	smoothed_rtt =		p == NULL ? 0 : p->smoothed_rtt;
+	sack_enabled = 		p == NULL ? 0 : p->sack_enabled;
+	snd_scale =		p == NULL ? 0 : p->snd_scale;
+	rcv_scale =		p == NULL ? 0 : p->rcv_scale;
+	flags =			p == NULL ? 0 : p->flags;
+	rxt_length = 		p == NULL ? 0 : p->rxt_length;
+	snd_buf_hiwater =	p == NULL ? 0 : p->snd_buf_hiwater;
+	snd_buf_cc = 		p == NULL ? 0 : p->snd_buf_cc;
+	rcv_buf_hiwater = 	p == NULL ? 0 : p->rcv_buf_hiwater;
+	rcv_buf_cc = 		p == NULL ? 0 : p->rcv_buf_cc;
+	sent_inflight_bytes = 	p == NULL ? 0 : p->sent_inflight_bytes;
+	t_segqlen =		p == NULL ? 0 : p->t_segqlen;
+	flowid = 		p == NULL ? 0 : p->flowid;
+	flowtype = 		p == NULL ? 0 : p->flowtype;
+};

Modified: projects/ifnet/cddl/lib/libdtrace/tcp.d
==============================================================================
--- projects/ifnet/cddl/lib/libdtrace/tcp.d	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/lib/libdtrace/tcp.d	Fri May 22 18:23:21 2015	(r283294)
@@ -241,78 +241,3 @@ translator tcpinfoh_t < struct tcphdr *p
 translator tcplsinfo_t < int s > {
 	tcps_state =	s;
 };
-
-/*
- * Convert a SIFTR direction value to a string
- */
-#pragma D binding "1.12.1" SIFTR_IN
-inline int SIFTR_IN =	1;
-#pragma D binding "1.12.1" SIFTR_OUT
-inline int SIFTR_OUT =	2;
-
-/* SIFTR direction strings. */
-#pragma D binding "1.12.1" siftr_dir_string
-inline string siftr_dir_string[uint8_t direction] =
-	direction == SIFTR_IN ?	"in" :
-	direction == SIFTR_OUT ? "out" :
-	"unknown" ;
-
-typedef struct siftrinfo {
-	struct timeval		tval;
-	uint8_t			direction;
-	uint8_t			ipver;
-	uint32_t		hash;
-	uint16_t		tcp_localport;
-	uint16_t		tcp_foreignport;
-	uint64_t		snd_cwnd;
-	u_long			snd_wnd;
-	u_long			rcv_wnd;
-	u_long			snd_bwnd;
-	u_long			snd_ssthresh;
-	int			conn_state;
-	u_int			max_seg_size;
-	int			smoothed_rtt;
-	u_char			sack_enabled;
-	u_char			snd_scale;
-	u_char			rcv_scale;
-	u_int			flags;
-	int			rxt_length;
-	u_int			snd_buf_hiwater;
-	u_int			snd_buf_cc;
-	u_int			rcv_buf_hiwater;
-	u_int			rcv_buf_cc;
-	u_int			sent_inflight_bytes;
-	int			t_segqlen;
-	u_int			flowid;
-	u_int			flowtype;
-} siftrinfo_t;
-
-#pragma D binding "1.12.1" translator
-translator siftrinfo_t < struct pkt_node *p > {
-	direction = 		p == NULL ? 0 : p->direction;
-	ipver =			p == NULL ? 0 : p->ipver;
-	hash = 			p == NULL ? 0 : p->hash;
-	tcp_localport =		p == NULL ? 0 : ntohs(p->tcp_localport);
-	tcp_foreignport =	p == NULL ? 0 : ntohs(p->tcp_foreignport);
-	snd_cwnd =		p == NULL ? 0 : p->snd_cwnd;
-	snd_wnd =		p == NULL ? 0 : p->snd_wnd;
-	rcv_wnd =		p == NULL ? 0 : p->rcv_wnd;
-	snd_bwnd =		p == NULL ? 0 : p->snd_bwnd;
-	snd_ssthresh =		p == NULL ? 0 : p->snd_ssthresh;
-	conn_state =		p == NULL ? 0 : p->conn_state;
-	max_seg_size = 		p == NULL ? 0 : p->max_seg_size;
-	smoothed_rtt =		p == NULL ? 0 : p->smoothed_rtt;
-	sack_enabled = 		p == NULL ? 0 : p->sack_enabled;
-	snd_scale =		p == NULL ? 0 : p->snd_scale;
-	rcv_scale =		p == NULL ? 0 : p->rcv_scale;
-	flags =			p == NULL ? 0 : p->flags;
-	rxt_length = 		p == NULL ? 0 : p->rxt_length;
-	snd_buf_hiwater =	p == NULL ? 0 : p->snd_buf_hiwater;
-	snd_buf_cc = 		p == NULL ? 0 : p->snd_buf_cc;
-	rcv_buf_hiwater = 	p == NULL ? 0 : p->rcv_buf_hiwater;
-	rcv_buf_cc = 		p == NULL ? 0 : p->rcv_buf_cc;
-	sent_inflight_bytes = 	p == NULL ? 0 : p->sent_inflight_bytes;
-	t_segqlen =		p == NULL ? 0 : p->t_segqlen;
-	flowid = 		p == NULL ? 0 : p->flowid;
-	flowtype = 		p == NULL ? 0 : p->flowtype;
-};

Modified: projects/ifnet/cddl/sbin/Makefile
==============================================================================
--- projects/ifnet/cddl/sbin/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/sbin/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -13,4 +13,6 @@ _zfs=	zfs
 _zpool=	zpool
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: projects/ifnet/cddl/usr.bin/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.bin/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.bin/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -26,4 +26,6 @@ _zstreamdump = zstreamdump
 .endif
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: projects/ifnet/cddl/usr.bin/ctfconvert/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.bin/ctfconvert/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.bin/ctfconvert/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -3,8 +3,6 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
 
-DEBUG_FLAGS=	-g
-
 PROG=		ctfconvert
 SRCS=		alist.c \
 		ctf.c \
@@ -36,7 +34,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-DPADD=		${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
-LDADD=		-ldwarf -lelf -lz -lpthread
+LIBADD=		dwarf elf z pthread
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/cddl/usr.bin/ctfdump/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.bin/ctfdump/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.bin/ctfdump/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -17,7 +17,6 @@ CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-DPADD=		${LIBPTHREAD} ${LIBELF} ${LIBZ}
-LDADD=		-lpthread -lelf -lz
+LIBADD=		elf z
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/cddl/usr.sbin/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.sbin/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.sbin/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -46,4 +46,6 @@ _dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: projects/ifnet/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.sbin/dtrace/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.sbin/dtrace/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -20,9 +20,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 #CFLAGS+=	-DNEED_ERRLOC
 #YFLAGS+=	-d
 
-DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
-		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
-LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \
-		-lrtld_db
+LIBADD=	dtrace
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
==============================================================================
--- projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh	Fri May 22 18:23:21 2015	(r283294)
@@ -38,7 +38,6 @@ exclude EXFAIL common/ip/tst.ipv4localud
 exclude EXFAIL common/mdb/tst.dtracedcmd.ksh
 exclude EXFAIL common/misc/tst.dofmax.ksh
 exclude EXFAIL common/misc/tst.include.ksh
-exclude EXFAIL common/pragma/tst.libchain.ksh
 exclude EXFAIL common/safety/tst.copyin2.d
 exclude EXFAIL common/safety/tst.msgdsize.d
 exclude EXFAIL common/safety/tst.msgsize.d

Modified: projects/ifnet/cddl/usr.sbin/lockstat/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.sbin/lockstat/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.sbin/lockstat/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -21,10 +21,6 @@ CFLAGS+=	-DNEED_ERRLOC -g
 
 #YFLAGS+=	-d
 
-DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
-		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} ${LIBUTIL} \
-		${LIBRTLD_DB}
-LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -lutil \
-		-lrtld_db
+LIBADD=	elf dtrace rt
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/cddl/usr.sbin/plockstat/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.sbin/plockstat/Makefile	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/cddl/usr.sbin/plockstat/Makefile	Fri May 22 18:23:21 2015	(r283294)
@@ -18,9 +18,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${.CURDIR}/../../../cddl/lib/libdtrace \
 		-I${.CURDIR}/../../../sys
 
-DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}\
-		${LIBELF} ${LIBZ} ${LIBRT} ${LIBRTLD_DB} ${LIBUTIL}
-LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt \
-		-lrtld_db -lutil
+LIBADD=	dtrace proc
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh
==============================================================================
--- projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh	Fri May 22 17:34:22 2015	(r283293)
+++ projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh	Fri May 22 18:23:21 2015	(r283294)
@@ -164,18 +164,22 @@ equal_body()
         grep '^failed: \${x} != \${y} (a != b)$' resfile
 }
 
-atf_test_case flush_stdout_on_timeout
-flush_stdout_on_timeout_body()
+atf_test_case flush_stdout_on_death
+flush_stdout_on_death_body()
 {
-    "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \
-        >out 2>err &
+    CONTROL_FILE="$(pwd)/done" "$(atf_get_srcdir)/misc_helpers" \
+        -s "$(atf_get_srcdir)" atf_check_flush_stdout >out 2>err &
     pid="${!}"
-    sleep 1
-    kill "${pid}"
+    while [ ! -f ./done ]; do
+        echo "Still waiting for helper to create control file"
+        ls
+        sleep 1
+    done
+    kill -9 "${pid}"
 
     grep 'Executing command.*true' out \
         || atf_fail 'First command not in output'
-    grep 'Executing command.*sleep 42' out \
+    grep 'Executing command.*false' out \
         || atf_fail 'Second command not in output'

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