svn commit: r300380 - in user/ngie/detangle-rc: . bin/ed cddl/contrib/dtracetoolkit cddl/usr.sbin cddl/usr.sbin/dtruss contrib/binutils/gas/config contrib/bmake contrib/bmake/mk contrib/bmake/mk/sy...

Garrett Cooper ngie at FreeBSD.org
Sat May 21 21:53:05 UTC 2016 

Author: ngie
Date: Sat May 21 21:53:01 2016
New Revision: 300380
URL: https://svnweb.freebsd.org/changeset/base/300380

Log:
  MFhead @ r300379

Added:
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/elftc_reloc_type_str.3
     - copied unchanged from r300379, head/contrib/elftoolchain/libelftc/elftc_reloc_type_str.3
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
     - copied unchanged from r300379, head/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
  user/ngie/detangle-rc/sbin/camcontrol/epc.c
     - copied unchanged from r300379, head/sbin/camcontrol/epc.c
  user/ngie/detangle-rc/sbin/camcontrol/zone.c
     - copied unchanged from r300379, head/sbin/camcontrol/zone.c
  user/ngie/detangle-rc/share/man/man3/pthread_mutex_consistent.3
     - copied unchanged from r300379, head/share/man/man3/pthread_mutex_consistent.3
  user/ngie/detangle-rc/share/man/man9/bus_map_resource.9
     - copied unchanged from r300379, head/share/man/man9/bus_map_resource.9
  user/ngie/detangle-rc/sys/arm/allwinner/aw_sid.c
     - copied unchanged from r300379, head/sys/arm/allwinner/aw_sid.c
  user/ngie/detangle-rc/sys/arm/allwinner/aw_sid.h
     - copied unchanged from r300379, head/sys/arm/allwinner/aw_sid.h
  user/ngie/detangle-rc/sys/arm/allwinner/aw_thermal.c
     - copied unchanged from r300379, head/sys/arm/allwinner/aw_thermal.c
  user/ngie/detangle-rc/sys/arm64/conf/GENERIC-INTRNG
     - copied unchanged from r300379, head/sys/arm64/conf/GENERIC-INTRNG
  user/ngie/detangle-rc/sys/boot/efi/libefi/env.c
     - copied unchanged from r300379, head/sys/boot/efi/libefi/env.c
  user/ngie/detangle-rc/sys/boot/ficl/efi.c
     - copied unchanged from r300379, head/sys/boot/ficl/efi.c
  user/ngie/detangle-rc/sys/dev/bhnd/bcma/bcma_nexus.c
     - copied unchanged from r300379, head/sys/dev/bhnd/bcma/bcma_nexus.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd_debug.h
     - copied unchanged from r300379, head/sys/dev/bhnd/bhnd_debug.h
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pcie2/
     - copied from r300379, head/sys/dev/bhnd/cores/pcie2/
  user/ngie/detangle-rc/sys/dev/bhnd/soc/
     - copied from r300379, head/sys/dev/bhnd/soc/
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_phy_n.c
     - copied unchanged from r300379, head/sys/dev/bwn/if_bwn_phy_n.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_phy_n.h
     - copied unchanged from r300379, head/sys/dev/bwn/if_bwn_phy_n.h
  user/ngie/detangle-rc/sys/dev/etherswitch/mtkswitch/
     - copied from r300379, head/sys/dev/etherswitch/mtkswitch/
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/vmbus_var.h
     - copied unchanged from r300379, head/sys/dev/hyperv/vmbus/vmbus_var.h
  user/ngie/detangle-rc/sys/dev/iscsi/icl_soft_proxy.c
     - copied unchanged from r300379, head/sys/dev/iscsi/icl_soft_proxy.c
  user/ngie/detangle-rc/sys/dev/usb/controller/generic_ohci.c
     - copied unchanged from r300379, head/sys/dev/usb/controller/generic_ohci.c
  user/ngie/detangle-rc/sys/dev/usb/controller/generic_usb_if.m
     - copied unchanged from r300379, head/sys/dev/usb/controller/generic_usb_if.m
  user/ngie/detangle-rc/sys/gnu/dev/
     - copied from r300379, head/sys/gnu/dev/
  user/ngie/detangle-rc/sys/gnu/dts/mips/CS-QR10.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/CS-QR10.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-EX300NP.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/MZK-EX300NP.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-EX750NP.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/MZK-EX750NP.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/SK-WB8.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/SK-WB8.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WNDR3700V5.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/WNDR3700V5.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WRH-300CR.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/WRH-300CR.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZBT-WG3526.dts
     - copied unchanged from r300379, head/sys/gnu/dts/mips/ZBT-WG3526.dts
  user/ngie/detangle-rc/sys/kern/msi_if.m
     - copied unchanged from r300379, head/sys/kern/msi_if.m
  user/ngie/detangle-rc/sys/mips/broadcom/
     - copied from r300379, head/sys/mips/broadcom/
  user/ngie/detangle-rc/sys/mips/conf/BCM
     - copied unchanged from r300379, head/sys/mips/conf/BCM
  user/ngie/detangle-rc/sys/mips/conf/BCM.hints
     - copied unchanged from r300379, head/sys/mips/conf/BCM.hints
  user/ngie/detangle-rc/sys/modules/vnic/
     - copied from r300379, head/sys/modules/vnic/
  user/ngie/detangle-rc/sys/net/ifdi_if.m
     - copied unchanged from r300379, head/sys/net/ifdi_if.m
  user/ngie/detangle-rc/sys/net/iflib.c
     - copied unchanged from r300379, head/sys/net/iflib.c
  user/ngie/detangle-rc/sys/net/iflib.h
     - copied unchanged from r300379, head/sys/net/iflib.h
  user/ngie/detangle-rc/sys/net/mp_ring.c
     - copied unchanged from r300379, head/sys/net/mp_ring.c
  user/ngie/detangle-rc/sys/net/mp_ring.h
     - copied unchanged from r300379, head/sys/net/mp_ring.h
  user/ngie/detangle-rc/sys/sys/disk_zone.h
     - copied unchanged from r300379, head/sys/sys/disk_zone.h
  user/ngie/detangle-rc/tools/build/options/WITHOUT_SYSTEM_COMPILER
     - copied unchanged from r300379, head/tools/build/options/WITHOUT_SYSTEM_COMPILER
  user/ngie/detangle-rc/tools/build/options/WITH_LIBSOFT
     - copied unchanged from r300379, head/tools/build/options/WITH_LIBSOFT
  user/ngie/detangle-rc/tools/build/options/WITH_SYSTEM_COMPILER
     - copied unchanged from r300379, head/tools/build/options/WITH_SYSTEM_COMPILER
  user/ngie/detangle-rc/usr.sbin/zonectl/
     - copied from r300379, head/usr.sbin/zonectl/
Deleted:
  user/ngie/detangle-rc/cddl/contrib/dtracetoolkit/
  user/ngie/detangle-rc/cddl/usr.sbin/dtruss/
  user/ngie/detangle-rc/lib/libc/aarch64/sys/brk.S
  user/ngie/detangle-rc/lib/libc/aarch64/sys/sbrk.S
  user/ngie/detangle-rc/share/dtrace/toolkit/
  user/ngie/detangle-rc/share/man/man5/reiserfs.5
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-mt7620n.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-rt2880.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-rt3050.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-rt3352.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-rt5350.dtsi
  user/ngie/detangle-rc/sys/dev/iscsi/icl_proxy.c
  user/ngie/detangle-rc/sys/gnu/fs/
  user/ngie/detangle-rc/sys/modules/reiserfs/
Modified:
  user/ngie/detangle-rc/Makefile
  user/ngie/detangle-rc/Makefile.inc1
  user/ngie/detangle-rc/ObsoleteFiles.inc
  user/ngie/detangle-rc/README
  user/ngie/detangle-rc/UPDATING
  user/ngie/detangle-rc/bin/ed/cbc.c
  user/ngie/detangle-rc/cddl/usr.sbin/Makefile
  user/ngie/detangle-rc/contrib/binutils/gas/config/tc-arm.c
  user/ngie/detangle-rc/contrib/bmake/ChangeLog
  user/ngie/detangle-rc/contrib/bmake/Makefile
  user/ngie/detangle-rc/contrib/bmake/arch.c
  user/ngie/detangle-rc/contrib/bmake/bmake.1
  user/ngie/detangle-rc/contrib/bmake/bmake.cat1
  user/ngie/detangle-rc/contrib/bmake/compat.c
  user/ngie/detangle-rc/contrib/bmake/job.c
  user/ngie/detangle-rc/contrib/bmake/main.c
  user/ngie/detangle-rc/contrib/bmake/make.1
  user/ngie/detangle-rc/contrib/bmake/meta.c
  user/ngie/detangle-rc/contrib/bmake/meta.h
  user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog
  user/ngie/detangle-rc/contrib/bmake/mk/auto.dep.mk
  user/ngie/detangle-rc/contrib/bmake/mk/autodep.mk
  user/ngie/detangle-rc/contrib/bmake/mk/dirdeps.mk
  user/ngie/detangle-rc/contrib/bmake/mk/dpadd.mk
  user/ngie/detangle-rc/contrib/bmake/mk/final.mk
  user/ngie/detangle-rc/contrib/bmake/mk/gendirdeps.mk
  user/ngie/detangle-rc/contrib/bmake/mk/init.mk
  user/ngie/detangle-rc/contrib/bmake/mk/install-mk
  user/ngie/detangle-rc/contrib/bmake/mk/lib.mk
  user/ngie/detangle-rc/contrib/bmake/mk/libnames.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.autodep.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.sys.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta2deps.py
  user/ngie/detangle-rc/contrib/bmake/mk/nls.mk
  user/ngie/detangle-rc/contrib/bmake/mk/own.mk
  user/ngie/detangle-rc/contrib/bmake/mk/prog.mk
  user/ngie/detangle-rc/contrib/bmake/mk/subdir.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/AIX.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/Darwin.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/Generic.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/HP-UX.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/IRIX.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/Linux.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/NetBSD.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/OSF1.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/OpenBSD.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/SunOS.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys/UnixWare.mk
  user/ngie/detangle-rc/contrib/bmake/mk/warnings.mk
  user/ngie/detangle-rc/contrib/bmake/parse.c
  user/ngie/detangle-rc/contrib/bmake/str.c
  user/ngie/detangle-rc/contrib/bsnmp/snmpd/main.c
  user/ngie/detangle-rc/contrib/elftoolchain/addr2line/addr2line.c
  user/ngie/detangle-rc/contrib/elftoolchain/brandelf/brandelf.c
  user/ngie/detangle-rc/contrib/elftoolchain/common/_elftc.h
  user/ngie/detangle-rc/contrib/elftoolchain/common/elfdefinitions.h
  user/ngie/detangle-rc/contrib/elftoolchain/cxxfilt/cxxfilt.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/ascii.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/binary.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/elfcopy.1
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/elfcopy.h
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/main.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/sections.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/segments.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/symbols.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfdump/elfdump.c
  user/ngie/detangle-rc/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
  user/ngie/detangle-rc/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
  user/ngie/detangle-rc/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelf/_libelf_config.h
  user/ngie/detangle-rc/contrib/elftoolchain/libelf/elf_data.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelf/libelf_ar.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelf/libelf_convert.m4
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/Makefile
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/libelftc.h
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelftc/make-toolchain-version
  user/ngie/detangle-rc/contrib/elftoolchain/libpe/libpe_section.c
  user/ngie/detangle-rc/contrib/elftoolchain/libpe/pe.h
  user/ngie/detangle-rc/contrib/elftoolchain/nm/nm.c
  user/ngie/detangle-rc/contrib/elftoolchain/readelf/readelf.c
  user/ngie/detangle-rc/contrib/elftoolchain/size/size.c
  user/ngie/detangle-rc/contrib/elftoolchain/strings/strings.c
  user/ngie/detangle-rc/contrib/gcc/c-typeck.c
  user/ngie/detangle-rc/contrib/groff/tmac/doc-syms
  user/ngie/detangle-rc/contrib/groff/tmac/groff_mdoc.man
  user/ngie/detangle-rc/contrib/ipfilter/man/ipf.5
  user/ngie/detangle-rc/contrib/libarchive/cpio/bsdcpio.1
  user/ngie/detangle-rc/contrib/libarchive/cpio/cpio.c
  user/ngie/detangle-rc/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
  user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  user/ngie/detangle-rc/contrib/netbsd-tests/lib/libc/gen/t_dir.c
  user/ngie/detangle-rc/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
  user/ngie/detangle-rc/etc/defaults/periodic.conf
  user/ngie/detangle-rc/etc/mtree/BSD.usr.dist
  user/ngie/detangle-rc/etc/ntp/leap-seconds
  user/ngie/detangle-rc/gnu/usr.bin/binutils/Makefile.inc0
  user/ngie/detangle-rc/gnu/usr.bin/cc/Makefile.tgt
  user/ngie/detangle-rc/gnu/usr.bin/cc/cc_tools/Makefile
  user/ngie/detangle-rc/gnu/usr.bin/gdb/Makefile.inc
  user/ngie/detangle-rc/gnu/usr.bin/gdb/libgdb/Makefile
  user/ngie/detangle-rc/include/Makefile
  user/ngie/detangle-rc/include/pthread.h
  user/ngie/detangle-rc/lib/clang/clang.build.mk
  user/ngie/detangle-rc/lib/clang/include/clang/Basic/Version.inc
  user/ngie/detangle-rc/lib/libbsdstat/bsdstat.c
  user/ngie/detangle-rc/lib/libc/Makefile
  user/ngie/detangle-rc/lib/libc/aarch64/Symbol.map
  user/ngie/detangle-rc/lib/libc/aarch64/sys/Makefile.inc
  user/ngie/detangle-rc/lib/libc/arm/Makefile.inc
  user/ngie/detangle-rc/lib/libc/arm/aeabi/Makefile.inc
  user/ngie/detangle-rc/lib/libc/arm/gen/Makefile.inc
  user/ngie/detangle-rc/lib/libc/gen/Symbol.map
  user/ngie/detangle-rc/lib/libc/gen/_pthread_stubs.c
  user/ngie/detangle-rc/lib/libc/gen/fts-compat.c
  user/ngie/detangle-rc/lib/libc/gen/fts.c
  user/ngie/detangle-rc/lib/libc/include/libc_private.h
  user/ngie/detangle-rc/lib/libc/net/name6.c
  user/ngie/detangle-rc/lib/libc/regex/engine.c
  user/ngie/detangle-rc/lib/libc/resolv/res_query.c
  user/ngie/detangle-rc/lib/libc/sys/_umtx_op.2
  user/ngie/detangle-rc/lib/libcompiler_rt/Makefile
  user/ngie/detangle-rc/lib/libelftc/Makefile
  user/ngie/detangle-rc/lib/libelftc/elftc_version.c
  user/ngie/detangle-rc/lib/libmt/mtlib.c
  user/ngie/detangle-rc/lib/libpam/modules/pam_unix/pam_unix.c
  user/ngie/detangle-rc/lib/libstand/printf.c
  user/ngie/detangle-rc/lib/libstand/uuid_from_string.c
  user/ngie/detangle-rc/lib/libthr/libthr.3
  user/ngie/detangle-rc/lib/libthr/pthread.map
  user/ngie/detangle-rc/lib/libthr/thread/thr_cond.c
  user/ngie/detangle-rc/lib/libthr/thread/thr_init.c
  user/ngie/detangle-rc/lib/libthr/thread/thr_mutex.c
  user/ngie/detangle-rc/lib/libthr/thread/thr_mutexattr.c
  user/ngie/detangle-rc/lib/libthr/thread/thr_private.h
  user/ngie/detangle-rc/lib/libthr/thread/thr_umtx.c
  user/ngie/detangle-rc/lib/libthr/thread/thr_umtx.h
  user/ngie/detangle-rc/lib/libufs/cgroup.c
  user/ngie/detangle-rc/lib/libutil/login_auth.c
  user/ngie/detangle-rc/lib/libutil/login_cap.c
  user/ngie/detangle-rc/lib/libutil/pidfile.3
  user/ngie/detangle-rc/lib/libutil/pidfile.c
  user/ngie/detangle-rc/lib/msun/arm/Makefile.inc
  user/ngie/detangle-rc/lib/msun/arm/fenv-vfp.c
  user/ngie/detangle-rc/sbin/camcontrol/Makefile
  user/ngie/detangle-rc/sbin/camcontrol/camcontrol.8
  user/ngie/detangle-rc/sbin/camcontrol/camcontrol.c
  user/ngie/detangle-rc/sbin/camcontrol/camcontrol.h
  user/ngie/detangle-rc/sbin/camcontrol/fwdownload.c
  user/ngie/detangle-rc/sbin/dhclient/dhclient.c
  user/ngie/detangle-rc/sbin/ifconfig/af_inet.c
  user/ngie/detangle-rc/sbin/ifconfig/af_inet6.c
  user/ngie/detangle-rc/sbin/ifconfig/af_nd6.c
  user/ngie/detangle-rc/sbin/ifconfig/ifclone.c
  user/ngie/detangle-rc/sbin/ifconfig/ifconfig.c
  user/ngie/detangle-rc/sbin/ifconfig/iffib.c
  user/ngie/detangle-rc/sbin/ifconfig/ifgre.c
  user/ngie/detangle-rc/sbin/ifconfig/ifieee80211.c
  user/ngie/detangle-rc/sbin/ifconfig/ifmac.c
  user/ngie/detangle-rc/sbin/ifconfig/ifmedia.c
  user/ngie/detangle-rc/sbin/init/init.c
  user/ngie/detangle-rc/sbin/ipfw/ipfw2.c
  user/ngie/detangle-rc/sbin/ping6/ping6.c
  user/ngie/detangle-rc/sbin/quotacheck/quotacheck.c
  user/ngie/detangle-rc/sbin/routed/main.c
  user/ngie/detangle-rc/share/doc/usd/07.mail/mail6.nr
  user/ngie/detangle-rc/share/dtrace/Makefile
  user/ngie/detangle-rc/share/dtrace/README
  user/ngie/detangle-rc/share/man/man3/Makefile
  user/ngie/detangle-rc/share/man/man3/pthread_cond_wait.3
  user/ngie/detangle-rc/share/man/man3/pthread_mutex_lock.3
  user/ngie/detangle-rc/share/man/man3/pthread_mutex_timedlock.3
  user/ngie/detangle-rc/share/man/man3/pthread_mutex_trylock.3
  user/ngie/detangle-rc/share/man/man3/pthread_mutex_unlock.3
  user/ngie/detangle-rc/share/man/man3/pthread_mutexattr.3
  user/ngie/detangle-rc/share/man/man4/ddb.4
  user/ngie/detangle-rc/share/man/man4/gdb.4
  user/ngie/detangle-rc/share/man/man4/tcp.4
  user/ngie/detangle-rc/share/man/man5/Makefile
  user/ngie/detangle-rc/share/man/man5/src.conf.5
  user/ngie/detangle-rc/share/man/man8/nanobsd.8
  user/ngie/detangle-rc/share/man/man9/BUS_GET_CPUS.9
  user/ngie/detangle-rc/share/man/man9/Makefile
  user/ngie/detangle-rc/share/man/man9/atomic.9
  user/ngie/detangle-rc/share/man/man9/bus_activate_resource.9
  user/ngie/detangle-rc/share/man/man9/bus_alloc_resource.9
  user/ngie/detangle-rc/share/man/man9/g_bio.9
  user/ngie/detangle-rc/share/man/man9/pci.9
  user/ngie/detangle-rc/share/man/man9/rman.9
  user/ngie/detangle-rc/share/man/man9/sglist.9
  user/ngie/detangle-rc/share/mk/bsd.compiler.mk
  user/ngie/detangle-rc/share/mk/bsd.cpu.mk
  user/ngie/detangle-rc/share/mk/bsd.dep.mk
  user/ngie/detangle-rc/share/mk/local.meta.sys.mk
  user/ngie/detangle-rc/share/mk/src.opts.mk
  user/ngie/detangle-rc/share/mk/src.sys.env.mk
  user/ngie/detangle-rc/share/mk/sys.mk
  user/ngie/detangle-rc/sys/amd64/amd64/sys_machdep.c
  user/ngie/detangle-rc/sys/amd64/include/atomic.h
  user/ngie/detangle-rc/sys/amd64/linux/linux_proto.h
  user/ngie/detangle-rc/sys/amd64/linux/linux_syscall.h
  user/ngie/detangle-rc/sys/amd64/linux/linux_syscalls.c
  user/ngie/detangle-rc/sys/amd64/linux/linux_sysent.c
  user/ngie/detangle-rc/sys/amd64/linux/linux_systrace_args.c
  user/ngie/detangle-rc/sys/amd64/linux/syscalls.master
  user/ngie/detangle-rc/sys/amd64/linux32/linux32_proto.h
  user/ngie/detangle-rc/sys/amd64/linux32/linux32_syscall.h
  user/ngie/detangle-rc/sys/amd64/linux32/linux32_syscalls.c
  user/ngie/detangle-rc/sys/amd64/linux32/linux32_sysent.c
  user/ngie/detangle-rc/sys/amd64/linux32/linux32_systrace_args.c
  user/ngie/detangle-rc/sys/amd64/linux32/syscalls.master
  user/ngie/detangle-rc/sys/amd64/vmm/io/vhpet.c
  user/ngie/detangle-rc/sys/arm/allwinner/a10/a10_intc.c
  user/ngie/detangle-rc/sys/arm/allwinner/a10_ahci.c
  user/ngie/detangle-rc/sys/arm/allwinner/aw_nmi.c
  user/ngie/detangle-rc/sys/arm/allwinner/aw_rsb.c
  user/ngie/detangle-rc/sys/arm/allwinner/axp81x.c
  user/ngie/detangle-rc/sys/arm/allwinner/files.allwinner
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_ccm.c
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_mmc.c
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_pinctrl.c
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c
  user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c
  user/ngie/detangle-rc/sys/arm/arm/generic_timer.c
  user/ngie/detangle-rc/sys/arm/arm/gic.c
  user/ngie/detangle-rc/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  user/ngie/detangle-rc/sys/arm/broadcom/bcm2835/bcm2835_intr.c
  user/ngie/detangle-rc/sys/arm/broadcom/bcm2835/bcm2836.c
  user/ngie/detangle-rc/sys/arm/conf/A10
  user/ngie/detangle-rc/sys/arm/conf/ALLWINNER
  user/ngie/detangle-rc/sys/arm/conf/TEGRA124
  user/ngie/detangle-rc/sys/arm/conf/std.armv6
  user/ngie/detangle-rc/sys/arm/freescale/imx/imx_sdhci.c
  user/ngie/detangle-rc/sys/arm/include/_align.h
  user/ngie/detangle-rc/sys/arm/include/asm.h
  user/ngie/detangle-rc/sys/arm/include/atomic-v4.h
  user/ngie/detangle-rc/sys/arm/include/param.h
  user/ngie/detangle-rc/sys/arm/mv/mpic.c
  user/ngie/detangle-rc/sys/arm/nvidia/tegra_gpio.c
  user/ngie/detangle-rc/sys/arm/nvidia/tegra_i2c.c
  user/ngie/detangle-rc/sys/arm/nvidia/tegra_lic.c
  user/ngie/detangle-rc/sys/arm/ti/aintc.c
  user/ngie/detangle-rc/sys/arm/ti/omap4/omap4_wugen.c
  user/ngie/detangle-rc/sys/arm/ti/ti_gpio.c
  user/ngie/detangle-rc/sys/arm64/arm64/autoconf.c
  user/ngie/detangle-rc/sys/arm64/arm64/busdma_bounce.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic.h
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_fdt.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_its.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_reg.h
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_var.h
  user/ngie/detangle-rc/sys/arm64/arm64/mp_machdep.c
  user/ngie/detangle-rc/sys/arm64/arm64/nexus.c
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_fdt.c
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_pem.c
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_pem_fdt.c
  user/ngie/detangle-rc/sys/arm64/conf/DEFAULTS
  user/ngie/detangle-rc/sys/arm64/include/intr.h
  user/ngie/detangle-rc/sys/arm64/include/resource.h
  user/ngie/detangle-rc/sys/boot/common/bootstrap.h
  user/ngie/detangle-rc/sys/boot/common/commands.c
  user/ngie/detangle-rc/sys/boot/common/disk.c
  user/ngie/detangle-rc/sys/boot/common/disk.h
  user/ngie/detangle-rc/sys/boot/common/module.c
  user/ngie/detangle-rc/sys/boot/common/part.c
  user/ngie/detangle-rc/sys/boot/common/part.h
  user/ngie/detangle-rc/sys/boot/common/pnp.c
  user/ngie/detangle-rc/sys/boot/common/util.c
  user/ngie/detangle-rc/sys/boot/efi/libefi/Makefile
  user/ngie/detangle-rc/sys/boot/efi/libefi/efi_console.c
  user/ngie/detangle-rc/sys/boot/efi/libefi/efinet.c
  user/ngie/detangle-rc/sys/boot/efi/libefi/efipart.c
  user/ngie/detangle-rc/sys/boot/efi/loader/Makefile
  user/ngie/detangle-rc/sys/boot/efi/loader/bootinfo.c
  user/ngie/detangle-rc/sys/boot/efi/loader/main.c
  user/ngie/detangle-rc/sys/boot/fdt/dts/arm/a83t.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi
  user/ngie/detangle-rc/sys/boot/fdt/fdt_loader_cmd.c
  user/ngie/detangle-rc/sys/boot/ficl/loader.c
  user/ngie/detangle-rc/sys/boot/ficl/words.c
  user/ngie/detangle-rc/sys/boot/forth/loader.4th
  user/ngie/detangle-rc/sys/boot/forth/loader.conf
  user/ngie/detangle-rc/sys/boot/i386/libi386/bioscd.c
  user/ngie/detangle-rc/sys/boot/i386/libi386/biosdisk.c
  user/ngie/detangle-rc/sys/boot/i386/zfsboot/zfsboot.c
  user/ngie/detangle-rc/sys/boot/pc98/libpc98/bioscd.c
  user/ngie/detangle-rc/sys/boot/pc98/libpc98/biosdisk.c
  user/ngie/detangle-rc/sys/boot/uboot/lib/disk.c
  user/ngie/detangle-rc/sys/boot/zfs/zfs.c
  user/ngie/detangle-rc/sys/cam/ata/ata_all.c
  user/ngie/detangle-rc/sys/cam/ata/ata_all.h
  user/ngie/detangle-rc/sys/cam/ata/ata_da.c
  user/ngie/detangle-rc/sys/cam/cam_ccb.h
  user/ngie/detangle-rc/sys/cam/cam_periph.c
  user/ngie/detangle-rc/sys/cam/ctl/ctl_frontend_iscsi.c
  user/ngie/detangle-rc/sys/cam/ctl/scsi_ctl.c
  user/ngie/detangle-rc/sys/cam/scsi/scsi_all.c
  user/ngie/detangle-rc/sys/cam/scsi/scsi_all.h
  user/ngie/detangle-rc/sys/cam/scsi/scsi_da.c
  user/ngie/detangle-rc/sys/cam/scsi/scsi_da.h
  user/ngie/detangle-rc/sys/cam/scsi/scsi_pass.c
  user/ngie/detangle-rc/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
  user/ngie/detangle-rc/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/ngie/detangle-rc/sys/compat/cloudabi/cloudabi_thread.c
  user/ngie/detangle-rc/sys/compat/linux/linux_fork.c
  user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/device.h
  user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/kernel.h
  user/ngie/detangle-rc/sys/compat/linuxkpi/common/src/linux_compat.c
  user/ngie/detangle-rc/sys/compat/ndis/subr_ntoskrnl.c
  user/ngie/detangle-rc/sys/conf/Makefile.mips
  user/ngie/detangle-rc/sys/conf/NOTES
  user/ngie/detangle-rc/sys/conf/files
  user/ngie/detangle-rc/sys/conf/files.arm
  user/ngie/detangle-rc/sys/conf/files.arm64
  user/ngie/detangle-rc/sys/conf/kern.post.mk
  user/ngie/detangle-rc/sys/conf/options
  user/ngie/detangle-rc/sys/conf/options.arm64
  user/ngie/detangle-rc/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  user/ngie/detangle-rc/sys/contrib/ipfilter/netinet/ip_frag.c
  user/ngie/detangle-rc/sys/contrib/ipfilter/netinet/ip_frag.h
  user/ngie/detangle-rc/sys/ddb/db_examine.c
  user/ngie/detangle-rc/sys/ddb/db_expr.c
  user/ngie/detangle-rc/sys/ddb/db_lex.c
  user/ngie/detangle-rc/sys/ddb/db_lex.h
  user/ngie/detangle-rc/sys/dev/acpica/Osd/OsdSynch.c
  user/ngie/detangle-rc/sys/dev/acpica/acpi_pcib_pci.c
  user/ngie/detangle-rc/sys/dev/ahci/ahci.c
  user/ngie/detangle-rc/sys/dev/ath/ath_hal/ah_regdomain.c
  user/ngie/detangle-rc/sys/dev/ath/ath_hal/ah_regdomain.h
  user/ngie/detangle-rc/sys/dev/atkbdc/atkbdc_ebus.c
  user/ngie/detangle-rc/sys/dev/bhnd/bcma/bcma_bhndb.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd.h
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd_bus_if.m
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd_ids.h
  user/ngie/detangle-rc/sys/dev/bhnd/bhnd_subr.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb_if.m
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb_pci.c
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb_pcireg.h
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb_private.h
  user/ngie/detangle-rc/sys/dev/bhnd/bhndb/bhndb_subr.c
  user/ngie/detangle-rc/sys/dev/bhnd/cores/chipc/bhnd_chipc_if.m
  user/ngie/detangle-rc/sys/dev/bhnd/cores/chipc/chipc.c
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pci/bhnd_pci.c
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pci/bhnd_pcib.c
  user/ngie/detangle-rc/sys/dev/bhnd/cores/pci/bhnd_pcireg.h
  user/ngie/detangle-rc/sys/dev/bhnd/nvram/bhnd_sprom.c
  user/ngie/detangle-rc/sys/dev/bhnd/nvram/nvram_map
  user/ngie/detangle-rc/sys/dev/bhnd/siba/siba.c
  user/ngie/detangle-rc/sys/dev/bhnd/siba/siba_bhndb.c
  user/ngie/detangle-rc/sys/dev/bhnd/siba/sibavar.h
  user/ngie/detangle-rc/sys/dev/bhnd/tools/bus_macro.sh
  user/ngie/detangle-rc/sys/dev/bwn/bwn_mac.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_debug.h
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_pci.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_phy_common.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_phy_g.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_phy_lp.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn_util.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwnreg.h
  user/ngie/detangle-rc/sys/dev/bwn/if_bwnvar.h
  user/ngie/detangle-rc/sys/dev/bxe/ecore_hsi.h
  user/ngie/detangle-rc/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
  user/ngie/detangle-rc/sys/dev/cxgbe/tom/t4_ddp.c
  user/ngie/detangle-rc/sys/dev/drm2/i915/intel_crt.c
  user/ngie/detangle-rc/sys/dev/drm2/i915/intel_display.c
  user/ngie/detangle-rc/sys/dev/drm2/radeon/atombios.h
  user/ngie/detangle-rc/sys/dev/drm2/radeon/r300_reg.h
  user/ngie/detangle-rc/sys/dev/drm2/radeon/radeon_device.c
  user/ngie/detangle-rc/sys/dev/drm2/radeon/radeon_fence.c
  user/ngie/detangle-rc/sys/dev/drm2/radeon/radeon_gart.c
  user/ngie/detangle-rc/sys/dev/e1000/e1000_82575.c
  user/ngie/detangle-rc/sys/dev/e1000/e1000_ich8lan.c
  user/ngie/detangle-rc/sys/dev/fb/vesa.c
  user/ngie/detangle-rc/sys/dev/gpio/ofw_gpiobus.c
  user/ngie/detangle-rc/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  user/ngie/detangle-rc/sys/dev/hyperv/netvsc/hv_rndis.h
  user/ngie/detangle-rc/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  user/ngie/detangle-rc/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_channel.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_connection.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_hv.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  user/ngie/detangle-rc/sys/dev/iicbus/iic.c
  user/ngie/detangle-rc/sys/dev/iicbus/iic.h
  user/ngie/detangle-rc/sys/dev/ipw/if_ipw.c
  user/ngie/detangle-rc/sys/dev/ipw/if_ipwvar.h
  user/ngie/detangle-rc/sys/dev/iscsi/icl.c
  user/ngie/detangle-rc/sys/dev/iscsi/icl.h
  user/ngie/detangle-rc/sys/dev/iscsi/icl_conn_if.m
  user/ngie/detangle-rc/sys/dev/iscsi/icl_soft.c
  user/ngie/detangle-rc/sys/dev/iscsi/icl_wrappers.h
  user/ngie/detangle-rc/sys/dev/iscsi/iscsi.c
  user/ngie/detangle-rc/sys/dev/isp/isp.c
  user/ngie/detangle-rc/sys/dev/isp/isp_freebsd.c
  user/ngie/detangle-rc/sys/dev/isp/isp_library.c
  user/ngie/detangle-rc/sys/dev/isp/isp_pci.c
  user/ngie/detangle-rc/sys/dev/isp/isp_sbus.c
  user/ngie/detangle-rc/sys/dev/isp/isp_target.c
  user/ngie/detangle-rc/sys/dev/isp/ispvar.h
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_binding.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_mac_ctxt.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_pcie_trans.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_phy_ctxt.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_phy_db.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_power.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_scan.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_time_event.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwm_util.c
  user/ngie/detangle-rc/sys/dev/iwm/if_iwmreg.h
  user/ngie/detangle-rc/sys/dev/kbd/kbd.c
  user/ngie/detangle-rc/sys/dev/le/lebuffer_sbus.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/en.h
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/ngie/detangle-rc/sys/dev/mwl/if_mwl.c
  user/ngie/detangle-rc/sys/dev/mwl/mwlhal.c
  user/ngie/detangle-rc/sys/dev/netmap/netmap.c
  user/ngie/detangle-rc/sys/dev/ntb/ntb_hw/ntb_hw.c
  user/ngie/detangle-rc/sys/dev/ntb/ntb_hw/ntb_hw.h
  user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.c
  user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.h
  user/ngie/detangle-rc/sys/dev/ofw/ofw_iicbus.c
  user/ngie/detangle-rc/sys/dev/ow/ow.c
  user/ngie/detangle-rc/sys/dev/pccbb/pccbb_pci.c
  user/ngie/detangle-rc/sys/dev/pci/pci.c
  user/ngie/detangle-rc/sys/dev/pci/pci_host_generic.c
  user/ngie/detangle-rc/sys/dev/pci/pci_host_generic.h
  user/ngie/detangle-rc/sys/dev/pci/pci_if.m
  user/ngie/detangle-rc/sys/dev/pci/pci_pci.c
  user/ngie/detangle-rc/sys/dev/pci/pcib_if.m
  user/ngie/detangle-rc/sys/dev/pci/pcib_private.h
  user/ngie/detangle-rc/sys/dev/pci/pcib_support.c
  user/ngie/detangle-rc/sys/dev/pci/pcivar.h
  user/ngie/detangle-rc/sys/dev/pms/RefTisa/sallsdk/spc/mpi.c
  user/ngie/detangle-rc/sys/dev/pms/RefTisa/sat/src/smsat.c
  user/ngie/detangle-rc/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c
  user/ngie/detangle-rc/sys/dev/ral/rt2860.c
  user/ngie/detangle-rc/sys/dev/ral/rt2860reg.h
  user/ngie/detangle-rc/sys/dev/ral/rt2860var.h
  user/ngie/detangle-rc/sys/dev/random/fortuna.c
  user/ngie/detangle-rc/sys/dev/rtwn/if_rtwn.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_ev.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_filter.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_mac.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_nvram.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_rx.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_tlv_layout.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_tx.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/ef10_vpd.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_lic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mac.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mcdi.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_regs_mcdi.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_vpd.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/medford_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_mac.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_vpd.c
  user/ngie/detangle-rc/sys/dev/sfxge/sfxge_rx.c
  user/ngie/detangle-rc/sys/dev/siba/siba_core.c
  user/ngie/detangle-rc/sys/dev/siba/sibareg.h
  user/ngie/detangle-rc/sys/dev/siba/sibavar.h
  user/ngie/detangle-rc/sys/dev/tsec/if_tsec_fdt.c
  user/ngie/detangle-rc/sys/dev/urtwn/if_urtwn.c
  user/ngie/detangle-rc/sys/dev/vnic/mrml_bridge.c
  user/ngie/detangle-rc/sys/dev/vnic/nic_main.c
  user/ngie/detangle-rc/sys/dev/vnic/nicvf_main.c
  user/ngie/detangle-rc/sys/dev/vnic/thunder_bgx.c
  user/ngie/detangle-rc/sys/dev/vnic/thunder_mdio.c
  user/ngie/detangle-rc/sys/dev/wi/if_wi.c
  user/ngie/detangle-rc/sys/dev/wi/if_wivar.h
  user/ngie/detangle-rc/sys/fs/autofs/autofs_vnops.c
  user/ngie/detangle-rc/sys/fs/devfs/devfs_devs.c
  user/ngie/detangle-rc/sys/fs/fuse/fuse_file.c
  user/ngie/detangle-rc/sys/fs/fuse/fuse_file.h
  user/ngie/detangle-rc/sys/fs/fuse/fuse_vnops.c
  user/ngie/detangle-rc/sys/fs/msdosfs/msdosfs_vfsops.c
  user/ngie/detangle-rc/sys/fs/nfsclient/nfs_clvfsops.c
  user/ngie/detangle-rc/sys/geom/eli/g_eli.c
  user/ngie/detangle-rc/sys/geom/geom.h
  user/ngie/detangle-rc/sys/geom/geom_dev.c
  user/ngie/detangle-rc/sys/geom/geom_disk.c
  user/ngie/detangle-rc/sys/geom/geom_disk.h
  user/ngie/detangle-rc/sys/geom/geom_event.c
  user/ngie/detangle-rc/sys/geom/geom_io.c
  user/ngie/detangle-rc/sys/geom/geom_kern.c
  user/ngie/detangle-rc/sys/geom/geom_mbr.c
  user/ngie/detangle-rc/sys/geom/geom_pc98.c
  user/ngie/detangle-rc/sys/geom/geom_subr.c
  user/ngie/detangle-rc/sys/geom/journal/g_journal.c
  user/ngie/detangle-rc/sys/geom/mirror/g_mirror.c
  user/ngie/detangle-rc/sys/geom/mountver/g_mountver.c
  user/ngie/detangle-rc/sys/geom/raid/g_raid.c
  user/ngie/detangle-rc/sys/geom/raid3/g_raid3.c
  user/ngie/detangle-rc/sys/gnu/dts/mips/3G-6200N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/3G-6200NL.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/3G150B.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/3G300M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/A5-V11.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AI-BR100.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AIR3GII.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ALL0239-3G.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ALL0256N-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ALL0256N-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ALL5002.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ALL5003.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AR670W.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AR725W.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ASL26555-16M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ASL26555-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ATP-52B.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWAPN2403.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM002-4M.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM002-8M.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM002-EVB-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM002-EVB-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM002.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/AWM003-EVB.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ArcherC20i.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/BC2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/BR-6425.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/BR-6475ND.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/BROADWAY.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/CARAMBOLA.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/CF-WR800N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/CY-SWR1100.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/D105.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DAP-1350.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DB-WRT01.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DCS-930.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DCS-930L-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-300-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-300-B7.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-320-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-600-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-600-B2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-610-A1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-615-D.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-615-H1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-620-A1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-620-D1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-645.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-810L.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/DIR-860L-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/E1700.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ESR-9753.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/EX2700.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/F5D8235_V1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/F5D8235_V2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/F7C027.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/FIREWRT.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/FONERA20N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/FREESTATION5.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/GL-MT300A.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/GL-MT300N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/GL-MT750.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HC5661.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HC5761.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HC5861.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HC5XXX.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/HG255D.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HLKRM04.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HPM.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HT-TM02.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/HW550-3G.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/IP2202.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/JHR-N805R.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/JHR-N825R.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/JHR-N926R.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/LINKIT7688.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/M2M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/M3.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/M4-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/M4-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MINIEMBPLUG.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MINIEMBWIFI.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MIWIFI-MINI.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MIWIFI-NANO.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MLW221.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MLWG2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MOFI3500-3GN.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MPRA1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MPRA2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MR-102N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7620a.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7620a_MT7530.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7620a_MT7610e.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7620a_V22SG.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7621.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MT7628.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-750DHP.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-DP150N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-W300NH2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MZK-WDPR.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/MicroWRT.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/NA930.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/NBG-419N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/NCS601W.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/NW718.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/OY-0001.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PBR-M1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PSG1208.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PSR-680W.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PWH2004.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PX-4885-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PX-4885-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/PX-4885.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/RE6500.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RP-N53.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-G32-B1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-N10-PLUS.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-N13U.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-N14U.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-N15.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT-N56U.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/RUT5XX.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/SAP-G3200U3.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/SL-R7205.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/TEW-691GR.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/TEW-692GR.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/TINY-AC.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/UBNT-ERX.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/UR-326N4G.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/UR-336UN.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/V11STFE.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/V22RW-2X2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/VOCORE-16M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/VOCORE-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/VOCORE.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/W150M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/W306R_V20.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/W502U.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WCR150GN.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WF-2881.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WHR-1166D.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WHR-300HP2.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WHR-600D.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WHR-G300N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WITI.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WIZARD8800.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WIZFI630A.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WL-330N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WL-330N3G.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WL-341V3.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WL-351.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WLI-TX4-AG300N.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WMR-300.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WNCE2001.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WR512-3GN-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WR512-3GN-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WR6202.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WRTNODE.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WRTNODE2.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/WRTNODE2P.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WRTNODE2R.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WSR-1166.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WSR-600.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WT1520-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WT1520-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WT1520.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/WT3020-4M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WT3020-8M.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/WZR-AGL300NH.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/X5.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/X8.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/XDXRN502J.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/Y1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/Y1.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/Y1S.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/YOUKU-YK1.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZBT-WA05.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZBT-WE826.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZBT-WG2626.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZBT-WR8305RT.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/ZTE-Q7.dts
  user/ngie/detangle-rc/sys/gnu/dts/mips/mt7620a.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/mt7620n.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/mt7621.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/mt7628an.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/rt2880.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/rt3050.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/rt3352.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/rt3883.dtsi
  user/ngie/detangle-rc/sys/gnu/dts/mips/rt5350.dtsi
  user/ngie/detangle-rc/sys/i386/i386/sys_machdep.c
  user/ngie/detangle-rc/sys/i386/include/atomic.h
  user/ngie/detangle-rc/sys/i386/linux/linux_proto.h
  user/ngie/detangle-rc/sys/i386/linux/linux_syscall.h
  user/ngie/detangle-rc/sys/i386/linux/linux_syscalls.c
  user/ngie/detangle-rc/sys/i386/linux/linux_sysent.c
  user/ngie/detangle-rc/sys/i386/linux/linux_systrace_args.c
  user/ngie/detangle-rc/sys/i386/linux/syscalls.master
  user/ngie/detangle-rc/sys/kern/bus_if.m
  user/ngie/detangle-rc/sys/kern/device_if.m
  user/ngie/detangle-rc/sys/kern/kern_clock.c
  user/ngie/detangle-rc/sys/kern/kern_exit.c
  user/ngie/detangle-rc/sys/kern/kern_malloc.c
  user/ngie/detangle-rc/sys/kern/kern_mbuf.c
  user/ngie/detangle-rc/sys/kern/kern_mutex.c
  user/ngie/detangle-rc/sys/kern/kern_thr.c
  user/ngie/detangle-rc/sys/kern/kern_thread.c
  user/ngie/detangle-rc/sys/kern/kern_umtx.c
  user/ngie/detangle-rc/sys/kern/subr_bus.c
  user/ngie/detangle-rc/sys/kern/subr_devstat.c
  user/ngie/detangle-rc/sys/kern/subr_intr.c
  user/ngie/detangle-rc/sys/kern/subr_rman.c
  user/ngie/detangle-rc/sys/kern/subr_sglist.c
  user/ngie/detangle-rc/sys/kern/subr_sleepqueue.c
  user/ngie/detangle-rc/sys/kern/subr_taskqueue.c
  user/ngie/detangle-rc/sys/kern/sys_socket.c
  user/ngie/detangle-rc/sys/kern/uipc_syscalls.c
  user/ngie/detangle-rc/sys/kern/vfs_aio.c
  user/ngie/detangle-rc/sys/kern/vfs_mount.c
  user/ngie/detangle-rc/sys/kern/vfs_subr.c
  user/ngie/detangle-rc/sys/kern/vfs_vnops.c
  user/ngie/detangle-rc/sys/mips/conf/AR933X_BASE
  user/ngie/detangle-rc/sys/mips/conf/AR934X_BASE
  user/ngie/detangle-rc/sys/mips/conf/DIR-825C1.hints
  user/ngie/detangle-rc/sys/mips/include/clock.h
  user/ngie/detangle-rc/sys/mips/mediatek/files.mediatek
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_gpio_v1.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_gpio_v2.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_intr_gic.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_intr_v1.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_intr_v2.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_pcie.c
  user/ngie/detangle-rc/sys/mips/mediatek/mtk_soc.c
  user/ngie/detangle-rc/sys/mips/mips/mips_pic.c
  user/ngie/detangle-rc/sys/modules/Makefile
  user/ngie/detangle-rc/sys/modules/bhnd/cores/bhnd_pci/Makefile
  user/ngie/detangle-rc/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile
  user/ngie/detangle-rc/sys/modules/bhnd/cores/bhnd_pcib/Makefile
  user/ngie/detangle-rc/sys/modules/bwn/Makefile
  user/ngie/detangle-rc/sys/modules/cam/Makefile
  user/ngie/detangle-rc/sys/modules/iscsi/Makefile
  user/ngie/detangle-rc/sys/modules/tcp/fastpath/Makefile
  user/ngie/detangle-rc/sys/net/altq/altq_cbq.c
  user/ngie/detangle-rc/sys/net/if.c
  user/ngie/detangle-rc/sys/net/if_tun.c
  user/ngie/detangle-rc/sys/net/if_var.h
  user/ngie/detangle-rc/sys/net/vnet.c
  user/ngie/detangle-rc/sys/net/vnet.h
  user/ngie/detangle-rc/sys/net80211/ieee80211.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_action.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_crypto_none.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_ddb.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_freebsd.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_hostap.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_ht.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_hwmp.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_ioctl.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_mesh.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_phy.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_scan_sta.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_sta.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_superg.c
  user/ngie/detangle-rc/sys/net80211/ieee80211_var.h
  user/ngie/detangle-rc/sys/netinet/ip_fw.h
  user/ngie/detangle-rc/sys/netinet/tcp_input.c
  user/ngie/detangle-rc/sys/netinet/tcp_output.c
  user/ngie/detangle-rc/sys/netinet/tcp_stacks/fastpath.c
  user/ngie/detangle-rc/sys/netinet/tcp_subr.c
  user/ngie/detangle-rc/sys/netinet/tcp_timer.c
  user/ngie/detangle-rc/sys/netinet/tcp_var.h
  user/ngie/detangle-rc/sys/netinet6/ip6_output.c
  user/ngie/detangle-rc/sys/netinet6/nd6.c
  user/ngie/detangle-rc/sys/netinet6/nd6.h
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw_dynamic.c
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw_eaction.c
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw_private.h
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw_sockopt.c
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw_table.c
  user/ngie/detangle-rc/sys/netpfil/pf/pf_norm.c
  user/ngie/detangle-rc/sys/ofed/drivers/infiniband/debug/memtrack.c
  user/ngie/detangle-rc/sys/ofed/drivers/infiniband/debug/memtrack.h
  user/ngie/detangle-rc/sys/ofed/drivers/net/mlx4/main.c
  user/ngie/detangle-rc/sys/sparc64/central/central.c
  user/ngie/detangle-rc/sys/sparc64/ebus/ebus.c
  user/ngie/detangle-rc/sys/sparc64/fhc/fhc.c
  user/ngie/detangle-rc/sys/sparc64/include/vm.h
  user/ngie/detangle-rc/sys/sparc64/isa/isa.c
  user/ngie/detangle-rc/sys/sparc64/pci/ofw_pci.c
  user/ngie/detangle-rc/sys/sparc64/sbus/dma_sbus.c
  user/ngie/detangle-rc/sys/sparc64/sbus/sbus.c
  user/ngie/detangle-rc/sys/sparc64/sparc64/nexus.c
  user/ngie/detangle-rc/sys/sparc64/sparc64/upa.c
  user/ngie/detangle-rc/sys/sys/_task.h
  user/ngie/detangle-rc/sys/sys/_umtx.h
  user/ngie/detangle-rc/sys/sys/ata.h
  user/ngie/detangle-rc/sys/sys/bio.h
  user/ngie/detangle-rc/sys/sys/bus.h
  user/ngie/detangle-rc/sys/sys/disk.h
  user/ngie/detangle-rc/sys/sys/elf_common.h
  user/ngie/detangle-rc/sys/sys/intr.h
  user/ngie/detangle-rc/sys/sys/malloc.h
  user/ngie/detangle-rc/sys/sys/mbuf.h
  user/ngie/detangle-rc/sys/sys/param.h
  user/ngie/detangle-rc/sys/sys/proc.h
  user/ngie/detangle-rc/sys/sys/rman.h
  user/ngie/detangle-rc/sys/sys/sglist.h
  user/ngie/detangle-rc/sys/sys/socketvar.h
  user/ngie/detangle-rc/sys/sys/taskqueue.h
  user/ngie/detangle-rc/sys/sys/umtx.h
  user/ngie/detangle-rc/sys/sys/vmmeter.h
  user/ngie/detangle-rc/sys/sys/vnode.h
  user/ngie/detangle-rc/sys/ufs/ffs/ffs_inode.c
  user/ngie/detangle-rc/sys/ufs/ffs/ffs_vfsops.c
  user/ngie/detangle-rc/sys/ufs/ufs/ufs_lookup.c
  user/ngie/detangle-rc/sys/ufs/ufs/ufs_vnops.c
  user/ngie/detangle-rc/sys/vm/vm.h
  user/ngie/detangle-rc/sys/vm/vm_fault.c
  user/ngie/detangle-rc/sys/vm/vm_object.c
  user/ngie/detangle-rc/sys/vm/vm_object.h
  user/ngie/detangle-rc/sys/vm/vm_page.c
  user/ngie/detangle-rc/sys/vm/vm_page.h
  user/ngie/detangle-rc/sys/vm/vnode_pager.c
  user/ngie/detangle-rc/sys/x86/x86/nexus.c
  user/ngie/detangle-rc/sys/xen/interface/io/blkif.h
  user/ngie/detangle-rc/targets/Makefile
  user/ngie/detangle-rc/tools/tools/nanobsd/defaults.sh
  user/ngie/detangle-rc/tools/tools/nanobsd/nanobsd.sh
  user/ngie/detangle-rc/usr.bin/ar/ar.c
  user/ngie/detangle-rc/usr.bin/bmake/Makefile
  user/ngie/detangle-rc/usr.bin/chat/chat.c
  user/ngie/detangle-rc/usr.bin/gprof/aout.c
  user/ngie/detangle-rc/usr.bin/gprof/arcs.c
  user/ngie/detangle-rc/usr.bin/gprof/gprof.c
  user/ngie/detangle-rc/usr.bin/kdump/kdump.c
  user/ngie/detangle-rc/usr.bin/ldd/ldd.c
  user/ngie/detangle-rc/usr.bin/mt/mt.1
  user/ngie/detangle-rc/usr.bin/ncal/ncal.c
  user/ngie/detangle-rc/usr.bin/numactl/numactl.1
  user/ngie/detangle-rc/usr.sbin/Makefile
  user/ngie/detangle-rc/usr.sbin/bsdconfig/share/dialog.subr
  user/ngie/detangle-rc/usr.sbin/bsnmpd/bsnmpd/Makefile
  user/ngie/detangle-rc/usr.sbin/camdd/camdd.c
  user/ngie/detangle-rc/usr.sbin/config/lang.l
  user/ngie/detangle-rc/usr.sbin/ctld/discovery.c
  user/ngie/detangle-rc/usr.sbin/ctld/login.c
  user/ngie/detangle-rc/usr.sbin/diskinfo/diskinfo.c
  user/ngie/detangle-rc/usr.sbin/iscsid/discovery.c
  user/ngie/detangle-rc/usr.sbin/iscsid/login.c
  user/ngie/detangle-rc/usr.sbin/kldxref/kldxref.c
  user/ngie/detangle-rc/usr.sbin/lmcconfig/lmcconfig.c
  user/ngie/detangle-rc/usr.sbin/makefs/cd9660.c
  user/ngie/detangle-rc/usr.sbin/makefs/ffs.c
  user/ngie/detangle-rc/usr.sbin/makefs/mtree.c
  user/ngie/detangle-rc/usr.sbin/pciconf/pciconf.8
  user/ngie/detangle-rc/usr.sbin/periodic/periodic.8
  user/ngie/detangle-rc/usr.sbin/periodic/periodic.sh
  user/ngie/detangle-rc/usr.sbin/ppp/link.c
  user/ngie/detangle-rc/usr.sbin/rarpd/rarpd.c
  user/ngie/detangle-rc/usr.sbin/route6d/route6d.c
  user/ngie/detangle-rc/usr.sbin/rpc.lockd/lock_proc.c
  user/ngie/detangle-rc/usr.sbin/rpc.lockd/lockd_lock.c
  user/ngie/detangle-rc/usr.sbin/rpc.statd/file.c
  user/ngie/detangle-rc/usr.sbin/rtadvd/config.c
  user/ngie/detangle-rc/usr.sbin/rtadvd/if.c
  user/ngie/detangle-rc/usr.sbin/rtsold/if.c
  user/ngie/detangle-rc/usr.sbin/ypldap/aldap.c
  user/ngie/detangle-rc/usr.sbin/ypldap/ypldap.c
Directory Properties:
  user/ngie/detangle-rc/   (props changed)
  user/ngie/detangle-rc/cddl/   (props changed)
  user/ngie/detangle-rc/contrib/binutils/   (props changed)
  user/ngie/detangle-rc/contrib/bmake/   (props changed)
  user/ngie/detangle-rc/contrib/elftoolchain/   (props changed)
  user/ngie/detangle-rc/contrib/elftoolchain/brandelf/   (props changed)
  user/ngie/detangle-rc/contrib/elftoolchain/elfdump/   (props changed)
  user/ngie/detangle-rc/contrib/gcc/   (props changed)
  user/ngie/detangle-rc/contrib/groff/   (props changed)
  user/ngie/detangle-rc/contrib/ipfilter/   (props changed)
  user/ngie/detangle-rc/contrib/libarchive/   (props changed)
  user/ngie/detangle-rc/contrib/libarchive/cpio/   (props changed)
  user/ngie/detangle-rc/contrib/libarchive/libarchive/   (props changed)
  user/ngie/detangle-rc/contrib/llvm/   (props changed)
  user/ngie/detangle-rc/contrib/llvm/tools/clang/   (props changed)
  user/ngie/detangle-rc/gnu/usr.bin/binutils/   (props changed)
  user/ngie/detangle-rc/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/ngie/detangle-rc/gnu/usr.bin/gdb/   (props changed)
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/detangle-rc/sys/contrib/ipfilter/   (props changed)

Modified: user/ngie/detangle-rc/Makefile
==============================================================================
--- user/ngie/detangle-rc/Makefile	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/Makefile	Sat May 21 21:53:01 2016	(r300380)
@@ -197,7 +197,7 @@ _MAKE+=	MK_META_MODE=no
 _TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}
 .endif
 .if defined(TARGET) && !defined(_TARGET)
 _TARGET=${TARGET}
@@ -374,7 +374,7 @@ worlds:
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
 TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
 _UNIVERSE_TARGETS=	${TARGETS}
-TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
+TARGET_ARCHES_arm?=	arm armeb armv6
 TARGET_ARCHES_arm64?=	aarch64
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64

Modified: user/ngie/detangle-rc/Makefile.inc1
==============================================================================
--- user/ngie/detangle-rc/Makefile.inc1	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/Makefile.inc1	Sat May 21 21:53:01 2016	(r300380)
@@ -48,6 +48,7 @@
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
+SRCDIR?=	${.CURDIR}
 LOCALBASE?=	/usr/local
 
 # Cross toolchain changes must be in effect before bsd.compiler.mk
@@ -56,8 +57,100 @@ LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
-.include <bsd.compiler.mk>		# don't depend on src.opts.mk doing it
-.include "share/mk/src.opts.mk"	
+.if defined(CROSS_TOOLCHAIN_PREFIX)
+CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+.endif
+# If we do not have a bootstrap binutils (because the in-tree one does not
+# support the target architecture), provide a default cross-binutils prefix.
+# This allows aarch64 builds, for example, to automatically use the
+# aarch64-binutils port or package.
+.if !make(showconfig)
+.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
+    !defined(CROSS_BINUTILS_PREFIX)
+CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
+.if !exists(${CROSS_BINUTILS_PREFIX})
+.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
+.endif
+.endif
+.endif
+
+XCOMPILERS=	CC CXX CPP
+.for COMPILER in ${XCOMPILERS}
+.if defined(CROSS_COMPILER_PREFIX)
+X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
+.else
+X${COMPILER}?=	${${COMPILER}}
+.endif
+.endfor
+XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
+.for BINUTIL in ${XBINUTILS}
+.if defined(CROSS_BINUTILS_PREFIX) && \
+    exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}})
+X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
+.else
+X${BINUTIL}?=	${${BINUTIL}}
+.endif
+.endfor
+# If a full path to an external cross compiler is given, don't build
+# a cross compiler.
+.if ${XCC:N${CCACHE_BIN}:M/*}
+MK_CROSS_COMPILER=	no
+.endif
+
+# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
+.include <bsd.compiler.mk>
+.include "share/mk/src.opts.mk"
+
+# Check if there is a local compiler that can satisfy as an external compiler.
+.if ${MK_SYSTEM_COMPILER} == "yes" && ${MK_CROSS_COMPILER} == "yes" && \
+    (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \
+    !make(showconfig)
+# Which compiler is expected to be used?
+.if ${MK_CLANG_BOOTSTRAP} == "yes"
+_expected_compiler_type=	clang
+.elif ${MK_GCC_BOOTSTRAP} == "yes"
+_expected_compiler_type=	gcc
+.endif
+# If the expected vs CC is different then we can't skip.
+# GCC cannot be used for cross-arch yet.  For clang we pass -target later if
+# TARGET_ARCH!=MACHINE_ARCH.
+.if ${_expected_compiler_type} == ${COMPILER_TYPE} && \
+    (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH})
+# It needs to be the same revision as we would build for the bootstrap.
+.if !defined(CROSS_COMPILER_FREEBSD_VERSION)
+.if ${_expected_compiler_type} == "clang"
+CROSS_COMPILER_FREEBSD_VERSION!= \
+	awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \
+	${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown
+CROSS_COMPILER_VERSION!= \
+	awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
+	${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown
+.elif ${_expected_compiler_type} == "gcc"
+CROSS_COMPILER_FREEBSD_VERSION!= \
+	awk '$$2 == "FBSD_CC_VER" {printf("%d\n", $$3)}' \
+	${SRCDIR}/gnu/usr.bin/cc/cc_tools/freebsd-native.h || echo unknown
+CROSS_COMPILER_VERSION!= \
+	awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3}' \
+	${SRCDIR}/contrib/gcc/BASE-VER || echo unknown
+.endif
+.export CROSS_COMPILER_FREEBSD_VERSION CROSS_COMPILER_VERSION
+.endif	# !defined(CROSS_COMPILER_FREEBSD_VERSION)
+.if ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION} && \
+    ${COMPILER_FREEBSD_VERSION} == ${CROSS_COMPILER_FREEBSD_VERSION}
+# Everything matches, disable the bootstrap compiler.
+MK_CLANG_BOOTSTRAP=	no
+MK_GCC_BOOTSTRAP=	no
+CROSSENV+=	COMPILER_VERSION=${COMPILER_VERSION} \
+		COMPILER_TYPE=${COMPILER_TYPE} \
+		COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION}
+.if make(buildworld)
+.info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree.  Not bootstrapping a cross-compiler.
+.endif
+.endif	# ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION}
+.endif	# ${_expected_compiler_type} == ${COMPILER_TYPE}
+.endif	# ${XCC:N${CCACHE_BIN}:M/*}
+
 
 # We must do lib/ and libexec/ before bin/ in case of a mid-install error to
 # keep the users system reasonably usable.  For static->dynamic root upgrades,
@@ -67,7 +160,6 @@ CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLC
 # This ordering is not a guarantee though.  The only guarantee of a working
 # system here would require fine-grained ordering of all components based
 # on their dependencies.
-SRCDIR?=	${.CURDIR}
 .if !empty(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
@@ -219,14 +311,13 @@ KNOWN_ARCHES?=	aarch64/arm64 \
 		arm \
 		armeb/arm \
 		armv6/arm \
-		armv6hf/arm \
 		i386 \
 		i386/pc98 \
 		mips \
 		mipsel/mips \
 		mips64el/mips \
-		mips64/mips \
 		mipsn32el/mips \
+		mips64/mips \
 		mipsn32/mips \
 		powerpc \
 		powerpc64/powerpc \
@@ -405,42 +496,6 @@ HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MT
 HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
 .endif
 
-.if defined(CROSS_TOOLCHAIN_PREFIX)
-CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
-CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
-.endif
-
-# If we do not have a bootstrap binutils (because the in-tree one does not
-# support the target architecture), provide a default cross-binutils prefix.
-# This allows aarch64 builds, for example, to automatically use the
-# aarch64-binutils port or package.
-.if !make(showconfig)
-.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
-    !defined(CROSS_BINUTILS_PREFIX)
-CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
-.if !exists(${CROSS_BINUTILS_PREFIX})
-.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
-.endif
-.endif
-.endif
-
-XCOMPILERS=	CC CXX CPP
-.for COMPILER in ${XCOMPILERS}
-.if defined(CROSS_COMPILER_PREFIX)
-X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
-.else
-X${COMPILER}?=	${${COMPILER}}
-.endif
-.endfor
-XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
-.for BINUTIL in ${XBINUTILS}
-.if defined(CROSS_BINUTILS_PREFIX) && \
-    exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}})
-X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
-.else
-X${BINUTIL}?=	${${BINUTIL}}
-.endif
-.endfor
 CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
 		CPP="${XCPP} ${XCFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
@@ -456,12 +511,13 @@ BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
 # External compiler needs sysroot and target flags.
-.if ${XCC:N${CCACHE_BIN}:M/*} || ${MK_CROSS_COMPILER} == "no"
+.if ${MK_CROSS_COMPILER} == "no" || \
+    (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
-.if ${TARGET_ARCH:M*hf*} != ""
+.if ${TARGET_ARCH:Marmv6*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
 TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	gnueabi
@@ -480,7 +536,7 @@ XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
 .else
-.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no"
+.endif # ${MK_CROSS_COMPILER} == "no"
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}
@@ -534,7 +590,7 @@ KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS
 .if ${MK_META_MODE} == "yes"
 # meta mode normally is disallowed when building from curdir==objdir, but we
 # want to allow it for the kernel build.
-KMAKE+=	.MAKE.MODE="${.MAKE.MODE} curdirOk=yes"
+KMAKEENV+=	META_MODE="${.MAKE.MODE} curdirOk=yes"
 .endif
 
 #
@@ -976,27 +1032,19 @@ packageworld: .PHONY
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
-reinstall: .MAKE .PHONY
+restage reinstall: .MAKE .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
-	@echo
+.if make(restage)
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Installing everything"
-	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if defined(LIBCOMPAT)
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
-.endif
-
-restage: .MAKE .PHONY
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Making hierarchy"
+	@echo ">>> Making distribution"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
-	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution
+	    LOCAL_MTREE=${LOCAL_MTREE:Q} distribution
+.endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing everything"
@@ -1724,9 +1772,7 @@ _elftctools=	lib/libelftc \
 		usr.bin/elfcopy
 .endif
 
-# If an full path to an external cross compiler is given, don't build
-# a cross compiler.
-.if ${XCC:N${CCACHE_BIN}:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
+.if ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang

Modified: user/ngie/detangle-rc/ObsoleteFiles.inc
==============================================================================
--- user/ngie/detangle-rc/ObsoleteFiles.inc	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/ObsoleteFiles.inc	Sat May 21 21:53:01 2016	(r300380)
@@ -38,6 +38,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160519: remove DTrace Toolkit from base
+OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
+OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
+OLD_FILES+=usr/share/dtrace/toolkit/hotuser
+OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
+OLD_FILES+=usr/share/dtrace/toolkit/procsystime
+OLD_DIRS+=usr/share/dtrace/toolkit
+# 20160519: stale MLINK removed
+OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
+# 20160517: ReiserFS removed
+OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=usr/lib/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz

Modified: user/ngie/detangle-rc/README
==============================================================================
--- user/ngie/detangle-rc/README	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/README	Sat May 21 21:53:01 2016	(r300380)
@@ -45,8 +45,6 @@ crypto		Cryptography stuff (see crypto/R
 
 etc		Template files for /etc.
 
-games		Amusements.
-
 gnu		Various commands and libraries under the GNU Public License.
 		Please see gnu/COPYING* for more information.
 

Modified: user/ngie/detangle-rc/UPDATING
==============================================================================
--- user/ngie/detangle-rc/UPDATING	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/UPDATING	Sat May 21 21:53:01 2016	(r300380)
@@ -31,6 +31,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160520:
+	The brk and sbrk functions have been removed from libc on arm64.
+	Binutils from ports has been updated to not link to these
+	functions and should be updated to the latest version before
+	installing a new libc.
+
+20160517:
+	The armv6 port now defaults to hard float ABI. Limited support
+	for running both hardfloat and soft float on the same system
+	is available using the libraries installed with -DWITH_LIBSOFT.
+	This has only been tested as an upgrade path for installworld
+	and packages may fail or need manual intervention to run. New
+	packages will be needed.
+
 20160510:
 	Kernel modules compiled outside of a kernel build now default to
 	installing to /boot/modules instead of /boot/kernel.  Many kernel

Modified: user/ngie/detangle-rc/bin/ed/cbc.c
==============================================================================
--- user/ngie/detangle-rc/bin/ed/cbc.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/bin/ed/cbc.c	Sat May 21 21:53:01 2016	(r300380)
@@ -90,16 +90,13 @@ void
 init_des_cipher(void)
 {
 #ifdef DES
-	int i;
-
 	des_ct = des_n = 0;
 
 	/* initialize the initialization vector */
 	MEMZERO(ivec, 8);
 
 	/* initialize the padding vector */
-	for (i = 0; i < 8; i++)
-		pvec[i] = (char) (arc4random() % 256);
+	arc4random_buf(pvec, sizeof(pvec));
 #endif
 }
 
@@ -164,7 +161,7 @@ get_keyword(void)
 	/*
 	 * get the key
 	 */
-	if (*(p = getpass("Enter key: "))) {
+	if ((p = getpass("Enter key: ")) != NULL && *p != '\0') {
 
 		/*
 		 * copy it, nul-padded, into the key area

Modified: user/ngie/detangle-rc/cddl/usr.sbin/Makefile
==============================================================================
--- user/ngie/detangle-rc/cddl/usr.sbin/Makefile	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/cddl/usr.sbin/Makefile	Sat May 21 21:53:01 2016	(r300380)
@@ -3,7 +3,6 @@
 .include <src.opts.mk>
 
 SUBDIR=	${_dtrace} \
-	${_dtruss} \
 	${_lockstat} \
 	${_plockstat} \
 	${_tests} \
@@ -23,14 +22,12 @@ _zhack=	zhack
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 _plockstat=	plockstat
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 
@@ -40,7 +37,6 @@ _dtrace=	dtrace
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 

Modified: user/ngie/detangle-rc/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- user/ngie/detangle-rc/contrib/binutils/gas/config/tc-arm.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/binutils/gas/config/tc-arm.c	Sat May 21 21:53:01 2016	(r300380)
@@ -2284,6 +2284,37 @@ s_unreq (int a ATTRIBUTE_UNUSED)
   demand_empty_rest_of_line ();
 }
 
+static void
+s_inst(int unused ATTRIBUTE_UNUSED)
+{
+	expressionS exp;
+
+	if (thumb_mode) {
+		as_bad(".inst not implemented for Thumb mode");
+		ignore_rest_of_line();
+		return;
+	}
+
+	if (is_it_end_of_statement()) {
+		demand_empty_rest_of_line();
+		return;
+	}
+
+	do {
+		expression(&exp);
+
+		if (exp.X_op != O_constant)
+			as_bad("constant expression required");
+		else
+			emit_expr(&exp, 4);
+
+	} while (*input_line_pointer++ == ',');
+
+	/* Put terminator back into stream. */
+	input_line_pointer--;
+	demand_empty_rest_of_line();
+}
+
 /* Directives: Instruction set selection.  */
 
 #ifdef OBJ_ELF
@@ -3837,10 +3868,10 @@ s_arm_eabi_attribute (int ignored ATTRIB
 #endif /* OBJ_ELF */
 
 static void s_arm_arch (int);
-static void s_arm_arch_extension (int);
 static void s_arm_object_arch (int);
 static void s_arm_cpu (int);
 static void s_arm_fpu (int);
+static void s_arm_arch_extension (int);
 
 #ifdef TE_PE
 
@@ -3892,9 +3923,10 @@ const pseudo_typeS md_pseudo_table[] =
   { "syntax",	   s_syntax,	  0 },
   { "cpu",	   s_arm_cpu,	  0 },
   { "arch",	   s_arm_arch,	  0 },
-  { "arch_extension",	   s_arm_arch_extension,	  0 },
   { "object_arch", s_arm_object_arch,	0 },
   { "fpu",	   s_arm_fpu,	  0 },
+  { "arch_extension",	   s_arm_arch_extension,	  0 },
+  { "inst",	   s_inst,	  0 },
 #ifdef OBJ_ELF
   { "word",	   s_arm_elf_cons, 4 },
   { "long",	   s_arm_elf_cons, 4 },

Modified: user/ngie/detangle-rc/contrib/bmake/ChangeLog
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/ChangeLog	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/ChangeLog	Sat May 21 21:53:01 2016	(r300380)
@@ -1,3 +1,26 @@
+2016-05-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): 20160512
+	  Merge with NetBSD make, pick up
+	  o meta.c: ignore paths that match .MAKE.META.IGNORE_PATTERNS
+	    this is useful for gcov builds.
+	  o propagate errors from filemon(4).
+	
+2016-05-09  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): 20160509
+	  Merge with NetBSD make, pick up
+	  o remove use of non-standard types u_int etc.
+	  o meta.c: apply realpath() before matching against metaIgnorePaths
+
+2016-04-04  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): 20160404
+	  Merge with NetBSD make, pick up
+	  o allow makefile to set .MAKE.JOBS
+
+	* Makefile (PROG_NAME): use ${_MAKE_VERSION}
+
 2016-03-15  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (_MAKE_VERSION): 20160315

Modified: user/ngie/detangle-rc/contrib/bmake/Makefile
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/Makefile	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/Makefile	Sat May 21 21:53:01 2016	(r300380)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.58 2016/03/15 23:39:12 sjg Exp $
+#	$Id: Makefile,v 1.63 2016/05/12 20:34:46 sjg Exp $
 
 # Base version on src date
-_MAKE_VERSION= 20160315
+_MAKE_VERSION= 20160512
 
 PROG=	bmake
 
@@ -131,9 +131,9 @@ OPTIONS_DEFAULT_NO+= \
 .include <own.mk>
 
 .if ${MK_PROG_VERSION} == "yes"
-PROG_NAME= ${PROG}-${MAKE_VERSION}
+PROG_NAME= ${PROG}-${_MAKE_VERSION}
 .if ${MK_PROG_LINK} == "yes"
-SYMLINKS+= ${PROG}-${MAKE_VERSION} ${BINDIR}/${PROG}
+SYMLINKS+= ${PROG_NAME} ${BINDIR}/${PROG}
 .endif
 .endif
 

Modified: user/ngie/detangle-rc/contrib/bmake/arch.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/arch.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/arch.c	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $	*/
+/*	$NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -832,7 +832,7 @@ ArchSVR4Entry(Arch *ar, char *name, size
 	    }
 	if (DEBUG(ARCH)) {
 	    fprintf(debug_file, "Found svr4 archive name table with %lu entries\n",
-	            (u_long)entry);
+	            (unsigned long)entry);
 	}
 	return 0;
     }
@@ -850,7 +850,7 @@ ArchSVR4Entry(Arch *ar, char *name, size
     if (entry >= ar->fnamesize) {
 	if (DEBUG(ARCH)) {
 	    fprintf(debug_file, "SVR4 entry offset %s is greater than %lu\n",
-		   name, (u_long)ar->fnamesize);
+		   name, (unsigned long)ar->fnamesize);
 	}
 	return 2;
     }

Modified: user/ngie/detangle-rc/contrib/bmake/bmake.1
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/bmake.1	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/bmake.1	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $
+.\"	$NetBSD: make.1,v 1.257 2016/05/10 23:45:45 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd February 19, 2016
+.Dd May 10, 2016
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -913,6 +913,9 @@ Provides a list of path prefixes that sh
 because the contents are expected to change over time.
 The default list includes:
 .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp
+.It Va .MAKE.META.IGNORE_PATTERNS
+Provides a list of patterns to match against pathnames.
+Ignore any that match.
 .It Va .MAKE.META.PREFIX
 Defines the message printed for each meta file updated in "meta verbose" mode.
 The default value is:

Modified: user/ngie/detangle-rc/contrib/bmake/bmake.cat1
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/bmake.cat1	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/bmake.cat1	Sat May 21 21:53:01 2016	(r300380)
@@ -586,6 +586,10 @@ VVAARRIIAABBLLEE AASSSSIIGG
                      The default list includes: `_/_d_e_v _/_e_t_c _/_p_r_o_c _/_t_m_p _/_v_a_r_/_r_u_n
                      _/_v_a_r_/_t_m_p'
 
+     _._M_A_K_E_._M_E_T_A_._I_G_N_O_R_E___P_A_T_T_E_R_N_S
+                     Provides a list of patterns to match against pathnames.
+                     Ignore any that match.
+
      _._M_A_K_E_._M_E_T_A_._P_R_E_F_I_X
                      Defines the message printed for each meta file updated in
                      "meta verbose" mode.  The default value is:
@@ -1471,4 +1475,4 @@ BBUUGGSS
 
      There is no way of escaping a space character in a filename.
 
-NetBSD 5.1                     February 19, 2016                    NetBSD 5.1
+NetBSD 5.1                       May 10, 2016                       NetBSD 5.1

Modified: user/ngie/detangle-rc/contrib/bmake/compat.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/compat.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/compat.c	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $	*/
+/*	$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -586,7 +586,8 @@ Compat_Make(void *gnp, void *pgnp)
 	}
 #ifdef USE_META
 	if (useMeta && !NoExecute(gn)) {
-	    meta_job_finish(NULL);
+	    if (meta_job_finish(NULL) != 0)
+		gn->made = ERROR;
 	}
 #endif
 

Modified: user/ngie/detangle-rc/contrib/bmake/job.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/job.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/job.c	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $	*/
+/*	$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1072,7 +1072,11 @@ JobFinish (Job *job, WAIT_T status)
 
 #ifdef USE_META
     if (useMeta) {
-	meta_job_finish(job);
+	int x;
+
+	if ((x = meta_job_finish(job)) != 0 && status == 0) {
+	    status = x;
+	}
     }
 #endif
     

Modified: user/ngie/detangle-rc/contrib/bmake/main.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/main.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/main.c	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1152,14 +1152,6 @@ main(int argc, char **argv)
 	}
 
 	/*
-	 * Be compatible if user did not specify -j and did not explicitly
-	 * turned compatibility on
-	 */
-	if (!compatMake && !forceJobs) {
-		compatMake = TRUE;
-	}
-	
-	/*
 	 * Initialize archive, target and suffix modules in preparation for
 	 * parsing the makefile(s)
 	 */
@@ -1275,6 +1267,36 @@ main(int argc, char **argv)
 	Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
 	free(p1);
 
+	if (!forceJobs && !compatMake &&
+	    Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
+	    char *value;
+	    int n;
+
+	    value = Var_Subst(NULL, "${.MAKE.JOBS}", VAR_GLOBAL, VARF_WANTRES);
+	    n = strtol(value, NULL, 0);
+	    if (n < 1) {
+		(void)fprintf(stderr, "%s: illegal value for .MAKE.JOBS -- must be positive integer!\n",
+		    progname);
+		exit(1);
+	    }
+	    if (n != maxJobs) {
+		Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL);
+		Var_Append(MAKEFLAGS, value, VAR_GLOBAL);
+	    }
+	    maxJobs = n;
+	    maxJobTokens = maxJobs;
+	    forceJobs = TRUE;
+	    free(value);
+	}
+
+	/*
+	 * Be compatible if user did not specify -j and did not explicitly
+	 * turned compatibility on
+	 */
+	if (!compatMake && !forceJobs) {
+	    compatMake = TRUE;
+	}
+
 	if (!compatMake)
 	    Job_ServerStart(maxJobTokens, jp_0, jp_1);
 	if (DEBUG(JOB))

Modified: user/ngie/detangle-rc/contrib/bmake/make.1
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/make.1	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/make.1	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $
+.\"	$NetBSD: make.1,v 1.257 2016/05/10 23:45:45 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd February 19, 2016
+.Dd May 10, 2016
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -924,6 +924,9 @@ Provides a list of path prefixes that sh
 because the contents are expected to change over time.
 The default list includes:
 .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp
+.It Va .MAKE.META.IGNORE_PATTERNS
+Provides a list of patterns to match against pathnames.
+Ignore any that match.
 .It Va .MAKE.META.PREFIX
 Defines the message printed for each meta file updated in "meta verbose" mode.
 The default value is:

Modified: user/ngie/detangle-rc/contrib/bmake/meta.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/meta.c	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/meta.c	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.57 2016/05/12 20:28:34 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -66,6 +66,9 @@ static char *metaIgnorePathsStr;	/* stri
 #ifndef MAKE_META_IGNORE_PATHS
 #define MAKE_META_IGNORE_PATHS ".MAKE.META.IGNORE_PATHS"
 #endif
+#ifndef MAKE_META_IGNORE_PATTERNS
+#define MAKE_META_IGNORE_PATTERNS ".MAKE.META.IGNORE_PATTERNS"
+#endif
 
 Boolean useMeta = FALSE;
 static Boolean useFilemon = FALSE;
@@ -73,6 +76,7 @@ static Boolean writeMeta = FALSE;
 static Boolean metaEnv = FALSE;		/* don't save env unless asked */
 static Boolean metaVerbose = FALSE;
 static Boolean metaIgnoreCMDs = FALSE;	/* ignore CMDs in .meta files */
+static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */
 static Boolean metaCurdirOk = FALSE;	/* write .meta in .CURDIR Ok? */
 static Boolean metaSilent = FALSE;	/* if we have a .meta be SILENT */
 
@@ -157,28 +161,33 @@ filemon_open(BuildMon *pbm)
  * Read the build monitor output file and write records to the target's
  * metadata file.
  */
-static void
+static int
 filemon_read(FILE *mfp, int fd)
 {
     char buf[BUFSIZ];
     int n;
+    int error;
 
     /* Check if we're not writing to a meta data file.*/
     if (mfp == NULL) {
 	if (fd >= 0)
 	    close(fd);			/* not interested */
-	return;
+	return 0;
     }
     /* rewind */
     (void)lseek(fd, (off_t)0, SEEK_SET);
 
+    error = 0;
     fprintf(mfp, "\n-- filemon acquired metadata --\n");
 
     while ((n = read(fd, buf, sizeof(buf))) > 0) {
-	fwrite(buf, 1, n, mfp);
+	if ((int)fwrite(buf, 1, n, mfp) < n)
+	    error = EIO;
     }
     fflush(mfp);
-    close(fd);
+    if (close(fd) < 0)
+	error = errno;
+    return error;
 }
 #endif
 
@@ -620,6 +629,15 @@ meta_mode_init(const char *make_mode)
     if (metaIgnorePathsStr) {
 	str2Lst_Append(metaIgnorePaths, metaIgnorePathsStr, NULL);
     }
+
+    /*
+     * We ignore any paths that match ${.MAKE.META.IGNORE_PATTERNS}
+     */
+    cp = NULL;
+    if (Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL, &cp)) {
+	metaIgnorePatterns = TRUE;
+	free(cp);
+    }
 }
 
 /*
@@ -744,27 +762,35 @@ meta_job_output(Job *job, char *cp, cons
     }
 }
 
-void
+int
 meta_cmd_finish(void *pbmp)
 {
+    int error = 0;
 #ifdef USE_FILEMON
     BuildMon *pbm = pbmp;
+    int x;
 
     if (!pbm)
 	pbm = &Mybm;
 
     if (pbm->filemon_fd >= 0) {
-	close(pbm->filemon_fd);
-	filemon_read(pbm->mfp, pbm->mon_fd);
+	if (close(pbm->filemon_fd) < 0)
+	    error = errno;
+	x = filemon_read(pbm->mfp, pbm->mon_fd);
+	if (error == 0 && x != 0)
+	    error = x;
 	pbm->filemon_fd = pbm->mon_fd = -1;
     }
 #endif
+    return error;
 }
 
-void
+int
 meta_job_finish(Job *job)
 {
     BuildMon *pbm;
+    int error = 0;
+    int x;
 
     if (job != NULL) {
 	pbm = &job->bm;
@@ -772,11 +798,14 @@ meta_job_finish(Job *job)
 	pbm = &Mybm;
     }
     if (pbm->mfp != NULL) {
-	meta_cmd_finish(pbm);
-	fclose(pbm->mfp);
+	error = meta_cmd_finish(pbm);
+	x = fclose(pbm->mfp);
+	if (error == 0 && x != 0)
+	    error = errno;
 	pbm->mfp = NULL;
 	pbm->meta_fname[0] = '\0';
     }
+    return error;
 }
 
 void
@@ -1209,14 +1238,35 @@ meta_oodate(GNode *gn, Boolean oodate)
 		     * be part of the dependencies because
 		     * they are _expected_ to change.
 		     */
-		    if (*p == '/' &&
-			Lst_ForEach(metaIgnorePaths, prefix_match, p)) {
+		    if (*p == '/') {
+			realpath(p, fname1); /* clean it up */
+			if (Lst_ForEach(metaIgnorePaths, prefix_match, fname1)) {
 #ifdef DEBUG_META_MODE
-			if (DEBUG(META))
-			    fprintf(debug_file, "meta_oodate: ignoring: %s\n",
-				    p);
+			    if (DEBUG(META))
+				fprintf(debug_file, "meta_oodate: ignoring path: %s\n",
+					p);
 #endif
-			break;
+			    break;
+			}
+		    }
+
+		    if (metaIgnorePatterns) {
+			char *pm;
+
+			snprintf(fname1, sizeof(fname1),
+				 "${%s:@m@${%s:L:M$m}@}",
+				 MAKE_META_IGNORE_PATTERNS, p);
+			pm = Var_Subst(NULL, fname1, gn, VARF_WANTRES);
+			if (*pm) {
+#ifdef DEBUG_META_MODE
+			    if (DEBUG(META))
+				fprintf(debug_file, "meta_oodate: ignoring pattern: %s\n",
+					p);
+#endif
+			    free(pm);
+			    break;
+			}
+			free(pm);
 		    }
 
 		    /*

Modified: user/ngie/detangle-rc/contrib/bmake/meta.h
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/meta.h	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/meta.h	Sat May 21 21:53:01 2016	(r300380)
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.h,v 1.4 2016/03/07 21:45:43 christos Exp $ */
+/*      $NetBSD: meta.h,v 1.5 2016/05/12 20:28:34 sjg Exp $ */
 
 /*
  * Things needed for 'meta' mode.
@@ -48,8 +48,8 @@ void meta_job_start(struct Job *, GNode 
 void meta_job_child(struct Job *);
 void meta_job_error(struct Job *, GNode *, int, int);
 void meta_job_output(struct Job *, char *, const char *);
-void meta_cmd_finish(void *);
-void meta_job_finish(struct Job *);
+int  meta_cmd_finish(void *);
+int  meta_job_finish(struct Job *);
 Boolean meta_oodate(GNode *, Boolean);
 void meta_compat_start(void);
 void meta_compat_child(void);

Modified: user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog	Sat May 21 20:50:25 2016	(r300379)
+++ user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog	Sat May 21 21:53:01 2016	(r300380)
@@ -1,3 +1,57 @@
+2016-05-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20160512
+
+	* dpadd.mk: always include local.dpadd.mk if it exists
+	  remove some things that better belong in local.dpadd.mk
+	  skip INCLUDES_* for staged libs unless SRC_* defined.
+
+	* own.mk: add INCLUDEDIR
+	
+2016-04-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* dirdeps.mk: when doing -f dirdeps.mk if target suppies no
+	  TARGET_MACHINE - :E will be empty or match part of path, use
+	  ${MACHINE}
+
+2016-04-07  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* meta.autodep.mk: issue a warning if UPDATE_DEPENDFILE=NO due to
+	  NO_FILEMON_COOKIE  
+

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

More information about the svn-src-user mailing list