Index: head/ObsoleteFiles.inc
===================================================================
--- head/ObsoleteFiles.inc	(revision 362262)
+++ head/ObsoleteFiles.inc	(revision 362263)
@@ -1,11274 +1,11277 @@
 #
 # $FreeBSD$
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
 # removed entries first (with the date as a comment). Dynamic libraries are
 # special cased (OLD_LIBS). Static libraries or the generic links to
 # the dynamic libraries (lib*.so) should (if you don't know why to make an
 # exception, make this a "must") be viewed as normal files (OLD_FILES).
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # Before you commit changes to this file please check if any entries in
 # tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
 # command tells which files are listed more than once regardless of some
 # architecture specific conditionals, so you can not blindly trust the
 # output:
 # ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
 # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
 # sort | uniq -d
 #
 # To find regular duplicates not dependent on optional components, you can
 # also use something that will not give you false positives, e.g.:
 # for t in `make -V TARGETS universe`; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
 #   -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 #
 # For optional components, you can use the following to see if some entries
 # in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
 # for o in tools/build/options/WITH*; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
 #   -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200617: update opencsd to 0.14.2
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
+
 # 20200606: retire binutils build infrastructure
 .if !defined(WITH_PORT_BASE_BINUTILS)
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
 .endif
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 
 # 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
 OLD_LIBS+=usr/lib32/capi.so
 OLD_LIBS+=usr/lib32/padlock.so
 
 # 20200528: libevent renamed libevent1
 OLD_FILES+=usr/include/private/event/event.h
 OLD_DIRS+=usr/include/private/event
 
 # 20200523: new clang import which bumps version from 10.0.0 to 10.0.1.s
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.0/include/profile
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/xray
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.0/lib
 OLD_DIRS+=usr/lib/clang/10.0.0
 
 # 20200515: libalias cuseeme protocol support retired
 OLD_LIBS+=lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_cuseeme.a
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 
 # 20200511: Remove ubsec(4)
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 
 # 20200506: GNU objdump 2.17.50 retired
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 
 # 20200428: route_var.h moved to net/route
 OLD_FILES+=usr/include/net/route_var.h
 
 # 20200418: Make libauditd private
 OLD_FILES+=usr/lib/libauditd.a
 OLD_FILES+=usr/lib/libauditd.so
 OLD_LIBS+=usr/lib/libauditd.so.5
 OLD_FILES+=usr/lib/libauditd_p.a
 
 # 20200418: Remove bogus man links
 OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz
 OLD_FILES+=usr/share/man/man3/getauclassnam_3.3.gz
 
 # 20200414: NFS file handle affinity code for the NFS server re-organized
 OLD_FILES+=usr/include/nfs/nfs_fha.h
 
 # 20200401: Remove procfs-based process debugging
 OLD_FILES+=usr/include/sys/pioctl.h
 
 # 20200330: GDB_LIBEXEC option retired (always true)
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 
 # 20200327: OCF refactoring
 OLD_FILES+=usr/share/man/man9/crypto_find_driver.9
 OLD_FILES+=usr/share/man/man9/crypto_register.9
 OLD_FILES+=usr/share/man/man9/crypto_unregister.9
 
 # 20200323: INTERNALLIB don't install headers anymore
 OLD_FILES+=usr/include/libelftc.h
 OLD_FILES+=usr/include/libifconfig.h
 OLD_FILES+=usr/include/libpmcstat.h
 
 # 20200320: cx and ctau drivers retired
 OLD_FILES+=usr/share/man/man4/ctau.4.gz
 OLD_FILES+=usr/share/man/man4/cx.4.gz
 
 # 20200318: host.conf was deprecated a long time ago.
 OLD_FILES+=etc/host.conf
 OLD_FILES+=etc/rc.d/nsswitch
 
 # 20200310: new clang import which bumps version from 9.0.1 to 10.0.0.
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
 
 # 20200309: amd(8) retired
 OLD_FILES+=etc/amd.map
 OLD_FILES+=etc/newsyslog.conf.d/amd.conf
 OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 
 # 20200301: bktr removed
 OLD_DIRS+=usr/include/dev/bktr
 OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_bt848.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/ioctl_bktr.h
 OLD_FILES+=usr/include/machine/ioctl_meteor.h
 .endif
 OLD_FILES+=usr/share/man/man4/bktr.4.gz
 
 # 20200229: GCC 4.2.1 removed
 .if !defined(WITH_PORT_BASE_GCC)
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 .endif
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libstdc++.a
 OLD_FILES+=usr/lib32/libstdc++.so
 OLD_LIBS+=usr/lib32/libstdc++.so.6
 OLD_FILES+=usr/lib32/libstdc++_p.a
 OLD_FILES+=usr/lib32/libsupc++.a
 OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/lib32/libgcov.a
 OLD_FILES+=usr/lib32/libgomp.a
 OLD_LIBS+=usr/lib32/libgomp.so.1
 OLD_FILES+=usr/lib32/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.7.gz
 
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
 OLD_LIBS+=usr/lib32/libncurses.so.8
 OLD_LIBS+=usr/lib32/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
 OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
 
 # 20200204: simple_httpd removed
 OLD_FILES+=usr/sbin/simple_httpd
 
 # 20200127: vpo removed
 OLD_FILES+=usr/share/man/man4/imm.4.gz
 OLD_FILES+=usr/share/man/man4/vpo.4.gz
 
 # 20200104: gcc libssp removed
 OLD_FILES+=usr/include/ssp/ssp.h
 OLD_FILES+=usr/include/ssp/stdio.h
 OLD_FILES+=usr/include/ssp/string.h
 OLD_FILES+=usr/include/ssp/unistd.h
 OLD_DIRS+=usr/include/ssp
 
 # 20191229: GEOM_SCHED class and gsched tool removed
 OLD_FILES+=sbin/gsched
 OLD_LIBS+=lib/geom/geom_sched.so
 
 # 20191222: new clang import which bumps version from 9.0.0 to 9.0.1.
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.0/lib
 OLD_DIRS+=usr/lib/clang/9.0.0
 # 20191214: Removal of sranddev(3)
 OLD_FILES+=usr/share/man/man3/sranddev.3.gz
 # 20191213: remove timeout(9)
 OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz
 OLD_FILES+=usr/share/man/man9/timeout.9.gz
 OLD_FILES+=usr/share/man/man9/untimeout.9.gz
 # 20191128: Removal of trm(4)
 OLD_FILES+=usr/share/man/man4/trm.4.gz
 # 20191121: Removal of sio(4)
 OLD_FILES+=usr/share/man/man4/sio.4.gz
 # 20191105: picobsd(8), et al, removed.
 OLD_FILES+=usr/share/man/man8/picobsd.8.gz
 # 20191009: new clang import which bumps version from 8.0.1 to 9.0.0.
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.1/lib
 OLD_DIRS+=usr/lib/clang/8.0.1
 # 20191009: libc++ 9.0.0 removed some experimental files
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/lib/libc++fs.a
 OLD_FILES+=usr/lib32/libc++fs.a
 # 20191003: Remove useless ZFS tests
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_013_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_014_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_016_pos.ksh
 # 20190910: mklocale(1) and colldef(1) removed
 OLD_FILES+=usr/bin/mklocale
 OLD_FILES+=usr/share/man/man1/mklocale.1.gz
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 # 20190904: Remove boot1.efifat
 OLD_FILES+=boot/boot1.efifat
 # 20190903: pc-sysinstall(8) removed
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 # 20190825: zlib 1.0.4 removed from kernel
 OLD_FILES+=usr/include/sys/zlib.h
 OLD_FILES+=usr/include/sys/zutil.h
 # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common
 OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
 OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py
 # 20190816: dir.h removed from POSIX
 OLD_FILES+=usr/include/sys/dir.h
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed
 OLD_FILES+=lib/casper/libcap_random.so.1
 OLD_FILES+=usr/include/casper/cap_random.h
 OLD_FILES+=usr/share/man/man3/cap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
 # 20190708: vm_page_hold() and _unhold() removed
 OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
 # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
 OLD_FILES+=usr/include/sys/capability.h
 # 20190615: sys/pwm.h renamed to dev/pwmc.h
 OLD_FILES+=usr/include/sys/pwm.h
 # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1.
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.0/lib
 OLD_DIRS+=usr/lib/clang/8.0.0
 # 20190523: Remove obsolete kgzip and support files
 OLD_FILES+=usr/sbin/kgzip
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man8/kgzip.8.gz
 # 20190517: Remove obsolete 10 and 10/100 ethernet drivers.
 OLD_FILES+=usr/share/man/man4/bm.4.gz
 OLD_FILES+=usr/share/man/man4/cs.4.gz
 OLD_FILES+=usr/share/man/man4/de.4.gz
 OLD_FILES+=usr/share/man/man4/if_de.4.gz
 OLD_FILES+=usr/share/man/man4/ed.4.gz
 OLD_FILES+=usr/share/man/man4/if_ed.4.gz
 OLD_FILES+=usr/share/man/man4/ep.4.gz
 OLD_FILES+=usr/share/man/man4/ex.4.gz
 OLD_FILES+=usr/share/man/man4/fe.4.gz
 OLD_FILES+=usr/share/man/man4/pcn.4.gz
 OLD_FILES+=usr/share/man/man4/if_pcn.4.gz
 OLD_FILES+=usr/share/man/man4/sf.4.gz
 OLD_FILES+=usr/share/man/man4/if_sf.4.gz
 OLD_FILES+=usr/share/man/man4/sn.4.gz
 OLD_FILES+=usr/share/man/man4/if_sn.4.gz
 OLD_FILES+=usr/share/man/man4/tl.4.gz
 OLD_FILES+=usr/share/man/man4/if_tl.4.gz
 OLD_FILES+=usr/share/man/man4/tx.4.gz
 OLD_FILES+=usr/share/man/man4/if_tx.4.gz
 OLD_FILES+=usr/share/man/man4/txp.4.gz
 OLD_FILES+=usr/share/man/man4/if_txp.4.gz
 OLD_FILES+=usr/share/man/man4/vx.4.gz
 OLD_FILES+=usr/share/man/man4/wb.4.gz
 OLD_FILES+=usr/share/man/man4/xe.4.gz
 OLD_FILES+=usr/share/man/man4/if_xe.4.gz
 # 20190513: libcap_sysctl interface change
 OLD_FILES+=lib/casper/libcap_sysctl.so.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc
 # 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0.
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 # 20190304: new clang import which bumps version from 7.0.1 to 8.0.0.
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/7.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/7.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/7.0.1/lib
 OLD_DIRS+=usr/lib/clang/7.0.1
 # 20190227: rename seq.h to seqc.h
 OLD_FILES+=usr/include/sys/seq.h
 # 20190222: libifconfig made INTERNALLIB
 OLD_FILES+=usr/lib/libprivateifconfig.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
 OLD_FILES+=usr/lib32/libprivateifconfig.a
 OLD_FILES+=usr/lib32/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_runlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wunlock.9.gz
 # 20190126: adv(4) / adw(4) removal
 OLD_FILES+=usr/share/man/man4/adv.4.gz
 OLD_FILES+=usr/share/man/man4/adw.4.gz
 # 20190123: nonexistant cred_update_thread(9) removed
 OLD_FILES+=usr/share/man/man9/cred_update_thread.9.gz
 # 20190114: old pbuf allocator removed
 OLD_FILES+=usr/share/man/man9/getpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/pbuf.9.gz
 OLD_FILES+=usr/share/man/man9/relpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/trypbuf.9.gz
 # 20181219: ibcs removal
 OLD_FILES+=usr/share/examples/ibcs2/hello.uu
 OLD_FILES+=usr/share/examples/ibcs2/README
 OLD_DIRS+=usr/share/examples/ibcs2
 # 20181215: Migration of CTM to ports
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 # 20181214: Remove timed files
 OLD_FILES+=etc/rc.d/timed
 OLD_FILES+=usr/sbin/timed
 OLD_FILES+=usr/sbin/timedc
 OLD_FILES+=usr/share/man/man8/timed.8.gz
 OLD_FILES+=usr/share/man/man8/timedc.8.gz
 # 20181211: new clang import which bumps version from 6.0.1 to 7.0.1.
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
 # 20181116: Rename test file.
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
 # 20181113: libufs version bumped to 7.
 OLD_LIBS+=lib/libufs.so.6
 OLD_LIBS+=usr/lib32/libufs.so.6
 # 20181112: Cleanup old libcap_dns.
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 OLD_LIBS+=usr/lib32/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports
 OLD_LIBS+=lib/libcrypto.so.9
 OLD_LIBS+=usr/lib/libssl.so.9
 OLD_LIBS+=usr/lib32/libcrypto.so.9
 OLD_LIBS+=usr/lib32/libssl.so.9
 # 20181021: mse(4) removal
 OLD_FILES+=usr/share/man/man4/mse.4.gz
 # 20181015: Stale libcasper(3) files following r329452
 OLD_LIBS+=lib/casper/libcap_sysctl.so.0
 OLD_LIBS+=lib/casper/libcap_grp.so.0
 OLD_LIBS+=lib/casper/libcap_pwd.so.0
 OLD_LIBS+=lib/casper/libcap_random.so.0
 OLD_LIBS+=lib/casper/libcap_dns.so.0
 OLD_LIBS+=lib/casper/libcap_syslog.so.0
 OLD_LIBS+=usr/lib32/libcap_sysctl.so.0
 OLD_LIBS+=usr/lib32/libcap_grp.so.0
 OLD_LIBS+=usr/lib32/libcap_pwd.so.0
 OLD_LIBS+=usr/lib32/libcap_random.so.0
 OLD_LIBS+=usr/lib32/libcap_dns.so.0
 OLD_LIBS+=usr/lib32/libcap_syslog.so.0
 # 20181012: rename of ixlv(4) to iavf(4)
 OLD_FILES+=usr/share/man/man4/ixlv.4.gz
 # 20181009: OpenSSL 1.1.1
 OLD_FILES+=usr/include/openssl/des_old.h
 OLD_FILES+=usr/include/openssl/dso.h
 OLD_FILES+=usr/include/openssl/krb5_asn.h
 OLD_FILES+=usr/include/openssl/kssl.h
 OLD_FILES+=usr/include/openssl/pqueue.h
 OLD_FILES+=usr/include/openssl/ssl23.h
 OLD_FILES+=usr/include/openssl/ui_compat.h
 OLD_FILES+=usr/lib/debug/usr/lib/engines/lib4758cca.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libaep.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libatalla.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libcapi.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libchil.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libcswift.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libgost.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libnuron.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libsureware.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libubsec.so.debug
 OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz
 OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_custom_cli_ext.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_default_read_ahead.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_ecdh_auto.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_add_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_flush_sessions.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_accept_state.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_msg_callback_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_remove_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_ecdh_auto.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_add_ssl_algorithms.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_version.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_client_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_server_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_set_chain.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_trusted_stack.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/blowfish.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_check_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_cmp_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_div_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_dump.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_fix_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_internal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_part_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_print.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_low.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_max.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sub_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_wexpand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/buffer.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/crypto.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPrivate_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_PKCS8PrivateKey.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Private_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/err.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz
 OLD_LIBS+=lib/libcrypto.so.8
 OLD_LIBS+=usr/lib/engines/lib4758cca.so
 OLD_LIBS+=usr/lib/engines/libaep.so
 OLD_LIBS+=usr/lib/engines/libatalla.so
 OLD_LIBS+=usr/lib/engines/libcapi.so
 OLD_LIBS+=usr/lib/engines/libchil.so
 OLD_LIBS+=usr/lib/engines/libcswift.so
 OLD_LIBS+=usr/lib/engines/libgost.so
 OLD_LIBS+=usr/lib/engines/libnuron.so
 OLD_LIBS+=usr/lib/engines/libsureware.so
 OLD_LIBS+=usr/lib/engines/libubsec.so
 OLD_LIBS+=usr/lib/libssl.so.8
 OLD_LIBS+=usr/lib32/libcrypto.so.8
 OLD_LIBS+=usr/lib32/lib4758cca.so
 OLD_LIBS+=usr/lib32/libaep.so
 OLD_LIBS+=usr/lib32/libatalla.so
 OLD_LIBS+=usr/lib32/libcapi.so
 OLD_LIBS+=usr/lib32/libchil.so
 OLD_LIBS+=usr/lib32/libcswift.so
 OLD_LIBS+=usr/lib32/libgost.so
 OLD_LIBS+=usr/lib32/libnuron.so
 OLD_LIBS+=usr/lib32/libsureware.so
 OLD_LIBS+=usr/lib32/libubsec.so
 OLD_LIBS+=usr/lib32/libssl.so.8
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 OLD_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 OLD_FILES+=usr/share/man/man3/arc4random_addrandom.3.gz
 OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz
 # 20180819: send-pr(1) placeholder removal
 OLD_FILES+=usr/bin/send-pr
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/libcasper.so.0
 OLD_LIBS+=usr/lib32/libcasper.so.0
 # 20180722: indent(1) option renamed, test files follow
 OLD_FILES+=usr/bin/indent/tests/nsac.0
 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro
 OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout
 OLD_FILES+=usr/bin/indent/tests/sac.0
 OLD_FILES+=usr/bin/indent/tests/sac.0.pro
 OLD_FILES+=usr/bin/indent/tests/sac.0.stdout
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 OLD_LIBS+=usr/lib/libmlx5.so.1
 OLD_LIBS+=usr/lib/libibverbs.so.1
 # 20180710: old numa cleanup
 OLD_FILES+=usr/include/sys/numa.h
 OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz
 OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz
 OLD_FILES+=usr/share/man/man1/numactl.1.gz
 OLD_FILES+=usr/bin/numactl
 # 20180630: new clang import which bumps version from 6.0.0 to 6.0.1.
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.0/lib
 OLD_DIRS+=usr/lib/clang/6.0.0
 # 20180615: asf(8) removed
 OLD_FILES+=usr/sbin/asf
 OLD_FILES+=usr/share/man/man8/asf.8.gz
 # 20180609: obsolete libc++ files missed from the 5.0.0 import
 OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 # 20180607: remove nls support from grep
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
 # 20180528: libpcap update removed header file
 OLD_FILES+=usr/include/pcap/export-defs.h
 # 20180517: retire vxge
 OLD_FILES+=usr/share/man/man4/if_vxge.4.gz
 OLD_FILES+=usr/share/man/man4/vxge.4.gz
 # 20180512: Rename Unbound tools
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/unbound.8.gz
 # 20180508: retire nxge
 OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
 OLD_FILES+=usr/share/man/man4/nxge.4.gz
 # 20180505: rhosts
 OLD_FILES+=usr/share/skel/dot.rhosts
 # 20180502: retire ixgb
 OLD_FILES+=usr/share/man/man4/if_ixgb.4.gz
 OLD_FILES+=usr/share/man/man4/ixgb.4.gz
 # 20180501: retire lmc
 OLD_FILES+=usr/include/dev/lmc/if_lmc.h
 OLD_DIRS+=usr/include/dev/lmc
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/share/man/man4/lmc.4.gz
 OLD_FILES+=usr/share/man/man4/if_lmc.4.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 # 20180417: remove fuswintr and suswintr
 OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
 OLD_FILES+=usr/share/man/man9/suswintr.9.gz
 # 20180413: remove Arcnet support
 OLD_FILES+=usr/include/net/if_arc.h
 OLD_FILES+=usr/share/man/man4/cm.4.gz
 # 20180409: remove FDDI support
 OLD_FILES+=usr/include/net/fddi.h
 OLD_FILES+=usr/share/man/man4/fpa.4.gz
 # 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
 OLD_DIRS+=boot/overlays
 # 20180311: remove sys/sys/i386/include/pcaudioio.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pcaudioio.h
 .endif
 # 20180310: remove sys/sys/dataacq.h
 OLD_FILES+=usr/include/sys/dataacq.h
 # 20180306: remove DTrace scripts made obsolete by dwatch(1)
 OLD_FILES+=usr/share/dtrace/watch_execve
 OLD_FILES+=usr/share/dtrace/watch_kill
 OLD_FILES+=usr/share/dtrace/watch_vop_remove
 # 20180212: move devmatch
 OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf
 OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
 OLD_FILES+=usr/bin/gdbtui
 # 20180201: Obsolete forth files
 OLD_FILES+=boot/pcibios.4th
 # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0.
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.1/lib
 OLD_DIRS+=usr/lib/clang/5.0.1
 # 20180109: Remove vestiges of digi(4) driver
 OLD_FILES+=usr/include/sys/digiio.h
 OLD_FILES+=usr/sbin/digictl
 OLD_FILES+=usr/share/man/man8/digictl.8.gz
 # 20180107: Convert remaining geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
 # 20180106: Convert most geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
 # 20171230: Remove /etc/skel from mtree
 OLD_DIRS+=etc/skel
 # 20171208: Remove basename_r(3)
 OLD_FILES+=usr/share/man/man3/basename_r.3.gz
 # 20171204: Move fdformat man page from volume 1 to volume 8.
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 # 20171203: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.4
 OLD_LIBS+=usr/lib32/libproc.so.4
 # 20171203: new clang import which bumps version from 5.0.0 to 5.0.1.
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.0/lib
 OLD_DIRS+=usr/lib/clang/5.0.0
 # 20171118: Remove old etc casper files
 OLD_FILES+=etc/casper/system.dns
 OLD_FILES+=etc/casper/system.grp
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
 OLD_DIRS+=etc/casper
 # 20171116: lint(1) removal
 OLD_FILES+=usr/bin/lint
 OLD_FILES+=usr/libexec/lint1
 OLD_FILES+=usr/libexec/lint2
 OLD_FILES+=usr/libdata/lint/llib-lposix.ln
 OLD_FILES+=usr/libdata/lint/llib-lstdc.ln
 OLD_FILES+=usr/share/man/man1/lint.1.gz
 OLD_FILES+=usr/share/man/man7/lint.7.gz
 OLD_DIRS+=usr/libdata/lint
 # 20171114: Removal of all fortune datfiles other than freebsd-tips
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 # 20171112: Removal of eqnchar definition
 OLD_FILES+=usr/share/misc/eqnchar
 # 20171110: Removal of mailaddr man page
 OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
 # 20171108: badsect(8) removal
 OLD_FILES+=sbin/badsect
 OLD_FILES+=rescue/badsect
 OLD_FILES+=usr/share/man/man8/badsect.8.gz
 # 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67].
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 .endif
 # 20171104: libcap_random should be in /lib not in /usr/lib
 OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library
 OLD_FILES+=usr/lib/libcap_dns.a
 OLD_FILES+=usr/lib/libcap_dns_p.a
 OLD_FILES+=usr/lib/libcap_grp.a
 OLD_FILES+=usr/lib/libcap_grp_p.a
 OLD_FILES+=usr/lib/libcap_pwd.a
 OLD_FILES+=usr/lib/libcap_pwd_p.a
 OLD_FILES+=usr/lib/libcap_random.a
 OLD_FILES+=usr/lib/libcap_random_p.a
 OLD_FILES+=usr/lib/libcap_sysctl.a
 OLD_FILES+=usr/lib/libcap_sysctl_p.a
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper_p.a
 OLD_FILES+=usr/lib32/libcap_dns.a
 OLD_FILES+=usr/lib32/libcap_dns_p.a
 OLD_FILES+=usr/lib32/libcap_grp.a
 OLD_FILES+=usr/lib32/libcap_grp_p.a
 OLD_FILES+=usr/lib32/libcap_pwd.a
 OLD_FILES+=usr/lib32/libcap_pwd_p.a
 OLD_FILES+=usr/lib32/libcap_random.a
 OLD_FILES+=usr/lib32/libcap_random_p.a
 OLD_FILES+=usr/lib32/libcap_sysctl.a
 OLD_FILES+=usr/lib32/libcap_sysctl_p.a
 OLD_FILES+=usr/lib32/libcasper.a
 OLD_FILES+=usr/lib32/libcasper_p.a
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 OLD_DIRS+=usr/tests/lib/libpathconv
 # 20171017: Removal of mbpool(9)
 OLD_FILES+=usr/include/sys/mbpool.h
 OLD_FILES+=usr/share/man/man9/mbpool.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_ext_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_count.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_card_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get_keep.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_create.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_sync.9.gz
 # 20171010: Remove libstand
 OLD_FILES+=usr/lib/libstand.a
 OLD_FILES+=usr/lib/libstand_p.a
 OLD_FILES+=usr/lib32/libstand.a
 OLD_FILES+=usr/lib32/libstand_p.a
 OLD_FILES+=usr/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
 OLD_FILES+=bin/rcp
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl
 OLD_FILES+=usr/share/man/man8/procctl.8.gz
 OLD_FILES+=usr/sbin/procctl
 # 20170926: remove unneeded man aliases and locales directory
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/man/en.ISO8859-1/man2
 OLD_FILES+=usr/share/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/man/en.ISO8859-1/man4
 OLD_FILES+=usr/share/man/en.ISO8859-1/man5
 OLD_FILES+=usr/share/man/en.ISO8859-1/man6
 OLD_FILES+=usr/share/man/en.ISO8859-1/man7
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8
 OLD_FILES+=usr/share/man/en.ISO8859-1/man9
 OLD_DIRS+=usr/share/man/en.ISO8859-1
 OLD_FILES+=usr/share/man/en.ISO8859-1/mandoc.db
 OLD_FILES+=usr/share/man/en.UTF-8/man1
 OLD_FILES+=usr/share/man/en.UTF-8/man2
 OLD_FILES+=usr/share/man/en.UTF-8/man3
 OLD_FILES+=usr/share/man/en.UTF-8/man4
 OLD_FILES+=usr/share/man/en.UTF-8/man5
 OLD_FILES+=usr/share/man/en.UTF-8/man6
 OLD_FILES+=usr/share/man/en.UTF-8/man7
 OLD_FILES+=usr/share/man/en.UTF-8/man8
 OLD_FILES+=usr/share/man/en.UTF-8/man9
 OLD_FILES+=usr/share/man/en.UTF-8/mandoc.db
 OLD_DIRS+=usr/share/man/en.UTF-8
 OLD_FILES+=usr/share/man/en.ISO8859-15
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/mandoc.db
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-15
 OLD_DIRS+=usr/share/man/ja/man1
 OLD_DIRS+=usr/share/man/ja/man2
 OLD_DIRS+=usr/share/man/ja/man3
 OLD_DIRS+=usr/share/man/ja/man4
 OLD_DIRS+=usr/share/man/ja/man5
 OLD_DIRS+=usr/share/man/ja/man6
 OLD_DIRS+=usr/share/man/ja/man7
 OLD_DIRS+=usr/share/man/ja/man8
 OLD_DIRS+=usr/share/man/ja/man9
 OLD_DIRS+=usr/share/man/ja
 # 20170913: remove unneeded catman utility
 OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_DIRS+=usr/share/man/cat1
 OLD_DIRS+=usr/share/man/cat2
 OLD_DIRS+=usr/share/man/cat3
 OLD_DIRS+=usr/share/man/cat4/amd64
 OLD_DIRS+=usr/share/man/cat4/arm
 OLD_DIRS+=usr/share/man/cat4/i386
 OLD_DIRS+=usr/share/man/cat4/powerpc
 OLD_DIRS+=usr/share/man/cat4/sparc64
 OLD_DIRS+=usr/share/man/cat4
 OLD_DIRS+=usr/share/man/cat5
 OLD_DIRS+=usr/share/man/cat6
 OLD_DIRS+=usr/share/man/cat7
 OLD_DIRS+=usr/share/man/cat8/amd64
 OLD_DIRS+=usr/share/man/cat8/arm
 OLD_DIRS+=usr/share/man/cat8/i386
 OLD_DIRS+=usr/share/man/cat8/powerpc
 OLD_DIRS+=usr/share/man/cat8/sparc64
 OLD_DIRS+=usr/share/man/cat8
 OLD_DIRS+=usr/share/man/cat9
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat2
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat3
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat5
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat6
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat7
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat9
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1
 OLD_DIRS+=usr/share/man/en.UTF-8/cat2
 OLD_DIRS+=usr/share/man/en.UTF-8/cat3
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4
 OLD_DIRS+=usr/share/man/en.UTF-8/cat5
 OLD_DIRS+=usr/share/man/en.UTF-8/cat6
 OLD_DIRS+=usr/share/man/en.UTF-8/cat7
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8
 OLD_DIRS+=usr/share/man/en.UTF-8/cat9
 OLD_DIRS+=usr/share/man/ja/cat1
 OLD_DIRS+=usr/share/man/ja/cat2
 OLD_DIRS+=usr/share/man/ja/cat3
 OLD_DIRS+=usr/share/man/ja/cat4/amd64
 OLD_DIRS+=usr/share/man/ja/cat4/arm
 OLD_DIRS+=usr/share/man/ja/cat4/i386
 OLD_DIRS+=usr/share/man/ja/cat4/powerpc
 OLD_DIRS+=usr/share/man/ja/cat4/sparc64
 OLD_DIRS+=usr/share/man/ja/cat4
 OLD_DIRS+=usr/share/man/ja/cat5
 OLD_DIRS+=usr/share/man/ja/cat6
 OLD_DIRS+=usr/share/man/ja/cat7
 OLD_DIRS+=usr/share/man/ja/cat8/amd64
 OLD_DIRS+=usr/share/man/ja/cat8/arm
 OLD_DIRS+=usr/share/man/ja/cat8/powerpc
 OLD_DIRS+=usr/share/man/ja/cat8/sparc64
 OLD_DIRS+=usr/share/man/ja/cat8
 OLD_DIRS+=usr/share/man/ja/cat9
 OLD_DIRS+=usr/share/openssl/man/cat1
 OLD_DIRS+=usr/share/openssl/man/cat3
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
 # 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc
 OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0.
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/4.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
 OLD_FILES+=usr/bin/llvm-pdbdump
 # 20170717: Remove documentation of vaporware
 OLD_FILES+=usr/share/man/man2/pdwait4.2.gz
 # 20170610: chown-f_test replaced by chown_test
 OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test
 # 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
 OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
 # 20170531: removal of groff
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 # 20170607: remove incorrect atf_check(1) manpage link
 OLD_FILES+=usr/share/man/man1/atf_check.1.gz
 # 20170601: remove stale manpage
 OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz
 # 20170601: old libifconfig and libifc
 OLD_FILES+=usr/lib/libifc.a
 OLD_FILES+=usr/lib/libifc_p.a
 OLD_FILES+=usr/lib/libifconfig.a
 OLD_FILES+=usr/lib/libifconfig_p.a
 OLD_FILES+=usr/lib32/libifc.a
 OLD_FILES+=usr/lib32/libifc_p.a
 OLD_FILES+=usr/lib32/libifconfig.a
 OLD_FILES+=usr/lib32/libifconfig_p.a
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
 OLD_FILES+=usr/share/misc/man.template
 # 20170525: disconnect the roff docs from the build
 OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz
 OLD_FILES+=usr/share/doc/papers/bio.ascii.gz
 OLD_FILES+=usr/share/doc/papers/contents.ascii.gz
 OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/jail.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz
 OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
 OLD_DIRS+=usr/share/doc/papers
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/01.cacm
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/02.implement
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/03.iosys
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/04.uprog
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/05.sysman
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/06.Clang
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/12.make
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/15.yacc
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/16.lex
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/17.m4
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/18.gprof
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/20.ipctut
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/21.ipc
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/22.rpcgen
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/23.rpc
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/24.xdr
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/25.xdrrfc
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/26.rpcrfc
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/27.nfsrfc
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/01.setup
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/02.config
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/03.fsck
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/04.quotas
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/05.fastfs
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/06.nfs
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/11.timedop
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/12.timed
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/18.net
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/smm
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/04.csh
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/05.dc
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/06.bc
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/07.mail
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/10.exref
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/11.edit
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/12.vi
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/13.viref
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/18.msdiffs
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/19.memacros
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/20.meref
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/21.troff
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/22.trofftut
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/usd
 # 20170523: 64-bit inode support, library version bumps
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_LIBS+=usr/lib32/libarchive.so.6
 OLD_LIBS+=usr/lib32/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 # 20170424: NATM support removed
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/dev/utopia/idtphy.h
 OLD_FILES+=usr/include/dev/utopia/suni.h
 OLD_FILES+=usr/include/dev/utopia/utopia.h
 OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
 OLD_DIRS+=usr/include/dev/utopia
 OLD_FILES+=usr/include/net/if_atm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
 OLD_FILES+=usr/include/netinet/if_atm.h
 OLD_FILES+=usr/include/netnatm/natm.h
 OLD_FILES+=usr/lib/debug/sbin/atmconfig.debug
 OLD_FILES+=usr/lib/debug/usr/lib/snmp_atm.so.6.debug
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_FILES+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man4/en.4.gz
 OLD_FILES+=usr/share/man/man4/fatm.4.gz
 OLD_FILES+=usr/share/man/man4/hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_en.4.gz
 OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_patm.4.gz
 OLD_FILES+=usr/share/man/man4/natm.4.gz
 OLD_FILES+=usr/share/man/man4/natmip.4.gz
 OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
 OLD_FILES+=usr/share/man/man4/patm.4.gz
 OLD_FILES+=usr/share/man/man4/utopia.4.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/man/man9/utopia.9.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff
 OLD_FILES+=usr/tests/usr.bin/ident/ident
 OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg
 OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff
 OLD_FILES+=usr/tests/usr.bin/soelim/soelim
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_config
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext
 # 20170319: io_test requires zh_TW.Big5 locale.
 OLD_FILES+=usr/tests/lib/libc/locale/io_test
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile
 OLD_FILES+=usr/tests/sys/geom/eli/Kyuafile
 OLD_DIRS+=usr/tests/sys/geom/eli/pbkdf2
 OLD_DIRS+=usr/tests/sys/geom/eli
 # 20170313: sbin/ipftest and ipresend temporarily disconnected.
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipresend
 # 20170311: Remove WITHOUT_MANDOCDB option
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 # 20170308: rename some tests
 OLD_FILES+=usr/tests/bin/pwait/pwait
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout
 # 20170307: remove pcap-int.h
 OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0.
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate
 # 20170302: new clang import which bumps version from 3.9.1 to 4.0.0.
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
 # 20170226: SVR4 compatibility removed
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/streams.4
 OLD_FILES+=usr/share/man/man4/svr4.4
 .endif
 # 20170219: OpenPAM RADULA upgrade removed the libpam tests
 OLD_FILES+=usr/tests/lib/libpam/Kyuafile
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_ctype
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readlinev
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readword
 OLD_DIRS+=usr/test/lib/libpam
 # 20170206: remove bdes(1)
 OLD_FILES+=usr/bin/bdes
 OLD_FILES+=usr/lib/debug/usr/bin/bdes.debug
 OLD_FILES+=usr/share/man/man1/bdes.1.gz
 # 20170206: merged projects/ipsec
 OLD_FILES+=usr/include/netinet/ip_ipsec.h
 OLD_FILES+=usr/include/netinet6/ip6_ipsec.h
 # 20170128: remove pc98 support
 OLD_FILES+=usr/include/dev/ic/i8251.h
 OLD_FILES+=usr/include/dev/ic/i8255.h
 OLD_FILES+=usr/include/dev/ic/rsa.h
 OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
 OLD_FILES+=usr/include/sys/disk/pc98.h
 OLD_FILES+=usr/include/sys/diskpc98.h
 OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
 OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
 # 20170110: Four files from ggate tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/3_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh
 # 20170103: libbsnmptools.so made into an INTERNALLIB
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_LIBS+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
 OLD_FILES+=usr/tests/lib/libarchive/test_acl_pax.tar.uu
 # 20161229: Three files from gnop tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh
 # 20161217: new clang import which bumps version from 3.9.0 to 3.9.1.
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.0/lib
 OLD_DIRS+=usr/lib/clang/3.9.0
 # 20161205: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.3
 OLD_LIBS+=usr/lib32/libproc.so.3
 # 20161127: Remove vm_page_cache(9)
 OLD_FILES+=usr/share/man/man9/vm_page_cache.9.gz
 # 20161124: new clang import which bumps version from 3.8.0 to 3.9.0.
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.8.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.8.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.8.0/lib
 OLD_DIRS+=usr/lib/clang/3.8.0
 # 20161121: Hyper-V manuals only apply to amd64 and i386.
 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
 OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
 .endif
 # 20161118: Remove hv_ata_pci_disengage(4)
 OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
 # 20161015: Remove GNU rcs
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/merge
 OLD_FILES+=usr/bin/rcs
 OLD_FILES+=usr/bin/rcsclean
 OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/merge.1.gz
 OLD_FILES+=usr/share/man/man1/rcs.1.gz
 OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
 OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
 OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
 OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
 OLD_FILES+=usr/tests/sys/kqueue/kqtest
 OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
 # 20160903: idle page zeroing support removed
 OLD_FILES+=usr/share/man/man9/pmap_zero_idle.9.gz
 # 20160901: Remove digi(4)
 OLD_FILES+=usr/share/man/man4/digi.4.gz
 # 20160819: Remove ie(4)
 OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
 # 20160819: Remove spic(4)
 OLD_FILES+=usr/share/man/man4/spic.4.gz
 # 20160819: Remove wl(4) and wlconfig(8)
 OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
 OLD_FILES+=usr/sbin/wlconfig
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
 # 20160819: Remove si(4) and sicontrol(8)
 OLD_FILES+=usr/share/man/man4/si.4.gz
 OLD_FILES+=usr/sbin/sicontrol
 OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
 # 20160819: Remove scd(4)
 OLD_FILES+=usr/share/man/man4/scd.4.gz
 # 20160815: Remove mcd(4)
 OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160805: lockmgr_waiters(9) removed
 OLD_FILES+=usr/share/man/man9/lockmgr_waiters.9.gz
 # 20160703: POSIXify locales with variants
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
 # 20160608: removed pam_verbose_error
 OLD_LIBS+=usr/lib/libpam.so.5
 OLD_LIBS+=usr/lib/pam_chroot.so.5
 OLD_LIBS+=usr/lib/pam_deny.so.5
 OLD_LIBS+=usr/lib/pam_echo.so.5
 OLD_LIBS+=usr/lib/pam_exec.so.5
 OLD_LIBS+=usr/lib/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib/pam_group.so.5
 OLD_LIBS+=usr/lib/pam_guest.so.5
 OLD_LIBS+=usr/lib/pam_krb5.so.5
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_LIBS+=usr/lib/pam_lastlog.so.5
 OLD_LIBS+=usr/lib/pam_login_access.so.5
 OLD_LIBS+=usr/lib/pam_nologin.so.5
 OLD_LIBS+=usr/lib/pam_opie.so.5
 OLD_LIBS+=usr/lib/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib/pam_permit.so.5
 OLD_LIBS+=usr/lib/pam_radius.so.5
 OLD_LIBS+=usr/lib/pam_rhosts.so.5
 OLD_LIBS+=usr/lib/pam_rootok.so.5
 OLD_LIBS+=usr/lib/pam_securetty.so.5
 OLD_LIBS+=usr/lib/pam_self.so.5
 OLD_LIBS+=usr/lib/pam_ssh.so.5
 OLD_LIBS+=usr/lib/pam_tacplus.so.5
 OLD_LIBS+=usr/lib/pam_unix.so.5
 OLD_LIBS+=usr/lib32/libpam.so.5
 OLD_LIBS+=usr/lib32/pam_chroot.so.5
 OLD_LIBS+=usr/lib32/pam_deny.so.5
 OLD_LIBS+=usr/lib32/pam_echo.so.5
 OLD_LIBS+=usr/lib32/pam_exec.so.5
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib32/pam_group.so.5
 OLD_LIBS+=usr/lib32/pam_guest.so.5
 OLD_LIBS+=usr/lib32/pam_krb5.so.5
 OLD_LIBS+=usr/lib32/pam_ksu.so.5
 OLD_LIBS+=usr/lib32/pam_lastlog.so.5
 OLD_LIBS+=usr/lib32/pam_login_access.so.5
 OLD_LIBS+=usr/lib32/pam_nologin.so.5
 OLD_LIBS+=usr/lib32/pam_opie.so.5
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib32/pam_permit.so.5
 OLD_LIBS+=usr/lib32/pam_radius.so.5
 OLD_LIBS+=usr/lib32/pam_rhosts.so.5
 OLD_LIBS+=usr/lib32/pam_rootok.so.5
 OLD_LIBS+=usr/lib32/pam_securetty.so.5
 OLD_LIBS+=usr/lib32/pam_self.so.5
 OLD_LIBS+=usr/lib32/pam_ssh.so.5
 OLD_LIBS+=usr/lib32/pam_tacplus.so.5
 OLD_LIBS+=usr/lib32/pam_unix.so.5
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
 # 20160519: remove DTrace Toolkit from base
 OLD_FILES+=usr/sbin/dtruss
 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
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 # 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
 # 20160504: tests rework
 OLD_FILES+=usr/tests/lib/libc/regex/data/README
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=lib/libkvm.so.6
 OLD_LIBS+=usr/lib32/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
 # 20160419: rename units.lib -> definitions.units
 OLD_FILES+=usr/share/misc/units.lib
 # 20160419: remove Big5HKSCS locales
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.Big5HKSCS
 # 20160317: rman_res_t size bump to uintmax_t
 OLD_LIBS+=usr/lib/libdevinfo.so.5
 OLD_LIBS+=usr/lib32/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0.
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/tblgen
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.1/lib
 OLD_DIRS+=usr/lib/clang/3.7.1
 # 20160301: Remove taskqueue_enqueue_fast
 OLD_FILES+=usr/share/man/man9/taskqueue_enqueue_fast.9.gz
 # 20160225: Remove casperd and libcapsicum.
 OLD_FILES+=sbin/casperd
 OLD_FILES+=etc/rc.d/casperd
 OLD_FILES+=usr/share/man/man8/casperd.8.gz
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/include/libcapsicum_service.h
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/share/man/man3/libcapsicum.3.gz
 OLD_FILES+=usr/include/libcapsicum_dns.h
 OLD_FILES+=usr/include/libcapsicum_grp.h
 OLD_FILES+=usr/include/libcapsicum_impl.h
 OLD_FILES+=usr/include/libcapsicum_pwd.h
 OLD_FILES+=usr/include/libcapsicum_random.h
 OLD_FILES+=usr/include/libcapsicum_sysctl.h
 OLD_FILES+=libexec/casper/dns
 OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
 OLD_FILES+=libexec/casper/.debug/random.debug
 OLD_FILES+=libexec/casper/.debug/dns.debug
 OLD_FILES+=libexec/casper/.debug/sysctl.debug
 OLD_FILES+=libexec/casper/.debug/pwd.debug
 OLD_FILES+=libexec/casper/.debug/grp.debug
 OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_FILES+=usr/lib/libcapsicum_p.a
 OLD_FILES+=usr/lib32/libcapsicum.a
 OLD_FILES+=usr/lib32/libcapsicum.so
 OLD_LIBS+=usr/lib32/libcapsicum.so.0
 OLD_FILES+=usr/lib32/libcapsicum_p.a
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
 OLD_FILES+=usr/share/man/man8/mkulzma.8.gz
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160121: cc.h moved
 OLD_FILES+=usr/include/netinet/cc.h
 # 20160116: Update mandoc to cvs snapshot 20160116
 OLD_FILES+=usr/share/mdocml/example.style.css
 OLD_FILES+=usr/share/mdocml/style.css
 OLD_DIRS+=usr/share/mdocml
 # 20160114: SA-16:06.snmpd
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 # 20160107: GNU ld installed as ld.bfd and linked as ld
 OLD_FILES+=usr/lib/debug/usr/bin/ld.debug
 # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1.
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.0/lib
 OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 OLD_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-1
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-13
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-15
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-2
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-4
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.UTF-8
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
 # 20151101: added missing _test suffix on multiple tests in lib/libc
 OLD_FILES+=usr/tests/lib/libc/c063/faccessat
 OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
 OLD_FILES+=usr/tests/lib/libc/c063/fchownat
 OLD_FILES+=usr/tests/lib/libc/c063/fexecve
 OLD_FILES+=usr/tests/lib/libc/c063/fstatat
 OLD_FILES+=usr/tests/lib/libc/c063/linkat
 OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
 OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
 OLD_FILES+=usr/tests/lib/libc/c063/mknodat
 OLD_FILES+=usr/tests/lib/libc/c063/openat
 OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/renameat
 OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/utimensat
 OLD_FILES+=usr/tests/lib/libc/string/memchr
 OLD_FILES+=usr/tests/lib/libc/string/memcpy
 OLD_FILES+=usr/tests/lib/libc/string/memmem
 OLD_FILES+=usr/tests/lib/libc/string/memset
 OLD_FILES+=usr/tests/lib/libc/string/strcat
 OLD_FILES+=usr/tests/lib/libc/string/strchr
 OLD_FILES+=usr/tests/lib/libc/string/strcmp
 OLD_FILES+=usr/tests/lib/libc/string/strcpy
 OLD_FILES+=usr/tests/lib/libc/string/strcspn
 OLD_FILES+=usr/tests/lib/libc/string/strerror
 OLD_FILES+=usr/tests/lib/libc/string/strlen
 OLD_FILES+=usr/tests/lib/libc/string/strpbrk
 OLD_FILES+=usr/tests/lib/libc/string/strrchr
 OLD_FILES+=usr/tests/lib/libc/string/strspn
 OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151101: 430.status-rwho was renamed to 430.status-uptime
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 # 20151030: OpenSSL 1.0.2d import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl_str.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_509_CRL_fp.3.gz
 OLD_LIBS+=lib/libcrypto.so.7
 OLD_LIBS+=usr/lib/libssl.so.7
 OLD_LIBS+=usr/lib32/libcrypto.so.7
 OLD_LIBS+=usr/lib32/libssl.so.7
 # 20151029: LinuxKPI moved to sys/compat/linuxkpi
 OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h
 # 20151015: test symbols moved to /usr/lib/debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/tests_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/application_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/exceptions_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/atf_c_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/error_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tc_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tp_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/dynstr_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/list_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/map_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/user_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/test-programs/.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/c_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/cpp_helpers.debug
 OLD_DIRS+=usr/tests/lib/libc/c063/.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/faccessat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchmodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchownat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fexecve.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fstatat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/linkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkdirat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkfifoat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mknodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/openat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/readlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/renameat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/symlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/unlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/utimensat.debug
 OLD_DIRS+=usr/tests/lib/libc/db/.debug
 OLD_FILES+=usr/tests/lib/libc/db/.debug/h_db.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/alarm_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/arc4random_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/assert_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/basedirname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/dir_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/floatunditf_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fnmatch_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify2_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetmask_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetround_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ftok_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getcwd_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getgrent_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/glob_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/isnan_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/nice_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/pause_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/raise_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/realpath_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/setdomainname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sethostname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/syslog_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/time_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ttyname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/vis_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/execve/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/execve/.debug/execve_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/posix_spawn/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/fileactions_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_fileactions.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawn.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawnattr.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawn_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawnattr_test.debug
 OLD_DIRS+=usr/tests/lib/libc/hash/.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/h_hash.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/sha2_test.debug
 OLD_DIRS+=usr/tests/lib/libc/inet/.debug
 OLD_FILES+=usr/tests/lib/libc/inet/.debug/inet_network_test.debug
 OLD_DIRS+=usr/tests/lib/libc/locale/.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/io_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbrtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbsnrtowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbstowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcscspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcspbrk_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcsspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcstod_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wctomb_test.debug
 OLD_DIRS+=usr/tests/lib/libc/net/.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/ether_aton_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/getprotoent_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_dns_server.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_nsd_recurse.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_protoent.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_servent.debug
 OLD_DIRS+=usr/tests/lib/libc/regex/.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/exhaust_test.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/h_regex.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/regex_att_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ssp/.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_fgets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_getcwd.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_gets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memmove.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memset.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_raw.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_read.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_readlink.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_snprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_sprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsnprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsprintf.debug
 OLD_DIRS+=usr/tests/lib/libc/stdio/.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/clearerr_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fflush_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen2_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fputc_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/mktemp_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/popen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/printf_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/scanf_test.debug
 OLD_DIRS+=usr/tests/lib/libc/stdlib/.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/abs_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/atoi_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/div_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/exit_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/getenv_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt_long.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/hsearch_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/posix_memalign_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/random_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtod_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtol_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/system_test.debug
 OLD_DIRS+=usr/tests/lib/libc/string/.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memmem.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memset.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcat.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcmp.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strerror.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strlen.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strpbrk.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strrchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/swab.debug
 OLD_DIRS+=usr/tests/lib/libc/sys/.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/access_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/chroot_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/clock_gettime_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/connect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/dup_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/fsync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getcontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getgroups_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getitimer_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getlogin_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getpid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getrusage_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getsid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/gettimeofday_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/issetugid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kevent_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/link_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/listen_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mincore_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkdir_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkfifo_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mknod_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mlock_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mmap_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mprotect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgctl_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgget_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgrcv_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgsnd_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/nanosleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe2_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/poll_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/revoke_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/select_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setrlimit_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setuid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigaction_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigqueue_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigtimedwait_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/socketpair_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/stat_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/timer_create_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/truncate_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/ucontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/umask_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/unlink_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/write_test.debug
 OLD_DIRS+=usr/tests/lib/libc/termios/.debug
 OLD_FILES+=usr/tests/lib/libc/termios/.debug/tcsetpgrp_test.debug
 OLD_DIRS+=usr/tests/lib/libc/tls/.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dynamic_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ttyio/.debug
 OLD_FILES+=usr/tests/lib/libc/ttyio/.debug/ttyio_test.debug
 OLD_DIRS+=usr/tests/lib/libcrypt/.debug
 OLD_FILES+=usr/tests/lib/libcrypt/.debug/crypt_tests.debug
 OLD_DIRS+=usr/tests/lib/libmp/.debug
 OLD_FILES+=usr/tests/lib/libmp/.debug/legacy_test.debug
 OLD_DIRS+=usr/tests/lib/libnv/.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/dnv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_array_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_add_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_exists_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_free_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_get_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_move_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_send_recv_test.debug
 OLD_DIRS+=usr/tests/lib/libpam/.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_ctype.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readlinev.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readword.debug
 OLD_DIRS+=usr/tests/lib/libproc/.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/proc_test.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/target_prog.debug
 OLD_DIRS+=usr/tests/lib/librt/.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sched_test.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sem_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/barrier_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/cond_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/condwait_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/detach_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/equal_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fork_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fpu_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_atexit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_cancel.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_exit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_resolv.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/join_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/mutex_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/once_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/preempt_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/rwlock_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sem_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/siglongjmp_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigmask_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigsuspend_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/swapcontext_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/dlopen/.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/main_pthread_create_test.debug
 OLD_DIRS+=usr/tests/lib/libutil/.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/flopen_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/grp_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/pidfile_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain-nodomain_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain_test.debug
 OLD_DIRS+=usr/tests/lib/libxo/.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/libenc_test.so.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_01.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_02.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_03.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_04.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_05.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_06.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_07.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_08.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_09.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_10.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_11.debug
 OLD_DIRS+=usr/tests/lib/msun/.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/acos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/asin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/atan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cbrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ceil_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cosh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/erf_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/exp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/fmod_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/infinity_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ldexp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/log_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/pow_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/precision_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/round_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/scalbn_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sinh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sqrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tanh_test.debug
 OLD_DIRS+=usr/tests/libexec/rtld-elf/.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/ld_library_pathfds.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/target.debug
 OLD_DIRS+=usr/tests/sbin/devd/.debug
 OLD_FILES+=usr/tests/sbin/devd/.debug/client_test.debug
 OLD_DIRS+=usr/tests/sbin/dhclient/.debug
 OLD_FILES+=usr/tests/sbin/dhclient/.debug/option-domain-search_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/atf/.debug
 OLD_FILES+=usr/tests/share/examples/tests/atf/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/plain/.debug
 OLD_FILES+=usr/tests/share/examples/tests/plain/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/sys/aio/.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_kqueue_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/lio_kqueue_test.debug
 OLD_DIRS+=usr/tests/sys/fifo/.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_create.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_io.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_misc.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_open.debug
 OLD_DIRS+=usr/tests/sys/file/.debug
 OLD_FILES+=usr/tests/sys/file/.debug/closefrom_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/dup_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/fcntlflags_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/flock_helper.debug
 OLD_FILES+=usr/tests/sys/file/.debug/ftruncate_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/newfileops_on_fork_test.debug
 OLD_DIRS+=usr/tests/sys/kern/.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/kern_descrip_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/ptrace_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/unix_seqpacket_test.debug
 OLD_DIRS+=usr/tests/sys/kern/execve/.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/execve_helper.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/good_aout.debug
 OLD_DIRS+=usr/tests/sys/kqueue/.debug
 OLD_FILES+=usr/tests/sys/kqueue/.debug/kqtest.debug
 OLD_DIRS+=usr/tests/sys/mqueue/.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest1.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest2.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest3.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest4.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest5.debug
 OLD_DIRS+=usr/tests/sys/netinet/.debug
 OLD_FILES+=usr/tests/sys/netinet/.debug/udp_dontroute.debug
 OLD_DIRS+=usr/tests/sys/pjdfstest/.debug
 OLD_FILES+=usr/tests/sys/pjdfstest/.debug/pjdfstest.debug
 OLD_DIRS+=usr/tests/sys/vm/.debug
 OLD_FILES+=usr/tests/sys/vm/.debug/mmap_test.debug
 # 20151015: Rename files due to file-installed-as-dir bug
 OLD_FILES+=usr/share/doc/legal/realtek
 OLD_FILES+=usr/share/doc/legal/realtek/LICENSE
 OLD_DIRS+=usr/share/doc/legal/realtek
 OLD_DIRS+=usr/share/doc/legal/intel_ipw
 OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE
 OLD_FILES+=usr/share/doc/legal/intel_iwn
 OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_iwn
 OLD_DIRS+=usr/share/doc/legal/intel_iwi
 OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_wpi
 OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE
 # 20151006: new libc++ import
 OLD_FILES+=usr/include/c++/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03
 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0.
 OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.1/include
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
 # 20150928: unused sgsmsg utility is removed
 OLD_FILES+=usr/bin/sgsmsg
 # 20150926: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MFREE.9.gz
 # 20150818: *allocm() are gone in jemalloc 4.0.0
 OLD_FILES+=usr/share/man/man3/allocm.3.gz
 OLD_FILES+=usr/share/man/man3/dallocm.3.gz
 OLD_FILES+=usr/share/man/man3/nallocm.3.gz
 OLD_FILES+=usr/share/man/man3/rallocm.3.gz
 OLD_FILES+=usr/share/man/man3/sallocm.3.gz
 # 20150802: Remove netbsd's test on pw(8)
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages.
 OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz
 # 20150704: nvlist private headers no longer installed
 OLD_FILES+=usr/include/sys/nv_impl.h
 OLD_FILES+=usr/include/sys/nvlist_impl.h
 OLD_FILES+=usr/include/sys/nvpair_impl.h
 # 20150624
 OLD_LIBS+=usr/lib/libugidfw.so.4
 OLD_LIBS+=usr/lib32/libugidfw.so.4
 # 20150604: Move nvlist man pages to section 9.
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz
 # 20150702: Remove duplicated nvlist includes.
 OLD_FILES+=usr/include/dnv.h
 OLD_FILES+=usr/include/nv.h
 # 20150528: PCI IOV device driver methods moved to a separate kobj interface.
 OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.0/include
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.0/lib
 OLD_DIRS+=usr/lib/clang/3.6.0
 # 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_FILES+=usr/share/examples/etc/libmap32.conf
 OLD_FILES+=usr/include/bsdstat.h
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib32/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_LIBS+=usr/lib32/private/libatf-c.so.1
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_LIBS+=usr/lib32/private/libucl.so.1
 OLD_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_LIBS+=usr/lib/private/libatf-c.so.1
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_LIBS+=usr/lib/private/libucl.so.1
 OLD_DIRS+=usr/lib/private
 # 20150501
 OLD_FILES+=usr/bin/soeliminate
 OLD_FILES+=usr/share/man/man1/soeliminate.1.gz
 # 20150501: Remove the nvlist_.*[vf] functions manpages.
 OLD_FILES+=usr/share/man/man3/nvlist_addf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
 # 20150429: remove never written documentation
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
 OLD_FILES+=usr/tests/sys/kern/mmap_test
 # 20150422: zlib.c moved from net to libkern
 OLD_FILES+=usr/include/net/zlib.h
 OLD_FILES+=usr/include/net/zutil.h
 # 20150418
 OLD_FILES+=sbin/mount_oldnfs
 OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
 # 20150416: ALTQ moved to net/altq
 OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
 OLD_FILES+=usr/include/altq/altq.h
 OLD_FILES+=usr/include/altq/altq_cdnr.h
 OLD_FILES+=usr/include/altq/altq_hfsc.h
 OLD_FILES+=usr/include/altq/altq_priq.h
 OLD_FILES+=usr/include/altq/altqconf.h
 OLD_FILES+=usr/include/altq/altq_classq.h
 OLD_FILES+=usr/include/altq/altq_red.h
 OLD_FILES+=usr/include/altq/if_altq.h
 OLD_FILES+=usr/include/altq/altq_var.h
 OLD_FILES+=usr/include/altq/altq_rmclass.h
 OLD_FILES+=usr/include/altq/altq_cbq.h
 OLD_FILES+=usr/include/altq/altq_rio.h
 OLD_DIRS+=usr/include/altq
 # 20150330: ntp 4.2.8p1
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h
 .endif
 # 20150326
 OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
 # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0.
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.1/altivec.h
 OLD_FILES+=usr/include/clang/3.5.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.1
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
 # 20150302: binutils documentation distributed as a manpage
 OLD_FILES+=usr/share/doc/binutils/as.txt
 OLD_FILES+=usr/share/doc/binutils/ld.txt
 OLD_DIRS+=usr/share/doc/binutils
 # 20150222: Removed bcd(6) and ppt(6)
 OLD_FILES+=usr/bin/bcd
 OLD_FILES+=usr/bin/ppt
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 # 20150217: Removed remnants of ar(4) driver
 OLD_FILES+=usr/include/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
 OLD_FILES+=usr/games/factor
 OLD_FILES+=usr/games/fortune
 OLD_FILES+=usr/games/grdc
 OLD_FILES+=usr/games/morse
 OLD_FILES+=usr/games/number
 OLD_FILES+=usr/games/pom
 OLD_FILES+=usr/games/ppt
 OLD_FILES+=usr/games/primes
 OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
 OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
 OLD_FILES+=usr/share/man/man9/spl.9.gz
 OLD_FILES+=usr/share/man/man9/spl0.9.gz
 OLD_FILES+=usr/share/man/man9/splbio.9.gz
 OLD_FILES+=usr/share/man/man9/splclock.9.gz
 OLD_FILES+=usr/share/man/man9/splhigh.9.gz
 OLD_FILES+=usr/share/man/man9/splimp.9.gz
 OLD_FILES+=usr/share/man/man9/splnet.9.gz
 OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
 OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
 OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
 OLD_FILES+=usr/share/man/man9/spltty.9.gz
 OLD_FILES+=usr/share/man/man9/splvm.9.gz
 OLD_FILES+=usr/share/man/man9/splx.9.gz
 # 20150118: toeplitz.c moved from netinet to net
 OLD_FILES+=usr/include/netinet/toeplitz.h
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.0/altivec.h
 OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.0/lib
 OLD_DIRS+=usr/lib/clang/3.5.0
 # 20150102: removal of asr(4)
 OLD_FILES+=usr/share/man/man4/asr.4.gz
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey
 OLD_FILES+=usr/bin/install-info
 OLD_FILES+=usr/bin/makeinfo
 OLD_FILES+=usr/bin/texindex
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/info/as.info.gz
 OLD_FILES+=usr/share/info/binutils.info.gz
 OLD_FILES+=usr/share/info/com_err.info.gz
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/diff.info.gz
 OLD_FILES+=usr/share/info/dir
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/info/grep.info.gz
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/info/history.info.gz
 OLD_FILES+=usr/share/info/info-stnd.info.gz
 OLD_FILES+=usr/share/info/info.info.gz
 OLD_FILES+=usr/share/info/ld.info.gz
 OLD_FILES+=usr/share/info/regex.info.gz
 OLD_FILES+=usr/share/info/rluserman.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/info/texinfo.info.gz
 OLD_FILES+=usr/share/man/man1/info.1.gz
 OLD_FILES+=usr/share/man/man1/infokey.1.gz
 OLD_FILES+=usr/share/man/man1/install-info.1.gz
 OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
 OLD_FILES+=usr/share/man/man1/texindex.1.gz
 OLD_FILES+=usr/share/man/man5/info.5.gz
 OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 OLD_DIRS+=usr/share/info
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
 OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/module.map
 OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
 # 20141225: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_DIRS+=usr/include/gpib
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.a
 OLD_FILES+=usr/lib32/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.so
 OLD_LIBS+=usr/lib32/libgpib.so.3
 OLD_FILES+=usr/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
 OLD_FILES+=usr/share/man/man3/ibdma.3.gz
 OLD_FILES+=usr/share/man/man3/ibeos.3.gz
 OLD_FILES+=usr/share/man/man3/ibeot.3.gz
 OLD_FILES+=usr/share/man/man3/ibloc.3.gz
 OLD_FILES+=usr/share/man/man3/ibonl.3.gz
 OLD_FILES+=usr/share/man/man3/ibpad.3.gz
 OLD_FILES+=usr/share/man/man3/ibrd.3.gz
 OLD_FILES+=usr/share/man/man3/ibsad.3.gz
 OLD_FILES+=usr/share/man/man3/ibsic.3.gz
 OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
 OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
 OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
 OLD_FILES+=usr/share/man/man4/gpib.4.gz
 OLD_FILES+=usr/share/man/man4/pcii.4.gz
 OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
 # 20141224: libxo moved to /lib
 OLD_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
 OLD_FILES+=usr/include/net/if_stf.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141209: pw tests broken into a file per command
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=share/man/man1/preconv.1.gz
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
 # 20141122: mandoc updated to 1.13.1
 OLD_FILES+=usr/share/mdocml/external.png
 # 20141111: SF_KQUEUE code removed
 OLD_FILES+=usr/include/sys/sf_base.h
 OLD_FILES+=usr/include/sys/sf_sync.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
 OLD_FILES+=usr/share/man/man4/if_faith.4.gz
 OLD_FILES+=usr/sbin/faithd
 OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141107: overhaul if_gre(4)
 OLD_FILES+=usr/include/netinet/ip_gre.h
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
 # 20141030: atf 0.21 import
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
 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
 # 20141003: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.2
 OLD_LIBS+=usr/lib32/libproc.so.2
 # 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
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 OLD_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 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
 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
 OLD_FILES+=usr/lib/private/libbsdstat.a
 OLD_FILES+=usr/lib/private/libbsdstat.so
 OLD_FILES+=usr/lib/private/libbsdstat_p.a
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 OLD_FILES+=usr/lib/private/libldns.a
 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/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
 OLD_FILES+=usr/lib/private/libucl.a
 OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 # 20140731
 OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version.
 OLD_LIBS+=lib/libsbuf.so.7
 OLD_LIBS+=usr/lib32/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
 # 20140722: browse_packages_ftp.sh removed
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
 # 20140716: Remove an incorrectly named man page
 OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
 # 20140712: Removal of bsd.dtrace.mk
 OLD_FILES+=usr/share/mk/bsd.dtrace.mk
 # 20140705: turn libreadline into an internal lib
 OLD_LIBS+=lib/libreadline.so.8
 OLD_FILES+=usr/lib/libreadline.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libreadline.so
 OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
 OLD_FILES+=usr/lib32/libhistory.a
 OLD_FILES+=usr/lib32/libhistory.so
 OLD_LIBS+=usr/lib32/libhistory.so.8
 OLD_FILES+=usr/lib32/libhistory_p.a
 OLD_FILES+=usr/lib32/libreadline.a
 OLD_FILES+=usr/lib32/libreadline.so
 OLD_LIBS+=usr/lib32/libreadline.so.8
 OLD_FILES+=usr/lib32/libreadline_p.a
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 OLD_FILES+=usr/include/readline/readline.h
 OLD_FILES+=usr/include/readline/tilde.h
 OLD_FILES+=usr/include/readline/rlconf.h
 OLD_FILES+=usr/include/readline/rlstdc.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
 OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
 OLD_FILES+=usr/share/man/man1/csup.1.gz
 OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
 OLD_FILES+=usr/share/examples/cvsup/README
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/stable-supfile
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4/altivec.h
 OLD_FILES+=usr/include/clang/3.4/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4/cpuid.h
 OLD_FILES+=usr/include/clang/3.4/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4/immintrin.h
 OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/xopintrin.h
 OLD_FILES+=usr/include/clang/3.4/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_DIRS+=usr/include/clang/3.4
 # 20140505: Bogusly installing src.opts.mk
 OLD_FILES+=usr/share/mk/src.opts.mk
 # 20140505: Reject PR kern/187551
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
 OLD_FILES+=usr/lib32/libssp_p.a
 OLD_FILES+=usr/lib32/libstand_p.a
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
 OLD_FILES+=usr/include/netatalk/at.h
 OLD_FILES+=usr/include/netatalk/at_extern.h
 OLD_FILES+=usr/include/netatalk/at_var.h
 OLD_FILES+=usr/include/netatalk/ddp.h
 OLD_FILES+=usr/include/netatalk/ddp_pcb.h
 OLD_FILES+=usr/include/netatalk/ddp_var.h
 OLD_FILES+=usr/include/netatalk/endian.h
 OLD_FILES+=usr/include/netatalk/phase2.h
 # 20140314: Remove IPX/SPX
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/include/netipx/ipx.h
 OLD_FILES+=usr/include/netipx/ipx_if.h
 OLD_FILES+=usr/include/netipx/ipx_pcb.h
 OLD_FILES+=usr/include/netipx/ipx_var.h
 OLD_FILES+=usr/include/netipx/spx.h
 OLD_FILES+=usr/include/netipx/spx_debug.h
 OLD_FILES+=usr/include/netipx/spx_timer.h
 OLD_FILES+=usr/include/netipx/spx_var.h
 OLD_DIRS+=usr/include/netipx
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
 OLD_FILES+=usr/lib32/libipx.a
 OLD_FILES+=usr/lib32/libipx.so
 OLD_LIBS+=usr/lib32/libipx.so.5
 OLD_FILES+=usr/lib32/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man4/ef.4.gz
 OLD_FILES+=usr/share/man/man4/if_ef.4.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 # 20140314: bsdconfig usermgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput
 # 20140307: bsdconfig groupmgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
 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/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
 OLD_FILES+=usr/include/clang/3.3/ammintrin.h
 OLD_FILES+=usr/include/clang/3.3/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.3/avxintrin.h
 OLD_FILES+=usr/include/clang/3.3/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.3/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.3/cpuid.h
 OLD_FILES+=usr/include/clang/3.3/emmintrin.h
 OLD_FILES+=usr/include/clang/3.3/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.3/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.3/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.3/immintrin.h
 OLD_FILES+=usr/include/clang/3.3/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.3/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.3/mmintrin.h
 OLD_FILES+=usr/include/clang/3.3/module.map
 OLD_FILES+=usr/include/clang/3.3/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.3/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.3/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.3/smmintrin.h
 OLD_FILES+=usr/include/clang/3.3/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/x86intrin.h
 OLD_FILES+=usr/include/clang/3.3/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/xopintrin.h
 OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
 OLD_DIRS+=usr/include/clang/3.3
 # 20140216: nve(4) removed
 OLD_FILES+=usr/share/man/man4/if_nve.4.gz
 OLD_FILES+=usr/share/man/man4/nve.4.gz
 # 20140205: Open Firmware device moved
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
 OLD_LIBS+=usr/lib32/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
 OLD_LIBS+=usr/lib32/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
 OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 OLD_LIBS+=usr/lib/libcapsicum.so.0
 OLD_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_FILES+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
 OLD_FILES+=usr/lib32/libiconv.a
 OLD_FILES+=usr/lib32/libiconv.so
 OLD_FILES+=usr/lib32/libiconv.so.3
 OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead.
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/sbin/pkg_add
 OLD_FILES+=usr/sbin/pkg_create
 OLD_FILES+=usr/sbin/pkg_delete
 OLD_FILES+=usr/sbin/pkg_info
 OLD_FILES+=usr/sbin/pkg_updating
 OLD_FILES+=usr/sbin/pkg_version
 OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg
 OLD_DIRS+=etc/keys/pkg/revoked
 OLD_DIRS+=etc/keys/pkg/trusted
 OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
 # 20131027: header moved
 OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
 # 20131021: isf(4) removed
 OLD_FILES+=usr/sbin/isfctl
 OLD_FILES+=usr/share/man/man4/isf.4.gz
 OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
 OLD_LIBS+=usr/lib/libbsdyml.so.0
 OLD_FILES+=usr/lib/libbsdyml_p.a
 OLD_FILES+=usr/lib32/libbsdyml.a
 OLD_FILES+=usr/lib32/libbsdyml.so
 OLD_LIBS+=usr/lib32/libbsdyml.so.0
 OLD_FILES+=usr/lib32/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
 OLD_FILES+=etc/atf/common.conf
 OLD_FILES+=usr/bin/atf-config
 OLD_FILES+=usr/bin/atf-report
 OLD_FILES+=usr/bin/atf-run
 OLD_FILES+=usr/bin/atf-version
 OLD_FILES+=usr/share/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/tests-results.css
 OLD_FILES+=usr/share/man/man1/atf-config.1.gz
 OLD_FILES+=usr/share/man/man1/atf-report.1.gz
 OLD_FILES+=usr/share/man/man1/atf-run.1.gz
 OLD_FILES+=usr/share/man/man1/atf-version.1.gz
 OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
 OLD_FILES+=usr/share/xml/atf/tests-results.dtd
 OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 OLD_DIRS+=etc/atf
 OLD_DIRS+=usr/share/examples/atf
 OLD_DIRS+=usr/share/xml/atf
 OLD_DIRS+=usr/share/xml
 OLD_DIRS+=usr/share/xsl/atf
 OLD_DIRS+=usr/share/xsl
 # 20131009: freebsd-version moved from /libexec to /bin
 OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
 OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
 OLD_FILES+=usr/bin/nslookup
 OLD_FILES+=usr/bin/nsupdate
 OLD_DIRS+=usr/include/lwres
 OLD_FILES+=usr/include/lwres/context.h
 OLD_FILES+=usr/include/lwres/int.h
 OLD_FILES+=usr/include/lwres/ipv6.h
 OLD_FILES+=usr/include/lwres/lang.h
 OLD_FILES+=usr/include/lwres/list.h
 OLD_FILES+=usr/include/lwres/lwbuffer.h
 OLD_FILES+=usr/include/lwres/lwpacket.h
 OLD_FILES+=usr/include/lwres/lwres.h
 OLD_FILES+=usr/include/lwres/net.h
 OLD_FILES+=usr/include/lwres/netdb.h
 OLD_FILES+=usr/include/lwres/platform.h
 OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/string.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
 OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
 OLD_FILES+=usr/sbin/dnssec-dsfromkey
 OLD_FILES+=usr/sbin/dnssec-keyfromlabel
 OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
 OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
 OLD_FILES+=usr/sbin/named
 OLD_FILES+=usr/sbin/named-checkconf
 OLD_FILES+=usr/sbin/named-checkzone
 OLD_FILES+=usr/sbin/named-compilezone
 OLD_FILES+=usr/sbin/named-journalprint
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/sbin/nsec3hash
 OLD_FILES+=usr/sbin/rndc
 OLD_FILES+=usr/sbin/rndc-confgen
 OLD_DIRS+=usr/share/doc/bind9
 OLD_FILES+=usr/share/doc/bind9/CHANGES
 OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
 OLD_FILES+=usr/share/doc/bind9/FAQ
 OLD_FILES+=usr/share/doc/bind9/HISTORY
 OLD_FILES+=usr/share/doc/bind9/README
 OLD_DIRS+=usr/share/doc/bind9/arm
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
 OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
 OLD_DIRS+=usr/share/doc/bind9/misc
 OLD_FILES+=usr/share/doc/bind9/misc/dnssec
 OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
 OLD_FILES+=usr/share/doc/bind9/misc/ipv6
 OLD_FILES+=usr/share/doc/bind9/misc/migration
 OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
 OLD_FILES+=usr/share/doc/bind9/misc/options
 OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
 OLD_FILES+=usr/share/doc/bind9/misc/roadmap
 OLD_FILES+=usr/share/doc/bind9/misc/sdb
 OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
 OLD_FILES+=usr/share/man/man1/arpaname.1.gz
 OLD_FILES+=usr/share/man/man1/dig.1.gz
 OLD_FILES+=usr/share/man/man1/nslookup.1.gz
 OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
 OLD_FILES+=usr/share/man/man3/lwres.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
 OLD_FILES+=usr/share/man/man5/named.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
 OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
 OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
 OLD_FILES+=usr/share/man/man8/named.8.gz
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
 OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/rndc.8.gz
 OLD_DIRS+=var/named/dev
 OLD_DIRS+=var/named/etc
 OLD_DIRS+=var/named/etc/namedb
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
 OLD_DIRS+=var/named/etc/namedb/dynamic
 OLD_FILES+=var/named/etc/namedb/make-localhost
 OLD_DIRS+=var/named/etc/namedb/master
 OLD_FILES+=var/named/etc/namedb/master/empty.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
 #OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
 OLD_FILES+=var/named/etc/namedb/named.root
 OLD_DIRS+=var/named/etc/namedb/working
 OLD_DIRS+=var/named/etc/namedb/slave
 OLD_DIRS+=var/named/var
 OLD_DIRS+=var/named/var/dump
 OLD_DIRS+=var/named/var/log
 OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
 # 20130923: example moved
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
 OLD_FILES+=usr/lib/libssh_p.a
 OLD_FILES+=usr/lib32/libssh.a
 OLD_FILES+=usr/lib32/libssh.so
 OLD_LIBS+=usr/lib32/libssh.so.5
 OLD_FILES+=usr/lib32/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)
 OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz
 # 20130710: libkvm version bump 
 OLD_LIBS+=lib/libkvm.so.5
 OLD_LIBS+=usr/lib32/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 OLD_LIBS+=usr/lib32/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
 OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
 OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
 OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
 OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
 OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
 OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
 OLD_FILES+=usr/share/examples/cvs/contrib/log
 OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
 OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
 OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
 OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
 OLD_DIRS+=usr/share/examples/cvs/contrib
 OLD_DIRS+=usr/share/examples/cvs
 OLD_FILES+=usr/share/info/cvs.info.gz
 OLD_FILES+=usr/share/info/cvsclient.info.gz
 OLD_FILES+=usr/share/man/man1/cvs.1.gz
 OLD_FILES+=usr/share/man/man5/cvs.5.gz
 OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130607: WITH_DEBUG_FILES added
 OLD_FILES+=lib/libufs.so.6.symbols
 OLD_FILES+=usr/lib32/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.2/altivec.h
 OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.2/mmintrin.h
 OLD_FILES+=usr/include/clang/3.2/module.map
 OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.2/smmintrin.h
 OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 # 20130404: legacy ATA stack removed
 OLD_FILES+=etc/periodic/daily/405.status-ata-raid
 OLD_FILES+=rescue/atacontrol
 OLD_FILES+=sbin/atacontrol
 OLD_FILES+=usr/share/man/man8/atacontrol.8.gz
 OLD_FILES+=usr/share/man/man4/atapicam.4.gz
 OLD_FILES+=usr/share/man/man4/ataraid.4.gz
 OLD_FILES+=usr/sbin/burncd
 OLD_FILES+=usr/share/man/man8/burncd.8.gz
 # 20130316: vinum.4 removed
 OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130312: fortunes-o removed
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse
 OLD_FILES+=usr/share/examples/cvsup/refuse.README
 # 20130309: NWFS and NCP supports removed
 OLD_FILES+=usr/bin/ncplist
 OLD_FILES+=usr/bin/ncplogin
 OLD_FILES+=usr/bin/ncplogout
 OLD_FILES+=usr/include/fs/nwfs/nwfs.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
 OLD_DIRS+=usr/include/fs/nwfs
 OLD_FILES+=usr/include/netncp/ncp.h
 OLD_FILES+=usr/include/netncp/ncp_cfg.h
 OLD_FILES+=usr/include/netncp/ncp_conn.h
 OLD_FILES+=usr/include/netncp/ncp_file.h
 OLD_FILES+=usr/include/netncp/ncp_lib.h
 OLD_FILES+=usr/include/netncp/ncp_ncp.h
 OLD_FILES+=usr/include/netncp/ncp_nls.h
 OLD_FILES+=usr/include/netncp/ncp_rcfile.h
 OLD_FILES+=usr/include/netncp/ncp_rq.h
 OLD_FILES+=usr/include/netncp/ncp_sock.h
 OLD_FILES+=usr/include/netncp/ncp_subr.h
 OLD_FILES+=usr/include/netncp/ncp_user.h
 OLD_FILES+=usr/include/netncp/ncpio.h
 OLD_FILES+=usr/include/netncp/nwerror.h
 OLD_DIRS+=usr/include/netncp
 OLD_FILES+=usr/lib/libncp.a
 OLD_FILES+=usr/lib/libncp.so
 OLD_LIBS+=usr/lib/libncp.so.4
 OLD_FILES+=usr/lib/libncp_p.a
 OLD_FILES+=usr/lib32/libncp.a
 OLD_FILES+=usr/lib32/libncp.so
 OLD_LIBS+=usr/lib32/libncp.so.4
 OLD_FILES+=usr/lib32/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 OLD_DIRS+=usr/share/examples/nwclient
 OLD_FILES+=usr/share/man/man1/ncplist.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
 OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20130302: NTFS support removed
 OLD_FILES+=rescue/mount_ntfs
 OLD_FILES+=sbin/mount_ntfs
 OLD_FILES+=usr/include/fs/ntfs/ntfs.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h
 OLD_DIRS+=usr/include/fs/ntfs
 OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz
 # 20130302: PORTALFS support removed
 OLD_FILES+=usr/include/fs/portalfs/portal.h
 OLD_DIRS+=usr/include/fs/portalfs
 OLD_FILES+=usr/sbin/mount_portalfs
 OLD_FILES+=usr/share/examples/portal/README
 OLD_FILES+=usr/share/examples/portal/portal.conf
 OLD_DIRS+=usr/share/examples/portal
 OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz
 # 20130302: CODAFS support removed
 OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130302: Capsicum overhaul
 OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz
 OLD_FILES+=usr/share/man/man2/cap_new.2.gz
 # 20130213: OpenSSL 1.0.1e import
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 # 20130116: removed long unused directories for .1aout section manpages
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
 OLD_FILES+=usr/share/man/en.UTF-8/man1aout
 OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20130103: gnats-supfile removed
 OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
 # 20121114: zpool-features manual page moved from section 5 to 7
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz
 OLD_FILES+=usr/share/man/man4/idt.4.gz
 OLD_FILES+=usr/share/man/man4/if_idt.4.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120910: NetBSD compat shims removed
 OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
 OLD_FILES+=usr/include/sys/device_port.h
 # 20120909: doc and www supfiles removed
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
 OLD_FILES+=usr/share/examples/cvsup/www-supfile
 # 20120908: pf cleanup
 OLD_FILES+=usr/include/net/if_pflow.h
 # 20120816: new clang import which bumps version from 3.1 to 3.2
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/include/clang/3.1/altivec.h
 OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.1/module.map
 OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/unwind.h
 OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 # 20120712: OpenSSL 1.0.1c import
 OLD_LIBS+=lib/libcrypto.so.6
 OLD_LIBS+=usr/lib/libssl.so.6
 OLD_LIBS+=usr/lib32/libcrypto.so.6
 OLD_LIBS+=usr/lib32/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 OLD_FILES+=usr/include/openssl/fips.h
 OLD_FILES+=usr/include/openssl/fips_rand.h
 OLD_FILES+=usr/include/openssl/pq_compat.h
 OLD_FILES+=usr/include/openssl/tmdiff.h
 OLD_FILES+=usr/include/openssl/ui_locl.h
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 # 20120621: remove old man page
 OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
 # 20120619: TOE support updated
 OLD_FILES+=usr/include/netinet/toedev.h
 # 20120613: auth.conf removed
 OLD_FILES+=etc/auth.conf
 OLD_FILES+=usr/share/examples/etc/auth.conf
 OLD_FILES+=usr/share/man/man3/auth.3.gz
 OLD_FILES+=usr/share/man/man3/auth_getval.3.gz
 OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
 OLD_FILES+=etc/pam.d/kde
 # 20120521: byacc import
 OLD_FILES+=usr/bin/yyfix
 OLD_FILES+=usr/share/man/man1/yyfix.1.gz
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd
 OLD_LIBS+=lib/libmd.so.5
 OLD_FILES+=usr/include/md2.h
 OLD_LIBS+=usr/lib32/libmd.so.5
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
 OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
 OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_LIBS+=usr/lib32/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
 # 20120412: BIND 9.8.1 release notes removed
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
 OLD_FILES+=usr/share/doc/bind9/release-notes.css
 # 20120330: legacy(4) moved to x86
 OLD_FILES+=usr/include/machine/legacyvar.h
 # 20120324: MPI headers updated
 OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
 # 20120322: hwpmc_mips24k.h removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1.
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
 	usr/include/hdb-private.h \
         usr/share/man/man3/krb5_addresses.3.gz \
         usr/share/man/man3/krb5_cc_cursor.3.gz \
         usr/share/man/man3/krb5_cc_ops.3.gz \
         usr/share/man/man3/krb5_config.3.gz \
         usr/share/man/man3/krb5_config_get_int_default.3.gz \
         usr/share/man/man3/krb5_context.3.gz \
         usr/share/man/man3/krb5_data.3.gz \
         usr/share/man/man3/krb5_err.3.gz \
         usr/share/man/man3/krb5_errx.3.gz \
         usr/share/man/man3/krb5_keyblock.3.gz \
         usr/share/man/man3/krb5_keytab_entry.3.gz \
         usr/share/man/man3/krb5_kt_cursor.3.gz \
         usr/share/man/man3/krb5_kt_ops.3.gz \
         usr/share/man/man3/krb5_set_warn_dest.3.gz \
         usr/share/man/man3/krb5_verr.3.gz \
         usr/share/man/man3/krb5_verrx.3.gz \
         usr/share/man/man3/krb5_vwarnx.3.gz \
         usr/share/man/man3/krb5_warn.3.gz \
         usr/share/man/man3/krb5_warnx.3.gz
 OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libhdb.so.10 \
 	usr/lib/libheimntlm.so.10 \
 	usr/lib/libhx509.so.10 \
 	usr/lib/libkadm5clnt.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.so.10 \
 	usr/lib/libroken.so.10 \
 	usr/lib32/libasn1.so.10 \
 	usr/lib32/libhdb.so.10 \
 	usr/lib32/libheimntlm.so.10 \
 	usr/lib32/libhx509.so.10 \
 	usr/lib32/libkadm5clnt.so.10 \
 	usr/lib32/libkadm5srv.so.10 \
 	usr/lib32/libkafs5.so.10 \
 	usr/lib32/libkrb5.so.10 \
 	usr/lib32/libroken.so.10
 # 20120309: Remove fifofs header files.
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
 # 20120304: xlocale cleanup
 OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
 	usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_read_support_compression_compress.3.gz \
 	usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
 	usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
 	usr/share/man/man3/archive_read_support_compression_none.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
 	usr/share/man/man3/archive_read_support_compression_xz.3.gz \
 	usr/share/man/man3/archive_write_set_callbacks.3.gz \
 	usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_write_set_compression_compress.3.gz \
 	usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
 	usr/share/man/man3/archive_write_set_compression_none.3.gz \
 	usr/share/man/man3/archive_write_set_compression_program.3.gz
 OLD_LIBS+=usr/lib/libarchive.so.5
 OLD_LIBS+=usr/lib32/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 20111214: eventtimers(7) moved to eventtimers(4)
 OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 20111125: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 20111125: libodialog removed
 OLD_FILES+=usr/lib/libodialog.a
 OLD_FILES+=usr/lib/libodialog.so
 OLD_LIBS+=usr/lib/libodialog.so.7
 OLD_FILES+=usr/lib/libodialog_p.a
 OLD_FILES+=usr/lib32/libodialog.a
 OLD_FILES+=usr/lib32/libodialog.so
 OLD_LIBS+=usr/lib32/libodialog.so.7
 OLD_FILES+=usr/lib32/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/lib32/libftpio.a
 OLD_FILES+=usr/lib32/libftpio.so
 OLD_LIBS+=usr/lib32/libftpio.so.8
 OLD_FILES+=usr/lib32/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_set.9.gz
 # 20110828: library version bump for 9.0
 OLD_LIBS+=lib/libcam.so.5
 OLD_LIBS+=lib/libpcap.so.7
 OLD_LIBS+=lib/libufs.so.5
 OLD_LIBS+=usr/lib/libbsnmp.so.5
 OLD_LIBS+=usr/lib/libdwarf.so.2
 OLD_LIBS+=usr/lib/libopie.so.6
 OLD_LIBS+=usr/lib/librtld_db.so.1
 OLD_LIBS+=usr/lib/libtacplus.so.4
 OLD_LIBS+=usr/lib32/libcam.so.5
 OLD_LIBS+=usr/lib32/libpcap.so.7
 OLD_LIBS+=usr/lib32/libufs.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.5
 OLD_LIBS+=usr/lib32/libdwarf.so.2
 OLD_LIBS+=usr/lib32/libopie.so.6
 OLD_LIBS+=usr/lib32/librtld_db.so.1
 OLD_LIBS+=usr/lib32/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
 OLD_FILES+=usr/share/man/man4/afd.4.gz
 OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
 OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
 OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
 OLD_FILES+=usr/share/doc/bind9/README.idnkit
 OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions.
 OLD_FILES+=usr/share/man/man9/vm_page_copy.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_protect.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_zero_fill.9.gz
 # 20110707: script no longer needed by /etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h
 # 20110705: the switch of default NFS client to the new one
 OLD_FILES+=sbin/mount_newnfs
 OLD_FILES+=usr/share/man/man8/mount_newnfs.8.gz
 OLD_FILES+=usr/include/nfsclient/nfs_kdtrace.h
 # 20110628: calendar.msk removed
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 # 20110517: libpkg removed
 OLD_FILES+=usr/include/pkg.h
 OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
 OLD_FILES+=usr/lib32/libpkg.a
 OLD_FILES+=usr/lib32/libpkg.so
 OLD_LIBS+=usr/lib32/libpkg.so.0
 OLD_FILES+=usr/lib32/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
 OLD_LIBS+=usr/lib32/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.9/mmintrin.h
 OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.9
 # 20110417: removal of Objective-C support
 OLD_FILES+=usr/include/objc/encoding.h
 OLD_FILES+=usr/include/objc/hash.h
 OLD_FILES+=usr/include/objc/NXConstStr.h
 OLD_FILES+=usr/include/objc/objc-api.h
 OLD_FILES+=usr/include/objc/objc-decls.h
 OLD_FILES+=usr/include/objc/objc-list.h
 OLD_FILES+=usr/include/objc/objc.h
 OLD_FILES+=usr/include/objc/Object.h
 OLD_FILES+=usr/include/objc/Protocol.h
 OLD_FILES+=usr/include/objc/runtime.h
 OLD_FILES+=usr/include/objc/sarray.h
 OLD_FILES+=usr/include/objc/thr.h
 OLD_FILES+=usr/include/objc/typedstream.h
 OLD_FILES+=usr/lib/libobjc.a
 OLD_FILES+=usr/lib/libobjc.so
 OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
 OLD_FILES+=usr/lib32/libobjc.a
 OLD_FILES+=usr/lib32/libobjc.so
 OLD_FILES+=usr/lib32/libobjc_p.a
 OLD_LIBS+=usr/lib32/libobjc.so.4
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.8/mmintrin.h
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.8
 # 20110119: netinet/sctp_cc_functions.h removed
 OLD_FILES+=usr/include/netinet/sctp_cc_functions.h
 # 20110119: Remove SYSCTL_*X* sysctl additions.
 OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
     usr/share/man/man9/SYSCTL_XLONG.9.gz
 
 # 20110112: Update dialog to new version, rename old libdialog to libodialog,
 #     removing associated man pages and header files.
 OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
     usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \
     usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \
     usr/share/man/man3/dialog_create_rc.3.gz \
     usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \
     usr/share/man/man3/dialog_prgbox.3.gz \
     usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \
     usr/share/man/man3/dialog_checklist.3.gz \
     usr/share/man/man3/dialog_radiolist.3.gz \
     usr/share/man/man3/dialog_inputbox.3.gz \
     usr/share/man/man3/dialog_clear_norefresh.3.gz \
     usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \
     usr/share/man/man3/dialog_fselect.3.gz \
     usr/share/man/man3/dialog_notify.3.gz \
     usr/share/man/man3/dialog_mesgbox.3.gz \
     usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \
     usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \
     usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \
     usr/share/man/man3/restore_helpline.3.gz \
     usr/share/man/man3/dialog_msgbox.3.gz \
     usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \
     usr/share/examples/dialog/README usr/share/examples/dialog/checklist \
     usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \
     usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \
     usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \
     usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \
     usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \
     usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\
     usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\
     usr/share/examples/libdialog/dselect.c \
     usr/share/examples/libdialog/fselect.c \
     usr/share/examples/libdialog/ftree1.c \
     usr/share/examples/libdialog/ftree1.test \
     usr/share/examples/libdialog/ftree2.c \
     usr/share/examples/libdialog/ftree2.test \
     usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \
     usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \
     usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \
     usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \
     usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\
     usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \
     usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c
 OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
 # 20101112: removed gasp.info
 OLD_FILES+=usr/share/info/gasp.info.gz
 # 20101109: machine/mutex.h removed
 OLD_FILES+=usr/include/machine/mutex.h
 # 20101109: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/mptable.h
 .endif
 # 20101101: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/apicreg.h
 OLD_FILES+=usr/include/machine/mca.h
 .endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101018: taskqueue(9) updates
 OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
 # 20101011: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
 # 20101002: removed manpath.config
 OLD_FILES+=etc/manpath.config
 OLD_FILES+=usr/share/examples/etc/manpath.config
 # 20100910: renamed sbuf_overflowed to sbuf_error
 OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz
 # 20100815: retired last traces of chooseproc(9)
 OLD_FILES+=usr/share/man/man9/chooseproc.9.gz
 # 20100806: removal of unused libcompat routines
 OLD_FILES+=usr/share/man/man3/ascftime.3.gz
 OLD_FILES+=usr/share/man/man3/cfree.3.gz
 OLD_FILES+=usr/share/man/man3/cftime.3.gz
 OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100725: acpi_aiboost(4) removal.
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100724: nfsclient/nfs_lock.h moved to nfs/nfs_lock.h
 OLD_FILES+=usr/include/nfsclient/nfs_lock.h
 # 20100720: new clang import which bumps version from 2.0 to 2.8
 OLD_FILES+=usr/include/clang/2.0/emmintrin.h
 OLD_FILES+=usr/include/clang/2.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.0/mmintrin.h
 OLD_FILES+=usr/include/clang/2.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.0
 # 20100706: removed pc-sysinstall's detect-vmware.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/liblzma.so.0
 OLD_LIBS+=usr/lib32/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
 OLD_FILES+=usr/include/mm_malloc.h
 OLD_FILES+=usr/include/pmmintrin.h
 OLD_FILES+=usr/include/xmmintrin.h
 .endif
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
 OLD_FILES+=usr/include/spe.h
 .endif
 # 20100416: [mips] removed <machine/psl.h>
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h
 .endif
 # 20100415: [mips] removed unused headers
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/archtype.h
 OLD_FILES+=usr/include/machine/segments.h
 OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
 OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
 OLD_LIBS+=usr/lib32/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
 OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
 OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
 .endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
 OLD_FILES+=usr/share/examples/bc/primes.b
 OLD_FILES+=usr/share/examples/bc/twins.b
 OLD_FILES+=usr/share/info/dc.info.gz
 OLD_DIRS+=usr/share/examples/bc
 # 20100114: removal of ttyslot(3)
 OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
 # 20100113: remove utmp.h, replace it by utmpx.h
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
 OLD_FILES+=usr/share/man/man5/lastlog.5.gz
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
 OLD_LIBS+=usr/lib32/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample
 OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
 OLD_FILES+=usr/share/examples/pppd/ip-down.sample
 OLD_FILES+=usr/share/examples/pppd/ip-up.sample
 OLD_FILES+=usr/share/examples/pppd/options.sample
 OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
 OLD_DIRS+=usr/share/examples/pppd
 OLD_FILES+=usr/share/examples/slattach/unit-command.sh
 OLD_DIRS+=usr/share/examples/slattach
 OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
 OLD_FILES+=usr/share/examples/sliplogin/slip.login
 OLD_FILES+=usr/share/examples/sliplogin/slip.logout
 OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
 OLD_DIRS+=usr/share/examples/sliplogin
 OLD_FILES+=usr/share/examples/startslip/sldown.sh
 OLD_FILES+=usr/share/examples/startslip/slip.sh
 OLD_FILES+=usr/share/examples/startslip/slup.sh
 OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6.
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6
 OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091117: usr/share/zoneinfo/GMT link removed
 OLD_FILES+=usr/share/zoneinfo/GMT
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed
 OLD_FILES+=usr/share/man/man9/fusword.9.gz
 OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
 OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090812: net80211 documentation overhaul
 OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20101208: libbsnmp was moved to usr/lib
 OLD_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
 OLD_LIBS+=lib/libbegemot.so.3
 OLD_LIBS+=lib/libbsdxml.so.3
 OLD_LIBS+=lib/libbsnmp.so.4
 OLD_LIBS+=lib/libcam.so.4
 OLD_LIBS+=lib/libcrypt.so.4
 OLD_LIBS+=lib/libcrypto.so.5
 OLD_LIBS+=lib/libctf.so.1
 OLD_LIBS+=lib/libdevstat.so.6
 OLD_LIBS+=lib/libdtrace.so.1
 OLD_LIBS+=lib/libedit.so.6
 OLD_LIBS+=lib/libgeom.so.4
 OLD_LIBS+=lib/libipsec.so.3
 OLD_LIBS+=lib/libipx.so.4
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
 OLD_LIBS+=lib/libpcap.so.6
 OLD_LIBS+=lib/libreadline.so.7
 OLD_LIBS+=lib/libsbuf.so.4
 OLD_LIBS+=lib/libufs.so.4
 OLD_LIBS+=lib/libumem.so.1
 OLD_LIBS+=lib/libutil.so.7
 OLD_LIBS+=lib/libuutil.so.1
 OLD_LIBS+=lib/libz.so.4
 OLD_LIBS+=lib/libzfs.so.1
 OLD_LIBS+=lib/libzpool.so.1
 OLD_LIBS+=usr/lib/libarchive.so.4
 OLD_LIBS+=usr/lib/libauditd.so.4
 OLD_LIBS+=usr/lib/libbluetooth.so.3
 OLD_LIBS+=usr/lib/libbsm.so.2
 OLD_LIBS+=usr/lib/libbz2.so.3
 OLD_LIBS+=usr/lib/libcalendar.so.4
 OLD_LIBS+=usr/lib/libcom_err.so.4
 OLD_LIBS+=usr/lib/libdevinfo.so.4
 OLD_LIBS+=usr/lib/libdialog.so.6
 OLD_LIBS+=usr/lib/libdwarf.so.1
 OLD_LIBS+=usr/lib/libfetch.so.5
 OLD_LIBS+=usr/lib/libform.so.4
 OLD_LIBS+=usr/lib/libformw.so.4
 OLD_LIBS+=usr/lib/libftpio.so.7
 OLD_LIBS+=usr/lib/libgnuregex.so.4
 OLD_LIBS+=usr/lib/libgpib.so.2
 OLD_LIBS+=usr/lib/libhistory.so.7
 OLD_LIBS+=usr/lib/libmagic.so.3
 OLD_LIBS+=usr/lib/libmemstat.so.2
 OLD_LIBS+=usr/lib/libmenu.so.4
 OLD_LIBS+=usr/lib/libmenuw.so.4
 OLD_LIBS+=usr/lib/libmilter.so.4
 OLD_LIBS+=usr/lib/libncp.so.3
 OLD_LIBS+=usr/lib/libnetgraph.so.3
 OLD_LIBS+=usr/lib/libngatm.so.3
 OLD_LIBS+=usr/lib/libobjc.so.3
 OLD_LIBS+=usr/lib/libopie.so.5
 OLD_LIBS+=usr/lib/libpam.so.4
 OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
 OLD_LIBS+=usr/lib/libsmb.so.3
 OLD_LIBS+=usr/lib/libssh.so.4
 OLD_LIBS+=usr/lib/libssl.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
 OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
 OLD_LIBS+=usr/lib/pam_deny.so.4
 OLD_LIBS+=usr/lib/pam_echo.so.4
 OLD_LIBS+=usr/lib/pam_exec.so.4
 OLD_LIBS+=usr/lib/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib/pam_group.so.4
 OLD_LIBS+=usr/lib/pam_guest.so.4
 OLD_LIBS+=usr/lib/pam_krb5.so.4
 OLD_LIBS+=usr/lib/pam_ksu.so.4
 OLD_LIBS+=usr/lib/pam_lastlog.so.4
 OLD_LIBS+=usr/lib/pam_login_access.so.4
 OLD_LIBS+=usr/lib/pam_nologin.so.4
 OLD_LIBS+=usr/lib/pam_opie.so.4
 OLD_LIBS+=usr/lib/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib/pam_permit.so.4
 OLD_LIBS+=usr/lib/pam_radius.so.4
 OLD_LIBS+=usr/lib/pam_rhosts.so.4
 OLD_LIBS+=usr/lib/pam_rootok.so.4
 OLD_LIBS+=usr/lib/pam_securetty.so.4
 OLD_LIBS+=usr/lib/pam_self.so.4
 OLD_LIBS+=usr/lib/pam_ssh.so.4
 OLD_LIBS+=usr/lib/pam_tacplus.so.4
 OLD_LIBS+=usr/lib/pam_unix.so.4
 OLD_LIBS+=usr/lib/snmp_atm.so.5
 OLD_LIBS+=usr/lib/snmp_bridge.so.5
 OLD_LIBS+=usr/lib/snmp_hostres.so.5
 OLD_LIBS+=usr/lib/snmp_mibII.so.5
 OLD_LIBS+=usr/lib/snmp_netgraph.so.5
 OLD_LIBS+=usr/lib/snmp_pf.so.5
 OLD_LIBS+=usr/lib32/libalias.so.6
 OLD_LIBS+=usr/lib32/libarchive.so.4
 OLD_LIBS+=usr/lib32/libauditd.so.4
 OLD_LIBS+=usr/lib32/libavl.so.1
 OLD_LIBS+=usr/lib32/libbegemot.so.3
 OLD_LIBS+=usr/lib32/libbluetooth.so.3
 OLD_LIBS+=usr/lib32/libbsdxml.so.3
 OLD_LIBS+=usr/lib32/libbsm.so.2
 OLD_LIBS+=usr/lib32/libbsnmp.so.4
 OLD_LIBS+=usr/lib32/libbz2.so.3
 OLD_LIBS+=usr/lib32/libcalendar.so.4
 OLD_LIBS+=usr/lib32/libcam.so.4
 OLD_LIBS+=usr/lib32/libcom_err.so.4
 OLD_LIBS+=usr/lib32/libcrypt.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.5
 OLD_LIBS+=usr/lib32/libctf.so.1
 OLD_LIBS+=usr/lib32/libdevinfo.so.4
 OLD_LIBS+=usr/lib32/libdevstat.so.6
 OLD_LIBS+=usr/lib32/libdialog.so.6
 OLD_LIBS+=usr/lib32/libdtrace.so.1
 OLD_LIBS+=usr/lib32/libdwarf.so.1
 OLD_LIBS+=usr/lib32/libedit.so.6
 OLD_LIBS+=usr/lib32/libfetch.so.5
 OLD_LIBS+=usr/lib32/libform.so.4
 OLD_LIBS+=usr/lib32/libformw.so.4
 OLD_LIBS+=usr/lib32/libftpio.so.7
 OLD_LIBS+=usr/lib32/libgeom.so.4
 OLD_LIBS+=usr/lib32/libgnuregex.so.4
 OLD_LIBS+=usr/lib32/libgpib.so.2
 OLD_LIBS+=usr/lib32/libhistory.so.7
 OLD_LIBS+=usr/lib32/libipsec.so.3
 OLD_LIBS+=usr/lib32/libipx.so.4
 OLD_LIBS+=usr/lib32/libkiconv.so.3
 OLD_LIBS+=usr/lib32/libkvm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.3
 OLD_LIBS+=usr/lib32/libmd.so.4
 OLD_LIBS+=usr/lib32/libmemstat.so.2
 OLD_LIBS+=usr/lib32/libmenu.so.4
 OLD_LIBS+=usr/lib32/libmenuw.so.4
 OLD_LIBS+=usr/lib32/libmilter.so.4
 OLD_LIBS+=usr/lib32/libncp.so.3
 OLD_LIBS+=usr/lib32/libncurses.so.7
 OLD_LIBS+=usr/lib32/libncursesw.so.7
 OLD_LIBS+=usr/lib32/libnetgraph.so.3
 OLD_LIBS+=usr/lib32/libngatm.so.3
 OLD_LIBS+=usr/lib32/libnvpair.so.1
 OLD_LIBS+=usr/lib32/libobjc.so.3
 OLD_LIBS+=usr/lib32/libopie.so.5
 OLD_LIBS+=usr/lib32/libpam.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.4
 OLD_LIBS+=usr/lib32/libpanelw.so.4
 OLD_LIBS+=usr/lib32/libpcap.so.6
 OLD_LIBS+=usr/lib32/libpmc.so.4
 OLD_LIBS+=usr/lib32/libproc.so.1
 OLD_LIBS+=usr/lib32/libradius.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.7
 OLD_LIBS+=usr/lib32/librpcsvc.so.4
 OLD_LIBS+=usr/lib32/libsbuf.so.4
 OLD_LIBS+=usr/lib32/libsdp.so.3
 OLD_LIBS+=usr/lib32/libsmb.so.3
 OLD_LIBS+=usr/lib32/libssh.so.4
 OLD_LIBS+=usr/lib32/libssl.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.3
 OLD_LIBS+=usr/lib32/libufs.so.4
 OLD_LIBS+=usr/lib32/libugidfw.so.3
 OLD_LIBS+=usr/lib32/libumem.so.1
 OLD_LIBS+=usr/lib32/libusb.so.1
 OLD_LIBS+=usr/lib32/libusbhid.so.3
 OLD_LIBS+=usr/lib32/libutil.so.7
 OLD_LIBS+=usr/lib32/libuutil.so.1
 OLD_LIBS+=usr/lib32/libvgl.so.5
 OLD_LIBS+=usr/lib32/libwrap.so.5
 OLD_LIBS+=usr/lib32/libypclnt.so.3
 OLD_LIBS+=usr/lib32/libz.so.4
 OLD_LIBS+=usr/lib32/libzfs.so.1
 OLD_LIBS+=usr/lib32/libzpool.so.1
 OLD_LIBS+=usr/lib32/pam_chroot.so.4
 OLD_LIBS+=usr/lib32/pam_deny.so.4
 OLD_LIBS+=usr/lib32/pam_echo.so.4
 OLD_LIBS+=usr/lib32/pam_exec.so.4
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib32/pam_group.so.4
 OLD_LIBS+=usr/lib32/pam_guest.so.4
 OLD_LIBS+=usr/lib32/pam_krb5.so.4
 OLD_LIBS+=usr/lib32/pam_ksu.so.4
 OLD_LIBS+=usr/lib32/pam_lastlog.so.4
 OLD_LIBS+=usr/lib32/pam_login_access.so.4
 OLD_LIBS+=usr/lib32/pam_nologin.so.4
 OLD_LIBS+=usr/lib32/pam_opie.so.4
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib32/pam_permit.so.4
 OLD_LIBS+=usr/lib32/pam_radius.so.4
 OLD_LIBS+=usr/lib32/pam_rhosts.so.4
 OLD_LIBS+=usr/lib32/pam_rootok.so.4
 OLD_LIBS+=usr/lib32/pam_securetty.so.4
 OLD_LIBS+=usr/lib32/pam_self.so.4
 OLD_LIBS+=usr/lib32/pam_ssh.so.4
 OLD_LIBS+=usr/lib32/pam_tacplus.so.4
 OLD_LIBS+=usr/lib32/pam_unix.so.4
 # 20090718: the gdm pam.d file is no longer required.
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
 OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed.
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
 # 20090712: ieee80211.4 -> net80211.4
 OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
 # 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
 OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
 OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
 OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)
 OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
 # 20090623: number of headers needed for a usb driver reduced
 OLD_FILES+=usr/include/dev/usb/usb_defs.h
 OLD_FILES+=usr/include/dev/usb/usb_error.h
 OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
 OLD_FILES+=usr/include/dev/usb/usb_hid.h
 OLD_FILES+=usr/include/dev/usb/usb_lookup.h
 OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
 OLD_FILES+=usr/include/dev/usb/usb_parse.h
 OLD_FILES+=usr/include/dev/usb/usb_revision.h
 # 20090609: devclass_add_driver is no longer public
 OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
 # 20090605: removal of clists
 OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090531: bind 9.6.1rc1 import
 OLD_LIBS+=usr/lib/liblwres.so.30
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 # 20090527: removal of legacy USB stack
 OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/hid.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
 OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
 OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
 OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
 OLD_DIRS+=usr/include/legacy/dev/usb
 OLD_DIRS+=usr/include/legacy/dev
 OLD_DIRS+=usr/include/legacy
 # 20090526: removal of makekey(8)
 OLD_FILES+=usr/libexec/makekey
 OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd
 OLD_FILES+=sbin/mount_nfs4
 OLD_FILES+=usr/share/man/man8/idmapd.8.gz
 OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
 # 20090513: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
 # 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
 OLD_FILES+=usr/sbin/raycontrol
 OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
 OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
 OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
 # 20090406: usb_sw_transfer.h removed
 OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
 OLD_FILES+=usr/include/net/if_ppp.h
 OLD_FILES+=usr/include/net/if_pppvar.h
 OLD_FILES+=usr/include/net/if_slvar.h
 OLD_FILES+=usr/include/net/ppp_comp.h
 OLD_FILES+=usr/include/net/slip.h
 OLD_FILES+=usr/sbin/sliplogin
 OLD_FILES+=usr/sbin/slstat
 OLD_FILES+=usr/sbin/pppd
 OLD_FILES+=usr/sbin/pppstats
 OLD_FILES+=usr/share/man/man1/startslip.1.gz
 OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
 OLD_FILES+=usr/share/man/man4/if_sl.4.gz
 OLD_FILES+=usr/share/man/man4/ppp.4.gz
 OLD_FILES+=usr/share/man/man4/sl.4.gz
 OLD_FILES+=usr/share/man/man8/pppd.8.gz
 OLD_FILES+=usr/share/man/man8/pppstats.8.gz
 OLD_FILES+=usr/share/man/man8/slattach.8.gz
 OLD_FILES+=usr/share/man/man8/slip.8.gz
 OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
 OLD_FILES+=usr/share/man/man8/slstat.8.gz
 # 20090321: libpcap upgraded to 1.0.0
 OLD_LIBS+=lib/libpcap.so.5
 OLD_LIBS+=usr/lib32/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 OLD_FILES+=usr/share/man/man4/k8temp.4.gz
 # 20090308: libusb.so.1 renamed
 OLD_LIBS+=usr/lib/libusb20.so.1
 OLD_FILES+=usr/lib/libusb20.a
 OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
 OLD_FILES+=usr/include/libusb20_compat10.h
 OLD_LIBS+=usr/lib32/libusb20.so.1
 OLD_FILES+=usr/lib32/libusb20.a
 OLD_FILES+=usr/lib32/libusb20.so
 OLD_FILES+=usr/lib32/libusb20_p.a
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 OLD_LIBS+=usr/lib32/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h
 OLD_DIRS+=usr/include/dev/usb2/include
 OLD_DIRS+=usr/include/dev/usb2
 OLD_FILES+=usr/include/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/dev/usb/hid.h
 OLD_FILES+=usr/include/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h
 OLD_FILES+=usr/include/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/dev/usb/ubser.h
 OLD_FILES+=usr/include/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/dev/usb/udbp.h
 OLD_FILES+=usr/include/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h
 OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 OLD_FILES+=usr/sbin/usbdevs
 OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h
 OLD_DIRS+=usr/include/pccard
 # 20090203: adding_user.8 moved to adding_user.7
 OLD_FILES+=usr/share/man/man8/adding_user.8.gz
 # 20090102: file 4.26 import
 OLD_FILES+=usr/share/misc/magic.mime
 OLD_FILES+=usr/share/misc/magic.mime.mgc
 # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
 # 20081223: ipprotosw.h removed
 OLD_FILES+=usr/include/netinet/ipprotosw.h
 # 20081123: vfs_mountedon.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
 # 20081023: FREE.9 and MALLOC.9 removed
 OLD_FILES+=usr/share/man/man9/FREE.9.gz
 OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
 OLD_FILES+=usr/share/man/man9/minor.9.gz
 OLD_FILES+=usr/share/man/man9/umajor.9.gz
 OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
 OLD_FILES+=usr/share/man/man9/suser.9.gz
 OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
 # 20080822: ntp 4.2.4p5 import
 OLD_FILES+=usr/share/doc/ntp/driver23.html
 OLD_FILES+=usr/share/doc/ntp/driver24.html
 # 20080821: several man pages moved from man4.i386 to man4
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man4/i386/io.4.gz
 OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
 .endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel
 OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
 .endif
 # 20080704: sbsh(4) removed
 OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
 OLD_FILES+=usr/share/man/man4/sbsh.4.gz
 # 20080704: cnw(4) removed
 OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
 OLD_FILES+=usr/share/man/man4/cnw.4.gz
 # 20080704: oltr(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
 OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
 .endif
 # 20080704: arl(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/arlcontrol
 OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
 OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 .endif
 # 20080703: sunlabel only for sparc64
 .if ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: pecoff image activator removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pecoff_machdep.h
 .endif
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h
 OLD_FILES+=usr/share/man/man3/gtty.3.gz
 OLD_FILES+=usr/share/man/man3/stty.3.gz
 # 20080609: gpt(8) removed
 OLD_FILES+=sbin/gpt
 OLD_FILES+=usr/share/man/man8/gpt.8.gz
 # 20080525: I4B removed
 OLD_FILES+=etc/isdn/answer
 OLD_FILES+=etc/isdn/isdntel
 OLD_FILES+=etc/isdn/record
 OLD_FILES+=etc/isdn/tell
 OLD_FILES+=etc/isdn/tell-record
 OLD_FILES+=etc/isdn/unknown_incoming
 OLD_FILES+=etc/isdn/holidays.D
 OLD_FILES+=etc/isdn/isdnd.rates.A
 OLD_FILES+=etc/isdn/isdnd.rates.D
 OLD_FILES+=etc/isdn/isdnd.rates.F
 OLD_FILES+=etc/isdn/isdnd.rates.L
 OLD_FILES+=etc/isdn/isdnd.rates.UK.BT
 OLD_FILES+=etc/isdn/isdnd.rc.sample
 OLD_FILES+=etc/isdn/isdntel.alias.sample
 OLD_DIRS+=etc/isdn
 OLD_FILES+=etc/rc.d/isdnd
 OLD_FILES+=usr/include/i4b/i4b_cause.h
 OLD_FILES+=usr/include/i4b/i4b_debug.h
 OLD_FILES+=usr/include/i4b/i4b_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_trace.h
 OLD_DIRS+=usr/include/i4b
 OLD_FILES+=usr/sbin/dtmfdecode
 OLD_FILES+=usr/sbin/g711conv
 OLD_FILES+=usr/sbin/isdnd
 OLD_FILES+=usr/sbin/isdndebug
 OLD_FILES+=usr/sbin/isdndecode
 OLD_FILES+=usr/sbin/isdnmonitor
 OLD_FILES+=usr/sbin/isdnphone
 OLD_FILES+=usr/sbin/isdntel
 OLD_FILES+=usr/sbin/isdntelctl
 OLD_FILES+=usr/sbin/isdntrace
 OLD_FILES+=usr/share/isdn/0.al
 OLD_FILES+=usr/share/isdn/1.al
 OLD_FILES+=usr/share/isdn/2.al
 OLD_FILES+=usr/share/isdn/3.al
 OLD_FILES+=usr/share/isdn/4.al
 OLD_FILES+=usr/share/isdn/5.al
 OLD_FILES+=usr/share/isdn/6.al
 OLD_FILES+=usr/share/isdn/7.al
 OLD_FILES+=usr/share/isdn/8.al
 OLD_FILES+=usr/share/isdn/9.al
 OLD_FILES+=usr/share/isdn/beep.al
 OLD_FILES+=usr/share/isdn/msg.al
 OLD_DIRS+=usr/share/isdn
 OLD_FILES+=usr/share/man/man1/dtmfdecode.1.gz
 OLD_FILES+=usr/share/man/man1/g711conv.1.gz
 OLD_FILES+=usr/share/man/man4/i4b.4.gz
 OLD_FILES+=usr/share/man/man4/i4bcapi.4.gz
 OLD_FILES+=usr/share/man/man4/i4bctl.4.gz
 OLD_FILES+=usr/share/man/man4/i4bing.4.gz
 OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
 OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq921.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq931.4.gz
 OLD_FILES+=usr/share/man/man4/i4brbch.4.gz
 OLD_FILES+=usr/share/man/man4/i4btel.4.gz
 OLD_FILES+=usr/share/man/man4/i4btrc.4.gz
 OLD_FILES+=usr/share/man/man4/iavc.4.gz
 OLD_FILES+=usr/share/man/man4/isic.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi2.4.gz
 OLD_FILES+=usr/share/man/man4/ifpnp.4.gz
 OLD_FILES+=usr/share/man/man4/ihfc.4.gz
 OLD_FILES+=usr/share/man/man4/itjc.4.gz
 OLD_FILES+=usr/share/man/man4/iwic.4.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rc.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rates.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.acct.5.gz
 OLD_FILES+=usr/share/man/man8/isdnd.8.gz
 OLD_FILES+=usr/share/man/man8/isdndebug.8.gz
 OLD_FILES+=usr/share/man/man8/isdndecode.8.gz
 OLD_FILES+=usr/share/man/man8/isdnmonitor.8.gz
 OLD_FILES+=usr/share/man/man8/isdnphone.8.gz
 OLD_FILES+=usr/share/man/man8/isdntel.8.gz
 OLD_FILES+=usr/share/man/man8/isdntelctl.8.gz
 OLD_FILES+=usr/share/man/man8/isdntrace.8.gz
 OLD_FILES+=usr/share/examples/isdn/contrib/README
 OLD_FILES+=usr/share/examples/isdn/contrib/anleitung.ppp
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.c
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/convert.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/hplay.c
 OLD_FILES+=usr/share/examples/isdn/contrib/i4b-ppp-newbie.txt
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnctl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct.pl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdntelmux.c
 OLD_FILES+=usr/share/examples/isdn/contrib/mrtg-isp0.sh
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/Makefile
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/README
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.8
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.c
 OLD_FILES+=usr/share/examples/isdn/v21/Makefile
 OLD_FILES+=usr/share/examples/isdn/v21/README
 OLD_FILES+=usr/share/examples/isdn/v21/v21modem.c
 OLD_FILES+=usr/share/examples/isdn/FAQ
 OLD_FILES+=usr/share/examples/isdn/KERNEL
 OLD_FILES+=usr/share/examples/isdn/Overview
 OLD_FILES+=usr/share/examples/isdn/README
 OLD_FILES+=usr/share/examples/isdn/ROADMAP
 OLD_FILES+=usr/share/examples/isdn/ReleaseNotes
 OLD_FILES+=usr/share/examples/isdn/Resources
 OLD_FILES+=usr/share/examples/isdn/SupportedCards
 OLD_FILES+=usr/share/examples/isdn/ThankYou
 OLD_DIRS+=usr/share/examples/isdn/contrib
 OLD_DIRS+=usr/share/examples/isdn/i4brunppp
 OLD_DIRS+=usr/share/examples/isdn/v21
 OLD_DIRS+=usr/share/examples/isdn
 OLD_FILES+=usr/share/examples/ppp/isdnd.rc
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
 # 20080525: ng_atmpif removed
 OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
 OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
 # 20080522: pmap_addr_hint removed
 OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
 # 20080517: ipsec_osdep.h removed
 OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
 # 20080507: heimdal 1.1 import
 OLD_LIBS+=usr/lib/libasn1.so.9
 OLD_LIBS+=usr/lib/libgssapi.so.9
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
 OLD_LIBS+=usr/lib/libhdb.so.9
 OLD_LIBS+=usr/lib/libkadm5clnt.so.9
 OLD_LIBS+=usr/lib/libkadm5srv.so.9
 OLD_LIBS+=usr/lib/libkafs5.so.9
 OLD_LIBS+=usr/lib/libkrb5.so.9
 OLD_LIBS+=usr/lib/libroken.so.9
 OLD_LIBS+=usr/lib32/libgssapi.so.9
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
 OLD_FILES+=usr/share/man/man4/awi.4.gz
 OLD_FILES+=usr/share/man/man4/if_awi.4.gz
 # 20080331: pkg_sign has been removed
 OLD_FILES+=usr/sbin/pkg_check
 OLD_FILES+=usr/sbin/pkg_sign
 OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080314: stack_print(9) mlink fixed
 OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
 # 20080312: libkse removal
 OLD_FILES+=usr/include/sys/kse.h
 OLD_FILES+=usr/lib/libkse.so
 OLD_LIBS+=usr/lib/libkse.so.3
 OLD_FILES+=usr/share/man/man2/kse.2.gz
 OLD_FILES+=usr/share/man/man2/kse_create.2.gz
 OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
 OLD_FILES+=usr/share/man/man2/kse_release.2.gz
 OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
 OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 OLD_FILES+=usr/lib32/libkse.so
 OLD_LIBS+=usr/lib32/libkse.so.3
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 OLD_FILES+=usr/share/man/man1/bsdar.1.gz
 OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz
 # 20080122: Removed from the tree
 OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
 OLD_FILES+=usr/lib32/libkse.a
 OLD_FILES+=usr/lib32/libkse_p.a
 OLD_FILES+=usr/lib32/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superseded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
 OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
 OLD_FILES+=usr/share/man/man8/cached.8.gz
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
 .endif
 # 20070801: fast_ipsec.4 gone
 OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
 # 20070715: netatm temporarily disconnected (removed 20080525)
 OLD_FILES+=rescue/atm
 OLD_FILES+=rescue/fore_dnld
 OLD_FILES+=rescue/ilmid
 OLD_FILES+=sbin/atm
 OLD_FILES+=sbin/fore_dnld
 OLD_FILES+=sbin/ilmid
 OLD_FILES+=usr/include/libatm.h
 OLD_FILES+=usr/include/netatm/atm.h
 OLD_FILES+=usr/include/netatm/atm_cm.h
 OLD_FILES+=usr/include/netatm/atm_if.h
 OLD_FILES+=usr/include/netatm/atm_ioctl.h
 OLD_FILES+=usr/include/netatm/atm_pcb.h
 OLD_FILES+=usr/include/netatm/atm_sap.h
 OLD_FILES+=usr/include/netatm/atm_sigmgr.h
 OLD_FILES+=usr/include/netatm/atm_stack.h
 OLD_FILES+=usr/include/netatm/atm_sys.h
 OLD_FILES+=usr/include/netatm/atm_var.h
 OLD_FILES+=usr/include/netatm/atm_vc.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
 OLD_FILES+=usr/include/netatm/port.h
 OLD_FILES+=usr/include/netatm/queue.h
 OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
 OLD_FILES+=usr/include/netatm/spans/spans_cls.h
 OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
 OLD_FILES+=usr/include/netatm/spans/spans_var.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
 OLD_FILES+=usr/include/netatm/uni/sscop.h
 OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
 OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
 OLD_FILES+=usr/include/netatm/uni/sscop_var.h
 OLD_FILES+=usr/include/netatm/uni/uni.h
 OLD_FILES+=usr/include/netatm/uni/uniip_var.h
 OLD_FILES+=usr/include/netatm/uni/unisig.h
 OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
 OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
 OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
 OLD_FILES+=usr/include/netatm/uni/unisig_print.h
 OLD_FILES+=usr/include/netatm/uni/unisig_var.h
 OLD_FILES+=usr/lib/libatm.a
 OLD_FILES+=usr/lib/libatm_p.a
 OLD_FILES+=usr/sbin/atmarpd
 OLD_FILES+=usr/sbin/scspd
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
 OLD_FILES+=usr/share/man/man8/atm.8.gz
 OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/man8/scspd.8.gz
 OLD_FILES+=usr/share/examples/atm/NOTES
 OLD_FILES+=usr/share/examples/atm/README
 OLD_FILES+=usr/share/examples/atm/Startup
 OLD_FILES+=usr/share/examples/atm/atm-config.sh
 OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
 OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
 OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
 OLD_LIBS+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
 OLD_FILES+=usr/lib32/libatm.a
 OLD_FILES+=usr/lib32/libatm.so
 OLD_LIBS+=usr/lib32/libatm.so.5
 OLD_FILES+=usr/lib32/libatm_p.a
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 OLD_FILES+=usr/include/machine/i4b_debug.h
 OLD_FILES+=usr/include/machine/i4b_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_trace.h
 .endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
 OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
 OLD_FILES+=usr/include/netinet6/esp.h
 OLD_FILES+=usr/include/netinet6/esp6.h
 OLD_FILES+=usr/include/netinet6/esp_aesctr.h
 OLD_FILES+=usr/include/netinet6/esp_camellia.h
 OLD_FILES+=usr/include/netinet6/esp_rijndael.h
 OLD_FILES+=usr/include/netinet6/ipsec.h
 OLD_FILES+=usr/include/netinet6/ipsec6.h
 OLD_FILES+=usr/include/netinet6/ipcomp.h
 OLD_FILES+=usr/include/netinet6/ipcomp6.h
 OLD_FILES+=usr/include/netkey/key.h
 OLD_FILES+=usr/include/netkey/key_debug.h
 OLD_FILES+=usr/include/netkey/key_var.h
 OLD_FILES+=usr/include/netkey/keydb.h
 OLD_FILES+=usr/include/netkey/keysock.h
 OLD_DIRS+=usr/include/netkey
 # 20070701: remove wicontrol
 OLD_FILES+=usr/sbin/wicontrol
 OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
 # 20070625: umapfs removal
 OLD_FILES+=rescue/mount_umapfs
 OLD_FILES+=sbin/mount_umapfs
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
 # 20070618: Removal of the PROTO.localhost* files
 OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=etc/namedb/PROTO.localhost.rev
 OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3
 OLD_LIBS+=lib/libncurses.so.6
 OLD_LIBS+=lib/libncursesw.so.6
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
 OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
 OLD_LIBS+=usr/lib/pam_deny.so.3
 OLD_LIBS+=usr/lib/pam_echo.so.3
 OLD_LIBS+=usr/lib/pam_exec.so.3
 OLD_LIBS+=usr/lib/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib/pam_group.so.3
 OLD_LIBS+=usr/lib/pam_guest.so.3
 OLD_LIBS+=usr/lib/pam_krb5.so.3
 OLD_LIBS+=usr/lib/pam_ksu.so.3
 OLD_LIBS+=usr/lib/pam_lastlog.so.3
 OLD_LIBS+=usr/lib/pam_login_access.so.3
 OLD_LIBS+=usr/lib/pam_nologin.so.3
 OLD_LIBS+=usr/lib/pam_opie.so.3
 OLD_LIBS+=usr/lib/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib/pam_permit.so.3
 OLD_LIBS+=usr/lib/pam_radius.so.3
 OLD_LIBS+=usr/lib/pam_rhosts.so.3
 OLD_LIBS+=usr/lib/pam_rootok.so.3
 OLD_LIBS+=usr/lib/pam_securetty.so.3
 OLD_LIBS+=usr/lib/pam_self.so.3
 OLD_LIBS+=usr/lib/pam_ssh.so.3
 OLD_LIBS+=usr/lib/pam_tacplus.so.3
 OLD_LIBS+=usr/lib/pam_unix.so.3
 OLD_LIBS+=usr/lib/snmp_atm.so.4
 OLD_LIBS+=usr/lib/snmp_bridge.so.4
 OLD_LIBS+=usr/lib/snmp_hostres.so.4
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
 OLD_LIBS+=usr/lib32/libalias.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.3
 OLD_LIBS+=usr/lib32/libdialog.so.5
 OLD_LIBS+=usr/lib32/libgnuregex.so.3
 OLD_LIBS+=usr/lib32/libhistory.so.6
 OLD_LIBS+=usr/lib32/libncurses.so.6
 OLD_LIBS+=usr/lib32/libncursesw.so.6
 OLD_LIBS+=usr/lib32/libpam.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.6
 OLD_LIBS+=usr/lib32/libssh.so.3
 OLD_LIBS+=usr/lib32/pam_chroot.so.3
 OLD_LIBS+=usr/lib32/pam_deny.so.3
 OLD_LIBS+=usr/lib32/pam_echo.so.3
 OLD_LIBS+=usr/lib32/pam_exec.so.3
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib32/pam_group.so.3
 OLD_LIBS+=usr/lib32/pam_guest.so.3
 OLD_LIBS+=usr/lib32/pam_krb5.so.3
 OLD_LIBS+=usr/lib32/pam_ksu.so.3
 OLD_LIBS+=usr/lib32/pam_lastlog.so.3
 OLD_LIBS+=usr/lib32/pam_login_access.so.3
 OLD_LIBS+=usr/lib32/pam_nologin.so.3
 OLD_LIBS+=usr/lib32/pam_opie.so.3
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib32/pam_permit.so.3
 OLD_LIBS+=usr/lib32/pam_radius.so.3
 OLD_LIBS+=usr/lib32/pam_rhosts.so.3
 OLD_LIBS+=usr/lib32/pam_rootok.so.3
 OLD_LIBS+=usr/lib32/pam_securetty.so.3
 OLD_LIBS+=usr/lib32/pam_self.so.3
 OLD_LIBS+=usr/lib32/pam_ssh.so.3
 OLD_LIBS+=usr/lib32/pam_tacplus.so.3
 OLD_LIBS+=usr/lib32/pam_unix.so.3
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
 OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
 OLD_LIBS+=lib/libbsdxml.so.2
 OLD_LIBS+=lib/libcam.so.3
 OLD_LIBS+=lib/libcrypt.so.3
 OLD_LIBS+=lib/libdevstat.so.5
 OLD_LIBS+=lib/libedit.so.5
 OLD_LIBS+=lib/libgeom.so.3
 OLD_LIBS+=lib/libipsec.so.2
 OLD_LIBS+=lib/libipx.so.3
 OLD_LIBS+=lib/libkiconv.so.2
 OLD_LIBS+=lib/libkse.so.2
 OLD_LIBS+=lib/libkvm.so.3
 OLD_LIBS+=lib/libm.so.4
 OLD_LIBS+=lib/libmd.so.3
 OLD_LIBS+=lib/libpcap.so.4
 OLD_LIBS+=lib/libpthread.so.2
 OLD_LIBS+=lib/libsbuf.so.3
 OLD_LIBS+=lib/libthr.so.2
 OLD_LIBS+=lib/libufs.so.3
 OLD_LIBS+=lib/libutil.so.6
 OLD_LIBS+=lib/libz.so.3
 OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_LIBS+=usr/lib/libbsm.so.1
 OLD_LIBS+=usr/lib/libbz2.so.2
 OLD_LIBS+=usr/lib/libcalendar.so.3
 OLD_LIBS+=usr/lib/libcom_err.so.3
 OLD_LIBS+=usr/lib/libdevinfo.so.3
 OLD_LIBS+=usr/lib/libfetch.so.4
 OLD_LIBS+=usr/lib/libform.so.3
 OLD_LIBS+=usr/lib/libformw.so.3
 OLD_LIBS+=usr/lib/libftpio.so.6
 OLD_LIBS+=usr/lib/libgpib.so.1
 OLD_LIBS+=usr/lib/libkse.so.2
 OLD_LIBS+=usr/lib/libmagic.so.2
 OLD_LIBS+=usr/lib/libmemstat.so.1
 OLD_LIBS+=usr/lib/libmenu.so.3
 OLD_LIBS+=usr/lib/libmenuw.so.3
 OLD_LIBS+=usr/lib/libmilter.so.3
 OLD_LIBS+=usr/lib/libmp.so.5
 OLD_LIBS+=usr/lib/libncp.so.2
 OLD_LIBS+=usr/lib/libnetgraph.so.2
 OLD_LIBS+=usr/lib/libngatm.so.2
 OLD_LIBS+=usr/lib/libopie.so.4
 OLD_LIBS+=usr/lib/libpanel.so.3
 OLD_LIBS+=usr/lib/libpanelw.so.3
 OLD_LIBS+=usr/lib/libpmc.so.3
 OLD_LIBS+=usr/lib/libradius.so.2
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
 OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2
 OLD_LIBS+=usr/lib/libugidfw.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.2
 OLD_LIBS+=usr/lib/libvgl.so.4
 OLD_LIBS+=usr/lib/libwrap.so.4
 OLD_LIBS+=usr/lib/libypclnt.so.2
 OLD_LIBS+=usr/lib/snmp_bridge.so.3
 OLD_LIBS+=usr/lib/snmp_hostres.so.3
 OLD_LIBS+=usr/lib32/libatm.so.4
 OLD_LIBS+=usr/lib32/libbegemot.so.2
 OLD_LIBS+=usr/lib32/libbluetooth.so.2
 OLD_LIBS+=usr/lib32/libbsdxml.so.2
 OLD_LIBS+=usr/lib32/libbsm.so.1
 OLD_LIBS+=usr/lib32/libbz2.so.2
 OLD_LIBS+=usr/lib32/libcalendar.so.3
 OLD_LIBS+=usr/lib32/libcam.so.3
 OLD_LIBS+=usr/lib32/libcom_err.so.3
 OLD_LIBS+=usr/lib32/libcrypt.so.3
 OLD_LIBS+=usr/lib32/libdevinfo.so.3
 OLD_LIBS+=usr/lib32/libdevstat.so.5
 OLD_LIBS+=usr/lib32/libedit.so.5
 OLD_LIBS+=usr/lib32/libfetch.so.4
 OLD_LIBS+=usr/lib32/libform.so.3
 OLD_LIBS+=usr/lib32/libformw.so.3
 OLD_LIBS+=usr/lib32/libftpio.so.6
 OLD_LIBS+=usr/lib32/libgeom.so.3
 OLD_LIBS+=usr/lib32/libgpib.so.1
 OLD_LIBS+=usr/lib32/libipsec.so.2
 OLD_LIBS+=usr/lib32/libipx.so.3
 OLD_LIBS+=usr/lib32/libkiconv.so.2
 OLD_LIBS+=usr/lib32/libkse.so.2
 OLD_LIBS+=usr/lib32/libkvm.so.3
 OLD_LIBS+=usr/lib32/libm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.2
 OLD_LIBS+=usr/lib32/libmd.so.3
 OLD_LIBS+=usr/lib32/libmemstat.so.1
 OLD_LIBS+=usr/lib32/libmenu.so.3
 OLD_LIBS+=usr/lib32/libmenuw.so.3
 OLD_LIBS+=usr/lib32/libmilter.so.3
 OLD_LIBS+=usr/lib32/libmp.so.5
 OLD_LIBS+=usr/lib32/libncp.so.2
 OLD_LIBS+=usr/lib32/libnetgraph.so.2
 OLD_LIBS+=usr/lib32/libngatm.so.2
 OLD_LIBS+=usr/lib32/libopie.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.3
 OLD_LIBS+=usr/lib32/libpanelw.so.3
 OLD_LIBS+=usr/lib32/libpcap.so.4
 OLD_LIBS+=usr/lib32/libpmc.so.3
 OLD_LIBS+=usr/lib32/libpthread.so.2
 OLD_LIBS+=usr/lib32/libradius.so.2
 OLD_LIBS+=usr/lib32/librpcsvc.so.3
 OLD_LIBS+=usr/lib32/libsbuf.so.3
 OLD_LIBS+=usr/lib32/libsdp.so.2
 OLD_LIBS+=usr/lib32/libsmb.so.2
 OLD_LIBS+=usr/lib32/libstdc++.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.2
 OLD_LIBS+=usr/lib32/libthr.so.2
 OLD_LIBS+=usr/lib32/libthread_db.so.2
 OLD_LIBS+=usr/lib32/libufs.so.3
 OLD_LIBS+=usr/lib32/libugidfw.so.2
 OLD_LIBS+=usr/lib32/libusbhid.so.2
 OLD_LIBS+=usr/lib32/libutil.so.6
 OLD_LIBS+=usr/lib32/libvgl.so.4
 OLD_LIBS+=usr/lib32/libwrap.so.4
 OLD_LIBS+=usr/lib32/libypclnt.so.2
 OLD_LIBS+=usr/lib32/libz.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 OLD_FILES+=usr/include/g2c.h
 OLD_FILES+=usr/libexec/f771
 OLD_FILES+=usr/share/info/g77.info.gz
 OLD_FILES+=usr/share/man/man1/f77.1.gz
 OLD_FILES+=usr/include/c++/3.4/algorithm
 OLD_FILES+=usr/include/c++/3.4/backward/algo.h
 OLD_FILES+=usr/include/c++/3.4/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.4/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.4/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.4/backward/complex.h
 OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/deque.h
 OLD_FILES+=usr/include/c++/3.4/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.4/backward/function.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/backward/heap.h
 OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.4/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/istream.h
 OLD_FILES+=usr/include/c++/3.4/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.4/backward/list.h
 OLD_FILES+=usr/include/c++/3.4/backward/map.h
 OLD_FILES+=usr/include/c++/3.4/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.4/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.4/backward/new.h
 OLD_FILES+=usr/include/c++/3.4/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/pair.h
 OLD_FILES+=usr/include/c++/3.4/backward/queue.h
 OLD_FILES+=usr/include/c++/3.4/backward/rope.h
 OLD_FILES+=usr/include/c++/3.4/backward/set.h
 OLD_FILES+=usr/include/c++/3.4/backward/slist.h
 OLD_FILES+=usr/include/c++/3.4/backward/stack.h
 OLD_FILES+=usr/include/c++/3.4/backward/stream.h
 OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/strstream
 OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/tree.h
 OLD_FILES+=usr/include/c++/3.4/backward/vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h
 OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/postypes.h
 OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc
 OLD_FILES+=usr/include/c++/3.4/bitset
 OLD_FILES+=usr/include/c++/3.4/cassert
 OLD_FILES+=usr/include/c++/3.4/cctype
 OLD_FILES+=usr/include/c++/3.4/cerrno
 OLD_FILES+=usr/include/c++/3.4/cfloat
 OLD_FILES+=usr/include/c++/3.4/ciso646
 OLD_FILES+=usr/include/c++/3.4/climits
 OLD_FILES+=usr/include/c++/3.4/clocale
 OLD_FILES+=usr/include/c++/3.4/cmath
 OLD_FILES+=usr/include/c++/3.4/complex
 OLD_FILES+=usr/include/c++/3.4/csetjmp
 OLD_FILES+=usr/include/c++/3.4/csignal
 OLD_FILES+=usr/include/c++/3.4/cstdarg
 OLD_FILES+=usr/include/c++/3.4/cstddef
 OLD_FILES+=usr/include/c++/3.4/cstdio
 OLD_FILES+=usr/include/c++/3.4/cstdlib
 OLD_FILES+=usr/include/c++/3.4/cstring
 OLD_FILES+=usr/include/c++/3.4/ctime
 OLD_FILES+=usr/include/c++/3.4/cwchar
 OLD_FILES+=usr/include/c++/3.4/cwctype
 OLD_FILES+=usr/include/c++/3.4/cxxabi.h
 OLD_FILES+=usr/include/c++/3.4/debug/bitset
 OLD_FILES+=usr/include/c++/3.4/debug/debug.h
 OLD_FILES+=usr/include/c++/3.4/debug/deque
 OLD_FILES+=usr/include/c++/3.4/debug/formatter.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/debug/list
 OLD_FILES+=usr/include/c++/3.4/debug/map
 OLD_FILES+=usr/include/c++/3.4/debug/map.h
 OLD_FILES+=usr/include/c++/3.4/debug/multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/3.4/debug/set
 OLD_FILES+=usr/include/c++/3.4/debug/set.h
 OLD_FILES+=usr/include/c++/3.4/debug/string
 OLD_FILES+=usr/include/c++/3.4/debug/vector
 OLD_FILES+=usr/include/c++/3.4/deque
 OLD_FILES+=usr/include/c++/3.4/exception
 OLD_FILES+=usr/include/c++/3.4/exception_defines.h
 OLD_FILES+=usr/include/c++/3.4/ext/algorithm
 OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/functional
 OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/3.4/ext/hash_map
 OLD_FILES+=usr/include/c++/3.4/ext/hash_set
 OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/ext/iterator
 OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/memory
 OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/numeric
 OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.4/ext/rope
 OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.4/ext/slist
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/fstream
 OLD_FILES+=usr/include/c++/3.4/functional
 OLD_FILES+=usr/include/c++/3.4/iomanip
 OLD_FILES+=usr/include/c++/3.4/ios
 OLD_FILES+=usr/include/c++/3.4/iosfwd
 OLD_FILES+=usr/include/c++/3.4/iostream
 OLD_FILES+=usr/include/c++/3.4/istream
 OLD_FILES+=usr/include/c++/3.4/iterator
 OLD_FILES+=usr/include/c++/3.4/limits
 OLD_FILES+=usr/include/c++/3.4/list
 OLD_FILES+=usr/include/c++/3.4/locale
 OLD_FILES+=usr/include/c++/3.4/map
 OLD_FILES+=usr/include/c++/3.4/memory
 OLD_FILES+=usr/include/c++/3.4/new
 OLD_FILES+=usr/include/c++/3.4/numeric
 OLD_FILES+=usr/include/c++/3.4/ostream
 OLD_FILES+=usr/include/c++/3.4/queue
 OLD_FILES+=usr/include/c++/3.4/set
 OLD_FILES+=usr/include/c++/3.4/sstream
 OLD_FILES+=usr/include/c++/3.4/stack
 OLD_FILES+=usr/include/c++/3.4/stdexcept
 OLD_FILES+=usr/include/c++/3.4/streambuf
 OLD_FILES+=usr/include/c++/3.4/string
 OLD_FILES+=usr/include/c++/3.4/typeinfo
 OLD_FILES+=usr/include/c++/3.4/utility
 OLD_FILES+=usr/include/c++/3.4/valarray
 OLD_FILES+=usr/include/c++/3.4/vector
 OLD_DIRS+=usr/include/c++/3.4/backward
 OLD_DIRS+=usr/include/c++/3.4/bits
 OLD_DIRS+=usr/include/c++/3.4/debug
 OLD_DIRS+=usr/include/c++/3.4/ext
 OLD_DIRS+=usr/include/c++/3.4
 # 20070510: zpool/zfs moved to /sbin
 OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
 OLD_FILES+=usr/include/net/if_trunk.h
 # 20070409: uuidgen moved to /bin/
 OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
 OLD_LIBS+=usr/lib32/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
 # 20070225: vm_page_unmanage() removed
 OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz
 # 20070216: VFS_VPTOFH(9) -> VOP_VPTOFH(9)
 OLD_FILES+=usr/share/man/man9/VFS_VPTOFH.9.gz
 # 20070212: kame.4 removed
 OLD_FILES+=usr/share/man/man4/kame.4.gz
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
 OLD_FILES+=usr/lib/libmytinfo_p.a
 OLD_FILES+=usr/lib/libmytinfow.a
 OLD_FILES+=usr/lib/libmytinfow.so
 OLD_FILES+=usr/lib/libmytinfow_p.a
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
 OLD_FILES+=usr/lib32/libmytinfow.a
 OLD_FILES+=usr/lib32/libmytinfow.so
 OLD_FILES+=usr/lib32/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 OLD_FILES+=usr/include/net/bpf_compat.h
 # 20070125: objformat bites the dust
 OLD_FILES+=usr/bin/objformat
 OLD_FILES+=usr/share/man/man1/objformat.1.gz
 OLD_FILES+=usr/include/objformat.h
 OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061201: remove symlink to *.so.4 libalias modules
 OLD_FILES+=usr/lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_dummy.so
 OLD_FILES+=usr/lib/libalias_ftp.so
 OLD_FILES+=usr/lib/libalias_irc.so
 OLD_FILES+=usr/lib/libalias_nbt.so
 OLD_FILES+=usr/lib/libalias_pptp.so
 OLD_FILES+=usr/lib/libalias_skinny.so
 OLD_FILES+=usr/lib/libalias_smedia.so
 # 20061201: remove old *.so.4 libalias modules
 OLD_FILES+=lib/libalias_cuseeme.so.4
 OLD_FILES+=lib/libalias_dummy.so.4
 OLD_FILES+=lib/libalias_ftp.so.4
 OLD_FILES+=lib/libalias_irc.so.4
 OLD_FILES+=lib/libalias_nbt.so.4
 OLD_FILES+=lib/libalias_pptp.so.4
 OLD_FILES+=lib/libalias_skinny.so.4
 OLD_FILES+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
 OLD_FILES+=usr/share/man/man9/devsw.9.gz
 # 20061122: remove obsolete mount programs
 OLD_FILES+=sbin/mount_devfs
 OLD_FILES+=sbin/mount_ext2fs
 OLD_FILES+=sbin/mount_fdescfs
 OLD_FILES+=sbin/mount_linprocfs
 OLD_FILES+=sbin/mount_procfs
 OLD_FILES+=sbin/mount_std
 OLD_FILES+=rescue/mount_devfs
 OLD_FILES+=rescue/mount_ext2fs
 OLD_FILES+=rescue/mount_fdescfs
 OLD_FILES+=rescue/mount_linprocfs
 OLD_FILES+=rescue/mount_procfs
 OLD_FILES+=rescue/mount_std
 OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 # 20061116: uhidev.4 removed
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 # 20060929: mrouted removed
 OLD_FILES+=usr/sbin/map-mbone
 OLD_FILES+=usr/sbin/mrinfo
 OLD_FILES+=usr/sbin/mrouted
 OLD_FILES+=usr/sbin/mtrace
 OLD_FILES+=usr/share/man/man8/map-mbone.8.gz
 OLD_FILES+=usr/share/man/man8/mrinfo.8.gz
 OLD_FILES+=usr/share/man/man8/mrouted.8.gz
 OLD_FILES+=usr/share/man/man8/mtrace.8.gz
 # 20060924: tcpslice removed
 OLD_FILES+=usr/sbin/tcpslice
 OLD_FILES+=usr/share/man/man1/tcpslice.1.gz
 # 20060829: kvmdb cleanup script removed
 OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb
 # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
 OLD_FILES+=etc/rc.d/ramdisk
 OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_FILES+=usr/include/openssl/eng_int.h
 OLD_FILES+=usr/include/openssl/hw_4758_cca_err.h
 OLD_FILES+=usr/include/openssl/hw_aep_err.h
 OLD_FILES+=usr/include/openssl/hw_atalla_err.h
 OLD_FILES+=usr/include/openssl/hw_cswift_err.h
 OLD_FILES+=usr/include/openssl/hw_ncipher_err.h
 OLD_FILES+=usr/include/openssl/hw_nuron_err.h
 OLD_FILES+=usr/include/openssl/hw_sureware_err.h
 OLD_FILES+=usr/include/openssl/hw_ubsec_err.h
 # 20060713: mount_linsysfs(8) never existed in 7.x
 OLD_FILES+=sbin/mount_linsysfs
 OLD_FILES+=usr/share/man/man8/mount_linsysfs.8.gz
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060605: man page links removed by OpenBSM 1.0 alpha 6 import
 OLD_FILES+=usr/share/man/man3/au_to_socket.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_128.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_32.3.gz
 # 20060517: pcvt removed
 OLD_FILES+=usr/share/pcvt/README.FIRST
 OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
 OLD_FILES+=usr/share/pcvt/Etc/Terminfo
 OLD_FILES+=usr/share/pcvt/Etc/Termcap
 OLD_DIRS+=usr/share/pcvt/Etc
 OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
 OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
 OLD_FILES+=usr/share/pcvt/Doc/Charsets
 OLD_FILES+=usr/share/pcvt/Doc/CharGen
 OLD_FILES+=usr/share/pcvt/Doc/Bibliography
 OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
 OLD_DIRS+=usr/share/pcvt/Doc
 OLD_DIRS+=usr/share/pcvt
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
 OLD_DIRS+=usr/share/misc/pcvtfonts
 OLD_FILES+=usr/share/misc/keycap.pcvt
 OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
 OLD_FILES+=usr/share/man/man5/keycap.5.gz
 OLD_FILES+=usr/share/man/man4/pcvt.4.gz
 OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
 OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
 OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
 OLD_FILES+=usr/share/man/man3/kgetent.3.gz
 OLD_FILES+=usr/share/man/man3/keycap.3.gz
 OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
 OLD_FILES+=usr/share/man/man1/scon.1.gz
 OLD_FILES+=usr/share/man/man1/loadfont.1.gz
 OLD_FILES+=usr/share/man/man1/kcon.1.gz
 OLD_FILES+=usr/share/man/man1/fontedit.1.gz
 OLD_FILES+=usr/share/man/man1/cursor.1.gz
 OLD_FILES+=usr/sbin/vt220keys
 OLD_FILES+=usr/sbin/scon
 OLD_FILES+=usr/sbin/loadfont
 OLD_FILES+=usr/sbin/kcon
 OLD_FILES+=usr/sbin/ispcvt
 OLD_FILES+=usr/sbin/fontedit
 OLD_FILES+=usr/sbin/cursor
 OLD_FILES+=usr/lib/libkeycap_p.a
 OLD_FILES+=usr/lib/libkeycap.a
 OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw
 OLD_FILES+=etc/periodic/security/600.ip6fwdenied
 OLD_FILES+=etc/periodic/security/650.ip6fwlimit
 OLD_FILES+=sbin/ip6fw
 OLD_FILES+=usr/include/netinet6/ip6_fw.h
 OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
 # 20060424: sab(4) removed
 OLD_FILES+=usr/share/man/man4/sab.4.gz
 # 20060328: remove redundant rc.d script
 OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20060115: sys/pccard includes cleanup
 OLD_FILES+=usr/include/pccard/driver.h
 OLD_FILES+=usr/include/pccard/i82365.h
 OLD_FILES+=usr/include/pccard/meciareg.h
 OLD_FILES+=usr/include/pccard/pccard_nbk.h
 OLD_FILES+=usr/include/pccard/pcic_pci.h
 OLD_FILES+=usr/include/pccard/pcicvar.h
 OLD_FILES+=usr/include/pccard/slot.h
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot
 OLD_FILES+=rescue/nextboot.sh
 # 20051214: usbd(8) removed
 OLD_FILES+=etc/rc.d/usbd
 OLD_FILES+=etc/usbd.conf
 OLD_FILES+=usr/sbin/usbd
 OLD_FILES+=usr/share/man/man8/usbd.8.gz
 # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
 # 20050930: pccardd(8) removed
 OLD_FILES+=usr/sbin/pccardd
 OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz
 # 20050825: T/TCP retired several months ago
 OLD_FILES+=usr/share/man/man4/ttcp.4.gz
 # 20050805 tn3270 retired long ago
 OLD_FILES+=usr/share/misc/map3270
 # 20050801: too old to be interesting here
 OLD_FILES+=usr/share/doc/papers/px.ps.gz
 # 20050721: moved to ports
 OLD_FILES+=usr/sbin/vttest
 OLD_FILES+=usr/share/man/man1/vttest.1.gz
 # 20050617: wpa man pages moved to section 8
 OLD_FILES+=usr/share/man/man1/hostapd.1.gz
 OLD_FILES+=usr/share/man/man1/hostapd_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_supplicant.1.gz
 # 20050610: rexecd (insecure by design)
 OLD_FILES+=etc/pam.d/rexecd
 OLD_FILES+=usr/share/man/man8/rexecd.8.gz
 OLD_FILES+=usr/libexec/rexecd
 # 20050606: OpenBSD dhclient replaces ISC one
 OLD_FILES+=bin/omshell
 OLD_FILES+=sbin/omshell
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
 OLD_FILES+=rescue/ipfs
 OLD_FILES+=rescue/ipfstat
 OLD_FILES+=rescue/ipmon
 OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
 OLD_FILES+=usr/sbin/iptest
 OLD_FILES+=usr/share/man/man1/ipnat.1.gz
 OLD_FILES+=usr/share/man/man1/ipsend.1.gz
 OLD_FILES+=usr/share/man/man1/iptest.1.gz
 OLD_FILES+=usr/share/man/man5/ipsend.5.gz
 # 200503XX: bsdtar takes over gtar
 OLD_FILES+=usr/bin/gtar
 OLD_FILES+=usr/share/man/man1/gtar.1.gz
 # 200503XX
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 # 20050324: updated release infrastructure
 OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz
 # 20050317: removed from BIND 9 distribution
 OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS
 # 2005XXXX:
 OLD_FILES+=sbin/mount_autofs
 OLD_FILES+=usr/lib/libautofs.a
 OLD_FILES+=usr/lib/libautofs.so
 OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz
 # 20050203: Merged with fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes2
 OLD_FILES+=usr/share/games/fortune/fortunes2.dat
 # 200501XX:
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
 OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
 OLD_FILES+=usr/lib/libxpg4.a
 OLD_FILES+=usr/lib/libxpg4.so
 OLD_FILES+=usr/lib/libxpg4_p.a
 # 20041109: replaced by em(4)
 OLD_FILES+=usr/share/man/man4/gx.4.gz
 OLD_FILES+=usr/share/man/man4/if_gx.4.gz
 # 20041017: rune interface removed
 OLD_FILES+=usr/include/rune.h
 OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/fputrune.3.gz
 OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrune.3.gz
 OLD_FILES+=usr/share/man/man3/rune.3.gz
 OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
 OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/sputrune.3.gz
 # 20040925: bind9 import
 OLD_FILES+=usr/bin/dnskeygen
 OLD_FILES+=usr/bin/dnsquery
 OLD_FILES+=usr/lib/libisc.a
 OLD_FILES+=usr/lib/libisc.so
 OLD_FILES+=usr/lib/libisc_p.a
 OLD_FILES+=usr/libexec/named-xfer
 OLD_FILES+=usr/sbin/named.restart
 OLD_FILES+=usr/sbin/ndc
 OLD_FILES+=usr/sbin/nslookup
 OLD_FILES+=usr/sbin/nsupdate
 OLD_FILES+=usr/share/doc/bind/html/acl.html
 OLD_FILES+=usr/share/doc/bind/html/address_list.html
 OLD_FILES+=usr/share/doc/bind/html/comments.html
 OLD_FILES+=usr/share/doc/bind/html/config.html
 OLD_FILES+=usr/share/doc/bind/html/controls.html
 OLD_FILES+=usr/share/doc/bind/html/docdef.html
 OLD_FILES+=usr/share/doc/bind/html/example.html
 OLD_FILES+=usr/share/doc/bind/html/include.html
 OLD_FILES+=usr/share/doc/bind/html/index.html
 OLD_FILES+=usr/share/doc/bind/html/key.html
 OLD_FILES+=usr/share/doc/bind/html/logging.html
 OLD_FILES+=usr/share/doc/bind/html/master.html
 OLD_FILES+=usr/share/doc/bind/html/options.html
 OLD_FILES+=usr/share/doc/bind/html/server.html
 OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html
 OLD_FILES+=usr/share/doc/bind/html/zone.html
 OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2
 OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt
 OLD_FILES+=usr/share/doc/bind/misc/style.txt
 OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz
 OLD_FILES+=usr/share/man/man1/dnsquery.1.gz
 OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-xfer.8.gz
 OLD_FILES+=usr/share/man/man8/named.restart.8.gz
 OLD_FILES+=usr/share/man/man8/ndc.8.gz
 OLD_FILES+=usr/share/man/man8/nslookup.8.gz
 # 200409XX
 OLD_FILES+=usr/share/man/man3/ENSURE.3.gz
 OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz
 OLD_FILES+=usr/share/man/man3/assertions.3.gz
 OLD_FILES+=usr/share/man/man3/bitncmp.3.gz
 OLD_FILES+=usr/share/man/man3/evAddTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz
 OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz
 OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evConnect.3.gz
 OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz
 OLD_FILES+=usr/share/man/man3/evConsTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCreate.3.gz
 OLD_FILES+=usr/share/man/man3/evDefer.3.gz
 OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evDestroy.3.gz
 OLD_FILES+=usr/share/man/man3/evDispatch.3.gz
 OLD_FILES+=usr/share/man/man3/evDo.3.gz
 OLD_FILES+=usr/share/man/man3/evDrop.3.gz
 OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evGetNext.3.gz
 OLD_FILES+=usr/share/man/man3/evHold.3.gz
 OLD_FILES+=usr/share/man/man3/evInitID.3.gz
 OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz
 OLD_FILES+=usr/share/man/man3/evListen.3.gz
 OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz
 OLD_FILES+=usr/share/man/man3/evNowTime.3.gz
 OLD_FILES+=usr/share/man/man3/evPrintf.3.gz
 OLD_FILES+=usr/share/man/man3/evRead.3.gz
 OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evSubTime.3.gz
 OLD_FILES+=usr/share/man/man3/evTestID.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz
 OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz
 OLD_FILES+=usr/share/man/man3/evUnhold.3.gz
 OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evUnwait.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evWrite.3.gz
 OLD_FILES+=usr/share/man/man3/eventlib.3.gz
 OLD_FILES+=usr/share/man/man3/heap.3.gz
 OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_delete.3.gz
 OLD_FILES+=usr/share/man/man3/heap_element.3.gz
 OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz
 OLD_FILES+=usr/share/man/man3/heap_free.3.gz
 OLD_FILES+=usr/share/man/man3/heap_increased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_insert.3.gz
 OLD_FILES+=usr/share/man/man3/heap_new.3.gz
 OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz
 OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_option.3.gz
 OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz
 OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz
 OLD_FILES+=usr/share/man/man3/log_write.3.gz
 OLD_FILES+=usr/share/man/man3/logging.3.gz
 OLD_FILES+=usr/share/man/man3/memcluster.3.gz
 OLD_FILES+=usr/share/man/man3/memget.3.gz
 OLD_FILES+=usr/share/man/man3/memput.3.gz
 OLD_FILES+=usr/share/man/man3/memstats.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.
 OLD_FILES+=usr/share/man/man3/sigwait.3.gz
 OLD_FILES+=usr/share/man/man3/tree_add.3.gz
 OLD_FILES+=usr/share/man/man3/tree_delete.3.gz
 OLD_FILES+=usr/share/man/man3/tree_init.3.gz
 OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
 OLD_FILES+=lib/geom/geom_concat.so.1
 OLD_FILES+=lib/geom/geom_label.so.1
 OLD_FILES+=lib/geom/geom_nop.so.1
 OLD_FILES+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 OLD_FILES+=usr/include/c++/3.3/algorithm
 OLD_FILES+=usr/include/c++/3.3/backward/algo.h
 OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.3/backward/complex.h
 OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/deque.h
 OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/function.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.3/backward/heap.h
 OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/istream.h
 OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.3/backward/list.h
 OLD_FILES+=usr/include/c++/3.3/backward/map.h
 OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.3/backward/new.h
 OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/pair.h
 OLD_FILES+=usr/include/c++/3.3/backward/queue.h
 OLD_FILES+=usr/include/c++/3.3/backward/rope.h
 OLD_FILES+=usr/include/c++/3.3/backward/set.h
 OLD_FILES+=usr/include/c++/3.3/backward/slist.h
 OLD_FILES+=usr/include/c++/3.3/backward/stack.h
 OLD_FILES+=usr/include/c++/3.3/backward/stream.h
 OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/strstream
 OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/tree.h
 OLD_FILES+=usr/include/c++/3.3/backward/vector.h
 OLD_DIRS+=usr/include/c++/3.3/backward
 OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
 OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
 OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
 OLD_DIRS+=usr/include/c++/3.3/bits
 OLD_FILES+=usr/include/c++/3.3/bitset
 OLD_FILES+=usr/include/c++/3.3/cassert
 OLD_FILES+=usr/include/c++/3.3/cctype
 OLD_FILES+=usr/include/c++/3.3/cerrno
 OLD_FILES+=usr/include/c++/3.3/cfloat
 OLD_FILES+=usr/include/c++/3.3/ciso646
 OLD_FILES+=usr/include/c++/3.3/climits
 OLD_FILES+=usr/include/c++/3.3/clocale
 OLD_FILES+=usr/include/c++/3.3/cmath
 OLD_FILES+=usr/include/c++/3.3/complex
 OLD_FILES+=usr/include/c++/3.3/csetjmp
 OLD_FILES+=usr/include/c++/3.3/csignal
 OLD_FILES+=usr/include/c++/3.3/cstdarg
 OLD_FILES+=usr/include/c++/3.3/cstddef
 OLD_FILES+=usr/include/c++/3.3/cstdio
 OLD_FILES+=usr/include/c++/3.3/cstdlib
 OLD_FILES+=usr/include/c++/3.3/cstring
 OLD_FILES+=usr/include/c++/3.3/ctime
 OLD_FILES+=usr/include/c++/3.3/cwchar
 OLD_FILES+=usr/include/c++/3.3/cwctype
 OLD_FILES+=usr/include/c++/3.3/cxxabi.h
 OLD_FILES+=usr/include/c++/3.3/deque
 OLD_FILES+=usr/include/c++/3.3/exception
 OLD_FILES+=usr/include/c++/3.3/exception_defines.h
 OLD_FILES+=usr/include/c++/3.3/ext/algorithm
 OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/functional
 OLD_FILES+=usr/include/c++/3.3/ext/hash_map
 OLD_FILES+=usr/include/c++/3.3/ext/hash_set
 OLD_FILES+=usr/include/c++/3.3/ext/iterator
 OLD_FILES+=usr/include/c++/3.3/ext/memory
 OLD_FILES+=usr/include/c++/3.3/ext/numeric
 OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.3/ext/rope
 OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.3/ext/slist
 OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
 OLD_DIRS+=usr/include/c++/3.3/ext
 OLD_FILES+=usr/include/c++/3.3/fstream
 OLD_FILES+=usr/include/c++/3.3/functional
 OLD_FILES+=usr/include/c++/3.3/iomanip
 OLD_FILES+=usr/include/c++/3.3/ios
 OLD_FILES+=usr/include/c++/3.3/iosfwd
 OLD_FILES+=usr/include/c++/3.3/iostream
 OLD_FILES+=usr/include/c++/3.3/istream
 OLD_FILES+=usr/include/c++/3.3/iterator
 OLD_FILES+=usr/include/c++/3.3/limits
 OLD_FILES+=usr/include/c++/3.3/list
 OLD_FILES+=usr/include/c++/3.3/locale
 OLD_FILES+=usr/include/c++/3.3/map
 OLD_FILES+=usr/include/c++/3.3/memory
 OLD_FILES+=usr/include/c++/3.3/new
 OLD_FILES+=usr/include/c++/3.3/numeric
 OLD_FILES+=usr/include/c++/3.3/ostream
 OLD_FILES+=usr/include/c++/3.3/queue
 OLD_FILES+=usr/include/c++/3.3/set
 OLD_FILES+=usr/include/c++/3.3/sstream
 OLD_FILES+=usr/include/c++/3.3/stack
 OLD_FILES+=usr/include/c++/3.3/stdexcept
 OLD_FILES+=usr/include/c++/3.3/streambuf
 OLD_FILES+=usr/include/c++/3.3/string
 OLD_FILES+=usr/include/c++/3.3/typeinfo
 OLD_FILES+=usr/include/c++/3.3/utility
 OLD_FILES+=usr/include/c++/3.3/valarray
 OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed.
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
 # 20040627: usbdevs.h and usbdevs_data.h removal
 OLD_FILES+=usr/include/dev/usb/usbdevs.h
 OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
 OLD_FILES+=usr/share/man/man1/gasp.1.gz
 OLD_FILES+=sbin/mountd
 OLD_FILES+=sbin/mount_fdesc
 OLD_FILES+=sbin/mount_umap
 OLD_FILES+=sbin/mount_union
 OLD_FILES+=sbin/mount_msdos
 OLD_FILES+=sbin/mount_null
 OLD_FILES+=sbin/mount_kernfs
 # 200405XX: arl
 OLD_FILES+=usr/sbin/arlconfig
 OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
 # 200403XX
 OLD_FILES+=bin/raidctl
 OLD_FILES+=sbin/raidctl
 OLD_FILES+=usr/bin/sasc
 OLD_FILES+=usr/sbin/sgsc
 OLD_FILES+=usr/sbin/stlload
 OLD_FILES+=usr/sbin/stlstats
 OLD_FILES+=usr/share/man/man1/sasc.1.gz
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
 # 20040229: clean_environment() was removed after 3 days
 OLD_FILES+=usr/share/man/man3/clean_environment.3.gz
 # 20040119: installed as `isdntel' in newer systems
 OLD_FILES+=etc/isdn/isdntel.sh
 # 200XYYZZ: /lib transition clitches
 OLD_FILES+=lib/libalias.so
 OLD_FILES+=lib/libatm.so
 OLD_FILES+=lib/libbsdxml.so
 OLD_FILES+=lib/libc.so
 OLD_FILES+=lib/libcam.so
 OLD_FILES+=lib/libcrypt.so
 OLD_FILES+=lib/libcrypto.so
 OLD_FILES+=lib/libdevstat.so
 OLD_FILES+=lib/libedit.so
 OLD_FILES+=lib/libgeom.so
 OLD_FILES+=lib/libipsec.so
 OLD_FILES+=lib/libipx.so
 OLD_FILES+=lib/libkvm.so
 OLD_FILES+=lib/libm.so
 OLD_FILES+=lib/libmd.so
 OLD_FILES+=lib/libncurses.so
 OLD_FILES+=lib/libreadline.so
 OLD_FILES+=lib/libsbuf.so
 OLD_FILES+=lib/libufs.so
 OLD_FILES+=lib/libz.so
 # 200312XX
 OLD_FILES+=bin/cxconfig
 OLD_FILES+=sbin/cxconfig
 OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
 # 20031016: MULTI_DRIVER_MODULE macro removed
 OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 # 200309XX
 OLD_FILES+=usr/bin/symorder
 OLD_FILES+=usr/share/man/man1/symorder.1.gz
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
 # 200307XX
 OLD_FILES+=sbin/mount_nwfs
 OLD_FILES+=sbin/mount_portalfs
 OLD_FILES+=sbin/mount_smbfs
 # 200306XX
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX
 OLD_FILES+=usr/lib/libcipher.a
 OLD_FILES+=usr/lib/libcipher.so
 OLD_FILES+=usr/lib/libcipher_p.a
 OLD_FILES+=usr/lib/libgmp.a
 OLD_FILES+=usr/lib/libgmp.so
 OLD_FILES+=usr/lib/libgmp_p.a
 OLD_FILES+=usr/lib/libperl.a
 OLD_FILES+=usr/lib/libperl.so
 OLD_FILES+=usr/lib/libperl_p.a
 OLD_FILES+=usr/lib/libposix1e.a
 OLD_FILES+=usr/lib/libposix1e.so
 OLD_FILES+=usr/lib/libposix1e_p.a
 OLD_FILES+=usr/lib/libskey.a
 OLD_FILES+=usr/lib/libskey.so
 OLD_FILES+=usr/lib/libskey_p.a
 OLD_FILES+=usr/libexec/tradcpp0
 OLD_FILES+=usr/libexec/cpp0
 # 200304XX: removal of xten
 OLD_FILES+=usr/libexec/xtend
 OLD_FILES+=usr/sbin/xten
 OLD_FILES+=usr/share/man/man1/xten.1.gz
 OLD_FILES+=usr/share/man/man8/xtend.8.gz
 # 200303XX
 OLD_FILES+=usr/lib/libacl.so
 OLD_FILES+=usr/lib/libdescrypt.so
 OLD_FILES+=usr/lib/libf2c.so
 OLD_FILES+=usr/lib/libg++.so
 OLD_FILES+=usr/lib/libkdb.so
 OLD_FILES+=usr/lib/librsaINTL.so
 OLD_FILES+=usr/lib/libscrypt.so
 OLD_FILES+=usr/lib/libss.so
 # 200302XX
 OLD_FILES+=usr/lib/libacl.a
 OLD_FILES+=usr/lib/libacl_p.a
 OLD_FILES+=usr/lib/libkadm.a
 OLD_FILES+=usr/lib/libkadm.so
 OLD_FILES+=usr/lib/libkadm_p.a
 OLD_FILES+=usr/lib/libkafs.a
 OLD_FILES+=usr/lib/libkafs.so
 OLD_FILES+=usr/lib/libkafs_p.a
 OLD_FILES+=usr/lib/libkdb.a
 OLD_FILES+=usr/lib/libkdb_p.a
 OLD_FILES+=usr/lib/libkrb.a
 OLD_FILES+=usr/lib/libkrb.so
 OLD_FILES+=usr/lib/libkrb_p.a
 OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_use_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_accept.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_alert_type_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_clear.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_connect.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_do_handshake.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_SSL_CTX.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ciphers.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_current_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_default_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_cert_chain.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_rbio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_library_init.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_load_client_CA_file.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_pending.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_read.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_rstate_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_session_reused.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_bio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_connect_state.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_state_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_want.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_write.3.gz
 OLD_FILES+=usr/share/man/man3/d2i_SSL_SESSION.3.gz
 # 200301XX
 OLD_FILES+=usr/share/man/man3/des_3cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_3ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cfb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_read.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_write.3.gz
 OLD_FILES+=usr/share/man/man3/des_is_weak_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_key_sched.3.gz
 OLD_FILES+=usr/share/man/man3/des_ofb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_pcbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_quad_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_random_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_2password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_odd_parity.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_2key.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_key.3.gz
 # 200212XX
 OLD_FILES+=usr/sbin/kenv
 OLD_FILES+=usr/bin/kenv
 OLD_FILES+=usr/sbin/elf2aout
 # 200210XX
 OLD_FILES+=usr/include/libusbhid.h
 OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
 OLD_FILES+=usr/share/man/man3/CheckRules.3.gz
 OLD_FILES+=usr/share/man/man3/ChunkCanBeRoot.3.gz
 OLD_FILES+=usr/share/man/man3/Clone_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk_DWIM.3.gz
 OLD_FILES+=usr/share/man/man3/Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Debug_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Delete_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Disk_Names.3.gz
 OLD_FILES+=usr/share/man/man3/Free_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDev.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDevDisk.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Open_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Bios_Geom.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Blocks.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Mgr.3.gz
 OLD_FILES+=usr/share/man/man3/ShowChunkFlags.3.gz
 OLD_FILES+=usr/share/man/man3/Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Write_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/slice_type_name.3.gz
 # 200210XX: most games moved to ports
 OLD_FILES+=usr/share/man/man6/adventure.6.gz
 OLD_FILES+=usr/share/man/man6/arithmetic.6.gz
 OLD_FILES+=usr/share/man/man6/atc.6.gz
 OLD_FILES+=usr/share/man/man6/backgammon.6.gz
 OLD_FILES+=usr/share/man/man6/battlestar.6.gz
 OLD_FILES+=usr/share/man/man6/bs.6.gz
 OLD_FILES+=usr/share/man/man6/canfield.6.gz
 OLD_FILES+=usr/share/man/man6/cfscores.6.gz
 OLD_FILES+=usr/share/man/man6/cribbage.6.gz
 OLD_FILES+=usr/share/man/man6/fish.6.gz
 OLD_FILES+=usr/share/man/man6/hack.6.gz
 OLD_FILES+=usr/share/man/man6/hangman.6.gz
 OLD_FILES+=usr/share/man/man6/larn.6.gz
 OLD_FILES+=usr/share/man/man6/mille.6.gz
 OLD_FILES+=usr/share/man/man6/phantasia.6.gz
 OLD_FILES+=usr/share/man/man6/piano.6.gz
 OLD_FILES+=usr/share/man/man6/pig.6.gz
 OLD_FILES+=usr/share/man/man6/quiz.6.gz
 OLD_FILES+=usr/share/man/man6/rain.6.gz
 OLD_FILES+=usr/share/man/man6/robots.6.gz
 OLD_FILES+=usr/share/man/man6/rogue.6.gz
 OLD_FILES+=usr/share/man/man6/sail.6.gz
 OLD_FILES+=usr/share/man/man6/snake.6.gz
 OLD_FILES+=usr/share/man/man6/snscore.6.gz
 OLD_FILES+=usr/share/man/man6/trek.6.gz
 OLD_FILES+=usr/share/man/man6/wargames.6.gz
 OLD_FILES+=usr/share/man/man6/worm.6.gz
 OLD_FILES+=usr/share/man/man6/worms.6.gz
 OLD_FILES+=usr/share/man/man6/wump.6.gz
 # 200207XX
 OLD_FILES+=usr/share/man/man1aout/ar.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/as.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ld.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/nm.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ranlib.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/size.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strings.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
 OLD_FILES+=bin/mountd
 OLD_FILES+=bin/nfsd
 # 20020707 sbin/nfsd -> usr.sbin/nfsd
 OLD_FILES+=sbin/nfsd
 # 200206XX
 OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
 .if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix
 # 200205XX
 OLD_FILES+=usr/bin/doscmd
 # 200204XX
 OLD_FILES+=usr/bin/a2p
 OLD_FILES+=usr/bin/ptx
 OLD_FILES+=usr/bin/pod2text
 OLD_FILES+=usr/bin/pod2man
 OLD_FILES+=usr/bin/pod2latex
 OLD_FILES+=usr/bin/pod2html
 OLD_FILES+=usr/bin/h2ph
 OLD_FILES+=usr/bin/dprofpp
 OLD_FILES+=usr/bin/c2ph
 OLD_FILES+=usr/bin/h2xs
 OLD_FILES+=usr/bin/pl2pm
 OLD_FILES+=usr/bin/splain
 OLD_FILES+=usr/bin/s2p
 OLD_FILES+=usr/bin/find2perl
 OLD_FILES+=usr/sbin/pkg_update
 OLD_FILES+=usr/sbin/scriptdump
 # 20020409 GC kget(1), userconfig is long dead.
 OLD_FILES+=sbin/kget
 OLD_FILES+=usr/share/man/man8/kget.8.gz
 # 200203XX
 OLD_FILES+=usr/lib/libss.a
 OLD_FILES+=usr/lib/libss_p.a
 OLD_FILES+=usr/lib/libtelnet.a
 OLD_FILES+=usr/lib/libtelnet_p.a
 OLD_FILES+=usr/sbin/diskpart
 # 200202XX
 OLD_FILES+=usr/bin/gprof4
 # 200201XX
 OLD_FILES+=usr/sbin/linux
 # 2001XXXX
 OLD_FILES+=usr/bin/joy
 OLD_FILES+=usr/sbin/ibcs2
 OLD_FILES+=usr/sbin/svr4
 OLD_FILES+=usr/bin/chflags
 OLD_FILES+=usr/sbin/uuconv
 OLD_FILES+=usr/sbin/uuchk
 OLD_FILES+=usr/sbin/portmap
 OLD_FILES+=usr/sbin/pmap_set
 OLD_FILES+=usr/sbin/pmap_dump
 OLD_FILES+=usr/sbin/mcon
 OLD_FILES+=usr/sbin/stlstty
 OLD_FILES+=usr/sbin/ispppcontrol
 OLD_FILES+=usr/sbin/rndcontrol
 # 20011001: UUCP migration to ports
 OLD_FILES+=usr/bin/uucp
 OLD_FILES+=usr/bin/uulog
 OLD_FILES+=usr/bin/uuname
 OLD_FILES+=usr/bin/uupick
 OLD_FILES+=usr/bin/uusched
 OLD_FILES+=usr/bin/uustat
 OLD_FILES+=usr/bin/uuto
 OLD_FILES+=usr/bin/uux
 OLD_FILES+=usr/libexec/uucp/uucico
 OLD_FILES+=usr/libexec/uucp/uuxqt
 OLD_FILES+=usr/libexec/uucpd
 OLD_FILES+=usr/share/man/man1/uuconv.1.gz
 OLD_FILES+=usr/share/man/man1/uucp.1.gz
 OLD_FILES+=usr/share/man/man1/uulog.1.gz
 OLD_FILES+=usr/share/man/man1/uuname.1.gz
 OLD_FILES+=usr/share/man/man1/uupick.1.gz
 OLD_FILES+=usr/share/man/man1/uustat.1.gz
 OLD_FILES+=usr/share/man/man1/uuto.1.gz
 OLD_FILES+=usr/share/man/man1/uux.1.gz
 OLD_FILES+=usr/share/man/man8/uuchk.8.gz
 OLD_FILES+=usr/share/man/man8/uucico.8.gz
 OLD_FILES+=usr/share/man/man8/uucpd.8.gz
 OLD_FILES+=usr/share/man/man8/uusched.8.gz
 OLD_FILES+=usr/share/man/man8/uuxqt.8.gz
 # 20010523 mount_portal -> mount_portalfs
 OLD_FILES+=sbin/mount_portal
 OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
 # 200104XX
 OLD_FILES+=usr/lib/libdescrypt.a
 OLD_FILES+=usr/lib/libscrypt.a
 OLD_FILES+=usr/lib/libscrypt_p.a
 OLD_FILES+=usr/sbin/pim6stat
 OLD_FILES+=usr/sbin/pim6sd
 OLD_FILES+=usr/sbin/pim6dd
 # 20010217
 OLD_FILES+=usr/share/doc/bind/misc/dns-setup
 # 20001200
 OLD_FILES+=usr/lib/libgcc_r_pic.a
 # 200009XX
 OLD_FILES+=usr/lib/libRSAglue.a
 OLD_FILES+=usr/lib/libRSAglue.so
 OLD_FILES+=usr/lib/librsaINTL.a
 OLD_FILES+=usr/lib/librsaUSA.a
 OLD_FILES+=usr/lib/librsaUSA.so
 # 200002XX ?
 OLD_FILES+=usr/lib/libf2c.a
 OLD_FILES+=usr/lib/libf2c_p.a
 OLD_FILES+=usr/lib/libg++.a
 OLD_FILES+=usr/lib/libg++_p.a
 # 20001006
 OLD_FILES+=usr/bin/miniperl
 # 20000810
 OLD_FILES+=usr/bin/sperl
 # 200001XX
 OLD_FILES+=usr/sbin/apmconf
 ## unsorted
 # do we still support aout builds?
 #OLD_FILES+=usr/lib/aout/c++rt0.o
 #OLD_FILES+=usr/lib/aout/crt0.o
 #OLD_FILES+=usr/lib/aout/gcrt0.o
 #OLD_FILES+=usr/lib/aout/scrt0.o
 #OLD_FILES+=usr/lib/aout/sgcrt0.o
 OLD_FILES+=usr/lib/pam_ftp.so
 OLD_FILES+=usr/share/man/man1/CA.pl.1.gz
 OLD_FILES+=usr/share/man/man1/asn1parse.1.gz
 OLD_FILES+=usr/share/man/man1/ca.1.gz
 OLD_FILES+=usr/share/man/man1/ciphers.1.gz
 OLD_FILES+=usr/share/man/man1/config.1.gz
 OLD_FILES+=usr/share/man/man1/crl.1.gz
 OLD_FILES+=usr/share/man/man1/crl2pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/dgst.1.gz
 OLD_FILES+=usr/share/man/man1/dhparam.1.gz
 OLD_FILES+=usr/share/man/man1/doscmd.1.gz
 OLD_FILES+=usr/share/man/man1/dsa.1.gz
 OLD_FILES+=usr/share/man/man1/dsaparam.1.gz
 OLD_FILES+=usr/share/man/man1/enc.1.gz
 OLD_FILES+=usr/share/man/man1/gendsa.1.gz
 OLD_FILES+=usr/share/man/man1/genrsa.1.gz
 OLD_FILES+=usr/share/man/man1/getNAME.1.gz
 OLD_FILES+=usr/share/man/man1/nseq.1.gz
 OLD_FILES+=usr/share/man/man1/ocsp.1.gz
 OLD_FILES+=usr/share/man/man1/openssl.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs12.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs8.1.gz
 OLD_FILES+=usr/share/man/man1/rand.1.gz
 OLD_FILES+=usr/share/man/man1/req.1.gz
 OLD_FILES+=usr/share/man/man1/rsa.1.gz
 OLD_FILES+=usr/share/man/man1/rsautl.1.gz
 OLD_FILES+=usr/share/man/man1/s_client.1.gz
 OLD_FILES+=usr/share/man/man1/s_server.1.gz
 OLD_FILES+=usr/share/man/man1/sess_id.1.gz
 OLD_FILES+=usr/share/man/man1/smime.1.gz
 OLD_FILES+=usr/share/man/man1/speed.1.gz
 OLD_FILES+=usr/share/man/man1/spkac.1.gz
 OLD_FILES+=usr/share/man/man1/verify.1.gz
 OLD_FILES+=usr/share/man/man1/version.1.gz
 OLD_FILES+=usr/share/man/man1/x509.1.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_dup.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_set_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_file.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_open_tar.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_support_format_gnutar.3.gz
 OLD_FILES+=usr/share/man/man3/cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/endvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsbytype.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/isnanf.3.gz
 OLD_FILES+=usr/share/man/man3/libautofs.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_attr_setsstack.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_getcancelstate.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_mutexattr_getpshared.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_mutexattr_setpshared.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.gz
 OLD_FILES+=usr/share/man/man3/setkey.3.gz
 OLD_FILES+=usr/share/man/man3/setvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/man/man3/vfsisloadable.3.gz
 OLD_FILES+=usr/share/man/man3/vfsload.3.gz
 OLD_FILES+=usr/share/man/man4/als4000.4.gz
 OLD_FILES+=usr/share/man/man4/csa.4.gz
 OLD_FILES+=usr/share/man/man4/emu10k1.4.gz
 OLD_FILES+=usr/share/man/man4/euc.4.gz
 OLD_FILES+=usr/share/man/man4/gusc.4.gz
 OLD_FILES+=usr/share/man/man4/if_fwp.4.gz
 OLD_FILES+=usr/share/man/man4/lomac.4.gz
 OLD_FILES+=usr/share/man/man4/maestro3.4.gz
 OLD_FILES+=usr/share/man/man4/raid.4.gz
 OLD_FILES+=usr/share/man/man4/sbc.4.gz
 OLD_FILES+=usr/share/man/man4/sd.4.gz
 OLD_FILES+=usr/share/man/man4/snc.4.gz
 OLD_FILES+=usr/share/man/man4/st.4.gz
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz
 OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
 OLD_FILES+=usr/share/man/man8/apm.8.gz
 OLD_FILES+=usr/share/man/man8/apmconf.8.gz
 OLD_FILES+=usr/share/man/man8/apmd.8.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
 OLD_FILES+=usr/share/man/man8/sconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ssl.8.gz
 OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
 OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_INIT.9.gz
 OLD_FILES+=usr/share/man/man9/at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_add.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_remove.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_empty.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_remove.9.gz
 OLD_FILES+=usr/share/man/man9/endtsleep.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_freem.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_free.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_steal.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_phys_to_kva.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_vm_init.9.gz
 OLD_FILES+=usr/share/man/man9/mac_biba.9.gz
 OLD_FILES+=usr/share/man/man9/mac_bsdextended.9.gz
 OLD_FILES+=usr/share/man/man9/mono_time.9.gz
 OLD_FILES+=usr/share/man/man9/p1003_1b.9.gz
 OLD_FILES+=usr/share/man/man9/pmap_prefault.9.gz
 OLD_FILES+=usr/share/man/man9/posix4.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_name.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_string.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_unit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/runtime.9.gz
 OLD_FILES+=usr/share/man/man9/sleepinit.9.gz
 OLD_FILES+=usr/share/man/man9/unsleep.9.gz
 OLD_FILES+=usr/share/games/atc/Game_List
 OLD_FILES+=usr/share/games/atc/Killer
 OLD_FILES+=usr/share/games/atc/crossover
 OLD_FILES+=usr/share/games/atc/default
 OLD_FILES+=usr/share/games/atc/easy
 OLD_FILES+=usr/share/games/atc/game_2
 OLD_FILES+=usr/share/games/larn/larnmaze
 OLD_FILES+=usr/share/games/larn/larnopts
 OLD_FILES+=usr/share/games/larn/larn.help
 OLD_FILES+=usr/share/games/quiz.db/africa
 OLD_FILES+=usr/share/games/quiz.db/america
 OLD_FILES+=usr/share/games/quiz.db/areas
 OLD_FILES+=usr/share/games/quiz.db/arith
 OLD_FILES+=usr/share/games/quiz.db/asia
 OLD_FILES+=usr/share/games/quiz.db/babies
 OLD_FILES+=usr/share/games/quiz.db/bard
 OLD_FILES+=usr/share/games/quiz.db/chinese
 OLD_FILES+=usr/share/games/quiz.db/collectives
 OLD_FILES+=usr/share/games/quiz.db/ed
 OLD_FILES+=usr/share/games/quiz.db/elements
 OLD_FILES+=usr/share/games/quiz.db/europe
 OLD_FILES+=usr/share/games/quiz.db/flowers
 OLD_FILES+=usr/share/games/quiz.db/greek
 OLD_FILES+=usr/share/games/quiz.db/inca
 OLD_FILES+=usr/share/games/quiz.db/index
 OLD_FILES+=usr/share/games/quiz.db/latin
 OLD_FILES+=usr/share/games/quiz.db/locomotive
 OLD_FILES+=usr/share/games/quiz.db/midearth
 OLD_FILES+=usr/share/games/quiz.db/morse
 OLD_FILES+=usr/share/games/quiz.db/murders
 OLD_FILES+=usr/share/games/quiz.db/poetry
 OLD_FILES+=usr/share/games/quiz.db/posneg
 OLD_FILES+=usr/share/games/quiz.db/pres
 OLD_FILES+=usr/share/games/quiz.db/province
 OLD_FILES+=usr/share/games/quiz.db/seq-easy
 OLD_FILES+=usr/share/games/quiz.db/seq-hard
 OLD_FILES+=usr/share/games/quiz.db/sexes
 OLD_FILES+=usr/share/games/quiz.db/sov
 OLD_FILES+=usr/share/games/quiz.db/spell
 OLD_FILES+=usr/share/games/quiz.db/state
 OLD_FILES+=usr/share/games/quiz.db/trek
 OLD_FILES+=usr/share/games/quiz.db/ucc
 OLD_FILES+=usr/share/games/cribbage.instr
 OLD_FILES+=usr/share/games/fish.instr
 OLD_FILES+=usr/share/games/wump.info
 OLD_FILES+=usr/games/hide/adventure
 OLD_FILES+=usr/games/hide/arithmetic
 OLD_FILES+=usr/games/hide/atc
 OLD_FILES+=usr/games/hide/backgammon
 OLD_FILES+=usr/games/hide/teachgammon
 OLD_FILES+=usr/games/hide/battlestar
 OLD_FILES+=usr/games/hide/bs
 OLD_FILES+=usr/games/hide/canfield
 OLD_FILES+=usr/games/hide/cribbage
 OLD_FILES+=usr/games/hide/fish
 OLD_FILES+=usr/games/hide/hack
 OLD_FILES+=usr/games/hide/hangman
 OLD_FILES+=usr/games/hide/larn
 OLD_FILES+=usr/games/hide/mille
 OLD_FILES+=usr/games/hide/phantasia
 OLD_FILES+=usr/games/hide/quiz
 OLD_FILES+=usr/games/hide/robots
 OLD_FILES+=usr/games/hide/rogue
 OLD_FILES+=usr/games/hide/sail
 OLD_FILES+=usr/games/hide/snake
 OLD_FILES+=usr/games/hide/trek
 OLD_FILES+=usr/games/hide/worm
 OLD_FILES+=usr/games/hide/wump
 OLD_FILES+=usr/games/adventure
 OLD_FILES+=usr/games/arithmetic
 OLD_FILES+=usr/games/atc
 OLD_FILES+=usr/games/backgammon
 OLD_FILES+=usr/games/teachgammon
 OLD_FILES+=usr/games/battlestar
 OLD_FILES+=usr/games/bs
 OLD_FILES+=usr/games/canfield
 OLD_FILES+=usr/games/cfscores
 OLD_FILES+=usr/games/cribbage
 OLD_FILES+=usr/games/dm
 OLD_FILES+=usr/games/fish
 OLD_FILES+=usr/games/hack
 OLD_FILES+=usr/games/hangman
 OLD_FILES+=usr/games/larn
 OLD_FILES+=usr/games/mille
 OLD_FILES+=usr/games/phantasia
 OLD_FILES+=usr/games/piano
 OLD_FILES+=usr/games/pig
 OLD_FILES+=usr/games/quiz
 OLD_FILES+=usr/games/rain
 OLD_FILES+=usr/games/robots
 OLD_FILES+=usr/games/rogue
 OLD_FILES+=usr/games/sail
 OLD_FILES+=usr/games/snake
 OLD_FILES+=usr/games/snscore
 OLD_FILES+=usr/games/trek
 OLD_FILES+=usr/games/wargames
 OLD_FILES+=usr/games/worm
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/include/cam/cam_extend.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
 OLD_FILES+=usr/include/g++/PlotFile.h
 OLD_FILES+=usr/include/g++/SFile.h
 OLD_FILES+=usr/include/g++/_G_config.h
 OLD_FILES+=usr/include/g++/algo.h
 OLD_FILES+=usr/include/g++/algobase.h
 OLD_FILES+=usr/include/g++/algorithm
 OLD_FILES+=usr/include/g++/alloc.h
 OLD_FILES+=usr/include/g++/bitset
 OLD_FILES+=usr/include/g++/builtinbuf.h
 OLD_FILES+=usr/include/g++/bvector.h
 OLD_FILES+=usr/include/g++/cassert
 OLD_FILES+=usr/include/g++/cctype
 OLD_FILES+=usr/include/g++/cerrno
 OLD_FILES+=usr/include/g++/cfloat
 OLD_FILES+=usr/include/g++/ciso646
 OLD_FILES+=usr/include/g++/climits
 OLD_FILES+=usr/include/g++/clocale
 OLD_FILES+=usr/include/g++/cmath
 OLD_FILES+=usr/include/g++/complex
 OLD_FILES+=usr/include/g++/complex.h
 OLD_FILES+=usr/include/g++/csetjmp
 OLD_FILES+=usr/include/g++/csignal
 OLD_FILES+=usr/include/g++/cstdarg
 OLD_FILES+=usr/include/g++/cstddef
 OLD_FILES+=usr/include/g++/cstdio
 OLD_FILES+=usr/include/g++/cstdlib
 OLD_FILES+=usr/include/g++/cstring
 OLD_FILES+=usr/include/g++/ctime
 OLD_FILES+=usr/include/g++/cwchar
 OLD_FILES+=usr/include/g++/cwctype
 OLD_FILES+=usr/include/g++/defalloc.h
 OLD_FILES+=usr/include/g++/deque
 OLD_FILES+=usr/include/g++/deque.h
 OLD_FILES+=usr/include/g++/editbuf.h
 OLD_FILES+=usr/include/g++/exception
 OLD_FILES+=usr/include/g++/floatio.h
 OLD_FILES+=usr/include/g++/fstream
 OLD_FILES+=usr/include/g++/fstream.h
 OLD_FILES+=usr/include/g++/function.h
 OLD_FILES+=usr/include/g++/functional
 OLD_FILES+=usr/include/g++/hash_map
 OLD_FILES+=usr/include/g++/hash_map.h
 OLD_FILES+=usr/include/g++/hash_set
 OLD_FILES+=usr/include/g++/hash_set.h
 OLD_FILES+=usr/include/g++/hashtable.h
 OLD_FILES+=usr/include/g++/heap.h
 OLD_FILES+=usr/include/g++/indstream.h
 OLD_FILES+=usr/include/g++/iolibio.h
 OLD_FILES+=usr/include/g++/iomanip
 OLD_FILES+=usr/include/g++/iomanip.h
 OLD_FILES+=usr/include/g++/iosfwd
 OLD_FILES+=usr/include/g++/iostdio.h
 OLD_FILES+=usr/include/g++/iostream
 OLD_FILES+=usr/include/g++/iostream.h
 OLD_FILES+=usr/include/g++/iostreamP.h
 OLD_FILES+=usr/include/g++/istream.h
 OLD_FILES+=usr/include/g++/iterator
 OLD_FILES+=usr/include/g++/iterator.h
 OLD_FILES+=usr/include/g++/libio.h
 OLD_FILES+=usr/include/g++/libioP.h
 OLD_FILES+=usr/include/g++/list
 OLD_FILES+=usr/include/g++/list.h
 OLD_FILES+=usr/include/g++/map
 OLD_FILES+=usr/include/g++/map.h
 OLD_FILES+=usr/include/g++/memory
 OLD_FILES+=usr/include/g++/multimap.h
 OLD_FILES+=usr/include/g++/multiset.h
 OLD_FILES+=usr/include/g++/new
 OLD_FILES+=usr/include/g++/new.h
 OLD_FILES+=usr/include/g++/numeric
 OLD_FILES+=usr/include/g++/ostream.h
 OLD_FILES+=usr/include/g++/pair.h
 OLD_FILES+=usr/include/g++/parsestream.h
 OLD_FILES+=usr/include/g++/pfstream.h
 OLD_FILES+=usr/include/g++/procbuf.h
 OLD_FILES+=usr/include/g++/pthread_alloc
 OLD_FILES+=usr/include/g++/pthread_alloc.h
 OLD_FILES+=usr/include/g++/queue
 OLD_FILES+=usr/include/g++/rope
 OLD_FILES+=usr/include/g++/rope.h
 OLD_FILES+=usr/include/g++/ropeimpl.h
 OLD_FILES+=usr/include/g++/set
 OLD_FILES+=usr/include/g++/set.h
 OLD_FILES+=usr/include/g++/slist
 OLD_FILES+=usr/include/g++/slist.h
 OLD_FILES+=usr/include/g++/sstream
 OLD_FILES+=usr/include/g++/stack
 OLD_FILES+=usr/include/g++/stack.h
 OLD_FILES+=usr/include/g++/std/bastring.cc
 OLD_FILES+=usr/include/g++/std/bastring.h
 OLD_FILES+=usr/include/g++/std/complext.cc
 OLD_FILES+=usr/include/g++/std/complext.h
 OLD_FILES+=usr/include/g++/std/dcomplex.h
 OLD_FILES+=usr/include/g++/std/fcomplex.h
 OLD_FILES+=usr/include/g++/std/gslice.h
 OLD_FILES+=usr/include/g++/std/gslice_array.h
 OLD_FILES+=usr/include/g++/std/indirect_array.h
 OLD_FILES+=usr/include/g++/std/ldcomplex.h
 OLD_FILES+=usr/include/g++/std/mask_array.h
 OLD_FILES+=usr/include/g++/std/slice.h
 OLD_FILES+=usr/include/g++/std/slice_array.h
 OLD_FILES+=usr/include/g++/std/std_valarray.h
 OLD_FILES+=usr/include/g++/std/straits.h
 OLD_FILES+=usr/include/g++/std/valarray_array.h
 OLD_FILES+=usr/include/g++/std/valarray_array.tcc
 OLD_FILES+=usr/include/g++/std/valarray_meta.h
 OLD_FILES+=usr/include/g++/stdexcept
 OLD_FILES+=usr/include/g++/stdiostream.h
 OLD_FILES+=usr/include/g++/stl.h
 OLD_FILES+=usr/include/g++/stl_algo.h
 OLD_FILES+=usr/include/g++/stl_algobase.h
 OLD_FILES+=usr/include/g++/stl_alloc.h
 OLD_FILES+=usr/include/g++/stl_bvector.h
 OLD_FILES+=usr/include/g++/stl_config.h
 OLD_FILES+=usr/include/g++/stl_construct.h
 OLD_FILES+=usr/include/g++/stl_deque.h
 OLD_FILES+=usr/include/g++/stl_function.h
 OLD_FILES+=usr/include/g++/stl_hash_fun.h
 OLD_FILES+=usr/include/g++/stl_hash_map.h
 OLD_FILES+=usr/include/g++/stl_hash_set.h
 OLD_FILES+=usr/include/g++/stl_hashtable.h
 OLD_FILES+=usr/include/g++/stl_heap.h
 OLD_FILES+=usr/include/g++/stl_iterator.h
 OLD_FILES+=usr/include/g++/stl_list.h
 OLD_FILES+=usr/include/g++/stl_map.h
 OLD_FILES+=usr/include/g++/stl_multimap.h
 OLD_FILES+=usr/include/g++/stl_multiset.h
 OLD_FILES+=usr/include/g++/stl_numeric.h
 OLD_FILES+=usr/include/g++/stl_pair.h
 OLD_FILES+=usr/include/g++/stl_queue.h
 OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/g++/stl_relops.h
 OLD_FILES+=usr/include/g++/stl_rope.h
 OLD_FILES+=usr/include/g++/stl_set.h
 OLD_FILES+=usr/include/g++/stl_slist.h
 OLD_FILES+=usr/include/g++/stl_stack.h
 OLD_FILES+=usr/include/g++/stl_tempbuf.h
 OLD_FILES+=usr/include/g++/stl_tree.h
 OLD_FILES+=usr/include/g++/stl_uninitialized.h
 OLD_FILES+=usr/include/g++/stl_vector.h
 OLD_FILES+=usr/include/g++/stream.h
 OLD_FILES+=usr/include/g++/streambuf.h
 OLD_FILES+=usr/include/g++/strfile.h
 OLD_FILES+=usr/include/g++/string
 OLD_FILES+=usr/include/g++/strstream
 OLD_FILES+=usr/include/g++/strstream.h
 OLD_FILES+=usr/include/g++/tempbuf.h
 OLD_FILES+=usr/include/g++/tree.h
 OLD_FILES+=usr/include/g++/type_traits.h
 OLD_FILES+=usr/include/g++/typeinfo
 OLD_FILES+=usr/include/g++/utility
 OLD_FILES+=usr/include/g++/valarray
 OLD_FILES+=usr/include/g++/vector
 OLD_FILES+=usr/include/g++/vector.h
 OLD_FILES+=usr/include/gmp.h
 OLD_FILES+=usr/include/isc/assertions.h
 OLD_FILES+=usr/include/isc/ctl.h
 OLD_FILES+=usr/include/isc/dst.h
 OLD_FILES+=usr/include/isc/eventlib.h
 OLD_FILES+=usr/include/isc/heap.h
 OLD_FILES+=usr/include/isc/irpmarshall.h
 OLD_FILES+=usr/include/isc/list.h
 OLD_FILES+=usr/include/isc/logging.h
 OLD_FILES+=usr/include/isc/memcluster.h
 OLD_FILES+=usr/include/isc/misc.h
 OLD_FILES+=usr/include/isc/tree.h
 OLD_FILES+=usr/include/machine/ansi.h
 OLD_FILES+=usr/include/machine/apic.h
 OLD_FILES+=usr/include/machine/asc_ioctl.h
 OLD_FILES+=usr/include/machine/asnames.h
 OLD_FILES+=usr/include/machine/bus_at386.h
 OLD_FILES+=usr/include/machine/bus_memio.h
 OLD_FILES+=usr/include/machine/bus_pc98.h
 OLD_FILES+=usr/include/machine/bus_pio.h
 OLD_FILES+=usr/include/machine/cdk.h
 OLD_FILES+=usr/include/machine/comstats.h
 OLD_FILES+=usr/include/machine/console.h
 OLD_FILES+=usr/include/machine/critical.h
 OLD_FILES+=usr/include/machine/cronyx.h
 OLD_FILES+=usr/include/machine/dvcfg.h
 OLD_FILES+=usr/include/machine/globaldata.h
 OLD_FILES+=usr/include/machine/globals.h
 OLD_FILES+=usr/include/machine/gsc.h
 OLD_FILES+=usr/include/machine/i4b_isppp.h
 OLD_FILES+=usr/include/machine/if_wavelan_ieee.h
 OLD_FILES+=usr/include/machine/iic.h
 OLD_FILES+=usr/include/machine/ioctl_ctx.h
 OLD_FILES+=usr/include/machine/ioctl_fd.h
 OLD_FILES+=usr/include/machine/ipl.h
 OLD_FILES+=usr/include/machine/lock.h
 OLD_FILES+=usr/include/machine/mouse.h
 OLD_FILES+=usr/include/machine/mpapic.h
 OLD_FILES+=usr/include/machine/mtpr.h
 OLD_FILES+=usr/include/machine/pc/msdos.h
 OLD_FILES+=usr/include/machine/physio_proc.h
 OLD_FILES+=usr/include/machine/smb.h
 OLD_FILES+=usr/include/machine/spigot.h
 OLD_FILES+=usr/include/machine/types.h
 OLD_FILES+=usr/include/machine/uc_device.h
 OLD_FILES+=usr/include/machine/ultrasound.h
 OLD_FILES+=usr/include/machine/wtio.h
 OLD_FILES+=usr/include/msdosfs/bootsect.h
 OLD_FILES+=usr/include/msdosfs/bpb.h
 OLD_FILES+=usr/include/msdosfs/denode.h
 OLD_FILES+=usr/include/msdosfs/direntry.h
 OLD_FILES+=usr/include/msdosfs/fat.h
 OLD_FILES+=usr/include/msdosfs/msdosfsmount.h
 OLD_FILES+=usr/include/net/hostcache.h
 OLD_FILES+=usr/include/net/if_faith.h
 OLD_FILES+=usr/include/net/if_ieee80211.h
 OLD_FILES+=usr/include/net/if_tunvar.h
 OLD_FILES+=usr/include/net/intrq.h
 OLD_FILES+=usr/include/netatm/kern_include.h
 OLD_FILES+=usr/include/netinet/if_fddi.h
 OLD_FILES+=usr/include/netinet/in_hostcache.h
 OLD_FILES+=usr/include/netinet/ip_flow.h
 OLD_FILES+=usr/include/netinet/ip_fw2.h
 OLD_FILES+=usr/include/netinet6/in6_prefix.h
 OLD_FILES+=usr/include/netns/idp.h
 OLD_FILES+=usr/include/netns/idp_var.h
 OLD_FILES+=usr/include/netns/ns.h
 OLD_FILES+=usr/include/netns/ns_error.h
 OLD_FILES+=usr/include/netns/ns_if.h
 OLD_FILES+=usr/include/netns/ns_pcb.h
 OLD_FILES+=usr/include/netns/sp.h
 OLD_FILES+=usr/include/netns/spidp.h
 OLD_FILES+=usr/include/netns/spp_debug.h
 OLD_FILES+=usr/include/netns/spp_timer.h
 OLD_FILES+=usr/include/netns/spp_var.h
 OLD_FILES+=usr/include/nfs/nfs.h
 OLD_FILES+=usr/include/nfs/nfsm_subs.h
 OLD_FILES+=usr/include/nfs/nfsmount.h
 OLD_FILES+=usr/include/nfs/nfsnode.h
 OLD_FILES+=usr/include/nfs/nfsrtt.h
 OLD_FILES+=usr/include/nfs/nfsrvcache.h
 OLD_FILES+=usr/include/nfs/nfsv2.h
 OLD_FILES+=usr/include/nfs/nqnfs.h
 OLD_FILES+=usr/include/ntfs/ntfs.h
 OLD_FILES+=usr/include/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/ntfs/ntfsmount.h
 OLD_FILES+=usr/include/nwfs/nwfs.h
 OLD_FILES+=usr/include/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/nwfs/nwfs_subr.h
 OLD_FILES+=usr/include/posix4/_semaphore.h
 OLD_FILES+=usr/include/posix4/aio.h
 OLD_FILES+=usr/include/posix4/ksem.h
 OLD_FILES+=usr/include/posix4/mqueue.h
 OLD_FILES+=usr/include/posix4/posix4.h
 OLD_FILES+=usr/include/posix4/sched.h
 OLD_FILES+=usr/include/posix4/semaphore.h
 OLD_DIRS+=usr/include/posix4
 OLD_FILES+=usr/include/security/_pam_compat.h
 OLD_FILES+=usr/include/security/_pam_macros.h
 OLD_FILES+=usr/include/security/_pam_types.h
 OLD_FILES+=usr/include/security/pam_malloc.h
 OLD_FILES+=usr/include/security/pam_misc.h
 OLD_FILES+=usr/include/skey.h
 OLD_FILES+=usr/include/strhash.h
 OLD_FILES+=usr/include/struct.h
 OLD_FILES+=usr/include/sys/_label.h
 OLD_FILES+=usr/include/sys/_posix.h
 OLD_FILES+=usr/include/sys/bus_private.h
 OLD_FILES+=usr/include/sys/ccdvar.h
 OLD_FILES+=usr/include/sys/diskslice.h
 OLD_FILES+=usr/include/sys/dmap.h
 OLD_FILES+=usr/include/sys/inttypes.h
 OLD_FILES+=usr/include/sys/jumbo.h
 OLD_FILES+=usr/include/sys/mac_policy.h
 OLD_FILES+=usr/include/sys/pbioio.h
 OLD_FILES+=usr/include/sys/syscall-hide.h
 OLD_FILES+=usr/include/sys/tprintf.h
 OLD_FILES+=usr/include/sys/vnioctl.h
 OLD_FILES+=usr/include/sys/wormio.h
 OLD_FILES+=usr/include/telnet.h
 OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h
 OLD_FILES+=usr/include/ufs/mfs/mfsnode.h
 OLD_FILES+=usr/include/values.h
 OLD_FILES+=usr/include/vm/vm_zone.h
 OLD_FILES+=usr/share/examples/etc/usbd.conf
 OLD_FILES+=usr/share/examples/meteor/README
 OLD_FILES+=usr/share/examples/meteor/rgb16.c
 OLD_FILES+=usr/share/examples/meteor/rgb24.c
 OLD_FILES+=usr/share/examples/meteor/test-n.c
 OLD_FILES+=usr/share/examples/meteor/yuvpk.c
 OLD_FILES+=usr/share/examples/meteor/yuvpl.c
 OLD_FILES+=usr/share/examples/worm/README
 OLD_FILES+=usr/share/examples/worm/makecdfs.sh
 OLD_FILES+=usr/share/groff_font/devlj4/Makefile
 OLD_FILES+=usr/share/groff_font/devlj4/text.map
 OLD_FILES+=usr/share/groff_font/devlj4/special.map
 OLD_FILES+=usr/share/misc/nslookup.help
 OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
 OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
 OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
 OLD_FILES+=usr/share/doc/ntp/authopt.htm
 OLD_FILES+=usr/share/doc/ntp/biblio.htm
 OLD_FILES+=usr/share/doc/ntp/build.htm
 OLD_FILES+=usr/share/doc/ntp/clockopt.htm
 OLD_FILES+=usr/share/doc/ntp/config.htm
 OLD_FILES+=usr/share/doc/ntp/confopt.htm
 OLD_FILES+=usr/share/doc/ntp/copyright.htm
 OLD_FILES+=usr/share/doc/ntp/debug.htm
 OLD_FILES+=usr/share/doc/ntp/driver1.htm
 OLD_FILES+=usr/share/doc/ntp/driver10.htm
 OLD_FILES+=usr/share/doc/ntp/driver11.htm
 OLD_FILES+=usr/share/doc/ntp/driver12.htm
 OLD_FILES+=usr/share/doc/ntp/driver16.htm
 OLD_FILES+=usr/share/doc/ntp/driver18.htm
 OLD_FILES+=usr/share/doc/ntp/driver19.htm
 OLD_FILES+=usr/share/doc/ntp/driver2.htm
 OLD_FILES+=usr/share/doc/ntp/driver20.htm
 OLD_FILES+=usr/share/doc/ntp/driver22.htm
 OLD_FILES+=usr/share/doc/ntp/driver23.htm
 OLD_FILES+=usr/share/doc/ntp/driver24.htm
 OLD_FILES+=usr/share/doc/ntp/driver26.htm
 OLD_FILES+=usr/share/doc/ntp/driver27.htm
 OLD_FILES+=usr/share/doc/ntp/driver28.htm
 OLD_FILES+=usr/share/doc/ntp/driver29.htm
 OLD_FILES+=usr/share/doc/ntp/driver3.htm
 OLD_FILES+=usr/share/doc/ntp/driver30.htm
 OLD_FILES+=usr/share/doc/ntp/driver32.htm
 OLD_FILES+=usr/share/doc/ntp/driver33.htm
 OLD_FILES+=usr/share/doc/ntp/driver34.htm
 OLD_FILES+=usr/share/doc/ntp/driver35.htm
 OLD_FILES+=usr/share/doc/ntp/driver36.htm
 OLD_FILES+=usr/share/doc/ntp/driver37.htm
 OLD_FILES+=usr/share/doc/ntp/driver4.htm
 OLD_FILES+=usr/share/doc/ntp/driver5.htm
 OLD_FILES+=usr/share/doc/ntp/driver6.htm
 OLD_FILES+=usr/share/doc/ntp/driver7.htm
 OLD_FILES+=usr/share/doc/ntp/driver8.htm
 OLD_FILES+=usr/share/doc/ntp/driver9.htm
 OLD_FILES+=usr/share/doc/ntp/exec.htm
 OLD_FILES+=usr/share/doc/ntp/extern.htm
 OLD_FILES+=usr/share/doc/ntp/gadget.htm
 OLD_FILES+=usr/share/doc/ntp/hints.htm
 OLD_FILES+=usr/share/doc/ntp/howto.htm
 OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
 OLD_FILES+=usr/share/doc/ntp/index.htm
 OLD_FILES+=usr/share/doc/ntp/kern.htm
 OLD_FILES+=usr/share/doc/ntp/kernpps.htm
 OLD_FILES+=usr/share/doc/ntp/ldisc.htm
 OLD_FILES+=usr/share/doc/ntp/measure.htm
 OLD_FILES+=usr/share/doc/ntp/miscopt.htm
 OLD_FILES+=usr/share/doc/ntp/monopt.htm
 OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
 OLD_FILES+=usr/share/doc/ntp/notes.htm
 OLD_FILES+=usr/share/doc/ntp/ntpd.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
 OLD_FILES+=usr/share/doc/ntp/ntpq.htm
 OLD_FILES+=usr/share/doc/ntp/ntptime.htm
 OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
 OLD_FILES+=usr/share/doc/ntp/parsedata.htm
 OLD_FILES+=usr/share/doc/ntp/parsenew.htm
 OLD_FILES+=usr/share/doc/ntp/patches.htm
 OLD_FILES+=usr/share/doc/ntp/porting.htm
 OLD_FILES+=usr/share/doc/ntp/pps.htm
 OLD_FILES+=usr/share/doc/ntp/prefer.htm
 OLD_FILES+=usr/share/doc/ntp/qth.htm
 OLD_FILES+=usr/share/doc/ntp/quick.htm
 OLD_FILES+=usr/share/doc/ntp/rdebug.htm
 OLD_FILES+=usr/share/doc/ntp/refclock.htm
 OLD_FILES+=usr/share/doc/ntp/release.htm
 OLD_FILES+=usr/share/doc/ntp/tickadj.htm
 OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/px.ascii.gz
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
 OLD_FILES+=usr/share/man/man3/mbmb.3.gz
 OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
 OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
 .if ${TARGET_ARCH} != "aarch64" && ${TARGET} != "arm" && \
     ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
     ${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips"
 OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
 .endif
 OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
 OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
 OLD_FILES+=usr/share/info/annotate.info.gz
 OLD_FILES+=usr/share/info/tar.info.gz
 OLD_FILES+=usr/share/bsnmp/defs/tree.def
 OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/libdata/msdosfs/iso22dos
 OLD_FILES+=usr/libdata/msdosfs/iso72dos
 OLD_FILES+=usr/libdata/msdosfs/koi2dos
 OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
 # The following files are *not* obsolete, they just don't get touched at
 # install, so don't add them:
 #  - boot/loader.rc
 #  - usr/share/tmac/man.local
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
 
 # Early entries split OLD_FILES, OLD_LIBS, and OLD_DIRS into separate sections
 # in this file, but this practice was abandoned in the mid-2000s.
 #
 # 20071120: shared library version bump
 OLD_LIBS+=usr/lib/libasn1.so.8
 OLD_LIBS+=usr/lib/libgssapi.so.8
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
 OLD_LIBS+=usr/lib/libhdb.so.8
 OLD_LIBS+=usr/lib/libkadm5clnt.so.8
 OLD_LIBS+=usr/lib/libkadm5srv.so.8
 OLD_LIBS+=usr/lib/libkafs5.so.8
 OLD_LIBS+=usr/lib/libkrb5.so.8
 OLD_LIBS+=usr/lib/libobjc.so.2
 OLD_LIBS+=usr/lib32/libgssapi.so.8
 OLD_LIBS+=usr/lib32/libobjc.so.2
 # 20070519: GCC 4.2
 OLD_LIBS+=usr/lib/libg2c.a
 OLD_LIBS+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
 OLD_LIBS+=usr/lib/libg2c_p.a
 OLD_LIBS+=usr/lib/libgcc_pic.a
 OLD_LIBS+=usr/lib32/libg2c.a
 OLD_LIBS+=usr/lib32/libg2c.so
 OLD_LIBS+=usr/lib32/libg2c.so.2
 OLD_LIBS+=usr/lib32/libg2c_p.a
 OLD_LIBS+=usr/lib32/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.4
 OLD_LIBS+=usr/lib32/libssl.so.4
 # 20060521: gethostbyaddr(3) ABI change
 OLD_LIBS+=usr/lib/libroken.so.8
 OLD_LIBS+=lib/libatm.so.3
 OLD_LIBS+=lib/libc.so.6
 OLD_LIBS+=lib/libutil.so.5
 OLD_LIBS+=usr/lib32/libatm.so.3
 OLD_LIBS+=usr/lib32/libc.so.6
 OLD_LIBS+=usr/lib32/libutil.so.5
 # 20060413: shared library moved to /usr/lib
 OLD_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 OLD_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 OLD_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_LIBS+=usr/lib/libc_r.a
 OLD_LIBS+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_LIBS+=usr/lib/libc_r_p.a
 OLD_LIBS+=usr/lib32/libc_r.a
 OLD_LIBS+=usr/lib32/libc_r.so
 OLD_LIBS+=usr/lib32/libc_r.so.7
 OLD_LIBS+=usr/lib32/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
 OLD_LIBS+=lib/libbegemot.so.1
 OLD_LIBS+=lib/libbsdxml.so.1
 OLD_LIBS+=lib/libbsnmp.so.2
 OLD_LIBS+=lib/libc.so.5
 OLD_LIBS+=lib/libcam.so.2
 OLD_LIBS+=lib/libcrypt.so.2
 OLD_LIBS+=lib/libcrypto.so.3
 OLD_LIBS+=lib/libdevstat.so.4
 OLD_LIBS+=lib/libedit.so.4
 OLD_LIBS+=lib/libgeom.so.2
 OLD_LIBS+=lib/libgpib.so.0
 OLD_LIBS+=lib/libipsec.so.1
 OLD_LIBS+=lib/libipx.so.2
 OLD_LIBS+=lib/libkiconv.so.1
 OLD_LIBS+=lib/libkvm.so.2
 OLD_LIBS+=lib/libm.so.3
 OLD_LIBS+=lib/libmd.so.2
 OLD_LIBS+=lib/libncurses.so.5
 OLD_LIBS+=lib/libreadline.so.5
 OLD_LIBS+=lib/libsbuf.so.2
 OLD_LIBS+=lib/libufs.so.2
 OLD_LIBS+=lib/libutil.so.4
 OLD_LIBS+=lib/libz.so.2
 OLD_LIBS+=usr/lib/libarchive.so.1
 OLD_LIBS+=usr/lib/libasn1.so.7
 OLD_LIBS+=usr/lib/libbluetooth.so.1
 OLD_LIBS+=usr/lib/libbz2.so.1
 OLD_LIBS+=usr/lib/libc_r.so.5
 OLD_LIBS+=usr/lib/libcalendar.so.2
 OLD_LIBS+=usr/lib/libcom_err.so.2
 OLD_LIBS+=usr/lib/libdevinfo.so.2
 OLD_LIBS+=usr/lib/libdialog.so.4
 OLD_LIBS+=usr/lib/libfetch.so.3
 OLD_LIBS+=usr/lib/libform.so.2
 OLD_LIBS+=usr/lib/libftpio.so.5
 OLD_LIBS+=usr/lib/libg2c.so.1
 OLD_LIBS+=usr/lib/libgnuregex.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.7
 OLD_LIBS+=usr/lib/libhdb.so.7
 OLD_LIBS+=usr/lib/libhistory.so.5
 OLD_LIBS+=usr/lib/libkadm5clnt.so.7
 OLD_LIBS+=usr/lib/libkadm5srv.so.7
 OLD_LIBS+=usr/lib/libkafs5.so.7
 OLD_LIBS+=usr/lib/libkrb5.so.7
 OLD_LIBS+=usr/lib/libmagic.so.1
 OLD_LIBS+=usr/lib/libmenu.so.2
 OLD_LIBS+=usr/lib/libmilter.so.2
 OLD_LIBS+=usr/lib/libmp.so.4
 OLD_LIBS+=usr/lib/libncp.so.1
 OLD_LIBS+=usr/lib/libnetgraph.so.1
 OLD_LIBS+=usr/lib/libngatm.so.1
 OLD_LIBS+=usr/lib/libobjc.so.1
 OLD_LIBS+=usr/lib/libopie.so.3
 OLD_LIBS+=usr/lib/libpam.so.2
 OLD_LIBS+=usr/lib/libpanel.so.2
 OLD_LIBS+=usr/lib/libpcap.so.3
 OLD_LIBS+=usr/lib/libpmc.so.2
 OLD_LIBS+=usr/lib/libpthread.so.1
 OLD_LIBS+=usr/lib/libradius.so.1
 OLD_LIBS+=usr/lib/libroken.so.7
 OLD_LIBS+=usr/lib/librpcsvc.so.2
 OLD_LIBS+=usr/lib/libsdp.so.1
 OLD_LIBS+=usr/lib/libsmb.so.1
 OLD_LIBS+=usr/lib/libssh.so.2
 OLD_LIBS+=usr/lib/libssl.so.3
 OLD_LIBS+=usr/lib/libstdc++.so.4
 OLD_LIBS+=usr/lib/libtacplus.so.1
 OLD_LIBS+=usr/lib/libthr.so.1
 OLD_LIBS+=usr/lib/libthread_db.so.1
 OLD_LIBS+=usr/lib/libugidfw.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.1
 OLD_LIBS+=usr/lib/libvgl.so.3
 OLD_LIBS+=usr/lib/libwrap.so.3
 OLD_LIBS+=usr/lib/libypclnt.so.1
 OLD_LIBS+=usr/lib/pam_chroot.so.2
 OLD_LIBS+=usr/lib/pam_deny.so.2
 OLD_LIBS+=usr/lib/pam_echo.so.2
 OLD_LIBS+=usr/lib/pam_exec.so.2
 OLD_LIBS+=usr/lib/pam_ftpusers.so.2
 OLD_LIBS+=usr/lib/pam_group.so.2
 OLD_LIBS+=usr/lib/pam_guest.so.2
 OLD_LIBS+=usr/lib/pam_krb5.so.2
 OLD_LIBS+=usr/lib/pam_ksu.so.2
 OLD_LIBS+=usr/lib/pam_lastlog.so.2
 OLD_LIBS+=usr/lib/pam_login_access.so.2
 OLD_LIBS+=usr/lib/pam_nologin.so.2
 OLD_LIBS+=usr/lib/pam_opie.so.2
 OLD_LIBS+=usr/lib/pam_opieaccess.so.2
 OLD_LIBS+=usr/lib/pam_passwdqc.so.2
 OLD_LIBS+=usr/lib/pam_permit.so.2
 OLD_LIBS+=usr/lib/pam_radius.so.2
 OLD_LIBS+=usr/lib/pam_rhosts.so.2
 OLD_LIBS+=usr/lib/pam_rootok.so.2
 OLD_LIBS+=usr/lib/pam_securetty.so.2
 OLD_LIBS+=usr/lib/pam_self.so.2
 OLD_LIBS+=usr/lib/pam_ssh.so.2
 OLD_LIBS+=usr/lib/pam_tacplus.so.2
 OLD_LIBS+=usr/lib/pam_unix.so.2
 OLD_LIBS+=usr/lib/snmp_atm.so.3
 OLD_LIBS+=usr/lib/snmp_mibII.so.3
 OLD_LIBS+=usr/lib/snmp_netgraph.so.3
 OLD_LIBS+=usr/lib/snmp_pf.so.3
 # 200505XX: ?
 OLD_LIBS+=usr/lib/snmp_atm.so.2
 OLD_LIBS+=usr/lib/snmp_mibII.so.2
 OLD_LIBS+=usr/lib/snmp_netgraph.so.2
 OLD_LIBS+=usr/lib/snmp_pf.so.2
 # 2005XXXX: not ready for primetime yet
 OLD_LIBS+=usr/lib/libautofs.so.1
 # 200411XX: libxpg4 removal
 OLD_LIBS+=usr/lib/libxpg4.so.3
 # 200410XX: libm compatibility fix
 OLD_LIBS+=lib/libm.so.2
 # 20041001: version bump
 OLD_LIBS+=lib/libreadline.so.4
 OLD_LIBS+=usr/lib/libhistory.so.4
 OLD_LIBS+=usr/lib/libopie.so.2
 OLD_LIBS+=usr/lib/libpcap.so.2
 # 20040925: bind9 import
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
 # 200404XX
 OLD_LIBS+=usr/lib/libsnmp.so.1
 OLD_LIBS+=usr/lib/snmp_mibII.so.1
 # 200309XX
 OLD_LIBS+=usr/lib/libasn1.so.6
 OLD_LIBS+=usr/lib/libhdb.so.6
 OLD_LIBS+=usr/lib/libkadm5clnt.so.6
 OLD_LIBS+=usr/lib/libkadm5srv.so.6
 OLD_LIBS+=usr/lib/libkrb5.so.6
 OLD_LIBS+=usr/lib/libroken.so.6
 # 200304XX
 OLD_LIBS+=usr/lib/libc.so.4
 OLD_LIBS+=usr/lib/libc_r.so.4
 OLD_LIBS+=usr/lib/libdevstat.so.2
 OLD_LIBS+=usr/lib/libedit.so.3
 OLD_LIBS+=usr/lib/libgmp.so.3
 OLD_LIBS+=usr/lib/libmp.so.3
 OLD_LIBS+=usr/lib/libpam.so.1
 OLD_LIBS+=usr/lib/libposix1e.so.2
 OLD_LIBS+=usr/lib/libskey.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.0
 OLD_LIBS+=usr/lib/libvgl.so.2
 # 20030218: OpenSSL 0.9.7 import
 OLD_FILES+=usr/include/des.h
 OLD_FILES+=usr/lib/libdes.a
 OLD_FILES+=usr/lib/libdes.so
 OLD_LIBS+=usr/lib/libdes.so.3
 OLD_FILES+=usr/lib/libdes_p.a
 # 200302XX
 OLD_LIBS+=usr/lib/libacl.so.3
 OLD_LIBS+=usr/lib/libasn1.so.5
 OLD_LIBS+=usr/lib/libcrypto.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.5
 OLD_LIBS+=usr/lib/libhdb.so.5
 OLD_LIBS+=usr/lib/libkadm.so.3
 OLD_LIBS+=usr/lib/libkadm5clnt.so.5
 OLD_LIBS+=usr/lib/libkadm5srv.so.5
 OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
 OLD_LIBS+=usr/lib/libroken.so.
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
 OLD_LIBS+=usr/lib/libgssapi.so.4
 # 200203XX
 OLD_LIBS+=usr/lib/libss.so.3
 OLD_LIBS+=usr/lib/libusb.so.0
 # 200112XX
 OLD_LIBS+=usr/lib/libfetch.so.2
 # 200110XX
 OLD_LIBS+=usr/lib/libgssapi.so.3
 # 200104XX
 OLD_LIBS+=usr/lib/libdescrypt.so.2
 OLD_LIBS+=usr/lib/libscrypt.so.2
 # 200102XX
 OLD_LIBS+=usr/lib/libcrypto.so.1
 OLD_LIBS+=usr/lib/libssl.so.1
 # 200009XX
 OLD_LIBS+=usr/lib/libRSAglue.so.1
 OLD_LIBS+=usr/lib/librsaINTL.so.1
 OLD_LIBS+=usr/lib/librsaUSA.so.1
 # 200006XX
 OLD_LIBS+=usr/lib/libalias.so.3
 OLD_LIBS+=usr/lib/libfetch.so.1
 OLD_LIBS+=usr/lib/libipsec.so.0
 # 200005XX
 OLD_LIBS+=usr/lib/libxpg4.so.2
 # 200002XX
 OLD_LIBS+=usr/lib/libc.so.3
 OLD_LIBS+=usr/lib/libcurses.so.2
 OLD_LIBS+=usr/lib/libdialog.so.3
 OLD_LIBS+=usr/lib/libedit.so.2
 OLD_LIBS+=usr/lib/libf2c.so.2
 OLD_LIBS+=usr/lib/libftpio.so.4
 OLD_LIBS+=usr/lib/libg++.so.4
 OLD_LIBS+=usr/lib/libhistory.so.3
 OLD_LIBS+=usr/lib/libmytinfo.so.2
 OLD_LIBS+=usr/lib/libncurses.so.3
 OLD_LIBS+=usr/lib/libreadline.so.3
 OLD_LIBS+=usr/lib/libss.so.2
 OLD_LIBS+=usr/lib/libtermcap.so.2
 OLD_LIBS+=usr/lib/libutil.so.2
 OLD_LIBS+=usr/lib/libvgl.so.1
 OLD_LIBS+=usr/lib/libwrap.so.2
 # ???
 OLD_LIBS+=usr/lib/libarchive.so.2
 OLD_LIBS+=usr/lib/libbsnmp.so.1
 OLD_LIBS+=usr/lib/libc_r.so.6
 OLD_LIBS+=usr/lib32/libarchive.so.2
 OLD_LIBS+=usr/lib32/libc_r.so.6
 OLD_LIBS+=usr/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
 OLD_DIRS+=usr/include/ntfs
 OLD_DIRS+=usr/include/nwfs
 OLD_DIRS+=usr/include/ufs/mfs
 # 20011001: UUCP migration to ports
 OLD_DIRS+=usr/libexec/uucp
 
 
 .include "tools/build/mk/OptionalObsoleteFiles.inc"
Index: head/contrib/opencsd/decoder/include/common/ocsd_dcd_mngr.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/ocsd_dcd_mngr.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/common/ocsd_dcd_mngr.h	(revision 362263)
@@ -1,396 +1,402 @@
 /*
  * \file       ocsd_dcd_mngr.h
  * \brief      OpenCSD : Decoder manager base class.
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_OCSD_DCD_MNGR_H_INCLUDED
 #define ARM_OCSD_DCD_MNGR_H_INCLUDED
 
 #include "opencsd/ocsd_if_types.h"
 #include "common/ocsd_dcd_mngr_i.h"
 #include "common/ocsd_lib_dcd_register.h"
 #include "common/trc_pkt_decode_base.h"
 #include "common/trc_pkt_proc_base.h"
 
 template <class P, class Pt, class Pc>
 class DecoderMngrBase : public IDecoderMngr
 {
 public:
     DecoderMngrBase(const std::string &decoderTypeName, ocsd_trace_protocol_t builtInProtocol);
     virtual ~DecoderMngrBase() {};
 
     // create decoder interface.
     virtual ocsd_err_t createDecoder(const int create_flags, const int instID, const CSConfig *p_config,  TraceComponent **p_component);
     virtual ocsd_err_t destroyDecoder(TraceComponent *p_component);
 
     virtual const ocsd_trace_protocol_t getProtocolType() const { return m_builtInProtocol; }
 
 // common    
     virtual ocsd_err_t attachErrorLogger(TraceComponent *pComponent, ITraceErrorLog *pIErrorLog);
     
 // pkt decoder
     virtual ocsd_err_t attachInstrDecoder(TraceComponent *pComponent, IInstrDecode *pIInstrDec);
     virtual ocsd_err_t attachMemAccessor(TraceComponent *pComponent, ITargetMemAccess *pMemAccessor);
     virtual ocsd_err_t attachOutputSink(TraceComponent *pComponent, ITrcGenElemIn *pOutSink);
 
 // pkt processor
     virtual ocsd_err_t attachPktMonitor(TraceComponent *pComponent, ITrcTypedBase *pPktRawDataMon);
     virtual ocsd_err_t attachPktIndexer(TraceComponent *pComponent, ITrcTypedBase *pPktIndexer);
     virtual ocsd_err_t attachPktSink(TraceComponent *pComponent, ITrcTypedBase *pPktDataInSink);
 
 // data input connection interface
     virtual ocsd_err_t getDataInputI(TraceComponent *pComponent, ITrcDataIn **ppDataIn);
 
 // generate a Config object from opaque config struct pointer.
     virtual ocsd_err_t createConfigFromDataStruct(CSConfig **pConfigBase, const void *pDataStruct);
 
 // implemented by decoder handler derived classes
     virtual TraceComponent *createPktProc(const bool useInstID, const int instID) = 0;
     virtual TraceComponent *createPktDecode(const bool useInstID, const int instID) { return 0; };
     virtual CSConfig *createConfig(const void *pDataStruct) = 0;
 
     
 private:
     ocsd_trace_protocol_t m_builtInProtocol;    //!< Protocol ID if built in type.
 };
 
 template <class P, class Pt, class Pc>
 DecoderMngrBase<P,Pt,Pc>::DecoderMngrBase(const std::string &decoderTypeName, ocsd_trace_protocol_t builtInProtocol)
 {
     OcsdLibDcdRegister *pDcdReg = OcsdLibDcdRegister::getDecoderRegister();
     if(pDcdReg)
         pDcdReg->registerDecoderTypeByName(decoderTypeName,this);
     m_builtInProtocol = builtInProtocol;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t  DecoderMngrBase<P,Pt,Pc>::createDecoder(const int create_flags, const int instID, const CSConfig *pConfig,  TraceComponent **ppTrcComp)
 {
     TraceComponent *pkt_proc = 0;
     TraceComponent *pkt_dcd = 0;
     bool bUseInstID =  (create_flags & OCSD_CREATE_FLG_INST_ID) != 0;
     bool bDecoder = (create_flags & OCSD_CREATE_FLG_FULL_DECODER) != 0;
     bool bUnConfigured = (pConfig == 0);
 
     const Pc *pConf = dynamic_cast< const Pc * >(pConfig);
 
     // check inputs valid... 
     if((pConf == 0) && !bUnConfigured)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
      if((create_flags & (OCSD_CREATE_FLG_PACKET_PROC | OCSD_CREATE_FLG_FULL_DECODER)) == 0)
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     // always need a packet processor
     pkt_proc = createPktProc(bUseInstID, instID);
     if(!pkt_proc)
         return OCSD_ERR_MEM;
 
+    // set the op mode flags
+    pkt_proc->setComponentOpMode(create_flags & (OCSD_OPFLG_COMP_MODE_MASK | OCSD_OPFLG_PKTPROC_COMMON));
+
     // set the configuration
     TrcPktProcBase<P,Pt,Pc> *pProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> *>(pkt_proc);       
     if(pProcBase == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     if(!bUnConfigured)
         pProcBase->setProtocolConfig(pConf);
 
     *ppTrcComp = pkt_proc;
 
     // may need a packet decoder
     if(bDecoder)
     {
         // create the decoder
         pkt_dcd = createPktDecode(bUseInstID, instID);
         if(!pkt_dcd)
             return OCSD_ERR_MEM;
+
+        // set the op mode flags
+        pkt_dcd->setComponentOpMode(create_flags & (OCSD_OPFLG_COMP_MODE_MASK | OCSD_OPFLG_PKTDEC_COMMON));
 
         // get the decoder base
         TrcPktDecodeBase<P,Pc> *pBase = dynamic_cast< TrcPktDecodeBase<P,Pc> *>(pkt_dcd);       
         if(pBase == 0)
             return OCSD_ERR_INVALID_PARAM_TYPE;
 
         if(!bUnConfigured)
             pBase->setProtocolConfig(pConf);
 
         // associate decoder with packet processor
         // -> this means a TraceComponent with an associated component is a packet decoder.
         //    the associated component is the connected packet processor.
         pkt_dcd->setAssocComponent(pkt_proc);
 
         // connect packet processor and decoder
         pProcBase->getPacketOutAttachPt()->attach(pBase);
 
         *ppTrcComp = pkt_dcd;
     }
     return OCSD_OK;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::destroyDecoder(TraceComponent *pComponent)
 {
     if(pComponent->getAssocComponent() != 0)
         delete pComponent->getAssocComponent();
     delete pComponent;
     return OCSD_OK;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachErrorLogger(TraceComponent *pComponent, ITraceErrorLog *pIErrorLog)
 {
     return pComponent->getErrorLogAttachPt()->replace_first(pIErrorLog);
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachInstrDecoder(TraceComponent *pComponent, IInstrDecode *pIInstrDec)
 {
     ocsd_err_t err = OCSD_ERR_DCD_INTERFACE_UNUSED;
 
     if(pComponent->getAssocComponent() == 0)    // no associated component - so this is a packet processor
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     TrcPktDecodeI *pDcdI = dynamic_cast< TrcPktDecodeI * >(pComponent);
     if(pDcdI == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     if(pDcdI->getUsesIDecode())
         err = pDcdI->getInstrDecodeAttachPt()->replace_first(pIInstrDec);
 
     return err;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachMemAccessor(TraceComponent *pComponent, ITargetMemAccess *pMemAccessor)
 {
     ocsd_err_t err = OCSD_ERR_DCD_INTERFACE_UNUSED;
 
     if(pComponent->getAssocComponent() == 0)    // no associated component - so this is a packet processor
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     TrcPktDecodeI *pDcdI = dynamic_cast< TrcPktDecodeI * >(pComponent);
     if(pDcdI == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     if(pDcdI->getUsesMemAccess())
         err = pDcdI->getMemoryAccessAttachPt()->replace_first(pMemAccessor);        
 
     return err;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachOutputSink(TraceComponent *pComponent, ITrcGenElemIn *pOutSink)
 {
     ocsd_err_t err = OCSD_ERR_INVALID_PARAM_TYPE;
 
     if(pComponent->getAssocComponent() == 0)    // no associated component - so this is a packet processor
         return err;
 
     TrcPktDecodeI *pDcdI = dynamic_cast< TrcPktDecodeI * >(pComponent);
     if(pDcdI == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     err = pDcdI->getTraceElemOutAttachPt()->replace_first(pOutSink);
 
     return err;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::getDataInputI(TraceComponent *pComponent, ITrcDataIn **ppDataIn)
 {
     // find the packet processor
     TraceComponent *pPktProc = pComponent;
     if(pComponent->getAssocComponent() != 0)
         pPktProc = pComponent->getAssocComponent();
 
     TrcPktProcI *pPPI = dynamic_cast< TrcPktProcI * >(pPktProc);
     if(pPPI == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     *ppDataIn = pPPI;
 
     return OCSD_OK;
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachPktMonitor(TraceComponent *pComponent, ITrcTypedBase *pPktRawDataMon)
 {
     // find the packet processor
     TraceComponent *pPktProc = pComponent;
     if(pComponent->getAssocComponent() != 0)
         pPktProc = pComponent->getAssocComponent();
 
     // get the packet processor
     TrcPktProcBase<P,Pt,Pc> *pPktProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> * >(pPktProc);
     if(pPktProcBase == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     // get the interface
     IPktRawDataMon<P> *p_If =  dynamic_cast< IPktRawDataMon<P> * >(pPktRawDataMon);
     if(p_If == 0)
         return  OCSD_ERR_INVALID_PARAM_TYPE;
 
     return pPktProcBase->getRawPacketMonAttachPt()->replace_first(p_If);
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachPktIndexer(TraceComponent *pComponent, ITrcTypedBase *pPktIndexer)
 {
     // find the packet processor
     TraceComponent *pPktProc = pComponent;
     if(pComponent->getAssocComponent() != 0)
         pPktProc = pComponent->getAssocComponent();
 
     // get the packet processor
     TrcPktProcBase<P,Pt,Pc> *pPktProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> * >(pPktProc);
     if(pPktProcBase == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     // get the interface
     ITrcPktIndexer<Pt> *p_If =  dynamic_cast< ITrcPktIndexer<Pt> * >(pPktIndexer);
     if(p_If == 0)
         return  OCSD_ERR_INVALID_PARAM_TYPE;
 
     return pPktProcBase->getTraceIDIndexerAttachPt()->replace_first(p_If);
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::attachPktSink(TraceComponent *pComponent, ITrcTypedBase *pPktDataInSink)
 {
     // must be solo packet processor
     if(pComponent->getAssocComponent() != 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     // interface must be the correct one.
     IPktDataIn<P> *pkt_in_i = dynamic_cast< IPktDataIn<P> * >(pPktDataInSink);
     if(pkt_in_i == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     // get the packet processor
     TrcPktProcBase<P,Pt,Pc> *pPktProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> * >(pComponent);
     if(pPktProcBase == 0)
         return OCSD_ERR_INVALID_PARAM_TYPE;
 
     // attach
     return  pPktProcBase->getPacketOutAttachPt()->replace_first(pkt_in_i);
 }
 
 template <class P, class Pt, class Pc>
 ocsd_err_t DecoderMngrBase<P,Pt,Pc>::createConfigFromDataStruct(CSConfig **pConfigBase, const void *pDataStruct)
 {
     CSConfig *pConfig = createConfig(pDataStruct);
     if(!pConfig)
         return OCSD_ERR_MEM;
     *pConfigBase = pConfig;
     return OCSD_OK;
 }
 
 /****************************************************************************************************/
 /* Full decoder / packet process pair, templated base for creating decoder objects                  */
 /****************************************************************************************************/
 
 template<   class P,            // Packet class.
             class Pt,           // Packet enum type ID.
             class Pc,           // Processor config class.
             class PcSt,         // Processor config struct type
             class PktProc,      // Packet processor class.
             class PktDcd>       // Packet decoder class.
 class DecodeMngrFullDcd : public DecoderMngrBase<P,Pt,Pc>
 {
 public:
     DecodeMngrFullDcd (const std::string &name, ocsd_trace_protocol_t builtInProtocol) 
         : DecoderMngrBase<P,Pt,Pc>(name,builtInProtocol) {};
 
     virtual ~DecodeMngrFullDcd() {};
 
     virtual TraceComponent *createPktProc(const bool useInstID, const int instID)
     {
         TraceComponent *pComp;
         if(useInstID)
             pComp = new (std::nothrow) PktProc(instID);
         else
             pComp = new (std::nothrow) PktProc();
         return pComp;
     }
 
     virtual TraceComponent *createPktDecode(const bool useInstID, const int instID)
     {
         TraceComponent *pComp;
         if(useInstID)
             pComp = new (std::nothrow)PktDcd(instID);
         else
             pComp = new (std::nothrow)PktDcd();
         return pComp;
     }
 
     virtual CSConfig *createConfig(const void *pDataStruct)
     {
        return new (std::nothrow) Pc((PcSt *)pDataStruct);
     }
 };
 
 /****************************************************************************************************/
 /* Packet processor only, templated base for creating decoder objects                               */
 /****************************************************************************************************/
 
 template<   class P,            // Packet class.
             class Pt,           // Packet enum type ID.
             class Pc,           // Processor config class.
             class PcSt,         // Processor config struct type
             class PktProc>      // Packet processor class.
 class DecodeMngrPktProc : public DecoderMngrBase<P,Pt,Pc>
 {
 public:
     DecodeMngrPktProc (const std::string &name, ocsd_trace_protocol_t builtInProtocol) 
         : DecoderMngrBase<P,Pt,Pc>(name,builtInProtocol) {};
 
     virtual ~DecodeMngrPktProc() {};
 
     virtual TraceComponent *createPktProc(const bool useInstID, const int instID)
     {
         TraceComponent *pComp;
         if(useInstID)
             pComp = new (std::nothrow) PktProc(instID);
         else
             pComp = new (std::nothrow) PktProc();
         return pComp;
     }
 
     virtual CSConfig *createConfig(const void *pDataStruct)
     {
        return new (std::nothrow) Pc((PcSt *)pDataStruct);
     }
 };
 
 
 
 #endif // ARM_OCSD_DCD_MNGR_H_INCLUDED
 
 /* End of File ocsd_dcd_mngr.h */
Index: head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_list.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_list.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_list.h	(revision 362263)
@@ -1,153 +1,153 @@
 /*
- * \file       ocsd_gen_elem_stack.h
- * \brief      OpenCSD : Generic element output stack.
+ * \file       ocsd_gen_elem_list.h
+ * \brief      OpenCSD : Generic element output list.
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include <list>
 #include "trc_gen_elem.h"
 #include "comp_attach_pt_t.h"
 #include "interfaces/trc_gen_elem_in_i.h"
 
 /*!
  * @class OcsdGenElemList
  * @brief Maintain a list of elements to be output
  * 
  * Each incoming packet can result in multiple output elements.
  * These are stacked in this class prior to entering the output phase of processing.
  *
  * This should remove some of the requirement on the packet processing to be re-enterant,
  * simplifying this code.
  *
- * Last element(s) on this stack can be marked pending to allow for later cancellation.
+ * Last element(s) on this list can be marked pending to allow for later cancellation.
  * (This required for cancel element in ETMv3 exeception branch).
  * 
  * The "list" is actually a ring buffer - maintaining pointers to indicate current valid elements.
  * This buffer can increase on demand, but will only be released at the end of a decode session.
  */
 class OcsdGenElemList
 {
 public:
     OcsdGenElemList();
     ~OcsdGenElemList();
 
     void initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf);
     void initCSID(const uint8_t CSID) { m_CSID = CSID; };
 
     void reset();   //!< reset the element list.
 
     OcsdTraceElement *getNextElem(const ocsd_trc_index_t trc_pkt_idx); //!< get next free element on the stack (add one to the output)
     const int getNumElem() const;                                      //!< return the total number of elements on the stack (inlcuding any pended ones).
     
     const ocsd_gen_trc_elem_t getElemType(const int entryN) const;    //!< get the type for the nth element in the stack (0 indexed)
 
     void pendLastNElem(int numPend);    //!< Last element to be pended prior to cancel/commit decision.
     void commitAllPendElem();           //!< commit all pended elements.
     void cancelPendElem();              //!< cancel the last pended element on the stack.
     const int numPendElem() const;      //!< return the number of pended elements.
 
     /*! Send all of the none pended elements
         Stop sending when all sent or _CONT response.
      */
     ocsd_datapath_resp_t sendElements(); 
     const bool elemToSend() const;  //!< true if any none-pending elements left to send.
 
 private:
 
     void growArray();
     const int getAdjustedIdx(int idxIn) const;  //!< get adjusted index into circular buffer.
 
 
     // list element contains pointer and byte index in trace stream
     typedef struct _elemPtr {
         OcsdTraceElement *pElem;        //!< pointer to the listed trace element
         ocsd_trc_index_t trc_pkt_idx;   //!< packet index in the trace stream
     } elemPtr_t;
 
     elemPtr_t *m_pElemArray;    //!< an array of pointers to elements.
     int m_elemArraySize;        //!< number of element pointers in the array 
 
     int m_firstElemIdx;        //!< internal index in array of first element in use.
     int m_numUsed;             //!< number of elements in use
     int m_numPend;             //!< internal count of pended elements.
 
     uint8_t m_CSID;
 
     componentAttachPt<ITrcGenElemIn> *m_sendIf; //!< element send interface.
 };
 
 inline const int OcsdGenElemList::getAdjustedIdx(int idxIn) const
 {
     if(idxIn >= m_elemArraySize)
         idxIn -= m_elemArraySize;
     return idxIn;
 }
 
 inline const int OcsdGenElemList::getNumElem() const 
 { 
     return m_numUsed; 
 }
 
 inline const int OcsdGenElemList::numPendElem() const
 {
     return m_numPend;
 }
 
 inline void OcsdGenElemList::pendLastNElem(int numPend)
 {
     if(numPend >= getNumElem())
         m_numPend = numPend;
 }
 
 inline void OcsdGenElemList::commitAllPendElem()
 {
      m_numPend = 0;
 }
 
 inline void OcsdGenElemList::cancelPendElem()
 {
     if(m_numPend > 0)
     {
         m_numUsed -= m_numPend;
     }
 }
 
 inline const bool OcsdGenElemList::elemToSend() const
 {
     return ((getNumElem() - m_numPend) > 0);
 }
 
 inline void OcsdGenElemList::initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf)
 {
     m_sendIf = pGenElemIf;
 }
 
-/* End of File ocsd_gen_elem_stack.h */
+/* End of File ocsd_gen_elem_list.h */
Index: head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_stack.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_stack.h	(nonexistent)
+++ head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_stack.h	(revision 362263)
@@ -0,0 +1,109 @@
+/*
+* \file       ocsd_gen_elem_stack.h
+* \brief      OpenCSD : Generic element output stack.
+*
+* \copyright  Copyright (c) 2020, ARM Limited. All Rights Reserved.
+*/
+
+/*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "trc_gen_elem.h"
+#include "comp_attach_pt_t.h"
+#include "interfaces/trc_gen_elem_in_i.h"
+
+/* element stack to handle cases where a trace element can generate multiple output packets 
+  
+   maintains the "current" element, which might be sent independently of this stack, and also
+   ensures that persistent data in the output elements is maintained between elements.
+*/
+class OcsdGenElemStack
+{
+public:
+    OcsdGenElemStack();
+    ~OcsdGenElemStack();
+
+    void initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf);
+    void initCSID(const uint8_t CSID) { m_CSID = CSID; };
+
+    OcsdTraceElement &getCurrElem();    //!< get the current element. 
+    ocsd_err_t resetElemStack();        //!< set pointers to base of stack
+    ocsd_err_t addElem(const ocsd_trc_index_t trc_pkt_idx);    //!< add elem to stack and set current.
+    void setCurrElemIdx(const ocsd_trc_index_t trc_pkt_idx);   //!< packet index for this element
+    ocsd_err_t addElemType(const ocsd_trc_index_t trc_pkt_idx, ocsd_gen_trc_elem_t elem_type);
+
+    ocsd_datapath_resp_t sendElements();    //!< send elements on the stack
+    const int numElemToSend() const;
+
+private:
+    typedef struct _elemPtr {
+        OcsdTraceElement *pElem;        //!< pointer to the listed trace element
+        ocsd_trc_index_t trc_pkt_idx;   //!< packet index in the trace stream
+    } elemPtr_t;
+
+    const bool isInit();              //!< check correctly initialised.
+
+    ocsd_err_t growArray();
+    void copyPersistentData(int src, int dst);  //!< copy across persistent state data between elements
+    void resetIndexes();    //!< clear down all indexes - reset or send complete.
+
+    elemPtr_t *m_pElemArray;    //!< an array of pointers to elements.
+    int m_elemArraySize;        //!< number of element pointers in the array 
+
+    int m_elem_to_send;     //!< number of live elements in the stack - init to 1.
+    int m_curr_elem_idx;    //!< index into the element array.
+    int m_send_elem_idx;    //!< next element to send.
+
+    //!< send packet info
+    uint8_t m_CSID;
+    componentAttachPt<ITrcGenElemIn> *m_sendIf; //!< element send interface.
+
+    bool m_is_init;
+};
+
+inline const int OcsdGenElemStack::numElemToSend() const
+{
+    return m_elem_to_send;
+}
+
+inline void OcsdGenElemStack::initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf)
+{
+    m_sendIf = pGenElemIf;
+}
+
+inline void OcsdGenElemStack::setCurrElemIdx(const ocsd_trc_index_t trc_pkt_idx)
+{
+    m_pElemArray[m_curr_elem_idx].trc_pkt_idx = trc_pkt_idx;
+}
+
+inline OcsdTraceElement &OcsdGenElemStack::getCurrElem()
+{
+    return *(m_pElemArray[m_curr_elem_idx].pElem);
+}
+
+
+/* End of File ocsd_gen_elem_stack.h */

Property changes on: head/contrib/opencsd/decoder/include/common/ocsd_gen_elem_stack.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/include/common/trc_core_arch_map.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/trc_core_arch_map.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/common/trc_core_arch_map.h	(revision 362263)
@@ -1,68 +1,100 @@
 /*!
  * \file       trc_core_arch_map.h
  * \brief      OpenCSD : Map core name strings to architecture profile constants.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_CORE_ARCH_MAP_H_INCLUDED
 #define ARM_TRC_CORE_ARCH_MAP_H_INCLUDED
 
 #include <map>
 #include <string>
 #include "opencsd/ocsd_if_types.h"
 
+/** @class CoreArchProfileMap
+ *
+ *  @brief Map core / arch name to profile for decoder.
+ *
+ *  Helper class for library clients to map core or architecture version names onto 
+ *  a profile / arch version pair suitable for use with the decode library.
+ * 
+ *  Valid core names are:-
+ *   - Cortex-Axx : where xx = 5,7,12,15,17,32,35,53,55,57,65,72,73,75,76,77;
+ *   - Cortex-Rxx : where xx = 5,7,8,52;
+ *   - Cortex-Mxx : where xx = 0,0+,3,4,23,33;
+ *
+ *  Valid architecture profile names are:-
+ *   - ARMv7-A, ARMv7-R, ARMv7-M;
+ *   - ARMv8-A, ARMv8.3A, ARMv8-R, ARMv8-M;
+ *  
+ */
 class CoreArchProfileMap
 {
 public:
     CoreArchProfileMap();
     ~CoreArchProfileMap() {};
 
     ocsd_arch_profile_t getArchProfile(const std::string &coreName);
 
 private:
 
     std::map<std::string, ocsd_arch_profile_t> core_profiles;
+    std::map<std::string, ocsd_arch_profile_t> arch_profiles;
 };
 
 inline ocsd_arch_profile_t CoreArchProfileMap::getArchProfile(const std::string &coreName)
 {
     ocsd_arch_profile_t ap = { ARCH_UNKNOWN, profile_Unknown };
+    bool bFound = false;
 
     std::map<std::string, ocsd_arch_profile_t>::const_iterator it;
+
+    /* match against the core name map. */
     it = core_profiles.find(coreName);
-    if(it != core_profiles.end())
+    if (it != core_profiles.end())
+    {
         ap = it->second;
+        bFound = true;
+    }
+
+    /* scan architecture profiles on no core name match */
+    if (!bFound)
+    {
+        it = arch_profiles.find(coreName);
+        if (it != arch_profiles.end())
+            ap = it->second;
+    }
     return ap;
 }
 
 #endif // ARM_TRC_CORE_ARCH_MAP_H_INCLUDED
 
 /* End of File trc_core_arch_map.h */
Index: head/contrib/opencsd/decoder/include/common/trc_gen_elem.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/trc_gen_elem.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/common/trc_gen_elem.h	(revision 362263)
@@ -1,209 +1,222 @@
 /*!
  * \file       trc_gen_elem.h
  * \brief      OpenCSD : Decoder Generic trace element output class.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #ifndef ARM_TRC_GEN_ELEM_H_INCLUDED
 #define ARM_TRC_GEN_ELEM_H_INCLUDED
 
 #include "opencsd/trc_gen_elem_types.h"
 #include "trc_printable_elem.h"
 #include "ocsd_pe_context.h"
 
 /** @addtogroup gen_trc_elem 
 @{*/
 
 /*!
  * @class OcsdTraceElement
  * @brief Generic trace element class
  * 
  */
 class OcsdTraceElement : public trcPrintableElem, public ocsd_generic_trace_elem
 {
 public:
     OcsdTraceElement();
     OcsdTraceElement(ocsd_gen_trc_elem_t type);
     virtual ~OcsdTraceElement() {};
 
     void init();
 
 // set elements API
 
     void setType(const ocsd_gen_trc_elem_t type);       //!< set type and init flags
     void updateType(const ocsd_gen_trc_elem_t type);    //!< change type only - no init
 
     void setContext(const ocsd_pe_context &new_context) { context = new_context; };
     void setISA(const ocsd_isa isa_update);
     
     void setCycleCount(const uint32_t cycleCount);
     void setEvent(const event_t ev_type, const uint16_t number);
     void setTS(const uint64_t ts, const bool freqChange = false);
 
     void setExcepMarker() { excep_data_marker = 1; };
     void setExceptionNum(uint32_t excepNum) { exception_number = excepNum; };
 
 
     void setTraceOnReason(const trace_on_reason_t reason);
+    void setUnSyncEOTReason(const unsync_info_t reason);
 
     void setAddrRange(const ocsd_vaddr_t  st_addr, const ocsd_vaddr_t en_addr, const int num_instr = 1);
     void setLastInstrInfo(const bool exec, const ocsd_instr_type last_i_type, const ocsd_instr_subtype last_i_subtype, const uint8_t size);
     void setAddrStart(const ocsd_vaddr_t  st_addr) { this->st_addr = st_addr; };
     void setLastInstrCond(const int is_cond) { this->last_instr_cond = is_cond; };
 
     void setSWTInfo(const ocsd_swt_info_t swt_info) { sw_trace_info = swt_info; };
     void setExtendedDataPtr(const void *data_ptr);
 
 // stringize the element
 
     virtual void toString(std::string &str) const;
 
 // get elements API
 
     OcsdTraceElement &operator =(const ocsd_generic_trace_elem* p_elem);
 
     const ocsd_gen_trc_elem_t getType() const { return elem_type; };
 
     // return current context
     const ocsd_pe_context &getContext() const {  return context; };
 
-    
+    void copyPersistentData(const OcsdTraceElement &src);
+
 private:
     void printSWInfoPkt(std::ostringstream &oss) const;
     void clearPerPktData(); //!< clear flags that indicate validity / have values on a per packet basis
 
 };
 
 inline OcsdTraceElement::OcsdTraceElement(ocsd_gen_trc_elem_t type)    
 {
     elem_type = type;
 }
 
 inline OcsdTraceElement::OcsdTraceElement()    
 {
     elem_type = OCSD_GEN_TRC_ELEM_UNKNOWN;
 }
 
 inline void OcsdTraceElement::setCycleCount(const uint32_t cycleCount)
 {
     cycle_count = cycleCount;
     has_cc = 1;
 }
 
 inline void OcsdTraceElement::setEvent(const event_t ev_type, const uint16_t number)
 {
     trace_event.ev_type = (uint16_t)ev_type;
     trace_event.ev_number = ev_type == EVENT_NUMBERED ? number : 0;
 }
 
 inline void OcsdTraceElement::setAddrRange(const ocsd_vaddr_t  st_addr, const ocsd_vaddr_t en_addr, const int num_instr /* = 1 */)
 {
     this->st_addr = st_addr;
     this->en_addr = en_addr;
     this->num_instr_range = num_instr;
 }
 
 inline void OcsdTraceElement::setLastInstrInfo(const bool exec, const ocsd_instr_type last_i_type, const ocsd_instr_subtype last_i_subtype, const uint8_t size)
 {
     last_instr_exec = exec ? 1 : 0;
     last_instr_sz = size & 0x7;
     this->last_i_type = last_i_type;
     this->last_i_subtype = last_i_subtype;
 }
 
 inline void OcsdTraceElement::setType(const ocsd_gen_trc_elem_t type) 
 { 
     // set the type and clear down the per element flags
     elem_type = type;
 
     clearPerPktData();
 }
 
 inline void OcsdTraceElement::updateType(const ocsd_gen_trc_elem_t type)
 {
     elem_type = type;
 }
 
 inline void OcsdTraceElement::init()
 {
     st_addr = en_addr = (ocsd_vaddr_t)-1;
     isa = ocsd_isa_unknown;
 
     cycle_count = 0;
     timestamp = 0;
 
     context.ctxt_id_valid = 0;
     context.vmid_valid = 0;
     context.el_valid = 0;
 
     last_i_type = OCSD_INSTR_OTHER;
     last_i_subtype = OCSD_S_INSTR_NONE;
 
     clearPerPktData();
 }
 
 inline void OcsdTraceElement::clearPerPktData()
 {
-    flag_bits = 0; // union with trace_on_reason / trace_event
-
+    flag_bits = 0;          // bit-field with various flags.
+    exception_number = 0;   // union with trace_on_reason / trace_event
     ptr_extended_data = 0;  // extended data pointer
 }
 
 inline void OcsdTraceElement::setTraceOnReason(const trace_on_reason_t reason)
 {
     trace_on_reason = reason;
 }
 
+inline void OcsdTraceElement::setUnSyncEOTReason(const unsync_info_t reason)
+{
+    unsync_eot_info = reason;
+}
+
 inline void OcsdTraceElement::setISA(const ocsd_isa isa_update)
 {
     isa = isa_update;
     if(isa > ocsd_isa_unknown)
         isa = ocsd_isa_unknown;
 }
 
 inline void OcsdTraceElement::setTS(const uint64_t ts, const bool freqChange /*= false*/) 
 { 
     timestamp = ts; 
     cpu_freq_change = freqChange ? 1 : 0; 
     has_ts = 1;
 }
 
 inline void OcsdTraceElement::setExtendedDataPtr(const void *data_ptr)
 {
     extended_data = 1;
     ptr_extended_data = data_ptr;
 }
 
+// set persistent data between output packets.
+inline void OcsdTraceElement::copyPersistentData(const OcsdTraceElement &src)
+{
+    isa = src.isa;
+    context = src.context;
+}
 
 /** @}*/
 
 #endif // ARM_TRC_GEN_ELEM_H_INCLUDED
 
 /* End of File trc_gen_elem.h */
Index: head/contrib/opencsd/decoder/include/common/trc_pkt_decode_base.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/trc_pkt_decode_base.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/common/trc_pkt_decode_base.h	(revision 362263)
@@ -1,303 +1,308 @@
 /*!
  * \file       trc_pkt_decode_base.h
  * \brief      OpenCSD : Trace Packet decoder base class.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_DECODE_BASE_H_INCLUDED
 #define ARM_TRC_PKT_DECODE_BASE_H_INCLUDED
 
 #include "trc_component.h"
 #include "comp_attach_pt_t.h"
 
 #include "interfaces/trc_pkt_in_i.h"
 #include "interfaces/trc_gen_elem_in_i.h"
 #include "interfaces/trc_tgt_mem_access_i.h"
 #include "interfaces/trc_instr_decode_i.h"
 
 /** @defgroup ocsd_pkt_decode OpenCSD Library : Packet Decoders.
 
     @brief Classes providing Protocol Packet Decoding capability.
 
     Packet decoders convert incoming protocol packets from a packet processor,
     into generic trace elements to be output to an analysis program.
 
     Packet decoders can be:-
     - PE decoders - converting ETM or PTM packets into instruction and data trace elements
     - SW stimulus decoder - converting STM or ITM packets into software generated trace elements.
     - Bus decoders - converting HTM packets into bus transaction elements.
 
 @{*/
 
 
 class TrcPktDecodeI : public TraceComponent
 {
 public:
     TrcPktDecodeI(const char *component_name);
     TrcPktDecodeI(const char *component_name, int instIDNum);
     virtual ~TrcPktDecodeI() {};
 
     componentAttachPt<ITrcGenElemIn> *getTraceElemOutAttachPt() { return &m_trace_elem_out; };
     componentAttachPt<ITargetMemAccess> *getMemoryAccessAttachPt() { return &m_mem_access; };
     componentAttachPt<IInstrDecode> *getInstrDecodeAttachPt() { return &m_instr_decode; };
 
     void setUsesMemAccess(bool bUsesMemaccess) { m_uses_memaccess = bUsesMemaccess; };
     const bool getUsesMemAccess() const { return m_uses_memaccess; };
 
     void setUsesIDecode(bool bUsesIDecode) { m_uses_idecode = bUsesIDecode; };
     const bool getUsesIDecode() const { return m_uses_idecode; };
 
 protected:
 
     /* implementation packet decoding interface */
     virtual ocsd_datapath_resp_t processPacket() = 0;
     virtual ocsd_datapath_resp_t onEOT() = 0;
     virtual ocsd_datapath_resp_t onReset() = 0;
     virtual ocsd_datapath_resp_t onFlush() = 0;
     virtual ocsd_err_t onProtocolConfig() = 0;
     virtual const uint8_t getCoreSightTraceID() = 0;
 
+    /* init handling */
     const bool checkInit();
+    /* Called on first init confirmation */
+    virtual void onFirstInitOK() {};
 
     /* data output */
     ocsd_datapath_resp_t outputTraceElement(const OcsdTraceElement &elem);    // use current index
     ocsd_datapath_resp_t outputTraceElementIdx(ocsd_trc_index_t idx, const OcsdTraceElement &elem); // use supplied index (where decoder caches elements) 
 
     /* target access */
     ocsd_err_t accessMemory(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, uint32_t *num_bytes, uint8_t *p_buffer);
 
     /* instruction decode */
     ocsd_err_t instrDecode(ocsd_instr_info *instr_info);
 
     componentAttachPt<ITrcGenElemIn> m_trace_elem_out;
     componentAttachPt<ITargetMemAccess> m_mem_access;
     componentAttachPt<IInstrDecode> m_instr_decode;
 
     ocsd_trc_index_t   m_index_curr_pkt;
 
     bool m_decode_init_ok;  //!< set true if all attachments in place for decode. (remove checks in main throughput paths)
     bool m_config_init_ok;  //!< set true if config set.
 
     std::string init_err_msg;    //!< error message for init error
 
     bool m_uses_memaccess;
     bool m_uses_idecode;
 
 };
 
 inline TrcPktDecodeI::TrcPktDecodeI(const char *component_name) : 
     TraceComponent(component_name),
     m_index_curr_pkt(0),
     m_decode_init_ok(false),
     m_config_init_ok(false),
     m_uses_memaccess(true),
     m_uses_idecode(true)
 {
 }
 
 inline TrcPktDecodeI::TrcPktDecodeI(const char *component_name, int instIDNum) :
     TraceComponent(component_name, instIDNum),
     m_index_curr_pkt(0),
     m_decode_init_ok(false),
     m_config_init_ok(false),
     m_uses_memaccess(true),
     m_uses_idecode(true)
 {
 }
 
 inline const bool TrcPktDecodeI::checkInit()
 {
     if(!m_decode_init_ok)
     {
         if(!m_config_init_ok)
             init_err_msg = "No decoder configuration information";
         else if(!m_trace_elem_out.hasAttachedAndEnabled())
             init_err_msg = "No element output interface attached and enabled";
         else if(m_uses_memaccess && !m_mem_access.hasAttachedAndEnabled())
             init_err_msg = "No memory access interface attached and enabled";
         else if(m_uses_idecode && !m_instr_decode.hasAttachedAndEnabled())
             init_err_msg = "No instruction decoder interface attached and enabled";
         else
             m_decode_init_ok = true;
+        if (m_decode_init_ok)
+            onFirstInitOK();
     }
     return m_decode_init_ok;
 }
 
 inline ocsd_datapath_resp_t TrcPktDecodeI::outputTraceElement(const OcsdTraceElement &elem)
 {
     return m_trace_elem_out.first()->TraceElemIn(m_index_curr_pkt,getCoreSightTraceID(), elem);
 }
 
 inline ocsd_datapath_resp_t TrcPktDecodeI::outputTraceElementIdx(ocsd_trc_index_t idx, const OcsdTraceElement &elem)
 {
     return m_trace_elem_out.first()->TraceElemIn(idx, getCoreSightTraceID(), elem);
 }
 
 inline ocsd_err_t TrcPktDecodeI::instrDecode(ocsd_instr_info *instr_info)
 {
     if(m_uses_idecode)
         return m_instr_decode.first()->DecodeInstruction(instr_info);
     return OCSD_ERR_DCD_INTERFACE_UNUSED;
 }
 
 inline ocsd_err_t TrcPktDecodeI::accessMemory(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, uint32_t *num_bytes, uint8_t *p_buffer)
 {
     if(m_uses_memaccess)
         return m_mem_access.first()->ReadTargetMemory(address,getCoreSightTraceID(),mem_space, num_bytes,p_buffer);
     return OCSD_ERR_DCD_INTERFACE_UNUSED;
 }
 
 /**********************************************************************/
 template <class P, class Pc>
 class TrcPktDecodeBase : public TrcPktDecodeI, public IPktDataIn<P>
 {
 public:
     TrcPktDecodeBase(const char *component_name);
     TrcPktDecodeBase(const char *component_name, int instIDNum);
     virtual ~TrcPktDecodeBase();
 
     virtual ocsd_datapath_resp_t PacketDataIn( const ocsd_datapath_op_t op,
                                                 const ocsd_trc_index_t index_sop,
                                                 const P *p_packet_in);
     
 
     /* protocol configuration */
     ocsd_err_t setProtocolConfig(const Pc *config); 
     const Pc *  getProtocolConfig() const { return  m_config; };
     
 protected:
     void ClearConfigObj();
 
     /* the protocol configuration */
     Pc *          m_config;
     /* the current input packet */
     const P *     m_curr_packet_in;
     
 };
 
 
 template <class P, class Pc> TrcPktDecodeBase<P, Pc>::TrcPktDecodeBase(const char *component_name) : 
     TrcPktDecodeI(component_name),
     m_config(0)
 {
 }
 
 template <class P, class Pc> TrcPktDecodeBase<P, Pc>::TrcPktDecodeBase(const char *component_name, int instIDNum) : 
     TrcPktDecodeI(component_name,instIDNum),
     m_config(0)
 {
 }
 
 template <class P, class Pc> TrcPktDecodeBase<P, Pc>::~TrcPktDecodeBase() 
 {
     ClearConfigObj();
 }
 
 template <class P, class Pc> ocsd_datapath_resp_t TrcPktDecodeBase<P, Pc>::PacketDataIn( const ocsd_datapath_op_t op,
                                                 const ocsd_trc_index_t index_sop,
                                                 const P *p_packet_in)
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     if(!checkInit())
     {
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_NOT_INIT,init_err_msg));
         return OCSD_RESP_FATAL_NOT_INIT;
     }
 
     switch(op)
     {
     case OCSD_OP_DATA:
         if(p_packet_in == 0)
         {
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_INVALID_PARAM_VAL));
             resp = OCSD_RESP_FATAL_INVALID_PARAM;
         }
         else
         {
             m_curr_packet_in = p_packet_in;
             m_index_curr_pkt = index_sop;
             resp = processPacket();
         }
         break;
 
     case OCSD_OP_EOT:
         resp = onEOT();
         break;
 
     case OCSD_OP_FLUSH:
         resp = onFlush();
         break;
 
     case OCSD_OP_RESET:
         resp = onReset();
         break;
 
     default:
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_INVALID_PARAM_VAL));
         resp = OCSD_RESP_FATAL_INVALID_OP;
         break;
     }
     return resp;
 }
 
     /* protocol configuration */
 template <class P, class Pc>  ocsd_err_t TrcPktDecodeBase<P, Pc>::setProtocolConfig(const Pc *config)
 {
     ocsd_err_t err = OCSD_ERR_INVALID_PARAM_VAL;
     if(config != 0)
     {
         ClearConfigObj(); // remove any current config
         m_config = new (std::nothrow) Pc(*config); // make a copy of the config - don't rely on the object passed in being valid outside the context of the call.
         if(m_config != 0)
         {
             err = onProtocolConfig();
             if(err == OCSD_OK)
                 m_config_init_ok = true;
         }
         else
             err = OCSD_ERR_MEM;
     }
     return err;
 }
 
 template <class P, class Pc> void TrcPktDecodeBase<P, Pc>::ClearConfigObj()
 {
     if(m_config)
     {
         delete m_config;
         m_config = 0;
     }
 }
 
 /** @}*/
 #endif // ARM_TRC_PKT_DECODE_BASE_H_INCLUDED
 
 /* End of File trc_pkt_decode_base.h */
Index: head/contrib/opencsd/decoder/include/common/trc_raw_buffer.h
===================================================================
--- head/contrib/opencsd/decoder/include/common/trc_raw_buffer.h	(nonexistent)
+++ head/contrib/opencsd/decoder/include/common/trc_raw_buffer.h	(revision 362263)
@@ -0,0 +1,96 @@
+/*
+* \file       trc_raw_buffer.h
+* \brief      OpenCSD : Trace raw data byte buffer
+*
+* \copyright  Copyright (c) 2019, ARM Limited. All Rights Reserved.
+*/
+
+/*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ARM_TRC_RAW_BUFFER_H_INCLUDED
+#define ARM_TRC_RAW_BUFFER_H_INCLUDED
+
+#include <vector>
+
+class TraceRawBuffer
+{
+public:
+    TraceRawBuffer() : 
+        m_bufSize(0), 
+        m_bufProcessed(0), 
+        m_pBuffer(0), 
+        pkt(0)
+    {};
+    ~TraceRawBuffer() {};
+
+    // init the buffer
+    void init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet);
+    void copyByteToPkt();   // move a byte to the packet buffer     
+    uint8_t peekNextByte(); // value of next byte in buffer.
+
+    bool empty() { return m_bufProcessed == m_bufSize; };
+    // bytes processed.
+    uint32_t processed() { return m_bufProcessed; };
+    // buffer size;
+    uint32_t size() { return m_bufSize; }
+
+private:
+    uint32_t m_bufSize;
+    uint32_t m_bufProcessed;
+    const uint8_t *m_pBuffer;
+    std::vector<uint8_t> *pkt;
+
+};
+
+// init the buffer
+inline void TraceRawBuffer::init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet)
+{
+    m_bufSize = size;
+    m_bufProcessed = 0;
+    m_pBuffer = rawtrace;
+    pkt = out_packet;
+}
+
+inline void TraceRawBuffer::copyByteToPkt()
+{
+    if (!empty()) {
+        pkt->push_back(m_pBuffer[m_bufProcessed]);
+        m_bufProcessed++;
+    }
+}
+
+inline uint8_t TraceRawBuffer::peekNextByte()
+{
+    uint8_t val = 0;
+    if (!empty())
+        val = m_pBuffer[m_bufProcessed];
+    return val;
+}
+
+#endif // ARM_TRC_RAW_BUFFER_H_INCLUDED
+

Property changes on: head/contrib/opencsd/decoder/include/common/trc_raw_buffer.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/include/i_dec/trc_i_decode.h
===================================================================
--- head/contrib/opencsd/decoder/include/i_dec/trc_i_decode.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/i_dec/trc_i_decode.h	(revision 362263)
@@ -1,57 +1,56 @@
 /*
  * \file       trc_i_decode.h
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #ifndef ARM_TRC_I_DECODE_H_INCLUDED
 #define ARM_TRC_I_DECODE_H_INCLUDED
 
 #include "interfaces/trc_instr_decode_i.h"
 #include "opencsd/ocsd_if_types.h"
 
 class TrcIDecode : public IInstrDecode  
 {
 public:
     TrcIDecode() {};
     virtual ~TrcIDecode() {};
 
     virtual ocsd_err_t DecodeInstruction(ocsd_instr_info *instr_info);
 
 private:
-    ocsd_err_t DecodeA32(ocsd_instr_info *instr_info);
-    ocsd_err_t DecodeA64(ocsd_instr_info *instr_info);
-    ocsd_err_t DecodeT32(ocsd_instr_info *instr_info);
-    void SetArchVersion(ocsd_instr_info *instr_info);
+    ocsd_err_t DecodeA32(ocsd_instr_info *instr_info, struct decode_info *info);
+    ocsd_err_t DecodeA64(ocsd_instr_info *instr_info, struct decode_info *info);
+    ocsd_err_t DecodeT32(ocsd_instr_info *instr_info, struct decode_info *info);
 };
 
 #endif // ARM_TRC_I_DECODE_H_INCLUDED
 
 /* End of File trc_i_decode.h */
Index: head/contrib/opencsd/decoder/include/i_dec/trc_idec_arminst.h
===================================================================
--- head/contrib/opencsd/decoder/include/i_dec/trc_idec_arminst.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/i_dec/trc_idec_arminst.h	(revision 362263)
@@ -1,141 +1,139 @@
 /*
  * \file       trc_idec_arminst.h
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_IDEC_ARMINST_H_INCLUDED
 #define ARM_TRC_IDEC_ARMINST_H_INCLUDED
 
 #ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS 1
 #endif
 
 #include "opencsd/ocsd_if_types.h"
 #include <cstdint>
 
+/* supplementary decode information */
+struct decode_info {
+    uint16_t arch_version;
+    ocsd_instr_subtype instr_sub_type;
+};
+
 /*
 For Thumb2, test if a halfword is the first half of a 32-bit instruction,
 as opposed to a complete 16-bit instruction.
 */
 inline int is_wide_thumb(uint16_t insthw)
 {
     return (insthw & 0xF800) >= 0xE800;
 }
 
 /*
 In the following queries, 16-bit Thumb2 instructions should be
 passed in as the high halfword, e.g. xxxx0000.
 */
 
 /*
 Test whether an instruction is a branch (software change of the PC).
 This includes branch instructions and all loads and data-processing 
 instructions that write to the PC.  It does not include exception
 instructions such as SVC, HVC and SMC.
 (Performance event 0x0C includes these.)
 */
-int inst_ARM_is_branch(uint32_t inst);
-int inst_Thumb_is_branch(uint32_t inst);
-int inst_A64_is_branch(uint32_t inst);
+int inst_ARM_is_branch(uint32_t inst, struct decode_info *info);
+int inst_Thumb_is_branch(uint32_t inst, struct decode_info *info);
+int inst_A64_is_branch(uint32_t inst, struct decode_info *info);
 
 /*
 Test whether an instruction is a direct (aka immediate) branch.
 Performance event 0x0D counts these.
 */
 int inst_ARM_is_direct_branch(uint32_t inst);
-int inst_Thumb_is_direct_branch(uint32_t inst);
-int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond);
-int inst_A64_is_direct_branch(uint32_t inst);
-int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link);
+int inst_Thumb_is_direct_branch(uint32_t inst, struct decode_info *info);
+int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond, struct decode_info *info);
+int inst_A64_is_direct_branch(uint32_t inst, struct decode_info *info);
+int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
 
 /*
 Get branch destination for a direct branch.
 */
 int inst_ARM_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc);
 int inst_Thumb_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc);
 int inst_A64_branch_destination(uint64_t addr, uint32_t inst, uint64_t *pnpc);
 
-int inst_ARM_is_indirect_branch(uint32_t inst);
-int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link);
-int inst_Thumb_is_indirect_branch(uint32_t inst);
-int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link);
-int inst_A64_is_indirect_branch(uint32_t inst);
+int inst_ARM_is_indirect_branch(uint32_t inst, struct decode_info *info);
+int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
+int inst_Thumb_is_indirect_branch(uint32_t inst, struct decode_info *info);
+int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
+int inst_A64_is_indirect_branch(uint32_t inst, struct decode_info *info);
 
-int inst_ARM_is_branch_and_link(uint32_t inst);
-int inst_Thumb_is_branch_and_link(uint32_t inst);
-int inst_A64_is_branch_and_link(uint32_t inst);
+int inst_ARM_is_branch_and_link(uint32_t inst, struct decode_info *info);
+int inst_Thumb_is_branch_and_link(uint32_t inst, struct decode_info *info);
+int inst_A64_is_branch_and_link(uint32_t inst, struct decode_info *info);
 
 int inst_ARM_is_conditional(uint32_t inst);
 int inst_Thumb_is_conditional(uint32_t inst);
 int inst_A64_is_conditional(uint32_t inst);
 
 /* For an IT instruction, return the number of instructions conditionalized
    (from 1 to 4).  For other instructions, return zero. */
 unsigned int inst_Thumb_is_IT(uint32_t inst);
 
 typedef enum {
     ARM_BARRIER_NONE,
     ARM_BARRIER_ISB,
     ARM_BARRIER_DMB,
     ARM_BARRIER_DSB
 } arm_barrier_t;
 
 arm_barrier_t inst_ARM_barrier(uint32_t inst);
 arm_barrier_t inst_Thumb_barrier(uint32_t inst);
 arm_barrier_t inst_A64_barrier(uint32_t inst);
 
 int inst_ARM_wfiwfe(uint32_t inst);
 int inst_Thumb_wfiwfe(uint32_t inst);
 int inst_A64_wfiwfe(uint32_t inst);
 
 /*
 Test whether an instruction is definitely undefined, e.g. because
 allocated to a "permanently UNDEFINED" space (UDF mnemonic).
 Other instructions besides the ones indicated, may always or
 sometimes cause an undefined instruction trap.  This call is
 intended to be helpful in 'runaway decode' prevention.
 */
 int inst_ARM_is_UDF(uint32_t inst);
 int inst_Thumb_is_UDF(uint32_t inst);
 int inst_A64_is_UDF(uint32_t inst);
-
-
-/* access sub-type information */
-ocsd_instr_subtype get_instr_subtype();
-void clear_instr_subtype();
-
-/* set arch version info. */
-void set_arch_version(uint16_t version);
 
 #endif // ARM_TRC_IDEC_ARMINST_H_INCLUDED
 
 /* End of File trc_idec_arminst.h */
Index: head/contrib/opencsd/decoder/include/mem_acc/trc_mem_acc_bufptr.h
===================================================================
--- head/contrib/opencsd/decoder/include/mem_acc/trc_mem_acc_bufptr.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/mem_acc/trc_mem_acc_bufptr.h	(revision 362263)
@@ -1,76 +1,75 @@
 /*
  * \file       trc_mem_acc_bufptr.h
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_MEM_ACC_BUFPTR_H_INCLUDED
 #define ARM_TRC_MEM_ACC_BUFPTR_H_INCLUDED
 
 #include "mem_acc/trc_mem_acc_base.h"
 
 /*!
  * @class TrcMemAccBufPtr:   
  * @brief Trace memory accessor for a memory buffer.
  *  
  * Wraps a memory buffer in an memory range accessor object.
  * Takes a copy of the buffer pointer which must remain valid 
  * for the lifetime of the object.
  * 
  */
 class TrcMemAccBufPtr: public TrcMemAccessorBase
 {
 public:
     /*!
      * Construct the accessor.
      * uses the start address as the start of range and calculates the end address
      * according to the buffer size
      *
      * @param s_address : Start address in memory map represented by the data in the buffer.
      * @param *p_buffer : pointer to a buffer of binary data.
      * @param size : size of the buffer.
      *
      */
     TrcMemAccBufPtr(const ocsd_vaddr_t s_address, const uint8_t *p_buffer, const uint32_t size);
 
     virtual ~TrcMemAccBufPtr() {};  /**< default destructor */
 
     /** Memory access override - allow decoder to read bytes from the buffer. */
     virtual const uint32_t readBytes(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t memSpace, const uint8_t trcID, const uint32_t reqBytes, uint8_t *byteBuffer);
 
 private:
     const uint8_t *m_p_buffer;  /**< pointer to the memory buffer  */
-    const uint32_t m_size;  /**< size of the memory buffer. */
 };
 
 #endif // ARM_TRC_MEM_ACC_BUFPTR_H_INCLUDED
 
 /* End of File trc_mem_acc_bufptr.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h	(revision 362263)
@@ -1,274 +1,275 @@
 /*!
  * \file       trc_pkt_decode_etmv3.h
  * \brief      OpenCSD : ETMv3 decode
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_DECODE_ETMV3_H_INCLUDED
 #define ARM_TRC_PKT_DECODE_ETMV3_H_INCLUDED
 
 #include "common/trc_pkt_decode_base.h"
 #include "common/trc_gen_elem.h"
 #include "common/ocsd_pe_context.h"
 #include "common/ocsd_code_follower.h"
 #include "common/ocsd_gen_elem_list.h"
 
 #include "opencsd/etmv3/trc_pkt_elem_etmv3.h"
 #include "opencsd/etmv3/trc_cmp_cfg_etmv3.h"
 
 /**************** Atom handling class **************************************/
 class Etmv3Atoms
 {
 public:
     Etmv3Atoms(const bool isCycleAcc);
     ~Etmv3Atoms() {};
 
     //! initialise the atom and index values
     void initAtomPkt(const EtmV3TrcPacket *in_pkt, const ocsd_trc_index_t &root_index);
     
     const ocsd_atm_val getCurrAtomVal() const;
     const int numAtoms() const; //!< number of atoms
     const ocsd_trc_index_t pktIndex() const; //!< originating packet index
 
     const bool hasAtomCC() const;   //!< cycle count for current atom?
     const uint32_t getAtomCC() const;   //!< cycle count for current atom
     const uint32_t getRemainCC() const; //!< get residual cycle count for remaining atoms
 
     void clearAtom();   //!< clear the current atom, set the next.
     void clearAll();    //!< clear all    
 
 private:
 
     // Atom PHDR packet formats from ETMv3 spec - defines content of header.
     enum {
         ATOM_PHDR_FMT_1 = 1,
         ATOM_PHDR_FMT_2,
         ATOM_PHDR_FMT_3,
         ATOM_PHDR_FMT_4,
     };
 
 
 
     ocsd_pkt_atom m_atom;         /**< atom elements - non zero number indicates valid atom count */
     uint8_t m_p_hdr_fmt;          /**< if atom elements, associated phdr format */
     uint32_t m_cycle_count;       
     ocsd_trc_index_t m_root_index; //!< root index for the atom packet
     bool m_isCCPacket;
 };
 
 
 inline Etmv3Atoms::Etmv3Atoms(const bool isCycleAcc)
 {
     m_isCCPacket = isCycleAcc;
 }
 
 //! initialise the atom and index values
 inline void Etmv3Atoms::initAtomPkt(const EtmV3TrcPacket *in_pkt, const ocsd_trc_index_t &root_index)
 {
     m_atom = in_pkt->getAtom();
     m_p_hdr_fmt = in_pkt->getPHdrFmt();
     m_cycle_count = in_pkt->getCycleCount();
 }
     
 inline const ocsd_atm_val Etmv3Atoms::getCurrAtomVal() const
 {
     return (m_atom.En_bits & 0x1) ? ATOM_E : ATOM_N;
 }
 
 inline const int Etmv3Atoms::numAtoms() const
 {
     return m_atom.num;
 }
 
 inline const ocsd_trc_index_t Etmv3Atoms::pktIndex() const
 {
     return  m_root_index;
 }
 
 inline const bool Etmv3Atoms::hasAtomCC() const
 {
     bool hasCC = false;
     if(!m_isCCPacket)
         return hasCC;
 
     switch(m_p_hdr_fmt)
     {
     case ATOM_PHDR_FMT_4:
     default: 
         break;
 
     case ATOM_PHDR_FMT_3:
     case ATOM_PHDR_FMT_1: 
         hasCC = true;
         break;
 
     case ATOM_PHDR_FMT_2:
         hasCC = (m_atom.num > 1);   // first of 2 has W state
         break;
     }
     return hasCC;
 }
 
 inline const uint32_t Etmv3Atoms::getAtomCC() const
 {
     uint32_t CC = 0;
     if(!m_isCCPacket)
         return CC;
 
     switch(m_p_hdr_fmt)
     {
     case ATOM_PHDR_FMT_4: // no CC in format 4
     default:  
         break;
 
     case ATOM_PHDR_FMT_3: // single CC with optional E atom
         CC = m_cycle_count; 
         break;
 
     case ATOM_PHDR_FMT_2: // single W on first of 2 atoms
         CC = (m_atom.num > 1) ? 1: 0; 
         break;
 
     case ATOM_PHDR_FMT_1: // each atom has 1 CC.
         CC = 1; 
         break;
     }
     return CC;
 }
 
 inline const uint32_t Etmv3Atoms::getRemainCC() const
 {
     uint32_t CC = 0;
     if(!m_isCCPacket)
         return CC;
 
     switch(m_p_hdr_fmt)
     {
     case ATOM_PHDR_FMT_4: // no CC in format 4
     default:  
         break;
 
     case ATOM_PHDR_FMT_3:
         CC = m_cycle_count; 
         break;
 
     case ATOM_PHDR_FMT_2:
         CC = (m_atom.num > 1) ? 1: 0; 
         break;
 
     case ATOM_PHDR_FMT_1:
         CC = m_atom.num; 
         break;
     }
     return CC;
 }
 
 inline void Etmv3Atoms::clearAtom()
 {
     m_atom.En_bits >>=1;
     if(m_atom.num)
         m_atom.num--;
 }
 
 inline void Etmv3Atoms::clearAll()
 {
     m_atom.num = 0;
 }
 
 /********** Main decode class ****************************************************/
 class TrcPktDecodeEtmV3 :  public TrcPktDecodeBase<EtmV3TrcPacket, EtmV3Config>
 {
 public:
     TrcPktDecodeEtmV3();
     TrcPktDecodeEtmV3(int instIDNum);
     virtual ~TrcPktDecodeEtmV3();
 
 protected:
     /* implementation packet decoding interface */
     virtual ocsd_datapath_resp_t processPacket();
     virtual ocsd_datapath_resp_t onEOT();
     virtual ocsd_datapath_resp_t onReset();
     virtual ocsd_datapath_resp_t onFlush();
     virtual ocsd_err_t onProtocolConfig();
     virtual const uint8_t getCoreSightTraceID() { return m_CSID; };
 
     /* local decode methods */
     void initDecoder();      //!< initial state on creation (zeros all config)
     void resetDecoder();     //!< reset state to start of decode. (moves state, retains config)
 
     ocsd_datapath_resp_t decodePacket(bool &pktDone); //!< decode a packet 
 
     ocsd_datapath_resp_t processISync(const bool withCC, const bool firstSync = false);
     ocsd_datapath_resp_t processBranchAddr();
     ocsd_datapath_resp_t processPHdr();
     
     ocsd_datapath_resp_t sendUnsyncPacket();    //!< send an initial unsync packet when decoder starts
 
     OcsdTraceElement *GetNextOpElem(ocsd_datapath_resp_t &resp);    //!< get the next element from the element list.
 
 private:
     void setNeedAddr(bool bNeedAddr);
     void pendExceptionReturn();
     bool preISyncValid(ocsd_etmv3_pkt_type pkt_type);
 //** intra packet state;
 
     OcsdCodeFollower m_code_follower;   //!< code follower for instruction trace
 
     ocsd_vaddr_t m_IAddr;           //!< next instruction address
     bool m_bNeedAddr;               //!< true if an address is needed (current out of date / invalid)
     bool m_bSentUnknown;            //!< true if we have sent an unknown address packet for this phase of needing an address.
     bool m_bWaitISync;              //!< true if waiting for first ISync packet
 
     OcsdPeContext m_PeContext;      //!< save context data before sending in output packet
 
     OcsdGenElemList m_outputElemList;   //!< list of output elements
 
 
 //** Other packet decoder state;
 
     // trace decode FSM
     typedef enum {
         NO_SYNC,        //!< pre start trace - init state or after reset or overflow, loss of sync.
         WAIT_ASYNC,     //!< waiting for a-sync packet.
         WAIT_ISYNC,     //!< waiting for i-sync packet.
         DECODE_PKTS,    //!< processing a packet
         SEND_PKTS,      //!< sending packets.
     } processor_state_t;
 
     processor_state_t m_curr_state;
+    unsync_info_t m_unsync_info;    //!< additional state for unsync
 
     uint8_t m_CSID; //!< Coresight trace ID for this decoder.
 };
 
 
 #endif // ARM_TRC_PKT_DECODE_ETMV3_H_INCLUDED
 
 /* End of File trc_pkt_decode_etmv3.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h	(nonexistent)
@@ -1,73 +0,0 @@
-/*
- * \file       trc_pkt_elem_etmv4d.h
- * \brief      OpenCSD : 
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#ifndef ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
-#define ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
-
-#include "trc_pkt_types_etmv4.h"
-#include "common/trc_printable_elem.h"
-#include "common/trc_pkt_elem_base.h"
-
-/** @addtogroup trc_pkts
-@{*/
-/*!
- * @class EtmV4DTrcPacket   
- * @brief ETMv4 Data Trace Protocol Packet .
- * 
- *  This class represents a single ETMv4 instruction trace packet, along with intra packet state.
- * 
- */
-class EtmV4DTrcPacket :  public TrcPacketBase, public ocsd_etmv4_d_pkt, trcPrintableElem
-{
-public:
-    EtmV4DTrcPacket();
-    ~EtmV4DTrcPacket();
-
-    // update interface - set packet values
-
-
-
-    // packet status interface - get packet info.
-
-
-    // printing
-    virtual void toString(std::string &str) const;
-    virtual void toStringFmt(const uint32_t fmtFlags, std::string &str) const;
-};
-
-/** @}*/
-
-#endif // ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
-
-/* End of File trc_pkt_elem_etmv4d.h */

Property changes on: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/etmv4_decoder.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/etmv4_decoder.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/etmv4_decoder.h	(revision 362263)
@@ -1,48 +1,47 @@
 /*
  * \file       etmv4_decoder.h
  * \brief      OpenCSD : Top level header file for ETMv4 decoders
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_ETMV4_DECODER_H_INCLUDED
 #define ARM_ETMV4_DECODER_H_INCLUDED
 
 #include "trc_cmp_cfg_etmv4.h"
 #include "trc_pkt_elem_etmv4i.h"
-#include "trc_pkt_elem_etmv4d.h"
 #include "trc_pkt_proc_etmv4.h"
 #include "trc_pkt_types_etmv4.h"
 #include "trc_pkt_decode_etmv4i.h"
 
 #endif // ARM_ETMV4_DECODER_H_INCLUDED
 
 /* End of File etmv4_decoder.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h	(revision 362263)
@@ -1,346 +1,433 @@
 /*
  * \file       trc_etmv4_stack_elem.h
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #ifndef ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED
 #define ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED
 
 #include "opencsd/etmv4/trc_pkt_types_etmv4.h"
 
 #include <deque>
 #include <vector>
 
 /* ETMv4 I trace stack elements  
     Speculation requires that we stack certain elements till they are committed or 
     cancelled. (P0 elements + other associated parts.)
 */
 
 typedef enum _p0_elem_t 
 {
     P0_UNKNOWN,
     P0_ATOM,
     P0_ADDR,
     P0_CTXT,
     P0_TRC_ON,
     P0_EXCEP,
     P0_EXCEP_RET,
     P0_EVENT,
     P0_TS,
     P0_CC,
     P0_TS_CC,
+    P0_Q,
     P0_OVERFLOW,
     P0_FUNC_RET,
 } p0_elem_t;
 
 
 /************************************************************/
 /***Trace stack element base class - 
     record originating packet type and index in buffer*/ 
 
 class TrcStackElem {
 public:
      TrcStackElem(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
      virtual ~TrcStackElem() {};
 
      const p0_elem_t getP0Type() const { return m_P0_type; };
      const ocsd_etmv4_i_pkt_type getRootPkt() const { return m_root_pkt; };
      const ocsd_trc_index_t getRootIndex() const  { return m_root_idx; };
      const bool isP0() const { return m_is_P0; };
 
 private:
      ocsd_etmv4_i_pkt_type m_root_pkt;
      ocsd_trc_index_t m_root_idx;
      p0_elem_t m_P0_type;
 
 protected:
      bool m_is_P0;  // true if genuine P0 - commit / cancellable, false otherwise
 
 };
 
 inline TrcStackElem::TrcStackElem(p0_elem_t p0_type, const bool isP0, ocsd_etmv4_i_pkt_type root_pkt, ocsd_trc_index_t root_index) :
     m_root_pkt(root_pkt),
     m_root_idx(root_index),
     m_P0_type(p0_type),
     m_is_P0(isP0)
 {
 }
 
 /************************************************************/
 /** Address element */
 
 class TrcStackElemAddr : public TrcStackElem
 {
 protected:
     TrcStackElemAddr(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
     virtual ~TrcStackElemAddr() {};
 
     friend class EtmV4P0Stack;
 
 public:
     void setAddr(const etmv4_addr_val_t &addr_val) { m_addr_val = addr_val; };
     const etmv4_addr_val_t &getAddr() const { return m_addr_val; };
 
 private:
     etmv4_addr_val_t m_addr_val;
 };
 
 inline TrcStackElemAddr::TrcStackElemAddr(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
     TrcStackElem(P0_ADDR, false, root_pkt,root_index)
 {
     m_addr_val.val = 0;
     m_addr_val.isa = 0;
 }
 
 /************************************************************/
+/** Q element */
+class TrcStackQElem : public TrcStackElem
+{
+protected:
+    TrcStackQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
+    virtual ~TrcStackQElem() {};
+
+    friend class EtmV4P0Stack;
+
+public:
+    void setInstrCount(const int instr_count) { m_instr_count = instr_count; };
+    const int getInstrCount() const { return m_instr_count;  }
+
+    void setAddr(const etmv4_addr_val_t &addr_val) 
+    {
+        m_addr_val = addr_val; 
+        m_has_addr = true; 
+    };
+    const etmv4_addr_val_t &getAddr() const { return m_addr_val; };
+    const bool hasAddr() const { return  m_has_addr; };
+
+private:
+    bool m_has_addr;
+    etmv4_addr_val_t m_addr_val;
+    int m_instr_count;
+
+};
+
+inline TrcStackQElem::TrcStackQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
+    TrcStackElem(P0_Q , true, root_pkt, root_index)
+{
+    m_addr_val.val = 0;
+    m_addr_val.isa = 0;
+    m_has_addr = false;
+    m_instr_count = 0;
+}
+
+/************************************************************/
 /** Context element */
     
 class TrcStackElemCtxt : public TrcStackElem
 {
 protected:
     TrcStackElemCtxt(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
     virtual ~TrcStackElemCtxt() {};
 
     friend class EtmV4P0Stack;
 
 public:
     void setContext(const  etmv4_context_t &ctxt) { m_context = ctxt; };
     const  etmv4_context_t &getContext() const  { return m_context; }; 
+    void setIS(const uint8_t IS) { m_IS = IS; };
+    const uint8_t getIS() const { return m_IS; };
 
 private:
      etmv4_context_t m_context;
+     uint8_t m_IS;  //!< IS value at time of generation of packet.
 };
 
 inline TrcStackElemCtxt::TrcStackElemCtxt(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
     TrcStackElem(P0_CTXT, false, root_pkt,root_index)
 {
 }
 
 /************************************************************/
 /** Exception element */
 
 class TrcStackElemExcept : public TrcStackElem
 {
 protected:
     TrcStackElemExcept(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
     virtual ~TrcStackElemExcept() {};
 
     friend class EtmV4P0Stack;
 
 public:
     void setPrevSame(bool bSame) { m_prev_addr_same = bSame; };
     const bool getPrevSame() const { return m_prev_addr_same; };
 
     void setExcepNum(const uint16_t num) { m_excep_num = num; };
     const uint16_t getExcepNum() const { return m_excep_num; };
 
 private:
     bool m_prev_addr_same;
     uint16_t m_excep_num;
 };
 
 inline TrcStackElemExcept::TrcStackElemExcept(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
     TrcStackElem(P0_EXCEP, true, root_pkt,root_index),
         m_prev_addr_same(false)
 {
 }
 
 /************************************************************/
 /** Atom element */
     
 class TrcStackElemAtom : public TrcStackElem
 {
 protected:
     TrcStackElemAtom(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
     virtual ~TrcStackElemAtom() {};
 
     friend class EtmV4P0Stack;
 
 public:
     void setAtom(const ocsd_pkt_atom &atom) { m_atom = atom; };
 
     const ocsd_atm_val commitOldest();
     int cancelNewest(const int nCancel);
+    void mispredictNewest();
     const bool isEmpty() const { return (m_atom.num == 0); };
 
 private:
     ocsd_pkt_atom m_atom;
 };
 
 inline TrcStackElemAtom::TrcStackElemAtom(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
     TrcStackElem(P0_ATOM, true, root_pkt,root_index)
 {
     m_atom.num = 0;
 }
 
 // commit oldest - get value and remove it from pattern
 inline const ocsd_atm_val TrcStackElemAtom::commitOldest()
 {
     ocsd_atm_val val = (m_atom.En_bits & 0x1) ? ATOM_E : ATOM_N;
     m_atom.num--;
     m_atom.En_bits >>= 1;
     return val;
 }
 
 // cancel newest - just reduce the atom count.
 inline int TrcStackElemAtom::cancelNewest(const int nCancel)
 {
     int nRemove = (nCancel <= m_atom.num) ? nCancel : m_atom.num;
     m_atom.num -= nRemove;
     return nRemove;
 }
 
+// mispredict newest - flip the bit of the newest atom
+inline void TrcStackElemAtom::mispredictNewest()
+{
+    uint32_t mask = 0x1 << (m_atom.num - 1);
+    if (m_atom.En_bits & mask)
+        m_atom.En_bits &= ~mask;
+    else
+        m_atom.En_bits |= mask;
+}
+
 /************************************************************/
 /** Generic param element */
 
 class TrcStackElemParam : public TrcStackElem
 {
 protected:
     TrcStackElemParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
     virtual ~TrcStackElemParam() {};
 
     friend class EtmV4P0Stack;
 
 public:
     void setParam(const uint32_t param, const int nParamNum) { m_param[(nParamNum & 0x3)] = param; };
     const uint32_t &getParam(const int nParamNum) const { return m_param[(nParamNum & 0x3)]; };
 
 private:
     uint32_t m_param[4];    
 };
 
 inline TrcStackElemParam::TrcStackElemParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
     TrcStackElem(p0_type, isP0, root_pkt,root_index)
 {
 }
 
 /************************************************************/
 /* P0 element stack that allows push of elements, and deletion of elements when done.
 */
 class EtmV4P0Stack
 {
 public:
     EtmV4P0Stack() {};
     ~EtmV4P0Stack();
 
     void push_front(TrcStackElem *pElem);
     void push_back(TrcStackElem *pElem);        // insert element when processing
-    void pop_back();
+    void pop_back(bool pend_delete = true);
+    void pop_front(bool pend_delete = true);
     TrcStackElem *back();
+    TrcStackElem *front();
     size_t size();
 
+    // iterate through stack from front
+    void from_front_init();
+    TrcStackElem *from_front_next();
+    void erase_curr_from_front();  // erase the element last returned 
+    
     void delete_all();
     void delete_back();
+    void delete_front();
     void delete_popped();
 
     // creation functions - create and push if successful.
     TrcStackElemParam *createParamElem(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const std::vector<uint32_t> &params);
     TrcStackElem *createParamElemNoParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, bool back = false);
     TrcStackElemAtom *createAtomElem (const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const ocsd_pkt_atom &atom);
     TrcStackElemExcept *createExceptElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const bool bSame, const uint16_t excepNum);
-    TrcStackElemCtxt *createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context);
+    TrcStackElemCtxt *createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context, const uint8_t IS, const bool back = false);
     TrcStackElemAddr *createAddrElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_addr_val_t &addr_val);
-
+    TrcStackQElem *createQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const int count);
 private:
     std::deque<TrcStackElem *> m_P0_stack;  //!< P0 decode element stack
     std::vector<TrcStackElem *> m_popped_elem;  //!< save list of popped but not deleted elements.
-
+    std::deque<TrcStackElem *>::iterator m_iter;    //!< iterate across the list w/o removing stuff
 };
 
 inline EtmV4P0Stack::~EtmV4P0Stack()
 {
     delete_all();
     delete_popped();
 }
 
 // put an element on the front of the stack
 inline void EtmV4P0Stack::push_front(TrcStackElem *pElem)
 {
     m_P0_stack.push_front(pElem);
 }
 
 // put an element on the back of the stack
 inline void EtmV4P0Stack::push_back(TrcStackElem *pElem)
 {
     m_P0_stack.push_back(pElem);
 }
 
 // pop last element pointer off the stack and stash it for later deletion
-inline void EtmV4P0Stack::pop_back()
+inline void EtmV4P0Stack::pop_back(bool pend_delete /* = true */)
 {
-    m_popped_elem.push_back(m_P0_stack.back());
+    if (pend_delete)
+        m_popped_elem.push_back(m_P0_stack.back());
     m_P0_stack.pop_back();
 }
 
+inline void EtmV4P0Stack::pop_front(bool pend_delete /* = true */)
+{
+    if (pend_delete)
+        m_popped_elem.push_back(m_P0_stack.front());
+    m_P0_stack.pop_front();
+}
+
 // pop last element pointer off the stack and delete immediately
 inline void EtmV4P0Stack::delete_back()
 {
     if (m_P0_stack.size() > 0)
     {
         TrcStackElem* pElem = m_P0_stack.back();
         delete pElem;
         m_P0_stack.pop_back();
     }
 }
 
+// pop first element pointer off the stack and delete immediately
+inline void EtmV4P0Stack::delete_front()
+{
+    if (m_P0_stack.size() > 0)
+    {
+        TrcStackElem* pElem = m_P0_stack.front();
+        delete pElem;
+        m_P0_stack.pop_front();
+    }
+}
+
+
+
 // get a pointer to the last element on the stack
 inline TrcStackElem *EtmV4P0Stack::back()
 {
     return m_P0_stack.back();
+}
+
+inline TrcStackElem *EtmV4P0Stack::front()
+{
+    return m_P0_stack.front();
 }
 
 // remove and delete all the elements left on the stack
 inline void EtmV4P0Stack::delete_all()
 {
     while (m_P0_stack.size() > 0)
         delete_back();
     m_P0_stack.clear();
 }
 
 // delete list of popped elements.
 inline void EtmV4P0Stack::delete_popped()
 {
     while (m_popped_elem.size() > 0)
     {
         delete m_popped_elem.back();
         m_popped_elem.pop_back();
     }
     m_popped_elem.clear();
 }
 
 // get current number of elements on the stack
 inline size_t EtmV4P0Stack::size()
 {
     return m_P0_stack.size();
 }
 
 #endif // ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED
 
 /* End of File trc_etmv4_stack_elem.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h	(revision 362263)
@@ -1,190 +1,227 @@
 /*
  * \file       trc_pkt_decode_etmv4i.h
  * \brief      OpenCSD : ETMv4 instruction decoder
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED
 #define ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED
 
 #include "common/trc_pkt_decode_base.h"
 #include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"
 #include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"
 #include "common/trc_gen_elem.h"
 #include "common/trc_ret_stack.h"
+#include "common/ocsd_gen_elem_stack.h"
 #include "opencsd/etmv4/trc_etmv4_stack_elem.h"
 
 class TrcStackElem;
 class TrcStackElemParam;
 class TrcStackElemCtxt;
 
 class TrcPktDecodeEtmV4I : public TrcPktDecodeBase<EtmV4ITrcPacket, EtmV4Config>
 {
 public:
     TrcPktDecodeEtmV4I();
     TrcPktDecodeEtmV4I(int instIDNum);
     virtual ~TrcPktDecodeEtmV4I();
 
 protected:
     /* implementation packet decoding interface */
     virtual ocsd_datapath_resp_t processPacket();
     virtual ocsd_datapath_resp_t onEOT();
     virtual ocsd_datapath_resp_t onReset();
     virtual ocsd_datapath_resp_t onFlush();
     virtual ocsd_err_t onProtocolConfig();
     virtual const uint8_t getCoreSightTraceID() { return m_CSID; };
 
     /* local decode methods */
     void initDecoder();      // initial state on creation (zeros all config)
     void resetDecoder();     // reset state to start of decode. (moves state, retains config)
+    virtual void onFirstInitOK(); // override to set init related info.
 
-    ocsd_datapath_resp_t decodePacket(bool &Complete);    // return true to indicate decode complete - can change FSM to commit state - return is false.
-    ocsd_datapath_resp_t commitElements(bool &Complete);   // commit elements - may get wait response, or flag completion.
-    ocsd_datapath_resp_t flushEOT();
+    ocsd_err_t decodePacket();    // decode packet into trace elements. return true to indicate decode complete - can change FSM to commit state - return is false.
+    ocsd_datapath_resp_t resolveElements();   // commit/cancel trace elements generated from latest / prior packets & send to output - may get wait response, or flag completion.
+    ocsd_err_t commitElements(); // commit elements - process element stack to generate output packets.
+    ocsd_err_t commitElemOnEOT();
+    ocsd_err_t cancelElements();    // cancel elements. These not output  
+    ocsd_err_t mispredictAtom();    // mispredict an atom
+    ocsd_err_t discardElements();   // discard elements and flush
 
     void doTraceInfoPacket();
-    void updateContext(TrcStackElemCtxt *pCtxtElem);
+    void updateContext(TrcStackElemCtxt *pCtxtElem, OcsdTraceElement &elem);
     
-    // process atom will output instruction trace, or no memory access trace elements. 
-    ocsd_datapath_resp_t processAtom(const ocsd_atm_val, bool &bCont);
+    // process atom will create instruction trace, or no memory access trace output elements. 
+    ocsd_err_t processAtom(const ocsd_atm_val atom);
 
     // process an exception element - output instruction trace + exception generic type.
-    ocsd_datapath_resp_t processException(); 
+    ocsd_err_t processException(); 
 
+    // process Q element
+    ocsd_err_t processQElement();
+
+    // process an element that cannot be cancelled / discarded
+    ocsd_err_t processTS_CC_EventElem(TrcStackElem *pElem); 
+
     // process a bad packet
-    ocsd_datapath_resp_t handleBadPacket(const char *reason);
+    ocsd_err_t handleBadPacket(const char *reason);
 
-    ocsd_datapath_resp_t outputCC(TrcStackElemParam *pParamElem);
-    ocsd_datapath_resp_t outputTS(TrcStackElemParam *pParamElem, bool withCC);
-    ocsd_datapath_resp_t outputEvent(TrcStackElemParam *pParamElem);
+    ocsd_err_t addElemCC(TrcStackElemParam *pParamElem);
+    ocsd_err_t addElemTS(TrcStackElemParam *pParamElem, bool withCC);
+    ocsd_err_t addElemEvent(TrcStackElemParam *pParamElem);
      
 private:
     void SetInstrInfoInAddrISA(const ocsd_vaddr_t addr_val, const uint8_t isa); 
+    const ocsd_isa calcISA(const bool SF, const uint8_t IS) const
+    {
+        if (SF)
+            return ocsd_isa_aarch64;
+        return (IS == 0) ? ocsd_isa_arm : ocsd_isa_thumb2;
+    }
+    typedef enum {
+        WP_NOT_FOUND,
+        WP_FOUND,
+        WP_NACC
+    } WP_res_t;
 
-    ocsd_err_t traceInstrToWP(bool &bWPFound, const bool traceToAddrNext = false, const ocsd_vaddr_t nextAddrMatch = 0);      //!< follow instructions from the current address to a WP. true if good, false if memory cannot be accessed.
+    typedef struct {
+        ocsd_vaddr_t st_addr;
+        ocsd_vaddr_t en_addr;
+        uint32_t num_instr;
+    } instr_range_t;
 
-    ocsd_datapath_resp_t returnStackPop();  // pop return stack and update instruction address.
+    //!< follow instructions from the current address to a WP. true if good, false if memory cannot be accessed.
+    ocsd_err_t traceInstrToWP(instr_range_t &instr_range, WP_res_t &WPRes, const bool traceToAddrNext = false, const ocsd_vaddr_t nextAddrMatch = 0);
 
-    ocsd_datapath_resp_t outputTraceRange(const bool executed, ocsd_trc_index_t index);
+    inline const bool WPFound(WP_res_t res) const { return (res == WP_FOUND); };
+    inline const bool WPNacc(WP_res_t res) const { return (res == WP_NACC); };
+        
+    ocsd_err_t returnStackPop();  // pop return stack and update instruction address.
 
+    void setElemTraceRange(OcsdTraceElement &elemIn, const instr_range_t &addr_range, const bool executed, ocsd_trc_index_t index);
+
+    ocsd_mem_space_acc_t getCurrMemSpace();
+
 //** intra packet state (see ETMv4 spec 6.2.1);
 
     // timestamping
     uint64_t m_timestamp;   // last broadcast global Timestamp.
 
     // state and context 
     uint32_t m_context_id;              // most recent context ID
     uint32_t m_vmid_id;                 // most recent VMID
     bool m_is_secure;                   // true if Secure
     bool m_is_64bit;                    // true if 64 bit
+    uint8_t m_last_IS;                  // last instruction set value from address packet.
 
     // cycle counts 
     int m_cc_threshold;
 
-    // speculative trace (unsupported at present in the decoder).
+    // speculative trace 
     int m_curr_spec_depth;                
-    int m_max_spec_depth; 
-    
+    int m_max_spec_depth;   // nax depth - from ID reg, beyond which auto-commit occurs 
+    int m_unseen_spec_elem; // speculative elements at decode start
+
+/** Remove elements that are associated with data trace */
+#ifdef DATA_TRACE_SUPPORTED
     // data trace associative elements (unsupported at present in the decoder).
     int m_p0_key;
     int m_p0_key_max;
 
     // conditional non-branch trace - when data trace active (unsupported at present in the decoder)
     int m_cond_c_key;
     int m_cond_r_key;
     int m_cond_key_max_incr;
+#endif
 
     uint8_t m_CSID; //!< Coresight trace ID for this decoder.
 
     bool m_IASize64;    //!< True if 64 bit instruction addresses supported.
 
 //** Other processor state;
 
     // trace decode FSM
     typedef enum {
         NO_SYNC,        //!< pre start trace - init state or after reset or overflow, loss of sync.
         WAIT_SYNC,      //!< waiting for sync packet.
         WAIT_TINFO,     //!< waiting for trace info packet.
         DECODE_PKTS,    //!< processing packets - creating decode elements on stack
-        COMMIT_ELEM,    //!< commit elements for execution - create generic trace elements and pass on.
+        RESOLVE_ELEM,   //!< analyze / resolve decode elements - create generic trace elements and pass on.
     } processor_state_t;
 
     processor_state_t m_curr_state;
+    unsync_info_t m_unsync_eot_info;   //!< addition info when / why unsync / eot
 
 //** P0 element stack
     EtmV4P0Stack m_P0_stack;    //!< P0 decode element stack
 
-    int m_P0_commit;    //!< number of elements to commit
+    // element resolution
+    struct {
+        int P0_commit;    //!< number of elements to commit
+        int P0_cancel;    //!< elements to cancel
+        bool mispredict;  //!< mispredict latest atom
+        bool discard;     //!< discard elements 
+    } m_elem_res;
 
+    //! true if any of the element resolution fields are non-zero
+    const bool isElemForRes() const {
+        return (m_elem_res.P0_commit || m_elem_res.P0_cancel || 
+            m_elem_res.mispredict || m_elem_res.discard);
+    }
+
+    void clearElemRes() {
+        m_elem_res.P0_commit = 0;
+        m_elem_res.P0_cancel = 0;
+        m_elem_res.mispredict = false;
+        m_elem_res.discard = false;
+    }
+
     // packet decode state
     bool m_need_ctxt;   //!< need context to continue
     bool m_need_addr;   //!< need an address to continue
-    bool m_except_pending_addr;    //!< next address packet is part of exception.
+    bool m_elem_pending_addr;    //!< next address packet is needed for prev element.
 
-    // exception packet processing state (may need excep elem only, range+excep, range+
-    typedef enum {
-        EXCEP_POP, // start of processing read exception packets off the stack and analyze
-        EXCEP_RANGE, // output a range element
-        EXCEP_NACC,  // output a nacc element
-        EXCEP_CTXT,  // output a ctxt element
-        EXCEP_EXCEP, // output an ecxeption element.
-    } excep_proc_state_t;
-
-    struct {
-        excep_proc_state_t proc;    //!< state of exception processing
-        etmv4_addr_val_t addr;      //!< excetion return address.
-        uint32_t number;            //!< exception number.
-        ocsd_trc_index_t index;     //!< trace index for exception element
-        bool addr_b_tgt;            //!< return address is also branch tgt address.
-    } m_excep_info; //!< exception info when processing exception packets
-
     ocsd_instr_info m_instr_info;  //!< instruction info for code follower - in address is the next to be decoded.
 
-    bool m_mem_nacc_pending;    //!< need to output a memory access failure packet
-    ocsd_vaddr_t m_nacc_addr;  //!< record unaccessible address 
-
-    ocsd_pe_context m_pe_context;  //!< current context information
     etmv4_trace_info_t m_trace_info; //!< trace info for this trace run.
 
     bool m_prev_overflow;
 
-    bool m_flush_EOT;           //!< true if doing an end of trace flush - cleans up lingering events / TS / CC
+    TrcAddrReturnStack m_return_stack;  //!< the address return stack.
 
-    TrcAddrReturnStack m_return_stack;
-
-//** output element
-    OcsdTraceElement m_output_elem;
-
+//** output element handling
+    OcsdGenElemStack m_out_elem;  //!< output element stack.
+    OcsdTraceElement &outElem() { return m_out_elem.getCurrElem(); };   //!< current  out element
 };
 
 #endif // ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED
 
 /* End of File trc_pkt_decode_etmv4i.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h	(revision 362263)
@@ -1,525 +1,541 @@
 /*
  * \file       trc_pkt_elem_etmv4i.h
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_ELEM_ETMV4I_H_INCLUDED
 #define ARM_TRC_PKT_ELEM_ETMV4I_H_INCLUDED
 
 #include "trc_pkt_types_etmv4.h"
 #include "common/trc_printable_elem.h"
 #include "common/trc_pkt_elem_base.h"
 
 /** @addtogroup trc_pkts
 @{*/
 
 /*!
 * @class Etmv4PktAddrStack
 * @brief ETMv4 Address packet values stack
 * @ingroup trc_pkts
 *
 *  This class represents a stack of recent broadcast address values - 
 *  used to fulfil the ExactMatch address type where no address is output.
 *
 */
 class Etmv4PktAddrStack
 {
 public:
     Etmv4PktAddrStack()
     {
-        for (int i = 0; i < 3; i++)
-        {
-            m_v_addr[i].pkt_bits = 0;
-            m_v_addr[i].size = VA_64BIT;
-            m_v_addr[i].val = 0;
-            m_v_addr[i].valid_bits = 0;
-            m_v_addr_ISA[i] = 0;
-        }
+        reset_stack();
     }
     ~Etmv4PktAddrStack() {};
 
     void push(const ocsd_pkt_vaddr vaddr, const uint8_t isa)
     {
         m_v_addr[2] = m_v_addr[1];
         m_v_addr[1] = m_v_addr[0];
         m_v_addr[0] = vaddr;
         m_v_addr_ISA[2] = m_v_addr_ISA[1];
         m_v_addr_ISA[1] = m_v_addr_ISA[0];
         m_v_addr_ISA[0] = isa;
     }
 
     void get_idx(const uint8_t idx, ocsd_pkt_vaddr &vaddr, uint8_t &isa)
     {
         if (idx < 3)
         {
             vaddr = m_v_addr[idx];
             isa = m_v_addr_ISA[idx];
         }
     }
 
+    // explicit reset for TInfo.
+    void reset_stack()
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            m_v_addr[i].pkt_bits = 0;
+            m_v_addr[i].size = OCSD_MAX_VA_BITSIZE == 64 ? VA_64BIT : VA_32BIT;
+            m_v_addr[i].val = 0;
+            m_v_addr[i].valid_bits = OCSD_MAX_VA_BITSIZE;
+            m_v_addr_ISA[i] = 0;
+        }
+
+    }
+
 private:
     ocsd_pkt_vaddr m_v_addr[3];         //!< most recently broadcast address packet
     uint8_t        m_v_addr_ISA[3];
 };
 
 /*!
  * @class EtmV4ITrcPacket   
  * @brief ETMv4 Instuction Trace Protocol Packet.
  * @ingroup trc_pkts
  * 
  *  This class represents a single ETMv4 data trace packet, along with intra packet state.
  * 
  */
 class EtmV4ITrcPacket :  public TrcPacketBase, public ocsd_etmv4_i_pkt, public trcPrintableElem
 {
 public:
     EtmV4ITrcPacket();
     ~EtmV4ITrcPacket();
 
     EtmV4ITrcPacket &operator =(const ocsd_etmv4_i_pkt* p_pkt);
 
     virtual const void *c_pkt() const { return (const ocsd_etmv4_i_pkt *)this; };
 
     // update interface - set packet values
     void initStartState();   //!< Set to initial state - no intra packet state valid. Use on start of trace / discontinuities.
     void initNextPacket();  //!< clear any single packet only flags / state.
 
     void setType(const ocsd_etmv4_i_pkt_type pkt_type) { type = pkt_type; };
     void updateErrType(const ocsd_etmv4_i_pkt_type err_pkt_type, const uint8_t val = 0);
 
     void clearTraceInfo();  //!< clear all the trace info data prior to setting for new trace info packet.
     void setTraceInfo(const uint32_t infoVal);
     void setTraceInfoKey(const uint32_t keyVal);
     void setTraceInfoSpec(const uint32_t specVal);
     void setTraceInfoCyct(const uint32_t cyctVal);
 
     void setTS(const uint64_t value, const uint8_t bits);
     void setCycleCount(const uint32_t value);
     void setCommitElements(const uint32_t commit_elem);
     void setCancelElements(const uint32_t cancel_elem);
     void setAtomPacket(const ocsd_pkt_atm_type type, const uint32_t En_bits, const uint8_t num);
 
     void setCondIF1(uint32_t const cond_key);
     void setCondIF2(uint8_t const c_elem_idx);
     void setCondIF3(uint8_t const num_c_elem, const bool finalElem);
 
     void setCondRF1(const uint32_t key[2], const uint8_t res[2], const uint8_t CI[2], const bool set2Keys);
     void setCondRF2(const uint8_t key_incr, const uint8_t token);
     void setCondRF3(const uint16_t tokens);
     void setCondRF4(const uint8_t token);
 
     void setContextInfo(const bool update, const uint8_t EL = 0, const uint8_t NS = 0, const uint8_t SF = 0);
     void setContextVMID(const uint32_t VMID);
     void setContextCID(const uint32_t CID);
 
     void setExceptionInfo(const uint16_t excep_type, const uint8_t addr_interp, const uint8_t m_fault_pending, const uint8_t m_type);
     
     void set64BitAddress(const uint64_t addr, const uint8_t IS);
     void set32BitAddress(const uint32_t addr, const uint8_t IS);
     void updateShortAddress(const uint32_t addr, const uint8_t IS, const uint8_t update_bits);
     void setAddressExactMatch(const uint8_t idx);
 
     void setDataSyncMarker(const uint8_t dsm_val);
     void setEvent(const uint8_t event_val);
 
     void setQType(const bool has_count, const uint32_t count, const bool has_addr, const bool addr_match, const uint8_t type);
 
     // packet status interface - get packet info.
     const ocsd_etmv4_i_pkt_type getType() const { return type; };
     const ocsd_etmv4_i_pkt_type getErrType() const { return err_type; };
 
     //! return true if this packet has set the commit packet count.
     const bool hasCommitElementsCount() const 
     {
         return pkt_valid.bits.commit_elem_valid ? true : false;
     };
     
     // trace info
     const etmv4_trace_info_t &getTraceInfo() const { return trace_info; };    
     const uint32_t getCCThreshold() const;
     const uint32_t getP0Key() const;
     const uint32_t getCurrSpecDepth() const;
 
     // atom
     const ocsd_pkt_atom &getAtom() const { return atom; };
+    const int getNumAtoms() const { return atom.num; };
 
     // context
     const etmv4_context_t &getContext() const { return context; };
 
     // address
     const uint8_t &getAddrMatch() const  { return addr_exact_match_idx; };
     const ocsd_vaddr_t &getAddrVal() const { return v_addr.val; };
     const uint8_t &getAddrIS() const { return v_addr_ISA; };
     const bool getAddr64Bit() const { return v_addr.size == VA_64BIT; };
 
     // ts
     const uint64_t getTS() const { return pkt_valid.bits.ts_valid ? ts.timestamp : 0; };
 
     // cc
     const uint32_t getCC() const { return pkt_valid.bits.cc_valid ? cycle_count : 0; };
 
+    // speculation
+    const int getCommitElem() const { return commit_elements; };
+    const int getCancelElem() const { return cancel_elements; };
+
     // packet type
     const bool isBadPacket() const;
 
     // printing
     virtual void toString(std::string &str) const;
     virtual void toStringFmt(const uint32_t fmtFlags, std::string &str) const;
 
 private:
     const char *packetTypeName(const ocsd_etmv4_i_pkt_type type, const char **pDesc) const;
     void contextStr(std::string &ctxtStr) const;
     void atomSeq(std::string &valStr) const;
     void addrMatchIdx(std::string &valStr) const;
     void exceptionInfo(std::string &valStr) const;
 
     void push_vaddr();
     void pop_vaddr_idx(const uint8_t idx);
 
     Etmv4PktAddrStack m_addr_stack;
 };
 
 inline void  EtmV4ITrcPacket::updateErrType(const ocsd_etmv4_i_pkt_type err_pkt_type, const uint8_t err_val /* = 0 */)
 {
     // set primary type to incoming error type, set packet err type to previous primary type.
     err_type = type;
     type = err_pkt_type;
     err_hdr_val = err_val;
 }
 
 inline void EtmV4ITrcPacket::clearTraceInfo()
 {
     pkt_valid.bits.ts_valid = 0;
     pkt_valid.bits.trace_info_valid = 0;
     pkt_valid.bits.p0_key_valid = 0;
     pkt_valid.bits.spec_depth_valid = 0;
     pkt_valid.bits.cc_thresh_valid  = 0;
 
     // set these as defaults - if they don't appear in TINFO this is the state.
     setTraceInfo(0);        
     setTraceInfoSpec(0);   
+
+    // explicitly reset the stack & zero the current address. 
+    m_addr_stack.reset_stack();
+    m_addr_stack.get_idx(0, v_addr, v_addr_ISA);
 }
 
 inline void EtmV4ITrcPacket::setTraceInfo(const uint32_t infoVal)
 {
     trace_info.val = infoVal;
     pkt_valid.bits.trace_info_valid = 1;
 }
 
 inline void EtmV4ITrcPacket::setTraceInfoKey(const uint32_t keyVal)
 {
     p0_key = keyVal;
     pkt_valid.bits.p0_key_valid = 1;
 }
 
 inline void EtmV4ITrcPacket::setTraceInfoSpec(const uint32_t specVal)
 {
     curr_spec_depth = specVal;
     pkt_valid.bits.spec_depth_valid = 1;
 }
 
 inline void EtmV4ITrcPacket::setTraceInfoCyct(const uint32_t cyctVal)
 {
     cc_threshold = cyctVal;
     pkt_valid.bits.cc_thresh_valid  = 1;
 }
 
 inline void EtmV4ITrcPacket::setTS(const uint64_t value, const uint8_t bits)
 {
     uint64_t mask = (uint64_t)-1LL;
     if(bits < 64) mask = (1ULL << bits) - 1;
     ts.timestamp = (ts.timestamp & ~mask) | (value & mask);
     ts.bits_changed = bits;
     pkt_valid.bits.ts_valid = 1;
 }
 
 inline void EtmV4ITrcPacket::setCycleCount(const uint32_t value)
 {
     pkt_valid.bits.cc_valid = 1;
     cycle_count = value;
 }
 
 inline void EtmV4ITrcPacket::setCommitElements(const uint32_t commit_elem)
 {
     pkt_valid.bits.commit_elem_valid = 1;
     commit_elements = commit_elem;
 }
 
 inline const uint32_t EtmV4ITrcPacket::getCCThreshold() const
 {
     if(pkt_valid.bits.cc_thresh_valid)
         return cc_threshold;
     return 0;
 }
 
 inline const uint32_t EtmV4ITrcPacket::getP0Key() const
 {
     if(pkt_valid.bits.p0_key_valid)
         return p0_key;
     return 0;
 }
 
 inline const uint32_t EtmV4ITrcPacket::getCurrSpecDepth() const
 {
     if(pkt_valid.bits.spec_depth_valid)
         return curr_spec_depth;
     return 0;
 }
 
 inline void EtmV4ITrcPacket::setCancelElements(const uint32_t cancel_elem)
 {
     cancel_elements = cancel_elem;
 }
 
 inline void EtmV4ITrcPacket::setAtomPacket(const ocsd_pkt_atm_type type, const uint32_t En_bits, const uint8_t num)
 {
     if(type == ATOM_REPEAT)
     {
         uint32_t bit_patt = En_bits & 0x1;
         if(bit_patt)
         {   
             // none zero - all 1s
             bit_patt = (bit_patt << num) - 1;
         }
         atom.En_bits = bit_patt;
     }
     else
         atom.En_bits = En_bits;
     atom.num = num;    
 }
 
 inline void EtmV4ITrcPacket::setCondIF1(const uint32_t cond_key)
 {
     cond_instr.cond_key_set = 1;
     cond_instr.f3_final_elem = 0;
     cond_instr.f2_cond_incr = 0;
     cond_instr.num_c_elem = 1;
     cond_instr.cond_c_key = cond_key;
 }
 
 inline void EtmV4ITrcPacket::setCondIF2(const uint8_t c_elem_idx)
 {
     cond_instr.cond_key_set = 0;
     cond_instr.f3_final_elem = 0;
     switch(c_elem_idx & 0x3)
     {
     case 0:
         cond_instr.f2_cond_incr = 1;
         cond_instr.num_c_elem = 1;
         break;
 
     case 1:
         cond_instr.f2_cond_incr = 0;
         cond_instr.num_c_elem = 1;
         break;
 
     case 2:
         cond_instr.f2_cond_incr = 1;
         cond_instr.num_c_elem = 2;
         break;
     }
 }
 
 inline void EtmV4ITrcPacket::setCondIF3(const uint8_t num_c_elem, const bool finalElem)
 {
     cond_instr.cond_key_set = 0;
     cond_instr.f3_final_elem = finalElem ? 1: 0;
     cond_instr.f2_cond_incr = 0;
     cond_instr.num_c_elem = num_c_elem;
 }
 
 inline void EtmV4ITrcPacket::setCondRF1(const uint32_t key[2], const uint8_t res[2], const uint8_t CI[2],const bool set2Keys)
 {
     cond_result.key_res_0_set = 1;
     cond_result.cond_r_key_0 = key[0];
     cond_result.res_0 = res[0];
     cond_result.ci_0 = CI[0];
 
     if(set2Keys)
     {
         cond_result.key_res_1_set = 1;
         cond_result.cond_r_key_1 = key[1];
         cond_result.res_1 = res[1];
         cond_result.ci_1 = CI[1];
     }
 }
 
 
 inline void EtmV4ITrcPacket::setCondRF2(const uint8_t key_incr, const uint8_t token)
 {
     cond_result.key_res_0_set = 0;
     cond_result.key_res_1_set = 0;
     cond_result.f2_key_incr = key_incr;
     cond_result.f2f4_token = token;
 }
 
 inline void EtmV4ITrcPacket::setCondRF3(const uint16_t tokens)
 {
     cond_result.key_res_0_set = 0;
     cond_result.key_res_1_set = 0;
     cond_result.f3_tokens = tokens;
 }
 
 inline void EtmV4ITrcPacket::setCondRF4(const uint8_t token)
 {
     cond_result.key_res_0_set = 0;
     cond_result.key_res_1_set = 0;
     cond_result.f2f4_token = token;
 }
 
 inline void EtmV4ITrcPacket::setContextInfo(const bool update, const uint8_t EL, const uint8_t NS, const uint8_t SF)
 {
     pkt_valid.bits.context_valid = 1;
     if(update)
     {
         context.updated = 1;
         context.EL = EL;
         context.NS = NS;
         context.SF = SF;
     }
 }
 
 inline void EtmV4ITrcPacket::setContextVMID(const uint32_t VMID)
 {
     pkt_valid.bits.context_valid = 1;
     context.updated = 1;
     context.VMID = VMID;
     context.updated_v = 1;
 }
 
 inline void EtmV4ITrcPacket::setContextCID(const uint32_t CID)
 {
     pkt_valid.bits.context_valid = 1;
     context.updated = 1;
     context.ctxtID = CID;
     context.updated_c = 1;
 }
 
 inline void EtmV4ITrcPacket::setExceptionInfo(const uint16_t excep_type, const uint8_t addr_interp, const uint8_t m_fault_pending, const uint8_t m_type)
 {
     exception_info.exceptionType = excep_type;
     exception_info.addr_interp = addr_interp;
     exception_info.m_fault_pending = m_fault_pending;
     exception_info.m_type = m_type;
 }
 
 inline void EtmV4ITrcPacket::set64BitAddress(const uint64_t addr, const uint8_t IS)
 {
     v_addr.pkt_bits = 64;
     v_addr.valid_bits = 64;
     v_addr.size = VA_64BIT;
     v_addr.val = addr;
     v_addr_ISA = IS;
     push_vaddr();
 }
 
 inline void EtmV4ITrcPacket::set32BitAddress(const uint32_t addr, const uint8_t IS)
 {
     uint64_t mask = OCSD_BIT_MASK(32);
     v_addr.pkt_bits = 32;
 
 	if (pkt_valid.bits.context_valid && context.SF)
 	{
 		v_addr.size = VA_64BIT;
-		if (v_addr.valid_bits < 32) // may be updating a 64 bit address so only set 32 if currently less.
-			v_addr.valid_bits = 32;
 		v_addr.val = (v_addr.val & ~mask) | (addr & mask);
 	}
     else
     {
 		v_addr.val = addr;
         v_addr.size = VA_32BIT;
-		v_addr.valid_bits = 32;
 	}
-	    
+
+    if (v_addr.valid_bits < 32) // may be updating a 64 bit address so only set 32 if currently less.
+        v_addr.valid_bits = 32;
+
     v_addr_ISA = IS;
     push_vaddr();
 }
 
 inline void EtmV4ITrcPacket::updateShortAddress(const uint32_t addr, const uint8_t IS, const uint8_t update_bits)
 {
     ocsd_vaddr_t update_mask = OCSD_BIT_MASK(update_bits);
     v_addr.pkt_bits = update_bits;
     if(v_addr.valid_bits < update_bits)
         v_addr.valid_bits = update_bits;
 
     v_addr.val = (v_addr.val & ~update_mask) | (addr & update_mask);
     v_addr_ISA = IS;
     push_vaddr();
 }
 
 inline void EtmV4ITrcPacket::setAddressExactMatch(const uint8_t idx)
 {
     addr_exact_match_idx = idx;   
     pop_vaddr_idx(idx);
     push_vaddr();
 }
 
 inline void EtmV4ITrcPacket::setDataSyncMarker(const uint8_t dsm_value)
 {
     dsm_val = dsm_value;
 }
 
 inline void EtmV4ITrcPacket::setEvent(const uint8_t event_value)
 {
     event_val = event_value;
 }
 
 inline void EtmV4ITrcPacket::setQType(const bool has_count, const uint32_t count, const bool has_addr, const bool addr_match, const uint8_t type)
 {
     Q_pkt.q_count = count;
     Q_pkt.q_type = type;
     Q_pkt.count_present = has_count ? 1 : 0;
     Q_pkt.addr_present = has_addr ? 1: 0;
     Q_pkt.addr_match = addr_match ? 1 :0;
 }
 
 inline const bool EtmV4ITrcPacket::isBadPacket() const
 {
     return (type >= ETM4_PKT_I_BAD_SEQUENCE);
 }
 
 inline void  EtmV4ITrcPacket::push_vaddr()
 {
     m_addr_stack.push(v_addr, v_addr_ISA);
 }
 
 inline void EtmV4ITrcPacket::pop_vaddr_idx(const uint8_t idx)
 {
     m_addr_stack.get_idx(idx, v_addr, v_addr_ISA);
 }
 
 /** @}*/
 
 #endif // ARM_TRC_PKT_ELEM_ETMV4I_H_INCLUDED
 
 /* End of File trc_pkt_elem_etmv4i.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h	(revision 362263)
@@ -1,104 +1,47 @@
 /*
  * \file       trc_pkt_proc_etmv4.h
  * \brief      OpenCSD : ETMv4 packet processor interface classes.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 #define ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 
+// split I & D into separate files, retain this header for backward compatibility
+// for now just include the I packet processor as that is the only one implemented.
 
 #include "trc_pkt_types_etmv4.h"
+#include "trc_pkt_proc_etmv4i.h"
 #include "common/trc_pkt_proc_base.h"
-
-class EtmV4IPktProcImpl;    /**< ETMv4 I channel packet processor */
-class EtmV4DPktProcImpl;    /**< ETMv4 D channel packet processor */
-class EtmV4ITrcPacket;
-class EtmV4DTrcPacket;
-class EtmV4Config;
-
-/** @addtogroup ocsd_pkt_proc
-@{*/
-
-class TrcPktProcEtmV4I : public TrcPktProcBase< EtmV4ITrcPacket,  ocsd_etmv4_i_pkt_type, EtmV4Config>
-{
-public:
-    TrcPktProcEtmV4I();
-    TrcPktProcEtmV4I(int instIDNum);
-    virtual ~TrcPktProcEtmV4I();
-
-protected:
-    /* implementation packet processing interface */
-    virtual ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                                const uint32_t dataBlockSize,
-                                                const uint8_t *pDataBlock,
-                                                uint32_t *numBytesProcessed);
-    virtual ocsd_datapath_resp_t onEOT();
-    virtual ocsd_datapath_resp_t onReset();
-    virtual ocsd_datapath_resp_t onFlush();
-    virtual ocsd_err_t onProtocolConfig();
-    virtual const bool isBadPacket() const;
-
-    friend class EtmV4IPktProcImpl;
-
-    EtmV4IPktProcImpl *m_pProcessor;
-};
-
-
-class TrcPktProcEtmV4D : public TrcPktProcBase< EtmV4DTrcPacket,  ocsd_etmv4_d_pkt_type, EtmV4Config>
-{
-public:
-    TrcPktProcEtmV4D();
-    TrcPktProcEtmV4D(int instIDNum);
-    virtual ~TrcPktProcEtmV4D();
-
-protected:
-    /* implementation packet processing interface */
-    virtual ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                                const uint32_t dataBlockSize,
-                                                const uint8_t *pDataBlock,
-                                                uint32_t *numBytesProcessed);
-    virtual ocsd_datapath_resp_t onEOT();
-    virtual ocsd_datapath_resp_t onReset();
-    virtual ocsd_datapath_resp_t onFlush();
-    virtual ocsd_err_t onProtocolConfig();
-    virtual const bool isBadPacket() const;
-
-    friend class EtmV4DPktProcImpl;
-
-    EtmV4DPktProcImpl *m_pProcessor;
-};
-
-/** @}*/
 
 #endif // ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 
 /* End of File trc_pkt_proc_etmv4.h */
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4i.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4i.h	(nonexistent)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4i.h	(revision 362263)
@@ -0,0 +1,214 @@
+/*
+ * \file       trc_pkt_proc_etmv4i.h
+ * \brief      OpenCSD : Implementation of ETMv4 packet processing
+ * 
+ * \copyright  Copyright (c) 2015, 2019 ARM Limited. All Rights Reserved.
+ */
+
+/* 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * 3. Neither the name of the copyright holder nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software without 
+ * specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */ 
+
+#ifndef ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
+#define ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
+
+#include "trc_pkt_types_etmv4.h"
+#include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
+#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"
+#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"
+#include "common/trc_raw_buffer.h"
+#include "common/trc_pkt_proc_base.h"
+
+class EtmV4ITrcPacket;
+class EtmV4Config;
+
+/** @addtogroup ocsd_pkt_proc
+@{*/
+
+class TrcPktProcEtmV4I : public TrcPktProcBase< EtmV4ITrcPacket, ocsd_etmv4_i_pkt_type, EtmV4Config>
+{
+public:
+    TrcPktProcEtmV4I();
+    TrcPktProcEtmV4I(int instIDNum);
+    virtual ~TrcPktProcEtmV4I();
+
+protected:
+    /* implementation packet processing interface */
+    virtual ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
+                                        const uint32_t dataBlockSize,
+                                        const uint8_t *pDataBlock,
+                                        uint32_t *numBytesProcessed);
+    virtual ocsd_datapath_resp_t onEOT();
+    virtual ocsd_datapath_resp_t onReset();
+    virtual ocsd_datapath_resp_t onFlush();
+    virtual ocsd_err_t onProtocolConfig();
+    virtual const bool isBadPacket() const;
+
+protected:
+    typedef enum _process_state {
+        PROC_HDR,
+        PROC_DATA,
+        SEND_PKT,
+        SEND_UNSYNCED,
+        PROC_ERR,
+    } process_state;
+    
+    process_state m_process_state;
+
+    void InitPacketState();      // clear current packet state.
+    void InitProcessorState();   // clear all previous process state
+
+    /** packet processor configuration **/
+    bool m_isInit;
+
+    // etmv4 hardware configuration
+    EtmV4Config m_config;
+
+    /** packet data **/
+    TraceRawBuffer m_trcIn;    // trace data in buffer
+    std::vector<uint8_t> m_currPacketData;  // raw data packet
+    int m_currPktIdx;   // index into raw packet when expanding
+    EtmV4ITrcPacket m_curr_packet;  // expanded packet
+    ocsd_trc_index_t m_packet_index;   // index of the start of the current packet
+    ocsd_trc_index_t m_blockIndex;     // index at the start of the current data block being processed
+
+    // searching for sync
+    bool m_is_sync;             //!< seen first sync packet
+    bool m_first_trace_info;    //!< seen first trace info packet after sync
+    bool m_sent_notsync_packet; //!< send one not sync packet if we see any unsynced data on the channel 
+    unsigned m_dump_unsynced_bytes;  //!< number of unsynced bytes to send
+    ocsd_trc_index_t m_update_on_unsync_packet_index;
+
+
+private:
+    // current processing state data - counts and flags to determine if a packet is complete.
+
+    // TraceInfo Packet
+    // flags to indicate processing progress for these sections is complete.
+    struct _t_info_pkt_prog {
+        uint8_t sectFlags;
+        uint8_t ctrlBytes;                 
+    }  m_tinfo_sections;
+
+    #define TINFO_INFO_SECT 0x01
+    #define TINFO_KEY_SECT  0x02 
+    #define TINFO_SPEC_SECT 0x04
+    #define TINFO_CYCT_SECT 0x08
+    #define TINFO_CTRL      0x20
+    #define TINFO_ALL_SECT  0x1F
+    #define TINFO_ALL       0x3F
+
+
+    // address and context packets 
+    int m_addrBytes;
+    uint8_t m_addrIS;
+    bool m_bAddr64bit;
+    int m_vmidBytes;    // bytes still to find
+    int m_ctxtidBytes;  // bytes still to find
+    bool m_bCtxtInfoDone;
+    bool m_addr_done;
+
+    // timestamp
+    bool m_ccount_done; // done or not needed 
+    bool m_ts_done;
+    int m_ts_bytes;
+
+    // exception
+    int m_excep_size;
+
+    // cycle count
+    bool m_has_count;
+    bool m_count_done;
+    bool m_commit_done;
+
+    // cond result
+    bool m_F1P1_done;  // F1 payload 1 done
+    bool m_F1P2_done;  // F1 payload 2 done
+    bool m_F1has_P2;   // F1 has a payload 2
+
+    // Q packets (use some from above too)
+    bool m_has_addr;
+    bool m_addr_short;
+    bool m_addr_match;
+    uint8_t m_Q_type;
+    uint8_t m_QE;
+
+    ocsd_datapath_resp_t outputPacket();
+    ocsd_datapath_resp_t outputUnsyncedRawPacket(); 
+
+    void iNotSync(const uint8_t lastByte);      // not synced yet
+    void iPktNoPayload(const uint8_t lastByte); // process a single byte packet
+    void iPktReserved(const uint8_t lastByte);  // deal with reserved header value
+    void iPktExtension(const uint8_t lastByte);
+    void iPktASync(const uint8_t lastByte);
+    void iPktTraceInfo(const uint8_t lastByte);
+    void iPktTimestamp(const uint8_t lastByte);
+    void iPktException(const uint8_t lastByte);
+    void iPktCycleCntF123(const uint8_t lastByte);
+    void iPktSpeclRes(const uint8_t lastByte);
+    void iPktCondInstr(const uint8_t lastByte);
+    void iPktCondResult(const uint8_t lastByte);
+    void iPktContext(const uint8_t lastByte);
+    void iPktAddrCtxt(const uint8_t lastByte);
+    void iPktShortAddr(const uint8_t lastByte);
+    void iPktLongAddr(const uint8_t lastByte);
+    void iPktQ(const uint8_t lastByte);
+    void iAtom(const uint8_t lastByte);
+    void iPktInvalidCfg(const uint8_t lastByte);  // packet invalid in current config.
+
+    unsigned extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit = 5);
+    unsigned extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit = 9);
+    unsigned extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result);
+    void extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx);
+    int extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value);
+    int extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value);
+    int extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits);
+
+    // packet processing is table driven.    
+    typedef void (TrcPktProcEtmV4I::*PPKTFN)(uint8_t);
+    PPKTFN m_pIPktFn;
+
+    struct _pkt_i_table_t {
+        ocsd_etmv4_i_pkt_type pkt_type;
+        PPKTFN pptkFn;
+    } m_i_table[256];
+
+    void BuildIPacketTable();
+
+    void throwBadSequenceError(const char *pszExtMsg);
+};
+
+
+inline const bool TrcPktProcEtmV4I::isBadPacket() const
+{
+    return m_curr_packet.isBadPacket();
+}
+
+/** @}*/
+
+#endif // ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
+
+/* End of File trc_pkt_proc_etmv4i_impl.h */

Property changes on: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4i.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h	(revision 362263)
@@ -1,367 +1,368 @@
 /*
  * \file       trc_pkt_types_etmv4.h
  * \brief      OpenCSD : ETMv4 packet info
  * 
  * \copyright  Copyright (c) 2015,2019 ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED
 #define ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED
 
 #include "opencsd/trc_pkt_types.h"
 
 /** @addtogroup trc_pkts
 @{*/
 
 /** @name ETMv4 Packet Types
 @{*/
 
 /** I stream packets. */
 typedef enum _ocsd_etmv4_i_pkt_type
 {
 /* state of decode markers */
 		ETM4_PKT_I_NOTSYNC = 0x200,             /*!< no sync found yet.  */
         ETM4_PKT_I_INCOMPLETE_EOT,              /*!< flushing incomplete/empty packet at end of trace.*/
         ETM4_PKT_I_NO_ERR_TYPE,                 /*!< error type not set for packet. */
 
 /* markers for unknown/bad packets */
 		ETM4_PKT_I_BAD_SEQUENCE = 0x300,        /*!< invalid sequence for packet type. */
         ETM4_PKT_I_BAD_TRACEMODE,               /*!< invalid packet type for this trace mode. */
 		ETM4_PKT_I_RESERVED,                    /*!< packet type reserved. */
         ETM4_PKT_I_RESERVED_CFG,                /*!< packet type reserved for current configuration */
 
 /* I stream packet types. */
     /* extension header. */
         ETM4_PKT_I_EXTENSION =          0x00,   /*!< b00000000  */
 
    /* sync */    
         ETM4_PKT_I_TRACE_INFO =         0x01,   /*!< b00000001 */
         // timestamp
         ETM4_PKT_I_TIMESTAMP =          0x02,   /*!< b0000001x */
         ETM4_PKT_I_TRACE_ON =           0x04,   /*!< b00000100 */
         ETM4_PKT_I_FUNC_RET =           0x05,   /*!< b00000101 (V8M only) */
     // Exceptions
         ETM4_PKT_I_EXCEPT =             0x06,   /*!< b00000110 */
         ETM4_PKT_I_EXCEPT_RTN =         0x07,   /*!< b00000111 */
 
         /* unused encodings             0x08-0xB     b00001000 to b00001011 */
 
     /* cycle count packets */
         ETM4_PKT_I_CCNT_F2 =            0x0C,   /*!< b0000110x */
         ETM4_PKT_I_CCNT_F1 =            0x0E,   /*!< b0000111x */
         ETM4_PKT_I_CCNT_F3 =            0x10,   /*!< b0001xxxx */
 
     // data synchronisation markers
         ETM4_PKT_I_NUM_DS_MKR =         0x20,   /*!< b00100xxx */
         ETM4_PKT_I_UNNUM_DS_MKR =       0x28,   /*!< b00101000 to b00101100 0x2C */
 
     // speculation 
         ETM4_PKT_I_COMMIT =             0x2D,   /*!< b00101101 */
-        ETM4_PKT_I_CANCEL_F1 =          0x2E,   /*!< b0010111x */
+        ETM4_PKT_I_CANCEL_F1 =          0x2E,   /*!< b00101110 */
+        ETM4_PKT_I_CANCEL_F1_MISPRED =  0x2F,   /*!< b00101111 */
         ETM4_PKT_I_MISPREDICT =         0x30,   /*!< b001100xx */
         ETM4_PKT_I_CANCEL_F2 =          0x34,   /*!< b001101xx */
         ETM4_PKT_I_CANCEL_F3 =          0x38,   /*!< b00111xxx */
 
     /* conditional instruction tracing */
         ETM4_PKT_I_COND_I_F2 =          0x40,   /*!< b01000000 - b01000010 */
         ETM4_PKT_I_COND_FLUSH =         0x43,   /*!< b01000011 */
         ETM4_PKT_I_COND_RES_F4 =        0x44,   /*!< b0100010x, b01000110 */
         /* unused encoding              0x47         b01000111 */
         ETM4_PKT_I_COND_RES_F2 =        0x48,   /*!< b0100100x, b01001010, b0100110x, b01001110 */
         /* unused encodings             0x4B,0x4F    b01001011, b01001111 */
         ETM4_PKT_I_COND_RES_F3 =        0x50,   /*!< b0101xxxx */
         /* unused encodings             0x60-0x67    b01100xxx */     
         ETM4_PKT_I_COND_RES_F1 =        0x68,   /*!< b011010xx, b0110111x  0x68-0x6B, 0x6e-0x6F */
         ETM4_PKT_I_COND_I_F1 =          0x6C,   /*!< b01101100 */
         ETM4_PKT_I_COND_I_F3 =          0x6D,   /*!< b01101101 */
 
         // event trace
         ETM4_PKT_I_IGNORE =             0x70,   /*!< b01110000 */
         ETM4_PKT_I_EVENT =              0x71,   /*!< b01110001 to 0x01111111 0x7F */
 
     /* address and context */
         ETM4_PKT_I_CTXT =               0x80,   /*!< b1000000x  */
         ETM4_PKT_I_ADDR_CTXT_L_32IS0 =  0x82,   /*!< b10000010  */
         ETM4_PKT_I_ADDR_CTXT_L_32IS1,           /*!< b10000011  */
         /* unused encoding              0x84         b10000100  */
         ETM4_PKT_I_ADDR_CTXT_L_64IS0 =  0x85,   /*!< b10000101  */
         ETM4_PKT_I_ADDR_CTXT_L_64IS1,           /*!< b10000110  */
         /* unused encoding              0x87         b10000111  */
         /* unused encodings             0x88-0x8F    b10001xxx  */
         ETM4_PKT_I_ADDR_MATCH =         0x90,   /*!< b10010000 to b10010010 0x92 */
         /* unused encodings             0x93-0x94    b10010011 to b10010010 */
         ETM4_PKT_I_ADDR_S_IS0 =         0x95,   /*!< b10010101  */
         ETM4_PKT_I_ADDR_S_IS1,                  /*!< b10010110  */
         /* unused encodings             0x97         b10010111 to b10011001 0x99 */
         ETM4_PKT_I_ADDR_L_32IS0 =       0x9A,   /*!< b10011010  */
         ETM4_PKT_I_ADDR_L_32IS1,                /*!< b10011011  */
         /* unused encoding              0x9C         b10011100  */
         ETM4_PKT_I_ADDR_L_64IS0 =       0x9D,   /*!< b10011101  */
         ETM4_PKT_I_ADDR_L_64IS1,                /*!< b10011110  */
         /* unused encoding              0x9F         b10011111  */
 
     /* Q packets */
         ETM4_PKT_I_Q = 0xA0,                    /*!< b1010xxxx  */
 
         /* unused encodings             0xB0-0xBF    b1011xxxx  */
 
     /* Atom packets */
         ETM4_PKT_I_ATOM_F6 =            0xC0,   /*!< b11000000 - b11010100 0xC0 - 0xD4, b11100000 - b11110100 0xE0 - 0xF4 */
         ETM4_PKT_I_ATOM_F5 =            0xD5,   /*!< b11010101 - b11010111 0xD5 - 0xD7, b11110101 0xF5 */
         ETM4_PKT_I_ATOM_F2 =            0xD8,   /*!< b110110xx to 0xDB */
         ETM4_PKT_I_ATOM_F4 =            0xDC,   /*!< b110111xx to 0xDF */
         ETM4_PKT_I_ATOM_F1 =            0xF6,   /*!< b1111011x to 0xF7 */
         ETM4_PKT_I_ATOM_F3 =            0xF8,   /*!< b11111xxx to 0xFF */
 
     // extension packets - follow 0x00 header
         ETM4_PKT_I_ASYNC = 0x100,              //!< b00000000
         ETM4_PKT_I_DISCARD = 0x103,            //!< b00000011
         ETM4_PKT_I_OVERFLOW = 0x105,           //!< b00000101
 
 } ocsd_etmv4_i_pkt_type;
 
 typedef union _etmv4_trace_info_t {
     uint32_t val;   //!< trace info full value.
     struct {
         uint32_t cc_enabled:1;      //!< 1 if cycle count enabled
         uint32_t cond_enabled:3;    //!< conditional trace enabeld type
         uint32_t p0_load:1;         //!< 1 if tracing with P0 load elements (for data trace)
         uint32_t p0_store:1;        //!< 1 if tracing with P0 store elements (for data trace)
     } bits;         //!< bitfields for trace info value.
 } etmv4_trace_info_t;
 
 typedef struct _etmv4_context_t {
     struct {
         uint32_t EL:2;          //!< exception level.
         uint32_t SF:1;          //!< sixty four bit
         uint32_t NS:1;          //!< none secure
         uint32_t updated:1;     //!< updated this context packet (otherwise same as last time)
         uint32_t updated_c:1;   //!< updated CtxtID
         uint32_t updated_v:1;   //!< updated VMID
     };
     uint32_t ctxtID;   //!< Current ctxtID
     uint32_t VMID;     //!< current VMID
 } etmv4_context_t;
 
 /** a broadcast address value. */
 typedef struct _etmv4_addr_val_t {
     ocsd_vaddr_t val;  //!< Address value.
     uint8_t isa;        //!< instruction set.
 } etmv4_addr_val_t;
 
 typedef struct _ocsd_etmv4_i_pkt
 {
     ocsd_etmv4_i_pkt_type type;    /**< Trace packet type derived from header byte */
 
     //** intra-packet data - valid across packets.
 
     ocsd_pkt_vaddr v_addr;         //!< most recently broadcast address packet
     uint8_t         v_addr_ISA;     //!< ISA for the address packet. (0 = IS0 / 1 = IS1)
 
     etmv4_context_t context;        //!< current context for PE
 
     struct {
         uint64_t timestamp;         //!< current timestamp value
         uint8_t bits_changed;       //!< bits updated in this timestamp packet.
     } ts;
 
     uint32_t cc_threshold;      //!< cycle count threshold - from trace info.
 
     // single packet data - only valid for specific packet types on packet instance.
     ocsd_pkt_atom  atom;       //!< atom elements - number of atoms indicates validity of packet
     uint32_t cycle_count;       //!< cycle count
 
     uint32_t curr_spec_depth;   //!< current speculation depth
     uint32_t p0_key;            //!< current P0 key value for data packet synchronisation
 
     uint32_t commit_elements;  //<! commit elements indicated by this packet - valid dependent on the packet type.
     uint32_t cancel_elements;  //<! cancel elements indicated by this packet - valid dependent on the packet type.
 
     etmv4_trace_info_t trace_info;  //!< trace info structure - programmed configuration of trace capture.
 
     struct {
         uint32_t exceptionType:10;      //!< exception number
         uint32_t addr_interp:2;         //!< address value interpretation
         uint32_t m_fault_pending:1;     //!< M class fault pending.
         uint32_t m_type:1;              //!< 1 if M class exception.
     } exception_info;
     
 
     uint8_t addr_exact_match_idx;   //!< address match index in this packet.
     uint8_t dsm_val;    //!<  Data Sync Marker number, or unnumbered atom count - packet type determines.
     uint8_t event_val;  //!< Event value on event packet.
 
     struct {
         uint32_t cond_c_key;    
         uint8_t num_c_elem;
         struct {
             uint32_t cond_key_set:1;
             uint32_t f3_final_elem:1;
             uint32_t f2_cond_incr:1;
         };
     } cond_instr;
 
     struct {
         uint32_t cond_r_key_0;
         uint32_t cond_r_key_1;
         struct {
             uint32_t res_0:4;
             uint32_t res_1:4;
             uint32_t ci_0:1;
             uint32_t ci_1:1;
             uint32_t key_res_0_set:1;
             uint32_t key_res_1_set:1;
             uint32_t f2_key_incr:2;
             uint32_t f2f4_token:2;
             uint32_t f3_tokens:12;
         };
     } cond_result;
 
     struct {
         uint32_t q_count;
         struct {
             uint32_t addr_present:1;
             uint32_t addr_match:1;
             uint32_t count_present:1;
             uint32_t q_type:4;
         };
     } Q_pkt;
 
     //! valid bits for packet elements (addresses have their own valid bits).
     union {
         uint32_t val;
         struct {
             uint32_t context_valid:1;
             uint32_t ts_valid:1;
             uint32_t spec_depth_valid:1;
             uint32_t p0_key_valid:1;
             uint32_t cond_c_key_valid:1;
             uint32_t cond_r_key_valid:1;
             uint32_t trace_info_valid:1;
             uint32_t cc_thresh_valid:1;
             uint32_t cc_valid:1;
             uint32_t commit_elem_valid:1;
         } bits;
     } pkt_valid;
 
     // original header type when packet type changed to error on decode error.
     ocsd_etmv4_i_pkt_type err_type;
     uint8_t err_hdr_val;
 
 } ocsd_etmv4_i_pkt;
 
 
 // D stream packets
 typedef enum _ocsd_etmv4_d_pkt_type
 {
 // markers for unknown/bad packets
 		ETM4_PKT_D_NOTSYNC = 0x200,        //!< no sync found yet
 		ETM4_PKT_D_BAD_SEQUENCE,   //!< invalid sequence for packet type
         ETM4_PKT_D_BAD_TRACEMODE,  //!< invalid packet type for this trace mode.
 		ETM4_PKT_D_RESERVED,       //!< packet type reserved.
         ETM4_PKT_D_INCOMPLETE_EOT, //!< flushing incomplete packet at end of trace.
         ETM4_PKT_D_NO_HEADER,      //!< waiting for a header byte
         ETM4_PKT_D_NO_ERR_TYPE,    //!< error packet has no header based type. Use with unknown/res packet types.
         
     // data sync markers
         ETM4_PKT_DNUM_DS_MKR = 0x111, // ext packet, b0001xxx1
     // extension header
         ETM4_PKT_D_EXTENSION = 0x00,           //!< b00000000 
 
         ETM4_PKT_DUNNUM_DS_MKR = 0x01,    //!< b00000001
     // event trace 
         ETM4_PKT_DEVENT = 0x04,           //!< b00000100
     // timestamp
         ETM4_PKT_DTIMESTAMP = 0x02,       //!< b00000010
     // P1 Data address 
         ETM4_PKT_DADDR_P1_F1 = 0x70,     //!< b0111xxxx
         ETM4_PKT_DADDR_P1_F2 = 0x80,     //!< b10xxxxxx
         ETM4_PKT_DADDR_P1_F3 = 0x14,     //!< b000101xx
         ETM4_PKT_DADDR_P1_F4 = 0x60,     //!< b0110xxxx
         ETM4_PKT_DADDR_P1_F5 = 0xF8,     //!< b11111xxx
         ETM4_PKT_DADDR_P1_F6 = 0xF6,     //!< b1111011x
         ETM4_PKT_DADDR_P1_F7 = 0xF5,     //!< b11110101
     // P2 Data value
         ETM4_PKT_DVAL_P2_F1 = 0x20,      //!< b0010xxxx
         ETM4_PKT_DVAL_P2_F2 = 0x30,      //!< b00110xxx
         ETM4_PKT_DVAL_P2_F3 = 0x40,      //!< b010xxxxx
         ETM4_PKT_DVAL_P2_F4 = 0x10,      //!< b000100xx
         ETM4_PKT_DVAL_P2_F5 = 0x18,      //!< b00011xxx
         ETM4_PKT_DVAL_P2_F6 = 0x38,      //!< b00111xxx
     // suppression
         ETM4_PKT_DSUPPRESSION = 0x03,     //!< b00000011
     // synchronisation- extension packets - follow 0x00 header
         ETM4_PKT_DTRACE_INFO = 0x101,      //!< b00000001
 
     // extension packets - follow 0x00 header
         ETM4_PKT_D_ASYNC = 0x100,              //!< b00000000
         ETM4_PKT_D_DISCARD = 0x103,            //!< b00000011
         ETM4_PKT_D_OVERFLOW = 0x105            //!< b00000101
 
 } ocsd_etmv4_d_pkt_type;
 
 
 typedef struct _ocsd_etmv4_d_pkt
 {
     ocsd_etmv4_d_pkt_type type;
 
     ocsd_pkt_vaddr d_addr;
 
     uint64_t        pkt_val;    /**< Packet value -> data value, timestamp value, event value */
 
     ocsd_etmv4_d_pkt_type err_type;
 
 } ocsd_etmv4_d_pkt;
 
 typedef struct _ocsd_etmv4_cfg 
 {
     uint32_t                reg_idr0;    /**< ID0 register */
     uint32_t                reg_idr1;    /**< ID1 register */
     uint32_t                reg_idr2;    /**< ID2 register */
     uint32_t                reg_idr8;
     uint32_t                reg_idr9;   
     uint32_t                reg_idr10;
     uint32_t                reg_idr11;
     uint32_t                reg_idr12;
     uint32_t                reg_idr13;
     uint32_t                reg_configr;  /**< Config Register */
     uint32_t                reg_traceidr;  /**< Trace Stream ID register */
     ocsd_arch_version_t    arch_ver;   /**< Architecture version */
     ocsd_core_profile_t    core_prof;  /**< Core Profile */
 } ocsd_etmv4_cfg;
 
 
 /** @}*/
 /** @}*/
 #endif // ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED
 
 /* End of File trc_pkt_types_etmv4.h */
 
Index: head/contrib/opencsd/decoder/include/opencsd/ocsd_if_types.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/ocsd_if_types.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/ocsd_if_types.h	(revision 362263)
@@ -1,626 +1,633 @@
 /*!
  * \file       opencsd/ocsd_if_types.h
  * \brief      OpenCSD : Standard Types used in the library interfaces.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_OCSD_IF_TYPES_H_INCLUDED
 #define ARM_OCSD_IF_TYPES_H_INCLUDED
 
 #include <stdint.h>
 #include <stddef.h>
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
 /** VS2010 does not support inttypes - remove when VS2010 support is dropped */
 #define __PRI64_PREFIX "ll"
 #define PRIX64 __PRI64_PREFIX "X"
 #define PRIu64 __PRI64_PREFIX "u"
 #define PRIu32 "u"
 #else
 #include <inttypes.h>
 #endif
 
 
 /** @defgroup ocsd_interfaces OpenCSD Library : Interfaces
     @brief Set of types, structures and virtual interface classes making up the primary API
 
   Set of component interfaces that connect various source reader and decode components into a 
   decode tree to allow trace decode for the trace data being output by the source reader.
 
 @{*/
 
 
 
 /** @name Trace Indexing and Channel IDs
 @{*/
 #ifdef ENABLE_LARGE_TRACE_SOURCES
 typedef uint64_t ocsd_trc_index_t;   /**< Trace source index type - 64 bit size */
 #define OCSD_TRC_IDX_STR PRIu64
 #else
 typedef uint32_t ocsd_trc_index_t;   /**< Trace source index type - 32 bit size */
 #define OCSD_TRC_IDX_STR PRIu32
 #endif
 
 /** Invalid trace index value */
 #define OCSD_BAD_TRC_INDEX           ((ocsd_trc_index_t)-1)
 /** Invalid trace source ID value */
 #define OCSD_BAD_CS_SRC_ID           ((uint8_t)-1)
 /** macro returing true if trace source ID is in valid range (0x0 < ID < 0x70) */
 #define OCSD_IS_VALID_CS_SRC_ID(id)      ((id > 0) && (id < 0x70))
 /** macro returing true if trace source ID is in reserved range (ID == 0x0 || 0x70 <= ID <= 0x7F) */
 #define OCSD_IS_RESERVED_CS_SRC_ID(id)   ((id == 0) || ((id >= 0x70) && (id <= 0x7F))
 /** @}*/
 
 /** @name General Library Return and Error Codes 
 @{*/
 
 /** Library Error return type */
 typedef enum _ocsd_err_t {
 
     /* general return errors */
     OCSD_OK = 0,                   /**< No Error. */
     OCSD_ERR_FAIL,                 /**< General systemic failure. */
     OCSD_ERR_MEM,                  /**< Internal memory allocation error. */
     OCSD_ERR_NOT_INIT,             /**< Component not initialised or initialisation failure. */
     OCSD_ERR_INVALID_ID,           /**< Invalid CoreSight Trace Source ID.  */
     OCSD_ERR_BAD_HANDLE,           /**< Invalid handle passed to component. */
     OCSD_ERR_INVALID_PARAM_VAL,    /**< Invalid value parameter passed to component. */
     OCSD_ERR_INVALID_PARAM_TYPE,   /**< Type mismatch on abstract interface */
     OCSD_ERR_FILE_ERROR,           /**< File access error */
     OCSD_ERR_NO_PROTOCOL,          /**< Trace protocol unsupported */
     /* attachment point errors */
     OCSD_ERR_ATTACH_TOO_MANY,      /**< Cannot attach - attach device limit reached. */
     OCSD_ERR_ATTACH_INVALID_PARAM, /**< Cannot attach - invalid parameter. */
     OCSD_ERR_ATTACH_COMP_NOT_FOUND,/**< Cannot detach - component not found. */
     /* source reader errors */
     OCSD_ERR_RDR_FILE_NOT_FOUND,   /**< source reader - file not found. */
     OCSD_ERR_RDR_INVALID_INIT,     /**< source reader - invalid initialisation parameter. */
     OCSD_ERR_RDR_NO_DECODER,       /**< source reader - not trace decoder set. */
     /* data path errors */
     OCSD_ERR_DATA_DECODE_FATAL,    /**< A decoder in the data path has returned a fatal error. */
     /* frame deformatter errors */
     OCSD_ERR_DFMTR_NOTCONTTRACE,    /**< Trace input to deformatter none-continuous */
     OCSD_ERR_DFMTR_BAD_FHSYNC,      /**< Bad frame or half frame sync in trace deformatter */
     /* packet processor errors - protocol issues etc */
     OCSD_ERR_BAD_PACKET_SEQ,        /**< Bad packet sequence */
     OCSD_ERR_INVALID_PCKT_HDR,      /**< Invalid packet header */
     OCSD_ERR_PKT_INTERP_FAIL,       /**< Interpreter failed - cannot recover - bad data or sequence */
     /* packet decoder errors */
     OCSD_ERR_UNSUPPORTED_ISA,          /**< ISA not supported in decoder. */
     OCSD_ERR_HW_CFG_UNSUPP,            /**< Programmed trace configuration not supported by decoder.*/
     OCSD_ERR_UNSUPP_DECODE_PKT,        /**< Packet not supported in decoder */
     OCSD_ERR_BAD_DECODE_PKT,           /**< reserved or unknown packet in decoder. */
     OCSD_ERR_COMMIT_PKT_OVERRUN,       /**< overrun in commit packet stack - tried to commit more than available */
     OCSD_ERR_MEM_NACC,                 /**< unable to access required memory address */
     OCSD_ERR_RET_STACK_OVERFLOW,       /**< internal return stack overflow checks failed - popped more than we pushed. */
     /* decode tree errors */
     OCSD_ERR_DCDT_NO_FORMATTER,         /**< No formatter in use - operation not valid. */
     /* target memory access errors */
     OCSD_ERR_MEM_ACC_OVERLAP,           /**< Attempted to set an overlapping range in memory access map */
     OCSD_ERR_MEM_ACC_FILE_NOT_FOUND,    /**< Memory access file could not be opened */
     OCSD_ERR_MEM_ACC_FILE_DIFF_RANGE,   /**< Attempt to re-use the same memory access file for a different address range */
     OCSD_ERR_MEM_ACC_RANGE_INVALID,     /**< Address range in accessor set to invalid values */
     OCSD_ERR_MEM_ACC_BAD_LEN,           /**< Memory accessor returned a bad read length value (larger than requested */
     /* test errors - errors generated only by the test code, not the library */
     OCSD_ERR_TEST_SNAPSHOT_PARSE,       /**< test snapshot file parse error */
     OCSD_ERR_TEST_SNAPSHOT_PARSE_INFO,  /**< test snapshot file parse information */
     OCSD_ERR_TEST_SNAPSHOT_READ,        /**< test snapshot reader error */
     OCSD_ERR_TEST_SS_TO_DECODER,        /**< test snapshot to decode tree conversion error */
     /* decoder registration */
     OCSD_ERR_DCDREG_NAME_REPEAT,        /**< attempted to register a decoder with the same name as another one */
     OCSD_ERR_DCDREG_NAME_UNKNOWN,       /**< attempted to find a decoder with a name that is not known in the library */
     OCSD_ERR_DCDREG_TYPE_UNKNOWN,       /**< attempted to find a decoder with a type that is not known in the library */
     OCSD_ERR_DCDREG_TOOMANY,            /**< attempted to register too many custom decoders */
     /* decoder config */
     OCSD_ERR_DCD_INTERFACE_UNUSED,      /**< Attempt to connect or use and interface not supported by this decoder. */
     /* end marker*/
     OCSD_ERR_LAST
 } ocsd_err_t;
 
 /* component handle types */
 typedef unsigned int ocsd_hndl_rdr_t;      /**< reader control handle */
 typedef unsigned int ocsd_hndl_err_log_t;  /**< error logger connection handle */
 
 /* common invalid handle type */
 #define OCSD_INVALID_HANDLE (unsigned int)-1     /**< Global invalid handle value */
 
 /*!  Error Severity Type
  * 
  *   Used to indicate the severity of an error, and also as the 
  *   error log verbosity level in the error logger.
  *   
  *   The logger will ignore errors with a severity value higher than the 
  *   current verbosity level.
  *
  *   The value OCSD_ERR_SEV_NONE can only be used as a verbosity level to switch off logging,
  *   not as a severity value on an error. The other values can be used as both error severity and
  *   logger verbosity values.
  */
 typedef enum _ocsd_err_severity_t {
     OCSD_ERR_SEV_NONE,     /**< No error logging. */
     OCSD_ERR_SEV_ERROR,    /**< Most severe error - perhaps fatal. */
     OCSD_ERR_SEV_WARN,     /**< Warning level. Inconsistent or incorrect data seen but can carry on decode processing */
     OCSD_ERR_SEV_INFO,     /**< Information only message. Use for debugging code or suspect input data. */
 } ocsd_err_severity_t;
 
 /** @}*/
 
 /** @name Trace Datapath 
 @{*/
 
 /** Trace Datapath operations.
   */
 typedef enum _ocsd_datapath_op_t {
     OCSD_OP_DATA = 0, /**< Standard index + data packet */
     OCSD_OP_EOT,   /**< End of available trace data. No data packet. */
     OCSD_OP_FLUSH, /**< Flush existing data where possible, retain decode state. No data packet. */
     OCSD_OP_RESET, /**< Reset decode state - drop any existing partial data. No data packet. */
 } ocsd_datapath_op_t;
 
 /**
   * Trace Datapath responses
   */
 typedef enum _ocsd_datapath_resp_t {
     OCSD_RESP_CONT,                /**< Continue processing */
     OCSD_RESP_WARN_CONT,           /**< Continue processing  : a component logged a warning. */
     OCSD_RESP_ERR_CONT,            /**< Continue processing  : a component logged an error.*/
     OCSD_RESP_WAIT,                /**< Pause processing */
     OCSD_RESP_WARN_WAIT,           /**< Pause processing : a component logged a warning. */
     OCSD_RESP_ERR_WAIT,            /**< Pause processing : a component logged an error. */
     OCSD_RESP_FATAL_NOT_INIT,      /**< Processing Fatal Error :  component unintialised. */
     OCSD_RESP_FATAL_INVALID_OP,    /**< Processing Fatal Error :  invalid data path operation. */
     OCSD_RESP_FATAL_INVALID_PARAM, /**< Processing Fatal Error :  invalid parameter in datapath call. */
     OCSD_RESP_FATAL_INVALID_DATA,  /**< Processing Fatal Error :  invalid trace data */
     OCSD_RESP_FATAL_SYS_ERR,       /**< Processing Fatal Error :  internal system error. */
 } ocsd_datapath_resp_t;
 
 /*! Macro returning true if datapath response value is FATAL. */
 #define OCSD_DATA_RESP_IS_FATAL(x) (x >= OCSD_RESP_FATAL_NOT_INIT)
 /*! Macro returning true if datapath response value indicates WARNING logged. */
 #define OCSD_DATA_RESP_IS_WARN(x) ((x == OCSD_RESP_WARN_CONT) || (x == OCSD_RESP_WARN_WAIT))
 /*! Macro returning true if datapath response value indicates ERROR logged. */
 #define OCSD_DATA_RESP_IS_ERR(x) ((x == OCSD_RESP_ERR_CONT) || (x == OCSD_RESP_ERR_WAIT))
 /*! Macro returning true if datapath response value indicates WARNING or ERROR logged. */
 #define OCSD_DATA_RESP_IS_WARN_OR_ERR(x) (OCSD_DATA_RESP_IS_ERR(x) || OCSD_DATA_RESP_IS_WARN(x))
 /*! Macro returning true if datapath response value is CONT. */
 #define OCSD_DATA_RESP_IS_CONT(x) (x <  OCSD_RESP_WAIT)
 /*! Macro returning true if datapath response value is WAIT. */
 #define OCSD_DATA_RESP_IS_WAIT(x) ((x >= OCSD_RESP_WAIT) && (x < OCSD_RESP_FATAL_NOT_INIT))
 
 /** @}*/
 
 /** @name Trace Decode component types 
 @{*/
 
 
 /** Raw frame element data types 
     Data blocks types output from ITrcRawFrameIn. 
 */
 typedef enum _rcdtl_rawframe_elem_t {
     OCSD_FRM_NONE,     /**< None data operation on data path. (EOT etc.) */
     OCSD_FRM_PACKED,   /**< Raw packed frame data */
     OCSD_FRM_HSYNC,    /**< HSYNC data */
     OCSD_FRM_FSYNC,    /**< Frame Sync Data */
     OCSD_FRM_ID_DATA,  /**< unpacked data for ID */
 } ocsd_rawframe_elem_t;
 
 
 /** Indicates if the trace source will be frame formatted or a single protocol source.
     Used in decode tree creation and configuration code.
 */
 typedef enum _ocsd_dcd_tree_src_t {
     OCSD_TRC_SRC_FRAME_FORMATTED,  /**< input source is frame formatted. */
     OCSD_TRC_SRC_SINGLE,           /**< input source is from a single protocol generator. */
 } ocsd_dcd_tree_src_t;
 
 #define OCSD_DFRMTR_HAS_FSYNCS         0x01 /**< Deformatter Config : formatted data has fsyncs - input data 4 byte aligned */
 #define OCSD_DFRMTR_HAS_HSYNCS         0x02 /**< Deformatter Config : formatted data has hsyncs - input data 2 byte aligned */
 #define OCSD_DFRMTR_FRAME_MEM_ALIGN    0x04 /**< Deformatter Config : formatted frames are memory aligned, no syncs. Input data 16 byte frame aligned. */
 #define OCSD_DFRMTR_PACKED_RAW_OUT     0x08 /**< Deformatter Config : output raw packed frame data if raw monitor attached. */
 #define OCSD_DFRMTR_UNPACKED_RAW_OUT   0x10 /**< Deformatter Config : output raw unpacked frame data if raw monitor attached. */
 #define OCSD_DFRMTR_RESET_ON_4X_FSYNC  0x20 /**< Deformatter Config : reset downstream decoders if frame aligned 4x consecutive fsyncs spotted. (perf workaround) */
 #define OCSD_DFRMTR_VALID_MASK         0x3F /**< Deformatter Config : valid mask for deformatter configuration */
 
 #define OCSD_DFRMTR_FRAME_SIZE         0x10 /**< CoreSight frame formatter frame size constant in bytes. */
 
 /** @}*/
 
 /** @name Trace Decode Component Name Prefixes 
  *
  *  Set of standard prefixes to be used for component names
 @{*/
 
 /** Component name prefix for trace source reader components */
 #define OCSD_CMPNAME_PREFIX_SOURCE_READER "SRDR"
 /** Component name prefix for trace frame deformatter component */
 #define OCSD_CMPNAME_PREFIX_FRAMEDEFORMATTER "DFMT"
 /** Component name prefix for trace packet processor. */
 #define OCSD_CMPNAME_PREFIX_PKTPROC "PKTP"
 /** Component name prefix for trace packet decoder. */
 #define OCSD_CMPNAME_PREFIX_PKTDEC   "PDEC"
 
 /** @}*/
 
 /** @name Trace Decode Arch and Profile 
 @{*/
 
 /** Core Architecture Version */
 typedef enum _ocsd_arch_version {
-    ARCH_UNKNOWN,   /**< unknown architecture */
-    ARCH_CUSTOM,    /**< None ARM, custom architecture */
-    ARCH_V7,        /**< V7 architecture */
-    ARCH_V8,        /**< V8 architecture */
-    ARCH_V8r3,      /**< V8.3 architecture */
+    ARCH_UNKNOWN = 0x0000,   /**< unknown architecture */
+    ARCH_CUSTOM = 0x0001,    /**< None ARM, custom architecture */
+    ARCH_V7 = 0x0700,        /**< V7 architecture */
+    ARCH_V8 = 0x0800,        /**< V8 architecture */
+    ARCH_V8r3 = 0x0803,      /**< V8.3 architecture */
 } ocsd_arch_version_t;
 
 // macros for arch version comparisons.
 #define OCSD_IS_V8_ARCH(arch) ((arch >= ARCH_V8) && (arch <= ARCH_V8r3))
 #define OCSD_MIN_V8_ARCH(arch) (arch >= ARCH_V8)
 
 /** Core Profile  */
 typedef enum _ocsd_core_profile {
     profile_Unknown,    /**< Unknown profile */
     profile_CortexM,    /**< Cortex-M profile */
     profile_CortexR,    /**< Cortex-R profile */
     profile_CortexA,    /**< Cortex-A profile */
     profile_Custom,     /**< None ARM, custom arch profile */
 } ocsd_core_profile_t;
 
 /** Combined architecture and profile descriptor for a core */
 typedef struct _ocsd_arch_profile_t {
     ocsd_arch_version_t arch;      /**< core architecture */
     ocsd_core_profile_t profile;   /**< core profile */
 } ocsd_arch_profile_t;
 
 /* may want to use a 32 bit v-addr when running on 32 bit only ARM platforms. */
 #ifdef USE_32BIT_V_ADDR
 typedef uint32_t ocsd_vaddr_t;     /**< 32 bit virtual addressing in library - use if compiling on 32 bit platforms */
 #define OCSD_MAX_VA_BITSIZE 32     /**< 32 bit Virtual address bitsize macro */
 #define OCSD_VA_MASK ~0UL          /**< 32 bit Virtual address bitsize mask */
 #else
 typedef uint64_t ocsd_vaddr_t;     /**< 64 bit virtual addressing in library */
 #define OCSD_MAX_VA_BITSIZE 64     /**< 64 bit Virtual address bitsize macro */
 #define OCSD_VA_MASK ~0ULL         /**< 64 bit Virtual address bitsize mask */
 #endif
 
 /** A bit mask for the first 'bits' consecutive bits of an address */ 
 #define OCSD_BIT_MASK(bits) (bits == OCSD_MAX_VA_BITSIZE) ? OCSD_VA_MASK : ((ocsd_vaddr_t)1 << bits) - 1
 
 /** @}*/
 
 /** @name Instruction Decode Information
 @{*/
 
 /** Instruction Set Architecture type
  *
  */
 typedef enum _ocsd_isa
 {    
     ocsd_isa_arm,          /**< V7 ARM 32, V8 AArch32 */  
     ocsd_isa_thumb2,       /**< Thumb2 -> 16/32 bit instructions */  
     ocsd_isa_aarch64,      /**< V8 AArch64 */
     ocsd_isa_tee,          /**< Thumb EE - unsupported */  
     ocsd_isa_jazelle,      /**< Jazelle - unsupported in trace */  
     ocsd_isa_custom,       /**< Instruction set - custom arch decoder */
     ocsd_isa_unknown       /**< ISA not yet known */
 } ocsd_isa;
 
 /** Security level type
 */
 typedef enum _ocsd_sec_level
 {
     ocsd_sec_secure,   /**< Core is in secure state */
     ocsd_sec_nonsecure /**< Core is in non-secure state */
 } ocsd_sec_level ;
 
 /** Exception level type
 */
 typedef enum _ocsd_ex_level
 {
     ocsd_EL_unknown = -1, /**< EL unknown / unsupported in trace */
     ocsd_EL0 = 0,  /**< EL0 */
     ocsd_EL1,      /**< EL1 */
     ocsd_EL2,      /**< EL2 */
     ocsd_EL3,      /**< EL3 */
 } ocsd_ex_level;
 
 
 /** instruction types - significant for waypoint calculaitons */
 typedef enum _ocsd_instr_type {
     OCSD_INSTR_OTHER,          /**< Other instruction - not significant for waypoints. */
     OCSD_INSTR_BR,             /**< Immediate Branch instruction */
     OCSD_INSTR_BR_INDIRECT,    /**< Indirect Branch instruction */
     OCSD_INSTR_ISB,            /**< Barrier : ISB instruction */
     OCSD_INSTR_DSB_DMB,        /**< Barrier : DSB or DMB instruction */
     OCSD_INSTR_WFI_WFE,        /**< WFI or WFE traced as direct branch */
 } ocsd_instr_type;
 
 /** instruction sub types - addiitonal information passed to the output packets
     for trace analysis tools.
  */
 typedef enum _ocsd_instr_subtype {
     OCSD_S_INSTR_NONE,         /**< no subtype set */
     OCSD_S_INSTR_BR_LINK,      /**< branch with link */
     OCSD_S_INSTR_V8_RET,       /**< v8 ret instruction - subtype of BR_INDIRECT  */
     OCSD_S_INSTR_V8_ERET,      /**< v8 eret instruction - subtype of BR_INDIRECT */
     OCSD_S_INSTR_V7_IMPLIED_RET,  /**< v7 instruction which could imply return e.g. MOV PC, LR; POP { ,pc} */
 } ocsd_instr_subtype;
 
 /** Instruction decode request structure. 
  *
  *   Used in IInstrDecode  interface.
  *
  *   Caller fills in the input: information, callee then fills in the decoder: information.
  */
 typedef struct _ocsd_instr_info {
     /* input information */
     ocsd_arch_profile_t pe_type;   /**< input: Core Arch and profile */
     ocsd_isa isa;                  /**< Input: Current ISA. */
     ocsd_vaddr_t instr_addr;       /**< Input: Instruction address. */
     uint32_t opcode;                /**< Input: Opcode at address. 16 bit opcodes will use MS 16bits of parameter. */
     uint8_t dsb_dmb_waypoints;      /**< Input: DMB and DSB are waypoints */
     uint8_t wfi_wfe_branch;         /**< Input: WFI, WFE classed as direct branches */
 
     /* instruction decode info */
     ocsd_instr_type type;          /**< Decoder: Current instruction type. */
     ocsd_vaddr_t branch_addr;      /**< Decoder: Calculated address of branch instrcution (direct branches only) */
     ocsd_isa next_isa;             /**< Decoder: ISA for next intruction. */
     uint8_t instr_size;             /**< Decoder : size of the decoded instruction */
     uint8_t is_conditional;         /**< Decoder : set to 1 if this instruction is conditional */
     uint8_t is_link;                /**< Decoder : is a branch with link instruction */
     uint8_t thumb_it_conditions;    /**< Decoder : return number of following instructions set with conditions by this Thumb IT instruction */
     ocsd_instr_subtype sub_type;   /**< Decoder : current instruction sub-type if known */
 } ocsd_instr_info;
 
 
 /** Core(PE) context structure 
     records current security state, exception level, VMID and ContextID for core.
 */
 typedef struct _ocsd_pe_context {    
     ocsd_sec_level security_level;     /**< security state */
     ocsd_ex_level  exception_level;    /**< exception level */
     uint32_t        context_id;         /**< context ID */
     uint32_t        vmid;               /**< VMID */
     struct {
         uint32_t bits64:1;              /**< 1 if 64 bit operation */
         uint32_t ctxt_id_valid:1;       /**< 1 if context ID value valid */
         uint32_t vmid_valid:1;          /**< 1 if VMID value is valid */
         uint32_t el_valid:1;            /**< 1 if EL value is valid (ETMv4 traces EL, other protocols do not) */
     };
 } ocsd_pe_context;
 
 
 /** @}*/
 
 /** @name Opcode Memory Access
     Types used when accessing memory storage for traced opcodes..
 @{*/
 
 /** memory space bitfield enum for available security states and exception levels used 
    when accessing memory. */
 typedef enum _ocsd_mem_space_acc_t {
     OCSD_MEM_SPACE_EL1S = 0x1, /**<  S EL1/0 */
     OCSD_MEM_SPACE_EL1N = 0x2, /**< NS EL1/0 */
     OCSD_MEM_SPACE_EL2 =  0x4, /**< NS EL2   */
     OCSD_MEM_SPACE_EL3 =  0x8, /**<  S EL3   */
-    OCSD_MEM_SPACE_S =    0x9, /**< Any  S   */
+    OCSD_MEM_SPACE_EL2S = 0x10, /**< S EL2   */
+    OCSD_MEM_SPACE_S =    0x19, /**< Any  S  */
     OCSD_MEM_SPACE_N =    0x6, /**< Any NS   */
-    OCSD_MEM_SPACE_ANY =  0xF, /**< Any sec level / EL - live system use current EL + sec state */
+    OCSD_MEM_SPACE_ANY =  0x1F, /**< Any sec level / EL - live system use current EL + sec state */
 } ocsd_mem_space_acc_t;
 
 /**
  * Callback function definition for callback function memory accessor type.
  *
  * When using callback memory accessor, the decoder will call this function to obtain the 
  * memory at the address for the current opcodes. The memory space will represent the current 
  * exception level and security context of the traced code.
  *
  * Return the number of bytes read, which can be less than the amount requested if this would take the
  * access address outside the range of addresses defined when this callback was registered with the decoder.
  *
  * Return 0 bytes if start address out of covered range, or memory space is not one of those defined as supported
  * when the callback was registered.
  *
  * @param p_context : opaque context pointer set by callback client.
  * @param address : start address of memory to be accessed
  * @param mem_space : memory space of accessed memory (current EL & security state)
  * @param reqBytes : number of bytes required
  * @param *byteBuffer : buffer for data.
  *
  * @return uint32_t  : Number of bytes actually read, or 0 for access error.
  */
 typedef uint32_t (* Fn_MemAcc_CB)(const void *p_context, const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, const uint32_t reqBytes, uint8_t *byteBuffer);
 
 /**
 * Callback function definition for callback function memory accessor type.
 *
 * When using callback memory accessor, the decoder will call this function to obtain the
 * memory at the address for the current opcodes. The memory space will represent the current
 * exception level and security context of the traced code.
 *
 * Return the number of bytes read, which can be less than the amount requested if this would take the
 * access address outside the range of addresses defined when this callback was registered with the decoder.
 *
 * Return 0 bytes if start address out of covered range, or memory space is not one of those defined as supported
 * when the callback was registered.
 *
 * @param p_context : opaque context pointer set by callback client.
 * @param address : start address of memory to be accessed
 * @param mem_space : memory space of accessed memory (current EL & security state)
 * @param trcID : Trace ID for source of trace - allow CB to client to associate mem req with source cpu.
 * @param reqBytes : number of bytes required
 * @param *byteBuffer : buffer for data.
 *
 * @return uint32_t  : Number of bytes actually read, or 0 for access error.
 */
 typedef uint32_t (* Fn_MemAccID_CB)(const void *p_context, const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, const uint8_t trcID, const uint32_t reqBytes, uint8_t *byteBuffer);
 
 
 /** memory region type for adding multi-region binary files to memory access interface */
 typedef struct _ocsd_file_mem_region {
     size_t                  file_offset;    /**< Offset from start of file for memory region */
     ocsd_vaddr_t           start_address;  /**< Start address of memory region */
     size_t                  region_size;    /**< size in bytes of memory region */
 } ocsd_file_mem_region_t;
 
 /** @}*/
 
 /** @name Packet Processor Operation Control Flags
     common operational flags - bottom 16 bits,
-    component specific - top 16 bits.
+    protocol component specific - top 16 bits.
+    (common flags share bitfield with pkt decoder common flags and create flags)
 @{*/
 
-#define OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS  0x00000001  /**< don't forward bad packets up data path */
-#define OCSD_OPFLG_PKTPROC_NOMON_BAD_PKTS  0x00000002  /**< don't forward bad packets to monitor interface */
-#define OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS    0x00000004  /**< throw error for bad packets - halt decoding. */
-#define OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS 0x00000008  /**< switch to unsynced state on bad packets - wait for next sync point */
+#define OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS  0x00000010  /**< don't forward bad packets up data path */
+#define OCSD_OPFLG_PKTPROC_NOMON_BAD_PKTS  0x00000020  /**< don't forward bad packets to monitor interface */
+#define OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS    0x00000040  /**< throw error for bad packets - halt decoding. */
+#define OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS 0x00000080  /**< switch to unsynced state on bad packets - wait for next sync point */
 
 /** mask to combine all common packet processor operational control flags */
 #define OCSD_OPFLG_PKTPROC_COMMON (OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS | \
                                     OCSD_OPFLG_PKTPROC_NOMON_BAD_PKTS | \
                                     OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS | \
                                     OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS  )
 
+/** mask for the component spcific flags */
+#define OCSD_OPFLG_COMP_MODE_MASK 0xFFFF0000
+
 /** @}*/
 
 /** @name Packet Decoder Operation Control Flags
     common operational flags - bottom 16 bits,
-    component specific - top 16 bits.
-@{*/
+    protcol component specific - top 16 bits.
+    (common flags share bitfield with pkt processor common flags and create flags)
+    @{*/
 
-#define OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS  0x00000001  /**< throw error on bad packets input (default is to unsync and wait) */
+#define OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS  0x00000100  /**< throw error on bad packets input (default is to unsync and wait) */
 
 /** mask to combine all common packet processor operational control flags */
 #define OCSD_OPFLG_PKTDEC_COMMON (OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS)
 
 /** @}*/
 
 /** @name Decoder creation information
 
-    Flags to use when creating decoders by name
+    Flags to use when creating decoders by name.
+    - share bitfield with pkt processor flags and packet decoder common flags.
 
     Builtin decoder names.
 
     Protocol type enum.
 @{*/
 
 #define OCSD_CREATE_FLG_PACKET_PROC     0x01    /**< Create packet processor only.              */
 #define OCSD_CREATE_FLG_FULL_DECODER    0x02    /**< Create packet processor + decoder pair     */
 #define OCSD_CREATE_FLG_INST_ID         0x04    /**< Use instance ID in decoder instance name   */
 
 #define OCSD_BUILTIN_DCD_STM        "STM"       /**< STM decoder */
 #define OCSD_BUILTIN_DCD_ETMV3      "ETMV3"     /**< ETMv3 decoder */
 #define OCSD_BUILTIN_DCD_ETMV4I     "ETMV4I"    /**< ETMv4 instruction decoder */
 #define OCSD_BUILTIN_DCD_ETMV4D     "ETMV4D"    /**< ETMv4 data decoder */
 #define OCSD_BUILTIN_DCD_PTM        "PTM"       /**< PTM decoder */
 
 /*! Trace Protocol Builtin Types + extern
  */
 typedef enum _ocsd_trace_protocol_t {
     OCSD_PROTOCOL_UNKNOWN = 0, /**< Protocol unknown */
 
 /* Built in library decoders */
     OCSD_PROTOCOL_ETMV3,   /**< ETMV3 instruction and data trace protocol decoder. */
     OCSD_PROTOCOL_ETMV4I,  /**< ETMV4 instruction trace protocol decoder. */
     OCSD_PROTOCOL_ETMV4D,  /**< ETMV4 data trace protocol decoder. */
     OCSD_PROTOCOL_PTM,     /**< PTM program flow instruction trace protocol decoder. */
     OCSD_PROTOCOL_STM,     /**< STM system trace protocol decoder. */
 
 /* others to be added here */
     OCSD_PROTOCOL_BUILTIN_END,  /**< Invalid protocol - built-in protocol types end marker */
 
 /* Custom / external decoders */
     OCSD_PROTOCOL_CUSTOM_0 = 100,   /**< Values from this onwards are assigned to external registered decoders */
     OCSD_PROTOCOL_CUSTOM_1,
     OCSD_PROTOCOL_CUSTOM_2,
     OCSD_PROTOCOL_CUSTOM_3,
     OCSD_PROTOCOL_CUSTOM_4,
     OCSD_PROTOCOL_CUSTOM_5,
     OCSD_PROTOCOL_CUSTOM_6,
     OCSD_PROTOCOL_CUSTOM_7,
     OCSD_PROTOCOL_CUSTOM_8,
     OCSD_PROTOCOL_CUSTOM_9,
 
     OCSD_PROTOCOL_END      /**< Invalid protocol - protocol types end marker */
 } ocsd_trace_protocol_t;
 
 /** Test if protocol type is a library built-in decoder */
 #define OCSD_PROTOCOL_IS_BUILTIN(P) ((P > OCSD_PROTOCOL_UNKNOWN) && (P < OCSD_PROTOCOL_BUILTIN_END)) 
 
 /** Test if protocol type is a custom external registered decoder */
 #define OCSD_PROTOCOL_IS_CUSTOM(P)  ((P >= OCSD_PROTOCOL_CUSTOM_0) && (P < OCSD_PROTOCOL_END ))
 
 /** @}*/
 
 
 /** @name Software Trace Packets Info
 
     Contains the information for the generic software trace output packet.
 
     Software trace packet master and channel data.
     Payload info:  
         size - packet payload size in bits;
         marker - if this packet has a marker/flag
         timestamp - if this packet has a timestamp associated
         number of packets - packet processor can optionally correlate identically 
         sized packets on the same master / channel to be output as a single generic packet
         
     Payload output as separate LE buffer, of sufficient bytes to hold all the packets.
 @{*/
 
 typedef struct _ocsd_swt_info {
     uint16_t swt_master_id;
     uint16_t swt_channel_id;
     union {
         struct {
             uint32_t swt_payload_pkt_bitsize:8; /**< [bits 0:7 ] Packet size in bits of the payload packets */
             uint32_t swt_payload_num_packets:8; /**< [bits 8:15 ] number of consecutive packets of this type in the payload data */
             uint32_t swt_marker_packet:1;       /**< [bit 16 ] packet is marker / flag packet */ 
             uint32_t swt_has_timestamp:1;       /**< [bit 17 ] packet has timestamp. */
             uint32_t swt_marker_first:1;        /**< [bit 18 ] for multiple packet payloads, this indicates if any marker is on first or last packet */
             uint32_t swt_master_err:1;          /**< [bit 19 ] current master has error - payload is error code */
             uint32_t swt_global_err:1;          /**< [bit 20 ] global error - payload is error code - master and channel ID not valid */
             uint32_t swt_trigger_event:1;       /**< [bit 21 ] trigger event packet - payload is event number */
             uint32_t swt_frequency:1;           /**< [bit 22 ] frequency packet - payload is frequency */
             uint32_t swt_id_valid:1;            /**< [bit 23 ] master & channel ID has been set by input stream  */
         };
         uint32_t swt_flag_bits;
     };
 } ocsd_swt_info_t;
 
 /** mask for the swt_id_valid flag - need to retain between packets */
 #define SWT_ID_VALID_MASK (0x1 << 23)
 
 /** @}*/
 
 /** @}*/
 #endif // ARM_OCSD_IF_TYPES_H_INCLUDED
 
 /* End of File opencsd/ocsd_if_types.h */
Index: head/contrib/opencsd/decoder/include/opencsd/ocsd_if_version.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/ocsd_if_version.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/ocsd_if_version.h	(revision 362263)
@@ -1,65 +1,65 @@
 /*
  * \file       ocsd_if_version.h
  * \brief      OpenCSD : Library API versioning
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_OCSD_IF_VERSION_H_INCLUDED
 #define ARM_OCSD_IF_VERSION_H_INCLUDED
 
 #include <stdint.h>
 
 /** @addtogroup ocsd_interfaces
 @{*/
 
 /** @name Library Versioning
 @{*/
 #define OCSD_VER_MAJOR 0x0 /**< Library Major Version */
-#define OCSD_VER_MINOR 0xC /**< Library Minor Version */
-#define OCSD_VER_PATCH 0x0 /**< Library Patch Version */
+#define OCSD_VER_MINOR 0xE /**< Library Minor Version */
+#define OCSD_VER_PATCH 0x2 /**< Library Patch Version */
 
 /** Library version number - MMMMnnpp format.
     MMMM = major version, 
     nn = minor version, 
     pp = patch version
 */
 #define OCSD_VER_NUM ((OCSD_VER_MAJOR << 16) | (OCSD_VER_MINOR << 8) | OCSD_VER_PATCH) 
 
-#define OCSD_VER_STRING "0.12.0"    /**< Library Version string */
+#define OCSD_VER_STRING "0.14.2"    /**< Library Version string */
 #define OCSD_LIB_NAME "OpenCSD Library"  /**< Library name string */
 #define OCSD_LIB_SHORT_NAME "OCSD"    /**< Library Short name string */
 /** @}*/
 
 /** @}*/
 
 #endif // ARM_OCSD_IF_VERSION_H_INCLUDED
 
 /* End of File ocsd_if_version.h */
Index: head/contrib/opencsd/decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h	(revision 362263)
@@ -1,197 +1,198 @@
 /*
  * \file       trc_pkt_decode_ptm.h
  * \brief      OpenCSD : PTM packet decoder.
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #ifndef ARM_TRC_PKT_DECODE_PTM_H_INCLUDED
 #define ARM_TRC_PKT_DECODE_PTM_H_INCLUDED
 
 #include "common/trc_pkt_decode_base.h"
 #include "opencsd/ptm/trc_pkt_elem_ptm.h"
 #include "opencsd/ptm/trc_cmp_cfg_ptm.h"
 #include "common/trc_gen_elem.h"
 #include "common/trc_ret_stack.h"
 
 /**************** Atom handling class **************************************/
 class PtmAtoms
 {
 public:
     PtmAtoms() {};
     ~PtmAtoms() {};
 
     //! initialise the atom and index values
     void initAtomPkt(const ocsd_pkt_atom &atom, const ocsd_trc_index_t &root_index);
     
     const ocsd_atm_val getCurrAtomVal() const;
     const int numAtoms() const; //!< number of atoms
     const ocsd_trc_index_t pktIndex() const; //!< originating packet index
 
     void clearAtom();   //!<  clear the current atom, set the next.
     void clearAll(); //!< clear all
 
 private:
     ocsd_pkt_atom m_atom;
     ocsd_trc_index_t m_root_index; //!< root index for the atom packet
 };
 
 inline void PtmAtoms::initAtomPkt(const ocsd_pkt_atom &atom, const ocsd_trc_index_t &root_index)
 {
     m_atom = atom;
     m_root_index = root_index;
 }
     
 inline const ocsd_atm_val PtmAtoms::getCurrAtomVal() const
 {
     return (m_atom.En_bits & 0x1) ?  ATOM_E : ATOM_N;
 }
 
 inline const int PtmAtoms::numAtoms() const
 {
     return m_atom.num;
 }
 
 inline const ocsd_trc_index_t PtmAtoms::pktIndex() const
 {
     return m_root_index;
 }
 
 inline void PtmAtoms::clearAtom()
 {
     if(m_atom.num)
     {
         m_atom.num--;
         m_atom.En_bits >>=1;
     }
 }
 
 inline void PtmAtoms::clearAll()
 {
     m_atom.num = 0;
 }
 
 /********** Main decode class ****************************************************/
 class TrcPktDecodePtm : public TrcPktDecodeBase<PtmTrcPacket, PtmConfig>
 {
 public:
     TrcPktDecodePtm();
     TrcPktDecodePtm(int instIDNum);
     virtual ~TrcPktDecodePtm();
 
 protected:
     /* implementation packet decoding interface */
     virtual ocsd_datapath_resp_t processPacket();
     virtual ocsd_datapath_resp_t onEOT();
     virtual ocsd_datapath_resp_t onReset();
     virtual ocsd_datapath_resp_t onFlush();
     virtual ocsd_err_t onProtocolConfig();
     virtual const uint8_t getCoreSightTraceID() { return m_CSID; };
 
     /* local decode methods */
 
 private:
     /** operation for the trace instruction follower */
     typedef enum {
         TRACE_WAYPOINT,     //!< standard operation - trace to waypoint - default op 
         TRACE_TO_ADDR_EXCL, //!< trace to supplied address - address is 1st instuction not executed.
         TRACE_TO_ADDR_INCL  //!< trace to supplied address - address is last instruction executed.
     } waypoint_trace_t;
 
     void initDecoder();
     void resetDecoder();
 
     ocsd_datapath_resp_t decodePacket();
     ocsd_datapath_resp_t contProcess(); 
     ocsd_datapath_resp_t processIsync();
     ocsd_datapath_resp_t processBranch();
     ocsd_datapath_resp_t processWPUpdate();
     ocsd_datapath_resp_t processAtom();
     ocsd_err_t traceInstrToWP(bool &bWPFound, const waypoint_trace_t traceWPOp = TRACE_WAYPOINT, const ocsd_vaddr_t nextAddrMatch = 0);      //!< follow instructions from the current address to a WP. true if good, false if memory cannot be accessed.
     ocsd_datapath_resp_t processAtomRange(const ocsd_atm_val A, const char *pkt_msg, const waypoint_trace_t traceWPOp = TRACE_WAYPOINT, const ocsd_vaddr_t nextAddrMatch = 0);
     void checkPendingNacc(ocsd_datapath_resp_t &resp);
 
     uint8_t m_CSID; //!< Coresight trace ID for this decoder.
 
 //** Other processor state;
 
     // trace decode FSM
     typedef enum {
         NO_SYNC,        //!< pre start trace - init state or after reset or overflow, loss of sync.
         WAIT_SYNC,      //!< waiting for sync packet.
         WAIT_ISYNC,     //!< waiting for isync packet after 1st ASYNC.
         DECODE_PKTS,    //!< processing input packet
         CONT_ISYNC,     //!< continue processing isync packet after WAIT. 
         CONT_ATOM,      //!< continue processing atom packet after WAIT.
         CONT_WPUP,      //!< continue processing WP update packet after WAIT.
         CONT_BRANCH,    //!< continue processing Branch packet after WAIT.
     } processor_state_t;
 
     processor_state_t m_curr_state;
+    unsync_info_t m_unsync_info;
 
     const bool processStateIsCont() const;
 
     // PE decode state - address and isa
 
     //! Structure to contain the PE addr and ISA state.
     typedef struct _ptm_pe_addr_state {
             ocsd_isa isa;              //!< current isa.
             ocsd_vaddr_t instr_addr;   //!< current address.
             bool valid;     //!< address valid - false if we need an address to continue decode.
     } ptm_pe_addr_state;
 
     ptm_pe_addr_state m_curr_pe_state;  //!< current instruction state for PTM decode.
     ocsd_pe_context m_pe_context;      //!< current context information
 
     // packet decode state
     bool m_need_isync;   //!< need context to continue
     
     ocsd_instr_info m_instr_info;  //!< instruction info for code follower - in address is the next to be decoded.
 
     bool m_mem_nacc_pending;    //!< need to output a memory access failure packet
     ocsd_vaddr_t m_nacc_addr;  //!< address of memory access failure
    
     bool m_i_sync_pe_ctxt;  //!< isync has pe context.
 
     PtmAtoms m_atoms;           //!< atoms to process in an atom packet
 
     TrcAddrReturnStack m_return_stack;  //!< trace return stack.
     
 //** output element
     OcsdTraceElement m_output_elem;
 };
 
 inline const bool TrcPktDecodePtm::processStateIsCont() const
 {
     return (bool)(m_curr_state >= CONT_ISYNC);
 }
 
 #endif // ARM_TRC_PKT_DECODE_PTM_H_INCLUDED
 
 /* End of File trc_pkt_decode_ptm.h */
Index: head/contrib/opencsd/decoder/include/opencsd/stm/trc_pkt_decode_stm.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/stm/trc_pkt_decode_stm.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/stm/trc_pkt_decode_stm.h	(revision 362263)
@@ -1,103 +1,104 @@
 /*
  * \file       trc_pkt_decode_stm.h
  * \brief      OpenCSD : STM packet decoder 
  *
  *  Convert the incoming indidvidual STM packets to 
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 
 #ifndef ARM_TRC_PKT_DECODE_STM_H_INCLUDED
 #define ARM_TRC_PKT_DECODE_STM_H_INCLUDED
 
 
 #include "common/trc_pkt_decode_base.h"
 #include "opencsd/stm/trc_pkt_elem_stm.h"
 #include "opencsd/stm/trc_cmp_cfg_stm.h"
 #include "common/trc_gen_elem.h"
 
 class TrcPktDecodeStm : public TrcPktDecodeBase<StmTrcPacket, STMConfig>
 {
 public:
     TrcPktDecodeStm();
     TrcPktDecodeStm(int instIDNum);
     virtual ~TrcPktDecodeStm();
     
 protected:
     /* implementation packet decoding interface */
     virtual ocsd_datapath_resp_t processPacket();
     virtual ocsd_datapath_resp_t onEOT();
     virtual ocsd_datapath_resp_t onReset();
     virtual ocsd_datapath_resp_t onFlush();
     virtual ocsd_err_t onProtocolConfig();
     virtual const uint8_t getCoreSightTraceID() { return m_CSID; };
 
     /* local decode methods */
 
 private:
     void initDecoder();
     void resetDecoder();
     void initPayloadBuffer();
     bool isInit() { return (bool)((m_config != 0) && (m_payload_buffer != 0)); };
     ocsd_datapath_resp_t decodePacket(bool &bPktDone);  //!< decode the current incoming packet
     void clearSWTPerPcktInfo();
     void updatePayload(bool &bSendPacket);
 
     typedef enum {
         NO_SYNC,        //!< pre start trace - init state or after reset or overflow, loss of sync.
         WAIT_SYNC,      //!< waiting for sync packet.
         DECODE_PKTS     //!< processing input packet.  
     } processor_state_t;
 
     processor_state_t m_curr_state;  
+    unsync_info_t m_unsync_info;
 
     ocsd_swt_info_t m_swt_packet_info;
 
     uint8_t *m_payload_buffer;  //!< payload buffer - allocated for one or multiple packets according to config
     int m_payload_size;         //!< payload buffer total size in bytes.
     int m_payload_used;         //!< payload buffer used in bytes - current payload size.
     bool m_payload_odd_nibble;  //!< last used byte in payload contains a single 4 bit packet.
     int m_num_pkt_correlation;  //!< number of identical payload packets to buffer up before output. - fixed at 1 till later update
 
     uint8_t m_CSID;             //!< Coresight trace ID for this decoder.
 
     bool m_decode_pass1;        //!< flag to indicate 1st pass of packet decode.
 
 
 
 //** output element
     OcsdTraceElement m_output_elem; //!< output packet
 };
 
 #endif // ARM_TRC_PKT_DECODE_STM_H_INCLUDED
 
 /* End of File trc_pkt_decode_stm.h */
Index: head/contrib/opencsd/decoder/include/opencsd/trc_gen_elem_types.h
===================================================================
--- head/contrib/opencsd/decoder/include/opencsd/trc_gen_elem_types.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/opencsd/trc_gen_elem_types.h	(revision 362263)
@@ -1,130 +1,142 @@
 /*!
  * \file       opencsd/trc_gen_elem_types.h
  * \brief      OpenCSD : Decoder Output Generic Element types.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_TRC_GEN_ELEM_TYPES_H_INCLUDED
 #define ARM_TRC_GEN_ELEM_TYPES_H_INCLUDED
 
 /** @defgroup gen_trc_elem  OpenCSD Library : Generic Trace Elements
   * @brief Generic trace elements output by the PE trace decode and SW stim decode stages.
   *
   * 
 @{*/
 
 #include "opencsd/ocsd_if_types.h"
 
 /**  Enum for generic element types */
 typedef enum _ocsd_gen_trc_elem_t 
 {  
     OCSD_GEN_TRC_ELEM_UNKNOWN = 0,     /*!< Unknown trace element - default value or indicate error in stream to client */
     OCSD_GEN_TRC_ELEM_NO_SYNC,         /*!< Waiting for sync - either at start of decode, or after overflow / bad packet */
     OCSD_GEN_TRC_ELEM_TRACE_ON,        /*!< Start of trace - beginning of elements or restart after discontinuity (overflow, trace filtering). */
     OCSD_GEN_TRC_ELEM_EO_TRACE,        /*!< end of the available trace in the buffer.  */
     OCSD_GEN_TRC_ELEM_PE_CONTEXT,      /*!< PE status update / change (arch, ctxtid, vmid etc).  */
     OCSD_GEN_TRC_ELEM_INSTR_RANGE,     /*!< traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key  */
+    OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH,  /*!< traced N instructions in a range, but incomplete information as to program execution path from start to end of range */
     OCSD_GEN_TRC_ELEM_ADDR_NACC,       /*!< tracing in inaccessible memory area  */ 
     OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN,    /*!< address currently unknown - need address packet update */
     OCSD_GEN_TRC_ELEM_EXCEPTION,       /*!< exception - start address may be exception target, end address may be preferred ret addr. */
     OCSD_GEN_TRC_ELEM_EXCEPTION_RET,   /*!< expection return */
     OCSD_GEN_TRC_ELEM_TIMESTAMP,       /*!< Timestamp - preceding elements happeded before this time. */
     OCSD_GEN_TRC_ELEM_CYCLE_COUNT,     /*!< Cycle count - cycles since last cycle count value - associated with a preceding instruction range. */
     OCSD_GEN_TRC_ELEM_EVENT,           /*!< Event - trigger or numbered event  */   
     OCSD_GEN_TRC_ELEM_SWTRACE,         /*!< Software trace packet - may contain data payload. */
     OCSD_GEN_TRC_ELEM_CUSTOM,          /*!< Fully custom packet type - used by none-ARM architecture decoders */
 } ocsd_gen_trc_elem_t;
 
 
 typedef enum _trace_on_reason_t {
     TRACE_ON_NORMAL = 0,    /**< Trace on at start of trace or filtering discontinuity */
     TRACE_ON_OVERFLOW,      /**< Trace on due to prior trace overflow discontinuity */
     TRACE_ON_EX_DEBUG,      /**< Trace restarted due to debug exit */
 } trace_on_reason_t;
 
 typedef struct _trace_event_t {
     uint16_t ev_type;          /**< event type - unknown (0) trigger (1), numbered event (2)*/
     uint16_t ev_number;        /**< event number if numbered event type */
 } trace_event_t;
 
+typedef enum _unsync_info_t {
+    UNSYNC_UNKNOWN,         /**< unknown /undefined */
+    UNSYNC_INIT_DECODER,    /**< decoder intialisation - start of trace. */
+    UNSYNC_RESET_DECODER,   /**< decoder reset. */
+    UNSYNC_OVERFLOW,        /**< overflow packet - need to re-sync / end of trace after overflow. */
+    UNSYNC_DISCARD,         /**< specl trace discard - need to re-sync. */
+    UNSYNC_BAD_PACKET,      /**< bad packet at input - resync to restart. */
+    UNSYNC_EOT,             /**< end of trace - no additional info */
+} unsync_info_t;
+
 typedef struct _ocsd_generic_trace_elem {
     ocsd_gen_trc_elem_t elem_type;   /**< Element type - remaining data interpreted according to this value */
     ocsd_isa           isa;          /**< instruction set for executed instructions */
     ocsd_vaddr_t       st_addr;      /**< start address for instruction execution range / inaccessible code address / data address */
     ocsd_vaddr_t       en_addr;        /**< end address (exclusive) for instruction execution range. */
     ocsd_pe_context    context;        /**< PE Context */
     uint64_t           timestamp;      /**< timestamp value for TS element type */
     uint32_t           cycle_count;    /**< cycle count for explicit cycle count element, or count for element with associated cycle count */
     ocsd_instr_type    last_i_type;    /**< Last instruction type if instruction execution range */
     ocsd_instr_subtype last_i_subtype; /**< sub type for last instruction in range */
  
     //! per element flags
     union {
         struct {
             uint32_t last_instr_exec:1;     /**< 1 if last instruction in range was executed; */
             uint32_t last_instr_sz:3;       /**< size of last instruction in bytes (2/4) */
             uint32_t has_cc:1;              /**< 1 if this packet has a valid cycle count included (e.g. cycle count included as part of instruction range packet, always 1 for pure cycle count packet.*/
             uint32_t cpu_freq_change:1;     /**< 1 if this packet indicates a change in CPU frequency */
             uint32_t excep_ret_addr:1;      /**< 1 if en_addr is the preferred exception return address on exception packet type */
             uint32_t excep_data_marker:1;   /**< 1 if the exception entry packet is a data push marker only, with no address information (used typically in v7M trace for marking data pushed onto stack) */
             uint32_t extended_data:1;       /**< 1 if the packet extended data pointer is valid. Allows packet extensions for custom decoders, or additional data payloads for data trace.  */
             uint32_t has_ts:1;              /**< 1 if the packet has an associated timestamp - e.g. SW/STM trace TS+Payload as a single packet */
             uint32_t last_instr_cond:1;     /**< 1 if the last instruction was conditional */
             uint32_t excep_ret_addr_br_tgt:1;   /**< 1 if exception return address (en_addr) is also the target of a taken branch addr from the previous range. */
         };
         uint32_t flag_bits;
     };
 
     //! packet specific payloads
     union {  
         uint32_t exception_number;          /**< exception number for exception type packets */
         trace_event_t  trace_event;         /**< Trace event - trigger etc      */
         trace_on_reason_t trace_on_reason;  /**< reason for the trace on packet */
         ocsd_swt_info_t sw_trace_info;      /**< software trace packet info    */
 		uint32_t num_instr_range;	        /**< number of instructions covered by range packet (for T32 this cannot be calculated from en-st/i_size) */
+        unsync_info_t unsync_eot_info;      /**< additional information for unsync / end-of-trace packets. */
     };
 
     const void *ptr_extended_data;        /**< pointer to extended data buffer (data trace, sw trace payload) / custom structure */
 
 } ocsd_generic_trace_elem;
 
 
 typedef enum _event_t {
     EVENT_UNKNOWN = 0,
     EVENT_TRIGGER,
     EVENT_NUMBERED
 } event_t;
 
 
 /** @}*/
 #endif // ARM_TRC_GEN_ELEM_TYPES_H_INCLUDED
 
 /* End of File opencsd/trc_gen_elem_types.h */
Index: head/contrib/opencsd/decoder/include/pkt_printers/pkt_printer_t.h
===================================================================
--- head/contrib/opencsd/decoder/include/pkt_printers/pkt_printer_t.h	(revision 362262)
+++ head/contrib/opencsd/decoder/include/pkt_printers/pkt_printer_t.h	(revision 362263)
@@ -1,189 +1,189 @@
 /*
  * \file       pkt_printer_t.h
  * \brief      OpenCSD : Test packet printer.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #ifndef ARM_PKT_PRINTER_T_H_INCLUDED
 #define ARM_PKT_PRINTER_T_H_INCLUDED
 
 #include "opencsd.h"
 
 #include <string>
 #include <sstream>
 //#include <iostream>
 #include <iomanip>
 
 template<class P>
 class PacketPrinter : public IPktDataIn<P>, public IPktRawDataMon<P>, public ItemPrinter
 {
 public:
     PacketPrinter(const uint8_t trcID);
     PacketPrinter(const uint8_t trcID, ocsdMsgLogger *pMsgLogger);
     virtual ~PacketPrinter();
 
 
     virtual ocsd_datapath_resp_t PacketDataIn( const ocsd_datapath_op_t op,
                                         const ocsd_trc_index_t index_sop,                                        
                                         const P *p_packet_in);
 
     virtual void RawPacketDataMon( const ocsd_datapath_op_t op,
                                    const ocsd_trc_index_t index_sop,
                                    const P *pkt,
                                    const uint32_t size,
                                    const uint8_t *p_data);
 
 
 private:
     void printIdx_ID(const ocsd_trc_index_t index_sop);
 
     uint8_t m_trcID;
     bool m_bRawPrint;
     std::ostringstream m_oss;
     ocsd_datapath_resp_t m_last_resp;
 
 };
 
 template<class P> PacketPrinter<P>::PacketPrinter(uint8_t trcID) : 
     m_trcID(trcID),
     m_bRawPrint(false),
     m_last_resp(OCSD_RESP_CONT)
 {
 }
 
 template<class P> PacketPrinter<P>::PacketPrinter(const uint8_t trcID, ocsdMsgLogger *pMsgLogger) :
     m_trcID(trcID),
     m_bRawPrint(false),
     m_last_resp(OCSD_RESP_CONT)
 {
     setMessageLogger(pMsgLogger);
 }
 
 template<class P> PacketPrinter<P>::~PacketPrinter()
 {
 }
 
 template<class P> ocsd_datapath_resp_t PacketPrinter<P>::PacketDataIn( const ocsd_datapath_op_t op,
                                         const ocsd_trc_index_t index_sop,
                                         const P *p_packet_in)
 {
     std::string pktstr;
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     
     // wait / flush test verification
     if(!m_bRawPrint && (m_last_resp == OCSD_RESP_WAIT))
     {
         // expect a flush or a complete reset after a wait.
-        if((op != OCSD_OP_FLUSH) || (op != OCSD_OP_RESET))
+        if((op != OCSD_OP_FLUSH) && (op != OCSD_OP_RESET))
         {
             m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tERROR: FLUSH operation expected after wait on trace decode path\n";
             itemPrintLine(m_oss.str());
             m_oss.str("");
             return OCSD_RESP_FATAL_INVALID_OP;
         }
     }
 
     switch(op)
     {
     case OCSD_OP_DATA:
         p_packet_in->toString(pktstr);
         if(!m_bRawPrint)
             printIdx_ID(index_sop);
         m_oss << ";\t" << pktstr << std::endl;
 
         // test the wait/flush response mechnism
         if(getTestWaits() && !m_bRawPrint)
         {
             decTestWaits();
             resp = OCSD_RESP_WAIT;
         }
         break;
 
     case OCSD_OP_EOT:
         m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tEND OF TRACE DATA\n";
         break;
 
     case OCSD_OP_FLUSH:
         m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tFLUSH operation on trace decode path\n";
         break;
 
     case OCSD_OP_RESET:
         m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tRESET operation on trace decode path\n";
         break;
     }
 
     m_last_resp = resp;
     itemPrintLine(m_oss.str());
     m_oss.str("");    
     return resp;
 }
 
 template<class P> void PacketPrinter<P>::RawPacketDataMon( const ocsd_datapath_op_t op,
                                    const ocsd_trc_index_t index_sop,
                                    const P *pkt,
                                    const uint32_t size,
                                    const uint8_t *p_data)
 {
     switch(op)
     {
     case OCSD_OP_DATA:
         printIdx_ID(index_sop);
         m_oss << "; [";
         if((size > 0) && (p_data != 0))
         {
             uint32_t data = 0;
             for(uint32_t i = 0; i < size; i++)
             {
                 data = (uint32_t)(p_data[i] & 0xFF); 
                 m_oss << "0x" << std::hex << std::setw(2) << std::setfill('0') << data << " ";
             }
         }
         m_oss << "]";
         m_bRawPrint = true;
         PacketDataIn(op,index_sop,pkt);
         m_bRawPrint = false;
         break;
 
     default:
         PacketDataIn(op,index_sop,pkt);
         break;
     }
 
 }
 
 template<class P> void PacketPrinter<P>::printIdx_ID(const ocsd_trc_index_t index_sop)
 {
     m_oss << "Idx:" << std::dec << index_sop << "; ID:"<< std::hex << (uint32_t)m_trcID;
 }
 
 #endif // ARM_PKT_PRINTER_T_H_INCLUDED
 
 /* End of File pkt_printer_t.h */
Index: head/contrib/opencsd/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp	(revision 362263)
@@ -1,671 +1,681 @@
 /*!
  * \file       trc_pkt_decode_etmv3.cpp
  * \brief      OpenCSD : ETMv3 trace packet decode.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "opencsd/etmv3/trc_pkt_decode_etmv3.h"
 
 #define DCD_NAME "DCD_ETMV3"
 
 TrcPktDecodeEtmV3::TrcPktDecodeEtmV3() : 
     TrcPktDecodeBase(DCD_NAME)
 {
     initDecoder();
 }
 
 TrcPktDecodeEtmV3::TrcPktDecodeEtmV3(int instIDNum) :
     TrcPktDecodeBase(DCD_NAME, instIDNum)
 {
     initDecoder();
 }
 
 TrcPktDecodeEtmV3::~TrcPktDecodeEtmV3()
 {
 }
 
 
 /* implementation packet decoding interface */
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::processPacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bPktDone = false;
 
     if(!m_config)
         return OCSD_RESP_FATAL_NOT_INIT;
 
     // iterate round the state machine, waiting for sync, then decoding packets.
     while(!bPktDone)
     {
         switch(m_curr_state)
         {
         case NO_SYNC:
             // output the initial not synced packet to the sink
             resp = sendUnsyncPacket();  
             m_curr_state = WAIT_ASYNC;  // immediate wait for ASync and actually check out the packet
             break;
 
         case WAIT_ASYNC:
             // if async, wait for ISync, but this packet done.
             if(m_curr_packet_in->getType() == ETM3_PKT_A_SYNC)
                 m_curr_state = WAIT_ISYNC;
             bPktDone = true;
             break;
 
         case WAIT_ISYNC:
             m_bWaitISync = true;    // we are waiting for ISync
             if((m_curr_packet_in->getType() == ETM3_PKT_I_SYNC) || 
                 (m_curr_packet_in->getType() == ETM3_PKT_I_SYNC_CYCLE))
             {
                 // process the ISync immediately as the first ISync seen.
                 resp = processISync((m_curr_packet_in->getType() == ETM3_PKT_I_SYNC_CYCLE),true);
                 m_curr_state = SEND_PKTS;
                 m_bWaitISync = false;
             }
             // something like TS, CC, PHDR+CC, which after ASYNC may be valid prior to ISync
             else if(preISyncValid(m_curr_packet_in->getType()))
             {
                 // decode anything that might be valid - send will be set automatically 
                 resp = decodePacket(bPktDone);
             }
             else
                 bPktDone = true; 
             break;
 
         case DECODE_PKTS:
             resp = decodePacket(bPktDone);
             break;
 
         case SEND_PKTS:
             resp = m_outputElemList.sendElements();
             if(OCSD_DATA_RESP_IS_CONT(resp))
                 m_curr_state = m_bWaitISync ? WAIT_ISYNC : DECODE_PKTS;
             bPktDone = true;
             break;  
 
         default:
             bPktDone = true;
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_index_curr_pkt,"Unknown Decoder State"));
             resetDecoder(); // mark decoder as unsynced - dump any current state.
             resp = OCSD_RESP_FATAL_SYS_ERR;
             break;
         }
     }
 
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::onEOT()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     OcsdTraceElement *pElem = 0;
     try {
         pElem = GetNextOpElem(resp);
         pElem->setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
+        pElem->setUnSyncEOTReason(UNSYNC_EOT);
         m_outputElemList.commitAllPendElem();
         m_curr_state = SEND_PKTS;
         resp = m_outputElemList.sendElements();
         if(OCSD_DATA_RESP_IS_CONT(resp))
             m_curr_state = DECODE_PKTS;
     }
     catch(ocsdError &err)
     {
         LogError(err);
         resetDecoder(); // mark decoder as unsynced - dump any current state.
     }    
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::onReset()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    m_unsync_info = UNSYNC_RESET_DECODER;
     resetDecoder();
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::onFlush()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     if(m_curr_state == SEND_PKTS)
     {
         resp = m_outputElemList.sendElements();
         if(OCSD_DATA_RESP_IS_CONT(resp))
             m_curr_state = m_bWaitISync ? WAIT_ISYNC : DECODE_PKTS;
     }
     return resp;
 }
 
 ocsd_err_t TrcPktDecodeEtmV3::onProtocolConfig()
 {
     ocsd_err_t err = OCSD_OK;
     if(m_config)
     {
         // set some static config elements
         m_CSID = m_config->getTraceID();
 
         // check config compatible with current decoder support level.
         // at present no data trace;
         if(m_config->GetTraceMode() != EtmV3Config::TM_INSTR_ONLY)
         {
             err = OCSD_ERR_HW_CFG_UNSUPP;
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv3 trace decoder : data trace decode not yet supported"));
         }
 
         // need to set up core profile info in follower
         ocsd_arch_profile_t arch_profile;
         arch_profile.arch = m_config->getArchVersion();
         arch_profile.profile = m_config->getCoreProfile();
         m_code_follower.setArchProfile(arch_profile);
         m_code_follower.setMemSpaceCSID(m_CSID);
         m_outputElemList.initCSID(m_CSID);
     }
     else
         err = OCSD_ERR_NOT_INIT;
     return err;
 }
 
 /* local decode methods */
 
 // initialise on creation
 void TrcPktDecodeEtmV3::initDecoder()
 {
     m_CSID = 0;
     resetDecoder();
+    m_unsync_info = UNSYNC_INIT_DECODER;
     m_code_follower.initInterfaces(getMemoryAccessAttachPt(),getInstrDecodeAttachPt());
     m_outputElemList.initSendIf(getTraceElemOutAttachPt());
 }
 
 // reset for first use / re-use.
 void TrcPktDecodeEtmV3::resetDecoder()
 {
     m_curr_state = NO_SYNC; // mark as not synced
     m_bNeedAddr = true;
     m_bSentUnknown = false;
     m_bWaitISync = false;
     m_outputElemList.reset();
 }
 
 OcsdTraceElement *TrcPktDecodeEtmV3::GetNextOpElem(ocsd_datapath_resp_t &resp)
 {
     OcsdTraceElement *pElem = m_outputElemList.getNextElem(m_index_curr_pkt);
     if(pElem == 0)
     {
         resp = OCSD_RESP_FATAL_NOT_INIT;
         throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_MEM,m_index_curr_pkt,m_CSID,"Memory Allocation Error - fatal");
     }
     return pElem;
 }
 
 bool TrcPktDecodeEtmV3::preISyncValid(ocsd_etmv3_pkt_type pkt_type)
 {
     bool bValid = false;
     // its a timestamp
     if((pkt_type == ETM3_PKT_TIMESTAMP) || 
         // or we are cycleacc and its a packet that can have CC in it
         (m_config->isCycleAcc() && ((pkt_type == ETM3_PKT_CYCLE_COUNT) || (pkt_type == ETM3_PKT_P_HDR)))
         )
         bValid = true;
     return bValid;
 }
 
 // simple packet transforms handled here, more complex processing passed on to specific routines.
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::decodePacket(bool &pktDone)
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bISyncHasCC = false;
     OcsdTraceElement *pElem = 0;
     pktDone = false;
 
     // there may be pended packets that can now be committed.
     // only the branch address with exception and cancel element can cancel
     // if not one of those, commit immediately, otherwise defer to branch address handler.
     if(m_curr_packet_in->getType() != ETM3_PKT_BRANCH_ADDRESS)
         m_outputElemList.commitAllPendElem();
 
     try {
 
         switch(m_curr_packet_in->getType())
         {
 
         case ETM3_PKT_NOTSYNC:
             // mark as not synced - must have lost sync in the packet processor somehow
             throw ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ,m_index_curr_pkt,m_CSID,"Trace Packet Synchronisation Lost");
             break;
 
             // no action for these packets - ignore and continue
         case ETM3_PKT_INCOMPLETE_EOT:
         case ETM3_PKT_A_SYNC:
         case ETM3_PKT_IGNORE:
             break;
 
     // markers for valid packets
         case ETM3_PKT_CYCLE_COUNT:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
             pElem->setCycleCount(m_curr_packet_in->getCycleCount());
             break;
 
         case ETM3_PKT_TRIGGER:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_EVENT);
             pElem->setEvent(EVENT_TRIGGER,0);
             break;
 
         case ETM3_PKT_BRANCH_ADDRESS:
             resp = processBranchAddr();
             break;
 
         case ETM3_PKT_I_SYNC_CYCLE:
             bISyncHasCC = true;
         case ETM3_PKT_I_SYNC:
             resp = processISync(bISyncHasCC);
             break;
 
         case ETM3_PKT_P_HDR:
             resp = processPHdr();
             break;
 
         case ETM3_PKT_CONTEXT_ID:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
             m_PeContext.setCtxtID(m_curr_packet_in->getCtxtID());
             pElem->setContext(m_PeContext);
             break;
 
         case ETM3_PKT_VMID:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
             m_PeContext.setVMID(m_curr_packet_in->getVMID());
             pElem->setContext(m_PeContext);
             break;
 
         case ETM3_PKT_EXCEPTION_ENTRY:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_EXCEPTION);
             pElem->setExcepMarker(); // exception entries are always v7M data markers in ETMv3 trace.
             break;
 
         case ETM3_PKT_EXCEPTION_EXIT:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_EXCEPTION_RET);
             pendExceptionReturn();
             break;
         
         case ETM3_PKT_TIMESTAMP:
             pElem = GetNextOpElem(resp);
             pElem->setType(OCSD_GEN_TRC_ELEM_TIMESTAMP);
             pElem->setTS(m_curr_packet_in->getTS());
             break;
 
             // data packets - data trace not supported at present
         case ETM3_PKT_STORE_FAIL:
         case ETM3_PKT_OOO_DATA:
         case ETM3_PKT_OOO_ADDR_PLC:
         case ETM3_PKT_NORM_DATA:
         case ETM3_PKT_DATA_SUPPRESSED:
         case ETM3_PKT_VAL_NOT_TRACED:
         case ETM3_PKT_BAD_TRACEMODE:
             resp = OCSD_RESP_FATAL_INVALID_DATA;        
             throw ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,m_index_curr_pkt,m_CSID,"Invalid packet type : Data Tracing decode not supported.");
             break;
 
     // packet errors 
         case ETM3_PKT_BAD_SEQUENCE:
             resp = OCSD_RESP_FATAL_INVALID_DATA;
             throw ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ,m_index_curr_pkt,m_CSID,"Bad Packet sequence.");
             break;
 
         default:
         case ETM3_PKT_RESERVED:
             resp = OCSD_RESP_FATAL_INVALID_DATA;
             throw ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ,m_index_curr_pkt,m_CSID,"Reserved or unknown packet ID.");
             break;
         }    
         m_curr_state = m_outputElemList.elemToSend() ? SEND_PKTS : DECODE_PKTS;
         pktDone = !m_outputElemList.elemToSend();
     }
     catch(ocsdError &err)
     {
         LogError(err);
+        m_unsync_info = UNSYNC_BAD_PACKET;
         resetDecoder(); // mark decoder as unsynced - dump any current state.
         pktDone = true;
     }
     catch(...)
     {
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_index_curr_pkt,m_CSID,"Bad Packet sequence."));
         resp = OCSD_RESP_FATAL_SYS_ERR;
+        m_unsync_info = UNSYNC_BAD_PACKET;
         resetDecoder(); // mark decoder as unsynced - dump any current state.
         pktDone = true;
     }
     return resp;
 }
    
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::sendUnsyncPacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     OcsdTraceElement *pElem = 0;
     try {
         pElem = GetNextOpElem(resp);
         pElem->setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
+        pElem->setUnSyncEOTReason(m_unsync_info);
         resp = m_outputElemList.sendElements();
     }
     catch(ocsdError &err)
     {
         LogError(err);
+        m_unsync_info = UNSYNC_BAD_PACKET;
         resetDecoder(); // mark decoder as unsynced - dump any current state.
     }
     return resp;
 }
 
 void TrcPktDecodeEtmV3::setNeedAddr(bool bNeedAddr)
 {
     m_bNeedAddr = bNeedAddr;
     m_bSentUnknown = false;    
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::processISync(const bool withCC, const bool firstSync /* = false */)
 {
     // map ISync reason to generic reason codes.
     static trace_on_reason_t on_map[] = { TRACE_ON_NORMAL, TRACE_ON_NORMAL,
         TRACE_ON_OVERFLOW, TRACE_ON_EX_DEBUG };
 
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool ctxtUpdate = m_curr_packet_in->isCtxtUpdated();   
     OcsdTraceElement *pElem = 0;
 
     try {
 
         pElem = GetNextOpElem(resp);
 
         if(firstSync || (m_curr_packet_in->getISyncReason() != iSync_Periodic))
         {
             pElem->setType(OCSD_GEN_TRC_ELEM_TRACE_ON);
             pElem->setTraceOnReason(on_map[(int)m_curr_packet_in->getISyncReason()]);
             pElem =  GetNextOpElem(resp);           
         }
 
         // look for context changes....
         if(ctxtUpdate || firstSync)
         {
             // if not first time out, read existing context in output element,
             // otherwise we are setting it new.
             if(firstSync)  
                 m_PeContext.resetCtxt();
 
             if(m_curr_packet_in->isCtxtIDUpdated())
                 m_PeContext.setCtxtID(m_curr_packet_in->getCtxtID());
             if(m_curr_packet_in->isVMIDUpdated())
                 m_PeContext.setVMID(m_curr_packet_in->getVMID());
             if(m_curr_packet_in->isCtxtFlagsUpdated())
             {
                 m_PeContext.setEL(m_curr_packet_in->isHyp() ? ocsd_EL2 : ocsd_EL_unknown);
                 m_PeContext.setSecLevel(m_curr_packet_in->isNS() ? ocsd_sec_nonsecure : ocsd_sec_secure);
             }
 
             // prepare the context packet
             pElem->setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
             pElem->setContext(m_PeContext);
             pElem->setISA(m_curr_packet_in->ISA());
 
             // with cycle count...
             if(m_curr_packet_in->getISyncHasCC())
                 pElem->setCycleCount(m_curr_packet_in->getCycleCount());
 
         }
 
         // set ISync address - if it is a valid I address
         if(!m_curr_packet_in->getISyncNoAddr())
         {
             if(m_curr_packet_in->getISyncIsLSiPAddr())
             {
                 // TBD: handle extra data processing instruction for data trace
                 // need to output E atom relating to the data instruction
                 // rare - on start-up case.
 
                 // main instruction address saved in data address for this packet type.
                 m_IAddr = m_curr_packet_in->getDataAddr();
             }
             else
             {
                 m_IAddr = m_curr_packet_in->getAddr();
             }
             setNeedAddr(false);    // ready to process atoms.
         }
         m_curr_state = m_outputElemList.elemToSend() ? SEND_PKTS : DECODE_PKTS;
     }
     catch(ocsdError &err)
     {
         LogError(err);
+        m_unsync_info = UNSYNC_BAD_PACKET;
         resetDecoder(); // mark decoder as unsynced - dump any current state.
     }
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::processBranchAddr()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     OcsdTraceElement *pElem = 0;
     bool bUpdatePEContext = false;
 
     // might need to cancel something ... if the last output was an instruction range or excep return
     if(m_curr_packet_in->isExcepCancel())
         m_outputElemList.cancelPendElem();
     else         
         m_outputElemList.commitAllPendElem(); // otherwise commit any pending elements.
 
     // record the address
     m_IAddr = m_curr_packet_in->getAddr();
     setNeedAddr(false);    // no longer need an address.
    
     // exception packet - may need additional output
     if(m_curr_packet_in->isExcepPkt())
     {
         // exeception packet may have exception, context change, or both.
         // check for context change
         if(m_curr_packet_in->isCtxtUpdated())
         {
             
             ocsd_sec_level sec = m_curr_packet_in->isNS() ? ocsd_sec_nonsecure : ocsd_sec_secure;
             if(sec != m_PeContext.getSecLevel())
             {
                 m_PeContext.setSecLevel(sec);
                 bUpdatePEContext = true;
             }
             ocsd_ex_level pkt_el = m_curr_packet_in->isHyp() ?  ocsd_EL2 : ocsd_EL_unknown;
             if(pkt_el != m_PeContext.getEL())
             {
                 m_PeContext.setEL(pkt_el);
                 bUpdatePEContext = true;
             }
         }
 
         // now decide if we need to send any packets out.
         try {
 
             if(bUpdatePEContext)
             {
                 pElem = GetNextOpElem(resp);
                 pElem->setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
                 pElem->setContext(m_PeContext);
             }
 
             // check for exception
             if(m_curr_packet_in->excepNum() != 0)
             {
                 pElem = GetNextOpElem(resp);
                 pElem->setType(OCSD_GEN_TRC_ELEM_EXCEPTION);
                 pElem->setExceptionNum(m_curr_packet_in->excepNum());                        
             }
 
             // finally - do we have anything to send yet?
             m_curr_state = m_outputElemList.elemToSend() ? SEND_PKTS : DECODE_PKTS;
         }
         catch(ocsdError &err)
         {
             LogError(err);
+            m_unsync_info = UNSYNC_BAD_PACKET;
             resetDecoder(); // mark decoder as unsynced - dump any current state.
         }
     }       
     return resp;
 }
 
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV3::processPHdr()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     OcsdTraceElement *pElem = 0;
     ocsd_isa isa;
     Etmv3Atoms atoms(m_config->isCycleAcc());
 
     atoms.initAtomPkt(m_curr_packet_in,m_index_curr_pkt);
     isa = m_curr_packet_in->ISA();
     m_code_follower.setMemSpaceAccess((m_PeContext.getSecLevel() ==  ocsd_sec_secure) ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N);
 
     try
     {
         do 
         {
             // if we do not have a valid address then send any cycle count elements 
             // and stop processing
             if(m_bNeedAddr)
             {
                 // output unknown address packet or a cycle count packet
                 if(!m_bSentUnknown || m_config->isCycleAcc())
                 {
                     pElem = GetNextOpElem(resp);
                     if(m_bSentUnknown || !atoms.numAtoms())
                         pElem->setType(OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
                     else
                         pElem->setType(OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN);
                     if(m_config->isCycleAcc())
                         pElem->setCycleCount(atoms.getRemainCC());
                     m_bSentUnknown = true;
                 }
                 atoms.clearAll();   // skip remaining atoms
             }
             else    // have an address, can process atoms
             {
                 pElem = GetNextOpElem(resp);
                 pElem->setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
     
                 // cycle accurate may have a cycle count to use
                 if(m_config->isCycleAcc())
                 {
                     // note: it is possible to have a CC only atom packet.
                     if(!atoms.numAtoms())   // override type if CC only
                          pElem->setType(OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
                     // set cycle count
                     pElem->setCycleCount(atoms.getAtomCC());
                 }
 
                 // now process the atom 
                 if(atoms.numAtoms())
                 {
                     m_code_follower.setISA(isa);
                     m_code_follower.followSingleAtom(m_IAddr,atoms.getCurrAtomVal());
 
                     // valid code range
                     if(m_code_follower.hasRange())
                     {
                         pElem->setAddrRange(m_IAddr,m_code_follower.getRangeEn());
                         pElem->setLastInstrInfo(atoms.getCurrAtomVal() == ATOM_E, 
                                     m_code_follower.getInstrType(),
                                     m_code_follower.getInstrSubType(),m_code_follower.getInstrSize());
                         pElem->setLastInstrCond(m_code_follower.isCondInstr());
                         pElem->setISA(isa);
                         if(m_code_follower.hasNextAddr())
                             m_IAddr = m_code_follower.getNextAddr();
                         else
                             setNeedAddr(true);
                     }
 
                     // next address has new ISA?
                     if(m_code_follower.ISAChanged())
                         isa = m_code_follower.nextISA();
                     
                     // there is a nacc
                     if(m_code_follower.isNacc())
                     {
                         if(m_code_follower.hasRange())
                         {
                             pElem = GetNextOpElem(resp);
                             pElem->setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
                         }
                         else
                             pElem->updateType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
                         pElem->setAddrStart(m_code_follower.getNaccAddr());
                         setNeedAddr(true);
                         m_code_follower.clearNacc(); // we have generated some code for the nacc.
                     }
                 }
 
                 atoms.clearAtom();  // next atom
             }
         }
         while(atoms.numAtoms());
 
         // is tha last element an atom?
         int numElem = m_outputElemList.getNumElem();
         if(numElem >= 1)
         {
             // if the last thing is an instruction range, pend it - could be cancelled later.
             if(m_outputElemList.getElemType(numElem-1) == OCSD_GEN_TRC_ELEM_INSTR_RANGE)
                 m_outputElemList.pendLastNElem(1);
         }
 
         // finally - do we have anything to send yet?
         m_curr_state = m_outputElemList.elemToSend() ? SEND_PKTS : DECODE_PKTS;
     }
     catch(ocsdError &err)
     {
         LogError(err);
+        m_unsync_info = UNSYNC_BAD_PACKET;
         resetDecoder(); // mark decoder as unsynced - dump any current state.
     }
     return resp;
 }
 
 // if v7M -> pend only ERET, if V7A/R pend ERET and prev instr.
 void TrcPktDecodeEtmV3::pendExceptionReturn()
 {
     int pendElem = 1;
     if(m_config->getCoreProfile() != profile_CortexM)
     {
         int nElem = m_outputElemList.getNumElem();
         if(nElem > 1)
         {
            if(m_outputElemList.getElemType(nElem - 2) == OCSD_GEN_TRC_ELEM_INSTR_RANGE)
                pendElem = 2;    // need to pend instr+eret for A/R
         }
     }
     m_outputElemList.pendLastNElem(pendElem);
 }
 
 /* End of File trc_pkt_decode_etmv3.cpp */
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp	(nonexistent)
@@ -1,1694 +0,0 @@
-/*
- * \file       trc_pkt_proc_etmv4i_impl.cpp
- * \brief      OpenCSD : 
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#include "trc_pkt_proc_etmv4i_impl.h"
-
-/* Trace raw input buffer class */
-TraceRawBuffer::TraceRawBuffer()
-{
-    m_bufSize = 0;
-    m_bufProcessed = 0;
-    m_pBuffer = 0;
-    pkt = 0;
-}
-
-// init the buffer
-void TraceRawBuffer::init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet)
-{
-    m_bufSize = size;
-    m_bufProcessed = 0;
-    m_pBuffer = rawtrace;
-    pkt = out_packet;
-}
-
-void TraceRawBuffer::copyByteToPkt()
-{
-    if (!empty()) {
-        pkt->push_back(m_pBuffer[m_bufProcessed]);
-        m_bufProcessed++;
-    }
-}
-uint8_t TraceRawBuffer::peekNextByte()
-{
-    uint8_t val = 0;
-    if (!empty())
-        val = m_pBuffer[m_bufProcessed];
-    return val;
-}
-
-/* trace etmv4 packet processing class */
-EtmV4IPktProcImpl::EtmV4IPktProcImpl() :
-    m_isInit(false),
-    m_interface(0),
-    m_first_trace_info(false)
-{
-    
-}
-
-EtmV4IPktProcImpl::~EtmV4IPktProcImpl()
-{
-}
-
-void EtmV4IPktProcImpl::Initialise(TrcPktProcEtmV4I *p_interface)
-{
-     if(p_interface)
-     {
-         m_interface = p_interface;
-         m_isInit = true;
-     }
-     InitProcessorState();
-}
-
-ocsd_err_t EtmV4IPktProcImpl::Configure(const EtmV4Config *p_config)
-{
-    ocsd_err_t err = OCSD_OK;
-    if(p_config != 0)
-    {
-        m_config = *p_config;
-        BuildIPacketTable();    // packet table based on config
-    }
-    else
-    {
-        err = OCSD_ERR_INVALID_PARAM_VAL;
-        if(m_isInit)
-            m_interface->LogError(ocsdError(OCSD_ERR_SEV_ERROR,err));
-    }
-    return err;
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::processData(  const ocsd_trc_index_t index,
-                                    const uint32_t dataBlockSize,
-                                    const uint8_t *pDataBlock,
-                                    uint32_t *numBytesProcessed)
-{
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    m_trcIn.init(dataBlockSize, pDataBlock, &m_currPacketData);
-    m_blockIndex = index;
-    bool done = false;
-    uint8_t nextByte;
-
-    do
-    {
-        try 
-        {
-           /* while (((m_blockBytesProcessed < dataBlockSize) ||
-                ((m_blockBytesProcessed == dataBlockSize) && (m_process_state == SEND_PKT))) &&
-                OCSD_DATA_RESP_IS_CONT(resp))*/
-            while ( (!m_trcIn.empty() || (m_process_state == SEND_PKT)) &&
-                    OCSD_DATA_RESP_IS_CONT(resp)
-                )
-            {
-                switch (m_process_state)
-                {
-                case PROC_HDR:
-                    m_packet_index = m_blockIndex + m_trcIn.processed();
-                    if (m_is_sync)
-                    {
-                        nextByte = m_trcIn.peekNextByte();
-                        m_pIPktFn = m_i_table[nextByte].pptkFn;
-                        m_curr_packet.type = m_i_table[nextByte].pkt_type;
-                    }
-                    else
-                    {
-                        // unsynced - process data until we see a sync point
-                        m_pIPktFn = &EtmV4IPktProcImpl::iNotSync;
-                        m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
-                    }
-                    m_process_state = PROC_DATA;
-
-                case PROC_DATA:
-                    // loop till full packet or no more data...
-                    while (!m_trcIn.empty() && (m_process_state == PROC_DATA))
-                    {
-                        nextByte = m_trcIn.peekNextByte();
-                        m_trcIn.copyByteToPkt();  // move next byte into the packet
-    //                    m_currPacketData.push_back(pDataBlock[m_blockBytesProcessed]);
-    //                    m_blockBytesProcessed++;
-                        (this->*m_pIPktFn)(nextByte);
-                    }
-                    break;
-
-                case SEND_PKT:
-                    resp = outputPacket();
-                    InitPacketState();
-                    m_process_state = PROC_HDR;
-                    break;
-
-                case SEND_UNSYNCED:
-                    resp = outputUnsyncedRawPacket();
-                    if (m_update_on_unsync_packet_index != 0)
-                    {
-                        m_packet_index = m_update_on_unsync_packet_index;
-                        m_update_on_unsync_packet_index = 0;
-                    }
-                    m_process_state = PROC_DATA;        // after dumping unsynced data, still in data mode.
-                    break;
-                }
-            }
-            done = true;
-        }
-        catch(ocsdError &err)
-        {
-            done = true;
-            m_interface->LogError(err);
-            if( (err.getErrorCode() == OCSD_ERR_BAD_PACKET_SEQ) ||
-                (err.getErrorCode() == OCSD_ERR_INVALID_PCKT_HDR))
-            {
-                // send invalid packets up the pipe to let the next stage decide what to do.
-                m_process_state = SEND_PKT; 
-                done = false;
-            }
-            else
-            {
-                // bail out on any other error.
-                resp = OCSD_RESP_FATAL_INVALID_DATA;
-            }
-        }
-        catch(...)
-        {
-            done = true;
-            /// vv bad at this point.
-            resp = OCSD_RESP_FATAL_SYS_ERR;
-            const ocsdError &fatal = ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_packet_index,m_config.getTraceID(),"Unknown System Error decoding trace.");
-            m_interface->LogError(fatal);
-        }
-    } while (!done);
-
-    *numBytesProcessed = m_trcIn.processed();
-    return resp;
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::onEOT()
-{
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    // if we have a partial packet then send to attached sinks
-    if(m_currPacketData.size() != 0)
-    {
-        m_curr_packet.updateErrType(ETM4_PKT_I_INCOMPLETE_EOT);
-        resp = outputPacket();
-        InitPacketState();
-    }
-    return resp;
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::onReset()
-{
-    // prepare for new decoding session
-    InitProcessorState();
-    return OCSD_RESP_CONT;
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::onFlush()
-{
-    // packet processor never holds on to flushable data (may have partial packet, 
-    // but any full packets are immediately sent)
-    return OCSD_RESP_CONT;
-}
-
-void EtmV4IPktProcImpl::InitPacketState()
-{
-    m_currPacketData.clear();
-    m_curr_packet.initNextPacket(); // clear for next packet.
-    m_update_on_unsync_packet_index = 0;
-}
-
-void EtmV4IPktProcImpl::InitProcessorState()
-{
-    InitPacketState();
-    m_pIPktFn = &EtmV4IPktProcImpl::iNotSync;
-    m_packet_index = 0;
-    m_is_sync = false;
-    m_first_trace_info = false;
-    m_sent_notsync_packet = false;
-    m_process_state = PROC_HDR;
-    m_curr_packet.initStartState();
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::outputPacket()
-{
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    resp = m_interface->outputOnAllInterfaces(m_packet_index,&m_curr_packet,&m_curr_packet.type,m_currPacketData);
-    return resp;
-}
-
-ocsd_datapath_resp_t EtmV4IPktProcImpl::outputUnsyncedRawPacket()
-{
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    
-
-    m_interface->outputRawPacketToMonitor(m_packet_index,&m_curr_packet,m_dump_unsynced_bytes,&m_currPacketData[0]);
-        
-    if(!m_sent_notsync_packet)
-    {        
-        resp = m_interface->outputDecodedPacket(m_packet_index,&m_curr_packet);
-        m_sent_notsync_packet = true;
-    }
-    
-    if(m_currPacketData.size() <= m_dump_unsynced_bytes)
-        m_currPacketData.clear();
-    else
-        m_currPacketData.erase(m_currPacketData.begin(),m_currPacketData.begin()+m_dump_unsynced_bytes);
-
-    return resp;
-}
-
-void EtmV4IPktProcImpl::iNotSync(const uint8_t lastByte)
-{
-    // is it an extension byte? 
-    if (lastByte == 0x00) // TBD : add check for forced sync in here?
-    {
-        if (m_currPacketData.size() > 1)
-        {
-            m_dump_unsynced_bytes = m_currPacketData.size() - 1;
-            m_process_state = SEND_UNSYNCED;
-            // outputting some data then update packet index after so output indexes accurate
-            m_update_on_unsync_packet_index = m_blockIndex + m_trcIn.processed() - 1;
-        }
-        else
-            m_packet_index = m_blockIndex + m_trcIn.processed() - 1;  // set it up now otherwise.
-
-        m_pIPktFn = m_i_table[lastByte].pptkFn;
-    }
-    else if (m_currPacketData.size() >= 8)
-    {
-        m_dump_unsynced_bytes = m_currPacketData.size();
-        m_process_state = SEND_UNSYNCED;
-        // outputting some data then update packet index after so output indexes accurate
-        m_update_on_unsync_packet_index = m_blockIndex + m_trcIn.processed();
-    }
-}
-
-void EtmV4IPktProcImpl::iPktNoPayload(const uint8_t lastByte)
-{
-    // some expansion may be required...
-    switch(m_curr_packet.type)
-    {
-    case ETM4_PKT_I_ADDR_MATCH:
-        m_curr_packet.setAddressExactMatch(lastByte & 0x3);
-        break;
-
-    case ETM4_PKT_I_EVENT:
-        m_curr_packet.setEvent(lastByte & 0xF);
-        break;
-
-    case ETM4_PKT_I_NUM_DS_MKR:
-    case ETM4_PKT_I_UNNUM_DS_MKR:
-        m_curr_packet.setDataSyncMarker(lastByte & 0x7);
-        break;
-
-    // these just need the packet type - no processing required.
-    case ETM4_PKT_I_COND_FLUSH:
-    case ETM4_PKT_I_EXCEPT_RTN:
-    case ETM4_PKT_I_TRACE_ON:
-    case ETM4_PKT_I_FUNC_RET:
-    case ETM4_PKT_I_IGNORE:
-    default: break;
-    }
-    m_process_state = SEND_PKT; // now just send it....
-}
-
-void EtmV4IPktProcImpl::iPktReserved(const uint8_t lastByte)
-{
-    m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED, lastByte);   // swap type for err type
-    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR,m_packet_index,m_config.getTraceID());
-}
-
-void EtmV4IPktProcImpl::iPktInvalidCfg(const uint8_t lastByte)
-{
-    m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED_CFG, lastByte);   // swap type for err type
-    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR, m_packet_index, m_config.getTraceID());
-}
-
-void EtmV4IPktProcImpl::iPktExtension(const uint8_t lastByte)
-{
-    if(m_currPacketData.size() == 2)
-    {
-        // not sync and not next by 0x00 - not sync sequence
-        if(!m_is_sync && (lastByte != 0x00))
-        {
-            m_pIPktFn = &EtmV4IPktProcImpl::iNotSync;
-            m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
-            return;
-        }
-
-        switch(lastByte)
-        {
-        case 0x03: // discard packet.
-            m_curr_packet.type = ETM4_PKT_I_DISCARD;
-            m_process_state = SEND_PKT;
-            break;
-
-        case 0x05:
-            m_curr_packet.type = ETM4_PKT_I_OVERFLOW;
-            m_process_state = SEND_PKT;
-            break;
-
-        case 0x00:
-            m_curr_packet.type = ETM4_PKT_I_ASYNC;
-            m_pIPktFn = &EtmV4IPktProcImpl::iPktASync;  // handle subsequent bytes as async
-            break;
-
-        default:
-            m_curr_packet.err_type = m_curr_packet.type;
-            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
-            m_process_state = SEND_PKT;
-            break;
-        }
-    }
-}
-
-void EtmV4IPktProcImpl::iPktASync(const uint8_t lastByte)
-{
-    if(lastByte != 0x00)
-    {
-        // not sync and not next by 0x00 - not sync sequence if < 12
-        if(!m_is_sync && m_currPacketData.size() != 12)
-        {
-            m_pIPktFn = &EtmV4IPktProcImpl::iNotSync;
-            m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
-            return;
-        }
-
-        // 12 bytes and not valid sync sequence - not possible even if not synced
-        m_process_state = SEND_PKT;
-        if((m_currPacketData.size() != 12) || (lastByte != 0x80))
-        {
-            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
-            m_curr_packet.err_type = ETM4_PKT_I_ASYNC;
-        }
-        else
-             m_is_sync = true;  // found a sync packet, mark decoder as synchronised.
-    }
-    else if(m_currPacketData.size() == 12)
-    {
-        if(!m_is_sync)
-        {
-            // if we are not yet synced then ignore extra leading 0x00.
-            m_dump_unsynced_bytes = 1;
-            m_process_state = SEND_UNSYNCED;
-        }
-        else
-        {
-            // bad periodic ASYNC sequence.
-            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
-            m_curr_packet.err_type = ETM4_PKT_I_ASYNC;
-            m_process_state = SEND_PKT;
-        }
-    }
-}
-
-void EtmV4IPktProcImpl::iPktTraceInfo(const uint8_t lastByte)
-{
-    if(m_currPacketData.size() == 1)    // header
-    {
-        //clear flags
-        m_tinfo_sections.sectFlags = 0; // mark all sections as incomplete.
-        m_tinfo_sections.ctrlBytes = 1; // assume only a single control section byte for now
-        
-    }
-    else if(m_currPacketData.size() == 2) // first payload control byte
-    {
-        // figure out which sections are absent and set to true - opposite of bitfeild in byte;
-        m_tinfo_sections.sectFlags = (~lastByte) & TINFO_ALL_SECT;
-
-        // see if there is an extended control section, otherwise this byte is it.
-        if((lastByte & 0x80) == 0x0)
-            m_tinfo_sections.sectFlags |= TINFO_CTRL;
- 
-    }
-    else
-    {
-        if(!(m_tinfo_sections.sectFlags & TINFO_CTRL))
-        {
-            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_CTRL;
-            m_tinfo_sections.ctrlBytes++;
-        }
-        else if(!(m_tinfo_sections.sectFlags & TINFO_INFO_SECT))
-            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_INFO_SECT;
-        else if(!(m_tinfo_sections.sectFlags & TINFO_KEY_SECT))
-            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_KEY_SECT;
-        else if(!(m_tinfo_sections.sectFlags & TINFO_SPEC_SECT))
-            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_SPEC_SECT;
-        else if(!(m_tinfo_sections.sectFlags & TINFO_CYCT_SECT))
-            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_CYCT_SECT;
-    }
-
-    // all sections accounted for?
-    if(m_tinfo_sections.sectFlags == TINFO_ALL)
-    {
-        // index of first section is number of payload control bytes + 1 for header byte
-        unsigned idx = m_tinfo_sections.ctrlBytes + 1;
-        uint32_t fieldVal = 0;
-        uint8_t presSect = m_currPacketData[1] & TINFO_ALL_SECT;  // first payload control byte
-
-        m_curr_packet.clearTraceInfo();
-
-        if((presSect & TINFO_INFO_SECT) && (idx < m_currPacketData.size()))
-        {
-            idx += extractContField(m_currPacketData,idx,fieldVal);
-            m_curr_packet.setTraceInfo(fieldVal);
-        }
-        if((presSect & TINFO_KEY_SECT) && (idx < m_currPacketData.size()))
-        {
-            idx += extractContField(m_currPacketData,idx,fieldVal);
-            m_curr_packet.setTraceInfoKey(fieldVal);
-        }
-        if((presSect & TINFO_SPEC_SECT) && (idx < m_currPacketData.size()))
-        {
-            idx += extractContField(m_currPacketData,idx,fieldVal);
-            m_curr_packet.setTraceInfoSpec(fieldVal);
-        }
-        if((presSect & TINFO_CYCT_SECT) && (idx < m_currPacketData.size()))
-        {
-            idx += extractContField(m_currPacketData,idx,fieldVal);
-            m_curr_packet.setTraceInfoCyct(fieldVal);
-        }
-        m_process_state = SEND_PKT;
-        m_first_trace_info = true;
-    }
-
-}
-
-void EtmV4IPktProcImpl::iPktTimestamp(const uint8_t lastByte)
-{
-    // process the header byte
-    if(m_currPacketData.size() == 1)
-    {
-        m_ccount_done = (bool)((lastByte & 0x1) == 0); // 0 = not present
-        m_ts_done = false;
-        m_ts_bytes = 0;
-    }
-    else
-    {        
-        if(!m_ts_done)
-        {
-            m_ts_bytes++;
-            m_ts_done = (m_ts_bytes == 9) || ((lastByte & 0x80) == 0);
-        }
-        else if(!m_ccount_done)
-        {
-            m_ccount_done = (bool)((lastByte & 0x80) == 0);
-            // TBD: check for oorange ccount - bad packet.
-        }
-    }
-
-    if(m_ts_done && m_ccount_done)
-    {        
-        int idx = 1;
-        uint64_t tsVal;
-        int ts_bytes = extractContField64(m_currPacketData, idx, tsVal);
-        int ts_bits = ts_bytes < 7 ? ts_bytes * 7 : 64;
-
-        if(!m_curr_packet.pkt_valid.bits.ts_valid && m_first_trace_info)
-            ts_bits = 64;   // after trace info, missing bits are all 0.
-
-        m_curr_packet.setTS(tsVal,(uint8_t)ts_bits);
-
-        if((m_currPacketData[0] & 0x1) == 0x1)
-        {
-            uint32_t countVal, countMask;
-            
-            idx += ts_bytes;           
-            extractContField(m_currPacketData, idx, countVal, 3);    // only 3 possible count bytes.
-            countMask = (((uint32_t)1UL << m_config.ccSize()) - 1); // mask of the CC size
-            countVal &= countMask;
-            m_curr_packet.setCycleCount(countVal);
-        }
-
-        m_process_state = SEND_PKT;
-    }
-}
-
-void EtmV4IPktProcImpl::iPktException(const uint8_t lastByte)
-{
-    uint16_t excep_type = 0;
-
-    switch(m_currPacketData.size())
-    {
-    case 1: m_excep_size = 3; break;
-    case 2: if((lastByte & 0x80) == 0x00)
-                m_excep_size = 2; 
-            break;
-    }
-
-    if(m_currPacketData.size() ==  (unsigned)m_excep_size)
-    {
-        excep_type =  (m_currPacketData[1] >> 1) & 0x1F;
-        uint8_t addr_interp = (m_currPacketData[1] & 0x40) >> 5 | (m_currPacketData[1] & 0x1);
-        uint8_t m_fault_pending = 0;        
-        uint8_t m_type = (m_config.coreProfile() == profile_CortexM) ? 1 : 0;
-
-        // extended exception packet (probably M class);
-        if(m_currPacketData[1] & 0x80)
-        {
-            excep_type |= ((uint16_t)m_currPacketData[2] & 0x1F) << 5;
-            m_fault_pending = (m_currPacketData[2] >> 5)  & 0x1;
-        }
-        m_curr_packet.setExceptionInfo(excep_type,addr_interp,m_fault_pending, m_type);
-        m_process_state = SEND_PKT;
-
-        // allow the standard address packet handlers to process the address packet field for the exception.
-    }
-}
-
-void EtmV4IPktProcImpl::iPktCycleCntF123(const uint8_t lastByte)
-{
-    ocsd_etmv4_i_pkt_type format = m_curr_packet.type;
-
-    if( m_currPacketData.size() == 1)
-    {
-        m_count_done = m_commit_done = false; 
-        m_has_count = true;
-
-        if(format == ETM4_PKT_I_CCNT_F3)
-        {
-            // no commit section for TRCIDR0.COMMOPT == 1
-            if(!m_config.commitOpt1())
-            {
-                m_curr_packet.setCommitElements(((lastByte >> 2) & 0x3) + 1);
-            }
-            // TBD: warning of non-valid CC threshold here?
-            m_curr_packet.setCycleCount(m_curr_packet.getCCThreshold() + (lastByte & 0x3));
-            m_process_state = SEND_PKT;
-        }
-        else if(format == ETM4_PKT_I_CCNT_F1) 
-        {
-            if((lastByte & 0x1) == 0x1)
-            {
-                m_has_count = false;
-                m_count_done = true;
-            }
-
-            // no commit section for TRCIDR0.COMMOPT == 1
-            if(m_config.commitOpt1())
-                m_commit_done = true;
-        }
-    }
-    else if((format == ETM4_PKT_I_CCNT_F2) && ( m_currPacketData.size() == 2))
-    {
-        int commit_offset = ((lastByte & 0x1) == 0x1) ? ((int)m_config.MaxSpecDepth() - 15) : 1;
-        int commit_elements = ((lastByte >> 4) & 0xF);
-        commit_elements += commit_offset;
-
-        // TBD: warning if commit elements < 0?
-
-        m_curr_packet.setCycleCount(m_curr_packet.getCCThreshold() + (lastByte & 0xF));
-        m_curr_packet.setCommitElements(commit_elements);
-        m_process_state = SEND_PKT;
-    }
-    else
-    {
-        // F1 and size 2 or more
-        if(!m_commit_done)
-            m_commit_done = ((lastByte & 0x80) == 0x00);
-        else if(!m_count_done)
-            m_count_done = ((lastByte & 0x80) == 0x00);
-    }
-
-    if((format == ETM4_PKT_I_CCNT_F1) && m_commit_done && m_count_done)
-    {        
-        int idx = 1; // index into buffer for payload data.
-        uint32_t field_value = 0;
-        // no commit section for TRCIDR0.COMMOPT == 1
-        if(!m_config.commitOpt1())
-        {
-            idx += extractContField(m_currPacketData,idx,field_value);
-            m_curr_packet.setCommitElements(field_value);
-        }
-		if (m_has_count)
-		{
-			extractContField(m_currPacketData, idx, field_value, 3);
-			m_curr_packet.setCycleCount(field_value + m_curr_packet.getCCThreshold());
-		}
-		else
-			m_curr_packet.setCycleCount(0);	/* unknown CC marked as 0 after overflow */
-        m_process_state = SEND_PKT;
-    }
-}
-
-void EtmV4IPktProcImpl::iPktSpeclRes(const uint8_t lastByte)
-{    
-    if(m_currPacketData.size() == 1)
-    {
-        switch(m_curr_packet.getType())
-        {
-        case ETM4_PKT_I_MISPREDICT:
-        case ETM4_PKT_I_CANCEL_F2:
-            switch(lastByte & 0x3)
-            {
-            case 0x1: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x1, 1); break; // E
-            case 0x2: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x3, 2); break; // EE
-            case 0x3: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x0, 1); break; // N
-            }
-            if(m_curr_packet.getType() == ETM4_PKT_I_CANCEL_F2)
-                m_curr_packet.setCancelElements(1);
-            m_process_state = SEND_PKT;
-            break;
-
-        case ETM4_PKT_I_CANCEL_F3:
-            if(lastByte & 0x1)
-                m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x1, 1); // E
-            m_curr_packet.setCancelElements(((lastByte >> 1) & 0x3) + 2);
-            m_process_state = SEND_PKT;
-            break;
-        }        
-    }
-    else
-    {
-        if((lastByte & 0x80) == 0x00)
-        {
-            uint32_t field_val = 0;
-            extractContField(m_currPacketData,1,field_val);
-            if(m_curr_packet.getType() == ETM4_PKT_I_COMMIT)
-                m_curr_packet.setCommitElements(field_val);
-            else
-                m_curr_packet.setCancelElements(field_val);
-            // TBD: sanity check with max spec depth here?
-            m_process_state = SEND_PKT;
-        }
-    }
-}
-
-void EtmV4IPktProcImpl::iPktCondInstr(const uint8_t lastByte)
-{
-    bool bF1Done = false;
-
-    if(m_currPacketData.size() == 1)    
-    {
-        if(m_curr_packet.getType() == ETM4_PKT_I_COND_I_F2)
-        {
-            m_curr_packet.setCondIF2(lastByte & 0x3);
-            m_process_state = SEND_PKT;
-        }
-
-    }
-    else if(m_currPacketData.size() == 2)  
-    {
-        if(m_curr_packet.getType() == ETM4_PKT_I_COND_I_F3)   // f3 two bytes long
-        {
-          uint8_t num_c_elem = ((lastByte >> 1) & 0x3F) + (lastByte & 0x1);
-            m_curr_packet.setCondIF3(num_c_elem,(bool)((lastByte & 0x1) == 0x1));
-            // TBD: check for 0 num_c_elem in here.
-            m_process_state = SEND_PKT;
-        }
-        else
-        {
-            bF1Done = ((lastByte & 0x80) == 0x00);
-        }
-    }
-    else
-    {
-        bF1Done = ((lastByte & 0x80) == 0x00);
-    }
-
-    if(bF1Done)
-    {
-        uint32_t cond_key = 0;
-        extractContField(m_currPacketData, 1, cond_key);       
-        m_process_state = SEND_PKT;        
-    }
-}
-
-void EtmV4IPktProcImpl::iPktCondResult(const uint8_t lastByte)
-{
-    if(m_currPacketData.size() == 1)    
-    {
-        m_F1P1_done = false;  // F1 payload 1 done
-        m_F1P2_done = false;  // F1 payload 2 done
-        m_F1has_P2 = false;   // F1 has a payload 2
-                
-        switch(m_curr_packet.getType())
-        {
-        case ETM4_PKT_I_COND_RES_F1:            
-
-            m_F1has_P2 = true;
-            if((lastByte & 0xFC) == 0x6C)// only one payload set
-            {
-                m_F1P2_done = true;
-                m_F1has_P2 = false;
-            }
-            break;
-
-        case ETM4_PKT_I_COND_RES_F2:
-            m_curr_packet.setCondRF2((lastByte & 0x4) ? 2 : 1, lastByte & 0x3);
-            m_process_state = SEND_PKT;
-            break;
-
-        case ETM4_PKT_I_COND_RES_F3:
-            break;
-
-        case ETM4_PKT_I_COND_RES_F4:
-            m_curr_packet.setCondRF4(lastByte & 0x3);
-            m_process_state = SEND_PKT;
-            break;
-        }        
-    }
-    else if((m_curr_packet.getType() == ETM4_PKT_I_COND_RES_F3) && (m_currPacketData.size() == 2)) 
-    {
-        // 2nd F3 packet
-        uint16_t f3_tokens = 0;
-        f3_tokens = (uint16_t)m_currPacketData[1];
-        f3_tokens |= ((uint16_t)m_currPacketData[0] & 0xf) << 8;
-        m_curr_packet.setCondRF3(f3_tokens);
-        m_process_state = SEND_PKT;
-    }
-    else  // !first packet  - F1
-    {
-        if(!m_F1P1_done)
-            m_F1P1_done = ((lastByte & 0x80) == 0x00);
-        else if(!m_F1P2_done)
-            m_F1P2_done = ((lastByte & 0x80) == 0x00);
-
-        if(m_F1P1_done && m_F1P2_done)
-        {
-            int st_idx = 1;
-            uint32_t key[2];
-            uint8_t result[2];
-            uint8_t CI[2];
-
-            st_idx+= extractCondResult(m_currPacketData,st_idx,key[0],result[0]);
-            CI[0] = m_currPacketData[0] & 0x1;
-            if(m_F1has_P2) // 2nd payload?
-            {
-                extractCondResult(m_currPacketData,st_idx,key[1],result[1]);
-                CI[1] = (m_currPacketData[0] >> 1) & 0x1;
-            }
-            m_curr_packet.setCondRF1(key,result,CI,m_F1has_P2);
-            m_process_state = SEND_PKT;
-        }
-    }
-}
-
-void EtmV4IPktProcImpl::iPktContext(const uint8_t lastByte)
-{
-    bool bSendPacket = false;
-    
-    if(m_currPacketData.size() == 1) 
-    {
-        if((lastByte & 0x1) == 0)
-        {
-            m_curr_packet.setContextInfo(false);    // no update context packet (ctxt same as last time).
-            m_process_state = SEND_PKT;
-        }
-    }
-    else if(m_currPacketData.size() == 2) 
-    {
-        if((lastByte & 0xC0) == 0) // no VMID or CID
-        {
-            bSendPacket = true;
-        }
-        else
-        {
-            m_vmidBytes = ((lastByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
-            m_ctxtidBytes = ((lastByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
-        }
-    }
-    else    // 3rd byte onwards
-    {
-        if(m_vmidBytes > 0)
-            m_vmidBytes--;
-        else if(m_ctxtidBytes > 0)
-            m_ctxtidBytes--;
-
-        if((m_ctxtidBytes == 0) && (m_vmidBytes == 0))
-            bSendPacket = true;        
-    }
-
-    if(bSendPacket)
-    {
-        extractAndSetContextInfo(m_currPacketData,1);
-        m_process_state = SEND_PKT;
-    }
-}
-
-void EtmV4IPktProcImpl::extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx)
-{
-    // on input, buffer index points at the info byte - always present
-    uint8_t infoByte = m_currPacketData[st_idx];
-    
-    m_curr_packet.setContextInfo(true, (infoByte & 0x3), (infoByte >> 5) & 0x1, (infoByte >> 4) & 0x1);    
-
-    // see if there are VMID and CID bytes, and how many.
-    int nVMID_bytes = ((infoByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
-    int nCtxtID_bytes = ((infoByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
-
-    // extract any VMID and CID
-    int payload_idx = st_idx+1;
-    if(nVMID_bytes)
-    {
-        uint32_t VMID = 0; 
-        for(int i = 0; i < nVMID_bytes; i++)
-        {
-            VMID |= ((uint32_t)m_currPacketData[i+payload_idx] << i*8);
-        }
-        payload_idx += nVMID_bytes;
-        m_curr_packet.setContextVMID(VMID);
-    }
-
-    if(nCtxtID_bytes)
-    {
-        uint32_t CID = 0; 
-        for(int i = 0; i < nCtxtID_bytes; i++)
-        {
-            CID |= ((uint32_t)m_currPacketData[i+payload_idx] << i*8);
-        }        
-        m_curr_packet.setContextCID(CID);
-    }
-}
-
-void EtmV4IPktProcImpl::iPktAddrCtxt(const uint8_t lastByte)
-{
-    if( m_currPacketData.size() == 1)    
-    {        
-        m_addrIS = 0;
-        m_addrBytes = 4;
-        m_bAddr64bit = false;
-        m_vmidBytes = 0;
-        m_ctxtidBytes = 0;
-        m_bCtxtInfoDone = false;
-
-        switch(m_curr_packet.type)
-        {
-        case ETM4_PKT_I_ADDR_CTXT_L_32IS1:
-            m_addrIS = 1;
-        case ETM4_PKT_I_ADDR_CTXT_L_32IS0:
-            break;
-
-        case ETM4_PKT_I_ADDR_CTXT_L_64IS1:
-            m_addrIS = 1;
-        case ETM4_PKT_I_ADDR_CTXT_L_64IS0:
-            m_addrBytes = 8;
-            m_bAddr64bit = true;
-            break;
-        }
-    }
-    else
-    {
-        if(m_addrBytes == 0)
-        {
-            if(m_bCtxtInfoDone == false)
-            {
-                m_bCtxtInfoDone = true;
-                m_vmidBytes = ((lastByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
-                m_ctxtidBytes = ((lastByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
-            }
-            else
-            {
-                if( m_vmidBytes > 0) 
-                     m_vmidBytes--;
-                else if(m_ctxtidBytes > 0)
-                    m_ctxtidBytes--;
-            }
-        }
-        else
-            m_addrBytes--;
-
-        if((m_addrBytes == 0) && m_bCtxtInfoDone && (m_vmidBytes == 0) && (m_ctxtidBytes == 0))
-        {
-            int st_idx = 1;
-            if(m_bAddr64bit)
-            {
-                uint64_t val64;
-                st_idx+=extract64BitLongAddr(m_currPacketData,st_idx,m_addrIS,val64);
-                m_curr_packet.set64BitAddress(val64,m_addrIS);
-            }
-            else
-            {
-                uint32_t val32;
-                st_idx+=extract32BitLongAddr(m_currPacketData,st_idx,m_addrIS,val32);
-                m_curr_packet.set32BitAddress(val32,m_addrIS);
-            }
-            extractAndSetContextInfo(m_currPacketData,st_idx);
-            m_process_state = SEND_PKT;
-        }
-    }
-}
-
-void EtmV4IPktProcImpl::iPktShortAddr(const uint8_t lastByte)
-{
-    if (m_currPacketData.size() == 1)
-    {
-        m_addr_done = false;
-        m_addrIS = 0;
-        if (lastByte == ETM4_PKT_I_ADDR_S_IS1)
-            m_addrIS = 1;
-    }
-    else if(!m_addr_done)
-    {
-        m_addr_done = (m_currPacketData.size() == 3) || ((lastByte & 0x80) == 0x00);
-    }
-
-    if(m_addr_done)
-    {
-        uint32_t addr_val = 0;
-        int bits = 0;
-
-        extractShortAddr(m_currPacketData,1,m_addrIS,addr_val,bits);
-        m_curr_packet.updateShortAddress(addr_val,m_addrIS,(uint8_t)bits);
-        m_process_state = SEND_PKT;
-    }
-}
-
-int EtmV4IPktProcImpl::extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits)
-{
-    int IS_shift = (IS == 0) ? 2 : 1;
-    int idx = 0;
-
-    bits = 7;   // at least 7 bits
-    value = 0;
-    value |= ((uint32_t)(buffer[st_idx+idx] & 0x7F)) << IS_shift;
-    
-    if(m_currPacketData[st_idx+idx] & 0x80)
-    {
-        idx++;
-        value |= ((uint32_t)m_currPacketData[st_idx+idx]) <<  (7 + IS_shift);
-        bits += 8;
-    }
-    idx++;
-    bits += IS_shift;
-    return idx;
-}
-
-void EtmV4IPktProcImpl::iPktLongAddr(const uint8_t lastByte)
-{
-    if(m_currPacketData.size() == 1)    
-    {
-        // init the intra-byte data
-        m_addrIS = 0;
-        m_bAddr64bit = false;
-        m_addrBytes = 4;
-
-        switch(m_curr_packet.type)
-        {
-        case ETM4_PKT_I_ADDR_L_32IS1:
-            m_addrIS = 1;
-        case ETM4_PKT_I_ADDR_L_32IS0:
-            m_addrBytes = 4;
-            break;
-
-        case ETM4_PKT_I_ADDR_L_64IS1:
-            m_addrIS = 1;
-        case ETM4_PKT_I_ADDR_L_64IS0:
-            m_addrBytes = 8;
-            m_bAddr64bit = true;
-            break;
-        }
-    }
-    if(m_currPacketData.size() == (unsigned)(1+m_addrBytes))
-    {
-        int st_idx = 1;
-        if(m_bAddr64bit)
-        {
-            uint64_t val64;
-            st_idx+=extract64BitLongAddr(m_currPacketData,st_idx,m_addrIS,val64);
-            m_curr_packet.set64BitAddress(val64,m_addrIS);
-        }
-        else
-        {
-            uint32_t val32;
-            st_idx+=extract32BitLongAddr(m_currPacketData,st_idx,m_addrIS,val32);
-            m_curr_packet.set32BitAddress(val32,m_addrIS);
-        }
-        m_process_state = SEND_PKT;
-    }
-}
-
-void EtmV4IPktProcImpl::iPktQ(const uint8_t lastByte)
-{
-    if(m_currPacketData.size() == 1)
-    {
-        m_Q_type = lastByte & 0xF;
-
-        m_addrBytes = 0;
-        m_count_done = false;
-        m_has_addr = false;
-        m_addr_short = true;
-        m_addr_match = false;
-        m_addrIS = 1;
-        m_QE = 0;
-
-        switch(m_Q_type)
-        {
-            // count only - implied address.
-        case 0x0:
-        case 0x1:
-        case 0x2:
-            m_addr_match = true;
-            m_has_addr = true;
-            m_QE = m_Q_type & 0x3;
-        case 0xC:
-            break;
-
-            // count + short address 
-        case 0x5:
-            m_addrIS = 0;
-        case 0x6:
-            m_has_addr = true;            
-            m_addrBytes = 2;  // short IS0/1
-            break;
-
-            // count + long address
-        case 0xA:
-            m_addrIS = 0;
-        case 0xB:
-            m_has_addr = true;
-            m_addr_short = false;
-            m_addrBytes = 4; // long IS0/1
-            break;
-
-            // no count, no address
-        case 0xF:
-            m_count_done = true;
-            break;
-
-            // reserved values 0x3, 0x4, 0x7, 0x8, 0x9, 0xD, 0xE
-        default:
-            m_curr_packet.err_type =  m_curr_packet.type;
-            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
-            //SendBadIPacket( PKT_BAD_SEQUENCE, "ERROR: Bad Q packet type", PKT_Q );
-            break;
-        }
-    }
-    else
-    {
-        if(m_addrBytes > 0)
-        {
-            if(m_addr_short && m_addrBytes == 2)  // short
-            {
-                if((lastByte & 0x80) == 0x00)
-                    m_addrBytes--;        // short version can have just single byte.
-            }
-            m_addrBytes--;
-        }
-        else if(!m_count_done)
-        {
-            m_count_done = ((lastByte & 0x80) == 0x00);
-        }
-    }
-
-    if(((m_addrBytes == 0) && m_count_done))
-    {
-        int idx = 1; // move past the header
-        int bits = 0;
-        uint32_t q_addr;
-        uint32_t q_count;
-
-        if(m_has_addr)
-        {
-            if(m_addr_match)
-            {
-                m_curr_packet.setAddressExactMatch(m_QE);
-            }
-            else if(m_addr_short)
-            {
-                idx+=extractShortAddr(m_currPacketData,idx,m_addrIS,q_addr,bits);
-                m_curr_packet.updateShortAddress(q_addr,m_addrIS,(uint8_t)bits);
-            }
-            else
-            {
-                idx+=extract32BitLongAddr(m_currPacketData,idx,m_addrIS,q_addr);
-                m_curr_packet.set32BitAddress(q_addr,m_addrIS);
-            }
-        }
-
-        if(m_Q_type != 0xF)
-        {
-            extractContField(m_currPacketData,idx,q_count);
-            m_curr_packet.setQType(true,q_count,m_has_addr,m_addr_match,m_Q_type);
-        }
-        else
-        {
-            m_curr_packet.setQType(false,0,false,false,0xF);
-        }
-        m_process_state = SEND_PKT;
-    }
-
-}
-
-void EtmV4IPktProcImpl::iAtom(const uint8_t lastByte)
-{
-    // patterns lsbit = oldest atom, ms bit = newest.
-    static const uint32_t f4_patterns[] = {
-        0xE, // EEEN 
-        0x0, // NNNN
-        0xA, // ENEN
-        0x5  // NENE
-    };
-
-    uint8_t pattIdx = 0, pattCount = 0;
-    uint32_t pattern;
-
-    // atom packets are single byte, no payload.
-    switch(m_curr_packet.type)
-    {
-    case ETM4_PKT_I_ATOM_F1:
-        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x1), 1); // 1xE or N
-        break;
-
-    case ETM4_PKT_I_ATOM_F2:
-        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x3), 2); // 2x (E or N)
-        break;
-
-    case ETM4_PKT_I_ATOM_F3:
-        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x7), 3); // 3x (E or N)
-        break;
-
-    case ETM4_PKT_I_ATOM_F4:
-        m_curr_packet.setAtomPacket(ATOM_PATTERN,f4_patterns[(lastByte & 0x3)], 4); // 4 atom pattern
-        break; 
-
-    case ETM4_PKT_I_ATOM_F5:
-        pattIdx = ((lastByte & 0x20) >> 3) | (lastByte & 0x3);
-        switch(pattIdx)
-        {
-        case 5: // 0b101
-            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x1E, 5); // 5 atom pattern EEEEN
-            break;
-
-        case 1: // 0b001
-            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x00, 5); // 5 atom pattern NNNNN
-            break;
-
-        case 2: //0b010
-            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x0A, 5); // 5 atom pattern NENEN
-            break;
-
-        case 3: //0b011
-            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x15, 5); // 5 atom pattern ENENE
-            break;
-
-        default:
-            // TBD: warn about invalid pattern in here.
-            break;
-        }
-        break;
-
-    case ETM4_PKT_I_ATOM_F6:
-        pattCount = (lastByte & 0x1F) + 3;  // count of E's
-        // TBD: check 23 or less at this point? 
-        pattern = ((uint32_t)0x1 << pattCount) - 1; // set pattern to string of E's
-        if((lastByte & 0x20) == 0x00)   // last atom is E?
-            pattern |= ((uint32_t)0x1 << pattCount); 
-        m_curr_packet.setAtomPacket(ATOM_PATTERN,pattern, pattCount+1);
-        break;
-    }
-
-    m_process_state = SEND_PKT;
-}
-
-// header byte processing is table driven.
-void EtmV4IPktProcImpl::BuildIPacketTable()   
-{
-    // initialise everything as reserved.
-    for(int i = 0; i < 256; i++)
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_RESERVED;
-        m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iPktReserved;
-    }
-
-    // 0x00 - extension 
-    m_i_table[0x00].pkt_type = ETM4_PKT_I_EXTENSION;
-    m_i_table[0x00].pptkFn   = &EtmV4IPktProcImpl::iPktExtension;
-
-    // 0x01 - Trace info
-    m_i_table[0x01].pkt_type = ETM4_PKT_I_TRACE_INFO;
-    m_i_table[0x01].pptkFn   = &EtmV4IPktProcImpl::iPktTraceInfo;
-
-    // b0000001x - timestamp
-    m_i_table[0x02].pkt_type = ETM4_PKT_I_TIMESTAMP;
-    m_i_table[0x02].pptkFn   = &EtmV4IPktProcImpl::iPktTimestamp;
-    m_i_table[0x03].pkt_type = ETM4_PKT_I_TIMESTAMP;
-    m_i_table[0x03].pptkFn   = &EtmV4IPktProcImpl::iPktTimestamp;
-
-    // b0000 0100 - trace on
-    m_i_table[0x04].pkt_type = ETM4_PKT_I_TRACE_ON;
-    m_i_table[0x04].pptkFn   = &EtmV4IPktProcImpl::iPktNoPayload;
-
-
-    // b0000 0101 - Funct ret V8M
-    m_i_table[0x05].pkt_type = ETM4_PKT_I_FUNC_RET;
-    if ((m_config.coreProfile() == profile_CortexM) &&
-        (OCSD_IS_V8_ARCH(m_config.archVersion())) &&
-        (m_config.FullVersion() >= 0x42))
-    {        
-        m_i_table[0x05].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-    }
-
-    // b0000 0110 - exception 
-    m_i_table[0x06].pkt_type = ETM4_PKT_I_EXCEPT;
-    m_i_table[0x06].pptkFn   = &EtmV4IPktProcImpl::iPktException;
-
-    // b0000 0111 - exception return 
-    m_i_table[0x07].pkt_type = ETM4_PKT_I_EXCEPT_RTN;
-    m_i_table[0x07].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-
-    // b0000 110x - cycle count f2
-    // b0000 111x - cycle count f1
-    for(int i = 0; i < 4; i++)
-    {
-        m_i_table[0x0C+i].pkt_type = (i >= 2) ? ETM4_PKT_I_CCNT_F1 : ETM4_PKT_I_CCNT_F2;
-        m_i_table[0x0C+i].pptkFn   = &EtmV4IPktProcImpl::iPktCycleCntF123;
-    }
-
-    // b0001 xxxx - cycle count f3
-    for(int i = 0; i < 16; i++)
-    {
-        m_i_table[0x10+i].pkt_type = ETM4_PKT_I_CCNT_F3;
-        m_i_table[0x10+i].pptkFn   = &EtmV4IPktProcImpl::iPktCycleCntF123;
-    }
-
-    // b0010 0xxx - NDSM
-    for(int i = 0; i < 8; i++)
-    {
-        m_i_table[0x20 + i].pkt_type = ETM4_PKT_I_NUM_DS_MKR;
-        if (m_config.enabledDataTrace())
-            m_i_table[0x20+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-        else
-            m_i_table[0x20+i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0010 10xx, b0010 1100 - UDSM
-    for(int i = 0; i < 5; i++)
-    {
-        m_i_table[0x28+i].pkt_type = ETM4_PKT_I_UNNUM_DS_MKR;
-        if (m_config.enabledDataTrace())
-            m_i_table[0x28+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-        else
-            m_i_table[0x28+i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0010 1101 - commit
-    m_i_table[0x2D].pkt_type = ETM4_PKT_I_COMMIT;
-    m_i_table[0x2D].pptkFn   = &EtmV4IPktProcImpl::iPktSpeclRes;
-
-    // b0010 111x - cancel f1
-    for(int i = 0; i < 2; i++)
-    {
-        // G++ doesn't understand [0x2E+i] so...
-        int idx = i + 0x2E;
-        m_i_table[idx].pkt_type = ETM4_PKT_I_CANCEL_F1;
-        m_i_table[idx].pptkFn   = &EtmV4IPktProcImpl::iPktSpeclRes;
-    }
-
-    // b0011 00xx - mis predict
-    for(int i = 0; i < 4; i++)
-    {
-        m_i_table[0x30+i].pkt_type = ETM4_PKT_I_MISPREDICT;
-        m_i_table[0x30+i].pptkFn   =  &EtmV4IPktProcImpl::iPktSpeclRes;
-    }
-
-    // b0011 01xx - cancel f2
-    for(int i = 0; i < 4; i++)
-    {
-        m_i_table[0x34+i].pkt_type = ETM4_PKT_I_CANCEL_F2;
-        m_i_table[0x34+i].pptkFn   =  &EtmV4IPktProcImpl::iPktSpeclRes;
-    }
-
-    // b0011 1xxx - cancel f3
-    for(int i = 0; i < 8; i++)
-    {
-        m_i_table[0x38+i].pkt_type = ETM4_PKT_I_CANCEL_F3;
-        m_i_table[0x38+i].pptkFn   =  &EtmV4IPktProcImpl::iPktSpeclRes;
-    }
-
-    bool bCondValid = m_config.hasCondTrace() && m_config.enabledCondITrace();
-
-    // b0100 000x, b0100 0010 - cond I f2
-    for (int i = 0; i < 3; i++)
-    {
-        m_i_table[0x40 + i].pkt_type = ETM4_PKT_I_COND_I_F2;
-        if (bCondValid)
-            m_i_table[0x40 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr;
-        else
-            m_i_table[0x40 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0100 0011 - cond flush
-    m_i_table[0x43].pkt_type = ETM4_PKT_I_COND_FLUSH;
-    if (bCondValid)
-        m_i_table[0x43].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-    else
-        m_i_table[0x43].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-
-    // b0100 010x, b0100 0110 - cond res f4
-    for (int i = 0; i < 3; i++)
-    {
-        m_i_table[0x44 + i].pkt_type = ETM4_PKT_I_COND_RES_F4;
-        if (bCondValid)
-            m_i_table[0x44 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[0x44 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0100 100x, b0100 0110 - cond res f2
-    // b0100 110x, b0100 1110 - cond res f2
-    for (int i = 0; i < 3; i++)
-    {
-        m_i_table[0x48 + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
-        if (bCondValid)
-            m_i_table[0x48 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[0x48 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-    for (int i = 0; i < 3; i++)
-    {
-        m_i_table[0x4C + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
-        if (bCondValid)
-            m_i_table[0x4C + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[0x4C + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0101xxxx - cond res f3
-    for (int i = 0; i < 16; i++)
-    {
-        m_i_table[0x50 + i].pkt_type = ETM4_PKT_I_COND_RES_F3;
-        if (bCondValid)
-            m_i_table[0x50 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[0x50 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b011010xx - cond res f1
-    for (int i = 0; i < 4; i++)
-    {
-        m_i_table[0x68 + i].pkt_type = ETM4_PKT_I_COND_RES_F1;
-        if (bCondValid)
-            m_i_table[0x68 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[0x68 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // b0110 1100 - cond instr f1
-    m_i_table[0x6C].pkt_type = ETM4_PKT_I_COND_I_F1;
-    if (bCondValid)
-        m_i_table[0x6C].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr;
-    else
-        m_i_table[0x6C].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-
-    // b0110 1101 - cond instr f3
-    m_i_table[0x6D].pkt_type = ETM4_PKT_I_COND_I_F3;
-    if (bCondValid)
-        m_i_table[0x6D].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr;
-    else
-        m_i_table[0x6D].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-
-    // b0110111x - cond res f1
-    for (int i = 0; i < 2; i++)
-    {
-        // G++ cannot understand [0x6E+i] so change these round
-        m_i_table[i + 0x6E].pkt_type = ETM4_PKT_I_COND_RES_F1;
-        if (bCondValid)
-            m_i_table[i + 0x6E].pptkFn = &EtmV4IPktProcImpl::iPktCondResult;
-        else
-            m_i_table[i + 0x6E].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg;
-    }
-
-    // ETM 4.3 introduces ignore packets
-    if (m_config.FullVersion() >= 0x43)
-    {
-        m_i_table[0x70].pkt_type = ETM4_PKT_I_IGNORE;
-        m_i_table[0x70].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload;
-    }
-
-    // b01110001 - b01111111 - event trace
-    for(int i = 0; i < 15; i++)
-    {
-        m_i_table[0x71+i].pkt_type = ETM4_PKT_I_EVENT;
-        m_i_table[0x71+i].pptkFn   = &EtmV4IPktProcImpl::iPktNoPayload;
-    }
-    
-    // 0b1000 000x - context 
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x80+i].pkt_type = ETM4_PKT_I_CTXT;
-        m_i_table[0x80+i].pptkFn   = &EtmV4IPktProcImpl::iPktContext;
-    }
-
-    // 0b1000 0010 to b1000 0011 - addr with ctxt
-    // 0b1000 0101 to b1000 0110 - addr with ctxt
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x82+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_32IS0 : ETM4_PKT_I_ADDR_CTXT_L_32IS1;
-        m_i_table[0x82+i].pptkFn   = &EtmV4IPktProcImpl::iPktAddrCtxt;
-    }
-
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x85+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_64IS0 : ETM4_PKT_I_ADDR_CTXT_L_64IS1;
-        m_i_table[0x85+i].pptkFn   = &EtmV4IPktProcImpl::iPktAddrCtxt;
-    }
-
-    // 0b1001 0000 to b1001 0010 - exact match addr
-    for(int i = 0; i < 3; i++)
-    {
-        m_i_table[0x90+i].pkt_type = ETM4_PKT_I_ADDR_MATCH;
-        m_i_table[0x90+i].pptkFn   = &EtmV4IPktProcImpl::iPktNoPayload;
-    }
-
-    // b1001 0101 - b1001 0110 - addr short address
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x95+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_S_IS0 : ETM4_PKT_I_ADDR_S_IS1;
-        m_i_table[0x95+i].pptkFn   = &EtmV4IPktProcImpl::iPktShortAddr;
-    }
-
-    // b10011010 - b10011011 - addr long address 
-    // b10011101 - b10011110 - addr long address 
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x9A+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_L_32IS0 : ETM4_PKT_I_ADDR_L_32IS1;
-        m_i_table[0x9A+i].pptkFn   = &EtmV4IPktProcImpl::iPktLongAddr;
-    }
-    for(int i = 0; i < 2; i++)
-    {
-        m_i_table[0x9D+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_L_64IS0 : ETM4_PKT_I_ADDR_L_64IS1;
-        m_i_table[0x9D+i].pptkFn   = &EtmV4IPktProcImpl::iPktLongAddr;
-    }
-    
-    // b1010xxxx - Q packet
-    for (int i = 0; i < 16; i++)
-    {
-        m_i_table[0xA0 + i].pkt_type = ETM4_PKT_I_Q;
-        // certain Q type codes are reserved.
-        switch (i) {
-        case 0x3:
-        case 0x4:
-        case 0x7:
-        case 0x8:
-        case 0x9:
-        case 0xD:
-        case 0xE:
-            // don't update pkt fn - leave at default reserved.
-            break;
-        default:
-            // if this config supports Q elem - otherwise reserved again.
-            if (m_config.hasQElem())
-                m_i_table[0xA0 + i].pptkFn = &EtmV4IPktProcImpl::iPktQ;
-        }
-    }
-
-    // Atom Packets - all no payload but have specific pattern generation fn
-    for(int i = 0xC0; i <= 0xD4; i++)   // atom f6
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    for(int i = 0xD5; i <= 0xD7; i++)  // atom f5
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F5;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    for(int i = 0xD8; i <= 0xDB; i++)  // atom f2
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F2;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    for(int i = 0xDC; i <= 0xDF; i++)  // atom f4
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F4;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    for(int i = 0xE0; i <= 0xF4; i++)  // atom f6
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    
-    // atom f5
-    m_i_table[0xF5].pkt_type = ETM4_PKT_I_ATOM_F5;
-    m_i_table[0xF5].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-
-    for(int i = 0xF6; i <= 0xF7; i++)  // atom f1
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F1;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-    for(int i = 0xF8; i <= 0xFF; i++)  // atom f3
-    {
-        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F3;
-        m_i_table[i].pptkFn   = &EtmV4IPktProcImpl::iAtom;
-    }
-}
-
- unsigned EtmV4IPktProcImpl::extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit /*= 5*/)
-{
-    unsigned idx = 0;
-    bool lastByte = false;
-    uint8_t byteVal;
-    value = 0;
-    while(!lastByte && (idx < byte_limit))   // max 5 bytes for 32 bit value;
-    {
-        if(buffer.size() > (st_idx + idx))
-        {
-            // each byte has seven bits + cont bit
-            byteVal = buffer[(st_idx + idx)];
-            lastByte = (byteVal & 0x80) != 0x80;
-            value |= ((uint32_t)(byteVal & 0x7F)) << (idx * 7);
-            idx++;
-        }
-        else
-        {
-            throwBadSequenceError("Invalid 32 bit continuation fields in packet");
-        }
-    }
-    return idx;
-}
-
-unsigned EtmV4IPktProcImpl::extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit /*= 9*/)
-{
-    unsigned idx = 0;
-    bool lastByte = false;
-    uint8_t byteVal;
-    value = 0;
-    while(!lastByte && (idx < byte_limit))   // max 9 bytes for 64 bit value;
-    {
-        if(buffer.size() > (st_idx + idx))
-        {
-            // each byte has seven bits + cont bit
-            byteVal = buffer[(st_idx + idx)];
-            lastByte = (byteVal & 0x80) != 0x80;
-            value |= ((uint64_t)(byteVal & 0x7F)) << (idx * 7);
-            idx++;
-        }
-        else
-        {
-            throwBadSequenceError("Invalid 64 bit continuation fields in packet");
-        }
-    }
-    return idx;
-}
-
- unsigned EtmV4IPktProcImpl::extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result)
-{
-    unsigned idx = 0;
-    bool lastByte = false;
-    int incr = 0;
-
-    key = 0;
-
-    while(!lastByte && (idx < 6)) // cannot be more than 6 bytes for res + 32 bit key
-    {
-        if(buffer.size() > (st_idx + idx))
-        {
-            if(idx == 0)
-            {
-                result = buffer[st_idx+idx];
-                key = (buffer[st_idx+idx] >> 4) & 0x7;
-                incr+=3;
-            }
-            else
-            {
-                key |= ((uint32_t)(buffer[st_idx+idx] & 0x7F)) << incr;
-                incr+=7;
-            }
-            lastByte = (bool)((buffer[st_idx+idx] & 0x80) == 0); 
-            idx++;
-        }
-        else
-        {
-            throwBadSequenceError("Invalid continuation fields in packet");
-        }
-    }    
-    return idx;
-}
-
-int EtmV4IPktProcImpl::extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value)
-{
-    value = 0;
-    if(IS == 0)
-    {
-        value |= ((uint64_t)(buffer[st_idx+0] & 0x7F)) << 2;
-        value |= ((uint64_t)(buffer[st_idx+1] & 0x7F)) << 9;
-    }
-    else
-    {
-        value |= ((uint64_t)(buffer[st_idx+0] & 0x7F)) << 1;
-        value |= ((uint64_t)buffer[st_idx+1]) << 8;
-    }
-    value |= ((uint64_t)buffer[st_idx+2]) << 16;
-    value |= ((uint64_t)buffer[st_idx+3]) << 24;
-    value |= ((uint64_t)buffer[st_idx+4]) << 32;
-    value |= ((uint64_t)buffer[st_idx+5]) << 40;
-    value |= ((uint64_t)buffer[st_idx+6]) << 48;
-    value |= ((uint64_t)buffer[st_idx+7]) << 56;      
-    return 8;    
-}
-
-int EtmV4IPktProcImpl::extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value)
-{
-    value = 0;
-    if(IS == 0)
-    {
-        value |= ((uint32_t)(buffer[st_idx+0] & 0x7F)) << 2;
-        value |= ((uint32_t)(buffer[st_idx+1] & 0x7F)) << 9;
-    }
-    else
-    {
-        value |= ((uint32_t)(buffer[st_idx+0] & 0x7F)) << 1;
-        value |= ((uint32_t)buffer[st_idx+1]) << 8;
-    }
-    value |= ((uint32_t)buffer[st_idx+2]) << 16;
-    value |= ((uint32_t)buffer[st_idx+3]) << 24;
-    return 4;
-}
-
-void EtmV4IPktProcImpl::throwBadSequenceError(const char *pszExtMsg)
-{
-    m_curr_packet.updateErrType(ETM4_PKT_I_BAD_SEQUENCE);   // swap type for err type
-    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_BAD_PACKET_SEQ,m_packet_index,m_config.getTraceID(),pszExtMsg);
-}
-
-
-/* End of File trc_pkt_proc_etmv4i_impl.cpp */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h	(nonexistent)
@@ -1,231 +0,0 @@
-/*
- * \file       trc_pkt_proc_etmv4i_impl.h
- * \brief      OpenCSD : Implementation of ETMv4 packet processing
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#ifndef ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
-#define ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
-
-#include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
-#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"
-#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"
-
-class TraceRawBuffer
-{
-public:
-    TraceRawBuffer();
-    ~TraceRawBuffer() {};
-
-    // init the buffer
-    void init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet);
-    void copyByteToPkt();   // move a byte to the packet buffer     
-    uint8_t peekNextByte(); // value of next byte in buffer.
-
-    bool empty() { return m_bufProcessed == m_bufSize; };
-    // bytes processed.
-    uint32_t processed() { return m_bufProcessed; }; 
-    // buffer size;
-    uint32_t size() { return m_bufSize; } 
-
-private:
-    uint32_t m_bufSize;
-    uint32_t m_bufProcessed;
-    const uint8_t *m_pBuffer;
-    std::vector<uint8_t> *pkt;
-
-};
-
-class EtmV4IPktProcImpl
-{
-public:
-    EtmV4IPktProcImpl();
-    ~EtmV4IPktProcImpl();
-
-    void Initialise(TrcPktProcEtmV4I *p_interface);
-
-    ocsd_err_t Configure(const EtmV4Config *p_config);
-
-
-    ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                        const uint32_t dataBlockSize,
-                                        const uint8_t *pDataBlock,
-                                        uint32_t *numBytesProcessed);
-    ocsd_datapath_resp_t onEOT();
-    ocsd_datapath_resp_t onReset();
-    ocsd_datapath_resp_t onFlush();
-    const bool isBadPacket() const;
-
-protected:
-    typedef enum _process_state {
-        PROC_HDR,
-        PROC_DATA,
-        SEND_PKT,
-        SEND_UNSYNCED,
-        PROC_ERR,
-    } process_state;
-    
-    process_state m_process_state;
-
-    void InitPacketState();      // clear current packet state.
-    void InitProcessorState();   // clear all previous process state
-
-    /** packet processor configuration **/
-    bool m_isInit;
-    TrcPktProcEtmV4I *m_interface;       /**< The interface to the other decode components */
-
-    // etmv4 hardware configuration
-    EtmV4Config m_config;
-
-    /** packet data **/
-    TraceRawBuffer m_trcIn;    // trace data in buffer
-    std::vector<uint8_t> m_currPacketData;  // raw data packet
-    int m_currPktIdx;   // index into raw packet when expanding
-    EtmV4ITrcPacket m_curr_packet;  // expanded packet
-    ocsd_trc_index_t m_packet_index;   // index of the start of the current packet
-//    uint32_t m_blockBytesProcessed;     // number of bytes processed in the current data block
-    ocsd_trc_index_t m_blockIndex;     // index at the start of the current data block being processed
-
-    // searching for sync
-    bool m_is_sync;             //!< seen first sync packet
-    bool m_first_trace_info;    //!< seen first trace info packet after sync
-    bool m_sent_notsync_packet; //!< send one not sync packet if we see any unsynced data on the channel 
-    unsigned m_dump_unsynced_bytes;  //!< number of unsynced bytes to send
-    ocsd_trc_index_t m_update_on_unsync_packet_index;
-
-
-private:
-    // current processing state data - counts and flags to determine if a packet is complete.
-
-    // TraceInfo Packet
-    // flags to indicate processing progress for these sections is complete.
-    struct _t_info_pkt_prog {
-        uint8_t sectFlags;
-        uint8_t ctrlBytes;                 
-    }  m_tinfo_sections;
-
-    #define TINFO_INFO_SECT 0x01
-    #define TINFO_KEY_SECT  0x02 
-    #define TINFO_SPEC_SECT 0x04
-    #define TINFO_CYCT_SECT 0x08
-    #define TINFO_CTRL      0x20
-    #define TINFO_ALL_SECT  0x1F
-    #define TINFO_ALL       0x3F
-
-
-    // address and context packets 
-    int m_addrBytes;
-    uint8_t m_addrIS;
-    bool m_bAddr64bit;
-    int m_vmidBytes;    // bytes still to find
-    int m_ctxtidBytes;  // bytes still to find
-    bool m_bCtxtInfoDone;
-    bool m_addr_done;
-
-    // timestamp
-    bool m_ccount_done; // done or not needed 
-    bool m_ts_done;
-    int m_ts_bytes;
-
-    // exception
-    int m_excep_size;
-
-    // cycle count
-    bool m_has_count;
-    bool m_count_done;
-    bool m_commit_done;
-
-    // cond result
-    bool m_F1P1_done;  // F1 payload 1 done
-    bool m_F1P2_done;  // F1 payload 2 done
-    bool m_F1has_P2;   // F1 has a payload 2
-
-    // Q packets (use some from above too)
-    bool m_has_addr;
-    bool m_addr_short;
-    bool m_addr_match;
-    uint8_t m_Q_type;
-    uint8_t m_QE;
-
-    ocsd_datapath_resp_t outputPacket();
-    ocsd_datapath_resp_t outputUnsyncedRawPacket(); 
-
-    void iNotSync(const uint8_t lastByte);      // not synced yet
-    void iPktNoPayload(const uint8_t lastByte); // process a single byte packet
-    void iPktReserved(const uint8_t lastByte);  // deal with reserved header value
-    void iPktExtension(const uint8_t lastByte);
-    void iPktASync(const uint8_t lastByte);
-    void iPktTraceInfo(const uint8_t lastByte);
-    void iPktTimestamp(const uint8_t lastByte);
-    void iPktException(const uint8_t lastByte);
-    void iPktCycleCntF123(const uint8_t lastByte);
-    void iPktSpeclRes(const uint8_t lastByte);
-    void iPktCondInstr(const uint8_t lastByte);
-    void iPktCondResult(const uint8_t lastByte);
-    void iPktContext(const uint8_t lastByte);
-    void iPktAddrCtxt(const uint8_t lastByte);
-    void iPktShortAddr(const uint8_t lastByte);
-    void iPktLongAddr(const uint8_t lastByte);
-    void iPktQ(const uint8_t lastByte);
-    void iAtom(const uint8_t lastByte);
-    void iPktInvalidCfg(const uint8_t lastByte);  // packet invalid in current config.
-
-    unsigned extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit = 5);
-    unsigned extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit = 9);
-    unsigned extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result);
-    void extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx);
-    int extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value);
-    int extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value);
-    int extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits);
-
-    // packet processing is table driven.    
-    typedef void (EtmV4IPktProcImpl::*PPKTFN)(uint8_t);
-    PPKTFN m_pIPktFn;
-
-    struct _pkt_i_table_t {
-        ocsd_etmv4_i_pkt_type pkt_type;
-        PPKTFN pptkFn;
-    } m_i_table[256];
-
-    void BuildIPacketTable();
-
-    void throwBadSequenceError(const char *pszExtMsg);
-};
-
-
-inline const bool EtmV4IPktProcImpl::isBadPacket() const
-{
-    return m_curr_packet.isBadPacket();
-}
-
-#endif // ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
-
-/* End of File trc_pkt_proc_etmv4i_impl.h */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp	(nonexistent)
@@ -1,57 +0,0 @@
-/*
- * \file       trc_pkt_elem_etmv4d.cpp
- * \brief      OpenCSD : 
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#include "opencsd/etmv4/trc_pkt_elem_etmv4d.h"
-
-EtmV4DTrcPacket::EtmV4DTrcPacket()
-{
-}
-
-EtmV4DTrcPacket::~EtmV4DTrcPacket()
-{
-}
-
-    // printing
-void EtmV4DTrcPacket::toString(std::string &str) const
-{
-}
-
-void EtmV4DTrcPacket::toStringFmt(const uint32_t fmtFlags, std::string &str) const
-{
-}
-
-
-
-/* End of File trc_pkt_elem_etmv4d.cpp */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp	(nonexistent)
@@ -1,126 +0,0 @@
-/*
- * \file       trc_pkt_proc_etmv4.cpp
- * \brief      OpenCSD : 
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
-#include "trc_pkt_proc_etmv4i_impl.h"
-#include "common/ocsd_error.h"
-
-#ifdef __GNUC__
-// G++ doesn't like the ## pasting
-#define ETMV4I_PKTS_NAME "PKTP_ETMV4I"
-#else
-// VC++ is fine
-#define ETMV4I_PKTS_NAME OCSD_CMPNAME_PREFIX_PKTPROC##"_ETMV4I"
-#endif
-
-static const uint32_t ETMV4_SUPPORTED_OP_FLAGS = OCSD_OPFLG_PKTPROC_COMMON;
-
-/***************************************************************************/
-/*******************ETM V4 INSTRUCTION *************************************/
-/***************************************************************************/
-
-TrcPktProcEtmV4I::TrcPktProcEtmV4I() : TrcPktProcBase(ETMV4I_PKTS_NAME), 
-    m_pProcessor(0)
-{
-    m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
-}
-
-TrcPktProcEtmV4I::TrcPktProcEtmV4I(int instIDNum) : TrcPktProcBase(ETMV4I_PKTS_NAME, instIDNum),
-    m_pProcessor(0)
-{
-    m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
-}
-
-TrcPktProcEtmV4I::~TrcPktProcEtmV4I()
-{
-    if(m_pProcessor)
-        delete m_pProcessor;
-    m_pProcessor = 0;
-}
-
-ocsd_err_t TrcPktProcEtmV4I::onProtocolConfig()
-{
-    if(m_pProcessor == 0)
-    {
-        m_pProcessor = new (std::nothrow) EtmV4IPktProcImpl();
-        if(m_pProcessor == 0)
-        {           
-            LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_MEM));
-            return OCSD_ERR_MEM;
-        }
-        m_pProcessor->Initialise(this);
-    }
-    return m_pProcessor->Configure(m_config);
-}
-
-ocsd_datapath_resp_t TrcPktProcEtmV4I::processData(  const ocsd_trc_index_t index,
-                                                const uint32_t dataBlockSize,
-                                                const uint8_t *pDataBlock,
-                                                uint32_t *numBytesProcessed)
-{
-    if(m_pProcessor)
-        return m_pProcessor->processData(index,dataBlockSize,pDataBlock,numBytesProcessed);
-    return OCSD_RESP_FATAL_NOT_INIT;
-}
-
-ocsd_datapath_resp_t TrcPktProcEtmV4I::onEOT()
-{
-    if(m_pProcessor)
-        return m_pProcessor->onEOT();
-    return OCSD_RESP_FATAL_NOT_INIT;
-}
-
-ocsd_datapath_resp_t TrcPktProcEtmV4I::onReset()
-{
-    if(m_pProcessor)
-        return m_pProcessor->onReset();
-    return OCSD_RESP_FATAL_NOT_INIT;
-}
-
-ocsd_datapath_resp_t TrcPktProcEtmV4I::onFlush()
-{
-    if(m_pProcessor)
-        return m_pProcessor->onFlush();
-    return OCSD_RESP_FATAL_NOT_INIT;
-}
-
-const bool TrcPktProcEtmV4I::isBadPacket() const
-{
-    if(m_pProcessor)
-        return m_pProcessor->isBadPacket();
-    return false;
-}
-
-/* End of File trc_pkt_proc_etmv4.cpp */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h	(nonexistent)
@@ -1,71 +0,0 @@
-/*
- * \file       trc_pkt_proc_etmv4d_impl.h
- * \brief      OpenCSD : 
- * 
- * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
- */
-
-/* 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */ 
-
-#ifndef ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
-#define ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
-
-#include "etmv4/trc_pkt_proc_etmv4.h"
-#include "etmv4/trc_cmp_cfg_etmv4.h"
-
-class EtmV4DPktProcImpl
-{
-public:
-    EtmV4DPktProcImpl();
-    ~EtmV4DPktProcImpl();
-
-    void Initialise(TrcPktProcEtmV4D *p_interface);
-
-    ocsd_err_t Configure(const EtmV4Config *p_config);
-
-
-    ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                        const uint32_t dataBlockSize,
-                                        const uint8_t *pDataBlock,
-                                        uint32_t *numBytesProcessed);
-    ocsd_datapath_resp_t onEOT();
-    ocsd_datapath_resp_t onReset();
-    ocsd_datapath_resp_t onFlush();
-
-protected:
-
-    bool m_isInit;
-    TrcPktProcEtmV4D *m_interface;       /**< The interface to the other decode components */
-    
-    EtmV4Config m_config;
-};
-
-
-#endif // ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
-
-/* End of File trc_pkt_proc_etmv4d_impl.h */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/etmv4/trc_etmv4_stack_elem.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_etmv4_stack_elem.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_etmv4_stack_elem.cpp	(revision 362263)
@@ -1,116 +1,156 @@
 /*
 * \file       trc_etmv4_stack_elem.cpp
 * \brief      OpenCSD : ETMv4 decoder
 *
 * \copyright  Copyright (c) 2017, ARM Limited. All Rights Reserved.
 */
 
 
 /*
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
 *
 * 1. Redistributions of source code must retain the above copyright notice,
 * this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 *
 * 3. Neither the name of the copyright holder nor the names of its contributors
 * may be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "opencsd/etmv4/trc_etmv4_stack_elem.h"
 
 /* implementation of P0 element stack in ETM v4 trace*/
 TrcStackElem *EtmV4P0Stack::createParamElemNoParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, bool back /*= false*/)
 {
     TrcStackElem *pElem = new (std::nothrow) TrcStackElem(p0_type, isP0, root_pkt, root_index);
     if (pElem)
     {
         if (back)
             push_back(pElem);
         else
             push_front(pElem);
     }
     return pElem;
 }
 
 TrcStackElemParam *EtmV4P0Stack::createParamElem(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const std::vector<uint32_t> &params)
 {
     TrcStackElemParam *pElem = new (std::nothrow) TrcStackElemParam(p0_type, isP0, root_pkt, root_index);
     if (pElem)
     {
         int param_idx = 0;
         int params_to_fill = params.size();
         while ((param_idx < 4) && params_to_fill)
         {
             pElem->setParam(params[param_idx], param_idx);
             param_idx++;
             params_to_fill--;
         }
         push_front(pElem);
     }
     return pElem;
 }
 
 TrcStackElemAtom *EtmV4P0Stack::createAtomElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const ocsd_pkt_atom &atom)
 {
     TrcStackElemAtom *pElem = new (std::nothrow) TrcStackElemAtom(root_pkt, root_index);
     if (pElem)
     {
         pElem->setAtom(atom);
         push_front(pElem);
     }
     return pElem;
 }
 
 TrcStackElemExcept *EtmV4P0Stack::createExceptElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const bool bSame, const uint16_t excepNum)
 {
     TrcStackElemExcept *pElem = new (std::nothrow) TrcStackElemExcept(root_pkt, root_index);
     if (pElem)
     {
         pElem->setExcepNum(excepNum);
         pElem->setPrevSame(bSame);
         push_front(pElem);
     }
     return pElem;
 }
 
-TrcStackElemCtxt *EtmV4P0Stack::createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context)
+TrcStackElemCtxt *EtmV4P0Stack::createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context, const uint8_t IS, const bool back /*= false*/)
 {
     TrcStackElemCtxt *pElem = new (std::nothrow) TrcStackElemCtxt(root_pkt, root_index);
     if (pElem)
     {
         pElem->setContext(context);
-        push_front(pElem);
+        pElem->setIS(IS);
+        if (back)
+            push_back(pElem);
+        else
+            push_front(pElem);
     }
     return pElem;
 
 }
 
 TrcStackElemAddr *EtmV4P0Stack::createAddrElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_addr_val_t &addr_val)
 {
     TrcStackElemAddr *pElem = new (std::nothrow) TrcStackElemAddr(root_pkt, root_index);
     if (pElem)
     {
         pElem->setAddr(addr_val);
         push_front(pElem);
     }
     return pElem;
 }
+
+TrcStackQElem *EtmV4P0Stack::createQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const int count)
+{
+    TrcStackQElem *pElem = new (std::nothrow) TrcStackQElem(root_pkt, root_index);
+    if (pElem)
+    {
+        pElem->setInstrCount(count);
+        push_front(pElem);
+    }
+    return pElem;
+}
+
+// iteration functions
+void EtmV4P0Stack::from_front_init()
+{
+    m_iter = m_P0_stack.begin();
+}
+
+TrcStackElem *EtmV4P0Stack::from_front_next()
+{
+    TrcStackElem *pElem = 0;
+    if (m_iter != m_P0_stack.end())
+    {
+        pElem = *m_iter++;
+    }
+    return pElem;
+}
+
+void EtmV4P0Stack::erase_curr_from_front()
+{
+    std::deque<TrcStackElem *>::iterator erase_iter;
+    erase_iter = m_iter;
+    erase_iter--;
+    m_P0_stack.erase(erase_iter);
+}
+
 
 /* End of file trc_etmv4_stack_elem.cpp */
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp	(revision 362263)
@@ -1,1155 +1,1585 @@
 /*
  * \file       trc_pkt_decode_etmv4i.cpp
  * \brief      OpenCSD : ETMv4 decoder
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
-
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "opencsd/etmv4/trc_pkt_decode_etmv4i.h"
 
 #include "common/trc_gen_elem.h"
 
 
 #define DCD_NAME "DCD_ETMV4"
 
 static const uint32_t ETMV4_SUPPORTED_DECODE_OP_FLAGS = OCSD_OPFLG_PKTDEC_COMMON;
 
 TrcPktDecodeEtmV4I::TrcPktDecodeEtmV4I()
     : TrcPktDecodeBase(DCD_NAME)
 {
     initDecoder();
 }
 
 TrcPktDecodeEtmV4I::TrcPktDecodeEtmV4I(int instIDNum)
     : TrcPktDecodeBase(DCD_NAME,instIDNum)
 {
     initDecoder();
 }
 
 TrcPktDecodeEtmV4I::~TrcPktDecodeEtmV4I()   
 {
 }
 
 /*********************** implementation packet decoding interface */
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV4I::processPacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    ocsd_err_t err = OCSD_OK;
     bool bPktDone = false;
 
     while(!bPktDone)
     {
         switch (m_curr_state)
         {
         case NO_SYNC:
             // output the initial not synced packet to the sink
-            m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
-            resp = outputTraceElement(m_output_elem);
-            m_curr_state = WAIT_SYNC;
+            err = m_out_elem.resetElemStack();
+            if (!err)
+                err = m_out_elem.addElemType(m_index_curr_pkt, OCSD_GEN_TRC_ELEM_NO_SYNC);
+            if (!err)
+            {
+                outElem().setUnSyncEOTReason(m_unsync_eot_info);
+                resp = m_out_elem.sendElements();
+                m_curr_state = WAIT_SYNC;
+            }
+            else
+                resp = OCSD_RESP_FATAL_SYS_ERR;
+
             // fall through to check if the current packet is the async we are waiting for.
             break;
 
         case WAIT_SYNC:
             if(m_curr_packet_in->getType() == ETM4_PKT_I_ASYNC)
                 m_curr_state = WAIT_TINFO;
             bPktDone = true;
             break;
 
         case WAIT_TINFO:
             m_need_ctxt = true;
             m_need_addr = true;
             if(m_curr_packet_in->getType() == ETM4_PKT_I_TRACE_INFO)
             {
                 doTraceInfoPacket();
                 m_curr_state = DECODE_PKTS;
                 m_return_stack.flush();
             }
             bPktDone = true;
             break;
 
         case DECODE_PKTS:
-            resp = decodePacket(bPktDone);  // this may change the state to commit elem;
-            break;
+            // this may change the state to RESOLVE_ELEM if required;
+            err = decodePacket();
+            if (err)
+            {
+#ifdef OCSD_WARN_UNSUPPORTED
+                if (err == OCSD_ERR_UNSUPP_DECODE_PKT)
+                    resp = OCSD_RESP_WARN_CONT;
+                else
+#else
+                resp = OCSD_RESP_FATAL_INVALID_DATA;
+#endif
 
-        case COMMIT_ELEM:
-            resp = commitElements(bPktDone); // this will change the state to DECODE_PKTS once all elem committed.
+                bPktDone = true;
+            }
+            else if (m_curr_state != RESOLVE_ELEM)
+                bPktDone = true;
             break;
 
+        case RESOLVE_ELEM:
+            // this will change the state to DECODE_PKTS once required elem resolved & 
+            // needed generic packets output
+            resp = resolveElements(); 
+            if ((m_curr_state == DECODE_PKTS) || (!OCSD_DATA_RESP_IS_CONT(resp)))
+                bPktDone = true;
+            break;
         }
     }
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV4I::onEOT()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    m_flush_EOT = true;
-    resp = flushEOT();
+    ocsd_err_t err;
+    if ((err = commitElemOnEOT()) != OCSD_OK)
+    {
+        resp = OCSD_RESP_FATAL_INVALID_DATA;
+        LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, "Error flushing element stack at end of trace data."));
+    }
+    else
+        resp = m_out_elem.sendElements();
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV4I::onReset()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    m_unsync_eot_info = UNSYNC_RESET_DECODER;
     resetDecoder();
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeEtmV4I::onFlush()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
 
-    // continue exception processing (can't go through processPacket as elements no longer on stack)
-    if(m_excep_info.proc != EXCEP_POP)
-        resp = processException();
-    // continue ongoing output operations on comitted elements.
-    else if(m_curr_state == COMMIT_ELEM)
-        resp = processPacket(); 
-    // continue flushing at end of trace
-    else if(m_flush_EOT)
-        resp = flushEOT();
+    if (m_curr_state == RESOLVE_ELEM)
+        resp = resolveElements();
+    else
+        resp = m_out_elem.sendElements();
     return resp;
 }
 
 ocsd_err_t TrcPktDecodeEtmV4I::onProtocolConfig()
 {
     ocsd_err_t err = OCSD_OK;
 
     // set some static config elements
     m_CSID = m_config->getTraceID();
     m_max_spec_depth = m_config->MaxSpecDepth();
+
+    // elements associated with data trace
+#ifdef DATA_TRACE_SUPPORTED
     m_p0_key_max = m_config->P0_Key_Max();
     m_cond_key_max_incr = m_config->CondKeyMaxIncr();
+#endif
 
+    m_out_elem.initCSID(m_CSID);
+
     // set up static trace instruction decode elements
     m_instr_info.dsb_dmb_waypoints = 0;
     m_instr_info.wfi_wfe_branch = m_config->wfiwfeBranch() ? 1 : 0;
     m_instr_info.pe_type.arch = m_config->archVersion();
     m_instr_info.pe_type.profile = m_config->coreProfile();
 
     m_IASize64 = (m_config->iaSizeMax() == 64);
 
     if (m_config->enabledRetStack())
     {
         m_return_stack.set_active(true);
 #ifdef TRC_RET_STACK_DEBUG
         m_return_stack.set_dbg_logger(this);
 #endif
     }
 
     // check config compatible with current decoder support level.
     // at present no data trace, no spec depth, no return stack, no QE
     // Remove these checks as support is added.
-    if(m_max_spec_depth != 0)
+    if(m_config->enabledDataTrace())
     {
         err = OCSD_ERR_HW_CFG_UNSUPP;
-        LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv4 instruction decode : None-zero speculation depth not supported"));
-    }
-    else if(m_config->enabledDataTrace())
-    {
-        err = OCSD_ERR_HW_CFG_UNSUPP;
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv4 instruction decode : Data trace elements not supported"));
     }
     else if(m_config->enabledLSP0Trace())
     {
         err = OCSD_ERR_HW_CFG_UNSUPP;
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv4 instruction decode : LSP0 elements not supported."));
     }
     else if(m_config->enabledCondITrace() != EtmV4Config::COND_TR_DIS)
     {
         err = OCSD_ERR_HW_CFG_UNSUPP;
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv4 instruction decode : Trace on conditional non-branch elements not supported."));
     }
-    else if(m_config->enabledQE())
-    {
-        err = OCSD_ERR_HW_CFG_UNSUPP;
-        LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_HW_CFG_UNSUPP,"ETMv4 instruction decode : Trace using Q elements not supported."));
-    }
     return err;
 }
 
-
 /************* local decode methods */
 void TrcPktDecodeEtmV4I::initDecoder()
 {
     // set the operational modes supported.
     m_supported_op_flags = ETMV4_SUPPORTED_DECODE_OP_FLAGS;
 
     /* init elements that get set by config */
     m_max_spec_depth = 0;
-    m_p0_key_max = 0;
     m_CSID = 0;
-    m_cond_key_max_incr = 0;
     m_IASize64 = false;
 
+    // elements associated with data trace
+#ifdef DATA_TRACE_SUPPORTED
+    m_p0_key_max = 0;
+    m_cond_key_max_incr = 0;
+#endif
+
     // reset decoder state to unsynced
+    m_unsync_eot_info = UNSYNC_INIT_DECODER;
     resetDecoder();
 }
 
 void TrcPktDecodeEtmV4I::resetDecoder()
 {
     m_curr_state = NO_SYNC;
     m_timestamp = 0;
     m_context_id = 0;              
     m_vmid_id = 0;                 
     m_is_secure = true;
     m_is_64bit = false;
     m_cc_threshold = 0;
     m_curr_spec_depth = 0;
-    m_p0_key = 0;
-    m_cond_c_key = 0;
-    m_cond_r_key = 0;
     m_need_ctxt = true;
     m_need_addr = true;
-    m_except_pending_addr = false;
-    m_mem_nacc_pending = false;
+    m_elem_pending_addr = false;
     m_prev_overflow = false;
     m_P0_stack.delete_all();
-    m_output_elem.init();
-    m_excep_info.proc = EXCEP_POP;
-    m_flush_EOT = false;
+    m_out_elem.resetElemStack();
+    m_last_IS = 0;
+    clearElemRes();
+
+    // elements associated with data trace
+#ifdef DATA_TRACE_SUPPORTED
+    m_p0_key = 0;
+    m_cond_c_key = 0;
+    m_cond_r_key = 0;
+#endif
 }
 
-// this function can output an immediate generic element if this covers the complete packet decode, 
-// or stack P0 and other elements for later processing on commit or cancel.
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::decodePacket(bool &Complete)
+void TrcPktDecodeEtmV4I::onFirstInitOK()
 {
+    // once init, set the output element interface to the out elem list.
+    m_out_elem.initSendIf(this->getTraceElemOutAttachPt());
+}
+
+// Changes a packet into stack of trace elements - these will be resolved and output later
+ocsd_err_t TrcPktDecodeEtmV4I::decodePacket()
+{
+    ocsd_err_t err = OCSD_OK;
     bool bAllocErr = false;
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    Complete = true;
     bool is_addr = false;
-    bool is_except = false;
-    
+
     switch(m_curr_packet_in->getType())
     {
     case ETM4_PKT_I_ASYNC: // nothing to do with this packet.
     case ETM4_PKT_I_IGNORE: // or this one.
         break;
 
     case ETM4_PKT_I_TRACE_INFO:
         // skip subsequent TInfo packets.
         m_return_stack.flush();
         break;
 
     case ETM4_PKT_I_TRACE_ON:
         {
             if (m_P0_stack.createParamElemNoParam(P0_TRC_ON, false, m_curr_packet_in->getType(), m_index_curr_pkt) == 0)
                 bAllocErr = true;
         }
         break;
 
-    case ETM4_PKT_I_OVERFLOW:
-        {
-            if (m_P0_stack.createParamElemNoParam(P0_OVERFLOW, false, m_curr_packet_in->getType(), m_index_curr_pkt) == 0)
-                bAllocErr = true;
-        }
-        break;
-
     case ETM4_PKT_I_ATOM_F1:
     case ETM4_PKT_I_ATOM_F2:
     case ETM4_PKT_I_ATOM_F3:
     case ETM4_PKT_I_ATOM_F4:
     case ETM4_PKT_I_ATOM_F5:
     case ETM4_PKT_I_ATOM_F6:
         {
             if (m_P0_stack.createAtomElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getAtom()) == 0)
                 bAllocErr = true;
             else
                 m_curr_spec_depth += m_curr_packet_in->getAtom().num;
         }
         break;
 
     case ETM4_PKT_I_CTXT:
         {
-            if (m_P0_stack.createContextElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getContext()) == 0)
+            if (m_P0_stack.createContextElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getContext(), m_last_IS) == 0)
                 bAllocErr = true;
         }
         break;
 
     case ETM4_PKT_I_ADDR_MATCH:
         {
             etmv4_addr_val_t addr;
 
             addr.val = m_curr_packet_in->getAddrVal();
-            addr.isa = m_curr_packet_in->getAddrIS();
+            addr.isa = m_last_IS = m_curr_packet_in->getAddrIS();
+
             if (m_P0_stack.createAddrElem(m_curr_packet_in->getType(), m_index_curr_pkt, addr) == 0)
                 bAllocErr = true;
             is_addr = true;
         }
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_64IS0:
     case ETM4_PKT_I_ADDR_CTXT_L_64IS1:
     case ETM4_PKT_I_ADDR_CTXT_L_32IS0:
     case ETM4_PKT_I_ADDR_CTXT_L_32IS1:    
         {
-            if (m_P0_stack.createContextElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getContext()) == 0)
+            m_last_IS = m_curr_packet_in->getAddrIS();
+            if (m_P0_stack.createContextElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getContext(), m_last_IS) == 0)
                 bAllocErr = true;
         }
     case ETM4_PKT_I_ADDR_L_32IS0:
     case ETM4_PKT_I_ADDR_L_32IS1:
     case ETM4_PKT_I_ADDR_L_64IS0:
     case ETM4_PKT_I_ADDR_L_64IS1:
     case ETM4_PKT_I_ADDR_S_IS0:
     case ETM4_PKT_I_ADDR_S_IS1:
         {
             etmv4_addr_val_t addr;
 
             addr.val = m_curr_packet_in->getAddrVal();
-            addr.isa = m_curr_packet_in->getAddrIS();
+            addr.isa = m_last_IS = m_curr_packet_in->getAddrIS();
+
             if (m_P0_stack.createAddrElem(m_curr_packet_in->getType(), m_index_curr_pkt, addr) == 0)
                 bAllocErr = true;
             is_addr = true;
         }
         break;
 
     // Exceptions
     case ETM4_PKT_I_EXCEPT:
          {
             if (m_P0_stack.createExceptElem(m_curr_packet_in->getType(), m_index_curr_pkt, 
                                             (m_curr_packet_in->exception_info.addr_interp == 0x2), 
                                             m_curr_packet_in->exception_info.exceptionType) == 0)
                 bAllocErr = true;
             else
-            {
-                m_except_pending_addr = true;  // wait for following packets before marking for commit.
-                is_except = true;
-            }
+                m_elem_pending_addr = true;  // wait for following packets before marking for commit.
         }
         break;
 
     case ETM4_PKT_I_EXCEPT_RTN:
         {
             // P0 element if V7M profile.
             bool bV7MProfile = (m_config->archVersion() == ARCH_V7) && (m_config->coreProfile() == profile_CortexM);
             if (m_P0_stack.createParamElemNoParam(P0_EXCEP_RET, bV7MProfile, m_curr_packet_in->getType(), m_index_curr_pkt) == 0)
                 bAllocErr = true;
             else if (bV7MProfile)
                 m_curr_spec_depth++;
         }
         break;
 
     case ETM4_PKT_I_FUNC_RET:
         {
             // P0 element iff V8M profile, otherwise ignore
             if (OCSD_IS_V8_ARCH(m_config->archVersion()) && (m_config->coreProfile() == profile_CortexM))
             {
                 if (m_P0_stack.createParamElemNoParam(P0_FUNC_RET, true, m_curr_packet_in->getType(), m_index_curr_pkt) == 0)
                     bAllocErr = true;
                 else
                     m_curr_spec_depth++;
             }
         }
         break;
 
     // event trace
     case ETM4_PKT_I_EVENT:
         {
             std::vector<uint32_t> params = { 0 };
             params[0] = (uint32_t)m_curr_packet_in->event_val;
             if (m_P0_stack.createParamElem(P0_EVENT, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
                 bAllocErr = true;
 
         }
         break;
 
     /* cycle count packets */
     case ETM4_PKT_I_CCNT_F1:
     case ETM4_PKT_I_CCNT_F2:
     case ETM4_PKT_I_CCNT_F3:
         {
             std::vector<uint32_t> params = { 0 };
             params[0] = m_curr_packet_in->getCC();
             if (m_P0_stack.createParamElem(P0_CC, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
                 bAllocErr = true;
 
         }
         break;
 
     // timestamp
     case ETM4_PKT_I_TIMESTAMP:
         {
             bool bTSwithCC = m_config->enabledCCI();
             uint64_t ts = m_curr_packet_in->getTS();
             std::vector<uint32_t> params = { 0, 0, 0 };
             params[0] = (uint32_t)(ts & 0xFFFFFFFF);
             params[1] = (uint32_t)((ts >> 32) & 0xFFFFFFFF);
             if (bTSwithCC)
                 params[2] = m_curr_packet_in->getCC();
             if (m_P0_stack.createParamElem(bTSwithCC ? P0_TS_CC : P0_TS, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
                 bAllocErr = true;
 
         }
         break;
 
     case ETM4_PKT_I_BAD_SEQUENCE:
-        resp = handleBadPacket("Bad byte sequence in packet.");
+        err = handleBadPacket("Bad byte sequence in packet.");
         break;
 
     case ETM4_PKT_I_BAD_TRACEMODE:
-        resp = handleBadPacket("Invalid packet type for trace mode.");
+        err = handleBadPacket("Invalid packet type for trace mode.");
         break;
 
     case ETM4_PKT_I_RESERVED:
-        resp = handleBadPacket("Reserved packet header");
+        err = handleBadPacket("Reserved packet header");
         break;
 
+    // speculation 
+    case ETM4_PKT_I_MISPREDICT:
+    case ETM4_PKT_I_CANCEL_F1_MISPRED:
+    case ETM4_PKT_I_CANCEL_F2:
+    case ETM4_PKT_I_CANCEL_F3:
+        m_elem_res.mispredict = true;
+        if (m_curr_packet_in->getNumAtoms())
+        {
+            if (m_P0_stack.createAtomElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->getAtom()) == 0)
+                bAllocErr = true;
+            else
+                m_curr_spec_depth += m_curr_packet_in->getNumAtoms();
+        }
+
+    case ETM4_PKT_I_CANCEL_F1:
+        m_elem_res.P0_cancel = m_curr_packet_in->getCancelElem();
+        break;
+                                
+    case ETM4_PKT_I_COMMIT:
+        m_elem_res.P0_commit = m_curr_packet_in->getCommitElem();
+        break;
+
+    case ETM4_PKT_I_OVERFLOW:
+        m_prev_overflow = true;
+    case ETM4_PKT_I_DISCARD:
+        m_curr_spec_depth = 0;
+        m_elem_res.discard = true;
+        break;
+
+        /* Q packets */
+    case ETM4_PKT_I_Q:
+        {
+            TrcStackQElem *pQElem = m_P0_stack.createQElem(m_curr_packet_in->getType(), m_index_curr_pkt, m_curr_packet_in->Q_pkt.q_count);
+            if (pQElem)
+            {
+                if (m_curr_packet_in->Q_pkt.addr_present)
+                {
+                    etmv4_addr_val_t addr;
+
+                    addr.val = m_curr_packet_in->getAddrVal();
+                    addr.isa = m_curr_packet_in->getAddrIS();
+                    pQElem->setAddr(addr);
+                    m_curr_spec_depth++;
+                }
+                else
+                    m_elem_pending_addr = true;
+            }
+            else
+                bAllocErr = true;
+        }
+        break;
+
     /*** presently unsupported packets ***/
     /* conditional instruction tracing */
     case ETM4_PKT_I_COND_FLUSH:
     case ETM4_PKT_I_COND_I_F1:
     case ETM4_PKT_I_COND_I_F2:
     case ETM4_PKT_I_COND_I_F3:
     case ETM4_PKT_I_COND_RES_F1:
     case ETM4_PKT_I_COND_RES_F2:
     case ETM4_PKT_I_COND_RES_F3:
     case ETM4_PKT_I_COND_RES_F4:
-    // speculation 
-    case ETM4_PKT_I_CANCEL_F1:
-    case ETM4_PKT_I_CANCEL_F2:
-    case ETM4_PKT_I_CANCEL_F3:
-    case ETM4_PKT_I_COMMIT:
-    case ETM4_PKT_I_MISPREDICT:
-    case ETM4_PKT_I_DISCARD:
     // data synchronisation markers
     case ETM4_PKT_I_NUM_DS_MKR:
     case ETM4_PKT_I_UNNUM_DS_MKR:
-    /* Q packets */
-    case ETM4_PKT_I_Q:
-        resp = OCSD_RESP_FATAL_INVALID_DATA;
-        LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Unsupported packet type."));
+        // all currently unsupported
+        {
+        ocsd_err_severity_t sev = OCSD_ERR_SEV_ERROR;
+#ifdef OCSD_WARN_UNSUPPORTED
+        sev = OCSD_ERR_SEV_WARN;
+        //resp = OCSD_RESP_WARN_CONT;
+#else
+        //resp = OCSD_RESP_FATAL_INVALID_DATA;
+#endif
+        err = OCSD_ERR_UNSUPP_DECODE_PKT;
+        LogError(ocsdError(sev, err, "Data trace releated, unsupported packet type."));
+        }
         break;
 
     default:
         // any other packet - bad packet error
-        resp = OCSD_RESP_FATAL_INVALID_DATA;
-        LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Unknown packet type."));
+        err = OCSD_ERR_BAD_DECODE_PKT;
+        LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,"Unknown packet type."));
         break;
-
     }
 
-    // we need to wait for following address after exception 
+    // we need to wait for following address after certain packets
     // - work out if we have seen enough here...
-    if(m_except_pending_addr && !is_except)
+    if (is_addr && m_elem_pending_addr)
     {
-        m_except_pending_addr = false;  //next packet has to be an address
-        // exception packet sequence complete
-        if(is_addr)
-        {
-            m_curr_spec_depth++;   // exceptions are P0 elements so up the spec depth to commit if needed.
-        }
-        else
-        {
-            resp = OCSD_RESP_FATAL_INVALID_DATA;
-            LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Expected Address packet to follow exception packet."));
-        }
+        m_curr_spec_depth++;  // increase spec depth for element waiting on address.
+        m_elem_pending_addr = false;  // can't be waiting on both
     }
 
     if(bAllocErr)
     {
-        resp = OCSD_RESP_FATAL_SYS_ERR;
+        err = OCSD_ERR_MEM;
         LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_MEM,"Memory allocation error."));       
     }
     else if(m_curr_spec_depth > m_max_spec_depth)
     {
         // auto commit anything above max spec depth 
         // (this will auto commit anything if spec depth not supported!)
-        m_P0_commit = m_curr_spec_depth - m_max_spec_depth;
-        m_curr_state = COMMIT_ELEM;
-        Complete = false;   // force the processing of the commit elements.        
+        m_elem_res.P0_commit = m_curr_spec_depth - m_max_spec_depth;
     }
-    return resp;
+
+    if (!err && isElemForRes())
+        m_curr_state = RESOLVE_ELEM;
+    return err;
 }
 
 void TrcPktDecodeEtmV4I::doTraceInfoPacket()
 {
     m_trace_info = m_curr_packet_in->getTraceInfo();
     m_cc_threshold = m_curr_packet_in->getCCThreshold();
-    m_p0_key = m_curr_packet_in->getP0Key();
     m_curr_spec_depth = m_curr_packet_in->getCurrSpecDepth();
+
+    // elements associated with data trace
+#ifdef DATA_TRACE_SUPPORTED
+    m_p0_key = m_curr_packet_in->getP0Key();
+#endif
 }
 
+/* Element resolution
+ * Commit or cancel elements as required
+ * Send any buffered output packets.
+ */
+ocsd_datapath_resp_t TrcPktDecodeEtmV4I::resolveElements()
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    bool Complete = false;
+
+    while (!Complete)
+    {
+        if (m_out_elem.numElemToSend())
+            resp = m_out_elem.sendElements();
+        else if (isElemForRes())
+        {
+            ocsd_err_t err = OCSD_OK;
+            if (m_elem_res.P0_commit)
+                err = commitElements();
+
+            if (!err && m_elem_res.P0_cancel)
+                err = cancelElements();
+
+            if (!err && m_elem_res.mispredict)
+                err = mispredictAtom();
+            
+            if (!err && m_elem_res.discard)
+                err = discardElements();
+
+            if (err != OCSD_OK)
+                resp = OCSD_RESP_FATAL_INVALID_DATA;
+        }
+        
+        // break out on error or wait request.
+        if (!OCSD_DATA_RESP_IS_CONT(resp))
+            break;
+
+        // completion is nothing to send and nothing to commit
+        Complete = !m_out_elem.numElemToSend() && !isElemForRes();
+
+        // done all elements - need more packets.
+        if (Complete) {
+            // if we are still in resolve, the goto decode.
+            if (m_curr_state == RESOLVE_ELEM)
+                m_curr_state = DECODE_PKTS;
+        }        
+    }
+    return resp;
+}
+
 /*
  * Walks through the element stack, processing from oldest element to the newest, 
    according to the number of P0 elements that need committing.
+   Build a stack of output elements in the process.
  */
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::commitElements(bool &Complete)
+ocsd_err_t TrcPktDecodeEtmV4I::commitElements()
 {
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    bool bPause = false;    // pause commit operation 
+    ocsd_err_t err = OCSD_OK;
     bool bPopElem = true;       // do we remove the element from the stack (multi atom elements may need to stay!)
-    int num_commit_req = m_P0_commit;
+    int num_commit_req = m_elem_res.P0_commit;
     ocsd_trc_index_t err_idx = 0;
-
-    Complete = true; // assume we exit due to completion of commit operation
-
     TrcStackElem *pElem = 0;    // stacked element pointer
 
-    while(m_P0_commit && !bPause)
+    err = m_out_elem.resetElemStack();
+
+    while(m_elem_res.P0_commit && !err)
     {
-        if(m_P0_stack.size() > 0)
+        if (m_P0_stack.size() > 0)
         {
             pElem = m_P0_stack.back();  // get oldest element
             err_idx = pElem->getRootIndex(); // save index in case of error.
 
             switch (pElem->getP0Type())
             {
             // indicates a trace restart - beginning of trace or discontinuiuty
             case P0_TRC_ON:
-                m_output_elem.setType(OCSD_GEN_TRC_ELEM_TRACE_ON);
-                m_output_elem.trace_on_reason = m_prev_overflow ? TRACE_ON_OVERFLOW : TRACE_ON_NORMAL;
-                m_prev_overflow = false;
-                resp = outputTraceElementIdx(pElem->getRootIndex(),m_output_elem);
-                m_return_stack.flush();
+                err = m_out_elem.addElemType(pElem->getRootIndex(), OCSD_GEN_TRC_ELEM_TRACE_ON);
+                if (!err)
+                {
+                    m_out_elem.getCurrElem().trace_on_reason = m_prev_overflow ? TRACE_ON_OVERFLOW : TRACE_ON_NORMAL;
+                    m_prev_overflow = false;
+                    m_return_stack.flush();
+                }
                 break;
 
             case P0_ADDR:
                 {
                 TrcStackElemAddr *pAddrElem = dynamic_cast<TrcStackElemAddr *>(pElem);
                 m_return_stack.clear_pop_pending(); // address removes the need to pop the indirect address target from the stack
                 if(pAddrElem)
                 {
                     SetInstrInfoInAddrISA(pAddrElem->getAddr().val, pAddrElem->getAddr().isa);
                     m_need_addr = false;
                 }
                 }
                 break;
 
             case P0_CTXT:
                 {
                 TrcStackElemCtxt *pCtxtElem = dynamic_cast<TrcStackElemCtxt *>(pElem);
                 if(pCtxtElem)
                 {
                     etmv4_context_t ctxt = pCtxtElem->getContext();
                     // check this is an updated context
                     if(ctxt.updated)
-                    {
-                        updateContext(pCtxtElem);
-
-                        m_output_elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
-                        resp = outputTraceElementIdx(pElem->getRootIndex(),m_output_elem);
+                    {                        
+                        err = m_out_elem.addElem(pElem->getRootIndex());
+                        if (!err)
+                            updateContext(pCtxtElem, outElem());
                     }
                 }
                 }
                 break;
 
             case P0_EVENT:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = this->outputEvent(pParamElem);
-                }
-                break;
-
             case P0_TS:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputTS(pParamElem,false);
-                }
-                break;
-
             case P0_CC:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputCC(pParamElem);
-                }
-                break;
-
             case P0_TS_CC:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputTS(pParamElem,true);
-                }
+                err = processTS_CC_EventElem(pElem);
                 break;
 
-            case P0_OVERFLOW:
-                m_prev_overflow = true;
-                break;
-
             case P0_ATOM:
                 {
                 TrcStackElemAtom *pAtomElem = dynamic_cast<TrcStackElemAtom *>(pElem);
 
                 if(pAtomElem)
                 {
-                    bool bContProcess = true;
-                    while(!pAtomElem->isEmpty() && m_P0_commit && bContProcess)
+                    while(!pAtomElem->isEmpty() && m_elem_res.P0_commit && !err)
                     {
                         ocsd_atm_val atom = pAtomElem->commitOldest();
 
                         // check if prev atom left us an indirect address target on the return stack
-                        if ((resp = returnStackPop()) != OCSD_RESP_CONT)
+                        if ((err = returnStackPop()) != OCSD_OK)
                             break;
 
                         // if address and context do instruction trace follower.
                         // otherwise skip atom and reduce committed elements
                         if(!m_need_ctxt && !m_need_addr)
                         {
-                            resp = processAtom(atom,bContProcess);
+                            err = processAtom(atom);
                         }
-                        m_P0_commit--; // mark committed 
+                        m_elem_res.P0_commit--; // mark committed 
                     }
                     if(!pAtomElem->isEmpty())   
                         bPopElem = false;   // don't remove if still atoms to process.
                 }
                 }
                 break;
 
             case P0_EXCEP:
                 // check if prev atom left us an indirect address target on the return stack
-                if ((resp = returnStackPop()) != OCSD_RESP_CONT)
+                if ((err = returnStackPop()) != OCSD_OK)
                     break;
 
-                m_excep_info.proc = EXCEP_POP;   // set state in case we need to stop part way through
-                resp = processException();  // output trace + exception elements.
-                m_P0_commit--;
+                err = processException();  // output trace + exception elements.
+                m_elem_res.P0_commit--;
                 break;
 
             case P0_EXCEP_RET:
-                m_output_elem.setType(OCSD_GEN_TRC_ELEM_EXCEPTION_RET);
-                resp = outputTraceElementIdx(pElem->getRootIndex(),m_output_elem);
-                if(pElem->isP0()) // are we on a core that counts ERET as P0?
-                    m_P0_commit--;
+                err = m_out_elem.addElemType(pElem->getRootIndex(), OCSD_GEN_TRC_ELEM_EXCEPTION_RET);
+                if (!err)
+                {
+                    if (pElem->isP0()) // are we on a core that counts ERET as P0?
+                        m_elem_res.P0_commit--;
+                }
                 break;
 
             case P0_FUNC_RET:
                 // func ret is V8M - data trace only - hint that data has been popped off the stack.
                 // at this point nothing to do till the decoder starts handling data trace.
                 if (pElem->isP0()) 
-                    m_P0_commit--;
+                    m_elem_res.P0_commit--;
                 break;
+
+            case P0_Q:
+                err = processQElement();
+                m_elem_res.P0_commit--;
+                break;
             }
 
             if(bPopElem)
                 m_P0_stack.delete_back();  // remove element from stack;
-
-            // if response not continue, then break out of the loop.
-            if(!OCSD_DATA_RESP_IS_CONT(resp))
-            {
-                bPause = true;
-            }
         }
         else
         {
             // too few elements for commit operation - decode error.
-            resp = OCSD_RESP_FATAL_INVALID_DATA;
+            err = OCSD_ERR_COMMIT_PKT_OVERRUN;
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_COMMIT_PKT_OVERRUN,err_idx,m_CSID,"Not enough elements to commit"));
-            bPause = true;
         }
     }
 
-    // done all elements - need more packets.
-    if(m_P0_commit == 0)    
-        m_curr_state = DECODE_PKTS;
-
     // reduce the spec depth by number of comitted elements
-    m_curr_spec_depth -= (num_commit_req-m_P0_commit);
-    return resp;
+    m_curr_spec_depth -= (num_commit_req-m_elem_res.P0_commit);
+    return err;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::returnStackPop()
+ocsd_err_t TrcPktDecodeEtmV4I::returnStackPop()
 {
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    ocsd_err_t err = OCSD_OK;
     ocsd_isa nextISA;
-    
+       
     if (m_return_stack.pop_pending())
     {
         ocsd_vaddr_t popAddr = m_return_stack.pop(nextISA);
         if (m_return_stack.overflow())
         {
-            resp = OCSD_RESP_FATAL_INVALID_DATA;
-            LogError(ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_RET_STACK_OVERFLOW, "Trace Return Stack Overflow."));
+            err = OCSD_ERR_RET_STACK_OVERFLOW;
+            LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, "Trace Return Stack Overflow."));
         }
         else
         {
             m_instr_info.instr_addr = popAddr;
             m_instr_info.isa = nextISA;
             m_need_addr = false;
         }
     }
-    return resp;
+    return err;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::flushEOT()
+ocsd_err_t TrcPktDecodeEtmV4I::commitElemOnEOT()
 {
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    if(m_flush_EOT)
+    ocsd_err_t err = OCSD_OK;
+    TrcStackElem *pElem = 0;
+
+    // nothing outstanding - reset the stack before we add more
+    if (!m_out_elem.numElemToSend())
+        m_out_elem.resetElemStack();
+
+    while((m_P0_stack.size() > 0) && !err)
     {
-        TrcStackElem *pElem = 0;
-        while(OCSD_DATA_RESP_IS_CONT(resp) && (m_P0_stack.size() > 0))
-        {
-            // scan for outstanding events, TS and CC, before any outstanding
-            // P0 commit elements.
-            pElem = m_P0_stack.back();
+        // scan for outstanding events, TS and CC, that appear before any outstanding
+        // uncommited P0 element.
+        pElem = m_P0_stack.back();
             
             switch(pElem->getP0Type())
             {
                 // clear stack and stop
             case P0_UNKNOWN:
             case P0_ATOM:
             case P0_TRC_ON:
             case P0_EXCEP:
             case P0_EXCEP_RET:
             case P0_OVERFLOW:
+            case P0_Q:
                 m_P0_stack.delete_all();
                 break;
 
-                //skip
-            case P0_ADDR:
-            case P0_CTXT:
-                break;
+            //skip
+        case P0_ADDR:
+        case P0_CTXT:
+            break;
 
-                // output
-            case P0_EVENT:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = this->outputEvent(pParamElem);
-                }
-                break;
+            // output
+        case P0_EVENT:
+        case P0_TS:
+        case P0_CC:
+        case P0_TS_CC:
+            err = processTS_CC_EventElem(pElem);
+            break;
+        }
+        m_P0_stack.delete_back();
+    }
 
-            case P0_TS:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputTS(pParamElem,false);
-                }
-                break;
+    if(!err)
+    {
+        err = m_out_elem.addElemType(m_index_curr_pkt, OCSD_GEN_TRC_ELEM_EO_TRACE);
+        outElem().setUnSyncEOTReason(m_prev_overflow ? UNSYNC_OVERFLOW : UNSYNC_EOT);
+    }
+    return err;
+}
 
-            case P0_CC:
-                {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputCC(pParamElem);
+// cancel elements. These not output  
+ocsd_err_t TrcPktDecodeEtmV4I::cancelElements()
+{
+    ocsd_err_t err = OCSD_OK;
+    bool P0StackDone = false;  // checked all P0 elements on the stack
+    TrcStackElem *pElem = 0;   // stacked element pointer
+    EtmV4P0Stack temp;
+    int num_cancel_req = m_elem_res.P0_cancel;
+    
+    while (m_elem_res.P0_cancel)
+    {
+        //search the stack for the newest elements 
+        if (!P0StackDone)
+        {
+            if (m_P0_stack.size() == 0)
+                P0StackDone = true;
+            else
+            {
+                // get the newest element
+                pElem = m_P0_stack.front();
+                if (pElem->isP0()) {
+                    if (pElem->getP0Type() == P0_ATOM)
+                    { 
+                        TrcStackElemAtom *pAtomElem = (TrcStackElemAtom *)pElem;
+                        // atom - cancel N atoms
+                        m_elem_res.P0_cancel -= pAtomElem->cancelNewest(m_elem_res.P0_cancel);
+                        if (pAtomElem->isEmpty())
+                            m_P0_stack.delete_front();  // remove the element
+                    }
+                    else
+                    {
+                        m_elem_res.P0_cancel--;
+                        m_P0_stack.delete_front();  // remove the element
+                    }
+                } else {
+                // not P0, make a keep / remove decision
+                    switch (pElem->getP0Type())
+                    {
+                    // keep these 
+                    case P0_EVENT:
+                    case P0_TS:
+                    case P0_CC:
+                    case P0_TS_CC:
+                        m_P0_stack.pop_front(false);
+                        temp.push_back(pElem);
+                        break;
+
+                    default:
+                        m_P0_stack.delete_front();
+                        break;
+                    }
                 }
-                break;
+            }
+        }
+        // may have some unseen elements
+        else if (m_unseen_spec_elem)
+        {
+            m_unseen_spec_elem--;
+            m_elem_res.P0_cancel--;
+        }
+        // otherwise we have some sort of overrun
+        else
+        {
+            // too few elements for commit operation - decode error.
+            err = OCSD_ERR_COMMIT_PKT_OVERRUN;
+            LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, m_index_curr_pkt, m_CSID, "Not enough elements to cancel"));
+            m_elem_res.P0_cancel = 0;
+            break;
+        }
+       
+        if (temp.size())
+        {
+            while (temp.size())
+            {
+                pElem = temp.back();
+                m_P0_stack.push_front(pElem);
+                temp.pop_back(false);
+            }
+        }
+    }
+    m_curr_spec_depth -= num_cancel_req - m_elem_res.P0_cancel;
+    return err;
+}
 
-            case P0_TS_CC:
+// mispredict an atom
+ocsd_err_t TrcPktDecodeEtmV4I::mispredictAtom()
+{
+    ocsd_err_t err = OCSD_OK;
+    bool bFoundAtom = false, bDone = false;
+    TrcStackElem *pElem = 0;
+       
+    m_P0_stack.from_front_init();   // init iterator at front.
+    while (!bDone)
+    {
+        pElem = m_P0_stack.from_front_next();
+        if (pElem)
+        {
+            if (pElem->getP0Type() == P0_ATOM)
+            {
+                TrcStackElemAtom *pAtomElem = dynamic_cast<TrcStackElemAtom *>(pElem);
+                if (pAtomElem)
                 {
-                TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
-                if(pParamElem)
-                    resp = outputTS(pParamElem,true);
+                    pAtomElem->mispredictNewest();
+                    bFoundAtom = true;
                 }
-                break;
+                bDone = true;
             }
-            m_P0_stack.delete_back();
+            else if (pElem->getP0Type() == P0_ADDR)
+            {
+                // need to disregard any addresses that appear between mispredict and the atom in question
+                m_P0_stack.erase_curr_from_front();
+            }
         }
+        else
+            bDone = true;
+    }
+   
+    // if missed atom then either overrun error or mispredict on unseen element
+    if (!bFoundAtom && !m_unseen_spec_elem)
+    {
+        err = OCSD_ERR_COMMIT_PKT_OVERRUN;
+        LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, m_index_curr_pkt, m_CSID, "Not found mispredict atom"));
+    }
+    m_elem_res.mispredict = false;
+    return err;
+}
 
-        if(OCSD_DATA_RESP_IS_CONT(resp) && (m_P0_stack.size() == 0))
+// discard elements and flush
+ocsd_err_t TrcPktDecodeEtmV4I::discardElements()
+{
+    ocsd_err_t err = OCSD_OK;
+    TrcStackElem *pElem = 0;   // stacked element pointer
+
+    // dump P0, elemnts - output remaining CC / TS
+    while ((m_P0_stack.size() > 0) && !err)
+    {
+        pElem = m_P0_stack.back();
+        err = processTS_CC_EventElem(pElem);
+        m_P0_stack.delete_back();
+    }
+
+    // clear all speculation info
+    clearElemRes(); 
+    m_curr_spec_depth = 0;
+
+    // set decode state
+    m_curr_state = NO_SYNC;
+    m_unsync_eot_info = m_prev_overflow ? UNSYNC_OVERFLOW : UNSYNC_DISCARD;
+
+    // unsync so need context & address.
+    m_need_ctxt = true;
+    m_need_addr = true;
+    m_elem_pending_addr = false;
+    return err;
+}
+
+ocsd_err_t TrcPktDecodeEtmV4I::processTS_CC_EventElem(TrcStackElem *pElem)
+{
+    ocsd_err_t err = OCSD_OK;
+
+    switch (pElem->getP0Type())
+    {
+        case P0_EVENT:
         {
-            m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
-            resp = outputTraceElement(m_output_elem);
-            m_flush_EOT = false;
+            TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
+            if (pParamElem)
+                err = addElemEvent(pParamElem);
         }
+        break;
+
+        case P0_TS:
+        {
+            TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
+            if (pParamElem)
+                err = addElemTS(pParamElem, false);
+        }
+        break;
+
+        case P0_CC:
+        {
+            TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
+            if (pParamElem)
+                err = addElemCC(pParamElem);
+        }
+        break;
+
+        case P0_TS_CC:
+        {
+            TrcStackElemParam *pParamElem = dynamic_cast<TrcStackElemParam *>(pElem);
+            if (pParamElem)
+                err = addElemTS(pParamElem, true);
+        }
+        break;
     }
-    return resp;
+    return err;
+
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::outputCC(TrcStackElemParam *pParamElem)
+ocsd_err_t TrcPktDecodeEtmV4I::addElemCC(TrcStackElemParam *pParamElem)
 {
-    m_output_elem.setType(OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
-    m_output_elem.setCycleCount(pParamElem->getParam(0));
-    return outputTraceElementIdx(pParamElem->getRootIndex(),m_output_elem);
+    ocsd_err_t err = OCSD_OK;
+
+    err = m_out_elem.addElemType(pParamElem->getRootIndex(), OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
+    if (!err)
+        outElem().setCycleCount(pParamElem->getParam(0));
+    return err;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::outputTS(TrcStackElemParam *pParamElem, bool withCC)
+ocsd_err_t TrcPktDecodeEtmV4I::addElemTS(TrcStackElemParam *pParamElem, bool withCC)
 {
-    m_output_elem.setType(OCSD_GEN_TRC_ELEM_TIMESTAMP);
-    m_output_elem.timestamp = (uint64_t)(pParamElem->getParam(0)) | (((uint64_t)pParamElem->getParam(1)) << 32);
-    if(withCC)
-        m_output_elem.setCycleCount(pParamElem->getParam(2));
-    return outputTraceElementIdx(pParamElem->getRootIndex(),m_output_elem);
+    ocsd_err_t err = OCSD_OK;
+
+    err = m_out_elem.addElemType(pParamElem->getRootIndex(), OCSD_GEN_TRC_ELEM_TIMESTAMP);
+    if (!err)
+    {
+        outElem().timestamp = (uint64_t)(pParamElem->getParam(0)) | (((uint64_t)pParamElem->getParam(1)) << 32);
+        if (withCC)
+            outElem().setCycleCount(pParamElem->getParam(2));
+    }
+    return err;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::outputEvent(TrcStackElemParam *pParamElem)
+ocsd_err_t TrcPktDecodeEtmV4I::addElemEvent(TrcStackElemParam *pParamElem)
 {
-    m_output_elem.setType(OCSD_GEN_TRC_ELEM_EVENT);
-    m_output_elem.trace_event.ev_type = EVENT_NUMBERED;
-    m_output_elem.trace_event.ev_number = pParamElem->getParam(0);
-    return outputTraceElementIdx(pParamElem->getRootIndex(),m_output_elem);
+    ocsd_err_t err = OCSD_OK;
+
+    err = m_out_elem.addElemType(pParamElem->getRootIndex(), OCSD_GEN_TRC_ELEM_EVENT);
+    if (!err)
+    {
+        outElem().trace_event.ev_type = EVENT_NUMBERED;
+        outElem().trace_event.ev_number = pParamElem->getParam(0);
+    }
+    return err;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::outputTraceRange(const bool executed, ocsd_trc_index_t index)
+void TrcPktDecodeEtmV4I::setElemTraceRange(OcsdTraceElement &elemIn, const instr_range_t &addr_range, 
+                                           const bool executed, ocsd_trc_index_t index)
 {
-    m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
-    m_output_elem.setLastInstrInfo(executed, m_instr_info.type, m_instr_info.sub_type, m_instr_info.instr_size);
-    m_output_elem.setISA(m_instr_info.isa);
-    m_output_elem.setLastInstrCond(m_instr_info.is_conditional);
+    elemIn.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
+    elemIn.setLastInstrInfo(executed, m_instr_info.type, m_instr_info.sub_type, m_instr_info.instr_size);
+    elemIn.setISA(m_instr_info.isa);
+    elemIn.setLastInstrCond(m_instr_info.is_conditional);
+    elemIn.setAddrRange(addr_range.st_addr, addr_range.en_addr, addr_range.num_instr);
     if (executed)
         m_instr_info.isa = m_instr_info.next_isa;
-    return outputTraceElementIdx(index, m_output_elem);
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::processAtom(const ocsd_atm_val atom, bool &bCont)
+ocsd_err_t TrcPktDecodeEtmV4I::processAtom(const ocsd_atm_val atom)
 {
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
-    TrcStackElem *pElem = m_P0_stack.back();  // get the atom element
-    bool bWPFound = false;
     ocsd_err_t err;
-    bCont = true;
+    TrcStackElem *pElem = m_P0_stack.back();  // get the atom element
+    WP_res_t WPRes;
+    instr_range_t addr_range;
 
-    err = traceInstrToWP(bWPFound);
+    // new element for this processed atom
+    if ((err = m_out_elem.addElem(pElem->getRootIndex())) != OCSD_OK)
+        return err;
+
+    err = traceInstrToWP(addr_range, WPRes);
     if(err != OCSD_OK)
     {
         if(err == OCSD_ERR_UNSUPPORTED_ISA)
         {
              m_need_addr = true;
              m_need_ctxt = true;
              LogError(ocsdError(OCSD_ERR_SEV_WARN,err,pElem->getRootIndex(),m_CSID,"Warning: unsupported instruction set processing atom packet."));  
              // wait for next context
-             return resp;
+             return OCSD_OK;
         }
         else
         {
-            bCont = false;
-            resp = OCSD_RESP_FATAL_INVALID_DATA;
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,pElem->getRootIndex(),m_CSID,"Error processing atom packet."));  
-            return resp;
+            return err;
         }
     }
 
-    if(bWPFound)
+    if(WPFound(WPRes))
     {
         //  save recorded next instuction address
         ocsd_vaddr_t nextAddr = m_instr_info.instr_addr;
 
         // action according to waypoint type and atom value
         switch(m_instr_info.type)
         {
         case OCSD_INSTR_BR:
             if (atom == ATOM_E)
             {
                 m_instr_info.instr_addr = m_instr_info.branch_addr;
                 if (m_instr_info.is_link)
                     m_return_stack.push(nextAddr, m_instr_info.isa);
 
             }
             break;
 
         case OCSD_INSTR_BR_INDIRECT:
             if (atom == ATOM_E)
             {
                 m_need_addr = true; // indirect branch taken - need new address.
                 if (m_instr_info.is_link)
                     m_return_stack.push(nextAddr,m_instr_info.isa);
                 m_return_stack.set_pop_pending();  // need to know next packet before we know what is to happen
             }
             break;
         }
-        resp = outputTraceRange((atom == ATOM_E), pElem->getRootIndex());
-
+        setElemTraceRange(outElem(), addr_range, (atom == ATOM_E), pElem->getRootIndex());
     }
     else
     {
         // no waypoint - likely inaccessible memory range.
         m_need_addr = true; // need an address update 
 
-        if(m_output_elem.st_addr != m_output_elem.en_addr)
+        if(addr_range.st_addr != addr_range.en_addr)
         {
             // some trace before we were out of memory access range
-            resp = outputTraceRange(true, pElem->getRootIndex());
+            setElemTraceRange(outElem(), addr_range, true, pElem->getRootIndex());
+
+            // another element for the nacc...
+            if (WPNacc(WPRes))
+                err = m_out_elem.addElem(pElem->getRootIndex());
         }
 
-        if(m_mem_nacc_pending && OCSD_DATA_RESP_IS_CONT(resp))
+        if(WPNacc(WPRes) && !err)
         {
-            m_output_elem.setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
-            m_output_elem.st_addr = m_nacc_addr;
-            resp = outputTraceElementIdx(pElem->getRootIndex(),m_output_elem);
-            m_mem_nacc_pending = false;
+            outElem().setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
+            outElem().st_addr = m_instr_info.instr_addr;
         }
     }
-
-    if(!OCSD_DATA_RESP_IS_CONT(resp))
-        bCont = false;
-
-    return resp;
+    return err;
 }
 
 // Exception processor
-ocsd_datapath_resp_t  TrcPktDecodeEtmV4I::processException()
+ocsd_err_t TrcPktDecodeEtmV4I::processException()
 {
-    ocsd_datapath_resp_t resp = OCSD_RESP_CONT; 
-    TrcStackElemExcept *pExceptElem;
+    ocsd_err_t err;
+    TrcStackElem *pElem = 0;
+    TrcStackElemExcept *pExceptElem = 0;
+    TrcStackElemAddr *pAddressElem = 0;
+    TrcStackElemCtxt *pCtxtElem = 0;
+    bool branch_target = false;    // exception address implies prior branch target address
+    ocsd_vaddr_t excep_ret_addr;
+    ocsd_trc_index_t excep_pkt_index;
+    WP_res_t WPRes = WP_NOT_FOUND;
 
-    m_excep_info.addr_b_tgt = false;
-    
-    if(m_excep_info.proc == EXCEP_POP)
+    // grab the exception element off the stack
+    pExceptElem = dynamic_cast<TrcStackElemExcept *>(m_P0_stack.back());  // get the exception element
+    excep_pkt_index = pExceptElem->getRootIndex();
+    branch_target = pExceptElem->getPrevSame();
+    m_P0_stack.pop_back(); // remove the exception element
+
+    pElem = m_P0_stack.back();  // look at next element.
+    if(pElem->getP0Type() == P0_CTXT)
     {
-        pExceptElem = dynamic_cast<TrcStackElemExcept *>(m_P0_stack.back());  // get the exception element
-        TrcStackElemAddr *pAddressElem = 0;
-        TrcStackElemCtxt *pCtxtElem = 0;
-        TrcStackElem *pElem = 0;
-    
-        m_P0_stack.pop_back(); // remove the exception element
-        pElem = m_P0_stack.back();  // look at next element.
-        if(pElem->getP0Type() == P0_CTXT)
-        {
-            pCtxtElem = dynamic_cast<TrcStackElemCtxt *>(pElem);
-            m_P0_stack.pop_back(); // remove the context element
-            pElem = m_P0_stack.back();  // next one should be an address element
-        }
+        pCtxtElem = dynamic_cast<TrcStackElemCtxt *>(pElem);
+        m_P0_stack.pop_back(); // remove the context element
+        pElem = m_P0_stack.back();  // next one should be an address element
+    }
    
-        if(pElem->getP0Type() != P0_ADDR)
-        {
-            // no following address element - indicate processing error.
-            resp = OCSD_RESP_FATAL_INVALID_DATA;
-            LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ,pExceptElem->getRootIndex(),m_CSID,"Address missing in exception packet."));  
-        }
-        else
-        {
-            // extract address
-            pAddressElem = static_cast<TrcStackElemAddr *>(pElem);
+   if(pElem->getP0Type() != P0_ADDR)
+   {
+       // no following address element - indicate processing error.      
+       LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ, excep_pkt_index,m_CSID,"Address missing in exception packet."));
+       return OCSD_ERR_BAD_PACKET_SEQ;
+   }
+   else
+   {
+        // extract address
+        pAddressElem = static_cast<TrcStackElemAddr *>(pElem);
+        excep_ret_addr = pAddressElem->getAddr().val;
 
-            // fill in exception info for use later
-            m_excep_info.addr = pAddressElem->getAddr();                
-            m_excep_info.number = pExceptElem->getExcepNum();
-            m_excep_info.index = pExceptElem->getRootIndex();
-            m_excep_info.addr_b_tgt = pExceptElem->getPrevSame();
-
-            // see if there is an address + optional context element implied 
-            // prior to the exception.
-            if (m_excep_info.addr_b_tgt)
-            {
-                // this was a branch target address - update current setting
-                bool b64bit = m_instr_info.isa == ocsd_isa_aarch64;
-                if (pCtxtElem) {
-                    b64bit = pCtxtElem->getContext().SF;
-                }
-                m_instr_info.instr_addr = m_excep_info.addr.val;
-                m_instr_info.isa = (m_excep_info.addr.isa == 0) ? 
-                    (b64bit ? ocsd_isa_aarch64 : ocsd_isa_arm) : ocsd_isa_thumb2;
-                m_need_addr = false;
-            }
-
-            // figure out next move
+        // see if there is an address + optional context element implied 
+        // prior to the exception.
+        if (branch_target)
+        {
+            // this was a branch target address - update current setting
+            bool b64bit = m_instr_info.isa == ocsd_isa_aarch64;
             if (pCtxtElem) {
-                m_excep_info.proc = EXCEP_CTXT;
-                updateContext(pCtxtElem);
+                b64bit = pCtxtElem->getContext().SF;
             }
-            else if(m_excep_info.addr.val == m_instr_info.instr_addr)
-                m_excep_info.proc = EXCEP_EXCEP;
-            else
-                m_excep_info.proc = EXCEP_RANGE;
+
+            // as the exception address was also a branch target address then update the 
+            // current maintained address value. This also means that there is no range to
+            // output before the exception packet.
+            m_instr_info.instr_addr = excep_ret_addr; 
+            m_instr_info.isa = (pAddressElem->getAddr().isa == 0) ?
+                    (b64bit ? ocsd_isa_aarch64 : ocsd_isa_arm) : ocsd_isa_thumb2;
+            m_need_addr = false;
         }
-        m_P0_stack.delete_popped();
-    }
+    }   
 
-    // output a context element
-    if (m_excep_info.proc == EXCEP_CTXT)
-    {
-        m_output_elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
-        resp = outputTraceElementIdx(m_excep_info.index, m_output_elem);
-        m_excep_info.proc = EXCEP_EXCEP;
-        if (!OCSD_DATA_RESP_IS_CONT(resp))
-            return resp;
-    }
+    // need to output something - set up an element
+    if ((err = m_out_elem.addElem(excep_pkt_index)))
+        return err;  
 
-    // output a range element
-    if(m_excep_info.proc == EXCEP_RANGE) 
+    // output a context element if present
+    if (pCtxtElem)
     {
-        bool bWPFound = false;
-        ocsd_err_t err;
+        updateContext(pCtxtElem, outElem());
 
-        // last instr_info address is the start address
-        m_output_elem.st_addr = m_instr_info.instr_addr;
+        // used the element - need another for later stages
+        if ((err = m_out_elem.addElem(excep_pkt_index)))
+            return err;
+    }
 
+    // if the preferred return address is not the end of the last output range...
+    if (m_instr_info.instr_addr != excep_ret_addr)
+    {        
+        bool range_out = false;
+        instr_range_t addr_range;
+
         // look for match to return address.
-        err = traceInstrToWP(bWPFound,true,m_excep_info.addr.val);
+        err = traceInstrToWP(addr_range, WPRes, true, excep_ret_addr);
 
         if(err != OCSD_OK)
         {
             if(err == OCSD_ERR_UNSUPPORTED_ISA)
             {
                 m_need_addr = true;
                 m_need_ctxt = true;
-                LogError(ocsdError(OCSD_ERR_SEV_WARN,err,m_excep_info.index,m_CSID,"Warning: unsupported instruction set processing exception packet."));  
+                LogError(ocsdError(OCSD_ERR_SEV_WARN,err, excep_pkt_index,m_CSID,"Warning: unsupported instruction set processing exception packet."));
             }
             else
             {
-                resp = OCSD_RESP_FATAL_INVALID_DATA;
-                LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,m_excep_info.index,m_CSID,"Error processing exception packet."));  
-                m_excep_info.proc = EXCEP_POP;  // nothing more to do, reset to start of exception handling
+                LogError(ocsdError(OCSD_ERR_SEV_ERROR,err, excep_pkt_index,m_CSID,"Error processing exception packet."));
             }
+            return err;
         }
 
-        if(bWPFound)
+        if(WPFound(WPRes))
         {
             // waypoint address found - output range
-            resp = outputTraceRange(true, m_excep_info.index);
-            m_excep_info.proc = EXCEP_EXCEP;
+            setElemTraceRange(outElem(), addr_range, true, excep_pkt_index);
+            range_out = true;
         }
         else
         {
             // no waypoint - likely inaccessible memory range.
             m_need_addr = true; // need an address update 
             
-            if(m_output_elem.st_addr != m_output_elem.en_addr)
+            if(addr_range.st_addr != addr_range.en_addr)
             {
                 // some trace before we were out of memory access range
-                resp = outputTraceRange(true, m_excep_info.index);
+                setElemTraceRange(outElem(), addr_range, true, excep_pkt_index);
+                range_out = true;
             }
+        }
 
-            m_excep_info.proc = m_mem_nacc_pending ? EXCEP_NACC : EXCEP_EXCEP;
+        // used the element need another for NACC or EXCEP.
+        if (range_out)
+        {
+            if ((err = m_out_elem.addElem(excep_pkt_index)))
+                return err;
         }
-    }  
-    
-    if((m_excep_info.proc == EXCEP_NACC) && OCSD_DATA_RESP_IS_CONT(resp))
+    }
+   
+    // watchpoint walk resulted in inaccessible memory call...
+    if (WPNacc(WPRes))
     {
-        m_output_elem.setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
-        m_output_elem.st_addr = m_nacc_addr;
-        resp = outputTraceElementIdx(m_excep_info.index,m_output_elem);
-        m_excep_info.proc = EXCEP_EXCEP;
-        m_mem_nacc_pending = false;
+        
+        outElem().setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
+        outElem().st_addr = m_instr_info.instr_addr;
+
+        // used the element - need another for the final exception packet.
+        if ((err = m_out_elem.addElem(excep_pkt_index)))
+            return err;
     }
     
-    if((m_excep_info.proc == EXCEP_EXCEP) && OCSD_DATA_RESP_IS_CONT(resp))
+    // output exception element.
+    outElem().setType(OCSD_GEN_TRC_ELEM_EXCEPTION);
+
+    // add end address as preferred return address to end addr in element
+    outElem().en_addr = excep_ret_addr;
+    outElem().excep_ret_addr = 1;
+    outElem().excep_ret_addr_br_tgt = branch_target;
+    outElem().exception_number = pExceptElem->getExcepNum();
+
+    m_P0_stack.delete_popped();     // clear the used elements from the stack
+    return err;
+}
+
+ocsd_err_t TrcPktDecodeEtmV4I::processQElement()
+{
+    ocsd_err_t err = OCSD_OK;
+    TrcStackQElem *pQElem;
+    etmv4_addr_val_t QAddr; // address where trace restarts 
+    int iCount = 0;
+
+    pQElem = dynamic_cast<TrcStackQElem *>(m_P0_stack.back());  // get the exception element
+    m_P0_stack.pop_back(); // remove the Q element.
+
+    if (!pQElem->hasAddr())  // no address - it must be next on the stack....
     {
-        // output element.
-        m_output_elem.setType(OCSD_GEN_TRC_ELEM_EXCEPTION);
-        // add end address as preferred return address to end addr in element
-        m_output_elem.en_addr = m_excep_info.addr.val;
-        m_output_elem.excep_ret_addr = 1;
-        m_output_elem.excep_ret_addr_br_tgt = m_excep_info.addr_b_tgt;
-        m_output_elem.exception_number = m_excep_info.number;
-        resp = outputTraceElementIdx(m_excep_info.index,m_output_elem);  
-        m_excep_info.proc = EXCEP_POP;
-    }   
-    return resp;
+        TrcStackElemAddr *pAddressElem = 0;
+        TrcStackElemCtxt *pCtxtElem = 0;
+        TrcStackElem *pElem = 0;
+
+        pElem = m_P0_stack.back();  // look at next element.
+        if (pElem->getP0Type() == P0_CTXT)
+        {
+            pCtxtElem = dynamic_cast<TrcStackElemCtxt *>(pElem);
+            m_P0_stack.pop_back(); // remove the context element
+            pElem = m_P0_stack.back();  // next one should be an address element
+        }
+
+        if (pElem->getP0Type() != P0_ADDR)
+        {
+            // no following address element - indicate processing error.
+            err = OCSD_ERR_BAD_PACKET_SEQ;
+            LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, pQElem->getRootIndex(), m_CSID, "Address missing in Q packet."));
+            m_P0_stack.delete_popped();
+            return err;
+        }
+        pAddressElem = dynamic_cast<TrcStackElemAddr *>(pElem);
+        QAddr = pAddressElem->getAddr();
+        m_P0_stack.pop_back();  // remove the address element
+        m_P0_stack.delete_popped(); // clear used elements
+
+        // return the context element for processing next time.
+        if (pCtxtElem)
+        {
+            // need a new copy at the back - old one will be deleted as popped.
+            m_P0_stack.createContextElem(pCtxtElem->getRootPkt(), pCtxtElem->getRootIndex(), pCtxtElem->getContext(),true);
+        }
+    }
+    else
+        QAddr = pQElem->getAddr();
+
+    // process the Q element with address. 
+    iCount = pQElem->getInstrCount();
+
+    bool isBranch = false;
+
+    // need to output something - set up an element
+    if ((err = m_out_elem.addElem(pQElem->getRootIndex())))
+        return err;
+
+    instr_range_t addr_range;
+    addr_range.st_addr = addr_range.en_addr = m_instr_info.instr_addr;
+    addr_range.num_instr = 0;
+
+    // walk iCount instructions
+    for (int i = 0; i < iCount; i++)
+    {
+        uint32_t opcode;
+        uint32_t bytesReq = 4;
+
+        err = accessMemory(m_instr_info.instr_addr, getCurrMemSpace(), &bytesReq, (uint8_t *)&opcode);
+        if (err != OCSD_OK) break;
+
+        if (bytesReq == 4) // got data back
+        {
+            m_instr_info.opcode = opcode;
+            err = instrDecode(&m_instr_info);
+            if (err != OCSD_OK) break;
+
+            // increment address - may be adjusted by direct branch value later
+            m_instr_info.instr_addr += m_instr_info.instr_size;
+            addr_range.num_instr++;
+
+            isBranch = (m_instr_info.type == OCSD_INSTR_BR) ||
+                (m_instr_info.type == OCSD_INSTR_BR_INDIRECT);
+
+            // on a branch no way of knowing if taken - bail out
+            if (isBranch)
+                break;
+        }
+        else
+            break;  // missing memory
+
+    }
+
+    if (err == OCSD_OK)
+    {
+        bool inCompleteRange = true;
+        if (iCount && (addr_range.num_instr == (unsigned)iCount))
+        {
+            if ((m_instr_info.instr_addr == QAddr.val) ||    // complete range
+                (isBranch)) // or ends on branch - only way we know if branch taken.
+            {
+                // output a range and continue
+                inCompleteRange = false;
+                // update the range decoded address in the output packet.
+                addr_range.en_addr = m_instr_info.instr_addr;
+                setElemTraceRange(outElem(), addr_range, true, pQElem->getRootIndex());
+            }
+        }
+
+        if (inCompleteRange)
+        {   
+            // unknown instructions executed.
+            addr_range.en_addr = QAddr.val;
+            addr_range.num_instr = iCount;
+
+            outElem().setType(OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH);
+            outElem().setAddrRange(addr_range.st_addr, addr_range.en_addr, addr_range.num_instr);
+            outElem().setISA(calcISA(m_is_64bit, QAddr.isa));
+        }
+
+        // after the Q element, tracing resumes at the address supplied
+        SetInstrInfoInAddrISA(QAddr.val, QAddr.isa);
+        m_need_addr = false;
+    }
+    else
+    {
+        // output error and halt decode.
+        LogError(ocsdError(OCSD_ERR_SEV_ERROR, err, pQElem->getRootIndex(), m_CSID, "Error processing Q packet"));
+    }
+    m_P0_stack.delete_popped();
+    return err;
 }
 
 void TrcPktDecodeEtmV4I::SetInstrInfoInAddrISA(const ocsd_vaddr_t addr_val, const uint8_t isa)
 {
     m_instr_info.instr_addr = addr_val;
-    if(m_is_64bit)
-        m_instr_info.isa = ocsd_isa_aarch64;
-    else
-        m_instr_info.isa = (isa == 0) ? ocsd_isa_arm : ocsd_isa_thumb2;
+    m_instr_info.isa = calcISA(m_is_64bit, isa);
 }
 
 // trace an instruction range to a waypoint - and set next address to restart from.
-ocsd_err_t TrcPktDecodeEtmV4I::traceInstrToWP(bool &bWPFound, const bool traceToAddrNext /*= false*/, const ocsd_vaddr_t nextAddrMatch /*= 0*/)
+ocsd_err_t TrcPktDecodeEtmV4I::traceInstrToWP(instr_range_t &range, WP_res_t &WPRes, const bool traceToAddrNext /*= false*/, const ocsd_vaddr_t nextAddrMatch /*= 0*/)
 {
     uint32_t opcode;
     uint32_t bytesReq;
     ocsd_err_t err = OCSD_OK;
 
-    // TBD?: update mem space to allow for EL as well.
-    ocsd_mem_space_acc_t mem_space = m_is_secure ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N;
+    range.st_addr = range.en_addr = m_instr_info.instr_addr;
+    range.num_instr = 0;
 
-    m_output_elem.st_addr = m_output_elem.en_addr = m_instr_info.instr_addr;
-    m_output_elem.num_instr_range = 0;
+    WPRes = WP_NOT_FOUND;
 
-    bWPFound = false;
-
-    while(!bWPFound && !m_mem_nacc_pending)
+    while(WPRes == WP_NOT_FOUND)
     {
         // start off by reading next opcode;
         bytesReq = 4;
-        err = accessMemory(m_instr_info.instr_addr,mem_space,&bytesReq,(uint8_t *)&opcode);
+        err = accessMemory(m_instr_info.instr_addr, getCurrMemSpace(),&bytesReq,(uint8_t *)&opcode);
         if(err != OCSD_OK) break;
 
         if(bytesReq == 4) // got data back
         {
             m_instr_info.opcode = opcode;
             err = instrDecode(&m_instr_info);
             if(err != OCSD_OK) break;
 
             // increment address - may be adjusted by direct branch value later
             m_instr_info.instr_addr += m_instr_info.instr_size;
+            range.num_instr++;
 
-            // update the range decoded address in the output packet.
-            m_output_elem.en_addr = m_instr_info.instr_addr;
-            m_output_elem.num_instr_range++;
-
             // either walking to match the next instruction address or a real watchpoint
-            if(traceToAddrNext)
-                bWPFound = (m_output_elem.en_addr == nextAddrMatch);
-            else
-                bWPFound = (m_instr_info.type != OCSD_INSTR_OTHER);
+            if (traceToAddrNext)
+            {
+                if (m_instr_info.instr_addr == nextAddrMatch) 
+                    WPRes = WP_FOUND;
+            }
+            else if (m_instr_info.type != OCSD_INSTR_OTHER)
+                WPRes = WP_FOUND;
         }
         else
         {
             // not enough memory accessible.
-            m_mem_nacc_pending = true;
-            m_nacc_addr = m_instr_info.instr_addr;           
+            WPRes = WP_NACC;
         }
     }
+    // update the range decoded address in the output packet.
+    range.en_addr = m_instr_info.instr_addr;
     return err;
 }
 
-void TrcPktDecodeEtmV4I::updateContext(TrcStackElemCtxt *pCtxtElem)
+void TrcPktDecodeEtmV4I::updateContext(TrcStackElemCtxt *pCtxtElem, OcsdTraceElement &elem)
 {
     etmv4_context_t ctxt = pCtxtElem->getContext();
-    // map to output element  and local saved state.
+    
+    elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
+
+    // map to output element and local saved state.
     m_is_64bit = (ctxt.SF != 0);
-    m_output_elem.context.bits64 = ctxt.SF;
+    elem.context.bits64 = ctxt.SF;
     m_is_secure = (ctxt.NS == 0);
-    m_output_elem.context.security_level = ctxt.NS ? ocsd_sec_nonsecure : ocsd_sec_secure;
-    m_output_elem.context.exception_level = (ocsd_ex_level)ctxt.EL;
-    m_output_elem.context.el_valid = 1;
+    elem.context.security_level = ctxt.NS ? ocsd_sec_nonsecure : ocsd_sec_secure;
+    elem.context.exception_level = (ocsd_ex_level)ctxt.EL;
+    elem.context.el_valid = 1;
     if(ctxt.updated_c)
     {
-        m_output_elem.context.ctxt_id_valid = 1;
-        m_context_id = m_output_elem.context.context_id = ctxt.ctxtID;
+        elem.context.ctxt_id_valid = 1;
+        m_context_id = elem.context.context_id = ctxt.ctxtID;
     }
     if(ctxt.updated_v)
     {
-        m_output_elem.context.vmid_valid = 1;
-        m_vmid_id = m_output_elem.context.vmid = ctxt.VMID;
+        elem.context.vmid_valid = 1;
+        m_vmid_id = elem.context.vmid = ctxt.VMID;
     }
+
+    // need to update ISA in case context follows address.
+    elem.isa = m_instr_info.isa = calcISA(m_is_64bit, pCtxtElem->getIS());
     m_need_ctxt = false;
 }
 
-ocsd_datapath_resp_t TrcPktDecodeEtmV4I::handleBadPacket(const char *reason)
+ocsd_err_t TrcPktDecodeEtmV4I::handleBadPacket(const char *reason)
 {
-    ocsd_datapath_resp_t resp  = OCSD_RESP_CONT;   
+    ocsd_err_t err = OCSD_OK;
 
-    if(getComponentOpMode() && OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS)
+    if(getComponentOpMode() & OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS)
     {
         // error out - stop decoding
-        resp = OCSD_RESP_FATAL_INVALID_DATA;
-        LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,reason));
+        err = OCSD_ERR_BAD_DECODE_PKT;
+        LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,reason));
     }
     else
     {
+        LogError(ocsdError(OCSD_ERR_SEV_WARN, OCSD_ERR_BAD_DECODE_PKT, reason));
         // switch to unsync - clear decode state
-        m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
-        resp = outputTraceElement(m_output_elem);
         resetDecoder();
-        m_curr_state = WAIT_SYNC;
+        m_curr_state = NO_SYNC;
+        m_unsync_eot_info = UNSYNC_BAD_PACKET;
     }
-    return resp;
+    return err;
 }
 
+inline ocsd_mem_space_acc_t TrcPktDecodeEtmV4I::getCurrMemSpace()
+{
+    static ocsd_mem_space_acc_t SMemSpace[] = {
+        OCSD_MEM_SPACE_EL1S,
+        OCSD_MEM_SPACE_EL1S,
+        OCSD_MEM_SPACE_EL2S,
+        OCSD_MEM_SPACE_EL3
+    };
+
+    static ocsd_mem_space_acc_t NSMemSpace[] = {
+        OCSD_MEM_SPACE_EL1N,
+        OCSD_MEM_SPACE_EL1N,
+        OCSD_MEM_SPACE_EL2,
+        OCSD_MEM_SPACE_EL3
+    };
+
+    /* if no valid EL value - just use S/NS */
+    if (!outElem().context.el_valid)
+        return  m_is_secure ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N;
+    
+    /* mem space according to EL + S/NS */
+    int el = (int)(outElem().context.exception_level) & 0x3;
+    return m_is_secure ? SMemSpace[el] : NSMemSpace[el];
+}
 /* End of File trc_pkt_decode_etmv4i.cpp */
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp	(revision 362263)
@@ -1,583 +1,678 @@
 /*
  * \file       trc_pkt_elem_etmv4i.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #include <sstream>
 #include <iomanip>
 
 #include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"
 
 EtmV4ITrcPacket::EtmV4ITrcPacket()
 {
 }
 
 EtmV4ITrcPacket::~EtmV4ITrcPacket()
 {
 }
 
 void EtmV4ITrcPacket::initStartState()
 {
     // clear packet state to start of trace (first sync or post discontinuity)
 
     // clear all valid bits
     pkt_valid.val = 0;
 
     // virtual address
     v_addr.pkt_bits = 0;
     v_addr.valid_bits = 0;
     v_addr_ISA = 0;
 
     // timestamp
     ts.bits_changed = 0;
     ts.timestamp = 0;    
 
     // per packet init
     initNextPacket();
 }
 
 void EtmV4ITrcPacket::initNextPacket()
 {
     // clear valid bits for elements that are only valid over a single packet.
     pkt_valid.bits.cc_valid = 0;
     pkt_valid.bits.commit_elem_valid = 0;
     atom.num = 0;
     context.updated = 0;
     context.updated_v = 0;
     context.updated_c = 0;
     err_type = ETM4_PKT_I_NO_ERR_TYPE;
 }
 
 // printing
 void EtmV4ITrcPacket::toString(std::string &str) const
 {
     const char *name;
     const char *desc;
     std::string valStr, ctxtStr = "";
 
     name = packetTypeName(type, &desc);
     str = name + (std::string)" : " + desc;
 
     // extended descriptions
     switch (type)
     {
     case ETM4_PKT_I_BAD_SEQUENCE:
     case ETM4_PKT_I_INCOMPLETE_EOT:
     case ETM4_PKT_I_RESERVED_CFG:
         name = packetTypeName(err_type, 0);
         str += "[" + (std::string)name + "]";
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_32IS0:
     case ETM4_PKT_I_ADDR_CTXT_L_32IS1:
         contextStr(ctxtStr);
     case ETM4_PKT_I_ADDR_L_32IS0:
     case ETM4_PKT_I_ADDR_L_32IS1:
         trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true, (v_addr.pkt_bits < 32) ? v_addr.pkt_bits : 0);
         str += "; Addr=" + valStr + "; " + ctxtStr;
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_64IS0:
     case ETM4_PKT_I_ADDR_CTXT_L_64IS1:
         contextStr(ctxtStr);
     case ETM4_PKT_I_ADDR_L_64IS0:
     case ETM4_PKT_I_ADDR_L_64IS1:
         trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true, (v_addr.pkt_bits < 64) ? v_addr.pkt_bits : 0);
         str += "; Addr=" + valStr + "; " + ctxtStr;
         break;
 
     case ETM4_PKT_I_CTXT:
         contextStr(ctxtStr);
         str += "; " + ctxtStr;
         break;
 
     case ETM4_PKT_I_ADDR_S_IS0:
     case ETM4_PKT_I_ADDR_S_IS1:
         trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true, v_addr.pkt_bits);
         str += "; Addr=" + valStr;
         break;
 
     case ETM4_PKT_I_ADDR_MATCH:
         addrMatchIdx(valStr);
         str += ", " + valStr;
         trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true);
         str += "; Addr=" + valStr + "; " + ctxtStr;
         break;
 
     case ETM4_PKT_I_ATOM_F1:
     case ETM4_PKT_I_ATOM_F2:
     case ETM4_PKT_I_ATOM_F3:
     case ETM4_PKT_I_ATOM_F4:
     case ETM4_PKT_I_ATOM_F5:
     case ETM4_PKT_I_ATOM_F6:
         atomSeq(valStr);
         str += "; " + valStr;
         break;
 
     case ETM4_PKT_I_EXCEPT:
         exceptionInfo(valStr);
         str += "; " + valStr;
         break;
 
     case ETM4_PKT_I_TIMESTAMP:
         {
             std::ostringstream oss;
             oss << "; Updated val = " << std::hex << "0x" << ts.timestamp;
             if (pkt_valid.bits.cc_valid)
                 oss << "; CC=" << std::hex << "0x" << cycle_count;
             str += oss.str();
         }
         break;
 
     case ETM4_PKT_I_TRACE_INFO:
         {
             std::ostringstream oss;
             oss << "; INFO=" << std::hex << "0x" << trace_info.val;
+            oss << " { CC." << std::dec << trace_info.bits.cc_enabled << " }";
             if (trace_info.bits.cc_enabled)
                 oss << "; CC_THRESHOLD=" << std::hex << "0x" << cc_threshold;
             str += oss.str();
         }
         break;
 
     case ETM4_PKT_I_CCNT_F1:
     case ETM4_PKT_I_CCNT_F2:
     case ETM4_PKT_I_CCNT_F3:
         {
             std::ostringstream oss;
             oss << "; Count=" << std::hex << "0x" << cycle_count;
             str += oss.str();
         }
         break;
+
+    case ETM4_PKT_I_CANCEL_F1:
+        {
+            std::ostringstream oss;
+            oss << "; Cancel(" << std::dec << cancel_elements << ")";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_CANCEL_F1_MISPRED:
+        {
+            std::ostringstream oss;
+            oss << "; Cancel(" << std::dec << cancel_elements << "), Mispredict";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_MISPREDICT:
+        {
+            std::ostringstream oss;
+            oss << "; ";
+            if (atom.num) {
+                atomSeq(valStr);
+                oss << "Atom: " << valStr << ", ";
+            }
+            oss << "Mispredict";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_CANCEL_F2:
+        {
+            std::ostringstream oss;
+            oss << "; ";
+            if (atom.num) {
+                atomSeq(valStr);
+                oss << "Atom: " << valStr << ", ";
+            }
+            oss << "Cancel(1), Mispredict";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_CANCEL_F3:
+        {
+            std::ostringstream oss;
+            oss << "; ";
+            if (atom.num) {
+                oss << "Atom: E, ";
+            }
+            oss << "Cancel(" << std::dec << cancel_elements << "), Mispredict";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_COMMIT:
+        {
+            std::ostringstream oss;
+            oss << "; Commit(" << std::dec << commit_elements << ")";
+            str += oss.str();
+        }
+        break;
+
+    case ETM4_PKT_I_Q:
+        {
+            std::ostringstream oss;
+            if (Q_pkt.count_present)
+            {
+                oss << "; Count(" << std::dec << Q_pkt.q_count << ")";
+                str += oss.str();
+            }
+            else
+                str += "; Count(Unknown)";
+
+            if (Q_pkt.addr_match) 
+            {
+                addrMatchIdx(valStr);
+                str += "; " + valStr;
+            }
+
+            if (Q_pkt.addr_present || Q_pkt.addr_match)
+            {
+                trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true, (v_addr.pkt_bits < 64) ? v_addr.pkt_bits : 0);
+                str += "; Addr=" + valStr;
+            }
+        }
+        break;
     }
-}
 
+}   
+
 void EtmV4ITrcPacket::toStringFmt(const uint32_t fmtFlags, std::string &str) const
 {
     toString(str);  // TBD add in formatted response.
 }
 
 const char *EtmV4ITrcPacket::packetTypeName(const ocsd_etmv4_i_pkt_type type, const char **ppDesc) const
 {
     const char *pName = "I_UNKNOWN";
     const char *pDesc = "Unknown Packet Header";
 
     switch(type)
     {
     case ETM4_PKT_I_NOTSYNC:
         pName = "I_NOT_SYNC";
         pDesc = "I Stream not synchronised";
         break;
 
     case ETM4_PKT_I_INCOMPLETE_EOT:
         pName = "I_INCOMPLETE_EOT";
         pDesc = "Incomplete packet at end of trace.";
         break;
 
     case ETM4_PKT_I_NO_ERR_TYPE:
         pName = "I_NO_ERR_TYPE";
         pDesc = "No Error Type.";
         break;
 
     case ETM4_PKT_I_BAD_SEQUENCE:
         pName = "I_BAD_SEQUENCE";
         pDesc = "Invalid Sequence in packet.";
         break;
 
     case ETM4_PKT_I_BAD_TRACEMODE:
         pName = "I_BAD_TRACEMODE";
         pDesc = "Invalid Packet for trace mode.";
         break;
 
     case ETM4_PKT_I_RESERVED:
         pName = "I_RESERVED";
         pDesc = "Reserved Packet Header";
         break;
 
     case ETM4_PKT_I_RESERVED_CFG:
         pName = "I_RESERVED_CFG";
         pDesc = "Reserved header for current configuration.";
         break;
 
     case ETM4_PKT_I_EXTENSION:
         pName = "I_EXTENSION";
         pDesc = "Extension packet header.";
         break;
 
     case ETM4_PKT_I_TRACE_INFO:
         pName = "I_TRACE_INFO";
         pDesc = "Trace Info.";
         break;
 
     case ETM4_PKT_I_TIMESTAMP:
         pName = "I_TIMESTAMP";
         pDesc = "Timestamp.";
         break;
 
     case ETM4_PKT_I_TRACE_ON:
         pName = "I_TRACE_ON";
         pDesc = "Trace On.";
         break;
 
     case ETM4_PKT_I_FUNC_RET:
         pName = "I_FUNC_RET";
         pDesc = "V8M - function return.";
         break;
 
     case ETM4_PKT_I_EXCEPT:
         pName = "I_EXCEPT";
         pDesc = "Exception.";
         break;
 
     case ETM4_PKT_I_EXCEPT_RTN:
         pName = "I_EXCEPT_RTN";
         pDesc = "Exception Return.";
         break;
 
     case ETM4_PKT_I_CCNT_F1:
         pName = "I_CCNT_F1";
         pDesc = "Cycle Count format 1.";
         break;
 
     case ETM4_PKT_I_CCNT_F2:
         pName = "I_CCNT_F2";
         pDesc = "Cycle Count format 2.";
         break;
 
     case ETM4_PKT_I_CCNT_F3:
         pName = "I_CCNT_F3";
         pDesc = "Cycle Count format 3.";
         break;
 
     case ETM4_PKT_I_NUM_DS_MKR:
         pName = "I_NUM_DS_MKR";
         pDesc = "Data Synchronisation Marker - Numbered.";
         break;
 
     case ETM4_PKT_I_UNNUM_DS_MKR:
         pName = "I_UNNUM_DS_MKR";
         pDesc = "Data Synchronisation Marker - Unnumbered.";
         break;
 
     case ETM4_PKT_I_COMMIT:
         pName = "I_COMMIT";
         pDesc = "Commit";
         break;
 
     case ETM4_PKT_I_CANCEL_F1:
         pName = "I_CANCEL_F1";
         pDesc = "Cancel Format 1.";
         break;
+
+    case ETM4_PKT_I_CANCEL_F1_MISPRED:
+        pName = "I_CANCEL_F1_MISPRED";
+        pDesc = "Cancel Format 1 + Mispredict.";
+        break;
+
 
     case ETM4_PKT_I_MISPREDICT:
         pName = "I_MISPREDICT";
         pDesc = "Mispredict.";
         break;
 
     case ETM4_PKT_I_CANCEL_F2:
         pName = "I_CANCEL_F2";
         pDesc = "Cancel Format 2.";
         break;
 
     case ETM4_PKT_I_CANCEL_F3:
         pName = "I_CANCEL_F3";
         pDesc = "Cancel Format 3.";
         break;
 
     case ETM4_PKT_I_COND_I_F2:
         pName = "I_COND_I_F2";
         pDesc = "Conditional Instruction, format 2.";
         break;
 
     case ETM4_PKT_I_COND_FLUSH:
         pName = "I_COND_FLUSH";
         pDesc = "Conditional Flush.";
         break;
 
     case ETM4_PKT_I_COND_RES_F4:
         pName = "I_COND_RES_F4";
         pDesc = "Conditional Result, format 4.";
         break;
 
     case ETM4_PKT_I_COND_RES_F2:
         pName = "I_COND_RES_F2";
         pDesc = "Conditional Result, format 2.";
         break;
 
     case ETM4_PKT_I_COND_RES_F3:
         pName = "I_COND_RES_F3";
         pDesc = "Conditional Result, format 3.";
         break;
 
     case ETM4_PKT_I_COND_RES_F1:
         pName = "I_COND_RES_F1";
         pDesc = "Conditional Result, format 1.";
         break;
 
     case ETM4_PKT_I_COND_I_F1:
         pName = "I_COND_I_F1";
         pDesc = "Conditional Instruction, format 1.";
         break;
 
     case ETM4_PKT_I_COND_I_F3:
         pName = "I_COND_I_F3";
         pDesc = "Conditional Instruction, format 3.";
         break;
 
     case ETM4_PKT_I_IGNORE:
         pName = "I_IGNORE";
         pDesc = "Ignore.";
         break;
 
     case ETM4_PKT_I_EVENT:
         pName = "I_EVENT";
         pDesc = "Trace Event.";
         break;
 
     case ETM4_PKT_I_CTXT:
         pName = "I_CTXT";
         pDesc = "Context Packet.";
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_32IS0:
         pName = "I_ADDR_CTXT_L_32IS0";
         pDesc = "Address & Context, Long, 32 bit, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_32IS1:
         pName = "I_ADDR_CTXT_L_32IS1";
         pDesc = "Address & Context, Long, 32 bit, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_64IS0:
         pName = "I_ADDR_CTXT_L_64IS0";
         pDesc = "Address & Context, Long, 64 bit, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_CTXT_L_64IS1:
         pName = "I_ADDR_CTXT_L_64IS1";
         pDesc = "Address & Context, Long, 64 bit, IS1.";
         break;
 
     case ETM4_PKT_I_ADDR_MATCH:
         pName = "I_ADDR_MATCH";
         pDesc = "Exact Address Match.";
         break;
 
     case ETM4_PKT_I_ADDR_S_IS0:
         pName = "I_ADDR_S_IS0";
         pDesc = "Address, Short, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_S_IS1:
         pName = "I_ADDR_S_IS1";
         pDesc = "Address, Short, IS1.";
         break;
 
     case ETM4_PKT_I_ADDR_L_32IS0:
         pName = "I_ADDR_L_32IS0";
         pDesc = "Address, Long, 32 bit, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_L_32IS1:
         pName = "I_ADDR_L_32IS1";
         pDesc = "Address, Long, 32 bit, IS1.";
         break;
 
     case ETM4_PKT_I_ADDR_L_64IS0:
         pName = "I_ADDR_L_64IS0";
         pDesc = "Address, Long, 64 bit, IS0.";
         break;
 
     case ETM4_PKT_I_ADDR_L_64IS1:
         pName = "I_ADDR_L_64IS1";
         pDesc = "Address, Long, 64 bit, IS1.";
         break;
 
     case ETM4_PKT_I_Q:       
         pName = "I_Q";
         pDesc = "Q Packet.";
         break;
 
     case ETM4_PKT_I_ATOM_F6:
         pName = "I_ATOM_F6";
         pDesc = "Atom format 6.";
         break;
 
     case ETM4_PKT_I_ATOM_F5:
         pName = "I_ATOM_F5";
         pDesc = "Atom format 5.";
         break;
 
     case ETM4_PKT_I_ATOM_F2:
         pName = "I_ATOM_F2";
         pDesc = "Atom format 2.";
         break;
 
     case ETM4_PKT_I_ATOM_F4:
         pName = "I_ATOM_F4";
         pDesc = "Atom format 4.";
         break;
 
     case ETM4_PKT_I_ATOM_F1:
         pName = "I_ATOM_F1";
         pDesc = "Atom format 1.";
         break;
 
     case ETM4_PKT_I_ATOM_F3:
         pName = "I_ATOM_F3";
         pDesc = "Atom format 3.";
         break;
 
     case ETM4_PKT_I_ASYNC:
         pName = "I_ASYNC";
         pDesc = "Alignment Synchronisation.";
         break;
 
     case ETM4_PKT_I_DISCARD:
         pName = "I_DISCARD";
         pDesc = "Discard.";
         break;
         
     case ETM4_PKT_I_OVERFLOW:
         pName = "I_OVERFLOW";
         pDesc = "Overflow.";
         break;
 
     default:
         break;
     }
 
     if(ppDesc) *ppDesc = pDesc;
     return pName;
 }
 
 void EtmV4ITrcPacket::contextStr(std::string &ctxtStr) const
 {
     ctxtStr = "";
     if(pkt_valid.bits.context_valid)
     {
         std::ostringstream oss;
         if(context.updated)
         {           
             oss << "Ctxt: " << (context.SF ? "AArch64," : "AArch32, ") << "EL" << context.EL << ", " << (context.NS ? "NS; " : "S; ");
             if(context.updated_c)
             {
                 oss << "CID=0x" << std::hex << std::setfill('0') << std::setw(8) << context.ctxtID << "; ";
             }
             if(context.updated_v)
             {
                 oss << "VMID=0x" << std::hex << std::setfill('0') << std::setw(4) << context.VMID << "; ";
             }
         }
         else
         {
             oss << "Ctxt: Same";
         }
         ctxtStr = oss.str();
     }
 }
 
 void EtmV4ITrcPacket::atomSeq(std::string &valStr) const
 {
     std::ostringstream oss;
     uint32_t bitpattern = atom.En_bits;
     for(int i = 0; i < atom.num; i++)
     {
         oss << ((bitpattern & 0x1) ? "E" : "N");
         bitpattern >>= 1;
     }
     valStr = oss.str();
 }
 
 void EtmV4ITrcPacket::addrMatchIdx(std::string &valStr) const
 {
     std::ostringstream oss;
     oss << "[" << (uint16_t)addr_exact_match_idx << "]";
     valStr = oss.str();
 }
 
 void EtmV4ITrcPacket::exceptionInfo(std::string &valStr) const
 {
     std::ostringstream oss;
 
     static const char *ARv8Excep[] = {
         "PE Reset", "Debug Halt", "Call", "Trap", 
         "System Error", "Reserved", "Inst Debug", "Data Debug",
         "Reserved", "Reserved", "Alignment", "Inst Fault", 
         "Data Fault", "Reserved", "IRQ", "FIQ"
     };
 
     static const char *MExcep[] = {
         "Reserved", "PE Reset", "NMI", "HardFault",
         "MemManage", "BusFault", "UsageFault", "Reserved",
         "Reserved","Reserved","Reserved","SVC",
         "DebugMonitor", "Reserved","PendSV","SysTick",
         "IRQ0","IRQ1","IRQ2","IRQ3",
         "IRQ4","IRQ5","IRQ6","IRQ7",
         "DebugHalt", "LazyFP Push", "Lockup", "Reserved",
         "Reserved","Reserved","Reserved","Reserved"
     };
 
     if(exception_info.m_type == 0)
     {
         if(exception_info.exceptionType < 0x10)
             oss << " " << ARv8Excep[exception_info.exceptionType] << ";";
         else
             oss << " Reserved;";
 
     }
     else
     {
         if(exception_info.exceptionType < 0x20)
             oss << " " << MExcep[exception_info.exceptionType] << ";";
         else if((exception_info.exceptionType >= 0x208) && (exception_info.exceptionType <= 0x3EF))
             oss << " IRQ" << (int)(exception_info.exceptionType - 0x200) << ";";
         else
             oss << " Reserved;";
         if(exception_info.m_fault_pending)
             oss << " Fault Pending;";
     }
 
     if(exception_info.addr_interp == 0x1)
         oss << " Ret Addr Follows;";
     else if(exception_info.addr_interp == 0x2)
         oss << " Ret Addr Follows, Match Prev;";            
     
     valStr = oss.str();
 }
 
 EtmV4ITrcPacket &EtmV4ITrcPacket::operator =(const ocsd_etmv4_i_pkt* p_pkt)
 {
     *dynamic_cast<ocsd_etmv4_i_pkt *>(this) = *p_pkt;
     return *this;        
 }
 
 /* End of File trc_pkt_elem_etmv4i.cpp */
Index: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp	(nonexistent)
+++ head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp	(revision 362263)
@@ -0,0 +1,1667 @@
+/*
+ * \file       trc_pkt_proc_etmv4i.cpp
+ * \brief      OpenCSD : Packet processor for ETMv4
+ * 
+ * \copyright  Copyright (c) 2015, 2019, ARM Limited. All Rights Reserved.
+ */
+
+/* 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * 3. Neither the name of the copyright holder nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software without 
+ * specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */ 
+
+#include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
+#include "common/ocsd_error.h"
+
+#ifdef __GNUC__
+ // G++ doesn't like the ## pasting
+#define ETMV4I_PKTS_NAME "PKTP_ETMV4I"
+#else
+ // VC++ is fine
+#define ETMV4I_PKTS_NAME OCSD_CMPNAME_PREFIX_PKTPROC##"_ETMV4I"
+#endif
+
+static const uint32_t ETMV4_SUPPORTED_OP_FLAGS = OCSD_OPFLG_PKTPROC_COMMON;
+
+/* trace etmv4 packet processing class */
+TrcPktProcEtmV4I::TrcPktProcEtmV4I() : TrcPktProcBase(ETMV4I_PKTS_NAME),
+    m_isInit(false),
+    m_first_trace_info(false)
+{
+    m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
+}
+
+TrcPktProcEtmV4I::TrcPktProcEtmV4I(int instIDNum) : TrcPktProcBase(ETMV4I_PKTS_NAME, instIDNum),
+    m_isInit(false),
+    m_first_trace_info(false)
+{
+    m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
+}
+
+
+TrcPktProcEtmV4I::~TrcPktProcEtmV4I()
+{
+}
+
+ocsd_err_t TrcPktProcEtmV4I::onProtocolConfig()
+{
+    InitProcessorState();
+    m_config = *TrcPktProcBase::getProtocolConfig();
+    BuildIPacketTable();    // packet table based on config
+    m_isInit = true;
+    return OCSD_OK;
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::processData(  const ocsd_trc_index_t index,
+                                    const uint32_t dataBlockSize,
+                                    const uint8_t *pDataBlock,
+                                    uint32_t *numBytesProcessed)
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+
+    if (!m_isInit)
+        return OCSD_RESP_FATAL_NOT_INIT;
+
+    m_trcIn.init(dataBlockSize, pDataBlock, &m_currPacketData);
+    m_blockIndex = index;
+    bool done = false;
+    uint8_t nextByte;
+
+    do
+    {
+        try 
+        {
+            while ( (!m_trcIn.empty() || (m_process_state == SEND_PKT)) &&
+                    OCSD_DATA_RESP_IS_CONT(resp)
+                )
+            {
+                switch (m_process_state)
+                {
+                case PROC_HDR:
+                    m_packet_index = m_blockIndex + m_trcIn.processed();
+                    if (m_is_sync)
+                    {
+                        nextByte = m_trcIn.peekNextByte();
+                        m_pIPktFn = m_i_table[nextByte].pptkFn;
+                        m_curr_packet.type = m_i_table[nextByte].pkt_type;
+                    }
+                    else
+                    {
+                        // unsynced - process data until we see a sync point
+                        m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
+                        m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
+                    }
+                    m_process_state = PROC_DATA;
+
+                case PROC_DATA:
+                    // loop till full packet or no more data...
+                    while (!m_trcIn.empty() && (m_process_state == PROC_DATA))
+                    {
+                        nextByte = m_trcIn.peekNextByte();
+                        m_trcIn.copyByteToPkt();  // move next byte into the packet
+                        (this->*m_pIPktFn)(nextByte);
+                    }
+                    break;
+
+                case SEND_PKT:
+                    resp = outputPacket();
+                    InitPacketState();
+                    m_process_state = PROC_HDR;
+                    break;
+
+                case SEND_UNSYNCED:
+                    resp = outputUnsyncedRawPacket();
+                    if (m_update_on_unsync_packet_index != 0)
+                    {
+                        m_packet_index = m_update_on_unsync_packet_index;
+                        m_update_on_unsync_packet_index = 0;
+                    }
+                    m_process_state = PROC_DATA;        // after dumping unsynced data, still in data mode.
+                    break;
+                }
+            }
+            done = true;
+        }
+        catch(ocsdError &err)
+        {
+            done = true;
+            LogError(err);
+            if( (err.getErrorCode() == OCSD_ERR_BAD_PACKET_SEQ) ||
+                (err.getErrorCode() == OCSD_ERR_INVALID_PCKT_HDR))
+            {
+                // send invalid packets up the pipe to let the next stage decide what to do.
+                m_process_state = SEND_PKT; 
+                done = false;
+            }
+            else
+            {
+                // bail out on any other error.
+                resp = OCSD_RESP_FATAL_INVALID_DATA;
+            }
+        }
+        catch(...)
+        {
+            done = true;
+            /// vv bad at this point.
+            resp = OCSD_RESP_FATAL_SYS_ERR;
+            const ocsdError &fatal = ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_packet_index,m_config.getTraceID(),"Unknown System Error decoding trace.");
+           LogError(fatal);
+        }
+    } while (!done);
+
+    *numBytesProcessed = m_trcIn.processed();
+    return resp;
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::onEOT()
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    if (!m_isInit)
+        return OCSD_RESP_FATAL_NOT_INIT;
+
+    // if we have a partial packet then send to attached sinks
+    if(m_currPacketData.size() != 0)
+    {
+        m_curr_packet.updateErrType(ETM4_PKT_I_INCOMPLETE_EOT);
+        resp = outputPacket();
+        InitPacketState();
+    }
+    return resp;
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::onReset()
+{
+    if (!m_isInit)
+        return OCSD_RESP_FATAL_NOT_INIT;
+
+    // prepare for new decoding session
+    InitProcessorState();
+    return OCSD_RESP_CONT;
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::onFlush()
+{
+    if (!m_isInit)
+        return OCSD_RESP_FATAL_NOT_INIT;
+
+    // packet processor never holds on to flushable data (may have partial packet, 
+    // but any full packets are immediately sent)
+    return OCSD_RESP_CONT;
+}
+
+void TrcPktProcEtmV4I::InitPacketState()
+{
+    m_currPacketData.clear();
+    m_curr_packet.initNextPacket(); // clear for next packet.
+    m_update_on_unsync_packet_index = 0;
+}
+
+void TrcPktProcEtmV4I::InitProcessorState()
+{
+    InitPacketState();
+    m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
+    m_packet_index = 0;
+    m_is_sync = false;
+    m_first_trace_info = false;
+    m_sent_notsync_packet = false;
+    m_process_state = PROC_HDR;
+    m_curr_packet.initStartState();
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::outputPacket()
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    resp = outputOnAllInterfaces(m_packet_index,&m_curr_packet,&m_curr_packet.type,m_currPacketData);
+    return resp;
+}
+
+ocsd_datapath_resp_t TrcPktProcEtmV4I::outputUnsyncedRawPacket()
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    
+
+   outputRawPacketToMonitor(m_packet_index,&m_curr_packet,m_dump_unsynced_bytes,&m_currPacketData[0]);
+        
+    if(!m_sent_notsync_packet)
+    {        
+        resp = outputDecodedPacket(m_packet_index,&m_curr_packet);
+        m_sent_notsync_packet = true;
+    }
+    
+    if(m_currPacketData.size() <= m_dump_unsynced_bytes)
+        m_currPacketData.clear();
+    else
+        m_currPacketData.erase(m_currPacketData.begin(),m_currPacketData.begin()+m_dump_unsynced_bytes);
+
+    return resp;
+}
+
+void TrcPktProcEtmV4I::iNotSync(const uint8_t lastByte)
+{
+    // is it an extension byte? 
+    if (lastByte == 0x00) // TBD : add check for forced sync in here?
+    {
+        if (m_currPacketData.size() > 1)
+        {
+            m_dump_unsynced_bytes = m_currPacketData.size() - 1;
+            m_process_state = SEND_UNSYNCED;
+            // outputting some data then update packet index after so output indexes accurate
+            m_update_on_unsync_packet_index = m_blockIndex + m_trcIn.processed() - 1;
+        }
+        else
+            m_packet_index = m_blockIndex + m_trcIn.processed() - 1;  // set it up now otherwise.
+
+        m_pIPktFn = m_i_table[lastByte].pptkFn;
+    }
+    else if (m_currPacketData.size() >= 8)
+    {
+        m_dump_unsynced_bytes = m_currPacketData.size();
+        m_process_state = SEND_UNSYNCED;
+        // outputting some data then update packet index after so output indexes accurate
+        m_update_on_unsync_packet_index = m_blockIndex + m_trcIn.processed();
+    }
+}
+
+void TrcPktProcEtmV4I::iPktNoPayload(const uint8_t lastByte)
+{
+    // some expansion may be required...
+    switch(m_curr_packet.type)
+    {
+    case ETM4_PKT_I_ADDR_MATCH:
+        m_curr_packet.setAddressExactMatch(lastByte & 0x3);
+        break;
+
+    case ETM4_PKT_I_EVENT:
+        m_curr_packet.setEvent(lastByte & 0xF);
+        break;
+
+    case ETM4_PKT_I_NUM_DS_MKR:
+    case ETM4_PKT_I_UNNUM_DS_MKR:
+        m_curr_packet.setDataSyncMarker(lastByte & 0x7);
+        break;
+
+    // these just need the packet type - no processing required.
+    case ETM4_PKT_I_COND_FLUSH:
+    case ETM4_PKT_I_EXCEPT_RTN:
+    case ETM4_PKT_I_TRACE_ON:
+    case ETM4_PKT_I_FUNC_RET:
+    case ETM4_PKT_I_IGNORE:
+    default: break;
+    }
+    m_process_state = SEND_PKT; // now just send it....
+}
+
+void TrcPktProcEtmV4I::iPktReserved(const uint8_t lastByte)
+{
+    m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED, lastByte);   // swap type for err type
+    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR,m_packet_index,m_config.getTraceID());
+}
+
+void TrcPktProcEtmV4I::iPktInvalidCfg(const uint8_t lastByte)
+{
+    m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED_CFG, lastByte);   // swap type for err type
+    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR, m_packet_index, m_config.getTraceID());
+}
+
+void TrcPktProcEtmV4I::iPktExtension(const uint8_t lastByte)
+{
+    if(m_currPacketData.size() == 2)
+    {
+        // not sync and not next by 0x00 - not sync sequence
+        if(!m_is_sync && (lastByte != 0x00))
+        {
+            m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
+            m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
+            return;
+        }
+
+        switch(lastByte)
+        {
+        case 0x03: // discard packet.
+            m_curr_packet.type = ETM4_PKT_I_DISCARD;
+            m_process_state = SEND_PKT;
+            break;
+
+        case 0x05:
+            m_curr_packet.type = ETM4_PKT_I_OVERFLOW;
+            m_process_state = SEND_PKT;
+            break;
+
+        case 0x00:
+            m_curr_packet.type = ETM4_PKT_I_ASYNC;
+            m_pIPktFn = &TrcPktProcEtmV4I::iPktASync;  // handle subsequent bytes as async
+            break;
+
+        default:
+            m_curr_packet.err_type = m_curr_packet.type;
+            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
+            m_process_state = SEND_PKT;
+            break;
+        }
+    }
+}
+
+void TrcPktProcEtmV4I::iPktASync(const uint8_t lastByte)
+{
+    if(lastByte != 0x00)
+    {
+        // not sync and not next by 0x00 - not sync sequence if < 12
+        if(!m_is_sync && m_currPacketData.size() != 12)
+        {
+            m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
+            m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
+            return;
+        }
+
+        // 12 bytes and not valid sync sequence - not possible even if not synced
+        m_process_state = SEND_PKT;
+        if((m_currPacketData.size() != 12) || (lastByte != 0x80))
+        {
+            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
+            m_curr_packet.err_type = ETM4_PKT_I_ASYNC;
+        }
+        else
+             m_is_sync = true;  // found a sync packet, mark decoder as synchronised.
+    }
+    else if(m_currPacketData.size() == 12)
+    {
+        if(!m_is_sync)
+        {
+            // if we are not yet synced then ignore extra leading 0x00.
+            m_dump_unsynced_bytes = 1;
+            m_process_state = SEND_UNSYNCED;
+        }
+        else
+        {
+            // bad periodic ASYNC sequence.
+            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
+            m_curr_packet.err_type = ETM4_PKT_I_ASYNC;
+            m_process_state = SEND_PKT;
+        }
+    }
+}
+
+void TrcPktProcEtmV4I::iPktTraceInfo(const uint8_t lastByte)
+{
+    if(m_currPacketData.size() == 1)    // header
+    {
+        //clear flags
+        m_tinfo_sections.sectFlags = 0; // mark all sections as incomplete.
+        m_tinfo_sections.ctrlBytes = 1; // assume only a single control section byte for now
+        
+    }
+    else if(m_currPacketData.size() == 2) // first payload control byte
+    {
+        // figure out which sections are absent and set to true - opposite of bitfeild in byte;
+        m_tinfo_sections.sectFlags = (~lastByte) & TINFO_ALL_SECT;
+
+        // see if there is an extended control section, otherwise this byte is it.
+        if((lastByte & 0x80) == 0x0)
+            m_tinfo_sections.sectFlags |= TINFO_CTRL;
+ 
+    }
+    else
+    {
+        if(!(m_tinfo_sections.sectFlags & TINFO_CTRL))
+        {
+            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_CTRL;
+            m_tinfo_sections.ctrlBytes++;
+        }
+        else if(!(m_tinfo_sections.sectFlags & TINFO_INFO_SECT))
+            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_INFO_SECT;
+        else if(!(m_tinfo_sections.sectFlags & TINFO_KEY_SECT))
+            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_KEY_SECT;
+        else if(!(m_tinfo_sections.sectFlags & TINFO_SPEC_SECT))
+            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_SPEC_SECT;
+        else if(!(m_tinfo_sections.sectFlags & TINFO_CYCT_SECT))
+            m_tinfo_sections.sectFlags |= (lastByte & 0x80) ? 0 : TINFO_CYCT_SECT;
+    }
+
+    // all sections accounted for?
+    if(m_tinfo_sections.sectFlags == TINFO_ALL)
+    {
+        // index of first section is number of payload control bytes + 1 for header byte
+        unsigned idx = m_tinfo_sections.ctrlBytes + 1;
+        uint32_t fieldVal = 0;
+        uint8_t presSect = m_currPacketData[1] & TINFO_ALL_SECT;  // first payload control byte
+
+        m_curr_packet.clearTraceInfo();
+
+        if((presSect & TINFO_INFO_SECT) && (idx < m_currPacketData.size()))
+        {
+            idx += extractContField(m_currPacketData,idx,fieldVal);
+            m_curr_packet.setTraceInfo(fieldVal);
+        }
+        if((presSect & TINFO_KEY_SECT) && (idx < m_currPacketData.size()))
+        {
+            idx += extractContField(m_currPacketData,idx,fieldVal);
+            m_curr_packet.setTraceInfoKey(fieldVal);
+        }
+        if((presSect & TINFO_SPEC_SECT) && (idx < m_currPacketData.size()))
+        {
+            idx += extractContField(m_currPacketData,idx,fieldVal);
+            m_curr_packet.setTraceInfoSpec(fieldVal);
+        }
+        if((presSect & TINFO_CYCT_SECT) && (idx < m_currPacketData.size()))
+        {
+            idx += extractContField(m_currPacketData,idx,fieldVal);
+            m_curr_packet.setTraceInfoCyct(fieldVal);
+        }
+        m_process_state = SEND_PKT;
+        m_first_trace_info = true;
+    }
+
+}
+
+void TrcPktProcEtmV4I::iPktTimestamp(const uint8_t lastByte)
+{
+    // process the header byte
+    if(m_currPacketData.size() == 1)
+    {
+        m_ccount_done = (bool)((lastByte & 0x1) == 0); // 0 = not present
+        m_ts_done = false;
+        m_ts_bytes = 0;
+    }
+    else
+    {        
+        if(!m_ts_done)
+        {
+            m_ts_bytes++;
+            m_ts_done = (m_ts_bytes == 9) || ((lastByte & 0x80) == 0);
+        }
+        else if(!m_ccount_done)
+        {
+            m_ccount_done = (bool)((lastByte & 0x80) == 0);
+            // TBD: check for oorange ccount - bad packet.
+        }
+    }
+
+    if(m_ts_done && m_ccount_done)
+    {        
+        int idx = 1;
+        uint64_t tsVal;
+        int ts_bytes = extractContField64(m_currPacketData, idx, tsVal);
+        int ts_bits = ts_bytes < 7 ? ts_bytes * 7 : 64;
+
+        if(!m_curr_packet.pkt_valid.bits.ts_valid && m_first_trace_info)
+            ts_bits = 64;   // after trace info, missing bits are all 0.
+
+        m_curr_packet.setTS(tsVal,(uint8_t)ts_bits);
+
+        if((m_currPacketData[0] & 0x1) == 0x1)
+        {
+            uint32_t countVal, countMask;
+            
+            idx += ts_bytes;           
+            extractContField(m_currPacketData, idx, countVal, 3);    // only 3 possible count bytes.
+            countMask = (((uint32_t)1UL << m_config.ccSize()) - 1); // mask of the CC size
+            countVal &= countMask;
+            m_curr_packet.setCycleCount(countVal);
+        }
+
+        m_process_state = SEND_PKT;
+    }
+}
+
+void TrcPktProcEtmV4I::iPktException(const uint8_t lastByte)
+{
+    uint16_t excep_type = 0;
+
+    switch(m_currPacketData.size())
+    {
+    case 1: m_excep_size = 3; break;
+    case 2: if((lastByte & 0x80) == 0x00)
+                m_excep_size = 2; 
+            break;
+    }
+
+    if(m_currPacketData.size() ==  (unsigned)m_excep_size)
+    {
+        excep_type =  (m_currPacketData[1] >> 1) & 0x1F;
+        uint8_t addr_interp = (m_currPacketData[1] & 0x40) >> 5 | (m_currPacketData[1] & 0x1);
+        uint8_t m_fault_pending = 0;        
+        uint8_t m_type = (m_config.coreProfile() == profile_CortexM) ? 1 : 0;
+
+        // extended exception packet (probably M class);
+        if(m_currPacketData[1] & 0x80)
+        {
+            excep_type |= ((uint16_t)m_currPacketData[2] & 0x1F) << 5;
+            m_fault_pending = (m_currPacketData[2] >> 5)  & 0x1;
+        }
+        m_curr_packet.setExceptionInfo(excep_type,addr_interp,m_fault_pending, m_type);
+        m_process_state = SEND_PKT;
+
+        // allow the standard address packet handlers to process the address packet field for the exception.
+    }
+}
+
+void TrcPktProcEtmV4I::iPktCycleCntF123(const uint8_t lastByte)
+{
+    ocsd_etmv4_i_pkt_type format = m_curr_packet.type;
+
+    if( m_currPacketData.size() == 1)
+    {
+        m_count_done = m_commit_done = false; 
+        m_has_count = true;
+
+        if(format == ETM4_PKT_I_CCNT_F3)
+        {
+            // no commit section for TRCIDR0.COMMOPT == 1
+            if(!m_config.commitOpt1())
+            {
+                m_curr_packet.setCommitElements(((lastByte >> 2) & 0x3) + 1);
+            }
+            // TBD: warning of non-valid CC threshold here?
+            m_curr_packet.setCycleCount(m_curr_packet.getCCThreshold() + (lastByte & 0x3));
+            m_process_state = SEND_PKT;
+        }
+        else if(format == ETM4_PKT_I_CCNT_F1) 
+        {
+            if((lastByte & 0x1) == 0x1)
+            {
+                m_has_count = false;
+                m_count_done = true;
+            }
+
+            // no commit section for TRCIDR0.COMMOPT == 1
+            if(m_config.commitOpt1())
+                m_commit_done = true;
+        }
+    }
+    else if((format == ETM4_PKT_I_CCNT_F2) && ( m_currPacketData.size() == 2))
+    {
+        int commit_offset = ((lastByte & 0x1) == 0x1) ? ((int)m_config.MaxSpecDepth() - 15) : 1;
+        int commit_elements = ((lastByte >> 4) & 0xF);
+        commit_elements += commit_offset;
+
+        // TBD: warning if commit elements < 0?
+
+        m_curr_packet.setCycleCount(m_curr_packet.getCCThreshold() + (lastByte & 0xF));
+        m_curr_packet.setCommitElements(commit_elements);
+        m_process_state = SEND_PKT;
+    }
+    else
+    {
+        // F1 and size 2 or more
+        if(!m_commit_done)
+            m_commit_done = ((lastByte & 0x80) == 0x00);
+        else if(!m_count_done)
+            m_count_done = ((lastByte & 0x80) == 0x00);
+    }
+
+    if((format == ETM4_PKT_I_CCNT_F1) && m_commit_done && m_count_done)
+    {        
+        int idx = 1; // index into buffer for payload data.
+        uint32_t field_value = 0;
+        // no commit section for TRCIDR0.COMMOPT == 1
+        if(!m_config.commitOpt1())
+        {
+            idx += extractContField(m_currPacketData,idx,field_value);
+            m_curr_packet.setCommitElements(field_value);
+        }
+		if (m_has_count)
+		{
+			extractContField(m_currPacketData, idx, field_value, 3);
+			m_curr_packet.setCycleCount(field_value + m_curr_packet.getCCThreshold());
+		}
+		else
+			m_curr_packet.setCycleCount(0);	/* unknown CC marked as 0 after overflow */
+        m_process_state = SEND_PKT;
+    }
+}
+
+void TrcPktProcEtmV4I::iPktSpeclRes(const uint8_t lastByte)
+{    
+    if(m_currPacketData.size() == 1)
+    {
+        switch(m_curr_packet.getType())
+        {
+        case ETM4_PKT_I_MISPREDICT:
+        case ETM4_PKT_I_CANCEL_F2:
+            switch(lastByte & 0x3)
+            {
+            case 0x1: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x1, 1); break; // E
+            case 0x2: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x3, 2); break; // EE
+            case 0x3: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x0, 1); break; // N
+            }
+            if (m_curr_packet.getType() == ETM4_PKT_I_CANCEL_F2)
+                m_curr_packet.setCancelElements(1);
+            else
+                m_curr_packet.setCancelElements(0);
+            m_process_state = SEND_PKT;
+            break;
+
+        case ETM4_PKT_I_CANCEL_F3:
+            if(lastByte & 0x1)
+                m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x1, 1); // E
+            m_curr_packet.setCancelElements(((lastByte >> 1) & 0x3) + 2);
+            m_process_state = SEND_PKT;
+            break;
+        }        
+    }
+    else
+    {
+        if((lastByte & 0x80) == 0x00)
+        {
+            uint32_t field_val = 0;
+            extractContField(m_currPacketData,1,field_val);
+            if(m_curr_packet.getType() == ETM4_PKT_I_COMMIT)
+                m_curr_packet.setCommitElements(field_val);
+            else
+                m_curr_packet.setCancelElements(field_val);
+            m_process_state = SEND_PKT;
+        }
+    }
+}
+
+void TrcPktProcEtmV4I::iPktCondInstr(const uint8_t lastByte)
+{
+    bool bF1Done = false;
+
+    if(m_currPacketData.size() == 1)    
+    {
+        if(m_curr_packet.getType() == ETM4_PKT_I_COND_I_F2)
+        {
+            m_curr_packet.setCondIF2(lastByte & 0x3);
+            m_process_state = SEND_PKT;
+        }
+
+    }
+    else if(m_currPacketData.size() == 2)  
+    {
+        if(m_curr_packet.getType() == ETM4_PKT_I_COND_I_F3)   // f3 two bytes long
+        {
+          uint8_t num_c_elem = ((lastByte >> 1) & 0x3F) + (lastByte & 0x1);
+            m_curr_packet.setCondIF3(num_c_elem,(bool)((lastByte & 0x1) == 0x1));
+            // TBD: check for 0 num_c_elem in here.
+            m_process_state = SEND_PKT;
+        }
+        else
+        {
+            bF1Done = ((lastByte & 0x80) == 0x00);
+        }
+    }
+    else
+    {
+        bF1Done = ((lastByte & 0x80) == 0x00);
+    }
+
+    if(bF1Done)
+    {
+        uint32_t cond_key = 0;
+        extractContField(m_currPacketData, 1, cond_key);       
+        m_process_state = SEND_PKT;        
+    }
+}
+
+void TrcPktProcEtmV4I::iPktCondResult(const uint8_t lastByte)
+{
+    if(m_currPacketData.size() == 1)    
+    {
+        m_F1P1_done = false;  // F1 payload 1 done
+        m_F1P2_done = false;  // F1 payload 2 done
+        m_F1has_P2 = false;   // F1 has a payload 2
+                
+        switch(m_curr_packet.getType())
+        {
+        case ETM4_PKT_I_COND_RES_F1:            
+
+            m_F1has_P2 = true;
+            if((lastByte & 0xFC) == 0x6C)// only one payload set
+            {
+                m_F1P2_done = true;
+                m_F1has_P2 = false;
+            }
+            break;
+
+        case ETM4_PKT_I_COND_RES_F2:
+            m_curr_packet.setCondRF2((lastByte & 0x4) ? 2 : 1, lastByte & 0x3);
+            m_process_state = SEND_PKT;
+            break;
+
+        case ETM4_PKT_I_COND_RES_F3:
+            break;
+
+        case ETM4_PKT_I_COND_RES_F4:
+            m_curr_packet.setCondRF4(lastByte & 0x3);
+            m_process_state = SEND_PKT;
+            break;
+        }        
+    }
+    else if((m_curr_packet.getType() == ETM4_PKT_I_COND_RES_F3) && (m_currPacketData.size() == 2)) 
+    {
+        // 2nd F3 packet
+        uint16_t f3_tokens = 0;
+        f3_tokens = (uint16_t)m_currPacketData[1];
+        f3_tokens |= ((uint16_t)m_currPacketData[0] & 0xf) << 8;
+        m_curr_packet.setCondRF3(f3_tokens);
+        m_process_state = SEND_PKT;
+    }
+    else  // !first packet  - F1
+    {
+        if(!m_F1P1_done)
+            m_F1P1_done = ((lastByte & 0x80) == 0x00);
+        else if(!m_F1P2_done)
+            m_F1P2_done = ((lastByte & 0x80) == 0x00);
+
+        if(m_F1P1_done && m_F1P2_done)
+        {
+            int st_idx = 1;
+            uint32_t key[2];
+            uint8_t result[2];
+            uint8_t CI[2];
+
+            st_idx+= extractCondResult(m_currPacketData,st_idx,key[0],result[0]);
+            CI[0] = m_currPacketData[0] & 0x1;
+            if(m_F1has_P2) // 2nd payload?
+            {
+                extractCondResult(m_currPacketData,st_idx,key[1],result[1]);
+                CI[1] = (m_currPacketData[0] >> 1) & 0x1;
+            }
+            m_curr_packet.setCondRF1(key,result,CI,m_F1has_P2);
+            m_process_state = SEND_PKT;
+        }
+    }
+}
+
+void TrcPktProcEtmV4I::iPktContext(const uint8_t lastByte)
+{
+    bool bSendPacket = false;
+    
+    if(m_currPacketData.size() == 1) 
+    {
+        if((lastByte & 0x1) == 0)
+        {
+            m_curr_packet.setContextInfo(false);    // no update context packet (ctxt same as last time).
+            m_process_state = SEND_PKT;
+        }
+    }
+    else if(m_currPacketData.size() == 2) 
+    {
+        if((lastByte & 0xC0) == 0) // no VMID or CID
+        {
+            bSendPacket = true;
+        }
+        else
+        {
+            m_vmidBytes = ((lastByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
+            m_ctxtidBytes = ((lastByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
+        }
+    }
+    else    // 3rd byte onwards
+    {
+        if(m_vmidBytes > 0)
+            m_vmidBytes--;
+        else if(m_ctxtidBytes > 0)
+            m_ctxtidBytes--;
+
+        if((m_ctxtidBytes == 0) && (m_vmidBytes == 0))
+            bSendPacket = true;        
+    }
+
+    if(bSendPacket)
+    {
+        extractAndSetContextInfo(m_currPacketData,1);
+        m_process_state = SEND_PKT;
+    }
+}
+
+void TrcPktProcEtmV4I::extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx)
+{
+    // on input, buffer index points at the info byte - always present
+    uint8_t infoByte = m_currPacketData[st_idx];
+    
+    m_curr_packet.setContextInfo(true, (infoByte & 0x3), (infoByte >> 5) & 0x1, (infoByte >> 4) & 0x1);    
+
+    // see if there are VMID and CID bytes, and how many.
+    int nVMID_bytes = ((infoByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
+    int nCtxtID_bytes = ((infoByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
+
+    // extract any VMID and CID
+    int payload_idx = st_idx+1;
+    if(nVMID_bytes)
+    {
+        uint32_t VMID = 0; 
+        for(int i = 0; i < nVMID_bytes; i++)
+        {
+            VMID |= ((uint32_t)m_currPacketData[i+payload_idx] << i*8);
+        }
+        payload_idx += nVMID_bytes;
+        m_curr_packet.setContextVMID(VMID);
+    }
+
+    if(nCtxtID_bytes)
+    {
+        uint32_t CID = 0; 
+        for(int i = 0; i < nCtxtID_bytes; i++)
+        {
+            CID |= ((uint32_t)m_currPacketData[i+payload_idx] << i*8);
+        }        
+        m_curr_packet.setContextCID(CID);
+    }
+}
+
+void TrcPktProcEtmV4I::iPktAddrCtxt(const uint8_t lastByte)
+{
+    if( m_currPacketData.size() == 1)    
+    {        
+        m_addrIS = 0;
+        m_addrBytes = 4;
+        m_bAddr64bit = false;
+        m_vmidBytes = 0;
+        m_ctxtidBytes = 0;
+        m_bCtxtInfoDone = false;
+
+        switch(m_curr_packet.type)
+        {
+        case ETM4_PKT_I_ADDR_CTXT_L_32IS1:
+            m_addrIS = 1;
+        case ETM4_PKT_I_ADDR_CTXT_L_32IS0:
+            break;
+
+        case ETM4_PKT_I_ADDR_CTXT_L_64IS1:
+            m_addrIS = 1;
+        case ETM4_PKT_I_ADDR_CTXT_L_64IS0:
+            m_addrBytes = 8;
+            m_bAddr64bit = true;
+            break;
+        }
+    }
+    else
+    {
+        if(m_addrBytes == 0)
+        {
+            if(m_bCtxtInfoDone == false)
+            {
+                m_bCtxtInfoDone = true;
+                m_vmidBytes = ((lastByte & 0x40) == 0x40) ? (m_config.vmidSize()/8) : 0;
+                m_ctxtidBytes = ((lastByte & 0x80) == 0x80) ? (m_config.cidSize()/8) : 0;
+            }
+            else
+            {
+                if( m_vmidBytes > 0) 
+                     m_vmidBytes--;
+                else if(m_ctxtidBytes > 0)
+                    m_ctxtidBytes--;
+            }
+        }
+        else
+            m_addrBytes--;
+
+        if((m_addrBytes == 0) && m_bCtxtInfoDone && (m_vmidBytes == 0) && (m_ctxtidBytes == 0))
+        {
+            int st_idx = 1;
+            if(m_bAddr64bit)
+            {
+                uint64_t val64;
+                st_idx+=extract64BitLongAddr(m_currPacketData,st_idx,m_addrIS,val64);
+                m_curr_packet.set64BitAddress(val64,m_addrIS);
+            }
+            else
+            {
+                uint32_t val32;
+                st_idx+=extract32BitLongAddr(m_currPacketData,st_idx,m_addrIS,val32);
+                m_curr_packet.set32BitAddress(val32,m_addrIS);
+            }
+            extractAndSetContextInfo(m_currPacketData,st_idx);
+            m_process_state = SEND_PKT;
+        }
+    }
+}
+
+void TrcPktProcEtmV4I::iPktShortAddr(const uint8_t lastByte)
+{
+    if (m_currPacketData.size() == 1)
+    {
+        m_addr_done = false;
+        m_addrIS = 0;
+        if (lastByte == ETM4_PKT_I_ADDR_S_IS1)
+            m_addrIS = 1;
+    }
+    else if(!m_addr_done)
+    {
+        m_addr_done = (m_currPacketData.size() == 3) || ((lastByte & 0x80) == 0x00);
+    }
+
+    if(m_addr_done)
+    {
+        uint32_t addr_val = 0;
+        int bits = 0;
+
+        extractShortAddr(m_currPacketData,1,m_addrIS,addr_val,bits);
+        m_curr_packet.updateShortAddress(addr_val,m_addrIS,(uint8_t)bits);
+        m_process_state = SEND_PKT;
+    }
+}
+
+int TrcPktProcEtmV4I::extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits)
+{
+    int IS_shift = (IS == 0) ? 2 : 1;
+    int idx = 0;
+
+    bits = 7;   // at least 7 bits
+    value = 0;
+    value |= ((uint32_t)(buffer[st_idx+idx] & 0x7F)) << IS_shift;
+    
+    if(m_currPacketData[st_idx+idx] & 0x80)
+    {
+        idx++;
+        value |= ((uint32_t)m_currPacketData[st_idx+idx]) <<  (7 + IS_shift);
+        bits += 8;
+    }
+    idx++;
+    bits += IS_shift;
+    return idx;
+}
+
+void TrcPktProcEtmV4I::iPktLongAddr(const uint8_t lastByte)
+{
+    if(m_currPacketData.size() == 1)    
+    {
+        // init the intra-byte data
+        m_addrIS = 0;
+        m_bAddr64bit = false;
+        m_addrBytes = 4;
+
+        switch(m_curr_packet.type)
+        {
+        case ETM4_PKT_I_ADDR_L_32IS1:
+            m_addrIS = 1;
+        case ETM4_PKT_I_ADDR_L_32IS0:
+            m_addrBytes = 4;
+            break;
+
+        case ETM4_PKT_I_ADDR_L_64IS1:
+            m_addrIS = 1;
+        case ETM4_PKT_I_ADDR_L_64IS0:
+            m_addrBytes = 8;
+            m_bAddr64bit = true;
+            break;
+        }
+    }
+    if(m_currPacketData.size() == (unsigned)(1+m_addrBytes))
+    {
+        int st_idx = 1;
+        if(m_bAddr64bit)
+        {
+            uint64_t val64;
+            st_idx+=extract64BitLongAddr(m_currPacketData,st_idx,m_addrIS,val64);
+            m_curr_packet.set64BitAddress(val64,m_addrIS);
+        }
+        else
+        {
+            uint32_t val32;
+            st_idx+=extract32BitLongAddr(m_currPacketData,st_idx,m_addrIS,val32);
+            m_curr_packet.set32BitAddress(val32,m_addrIS);
+        }
+        m_process_state = SEND_PKT;
+    }
+}
+
+void TrcPktProcEtmV4I::iPktQ(const uint8_t lastByte)
+{
+    if(m_currPacketData.size() == 1)
+    {
+        m_Q_type = lastByte & 0xF;
+
+        m_addrBytes = 0;
+        m_count_done = false;
+        m_has_addr = false;
+        m_addr_short = true;
+        m_addr_match = false;
+        m_addrIS = 1;
+        m_QE = 0;
+
+        switch(m_Q_type)
+        {
+            // count only - implied address.
+        case 0x0:
+        case 0x1:
+        case 0x2:
+            m_addr_match = true;
+            m_has_addr = true;
+            m_QE = m_Q_type & 0x3;
+        case 0xC:
+            break;
+
+            // count + short address 
+        case 0x5:
+            m_addrIS = 0;
+        case 0x6:
+            m_has_addr = true;            
+            m_addrBytes = 2;  // short IS0/1
+            break;
+
+            // count + long address
+        case 0xA:
+            m_addrIS = 0;
+        case 0xB:
+            m_has_addr = true;
+            m_addr_short = false;
+            m_addrBytes = 4; // long IS0/1
+            break;
+
+            // no count, no address
+        case 0xF:
+            m_count_done = true;
+            break;
+
+            // reserved values 0x3, 0x4, 0x7, 0x8, 0x9, 0xD, 0xE
+        default:
+            m_curr_packet.err_type =  m_curr_packet.type;
+            m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
+            m_process_state = SEND_PKT;
+            break;
+        }
+    }
+    else
+    {
+        if(m_addrBytes > 0)
+        {
+            if(m_addr_short && m_addrBytes == 2)  // short
+            {
+                if((lastByte & 0x80) == 0x00)
+                    m_addrBytes--;        // short version can have just single byte.
+            }
+            m_addrBytes--;
+        }
+        else if(!m_count_done)
+        {
+            m_count_done = ((lastByte & 0x80) == 0x00);
+        }
+    }
+
+    if(((m_addrBytes == 0) && m_count_done))
+    {
+        int idx = 1; // move past the header
+        int bits = 0;
+        uint32_t q_addr;
+        uint32_t q_count;
+
+        if(m_has_addr)
+        {
+            if(m_addr_match)
+            {
+                m_curr_packet.setAddressExactMatch(m_QE);
+            }
+            else if(m_addr_short)
+            {
+                idx+=extractShortAddr(m_currPacketData,idx,m_addrIS,q_addr,bits);
+                m_curr_packet.updateShortAddress(q_addr,m_addrIS,(uint8_t)bits);
+            }
+            else
+            {
+                idx+=extract32BitLongAddr(m_currPacketData,idx,m_addrIS,q_addr);
+                m_curr_packet.set32BitAddress(q_addr,m_addrIS);
+            }
+        }
+
+        if(m_Q_type != 0xF)
+        {
+            extractContField(m_currPacketData,idx,q_count);
+            m_curr_packet.setQType(true,q_count,m_has_addr,m_addr_match,m_Q_type);
+        }
+        else
+        {
+            m_curr_packet.setQType(false,0,false,false,0xF);
+        }
+        m_process_state = SEND_PKT;
+    }
+
+}
+
+void TrcPktProcEtmV4I::iAtom(const uint8_t lastByte)
+{
+    // patterns lsbit = oldest atom, ms bit = newest.
+    static const uint32_t f4_patterns[] = {
+        0xE, // EEEN 
+        0x0, // NNNN
+        0xA, // ENEN
+        0x5  // NENE
+    };
+
+    uint8_t pattIdx = 0, pattCount = 0;
+    uint32_t pattern;
+
+    // atom packets are single byte, no payload.
+    switch(m_curr_packet.type)
+    {
+    case ETM4_PKT_I_ATOM_F1:
+        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x1), 1); // 1xE or N
+        break;
+
+    case ETM4_PKT_I_ATOM_F2:
+        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x3), 2); // 2x (E or N)
+        break;
+
+    case ETM4_PKT_I_ATOM_F3:
+        m_curr_packet.setAtomPacket(ATOM_PATTERN,(lastByte & 0x7), 3); // 3x (E or N)
+        break;
+
+    case ETM4_PKT_I_ATOM_F4:
+        m_curr_packet.setAtomPacket(ATOM_PATTERN,f4_patterns[(lastByte & 0x3)], 4); // 4 atom pattern
+        break; 
+
+    case ETM4_PKT_I_ATOM_F5:
+        pattIdx = ((lastByte & 0x20) >> 3) | (lastByte & 0x3);
+        switch(pattIdx)
+        {
+        case 5: // 0b101
+            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x1E, 5); // 5 atom pattern EEEEN
+            break;
+
+        case 1: // 0b001
+            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x00, 5); // 5 atom pattern NNNNN
+            break;
+
+        case 2: //0b010
+            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x0A, 5); // 5 atom pattern NENEN
+            break;
+
+        case 3: //0b011
+            m_curr_packet.setAtomPacket(ATOM_PATTERN,0x15, 5); // 5 atom pattern ENENE
+            break;
+
+        default:
+            // TBD: warn about invalid pattern in here.
+            break;
+        }
+        break;
+
+    case ETM4_PKT_I_ATOM_F6:
+        pattCount = (lastByte & 0x1F) + 3;  // count of E's
+        // TBD: check 23 or less at this point? 
+        pattern = ((uint32_t)0x1 << pattCount) - 1; // set pattern to string of E's
+        if((lastByte & 0x20) == 0x00)   // last atom is E?
+            pattern |= ((uint32_t)0x1 << pattCount); 
+        m_curr_packet.setAtomPacket(ATOM_PATTERN,pattern, pattCount+1);
+        break;
+    }
+
+    m_process_state = SEND_PKT;
+}
+
+// header byte processing is table driven.
+void TrcPktProcEtmV4I::BuildIPacketTable()   
+{
+    // initialise everything as reserved.
+    for(int i = 0; i < 256; i++)
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_RESERVED;
+        m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iPktReserved;
+    }
+
+    // 0x00 - extension 
+    m_i_table[0x00].pkt_type = ETM4_PKT_I_EXTENSION;
+    m_i_table[0x00].pptkFn   = &TrcPktProcEtmV4I::iPktExtension;
+
+    // 0x01 - Trace info
+    m_i_table[0x01].pkt_type = ETM4_PKT_I_TRACE_INFO;
+    m_i_table[0x01].pptkFn   = &TrcPktProcEtmV4I::iPktTraceInfo;
+
+    // b0000001x - timestamp
+    m_i_table[0x02].pkt_type = ETM4_PKT_I_TIMESTAMP;
+    m_i_table[0x02].pptkFn   = &TrcPktProcEtmV4I::iPktTimestamp;
+    m_i_table[0x03].pkt_type = ETM4_PKT_I_TIMESTAMP;
+    m_i_table[0x03].pptkFn   = &TrcPktProcEtmV4I::iPktTimestamp;
+
+    // b0000 0100 - trace on
+    m_i_table[0x04].pkt_type = ETM4_PKT_I_TRACE_ON;
+    m_i_table[0x04].pptkFn   = &TrcPktProcEtmV4I::iPktNoPayload;
+
+
+    // b0000 0101 - Funct ret V8M
+    m_i_table[0x05].pkt_type = ETM4_PKT_I_FUNC_RET;
+    if ((m_config.coreProfile() == profile_CortexM) &&
+        (OCSD_IS_V8_ARCH(m_config.archVersion())) &&
+        (m_config.FullVersion() >= 0x42))
+    {        
+        m_i_table[0x05].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+    }
+
+    // b0000 0110 - exception 
+    m_i_table[0x06].pkt_type = ETM4_PKT_I_EXCEPT;
+    m_i_table[0x06].pptkFn   = &TrcPktProcEtmV4I::iPktException;
+
+    // b0000 0111 - exception return 
+    m_i_table[0x07].pkt_type = ETM4_PKT_I_EXCEPT_RTN;
+    m_i_table[0x07].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+
+    // b0000 110x - cycle count f2
+    // b0000 111x - cycle count f1
+    for(int i = 0; i < 4; i++)
+    {
+        m_i_table[0x0C+i].pkt_type = (i >= 2) ? ETM4_PKT_I_CCNT_F1 : ETM4_PKT_I_CCNT_F2;
+        m_i_table[0x0C+i].pptkFn   = &TrcPktProcEtmV4I::iPktCycleCntF123;
+    }
+
+    // b0001 xxxx - cycle count f3
+    for(int i = 0; i < 16; i++)
+    {
+        m_i_table[0x10+i].pkt_type = ETM4_PKT_I_CCNT_F3;
+        m_i_table[0x10+i].pptkFn   = &TrcPktProcEtmV4I::iPktCycleCntF123;
+    }
+
+    // b0010 0xxx - NDSM
+    for(int i = 0; i < 8; i++)
+    {
+        m_i_table[0x20 + i].pkt_type = ETM4_PKT_I_NUM_DS_MKR;
+        if (m_config.enabledDataTrace())
+            m_i_table[0x20+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+        else
+            m_i_table[0x20+i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0010 10xx, b0010 1100 - UDSM
+    for(int i = 0; i < 5; i++)
+    {
+        m_i_table[0x28+i].pkt_type = ETM4_PKT_I_UNNUM_DS_MKR;
+        if (m_config.enabledDataTrace())
+            m_i_table[0x28+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+        else
+            m_i_table[0x28+i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0010 1101 - commit
+    m_i_table[0x2D].pkt_type = ETM4_PKT_I_COMMIT;
+    m_i_table[0x2D].pptkFn   = &TrcPktProcEtmV4I::iPktSpeclRes;
+
+    // b0010 111x - cancel f1 (mis pred)
+    m_i_table[0x2E].pkt_type = ETM4_PKT_I_CANCEL_F1;
+    m_i_table[0x2E].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
+    m_i_table[0x2F].pkt_type = ETM4_PKT_I_CANCEL_F1_MISPRED;
+    m_i_table[0x2F].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
+
+    // b0011 00xx - mis predict
+    for(int i = 0; i < 4; i++)
+    {
+        m_i_table[0x30+i].pkt_type = ETM4_PKT_I_MISPREDICT;
+        m_i_table[0x30+i].pptkFn   =  &TrcPktProcEtmV4I::iPktSpeclRes;
+    }
+
+    // b0011 01xx - cancel f2
+    for(int i = 0; i < 4; i++)
+    {
+        m_i_table[0x34+i].pkt_type = ETM4_PKT_I_CANCEL_F2;
+        m_i_table[0x34+i].pptkFn   =  &TrcPktProcEtmV4I::iPktSpeclRes;
+    }
+
+    // b0011 1xxx - cancel f3
+    for(int i = 0; i < 8; i++)
+    {
+        m_i_table[0x38+i].pkt_type = ETM4_PKT_I_CANCEL_F3;
+        m_i_table[0x38+i].pptkFn   =  &TrcPktProcEtmV4I::iPktSpeclRes;
+    }
+
+    bool bCondValid = m_config.hasCondTrace() && m_config.enabledCondITrace();
+
+    // b0100 000x, b0100 0010 - cond I f2
+    for (int i = 0; i < 3; i++)
+    {
+        m_i_table[0x40 + i].pkt_type = ETM4_PKT_I_COND_I_F2;
+        if (bCondValid)
+            m_i_table[0x40 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
+        else
+            m_i_table[0x40 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0100 0011 - cond flush
+    m_i_table[0x43].pkt_type = ETM4_PKT_I_COND_FLUSH;
+    if (bCondValid)
+        m_i_table[0x43].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+    else
+        m_i_table[0x43].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+
+    // b0100 010x, b0100 0110 - cond res f4
+    for (int i = 0; i < 3; i++)
+    {
+        m_i_table[0x44 + i].pkt_type = ETM4_PKT_I_COND_RES_F4;
+        if (bCondValid)
+            m_i_table[0x44 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[0x44 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0100 100x, b0100 0110 - cond res f2
+    // b0100 110x, b0100 1110 - cond res f2
+    for (int i = 0; i < 3; i++)
+    {
+        m_i_table[0x48 + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
+        if (bCondValid)
+            m_i_table[0x48 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[0x48 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+    for (int i = 0; i < 3; i++)
+    {
+        m_i_table[0x4C + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
+        if (bCondValid)
+            m_i_table[0x4C + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[0x4C + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0101xxxx - cond res f3
+    for (int i = 0; i < 16; i++)
+    {
+        m_i_table[0x50 + i].pkt_type = ETM4_PKT_I_COND_RES_F3;
+        if (bCondValid)
+            m_i_table[0x50 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[0x50 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b011010xx - cond res f1
+    for (int i = 0; i < 4; i++)
+    {
+        m_i_table[0x68 + i].pkt_type = ETM4_PKT_I_COND_RES_F1;
+        if (bCondValid)
+            m_i_table[0x68 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[0x68 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // b0110 1100 - cond instr f1
+    m_i_table[0x6C].pkt_type = ETM4_PKT_I_COND_I_F1;
+    if (bCondValid)
+        m_i_table[0x6C].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
+    else
+        m_i_table[0x6C].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+
+    // b0110 1101 - cond instr f3
+    m_i_table[0x6D].pkt_type = ETM4_PKT_I_COND_I_F3;
+    if (bCondValid)
+        m_i_table[0x6D].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
+    else
+        m_i_table[0x6D].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+
+    // b0110111x - cond res f1
+    for (int i = 0; i < 2; i++)
+    {
+        // G++ cannot understand [0x6E+i] so change these round
+        m_i_table[i + 0x6E].pkt_type = ETM4_PKT_I_COND_RES_F1;
+        if (bCondValid)
+            m_i_table[i + 0x6E].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
+        else
+            m_i_table[i + 0x6E].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
+    }
+
+    // ETM 4.3 introduces ignore packets
+    if (m_config.FullVersion() >= 0x43)
+    {
+        m_i_table[0x70].pkt_type = ETM4_PKT_I_IGNORE;
+        m_i_table[0x70].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
+    }
+
+    // b01110001 - b01111111 - event trace
+    for(int i = 0; i < 15; i++)
+    {
+        m_i_table[0x71+i].pkt_type = ETM4_PKT_I_EVENT;
+        m_i_table[0x71+i].pptkFn   = &TrcPktProcEtmV4I::iPktNoPayload;
+    }
+    
+    // 0b1000 000x - context 
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x80+i].pkt_type = ETM4_PKT_I_CTXT;
+        m_i_table[0x80+i].pptkFn   = &TrcPktProcEtmV4I::iPktContext;
+    }
+
+    // 0b1000 0010 to b1000 0011 - addr with ctxt
+    // 0b1000 0101 to b1000 0110 - addr with ctxt
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x82+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_32IS0 : ETM4_PKT_I_ADDR_CTXT_L_32IS1;
+        m_i_table[0x82+i].pptkFn   = &TrcPktProcEtmV4I::iPktAddrCtxt;
+    }
+
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x85+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_64IS0 : ETM4_PKT_I_ADDR_CTXT_L_64IS1;
+        m_i_table[0x85+i].pptkFn   = &TrcPktProcEtmV4I::iPktAddrCtxt;
+    }
+
+    // 0b1001 0000 to b1001 0010 - exact match addr
+    for(int i = 0; i < 3; i++)
+    {
+        m_i_table[0x90+i].pkt_type = ETM4_PKT_I_ADDR_MATCH;
+        m_i_table[0x90+i].pptkFn   = &TrcPktProcEtmV4I::iPktNoPayload;
+    }
+
+    // b1001 0101 - b1001 0110 - addr short address
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x95+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_S_IS0 : ETM4_PKT_I_ADDR_S_IS1;
+        m_i_table[0x95+i].pptkFn   = &TrcPktProcEtmV4I::iPktShortAddr;
+    }
+
+    // b10011010 - b10011011 - addr long address 
+    // b10011101 - b10011110 - addr long address 
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x9A+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_L_32IS0 : ETM4_PKT_I_ADDR_L_32IS1;
+        m_i_table[0x9A+i].pptkFn   = &TrcPktProcEtmV4I::iPktLongAddr;
+    }
+    for(int i = 0; i < 2; i++)
+    {
+        m_i_table[0x9D+i].pkt_type =  (i == 0) ? ETM4_PKT_I_ADDR_L_64IS0 : ETM4_PKT_I_ADDR_L_64IS1;
+        m_i_table[0x9D+i].pptkFn   = &TrcPktProcEtmV4I::iPktLongAddr;
+    }
+    
+    // b1010xxxx - Q packet
+    for (int i = 0; i < 16; i++)
+    {
+        m_i_table[0xA0 + i].pkt_type = ETM4_PKT_I_Q;
+        // certain Q type codes are reserved.
+        switch (i) {
+        case 0x3:
+        case 0x4:
+        case 0x7:
+        case 0x8:
+        case 0x9:
+        case 0xD:
+        case 0xE:
+            // don't update pkt fn - leave at default reserved.
+            break;
+        default:
+            // if this config supports Q elem - otherwise reserved again.
+            if (m_config.hasQElem())
+                m_i_table[0xA0 + i].pptkFn = &TrcPktProcEtmV4I::iPktQ;
+        }
+    }
+
+    // Atom Packets - all no payload but have specific pattern generation fn
+    for(int i = 0xC0; i <= 0xD4; i++)   // atom f6
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    for(int i = 0xD5; i <= 0xD7; i++)  // atom f5
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F5;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    for(int i = 0xD8; i <= 0xDB; i++)  // atom f2
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F2;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    for(int i = 0xDC; i <= 0xDF; i++)  // atom f4
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F4;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    for(int i = 0xE0; i <= 0xF4; i++)  // atom f6
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    
+    // atom f5
+    m_i_table[0xF5].pkt_type = ETM4_PKT_I_ATOM_F5;
+    m_i_table[0xF5].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+
+    for(int i = 0xF6; i <= 0xF7; i++)  // atom f1
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F1;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+    for(int i = 0xF8; i <= 0xFF; i++)  // atom f3
+    {
+        m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F3;
+        m_i_table[i].pptkFn   = &TrcPktProcEtmV4I::iAtom;
+    }
+}
+
+ unsigned TrcPktProcEtmV4I::extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit /*= 5*/)
+{
+    unsigned idx = 0;
+    bool lastByte = false;
+    uint8_t byteVal;
+    value = 0;
+    while(!lastByte && (idx < byte_limit))   // max 5 bytes for 32 bit value;
+    {
+        if(buffer.size() > (st_idx + idx))
+        {
+            // each byte has seven bits + cont bit
+            byteVal = buffer[(st_idx + idx)];
+            lastByte = (byteVal & 0x80) != 0x80;
+            value |= ((uint32_t)(byteVal & 0x7F)) << (idx * 7);
+            idx++;
+        }
+        else
+        {
+            throwBadSequenceError("Invalid 32 bit continuation fields in packet");
+        }
+    }
+    return idx;
+}
+
+unsigned TrcPktProcEtmV4I::extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit /*= 9*/)
+{
+    unsigned idx = 0;
+    bool lastByte = false;
+    uint8_t byteVal;
+    value = 0;
+    while(!lastByte && (idx < byte_limit))   // max 9 bytes for 64 bit value;
+    {
+        if(buffer.size() > (st_idx + idx))
+        {
+            // each byte has seven bits + cont bit
+            byteVal = buffer[(st_idx + idx)];
+            lastByte = (byteVal & 0x80) != 0x80;
+            value |= ((uint64_t)(byteVal & 0x7F)) << (idx * 7);
+            idx++;
+        }
+        else
+        {
+            throwBadSequenceError("Invalid 64 bit continuation fields in packet");
+        }
+    }
+    return idx;
+}
+
+ unsigned TrcPktProcEtmV4I::extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result)
+{
+    unsigned idx = 0;
+    bool lastByte = false;
+    int incr = 0;
+
+    key = 0;
+
+    while(!lastByte && (idx < 6)) // cannot be more than 6 bytes for res + 32 bit key
+    {
+        if(buffer.size() > (st_idx + idx))
+        {
+            if(idx == 0)
+            {
+                result = buffer[st_idx+idx];
+                key = (buffer[st_idx+idx] >> 4) & 0x7;
+                incr+=3;
+            }
+            else
+            {
+                key |= ((uint32_t)(buffer[st_idx+idx] & 0x7F)) << incr;
+                incr+=7;
+            }
+            lastByte = (bool)((buffer[st_idx+idx] & 0x80) == 0); 
+            idx++;
+        }
+        else
+        {
+            throwBadSequenceError("Invalid continuation fields in packet");
+        }
+    }    
+    return idx;
+}
+
+int TrcPktProcEtmV4I::extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value)
+{
+    value = 0;
+    if(IS == 0)
+    {
+        value |= ((uint64_t)(buffer[st_idx+0] & 0x7F)) << 2;
+        value |= ((uint64_t)(buffer[st_idx+1] & 0x7F)) << 9;
+    }
+    else
+    {
+        value |= ((uint64_t)(buffer[st_idx+0] & 0x7F)) << 1;
+        value |= ((uint64_t)buffer[st_idx+1]) << 8;
+    }
+    value |= ((uint64_t)buffer[st_idx+2]) << 16;
+    value |= ((uint64_t)buffer[st_idx+3]) << 24;
+    value |= ((uint64_t)buffer[st_idx+4]) << 32;
+    value |= ((uint64_t)buffer[st_idx+5]) << 40;
+    value |= ((uint64_t)buffer[st_idx+6]) << 48;
+    value |= ((uint64_t)buffer[st_idx+7]) << 56;      
+    return 8;    
+}
+
+int TrcPktProcEtmV4I::extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value)
+{
+    value = 0;
+    if(IS == 0)
+    {
+        value |= ((uint32_t)(buffer[st_idx+0] & 0x7F)) << 2;
+        value |= ((uint32_t)(buffer[st_idx+1] & 0x7F)) << 9;
+    }
+    else
+    {
+        value |= ((uint32_t)(buffer[st_idx+0] & 0x7F)) << 1;
+        value |= ((uint32_t)buffer[st_idx+1]) << 8;
+    }
+    value |= ((uint32_t)buffer[st_idx+2]) << 16;
+    value |= ((uint32_t)buffer[st_idx+3]) << 24;
+    return 4;
+}
+
+void TrcPktProcEtmV4I::throwBadSequenceError(const char *pszExtMsg)
+{
+    m_curr_packet.updateErrType(ETM4_PKT_I_BAD_SEQUENCE);   // swap type for err type
+    throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_BAD_PACKET_SEQ,m_packet_index,m_config.getTraceID(),pszExtMsg);
+}
+
+
+/* End of File trc_pkt_proc_etmv4i.cpp */

Property changes on: head/contrib/opencsd/decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/i_dec/trc_i_decode.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/i_dec/trc_i_decode.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/i_dec/trc_i_decode.cpp	(revision 362263)
@@ -1,250 +1,235 @@
 /*
  * \file       trc_i_decode.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "opencsd/ocsd_if_types.h"
 #include "i_dec/trc_i_decode.h"
 #include "i_dec/trc_idec_arminst.h"
 
 ocsd_err_t TrcIDecode::DecodeInstruction(ocsd_instr_info *instr_info)
 {
     ocsd_err_t err = OCSD_OK;
-    clear_instr_subtype();
-    SetArchVersion(instr_info);
+    struct decode_info info;
 
+    info.instr_sub_type = OCSD_S_INSTR_NONE;
+    info.arch_version = (uint16_t)(instr_info->pe_type.arch);
+
     switch(instr_info->isa)
     {
     case ocsd_isa_arm:
-        err = DecodeA32(instr_info);
+        err = DecodeA32(instr_info, &info);
         break;
 
     case ocsd_isa_thumb2:
-        err = DecodeT32(instr_info);
+        err = DecodeT32(instr_info, &info);
         break;
 
     case ocsd_isa_aarch64:
-        err = DecodeA64(instr_info);
+        err = DecodeA64(instr_info, &info);
         break;
 
     case ocsd_isa_tee:    
     case ocsd_isa_jazelle:
     default:
         // unsupported ISA
         err = OCSD_ERR_UNSUPPORTED_ISA;
         break;
     }
-    instr_info->sub_type = get_instr_subtype();
+    instr_info->sub_type = info.instr_sub_type;
     return err;
 }
 
-void TrcIDecode::SetArchVersion(ocsd_instr_info *instr_info)
+ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info, struct decode_info *info)
 {
-    uint16_t arch = 0x0700;
-
-    switch (instr_info->pe_type.arch)
-    {
-    case ARCH_V8: arch = 0x0800; break;
-    case ARCH_V8r3: arch = 0x0803; break;
-    case ARCH_V7:
-    default:
-        break;
-    }
-    set_arch_version(arch);
-}
-
-
-ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info)
-{
     uint32_t branchAddr = 0;
     arm_barrier_t barrier;
 
     instr_info->instr_size = 4; // instruction size A32
     instr_info->type =  OCSD_INSTR_OTHER;  // default type
     instr_info->next_isa = instr_info->isa; // assume same ISA 
     instr_info->is_link = 0;
 
-    if(inst_ARM_is_indirect_branch(instr_info->opcode))
+    if(inst_ARM_is_indirect_branch(instr_info->opcode, info))
     {
         instr_info->type = OCSD_INSTR_BR_INDIRECT;
-        instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode);
+        instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode, info);
     }
     else if(inst_ARM_is_direct_branch(instr_info->opcode))
     {
         inst_ARM_branch_destination((uint32_t)instr_info->instr_addr,instr_info->opcode,&branchAddr);
         instr_info->type = OCSD_INSTR_BR;
         if (branchAddr & 0x1)
         {
             instr_info->next_isa = ocsd_isa_thumb2;
             branchAddr &= ~0x1;
         }
         instr_info->branch_addr = (ocsd_vaddr_t)branchAddr;
-        instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode);
+        instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode, info);
     }
     else if((barrier = inst_ARM_barrier(instr_info->opcode)) != ARM_BARRIER_NONE)
     {
         switch(barrier)
         {
         case ARM_BARRIER_ISB: 
             instr_info->type = OCSD_INSTR_ISB;             
             break;
 
         case ARM_BARRIER_DSB:
         case ARM_BARRIER_DMB:
             if(instr_info->dsb_dmb_waypoints)
                 instr_info->type = OCSD_INSTR_DSB_DMB;             
             break;
         }
     }
     else if (instr_info->wfi_wfe_branch)
     {
         if (inst_ARM_wfiwfe(instr_info->opcode))
         {
             instr_info->type = OCSD_INSTR_WFI_WFE;
         }
     }
     instr_info->is_conditional = inst_ARM_is_conditional(instr_info->opcode);
 
     return OCSD_OK;
 }
 
-ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info)
+ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info, struct decode_info *info)
 {
     uint64_t branchAddr = 0;
     arm_barrier_t barrier;
 
     instr_info->instr_size =  4; // default address update
     instr_info->type =  OCSD_INSTR_OTHER;  // default type
     instr_info->next_isa = instr_info->isa; // assume same ISA 
     instr_info->is_link = 0;
     
-    if(inst_A64_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link))
+    if(inst_A64_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link, info))
     {
         instr_info->type = OCSD_INSTR_BR_INDIRECT;
 //        instr_info->is_link = inst_A64_is_branch_and_link(instr_info->opcode);
     }
-    else if(inst_A64_is_direct_branch_link(instr_info->opcode, &instr_info->is_link))
+    else if(inst_A64_is_direct_branch_link(instr_info->opcode, &instr_info->is_link, info))
     {
         inst_A64_branch_destination(instr_info->instr_addr,instr_info->opcode,&branchAddr);
         instr_info->type = OCSD_INSTR_BR;
         instr_info->branch_addr = (ocsd_vaddr_t)branchAddr;
 //        instr_info->is_link = inst_A64_is_branch_and_link(instr_info->opcode);
     }
     else if((barrier = inst_A64_barrier(instr_info->opcode)) != ARM_BARRIER_NONE)
     {
         switch(barrier)
         {
         case ARM_BARRIER_ISB: 
             instr_info->type = OCSD_INSTR_ISB;             
             break;
 
         case ARM_BARRIER_DSB:
         case ARM_BARRIER_DMB:
             if(instr_info->dsb_dmb_waypoints)
                 instr_info->type = OCSD_INSTR_DSB_DMB;             
             break;
         }
     }
     else if (instr_info->wfi_wfe_branch)
     {
         if (inst_A64_wfiwfe(instr_info->opcode))
         {
             instr_info->type = OCSD_INSTR_WFI_WFE;
         }
     }
 
     instr_info->is_conditional = inst_A64_is_conditional(instr_info->opcode);
 
     return OCSD_OK;
 }
 
-ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info)
+ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info, struct decode_info *info)
 {
     uint32_t branchAddr = 0;
     arm_barrier_t barrier;
 
     // need to align the 32 bit opcode as 2 16 bit, with LS 16 as in top 16 bit of 
     // 32 bit word - T2 routines assume 16 bit in top 16 bit of 32 bit opcode.
     uint32_t op_temp = (instr_info->opcode >> 16) & 0xFFFF;
     op_temp |= ((instr_info->opcode & 0xFFFF) << 16);
     instr_info->opcode = op_temp;
 
 
     instr_info->instr_size = is_wide_thumb((uint16_t)(instr_info->opcode >> 16)) ? 4 : 2;
     instr_info->type =  OCSD_INSTR_OTHER;  // default type
     instr_info->next_isa = instr_info->isa; // assume same ISA 
     instr_info->is_link = 0;
     instr_info->is_conditional = 0;
 
 
-    if(inst_Thumb_is_direct_branch_link(instr_info->opcode,&instr_info->is_link, &instr_info->is_conditional))
+    if(inst_Thumb_is_direct_branch_link(instr_info->opcode,&instr_info->is_link, &instr_info->is_conditional, info))
     {
         inst_Thumb_branch_destination((uint32_t)instr_info->instr_addr,instr_info->opcode,&branchAddr);
         instr_info->type = OCSD_INSTR_BR;
         instr_info->branch_addr = (ocsd_vaddr_t)(branchAddr & ~0x1);
         if((branchAddr & 0x1) == 0)
             instr_info->next_isa = ocsd_isa_arm;
     }
-    else if (inst_Thumb_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link))
+    else if (inst_Thumb_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link, info))
     {
         instr_info->type = OCSD_INSTR_BR_INDIRECT;
     }
     else if((barrier = inst_Thumb_barrier(instr_info->opcode)) != ARM_BARRIER_NONE)
     {
         switch(barrier)
         {
         case ARM_BARRIER_ISB: 
             instr_info->type = OCSD_INSTR_ISB;             
             break;
 
         case ARM_BARRIER_DSB:
         case ARM_BARRIER_DMB:
             if(instr_info->dsb_dmb_waypoints)
                 instr_info->type = OCSD_INSTR_DSB_DMB;             
             break;
         }
     }
     else if (instr_info->wfi_wfe_branch)
     {
         if (inst_Thumb_wfiwfe(instr_info->opcode))
         {
             instr_info->type = OCSD_INSTR_WFI_WFE;
         }
     }
     instr_info->is_conditional = inst_Thumb_is_conditional(instr_info->opcode);
     instr_info->thumb_it_conditions = inst_Thumb_is_IT(instr_info->opcode);
 
     return OCSD_OK;
 }
-
 
 /* End of File trc_i_decode.cpp */
Index: head/contrib/opencsd/decoder/source/i_dec/trc_idec_arminst.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/i_dec/trc_idec_arminst.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/i_dec/trc_idec_arminst.cpp	(revision 362263)
@@ -1,682 +1,661 @@
 /*
  * \file       trc_idec_arminst.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 /*
 Basic ARM/Thumb/A64 instruction decode, suitable for e.g. basic
 block identification and trace decode.
 */
 
 #include "i_dec/trc_idec_arminst.h"
 
 #include <stddef.h>  /* for NULL */
 #include <assert.h>
 
-
-static ocsd_instr_subtype instr_sub_type = OCSD_S_INSTR_NONE;
-
-/* need to spot the architecture version for certain instructions */
-static uint16_t arch_version = 0x70;
-
-ocsd_instr_subtype get_instr_subtype()
-{
-    return instr_sub_type;
-}
-
-void clear_instr_subtype()
-{
-    instr_sub_type = OCSD_S_INSTR_NONE;
-}
-
-void set_arch_version(uint16_t version)
-{
-    arch_version = version;
-}
-
 int inst_ARM_is_direct_branch(uint32_t inst)
 {
     int is_direct_branch = 1;
     if ((inst & 0xf0000000) == 0xf0000000) {
         /* NV space */
         if ((inst & 0xfe000000) == 0xfa000000){
             /* BLX (imm) */
         } else {
             is_direct_branch = 0;
         }
     } else if ((inst & 0x0e000000) == 0x0a000000) {
         /* B, BL */
     } else {
         is_direct_branch = 0;
     }
     return is_direct_branch;
 }
 
 int inst_ARM_wfiwfe(uint32_t inst)
 {
     if ( ((inst & 0xf0000000) != 0xf0000000) &&
          ((inst & 0x0ffffffe) == 0x0320f002)
         )
         /* WFI & WFE may be traced as branches in etm4.3 ++ */
         return 1;
     return 0;
 }
 
-int inst_ARM_is_indirect_branch(uint32_t inst)
+int inst_ARM_is_indirect_branch(uint32_t inst, struct decode_info *info)
 {
     int is_indirect_branch = 1;
     if ((inst & 0xf0000000) == 0xf0000000) {
         /* NV space */
         if ((inst & 0xfe500000) == 0xf8100000) {
             /* RFE */
         } else {
             is_indirect_branch = 0;
         }
     } else if ((inst & 0x0ff000d0) == 0x01200010) {
         /* BLX (register), BX */
         if ((inst & 0xFF) == 0x1E)
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */
     } else if ((inst & 0x0ff000f0) == 0x01200020) {
         /* BXJ: in v8 this behaves like BX */
     } else if ((inst & 0x0e108000) == 0x08108000) {
         /* POP {...,pc} or LDMxx {...,pc} */
         if ((inst & 0x0FFFA000) == 0x08BD8000) /* LDMIA SP!,{...,pc} */
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
     } else if ((inst & 0x0e50f000) == 0x0410f000) {
         /* LDR PC,imm... inc. POP {PC} */
         if ( (inst & 0x01ff0000) == 0x009D0000)
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm */
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm */
     } else if ((inst & 0x0e50f010) == 0x0610f000) {
         /* LDR PC,reg */
     } else if ((inst & 0x0fe0f000) == 0x01a0f000) {
         /* MOV PC,rx */
         if ((inst & 0x00100FFF) == 0x00E) /* ensure the S=0, LSL #0 variant - i.e plain MOV */
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC, R14 */
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC, R14 */
     } else if ((inst & 0x0f900080) == 0x01000000) {
         /* "Miscellaneous instructions" - in DP space */
         is_indirect_branch = 0;
     } else if ((inst & 0x0f9000f0) == 0x01800090) {
         /* Some extended loads and stores */
         is_indirect_branch = 0;
     } else if ((inst & 0x0fb0f000) == 0x0320f000) {
         /* MSR #imm */
         is_indirect_branch = 0;
     } else if ((inst & 0x0e00f000) == 0x0200f000) {
         /* DP PC,imm shift */
         if ((inst & 0x0f90f000) == 0x0310f000) {
             /* TST/CMP */
            is_indirect_branch = 0;
         }
     } else if ((inst & 0x0e00f000) == 0x0000f000) {
         /* DP PC,reg */
     } else {
         is_indirect_branch = 0;
     }
     return is_indirect_branch;
 }
 
-int inst_Thumb_is_direct_branch(uint32_t inst)
+int inst_Thumb_is_direct_branch(uint32_t inst, struct decode_info *info)
 {
     uint8_t link, cond;
-    return inst_Thumb_is_direct_branch_link(inst, &link, &cond);
+    return inst_Thumb_is_direct_branch_link(inst, &link, &cond, info);
 }
 
-int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond)
+int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond, struct decode_info *info)
 {
     int is_direct_branch = 1;
 
     if ((inst & 0xf0000000) == 0xd0000000 && (inst & 0x0e000000) != 0x0e000000) {
         /* B<c> (encoding T1) */
         *is_cond = 1;
     } else if ((inst & 0xf8000000) == 0xe0000000) {
         /* B (encoding T2) */
     } else if ((inst & 0xf800d000) == 0xf0008000 && (inst & 0x03800000) != 0x03800000) {
         /* B (encoding T3) */
         *is_cond = 1;
     } else if ((inst & 0xf8009000) == 0xf0009000) {
         /* B (encoding T4); BL (encoding T1) */
         if (inst & 0x00004000) {
             *is_link = 1;
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         }
     } else if ((inst & 0xf800d001) == 0xf000c000) {
         /* BLX (imm) (encoding T2) */
         *is_link = 1;
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
     } else if ((inst & 0xf5000000) == 0xb1000000) {
         /* CB(NZ) */
         *is_cond = 1;
     } else {
         is_direct_branch = 0;
     }
     return is_direct_branch;
 }
 
 int inst_Thumb_wfiwfe(uint32_t inst)
 {
     int is_wfiwfe = 1;
     /* WFI, WFE may be branches in etm4.3++ */
     if ((inst & 0xfffffffe) == 0xf3af8002) {
         /* WFI & WFE (encoding T2) */
     }
     else if ((inst & 0xffef0000) == 0xbf200000) {
         /* WFI & WFE (encoding T1) */
     }
     else {
         is_wfiwfe = 0;
     }
     return is_wfiwfe;
 }
 
-int inst_Thumb_is_indirect_branch(uint32_t inst)
+int inst_Thumb_is_indirect_branch(uint32_t inst, struct decode_info *info)
 {
     uint8_t link;
-    return inst_Thumb_is_indirect_branch_link(inst, &link);
+    return inst_Thumb_is_indirect_branch_link(inst, &link, info);
 }
 
-int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link)
+int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
 {
     /* See e.g. PFT Table 2-3 and Table 2-5 */
     int is_branch = 1;
     
     if ((inst & 0xff000000) == 0x47000000) {
         /* BX, BLX (reg) [v8M includes BXNS, BLXNS] */
         if (inst & 0x00800000) {
             *is_link = 1;
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         }
         else if ((inst & 0x00780000) == 0x00700000) {
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;  /* BX LR */
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;  /* BX LR */
         }
     } else if ((inst & 0xfff0d000) == 0xf3c08000) {
         /* BXJ: in v8 this behaves like BX */
     } else if ((inst & 0xff000000) == 0xbd000000) {
         /* POP {pc} */
-        instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
+        info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
     } else if ((inst & 0xfd870000) == 0x44870000) {
         /* MOV PC,reg or ADD PC,reg */
-        if ((inst & 0xffff0000) == 0x46f700000)
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC,LR */
+        if ((inst & 0xffff0000) == 0x46f70000)
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC,LR */
     } else if ((inst & 0xfff0ffe0) == 0xe8d0f000) {
         /* TBB/TBH */
     } else if ((inst & 0xffd00000) == 0xe8100000) {
         /* RFE (T1) */
     } else if ((inst & 0xffd00000) == 0xe9900000) {
         /* RFE (T2) */
     } else if ((inst & 0xfff0d000) == 0xf3d08000) {
         /* SUBS PC,LR,#imm inc.ERET */
     } else if ((inst & 0xfff0f000) == 0xf8d0f000) {
         /* LDR PC,imm (T3) */
     } else if ((inst & 0xff7ff000) == 0xf85ff000) {
         /* LDR PC,literal (T2) */
     } else if ((inst & 0xfff0f800) == 0xf850f800) {
         /* LDR PC,imm (T4) */
         if((inst & 0x000f0f00) == 0x000d0b00)
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm*/
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm*/
     } else if ((inst & 0xfff0ffc0) == 0xf850f000) {
         /* LDR PC,reg (T2) */
     } else if ((inst & 0xfe508000) == 0xe8108000) {
         /* LDM PC */
         if ((inst & 0x0FFF0000) == 0x08BD0000) /* LDMIA [SP]!, */
-            instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* POP {...,pc} */
+            info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* POP {...,pc} */
     } else {
         is_branch = 0;
     }
     return is_branch;
 }
 
-int inst_A64_is_direct_branch(uint32_t inst)
+int inst_A64_is_direct_branch(uint32_t inst, struct decode_info *info)
 {
     uint8_t link = 0;
-    return inst_A64_is_direct_branch_link(inst, &link);
+    return inst_A64_is_direct_branch_link(inst, &link, info);
 }
 
-int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link)
+int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
 {
     int is_direct_branch = 1;
     if ((inst & 0x7c000000) == 0x34000000) {
         /* CB, TB */
     } else if ((inst & 0xff000010) == 0x54000000) {
         /* B<cond> */
     } else if ((inst & 0x7c000000) == 0x14000000) {
         /* B, BL imm */
         if (inst & 0x80000000) {
             *is_link = 1;
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         }
     } else {
         is_direct_branch = 0;
     }
     return is_direct_branch;
 }
 
 int inst_A64_wfiwfe(uint32_t inst)
 {
     /* WFI, WFE may be traced as branches in etm 4.3++ */
     if ((inst & 0xffffffdf) == 0xd503205f)
         return 1;
     return 0;
 }
 
-int inst_A64_is_indirect_branch(uint32_t inst)
+int inst_A64_is_indirect_branch(uint32_t inst, struct decode_info *info)
 {
     uint8_t link = 0;
-    return inst_A64_is_indirect_branch_link(inst, &link);
+    return inst_A64_is_indirect_branch_link(inst, &link, info);
 }
 
-int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link)
+int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
 {
     int is_indirect_branch = 1;
 
     if ((inst & 0xffdffc1f) == 0xd61f0000) {
         /* BR, BLR */
         if (inst & 0x00200000) {
             *is_link = 1;
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         }
     } else if ((inst & 0xfffffc1f) == 0xd65f0000) {
-        instr_sub_type = OCSD_S_INSTR_V8_RET;
+        info->instr_sub_type = OCSD_S_INSTR_V8_RET;
         /* RET */
     } else if ((inst & 0xffffffff) == 0xd69f03e0) {
         /* ERET */
-        instr_sub_type = OCSD_S_INSTR_V8_ERET;
-    } else if (arch_version >= 0x0803) {
+        info->instr_sub_type = OCSD_S_INSTR_V8_ERET;
+    } else if (info->arch_version >= 0x0803) {
         /* new pointer auth instr for v8.3 arch */   
-        if ((inst & 0xffdff800) == 0xd61f0800) {
+        if ((inst & 0xffdff800) == 0xd71f0800) {
             /* BRAA, BRAB, BLRAA, BLRBB */
             if (inst & 0x00200000) {
                 *is_link = 1;
-                instr_sub_type = OCSD_S_INSTR_BR_LINK;
+                info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
             }
-        } else if ((inst & 0xffdff81F) == 0xd71f081F) {
+        } else if ((inst & 0xffdff81F) == 0xd61f081F) {
             /* BRAAZ, BRABZ, BLRAAZ, BLRBBZ */
             if (inst & 0x00200000) {
                 *is_link = 1;
-                instr_sub_type = OCSD_S_INSTR_BR_LINK;
+                info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
             }
         } else if ((inst & 0xfffffbff) == 0xd69f0bff) {
             /* ERETAA, ERETAB */
-            instr_sub_type = OCSD_S_INSTR_V8_ERET;
+            info->instr_sub_type = OCSD_S_INSTR_V8_ERET;
         } else if ((inst & 0xfffffbff) == 0xd65f0bff) {
             /* RETAA, RETAB */
-            instr_sub_type = OCSD_S_INSTR_V8_RET;
+            info->instr_sub_type = OCSD_S_INSTR_V8_RET;
         } else {
             is_indirect_branch = 0;
         }
     } else {
         is_indirect_branch = 0;
     }
     return is_indirect_branch;
 }
 
 int inst_ARM_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc)
 {
     uint32_t npc;
     int is_direct_branch = 1;
     if ((inst & 0x0e000000) == 0x0a000000) {
         /*
           B:   cccc:1010:imm24
           BL:  cccc:1011:imm24
           BLX: 1111:101H:imm24
         */
         npc = addr + 8 + ((int32_t)((inst & 0xffffff) << 8) >> 6);
         if ((inst & 0xf0000000) == 0xf0000000) {
             npc |= 1;  /* indicate ISA is now Thumb */
             npc |= ((inst >> 23) & 2);   /* apply the H bit */
         }
     } else {
         is_direct_branch = 0;
     }
     if (is_direct_branch && pnpc != NULL) {
         *pnpc = npc;
     }
     return is_direct_branch;
 }
 
 int inst_Thumb_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc)
 {
     uint32_t npc;
     int is_direct_branch = 1;
     if ((inst & 0xf0000000) == 0xd0000000 && (inst & 0x0e000000) != 0x0e000000) {
         /* B<c> (encoding T1) */
         npc = addr + 4 + ((int32_t)((inst & 0x00ff0000) << 8) >> 23);
         npc |= 1;
     } else if ((inst & 0xf8000000) == 0xe0000000) {
         /* B (encoding T2) */
         npc = addr + 4 + ((int32_t)((inst & 0x07ff0000) << 5) >> 20);
         npc |= 1;
     } else if ((inst & 0xf800d000) == 0xf0008000 && (inst & 0x03800000) != 0x03800000) {
         /* B (encoding T3) */
         npc = addr + 4 + ((int32_t)(((inst & 0x04000000) << 5) |
                                     ((inst & 0x0800) << 19) |
                                     ((inst & 0x2000) << 16) |
                                     ((inst & 0x003f0000) << 7) |
                                     ((inst & 0x000007ff) << 12)) >> 11);
         npc |= 1;
     } else if ((inst & 0xf8009000) == 0xf0009000) {
         /* B (encoding T4); BL (encoding T1) */
         uint32_t S = ((inst & 0x04000000) >> 26)-1;  /* ffffffff or 0 according to S bit */
         npc = addr + 4 + ((int32_t)(((inst & 0x04000000) << 5) |
                                     (((inst^S) & 0x2000) << 17) |
                                     (((inst^S) & 0x0800) << 18) |
                                     ((inst & 0x03ff0000) << 3) |
                                     ((inst & 0x000007ff) << 8)) >> 7);
         npc |= 1;
     } else if ((inst & 0xf800d001) == 0xf000c000) {
         /* BLX (encoding T2) */
         uint32_t S = ((inst & 0x04000000) >> 26)-1;  /* ffffffff or 0 according to S bit */
         addr &= 0xfffffffc;   /* Align(PC,4) */
         npc = addr + 4 + ((int32_t)(((inst & 0x04000000) << 5) |
                                     (((inst^S) & 0x2000) << 17) |
                                     (((inst^S) & 0x0800) << 18) |
                                     ((inst & 0x03ff0000) << 3) |
                                     ((inst & 0x000007fe) << 8)) >> 7);
         /* don't set the Thumb bit, as we're transferring to ARM */
     } else if ((inst & 0xf5000000) == 0xb1000000) {
         /* CB(NZ) */
         /* Note that it's zero-extended - always a forward branch */
         npc = addr + 4 + ((((inst & 0x02000000) << 6) |
                            ((inst & 0x00f80000) << 7)) >> 25);
         npc |= 1;
     } else {
         is_direct_branch = 0;
     }
     if (is_direct_branch && pnpc != NULL) {
         *pnpc = npc;
     }
     return is_direct_branch;
 }
 
 int inst_A64_branch_destination(uint64_t addr, uint32_t inst, uint64_t *pnpc)
 {
     uint64_t npc;
     int is_direct_branch = 1;
     if ((inst & 0xff000010) == 0x54000000) {
         /* B<cond> */
         npc = addr + ((int32_t)((inst & 0x00ffffe0) << 8) >> 11);
     } else if ((inst & 0x7c000000) == 0x14000000) {
         /* B, BL imm */
         npc = addr + ((int32_t)((inst & 0x03ffffff) << 6) >> 4);
     } else if ((inst & 0x7e000000) == 0x34000000) {
         /* CB */
         npc = addr + ((int32_t)((inst & 0x00ffffe0) << 8) >> 11);
     } else if ((inst & 0x7e000000) == 0x36000000) {
         /* TB */
         npc = addr + ((int32_t)((inst & 0x0007ffe0) << 13) >> 16);
     } else {
         is_direct_branch = 0;
     }
     if (is_direct_branch && pnpc != NULL) {
         *pnpc = npc;
     }
     return is_direct_branch;
 }
 
-int inst_ARM_is_branch(uint32_t inst)
+int inst_ARM_is_branch(uint32_t inst, struct decode_info *info)
 {
-    return inst_ARM_is_indirect_branch(inst) ||
+    return inst_ARM_is_indirect_branch(inst, info) ||
            inst_ARM_is_direct_branch(inst);
 }
 
-int inst_Thumb_is_branch(uint32_t inst)
+int inst_Thumb_is_branch(uint32_t inst, struct decode_info *info)
 {
-    return inst_Thumb_is_indirect_branch(inst) ||
-           inst_Thumb_is_direct_branch(inst);
+    return inst_Thumb_is_indirect_branch(inst, info) ||
+           inst_Thumb_is_direct_branch(inst, info);
 }
 
-int inst_A64_is_branch(uint32_t inst)
+int inst_A64_is_branch(uint32_t inst, struct decode_info *info)
 {
-    return inst_A64_is_indirect_branch(inst) ||
-           inst_A64_is_direct_branch(inst);
+    return inst_A64_is_indirect_branch(inst, info) ||
+           inst_A64_is_direct_branch(inst, info);
 }
 
-int inst_ARM_is_branch_and_link(uint32_t inst)
+int inst_ARM_is_branch_and_link(uint32_t inst, struct decode_info *info)
 {
     int is_branch = 1;
     if ((inst & 0xf0000000) == 0xf0000000) {
         if ((inst & 0xfe000000) == 0xfa000000){
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
             /* BLX (imm) */
         } else {
             is_branch = 0;
         }
     } else if ((inst & 0x0f000000) == 0x0b000000) {
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         /* BL */
     } else if ((inst & 0x0ff000f0) == 0x01200030) {
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         /* BLX (reg) */
     } else {
         is_branch = 0;
     }
     return is_branch;
 }
 
-int inst_Thumb_is_branch_and_link(uint32_t inst)
+int inst_Thumb_is_branch_and_link(uint32_t inst, struct decode_info *info)
 {
     int is_branch = 1;
     if ((inst & 0xff800000) == 0x47800000) {
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         /* BLX (reg) */
     } else if ((inst & 0xf800c000) == 0xf000c000) {
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         /* BL, BLX (imm) */
     } else {
         is_branch = 0;
     }
     return is_branch;
 }
 
-int inst_A64_is_branch_and_link(uint32_t inst)
+int inst_A64_is_branch_and_link(uint32_t inst, struct decode_info *info)
 {
     int is_branch = 1;
     if ((inst & 0xfffffc1f) == 0xd63f0000) {
         /* BLR */
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
     } else if ((inst & 0xfc000000) == 0x94000000) {
         /* BL */
-        instr_sub_type = OCSD_S_INSTR_BR_LINK;
-    }  else if (arch_version >= 0x0803) {
+        info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
+    }  else if (info->arch_version >= 0x0803) {
         /* new pointer auth instr for v8.3 arch */
         if ((inst & 0xfffff800) == 0xd73f0800) {
             /* BLRAA, BLRBB */
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         } else if ((inst & 0xfffff81F) == 0xd63f081F) {
             /* BLRAAZ, BLRBBZ */
-            instr_sub_type = OCSD_S_INSTR_BR_LINK;
+            info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
         } else {
             is_branch = 0;
         }
     } else {
         is_branch = 0;
     }
     return is_branch;
 }
 
 int inst_ARM_is_conditional(uint32_t inst)
 {
     return (inst & 0xe0000000) != 0xe0000000;
 }
 
 int inst_Thumb_is_conditional(uint32_t inst)
 {
     if ((inst & 0xf0000000) == 0xd0000000 && (inst & 0x0e000000) != 0x0e000000) {
         /* B<c> (encoding T1) */
         return 1;
     } else if ((inst & 0xf800d000) == 0xf0008000 && (inst & 0x03800000) != 0x03800000) {
         /* B<c> (encoding T3) */
         return 1;
     } else if ((inst & 0xf5000000) == 0xb1000000) {
         /* CB(N)Z */
         return 1;
     }
     return 0;
 }
 
 unsigned int inst_Thumb_is_IT(uint32_t inst)
 {
     if ((inst & 0xff000000) == 0xbf000000 &&
         (inst & 0x000f0000) != 0x00000000) {
         if (inst & 0x00010000) {
             return 4;
         } else if (inst & 0x00020000) {
             return 3;
         } else if (inst & 0x00040000) {
             return 2;
         } else {
             assert(inst & 0x00080000);
             return 1;
         }
     } else {
         return 0;
     }
 }
 
 /*
 Test whether an A64 instruction is conditional.
 
 Instructions like CSEL, CSINV, CCMP are not classed as conditional.
 They use the condition code but do one of two things with it,
 neither a NOP.  The "intruction categories" section of ETMv4
 lists no (non branch) conditional instructions for A64.
 */
 int inst_A64_is_conditional(uint32_t inst)
 {
     if ((inst & 0x7c000000) == 0x34000000) {
         /* CB, TB */
         return 1;
     } else if ((inst & 0xff000010) == 0x54000000) {
         /* B.cond */
         return 1;
     }
     return 0;
 }
 
 arm_barrier_t inst_ARM_barrier(uint32_t inst)
 {
     if ((inst & 0xfff00000) == 0xf5700000) {
         switch (inst & 0xf0) {
         case 0x40:
             return ARM_BARRIER_DSB;
         case 0x50:
             return ARM_BARRIER_DMB;
         case 0x60:
             return ARM_BARRIER_ISB;
         default:
             return ARM_BARRIER_NONE;
         }
     } else if ((inst & 0x0fff0f00) == 0x0e070f00) {
         switch (inst & 0xff) {
         case 0x9a:
             return ARM_BARRIER_DSB;   /* mcr p15,0,Rt,c7,c10,4 */
         case 0xba:
             return ARM_BARRIER_DMB;   /* mcr p15,0,Rt,c7,c10,5 */
         case 0x95:
             return ARM_BARRIER_ISB;   /* mcr p15,0,Rt,c7,c5,4 */
         default:
             return ARM_BARRIER_NONE;
         }
     } else {
         return ARM_BARRIER_NONE;
     }
 }
 
 arm_barrier_t inst_Thumb_barrier(uint32_t inst)
 {
     if ((inst & 0xffffff00) == 0xf3bf8f00) {
         switch (inst & 0xf0) {
         case 0x40:
             return ARM_BARRIER_DSB;
         case 0x50:
             return ARM_BARRIER_DMB;
         case 0x60:
             return ARM_BARRIER_ISB;
         default:
             return ARM_BARRIER_NONE;
         }
     } else if ((inst & 0xffff0f00) == 0xee070f00) {
         /* Thumb2 CP15 barriers are unlikely... 1156T2 only? */
         switch (inst & 0xff) {
         case 0x9a:
             return ARM_BARRIER_DSB;   /* mcr p15,0,Rt,c7,c10,4 */
         case 0xba:
             return ARM_BARRIER_DMB;   /* mcr p15,0,Rt,c7,c10,5 */
         case 0x95:
             return ARM_BARRIER_ISB;   /* mcr p15,0,Rt,c7,c5,4 */
         default:
             return ARM_BARRIER_NONE;
         }
         return ARM_BARRIER_NONE;
     } else {
         return ARM_BARRIER_NONE;
     }
 }
 
 arm_barrier_t inst_A64_barrier(uint32_t inst)
 {
     if ((inst & 0xfffff09f) == 0xd503309f) {
         switch (inst & 0x60) {
         case 0x0:
             return ARM_BARRIER_DSB;
         case 0x20:
             return ARM_BARRIER_DMB;
         case 0x40:
             return ARM_BARRIER_ISB;
         default:
             return ARM_BARRIER_NONE;
         }
     } else {
         return ARM_BARRIER_NONE;
     }
 }
 
 int inst_ARM_is_UDF(uint32_t inst)
 {
     return (inst & 0xfff000f0) == 0xe7f000f0;
 }
 
 int inst_Thumb_is_UDF(uint32_t inst)
 {
     return (inst & 0xff000000) == 0xde000000 ||   /* T1 */
            (inst & 0xfff0f000) == 0xf7f0a000;     /* T2 */
 }
 
 int inst_A64_is_UDF(uint32_t inst)
 {
     /* No A64 encodings are formally allocated as permanently undefined,
        but it is intended not to allocate any instructions in the 21-bit
        regions at the bottom or top of the range. */
     return (inst & 0xffe00000) == 0x00000000 ||
            (inst & 0xffe00000) == 0xffe00000;
 }
 
 /* End of File trc_idec_arminst.cpp */
Index: head/contrib/opencsd/decoder/source/mem_acc/trc_mem_acc_bufptr.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/mem_acc/trc_mem_acc_bufptr.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/mem_acc/trc_mem_acc_bufptr.cpp	(revision 362263)
@@ -1,54 +1,53 @@
 /*
  * \file       trc_mem_acc_bufptr.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 #include <cstring>
 
 #include "mem_acc/trc_mem_acc_bufptr.h"
 
 TrcMemAccBufPtr::TrcMemAccBufPtr(const ocsd_vaddr_t s_address, const uint8_t *p_buffer, const uint32_t size) : 
     TrcMemAccessorBase(MEMACC_BUFPTR, s_address, s_address+size-1),
-    m_p_buffer(p_buffer),
-    m_size(size)
+    m_p_buffer(p_buffer)
 {
 }
 
 const uint32_t TrcMemAccBufPtr::readBytes(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, const uint8_t trcID, const uint32_t reqBytes, uint8_t *byteBuffer)
 {
     // mapper wlll filter memory spaces.
     uint32_t bytesRead = bytesInRange(address,reqBytes); // check bytes available
     if(bytesRead)
         memcpy(byteBuffer,m_p_buffer+address-m_startAddress,bytesRead);
     return bytesRead;
 }
 
 /* End of File trc_mem_acc_bufptr.cpp */
Index: head/contrib/opencsd/decoder/source/ocsd_dcd_tree.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/ocsd_dcd_tree.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/ocsd_dcd_tree.cpp	(revision 362263)
@@ -1,715 +1,716 @@
 /*
  * \file       ocsd_dcd_tree.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "common/ocsd_dcd_tree.h"
 #include "common/ocsd_lib_dcd_register.h"
 #include "mem_acc/trc_mem_acc_mapper.h"
 
 /***************************************************************/
 ITraceErrorLog *DecodeTree::s_i_error_logger = &DecodeTree::s_error_logger; 
 std::list<DecodeTree *> DecodeTree::s_trace_dcd_trees;  /**< list of pointers to decode tree objects */
 ocsdDefaultErrorLogger DecodeTree::s_error_logger;     /**< The library default error logger */
 TrcIDecode DecodeTree::s_instruction_decoder;           /**< default instruction decode library */
 
 DecodeTree *DecodeTree::CreateDecodeTree(const ocsd_dcd_tree_src_t src_type, uint32_t formatterCfgFlags)
 {
     DecodeTree *dcd_tree = new (std::nothrow) DecodeTree();
     if(dcd_tree != 0)
     {
         if(dcd_tree->initialise(src_type, formatterCfgFlags))
         {
             s_trace_dcd_trees.push_back(dcd_tree);
         }
         else 
         {
             delete dcd_tree;
             dcd_tree = 0;
         }
     }
     return dcd_tree;
 }
 
 void DecodeTree::DestroyDecodeTree(DecodeTree *p_dcd_tree)
 {
     std::list<DecodeTree *>::iterator it;
     bool bDestroyed = false;
     it = s_trace_dcd_trees.begin();
     while(!bDestroyed && (it != s_trace_dcd_trees.end()))
     {
         if(*it == p_dcd_tree)
         {
             s_trace_dcd_trees.erase(it);
             delete p_dcd_tree;
             bDestroyed = true;
         }
         else
             it++;
     }
 }
 
 void DecodeTree::setAlternateErrorLogger(ITraceErrorLog *p_error_logger)
 {
     if(p_error_logger)
         s_i_error_logger = p_error_logger;
     else
         s_i_error_logger = &s_error_logger;
 }
 
 /***************************************************************/
 
 DecodeTree::DecodeTree() :
     m_i_instr_decode(&s_instruction_decoder),
     m_i_mem_access(0),
     m_i_gen_elem_out(0),
     m_i_decoder_root(0),
     m_frame_deformatter_root(0),
     m_decode_elem_iter(0),
     m_default_mapper(0),
     m_created_mapper(false)
 {
     for(int i = 0; i < 0x80; i++)
         m_decode_elements[i] = 0;
 }
 
 DecodeTree::~DecodeTree()
 {
     destroyMemAccMapper();
     for(uint8_t i = 0; i < 0x80; i++)
     {
         destroyDecodeElement(i);
     }
     PktPrinterFact::destroyAllPrinters(m_printer_list);
+    delete m_frame_deformatter_root;
 }
 
 
 
 ocsd_datapath_resp_t DecodeTree::TraceDataIn( const ocsd_datapath_op_t op,
                                                const ocsd_trc_index_t index,
                                                const uint32_t dataBlockSize,
                                                const uint8_t *pDataBlock,
                                                uint32_t *numBytesProcessed)
 {
     if(m_i_decoder_root)
         return m_i_decoder_root->TraceDataIn(op,index,dataBlockSize,pDataBlock,numBytesProcessed);
     *numBytesProcessed = 0;
     return OCSD_RESP_FATAL_NOT_INIT;
 }
 
 /* set key interfaces - attach / replace on any existing tree components */
 void DecodeTree::setInstrDecoder(IInstrDecode *i_instr_decode)
 {
     uint8_t elemID;
     DecodeTreeElement *pElem = 0;
 
     pElem = getFirstElement(elemID);
     while(pElem != 0)
     {
         pElem->getDecoderMngr()->attachInstrDecoder(pElem->getDecoderHandle(),i_instr_decode);
         pElem = getNextElement(elemID);
     }
 }
 
 void DecodeTree::setMemAccessI(ITargetMemAccess *i_mem_access)
 {
     uint8_t elemID;
     DecodeTreeElement *pElem = 0;
    
     pElem = getFirstElement(elemID);
     while(pElem != 0)
     {
         pElem->getDecoderMngr()->attachMemAccessor(pElem->getDecoderHandle(),i_mem_access);
         pElem = getNextElement(elemID);
     }
     m_i_mem_access = i_mem_access;
 }
 
 void DecodeTree::setGenTraceElemOutI(ITrcGenElemIn *i_gen_trace_elem)
 {
     uint8_t elemID;
     DecodeTreeElement *pElem = 0;
 
     pElem = getFirstElement(elemID);
     while(pElem != 0)
     {
         pElem->getDecoderMngr()->attachOutputSink(pElem->getDecoderHandle(),i_gen_trace_elem);
         pElem = getNextElement(elemID);
     }
 }
 
 ocsd_err_t DecodeTree::createMemAccMapper(memacc_mapper_t type /* = MEMACC_MAP_GLOBAL*/ )
 {
     // clean up any old one
     destroyMemAccMapper();
 
     // make a new one
     switch(type)
     {
     default:
     case MEMACC_MAP_GLOBAL:
         m_default_mapper = new (std::nothrow) TrcMemAccMapGlobalSpace();
         break;
     }
 
     // set the access interface
     if(m_default_mapper)
     {
         m_created_mapper = true;
         setMemAccessI(m_default_mapper);
         m_default_mapper->setErrorLog(s_i_error_logger);
     }
 
     return (m_default_mapper != 0) ? OCSD_OK : OCSD_ERR_MEM;
 }
 
 void DecodeTree::setExternMemAccMapper(TrcMemAccMapper* pMapper)
 {
     destroyMemAccMapper();  // destroy any existing mapper - if decode tree created it.
     m_default_mapper = pMapper;
 }
 
 void DecodeTree::destroyMemAccMapper()
 {
     if(m_default_mapper && m_created_mapper)
     {
         m_default_mapper->RemoveAllAccessors();
         delete m_default_mapper;
         m_default_mapper = 0;
         m_created_mapper = false;
     }
 }
 
 void DecodeTree::logMappedRanges()
 {
     if(m_default_mapper)
         m_default_mapper->logMappedRanges();
 }
 
 /* Memory accessor creation - all on default mem accessor using the 0 CSID for global core space. */
 ocsd_err_t DecodeTree::addBufferMemAcc(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, const uint8_t *p_mem_buffer, const uint32_t mem_length)
 {
     if(!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
 
     // need a valid memory buffer, and a least enough bytes for one opcode.
     if((p_mem_buffer == 0) || (mem_length < 4))
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     TrcMemAccessorBase *p_accessor;
     ocsd_err_t err = TrcMemAccFactory::CreateBufferAccessor(&p_accessor, address, p_mem_buffer, mem_length);
     if(err == OCSD_OK)
     {
         TrcMemAccBufPtr *pMBuffAcc = dynamic_cast<TrcMemAccBufPtr *>(p_accessor);
         if(pMBuffAcc)
         {
             pMBuffAcc->setMemSpace(mem_space);
             err = m_default_mapper->AddAccessor(p_accessor,0);
         }
         else
             err = OCSD_ERR_MEM;    // wrong type of object - treat as mem error
 
         if(err != OCSD_OK)
             TrcMemAccFactory::DestroyAccessor(p_accessor);
     }
     return err;
 }
 
 ocsd_err_t DecodeTree::addBinFileMemAcc(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space, const std::string &filepath)
 {
     if(!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
     
     if(filepath.length() == 0)
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     TrcMemAccessorBase *p_accessor;
     ocsd_err_t err = TrcMemAccFactory::CreateFileAccessor(&p_accessor,filepath,address);
 
     if(err == OCSD_OK)
     {
         TrcMemAccessorFile *pAcc = dynamic_cast<TrcMemAccessorFile *>(p_accessor);
         if(pAcc)
         {
             pAcc->setMemSpace(mem_space);
             err = m_default_mapper->AddAccessor(pAcc,0);
         }
         else
             err = OCSD_ERR_MEM;    // wrong type of object - treat as mem error
 
         if(err != OCSD_OK)
             TrcMemAccFactory::DestroyAccessor(p_accessor);
     }
     return err;
 
 }
 
 ocsd_err_t DecodeTree::addBinFileRegionMemAcc(const ocsd_file_mem_region_t *region_array, const int num_regions, const ocsd_mem_space_acc_t mem_space, const std::string &filepath)
 {
     if(!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
 
     if((region_array == 0) || (num_regions == 0) || (filepath.length() == 0))
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     TrcMemAccessorBase *p_accessor;
     int curr_region_idx = 0;
 
     // add first region during the creation of the file accessor.
     ocsd_err_t err = TrcMemAccFactory::CreateFileAccessor(&p_accessor,filepath,region_array[curr_region_idx].start_address,region_array[curr_region_idx].file_offset, region_array[curr_region_idx].region_size);            
     if(err == OCSD_OK)
     {
         TrcMemAccessorFile *pAcc = dynamic_cast<TrcMemAccessorFile *>(p_accessor);
         if(pAcc)
         {
             // add additional regions to the file accessor.
             curr_region_idx++;
             while(curr_region_idx < num_regions)
             {
                 pAcc->AddOffsetRange(region_array[curr_region_idx].start_address, 
                                         region_array[curr_region_idx].region_size,
                                         region_array[curr_region_idx].file_offset);
                 curr_region_idx++;
             }
             pAcc->setMemSpace(mem_space);
 
             // add the accessor to the map.
             err = m_default_mapper->AddAccessor(pAcc,0);
         }
         else
             err = OCSD_ERR_MEM;    // wrong type of object - treat as mem error
 
         if(err != OCSD_OK)
             TrcMemAccFactory::DestroyAccessor(p_accessor);
     }
     return err;
 }
 
 ocsd_err_t DecodeTree::updateBinFileRegionMemAcc(const ocsd_file_mem_region_t *region_array, const int num_regions, const ocsd_mem_space_acc_t mem_space, const std::string &filepath)
 {
     if (!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
 
     if ((region_array == 0) || (num_regions == 0) || (filepath.length() == 0))
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     TrcMemAccessorFile *pAcc = TrcMemAccessorFile::getExistingFileAccessor(filepath);
     if (!pAcc) 
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     int curr_region_idx = 0;
     while (curr_region_idx < num_regions)
     {
         // check "new" range
         if (!pAcc->addrStartOfRange(region_array[curr_region_idx].start_address))
         {
             // ensure adds cleanly
             if (!pAcc->AddOffsetRange(region_array[curr_region_idx].start_address,
                 region_array[curr_region_idx].region_size,
                 region_array[curr_region_idx].file_offset))
                 return OCSD_ERR_INVALID_PARAM_VAL;  // otherwise bail out
         }
         curr_region_idx++;
     }
     return OCSD_OK;
 }
 ocsd_err_t DecodeTree::initCallbackMemAcc(const ocsd_vaddr_t st_address, const ocsd_vaddr_t en_address, 
     const ocsd_mem_space_acc_t mem_space, void *p_cb_func, bool IDfn, const void *p_context)
 {
     if(!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
 
     if(p_cb_func == 0)
         return OCSD_ERR_INVALID_PARAM_VAL;
 
     TrcMemAccessorBase *p_accessor;
     ocsd_err_t err = TrcMemAccFactory::CreateCBAccessor(&p_accessor, st_address, en_address, mem_space);
     if(err == OCSD_OK)
     {
         TrcMemAccCB *pCBAcc = dynamic_cast<TrcMemAccCB *>(p_accessor);
         if(pCBAcc)
         {
             if (IDfn)
                 pCBAcc->setCBIDIfFn((Fn_MemAccID_CB)p_cb_func, p_context);
             else
                 pCBAcc->setCBIfFn((Fn_MemAcc_CB)p_cb_func, p_context);
 
             err = m_default_mapper->AddAccessor(p_accessor,0);
         }
         else
             err = OCSD_ERR_MEM;    // wrong type of object - treat as mem error
 
         if(err != OCSD_OK)
             TrcMemAccFactory::DestroyAccessor(p_accessor);
     }
     return err;
 }
 
 ocsd_err_t DecodeTree::addCallbackMemAcc(const ocsd_vaddr_t st_address, const ocsd_vaddr_t en_address, const ocsd_mem_space_acc_t mem_space, Fn_MemAcc_CB p_cb_func, const void *p_context)
 {
     return initCallbackMemAcc(st_address, en_address, mem_space, (void *)p_cb_func, false, p_context);
 }
 
 ocsd_err_t DecodeTree::addCallbackIDMemAcc(const ocsd_vaddr_t st_address, const ocsd_vaddr_t en_address, const ocsd_mem_space_acc_t mem_space, Fn_MemAccID_CB p_cb_func, const void *p_context)
 {
     return initCallbackMemAcc(st_address, en_address, mem_space, (void *)p_cb_func, true, p_context);
 }
 
 ocsd_err_t DecodeTree::removeMemAccByAddress(const ocsd_vaddr_t address, const ocsd_mem_space_acc_t mem_space)
 {
     if(!hasMemAccMapper())
         return OCSD_ERR_NOT_INIT;
     return m_default_mapper->RemoveAccessorByAddress(address,mem_space,0);
 }
 
 ocsd_err_t DecodeTree::createDecoder(const std::string &decoderName, const int createFlags, const CSConfig *pConfig)
 {
     ocsd_err_t err = OCSD_OK;
     IDecoderMngr *pDecoderMngr = 0;
     TraceComponent *pTraceComp = 0;
     int crtFlags = createFlags;
 
     uint8_t CSID = 0;   // default for single stream decoder (no deformatter) - we ignore the ID
     if(usingFormatter())
     {
         CSID = pConfig->getTraceID();
         crtFlags |= OCSD_CREATE_FLG_INST_ID;
     }
 
     // create the decode element to attach to the channel.
     if((err = createDecodeElement(CSID)) != OCSD_OK)
         return err;
 
     // get the libary decoder register.
     OcsdLibDcdRegister * lib_reg = OcsdLibDcdRegister::getDecoderRegister();
     if(lib_reg == 0)
         return OCSD_ERR_NOT_INIT;
 
     // find the named decoder
     if((err = lib_reg->getDecoderMngrByName(decoderName,&pDecoderMngr)) != OCSD_OK)
         return err;
 
     // got the decoder...
     if((err = pDecoderMngr->createDecoder(crtFlags,(int)CSID,pConfig,&pTraceComp)) != OCSD_OK)
         return err;
 
     m_decode_elements[CSID]->SetDecoderElement(decoderName, pDecoderMngr, pTraceComp, true);
 
     // always attach an error logger
     if(err == OCSD_OK)
         err = pDecoderMngr->attachErrorLogger(pTraceComp,DecodeTree::s_i_error_logger);
 
     // if we created a packet decoder it may need additional components.
     if(crtFlags &  OCSD_CREATE_FLG_FULL_DECODER)
     {
         if(m_i_instr_decode && (err == OCSD_OK))
             err = pDecoderMngr->attachInstrDecoder(pTraceComp,m_i_instr_decode);
         
         if(err == OCSD_ERR_DCD_INTERFACE_UNUSED)    // ignore if instruction decoder refused
             err = OCSD_OK;
 
         if(m_i_mem_access && (err == OCSD_OK))
             err = pDecoderMngr->attachMemAccessor(pTraceComp,m_i_mem_access);
 
         if(err == OCSD_ERR_DCD_INTERFACE_UNUSED)    // ignore if mem accessor refused
             err = OCSD_OK;
 
         if( m_i_gen_elem_out && (err == OCSD_OK))
             err = pDecoderMngr->attachOutputSink(pTraceComp,m_i_gen_elem_out);
     }
 
     // finally attach the packet processor input to the demux output channel
     if(err == OCSD_OK)
     {
         ITrcDataIn *pDataIn = 0;
         if((err = pDecoderMngr->getDataInputI(pTraceComp,&pDataIn)) == OCSD_OK)
         {
             // got the interface -> attach to demux, or direct to input of decode tree
             if(usingFormatter())
                 err = m_frame_deformatter_root->getIDStreamAttachPt(CSID)->attach(pDataIn);
             else
                 m_i_decoder_root = pDataIn;
         }
     }
 
     if(err != OCSD_OK)
     {
         destroyDecodeElement(CSID); // will destroy decoder as well.       
     }
     return err;
 }
 
 ocsd_err_t DecodeTree::removeDecoder(const uint8_t CSID)
 {
     ocsd_err_t err = OCSD_OK;
     uint8_t localID = CSID;
     if(!usingFormatter())
         localID = 0;
 
     if(usingFormatter() && !OCSD_IS_VALID_CS_SRC_ID(CSID))
         err = OCSD_ERR_INVALID_ID;
     else
     {
         destroyDecodeElement(localID);
     }
     return err;
 }
 
 DecodeTreeElement * DecodeTree::getDecoderElement(const uint8_t CSID) const
 {
     DecodeTreeElement *ret_elem = 0;
     if(usingFormatter() && OCSD_IS_VALID_CS_SRC_ID(CSID))
     {
         ret_elem = m_decode_elements[CSID]; 
     }
     else
         ret_elem = m_decode_elements[0];    // ID 0 is used if single leaf tree.
     return ret_elem;
 }
 
 DecodeTreeElement *DecodeTree::getFirstElement(uint8_t &elemID)
 {
     m_decode_elem_iter = 0;
     return getNextElement(elemID);
 }
 
 DecodeTreeElement *DecodeTree::getNextElement(uint8_t &elemID)
 {
     DecodeTreeElement *ret_elem = 0;
 
     if(m_decode_elem_iter < 0x80)
     {
         // find a none zero entry or end of range
         while((m_decode_elements[m_decode_elem_iter] == 0) && (m_decode_elem_iter < 0x80))
             m_decode_elem_iter++;
 
         // return entry unless end of range
         if(m_decode_elem_iter < 0x80)
         {
             ret_elem = m_decode_elements[m_decode_elem_iter];
             elemID = m_decode_elem_iter;
             m_decode_elem_iter++;
         }
     }
     return ret_elem;
 }
 
 bool DecodeTree::initialise(const ocsd_dcd_tree_src_t type, uint32_t formatterCfgFlags)
 {
     bool initOK = true;
     m_dcd_tree_type = type;
     if(type ==  OCSD_TRC_SRC_FRAME_FORMATTED)
     {
         // frame formatted - we want to create the deformatter and hook it up
         m_frame_deformatter_root = new (std::nothrow) TraceFormatterFrameDecoder();
         if(m_frame_deformatter_root)
         {
             m_frame_deformatter_root->Configure(formatterCfgFlags);
             m_frame_deformatter_root->getErrLogAttachPt()->attach(DecodeTree::s_i_error_logger);
             m_i_decoder_root = dynamic_cast<ITrcDataIn*>(m_frame_deformatter_root);
         }
         else 
             initOK = false;
     }
     return initOK;
 }
 
 void DecodeTree::setSingleRoot(TrcPktProcI *pComp)
 {
     m_i_decoder_root = static_cast<ITrcDataIn*>(pComp);
 }
 
 ocsd_err_t DecodeTree::createDecodeElement(const uint8_t CSID)
 {
     ocsd_err_t err = OCSD_ERR_INVALID_ID;
     if(CSID < 0x80)
     {
         if(m_decode_elements[CSID] == 0)
         {
             m_decode_elements[CSID] = new (std::nothrow) DecodeTreeElement();
             if(m_decode_elements[CSID] == 0)
                 err = OCSD_ERR_MEM;
             else 
                 err = OCSD_OK;
         }
         else
             err = OCSD_ERR_ATTACH_TOO_MANY;
     }
     return err;
 }
 
 void DecodeTree::destroyDecodeElement(const uint8_t CSID)
 {
     if(CSID < 0x80)
     {
         if(m_decode_elements[CSID] != 0)
         {
             m_decode_elements[CSID]->DestroyElem();
             delete m_decode_elements[CSID];
             m_decode_elements[CSID] = 0;
         }
     }
 }
 
 ocsd_err_t DecodeTree::setIDFilter(std::vector<uint8_t> &ids)
 {
     ocsd_err_t err = OCSD_ERR_DCDT_NO_FORMATTER;
     if(usingFormatter())
     {
         err = m_frame_deformatter_root->OutputFilterAllIDs(false);
         if(err == OCSD_OK)
             err = m_frame_deformatter_root->OutputFilterIDs(ids,true);
     }
     return err;
 }
 
 ocsd_err_t DecodeTree::clearIDFilter()
 {
     ocsd_err_t err = OCSD_ERR_DCDT_NO_FORMATTER;
     if(usingFormatter())
     {
         err = m_frame_deformatter_root->OutputFilterAllIDs(true);
     }
     return err;
 }
 
 /** add a protocol packet printer */
 ocsd_err_t DecodeTree::addPacketPrinter(uint8_t CSID, bool bMonitor, ItemPrinter **ppPrinter)
 {
     ocsd_err_t err = OCSD_ERR_INVALID_PARAM_VAL;
     DecodeTreeElement *pElement = getDecoderElement(CSID);
     if (pElement)
     {
         ocsd_trace_protocol_t protocol = pElement->getProtocol();
         ItemPrinter *pPrinter;
 
         pPrinter = PktPrinterFact::createProtocolPrinter(getPrinterList(), protocol, CSID);        
         if (pPrinter)
         {
             pPrinter->setMessageLogger(getCurrentErrorLogI()->getOutputLogger());
             switch (protocol)
             {
             case  OCSD_PROTOCOL_ETMV4I:
             {
                 PacketPrinter<EtmV4ITrcPacket> *pTPrinter = dynamic_cast<PacketPrinter<EtmV4ITrcPacket> *>(pPrinter);
                 if (bMonitor)
                     err = pElement->getDecoderMngr()->attachPktMonitor(pElement->getDecoderHandle(), (IPktRawDataMon<EtmV4ITrcPacket> *)pTPrinter);
                 else
                     err = pElement->getDecoderMngr()->attachPktSink(pElement->getDecoderHandle(), (IPktDataIn<EtmV4ITrcPacket> *)pTPrinter);
             }
             break;
 
             case  OCSD_PROTOCOL_ETMV3:
             {
                 PacketPrinter<EtmV3TrcPacket> *pTPrinter = dynamic_cast<PacketPrinter<EtmV3TrcPacket> *>(pPrinter);
                 if (bMonitor)
                     err = pElement->getDecoderMngr()->attachPktMonitor(pElement->getDecoderHandle(), (IPktRawDataMon<EtmV3TrcPacket> *)pTPrinter);
                 else
                     err = pElement->getDecoderMngr()->attachPktSink(pElement->getDecoderHandle(), (IPktDataIn<EtmV3TrcPacket> *)pTPrinter);
             }
             break;
 
             case  OCSD_PROTOCOL_PTM:
             {
                 PacketPrinter<PtmTrcPacket> *pTPrinter = dynamic_cast<PacketPrinter<PtmTrcPacket> *>(pPrinter);
                 if (bMonitor)
                     err = pElement->getDecoderMngr()->attachPktMonitor(pElement->getDecoderHandle(), (IPktRawDataMon<PtmTrcPacket> *)pTPrinter);
                 else
                     err = pElement->getDecoderMngr()->attachPktSink(pElement->getDecoderHandle(), (IPktDataIn<PtmTrcPacket> *)pTPrinter);
             }
             break;
 
             case OCSD_PROTOCOL_STM:
             {
                 PacketPrinter<StmTrcPacket> *pTPrinter = dynamic_cast<PacketPrinter<StmTrcPacket> *>(pPrinter);
                 if (bMonitor)
                     err = pElement->getDecoderMngr()->attachPktMonitor(pElement->getDecoderHandle(), (IPktRawDataMon<StmTrcPacket> *)pTPrinter);
                 else
                     err = pElement->getDecoderMngr()->attachPktSink(pElement->getDecoderHandle(), (IPktDataIn<StmTrcPacket> *)pTPrinter);
             }
             break;
 
             default:
                 err = OCSD_ERR_NO_PROTOCOL;
                 break;
             }
 
             if (err == OCSD_OK)
             {
                 if (ppPrinter)
                     *ppPrinter = pPrinter;
             }
             else
                 PktPrinterFact::destroyPrinter(getPrinterList(), pPrinter);
         }
     }
     return err;
 }
 
 /** add a raw frame printer */
 ocsd_err_t DecodeTree::addRawFramePrinter(RawFramePrinter **ppPrinter, uint32_t flags)
 {
     ocsd_err_t err = OCSD_ERR_MEM;
     RawFramePrinter *pPrinter = PktPrinterFact::createRawFramePrinter(getPrinterList());
     if (pPrinter)
     {
         pPrinter->setMessageLogger((DecodeTree::getCurrentErrorLogI()->getOutputLogger()));
         TraceFormatterFrameDecoder *pFrameDecoder = getFrameDeformatter();
         uint32_t cfgFlags = pFrameDecoder->getConfigFlags();
         cfgFlags |= ((uint32_t)flags & (OCSD_DFRMTR_PACKED_RAW_OUT | OCSD_DFRMTR_UNPACKED_RAW_OUT));
         pFrameDecoder->Configure(cfgFlags);
         err = pFrameDecoder->getTrcRawFrameAttachPt()->attach(pPrinter);        
         if (ppPrinter && (err==OCSD_OK))
             *ppPrinter = pPrinter;
     }
     return err;
 }
 
 /** add a generic element output printer */
 ocsd_err_t DecodeTree::addGenElemPrinter(TrcGenericElementPrinter **ppPrinter)
 {
     ocsd_err_t err = OCSD_ERR_MEM;
     TrcGenericElementPrinter *pPrinter = PktPrinterFact::createGenElemPrinter(getPrinterList());
     if (pPrinter)
     {
         pPrinter->setMessageLogger((DecodeTree::getCurrentErrorLogI()->getOutputLogger()));
         setGenTraceElemOutI(pPrinter);
         err = OCSD_OK;
         if (ppPrinter)
             *ppPrinter = pPrinter;
     }
     return err;
 
 }
 
 /* End of File ocsd_dcd_tree.cpp */
Index: head/contrib/opencsd/decoder/source/ocsd_error.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/ocsd_error.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/ocsd_error.cpp	(revision 362263)
@@ -1,232 +1,232 @@
 /*
  * \file       ocsd_error.cpp
  * \brief      OpenCSD : Library error class.
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "common/ocsd_error.h"
 #include <sstream>
 #include <iomanip>
 
 static const char *s_errorCodeDescs[][2] = {
     /* general return errors */
     {"OCSD_OK", "No Error."},
     {"OCSD_ERR_FAIL","General failure."},
     {"OCSD_ERR_MEM","Internal memory allocation error."},
     {"OCSD_ERR_NOT_INIT","Component not initialised."},
     {"OCSD_ERR_INVALID_ID","Invalid CoreSight Trace Source ID."},
     {"OCSD_ERR_BAD_HANDLE","Invalid handle passed to component."},
     {"OCSD_ERR_INVALID_PARAM_VAL","Invalid value parameter passed to component."},
     {"OCSD_ERR_INVALID_PARAM_TYPE","Type mismatch on abstract interface."},
     {"OCSD_ERR_FILE_ERROR","File access error"},
     {"OCSD_ERR_NO_PROTOCOL","Trace protocol unsupported"},
     /* attachment point errors */
     {"OCSD_ERR_ATTACH_TOO_MANY","Cannot attach - attach device limit reached."},
     {"OCSD_ERR_ATTACH_INVALID_PARAM"," Cannot attach - invalid parameter."},
     {"OCSD_ERR_ATTACH_COMP_NOT_FOUND","Cannot detach - component not found."},
     /* source reader errors */
     {"OCSD_ERR_RDR_FILE_NOT_FOUND","source reader - file not found."},
     {"OCSD_ERR_RDR_INVALID_INIT",  "source reader - invalid initialisation parameter."},
     {"OCSD_ERR_RDR_NO_DECODER", "source reader - not trace decoder set."},
     /* data path errors */
     {"OCSD_ERR_DATA_DECODE_FATAL", "A decoder in the data path has returned a fatal error."},
     /* frame deformatter errors */
     {"OCSD_ERR_DFMTR_NOTCONTTRACE", "Trace input to deformatter none-continuous"},
     {"OCSD_ERR_DFMTR_BAD_FHSYNC", "Bad frame or half frame sync in trace deformatter"},
     /* packet processor errors - protocol issues etc */
     {"OCSD_ERR_BAD_PACKET_SEQ","Bad packet sequence"},
     {"OCSD_ERR_INVALID_PCKT_HDR","Invalid packet header"},
     {"OCSD_ERR_PKT_INTERP_FAIL","Interpreter failed - cannot recover - bad data or sequence"},
     /* packet decoder errors */
     {"OCSD_ERR_UNSUPPORTED_ISA","ISA not supported in decoder"},
     {"OCSD_ERR_HW_CFG_UNSUPP","Programmed trace configuration not supported by decodUer."},
     {"OCSD_ERR_UNSUPP_DECODE_PKT","Packet not supported in decoder"},
     {"OCSD_ERR_BAD_DECODE_PKT","Reserved or unknown packet in decoder."}, 
     {"OCSD_ERR_COMMIT_PKT_OVERRUN","Overrun in commit packet stack - tried to commit more than available"},
     {"OCSD_ERR_MEM_NACC","Unable to access required memory address."},
     {"OCSD_ERR_RET_STACK_OVERFLOW","Internal return stack overflow checks failed - popped more than we pushed."},
     /* decode tree errors */
     {"OCSD_ERR_DCDT_NO_FORMATTER","No formatter in use - operation not valid."},
     /* target memory access errors */
     {"OCSD_ERR_MEM_ACC_OVERLAP","Attempted to set an overlapping range in memory access map."},
     {"OCSD_ERR_MEM_ACC_FILE_NOT_FOUND","Memory access file could not be opened."},
     {"OCSD_ERR_MEM_ACC_FILE_DIFF_RANGE","Attempt to re-use the same memory access file for a different address range."},
     {"OCSD_ERR_MEM_ACC_BAD_LEN","Memory accessor returned a bad read length value (larger than requested."},
     {"OCSD_ERR_MEM_ACC_RANGE_INVALID","Address range in accessor set to invalid values."},
     /* test errors - errors generated only by the test code, not the library */
     {"OCSD_ERR_TEST_SNAPSHOT_PARSE", "Test snapshot file parse error"},
     {"OCSD_ERR_TEST_SNAPSHOT_PARSE_INFO", "Test snapshot file parse information"},
     {"OCSD_ERR_TEST_SNAPSHOT_READ","test snapshot reader error"},
     {"OCSD_ERR_TEST_SS_TO_DECODER","test snapshot to decode tree conversion error"},
     /* decoder registration */
     {"OCSD_ERR_DCDREG_NAME_REPEAT","Attempted to register a decoder with the same name as another one."},
     {"OCSD_ERR_DCDREG_NAME_UNKNOWN","Attempted to find a decoder with a name that is not known in the library."},
     {"OCSD_ERR_DCDREG_TYPE_UNKNOWN","Attempted to find a decoder with a type that is not known in the library."},
     /* decoder config */
     {"OCSD_ERR_DCD_INTERFACE_UNUSED","Attempt to connect or use and interface not supported by this decoder."},
     /* end marker*/
     {"OCSD_ERR_LAST", "No error - error code end marker"}
 };
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(OCSD_BAD_TRC_INDEX),
     m_chan_ID(OCSD_BAD_CS_SRC_ID)
 {
 }
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code, const ocsd_trc_index_t idx) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(idx),
     m_chan_ID(OCSD_BAD_CS_SRC_ID)
 {
 }
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code, const ocsd_trc_index_t idx, const uint8_t chan_id) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(idx),
     m_chan_ID(chan_id)
 {
 }
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code, const std::string &msg) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(OCSD_BAD_TRC_INDEX),
     m_chan_ID(OCSD_BAD_CS_SRC_ID),
     m_err_message(msg)
 {
 }
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code, const ocsd_trc_index_t idx, const std::string &msg) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(idx),
     m_chan_ID(OCSD_BAD_CS_SRC_ID),
     m_err_message(msg)
 {
 }
 
 ocsdError::ocsdError(const ocsd_err_severity_t sev_type, const ocsd_err_t code, const ocsd_trc_index_t idx, const uint8_t chan_id, const std::string &msg) :
     m_error_code(code),
     m_sev(sev_type),
     m_idx(idx),
     m_chan_ID(chan_id),
     m_err_message(msg)
 {
 }
 
 
 ocsdError::ocsdError(const ocsdError *pError) :
     m_error_code(pError->getErrorCode()),
     m_sev(pError->getErrorSeverity()),
     m_idx(pError->getErrorIndex()),
     m_chan_ID(pError->getErrorChanID())
 {
     setMessage(pError->getMessage());
 }
 
 ocsdError::ocsdError(const ocsdError &Error) :
     m_error_code(Error.getErrorCode()),
     m_sev(Error.getErrorSeverity()),
     m_idx(Error.getErrorIndex()),
     m_chan_ID(Error.getErrorChanID())
 {
     setMessage(Error.getMessage());
 }
 
 ocsdError::ocsdError():
     m_error_code(OCSD_ERR_LAST),
     m_sev(OCSD_ERR_SEV_NONE),
     m_idx(OCSD_BAD_TRC_INDEX),
     m_chan_ID(OCSD_BAD_CS_SRC_ID)
 {
 }
 
 ocsdError::~ocsdError()
 {
 }
 
 const std::string ocsdError::getErrorString(const ocsdError &error)
 {
     std::string szErrStr = "LIBRARY INTERNAL ERROR: Invalid Error Object";
     const char *sev_type_sz[] = {
         "NONE ",
         "ERROR:",
         "WARN :", 
         "INFO :"
     };
 
     switch(error.getErrorSeverity())
     {
     default:
     case OCSD_ERR_SEV_NONE:
         break;
 
     case OCSD_ERR_SEV_ERROR:
     case OCSD_ERR_SEV_WARN:
     case OCSD_ERR_SEV_INFO:
         szErrStr = sev_type_sz[(int)error.getErrorSeverity()];
         appendErrorDetails(szErrStr,error);
         break;
     }
     return szErrStr;
 }
 
 void ocsdError::appendErrorDetails(std::string &errStr, const ocsdError &error)
 {
-    int numerrstr = ((sizeof(s_errorCodeDescs) / sizeof(const char *)) / 2);
+    int numerrstr = sizeof(s_errorCodeDescs) / sizeof(s_errorCodeDescs[0]);
     int code = (int)error.getErrorCode();
     ocsd_trc_index_t idx = error.getErrorIndex();
     uint8_t chan_ID = error.getErrorChanID();
     std::ostringstream oss;
 
     oss << "0x" << std::hex << std::setfill('0') << std::setw(4) << code;
     if(code < numerrstr)
         oss << " (" << s_errorCodeDescs[code][0] << ") [" << s_errorCodeDescs[code][1] << "]; ";
     else
         oss << " (unknown); ";
 
     if(idx != OCSD_BAD_TRC_INDEX)
         oss << "TrcIdx=" << std::dec << idx << "; ";
 
     if(chan_ID != OCSD_BAD_CS_SRC_ID)
         oss << "CS ID=" << std::hex << std::setfill('0') << std::setw(2) << (uint16_t)chan_ID << "; ";
 
     oss << error.getMessage();
     errStr = oss.str();
 }
 
 /* End of File ocsd_error.cpp */
Index: head/contrib/opencsd/decoder/source/ocsd_gen_elem_stack.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/ocsd_gen_elem_stack.cpp	(nonexistent)
+++ head/contrib/opencsd/decoder/source/ocsd_gen_elem_stack.cpp	(revision 362263)
@@ -0,0 +1,196 @@
+/*
+* \file       ocsd_gen_elem_stack.cpp
+* \brief      OpenCSD : List of Generic trace elements for output.
+*
+* \copyright  Copyright (c) 2020, ARM Limited. All Rights Reserved.
+*/
+
+
+/*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+*
+* 3. Neither the name of the copyright holder nor the names of its contributors
+* may be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "common/ocsd_gen_elem_stack.h"
+
+OcsdGenElemStack::OcsdGenElemStack() :
+    m_pElemArray(0),
+    m_elemArraySize(0),
+    m_elem_to_send(0),
+    m_curr_elem_idx(0),
+    m_send_elem_idx(0),
+    m_CSID(0),
+    m_is_init(false)
+{
+
+}
+
+OcsdGenElemStack::~OcsdGenElemStack()
+{
+    for (int i = 0; i<m_elemArraySize; i++)
+    {
+        delete m_pElemArray[i].pElem;
+    }
+    delete [] m_pElemArray;
+    m_pElemArray = 0;
+}
+
+ocsd_err_t OcsdGenElemStack::addElem(const ocsd_trc_index_t trc_pkt_idx)
+{
+    ocsd_err_t err = OCSD_OK;
+
+    if (((m_curr_elem_idx + 1) == m_elemArraySize) || !m_pElemArray)
+    {
+        err = growArray();
+        if (err)
+            return err;
+    }
+
+    // if there is a least one element then copy and increment
+    // otherwise we are at base of stack.
+    if (m_elem_to_send)
+    {
+        copyPersistentData(m_curr_elem_idx, m_curr_elem_idx + 1);
+        m_curr_elem_idx++;
+    }
+    m_pElemArray[m_curr_elem_idx].trc_pkt_idx = trc_pkt_idx;
+    m_elem_to_send++;
+    return err;
+}
+
+ocsd_err_t OcsdGenElemStack::addElemType(const ocsd_trc_index_t trc_pkt_idx, ocsd_gen_trc_elem_t elem_type)
+{
+    ocsd_err_t err = addElem(trc_pkt_idx);
+    if (!err)
+        getCurrElem().setType(elem_type);
+    return err;
+}
+
+ocsd_err_t OcsdGenElemStack::resetElemStack()
+{
+    ocsd_err_t err = OCSD_OK;
+    if (!m_pElemArray)
+    {
+        err = growArray();
+        if (err)
+            return err;
+    }
+
+    if (!isInit())
+        return OCSD_ERR_NOT_INIT;
+
+    resetIndexes();
+    return err;
+}
+
+void OcsdGenElemStack::resetIndexes()
+{
+    // last time there was more than one element on stack
+    if (m_curr_elem_idx > 0)
+        copyPersistentData(m_curr_elem_idx, 0);
+
+    // indexes to bottom of stack, nothing in use at present
+    m_curr_elem_idx = 0;
+    m_send_elem_idx = 0;
+    m_elem_to_send = 0;
+}
+
+ocsd_datapath_resp_t OcsdGenElemStack::sendElements()
+{
+    ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    if (!isInit())
+        return OCSD_RESP_FATAL_NOT_INIT;
+
+    while (m_elem_to_send && OCSD_DATA_RESP_IS_CONT(resp))
+    {
+        resp = m_sendIf->first()->TraceElemIn(m_pElemArray[m_send_elem_idx].trc_pkt_idx, m_CSID, *(m_pElemArray[m_send_elem_idx].pElem));
+        m_send_elem_idx++;
+        m_elem_to_send--;
+    }
+
+    // clear the indexes if we are done.
+    if (!m_elem_to_send)
+        resetIndexes();
+    return resp;
+}
+
+ocsd_err_t OcsdGenElemStack::growArray()
+{
+    elemPtr_t *p_new_array = 0;
+    const int increment = 4;
+    
+    p_new_array = new (std::nothrow) elemPtr_t[m_elemArraySize + increment];
+
+    if (p_new_array != 0)
+    {
+        OcsdTraceElement *pElem = 0;
+
+        // fill the last increment elements with new objects
+        for (int i = 0; i < increment; i++)
+        {
+            pElem = new (std::nothrow) OcsdTraceElement();
+            if (!pElem)
+                return OCSD_ERR_MEM;
+            pElem->init();
+            p_new_array[m_elemArraySize + i].pElem = pElem;
+        }
+
+        // copy the existing objects from the old array to the start of the new one
+        if (m_elemArraySize > 0)
+        {            
+            for (int i = 0; i < m_elemArraySize; i++)
+            {
+                p_new_array[i].pElem = m_pElemArray[i].pElem;
+                p_new_array[i].trc_pkt_idx = m_pElemArray[i].trc_pkt_idx;
+            }
+        }
+
+        // delete the old pointer array.
+        delete[] m_pElemArray;
+        m_elemArraySize += increment;
+        m_pElemArray = p_new_array;
+    }
+    else
+        return OCSD_ERR_MEM;
+
+    return OCSD_OK;
+}
+
+void OcsdGenElemStack::copyPersistentData(int src, int dst)
+{
+    m_pElemArray[dst].pElem->copyPersistentData(*(m_pElemArray[src].pElem));
+}
+
+const bool OcsdGenElemStack::isInit()
+{
+    if (!m_is_init) {
+        if (m_elemArraySize && m_pElemArray && m_sendIf)
+            m_is_init = true;
+    }
+    return m_is_init;
+}
+
+
+/* End of File ocsd_gen_elem_stack.cpp */

Property changes on: head/contrib/opencsd/decoder/source/ocsd_gen_elem_stack.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/opencsd/decoder/source/ptm/trc_pkt_decode_ptm.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/ptm/trc_pkt_decode_ptm.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/ptm/trc_pkt_decode_ptm.cpp	(revision 362263)
@@ -1,665 +1,671 @@
 /*
  * \file       trc_pkt_decode_ptm.cpp
  * \brief      OpenCSD : PTM packet decoder.
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include <sstream>
 #include "opencsd/ptm/trc_pkt_decode_ptm.h"
 
 #define DCD_NAME "DCD_PTM"
 
 TrcPktDecodePtm::TrcPktDecodePtm()
     : TrcPktDecodeBase(DCD_NAME)
 {
     initDecoder();
 }
 
 TrcPktDecodePtm::TrcPktDecodePtm(int instIDNum)
     : TrcPktDecodeBase(DCD_NAME,instIDNum)
 {
     initDecoder();
 }
 
 TrcPktDecodePtm::~TrcPktDecodePtm()
 {
 }
 
 /*********************** implementation packet decoding interface */
 
 ocsd_datapath_resp_t TrcPktDecodePtm::processPacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bPktDone = false;
 
     while(!bPktDone)
     {
         switch(m_curr_state)
         {
         case NO_SYNC:
             // no sync - output a no sync packet then transition to wait sync.
             m_output_elem.elem_type = OCSD_GEN_TRC_ELEM_NO_SYNC;
+            m_output_elem.unsync_eot_info = m_unsync_info;
             resp = outputTraceElement(m_output_elem);
             m_curr_state = (m_curr_packet_in->getType() == PTM_PKT_A_SYNC) ? WAIT_ISYNC : WAIT_SYNC;
             bPktDone = true;
             break;
 
         case WAIT_SYNC:
             if(m_curr_packet_in->getType() == PTM_PKT_A_SYNC)
                 m_curr_state = WAIT_ISYNC;
             bPktDone = true;
             break;
 
         case WAIT_ISYNC:
             if(m_curr_packet_in->getType() == PTM_PKT_I_SYNC)
                 m_curr_state = DECODE_PKTS;
             else 
                 bPktDone = true;
             break;
 
         case DECODE_PKTS:
             resp = decodePacket();
             bPktDone = true;
             break;
 
         default:
              // should only see these after a _WAIT resp - in flush handler 
         case CONT_ISYNC: 
         case CONT_ATOM:
             bPktDone = true;
             // throw a decoder error
             break;
         }
     }
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodePtm::onEOT()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     // shouldn't be any packets left to be processed - flush shoudl have done this.
     // just output the end of trace marker
     m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
+    m_output_elem.setUnSyncEOTReason(UNSYNC_EOT);
     resp = outputTraceElement(m_output_elem);
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodePtm::onReset()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    m_unsync_info = UNSYNC_RESET_DECODER;
     resetDecoder();
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodePtm::onFlush()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     resp = contProcess();
     return resp;
 }
 
 // atom and isync packets can have multiple ouput packets that can be _WAITed mid stream.
 ocsd_datapath_resp_t TrcPktDecodePtm::contProcess()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     switch(m_curr_state)
     { 
     case CONT_ISYNC:
         resp = processIsync();
         break;
 
     case CONT_ATOM:
         resp = processAtom();
         break;
 
     case CONT_WPUP:
         resp = processWPUpdate();
         break;        
 
     case CONT_BRANCH:
         resp = processBranch();
         break;
 
     default: break; // not a state that requires further processing
     }
 
     if(OCSD_DATA_RESP_IS_CONT(resp) && processStateIsCont())
         m_curr_state = DECODE_PKTS; // continue packet processing - assuming we have not degraded into an unsynced state.
 
     return resp;
 }
 
 ocsd_err_t TrcPktDecodePtm::onProtocolConfig()
 {
     ocsd_err_t err = OCSD_OK;
     if(m_config == 0)
         return OCSD_ERR_NOT_INIT;
 
     // static config - copy of CSID for easy reference
     m_CSID = m_config->getTraceID();
 
     // handle return stack implementation
     if (m_config->hasRetStack())
     {
         m_return_stack.set_active(m_config->enaRetStack());
 #ifdef TRC_RET_STACK_DEBUG
         m_return_stack.set_dbg_logger(this);
 #endif
     }
     
     // config options affecting decode
     m_instr_info.pe_type.profile = m_config->coreProfile();
     m_instr_info.pe_type.arch = m_config->archVersion();
     m_instr_info.dsb_dmb_waypoints = m_config->dmsbWayPt() ? 1 : 0;
     m_instr_info.wfi_wfe_branch = 0;
     return err;
 }
 
 /****************** local decoder routines */
 
 void TrcPktDecodePtm::initDecoder()
 {
     m_CSID = 0;
     m_instr_info.pe_type.profile = profile_Unknown;
     m_instr_info.pe_type.arch = ARCH_UNKNOWN;
     m_instr_info.dsb_dmb_waypoints = 0;
+    m_unsync_info = UNSYNC_INIT_DECODER;
     resetDecoder();
 }
 
 void TrcPktDecodePtm::resetDecoder()
 {
     m_curr_state = NO_SYNC;
     m_need_isync = true;    // need context to start.
 
     m_instr_info.isa = ocsd_isa_unknown;
     m_mem_nacc_pending = false;
 
     m_pe_context.ctxt_id_valid = 0;
     m_pe_context.bits64 = 0;
     m_pe_context.vmid_valid = 0;
     m_pe_context.exception_level = ocsd_EL_unknown;
     m_pe_context.security_level = ocsd_sec_secure;
     m_pe_context.el_valid = 0;
     
     m_curr_pe_state.instr_addr = 0x0;
     m_curr_pe_state.isa = ocsd_isa_unknown;
     m_curr_pe_state.valid = false;
 
     m_atoms.clearAll();
     m_output_elem.init();
 }
 
 ocsd_datapath_resp_t TrcPktDecodePtm::decodePacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     switch(m_curr_packet_in->getType())
     {
         // ignore these from trace o/p point of veiw
     case PTM_PKT_NOTSYNC:   
     case PTM_PKT_INCOMPLETE_EOT:
     case PTM_PKT_NOERROR:
         break;
 
         // bad / reserved packet - need to wait for next sync point
     case PTM_PKT_BAD_SEQUENCE:
     case PTM_PKT_RESERVED:
         m_curr_state = WAIT_SYNC;
         m_need_isync = true;    // need context to re-start.
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
         resp = outputTraceElement(m_output_elem);
         break;
 
         // packets we can ignore if in sync
     case PTM_PKT_A_SYNC:
     case PTM_PKT_IGNORE:
         break;
 
         // 
     case PTM_PKT_I_SYNC:
         resp = processIsync();
         break;
 
     case PTM_PKT_BRANCH_ADDRESS:
         resp = processBranch();
         break;
 
     case PTM_PKT_TRIGGER:
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_EVENT);
         m_output_elem.setEvent(EVENT_TRIGGER, 0);
         resp = outputTraceElement(m_output_elem);
         break;
 
     case PTM_PKT_WPOINT_UPDATE:
         resp = processWPUpdate();
         break;
 
     case PTM_PKT_CONTEXT_ID:
         {
             bool bUpdate = true;  
             // see if this is a change
             if((m_pe_context.ctxt_id_valid) && (m_pe_context.context_id == m_curr_packet_in->context.ctxtID))
                 bUpdate = false;
             if(bUpdate)
             {
                 m_pe_context.context_id = m_curr_packet_in->context.ctxtID;
                 m_pe_context.ctxt_id_valid = 1;
                 m_output_elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
                 m_output_elem.setContext(m_pe_context);
                 resp = outputTraceElement(m_output_elem);
             }
         }        
         break;
 
     case PTM_PKT_VMID:
         {
             bool bUpdate = true;  
             // see if this is a change
             if((m_pe_context.vmid_valid) && (m_pe_context.vmid == m_curr_packet_in->context.VMID))
                 bUpdate = false;
             if(bUpdate)
             {
                 m_pe_context.vmid = m_curr_packet_in->context.VMID;
                 m_pe_context.vmid_valid = 1;
                 m_output_elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
                 m_output_elem.setContext(m_pe_context);
                 resp = outputTraceElement(m_output_elem);
             }
         }   
         break;
 
     case PTM_PKT_ATOM:
         if(m_curr_pe_state.valid)
         {
             m_atoms.initAtomPkt(m_curr_packet_in->getAtom(),m_index_curr_pkt);
             resp = processAtom();
         }
         break;
 
     case PTM_PKT_TIMESTAMP:
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_TIMESTAMP);
         m_output_elem.timestamp = m_curr_packet_in->timestamp;
         if(m_curr_packet_in->cc_valid)
             m_output_elem.setCycleCount(m_curr_packet_in->cycle_count);
         resp = outputTraceElement(m_output_elem);
         break;
 
     case PTM_PKT_EXCEPTION_RET:
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_EXCEPTION_RET);
         resp = outputTraceElement(m_output_elem);
         break;
 
     }
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodePtm::processIsync()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
 
     // extract the I-Sync data if not re-entering after a _WAIT
     if(m_curr_state == DECODE_PKTS)
     {        
         m_curr_pe_state.instr_addr = m_curr_packet_in->getAddrVal();
         m_curr_pe_state.isa = m_curr_packet_in->getISA();
         m_curr_pe_state.valid = true;
         
         m_i_sync_pe_ctxt = m_curr_packet_in->ISAChanged();
         if(m_curr_packet_in->CtxtIDUpdated())
         {
             m_pe_context.context_id = m_curr_packet_in->getCtxtID();
             m_pe_context.ctxt_id_valid = 1;
             m_i_sync_pe_ctxt = true;
         }
 
         if(m_curr_packet_in->VMIDUpdated())
         {
             m_pe_context.vmid = m_curr_packet_in->getVMID();
             m_pe_context.vmid_valid = 1;
             m_i_sync_pe_ctxt = true;
         }
         m_pe_context.security_level = m_curr_packet_in->getNS() ? ocsd_sec_nonsecure : ocsd_sec_secure;
         
         if(m_need_isync || (m_curr_packet_in->iSyncReason() != iSync_Periodic))
         {
             m_output_elem.setType(OCSD_GEN_TRC_ELEM_TRACE_ON);
             m_output_elem.trace_on_reason = TRACE_ON_NORMAL;
             if(m_curr_packet_in->iSyncReason() == iSync_TraceRestartAfterOverflow)
                 m_output_elem.trace_on_reason = TRACE_ON_OVERFLOW;
             else if(m_curr_packet_in->iSyncReason() == iSync_DebugExit)
                 m_output_elem.trace_on_reason = TRACE_ON_EX_DEBUG;
             if(m_curr_packet_in->hasCC())
                 m_output_elem.setCycleCount(m_curr_packet_in->getCCVal());
             resp = outputTraceElement(m_output_elem);           
         }
         else
         {
             // periodic - no output
             m_i_sync_pe_ctxt = false;
         }
         m_need_isync = false;   // got 1st Isync - can continue to process data.
         m_return_stack.flush();
     }
     
     if(m_i_sync_pe_ctxt && OCSD_DATA_RESP_IS_CONT(resp))
     {
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_PE_CONTEXT);
         m_output_elem.setContext(m_pe_context);
         m_output_elem.setISA(m_curr_pe_state.isa);
         resp = outputTraceElement(m_output_elem); 
         m_i_sync_pe_ctxt = false;
     }
 
     // if wait and still stuff to process....
     if(OCSD_DATA_RESP_IS_WAIT(resp) && ( m_i_sync_pe_ctxt))
         m_curr_state = CONT_ISYNC;
 
     return resp;
 }
 
 // change of address and/or exception in program flow.
 // implies E atom before the branch if none exception.
 ocsd_datapath_resp_t TrcPktDecodePtm::processBranch()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
 
     // initial pass - decoding packet.
     if(m_curr_state == DECODE_PKTS)
     {
         // specific behviour if this is an exception packet.
         if(m_curr_packet_in->isBranchExcepPacket())
         {
             // exception - record address and output exception packet.
             m_output_elem.setType(OCSD_GEN_TRC_ELEM_EXCEPTION);
             m_output_elem.exception_number = m_curr_packet_in->excepNum();
             m_output_elem.excep_ret_addr = 0;
             if(m_curr_pe_state.valid)
             {
                 m_output_elem.excep_ret_addr = 1;
                 m_output_elem.en_addr = m_curr_pe_state.instr_addr;
             }
             // could be an associated cycle count
             if(m_curr_packet_in->hasCC())
                 m_output_elem.setCycleCount(m_curr_packet_in->getCCVal());
 
             // output the element
             resp = outputTraceElement(m_output_elem);
         }
         else
         {
             // branch address only - implies E atom - need to output a range element based on the atom.
             if(m_curr_pe_state.valid)
                 resp = processAtomRange(ATOM_E,"BranchAddr");
         }
 
         // now set the branch address for the next time.
         m_curr_pe_state.isa = m_curr_packet_in->getISA();
         m_curr_pe_state.instr_addr = m_curr_packet_in->getAddrVal();
         m_curr_pe_state.valid = true;
     }
 
     // atom range may return with NACC pending 
     checkPendingNacc(resp);
 
     // if wait and still stuff to process....
     if(OCSD_DATA_RESP_IS_WAIT(resp) && ( m_mem_nacc_pending))
         m_curr_state = CONT_BRANCH;
 
     return resp;
 }
 
 // effectively completes a range prior to exception or after many bytes of trace (>4096)
 //
 ocsd_datapath_resp_t TrcPktDecodePtm::processWPUpdate()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
 
     // if we need an address to run from then the WPUpdate will not form a range as 
     // we do not have a start point - still waiting for branch or other address packet
     if(m_curr_pe_state.valid)
     {
         // WP update implies atom - use E, we cannot be sure if the instruction passed its condition codes 
         // - though it doesn't really matter as it is not a branch so cannot change flow.
         resp = processAtomRange(ATOM_E,"WP update",TRACE_TO_ADDR_INCL,m_curr_packet_in->getAddrVal());
     }
 
     // atom range may return with NACC pending 
     checkPendingNacc(resp);
 
     // if wait and still stuff to process....
     if(OCSD_DATA_RESP_IS_WAIT(resp) && ( m_mem_nacc_pending))
         m_curr_state = CONT_WPUP;
 
     return resp;
 }
 
 // a single atom packet can result in multiple range outputs...need to be re-entrant in case we get a wait response.
 // also need to handle nacc response from instruction walking routine
 // 
 ocsd_datapath_resp_t TrcPktDecodePtm::processAtom()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
 
     // loop to process all the atoms in the packet
     while(m_atoms.numAtoms() && m_curr_pe_state.valid && OCSD_DATA_RESP_IS_CONT(resp))
     {
         resp = processAtomRange(m_atoms.getCurrAtomVal(),"atom");
         if(!m_curr_pe_state.valid)
             m_atoms.clearAll();
         else
             m_atoms.clearAtom();
     }
 
     // bad address may mean a nacc needs sending
     checkPendingNacc(resp);
 
     // if wait and still stuff to process....
     if(OCSD_DATA_RESP_IS_WAIT(resp) && ( m_mem_nacc_pending || m_atoms.numAtoms()))
         m_curr_state = CONT_ATOM;
 
     return resp;
 }
 
  void TrcPktDecodePtm::checkPendingNacc(ocsd_datapath_resp_t &resp)
  {
     if(m_mem_nacc_pending && OCSD_DATA_RESP_IS_CONT(resp))
     {
         m_output_elem.setType(OCSD_GEN_TRC_ELEM_ADDR_NACC);
         m_output_elem.st_addr = m_nacc_addr;
         resp = outputTraceElementIdx(m_index_curr_pkt,m_output_elem);
         m_mem_nacc_pending = false;
     }
  }
 
 // given an atom element - walk the code and output a range or mark nacc.
 ocsd_datapath_resp_t TrcPktDecodePtm::processAtomRange(const ocsd_atm_val A, const char *pkt_msg, const waypoint_trace_t traceWPOp /*= TRACE_WAYPOINT*/, const ocsd_vaddr_t nextAddrMatch /*= 0*/)
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bWPFound = false;
     std::ostringstream oss;
+    ocsd_err_t err = OCSD_OK;
 
     m_instr_info.instr_addr = m_curr_pe_state.instr_addr;
     m_instr_info.isa = m_curr_pe_state.isa;
 
-    ocsd_err_t err = traceInstrToWP(bWPFound,traceWPOp,nextAddrMatch);
+    // set type (which resets out-elem) before traceInstrToWP modifies out-elem values
+    m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE); 
+    
+    err = traceInstrToWP(bWPFound,traceWPOp,nextAddrMatch);
     if(err != OCSD_OK)
     {
         if(err == OCSD_ERR_UNSUPPORTED_ISA)
         {
                 m_curr_pe_state.valid = false; // need a new address packet
                 oss << "Warning: unsupported instruction set processing " << pkt_msg << " packet.";
                 LogError(ocsdError(OCSD_ERR_SEV_WARN,err,m_index_curr_pkt,m_CSID,oss.str()));  
                 // wait for next address
                 return OCSD_RESP_WARN_CONT;
         }
         else
         {
             resp = OCSD_RESP_FATAL_INVALID_DATA;
             oss << "Error processing " << pkt_msg << " packet.";
             LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,m_index_curr_pkt,m_CSID,oss.str()));  
             return resp;
         }
     }
     
     if(bWPFound)
     {
         //  save recorded next instuction address
         ocsd_vaddr_t nextAddr = m_instr_info.instr_addr;
 
         // action according to waypoint type and atom value
         switch(m_instr_info.type)
         {
         case OCSD_INSTR_BR:
             if (A == ATOM_E)
             {
                 m_instr_info.instr_addr = m_instr_info.branch_addr;
                 if (m_instr_info.is_link)
                     m_return_stack.push(nextAddr,m_instr_info.isa);
             }
             break;
 
             // For PTM -> branch addresses imply E atom, N atom does not need address (return stack will require this)
         case OCSD_INSTR_BR_INDIRECT:
             if (A == ATOM_E)
             {
                 // atom on indirect branch - either implied E from a branch address packet, or return stack if active.
 
                 // indirect branch taken - need new address -if the current packet is a branch address packet this will be sorted.
                 m_curr_pe_state.valid = false; 
 
                 // if return stack and the incoming packet is an atom.
                 if (m_return_stack.is_active() && (m_curr_packet_in->getType() == PTM_PKT_ATOM))
                 {
                     // we have an E atom packet and return stack value - set address from return stack
                     m_instr_info.instr_addr = m_return_stack.pop(m_instr_info.next_isa);
 
                     if (m_return_stack.overflow())
                     {
                         resp = OCSD_RESP_FATAL_INVALID_DATA;
                         oss << "Return stack error processing " << pkt_msg << " packet.";
                         LogError(ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_RET_STACK_OVERFLOW, m_index_curr_pkt, m_CSID, oss.str()));
                         return resp;
                     }
                     else
                         m_curr_pe_state.valid = true; 
                 }
                 if(m_instr_info.is_link)
                     m_return_stack.push(nextAddr, m_instr_info.isa);
             }
             break;
         }
         
-        m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
         m_output_elem.setLastInstrInfo((A == ATOM_E),m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size);
         m_output_elem.setISA(m_curr_pe_state.isa);
         if(m_curr_packet_in->hasCC())
             m_output_elem.setCycleCount(m_curr_packet_in->getCCVal());
         m_output_elem.setLastInstrCond(m_instr_info.is_conditional);
         resp = outputTraceElementIdx(m_index_curr_pkt,m_output_elem);
 
         m_curr_pe_state.instr_addr = m_instr_info.instr_addr;
         m_curr_pe_state.isa = m_instr_info.next_isa;
     }
     else
     {
         // no waypoint - likely inaccessible memory range.
         m_curr_pe_state.valid = false; // need an address update 
 
         if(m_output_elem.st_addr != m_output_elem.en_addr)
         {
             // some trace before we were out of memory access range
-            m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
             m_output_elem.setLastInstrInfo(true,m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size);
             m_output_elem.setISA(m_curr_pe_state.isa);
             m_output_elem.setLastInstrCond(m_instr_info.is_conditional);
             resp = outputTraceElementIdx(m_index_curr_pkt,m_output_elem);
         }
     }
     return resp;
 }
 
 ocsd_err_t TrcPktDecodePtm::traceInstrToWP(bool &bWPFound, const waypoint_trace_t traceWPOp /*= TRACE_WAYPOINT*/, const ocsd_vaddr_t nextAddrMatch /*= 0*/)
 {
     uint32_t opcode;
     uint32_t bytesReq;
     ocsd_err_t err = OCSD_OK;
     ocsd_vaddr_t curr_op_address;
 
     ocsd_mem_space_acc_t mem_space = (m_pe_context.security_level == ocsd_sec_secure) ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N;
 
     m_output_elem.st_addr = m_output_elem.en_addr = m_instr_info.instr_addr;
     m_output_elem.num_instr_range = 0;
 
     bWPFound = false;
 
     while(!bWPFound && !m_mem_nacc_pending)
     {
         // start off by reading next opcode;
         bytesReq = 4;
         curr_op_address = m_instr_info.instr_addr;  // save the start address for the current opcode
         err = accessMemory(m_instr_info.instr_addr,mem_space,&bytesReq,(uint8_t *)&opcode);
         if(err != OCSD_OK) break;
 
         if(bytesReq == 4) // got data back
         {
             m_instr_info.opcode = opcode;
             err = instrDecode(&m_instr_info);
             if(err != OCSD_OK) break;
 
             // increment address - may be adjusted by direct branch value later
             m_instr_info.instr_addr += m_instr_info.instr_size;
 
             // update the range decoded address in the output packet.
             m_output_elem.en_addr = m_instr_info.instr_addr;
             m_output_elem.num_instr_range++;
 
             m_output_elem.last_i_type = m_instr_info.type;
             // either walking to match the next instruction address or a real waypoint
             if(traceWPOp != TRACE_WAYPOINT)
             {
                 if(traceWPOp == TRACE_TO_ADDR_EXCL)
                     bWPFound = (m_output_elem.en_addr == nextAddrMatch);
                 else
                     bWPFound = (curr_op_address == nextAddrMatch);
             }
             else
                 bWPFound = (m_instr_info.type != OCSD_INSTR_OTHER);
         }
         else
         {
             // not enough memory accessible.
             m_mem_nacc_pending = true;
             m_nacc_addr = m_instr_info.instr_addr;
         }
     }
     return err;
 }
 
 /* End of File trc_pkt_decode_ptm.cpp */
Index: head/contrib/opencsd/decoder/source/stm/trc_pkt_decode_stm.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/stm/trc_pkt_decode_stm.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/stm/trc_pkt_decode_stm.cpp	(revision 362263)
@@ -1,299 +1,303 @@
 /*
  * \file       trc_pkt_decode_stm.cpp
  * \brief      OpenCSD : STM packet decoder - output generic SW trace packets.
  * 
  * \copyright  Copyright (c) 2016, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "opencsd/stm/trc_pkt_decode_stm.h"
 #define DCD_NAME "DCD_STM"
 
 TrcPktDecodeStm::TrcPktDecodeStm()
     : TrcPktDecodeBase(DCD_NAME)
 {
     initDecoder();
 }
 
 TrcPktDecodeStm::TrcPktDecodeStm(int instIDNum)
     : TrcPktDecodeBase(DCD_NAME, instIDNum)
 {
     initDecoder();
 }
 
 TrcPktDecodeStm::~TrcPktDecodeStm()
 {
     if(m_payload_buffer)
         delete [] m_payload_buffer;
     m_payload_buffer = 0;
 }
 
 /* implementation packet decoding interface */
 ocsd_datapath_resp_t TrcPktDecodeStm::processPacket()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bPktDone = false;
 
     m_decode_pass1 = true;
 
     while(!bPktDone)
     {
         switch(m_curr_state)
         {
         case NO_SYNC:
             m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
+            m_output_elem.setUnSyncEOTReason(m_unsync_info);
             resp = outputTraceElement(m_output_elem);
             m_curr_state = WAIT_SYNC;
             break;
 
         case WAIT_SYNC:
             if(m_curr_packet_in->getPktType() == STM_PKT_ASYNC)
                 m_curr_state = DECODE_PKTS;
             bPktDone = true;
             break;
 
         case DECODE_PKTS:
             resp = decodePacket(bPktDone);
             break;
         }
     }
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeStm::onEOT()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
+    m_output_elem.setUnSyncEOTReason(UNSYNC_EOT);
     resp = outputTraceElement(m_output_elem);
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeStm::onReset()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
+    m_unsync_info = UNSYNC_RESET_DECODER;
     resetDecoder();
     return resp;
 }
 
 ocsd_datapath_resp_t TrcPktDecodeStm::onFlush()
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     // don't currently save unsent packets so nothing to flush
     return resp;
 }
 
 ocsd_err_t TrcPktDecodeStm::onProtocolConfig()
 {
     if(m_config == 0)
         return OCSD_ERR_NOT_INIT;
 
     // static config - copy of CSID for easy reference
     m_CSID = m_config->getTraceID();
     return OCSD_OK;
 }
 
 void TrcPktDecodeStm::initDecoder()
 {
     m_payload_buffer = 0;
     m_num_pkt_correlation = 1;  // fixed at single packet payload correlation - add feature later
     m_CSID = 0;
 
     // base decoder state - STM requires no memory and instruction decode.
     setUsesMemAccess(false);
     setUsesIDecode(false);
-
+    m_unsync_info = UNSYNC_INIT_DECODER;
     resetDecoder();
 }
 
 void TrcPktDecodeStm::resetDecoder()
 {
     m_curr_state = NO_SYNC;
     m_payload_size = 0;     
     m_payload_used = 0; 
     m_payload_odd_nibble = false;
     m_output_elem.init();
     m_swt_packet_info.swt_flag_bits = 0;	// zero out everything
     initPayloadBuffer();
 }
 
 void TrcPktDecodeStm::initPayloadBuffer()
 {
     // set up the payload buffer. If we are correlating indentical packets then 
     // need a buffer that is a multiple of 64bit packets.
     // otherwise a single packet length will do.
     if(m_payload_buffer)
         delete [] m_payload_buffer;
     m_payload_buffer = new (std::nothrow) uint8_t[m_num_pkt_correlation * sizeof(uint64_t)];
 }
 
 ocsd_datapath_resp_t TrcPktDecodeStm::decodePacket(bool &bPktDone)
 {
     ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
     bool bSendPacket = false;       // flag to indicate output required.
 
     bPktDone = true;    // assume complete unless 2nd pass required.
     m_output_elem.setType(OCSD_GEN_TRC_ELEM_SWTRACE);
     clearSWTPerPcktInfo();
     
     switch (m_curr_packet_in->getPktType())
     {
     case STM_PKT_BAD_SEQUENCE:   /**< Incorrect protocol sequence */
     case STM_PKT_RESERVED:
         resp = OCSD_RESP_FATAL_INVALID_DATA;
+        m_unsync_info = UNSYNC_BAD_PACKET;
     case STM_PKT_NOTSYNC:
         resetDecoder();
         break;
 
     case STM_PKT_VERSION:    /**< Version packet  - not relevant to generic (versionless) o/p */
     case STM_PKT_ASYNC:      /**< Alignment synchronisation packet */
     case STM_PKT_INCOMPLETE_EOT:     /**< Incomplete packet flushed at end of trace. */
         // no action required.
         break;
 
 /* markers for valid packets*/
     case STM_PKT_NULL:       /**< Null packet */
         if(m_curr_packet_in->isTSPkt())
             bSendPacket = true;     // forward NULL packet if associated timestamp.
         break;
         
     case STM_PKT_FREQ:       /**< Frequency packet */
         m_swt_packet_info.swt_frequency = 1;
         updatePayload(bSendPacket);
         break;
 
     case STM_PKT_TRIG:       /**< Trigger event packet. */
         m_swt_packet_info.swt_trigger_event = 1;
         updatePayload(bSendPacket);
         break;
 
     case STM_PKT_GERR:       /**< Global error packet - protocol error but unknown which master had error */
         m_swt_packet_info.swt_master_id = m_curr_packet_in->getMaster();
         m_swt_packet_info.swt_channel_id = m_curr_packet_in->getChannel(); 
         m_swt_packet_info.swt_global_err = 1;
         m_swt_packet_info.swt_id_valid = 0;
         updatePayload(bSendPacket);
         break;
 
     case STM_PKT_MERR:       /**< Master error packet - current master detected an error (e.g. dropped trace) */
         m_swt_packet_info.swt_channel_id = m_curr_packet_in->getChannel(); 
         m_swt_packet_info.swt_master_err = 1;
         updatePayload(bSendPacket);
         break;
 
     case STM_PKT_M8:         /**< Set current master */
         m_swt_packet_info.swt_master_id = m_curr_packet_in->getMaster();
         m_swt_packet_info.swt_channel_id = m_curr_packet_in->getChannel();  // forced to 0
         m_swt_packet_info.swt_id_valid = 1;
         break;
 
     case STM_PKT_C8:         /**< Set lower 8 bits of current channel - packet proc hadnles this */
     case STM_PKT_C16:        /**< Set current channel */
         m_swt_packet_info.swt_channel_id = m_curr_packet_in->getChannel(); 
         break;
 
     case STM_PKT_FLAG:       /**< Flag packet */
         m_swt_packet_info.swt_marker_packet = 1;
         bSendPacket = true;  // send 0 payload marker packet./
         break;
         
 
     case STM_PKT_D4:         /**< 4 bit data payload packet */
     case STM_PKT_D8:         /**< 8 bit data payload packet */
     case STM_PKT_D16:        /**< 16 bit data payload packet */
     case STM_PKT_D32:        /**< 32 bit data payload packet */
     case STM_PKT_D64:        /**< 64 bit data payload packet */
         updatePayload(bSendPacket);
         break;
 
     }
 
     if(bSendPacket)
     {
         if(m_curr_packet_in->isTSPkt())
         {
             m_output_elem.setTS(m_curr_packet_in->getTSVal());
             m_swt_packet_info.swt_has_timestamp = 1;
         }
         m_output_elem.setSWTInfo(m_swt_packet_info);
         resp = outputTraceElement(m_output_elem);
     }
     
     return resp;
 }
 
 void TrcPktDecodeStm::clearSWTPerPcktInfo()
 {
     m_swt_packet_info.swt_flag_bits &= (uint32_t)(0x0 | SWT_ID_VALID_MASK);    // clear flags and current payload size (save id valid flag).
 }
 
 void TrcPktDecodeStm::updatePayload(bool &bSendPacket)
 {
     // without buffering similar packets - this function is quite simple
     bSendPacket = true;
     m_swt_packet_info.swt_payload_num_packets = 1;
 
     switch(m_curr_packet_in->getPktType())
     {
     case STM_PKT_D4:         /**< 4 bit data payload packet */
         m_swt_packet_info.swt_payload_pkt_bitsize = 4;
         *(uint8_t *)m_payload_buffer = m_curr_packet_in->getD4Val();
         break;
 
     case STM_PKT_D8:         /**< 8 bit data payload packet */
     case STM_PKT_TRIG:       /**< Trigger event packet - 8 bits. */
     case STM_PKT_GERR:       /**< error packet - 8 bits. */
     case STM_PKT_MERR:       /**< error packet - 8 bits. */
         m_swt_packet_info.swt_payload_pkt_bitsize = 8;
         *(uint8_t *)m_payload_buffer = m_curr_packet_in->getD8Val();
         break;
 
     case STM_PKT_D16:        /**< 16 bit data payload packet */
         m_swt_packet_info.swt_payload_pkt_bitsize = 16;
         *(uint16_t *)m_payload_buffer = m_curr_packet_in->getD16Val();
         break;
 
     case STM_PKT_D32:        /**< 32 bit data payload packet */
     case STM_PKT_FREQ:       /**< Frequency packet */
         m_swt_packet_info.swt_payload_pkt_bitsize = 32;
         *(uint32_t *)m_payload_buffer = m_curr_packet_in->getD32Val();
         break;
 
 
     case STM_PKT_D64:        /**< 64 bit data payload packet */
         m_swt_packet_info.swt_payload_pkt_bitsize = 64;
         *(uint64_t *)m_payload_buffer = m_curr_packet_in->getD64Val();
         break;
     }
     m_output_elem.setExtendedDataPtr(m_payload_buffer);
     if (m_curr_packet_in->isMarkerPkt())
         m_swt_packet_info.swt_marker_packet = 1;
 
 }
 
 /* End of File trc_pkt_decode_stm.cpp */
Index: head/contrib/opencsd/decoder/source/trc_component.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/trc_component.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/trc_component.cpp	(revision 362263)
@@ -1,149 +1,155 @@
 /*
  * \file       trc_component.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "common/trc_component.h"
 
 class errLogAttachMonitor : public IComponentAttachNotifier
 {
 public:
     errLogAttachMonitor() 
     {
         m_pComp = 0;
     };
-    virtual ~ errLogAttachMonitor() {};
+    virtual ~ errLogAttachMonitor()
+    {
+        if (m_pComp)
+            m_pComp->getErrorLogAttachPt()->set_notifier(0);
+        m_pComp = 0;
+        
+    };
     virtual void attachNotify(const int num_attached)
     {
         if(m_pComp)
             m_pComp->do_attach_notify(num_attached);
     }
     void Init(TraceComponent *pComp)
     {
         m_pComp = pComp;
         if(m_pComp)
             m_pComp->getErrorLogAttachPt()->set_notifier(this);
     }
 private:
     TraceComponent *m_pComp;
 };
 
 TraceComponent::TraceComponent(const std::string &name)
 {
     Init(name);
 }
 
 TraceComponent::TraceComponent(const std::string &name, int instIDNum) 
 {
     std::string name_combined = name;
     char num_buffer[32];
     sprintf(num_buffer,"_%04d",instIDNum);
     name_combined += (std::string)num_buffer;
     Init(name_combined);
 }
 
 TraceComponent::~TraceComponent()
 {
+    if (m_pErrAttachMon)
+        delete m_pErrAttachMon;
 }
 
 void TraceComponent::Init(const std::string &name)
 {
     m_errLogHandle = OCSD_INVALID_HANDLE;
     m_errVerbosity = OCSD_ERR_SEV_NONE;
     m_name = name;
 
     m_supported_op_flags = 0;
     m_op_flags = 0;
     m_assocComp = 0;
 
     m_pErrAttachMon = new (std::nothrow) errLogAttachMonitor();
     if(m_pErrAttachMon)
         m_pErrAttachMon->Init(this);
 }
 
 void TraceComponent::LogError(const ocsdError &Error) 
 {
     if((m_errLogHandle != OCSD_INVALID_HANDLE) && 
         isLoggingErrorLevel(Error.getErrorSeverity()))
     {
         // ensure we have not disabled the attachPt
         if(m_error_logger.first())
             m_error_logger.first()->LogError(m_errLogHandle,&Error);
     }
 }
 
 void TraceComponent::LogMessage(const ocsd_err_severity_t filter_level, const std::string &msg)
 {
     if ((m_errLogHandle != OCSD_INVALID_HANDLE) &&
         isLoggingErrorLevel(filter_level))
     {
         // ensure we have not disabled the attachPt
         if (m_error_logger.first())
             m_error_logger.first()->LogMessage(this->m_errLogHandle, filter_level, msg);
     }
 
 }
 
 void TraceComponent::do_attach_notify(const int num_attached)
 {
     if(num_attached)
     {
         // ensure we have not disabled the attachPt
         if(m_error_logger.first())
         {
             m_errLogHandle = m_error_logger.first()->RegisterErrorSource(m_name);
             m_errVerbosity = m_error_logger.first()->GetErrorLogVerbosity();
         }
     }
     else
     {   
         m_errLogHandle = OCSD_INVALID_HANDLE;
     }
 }
 
 void TraceComponent::updateErrorLogLevel()
 {
     if(m_error_logger.first())
     {
         m_errVerbosity = m_error_logger.first()->GetErrorLogVerbosity();
     }
 }
 
 ocsd_err_t TraceComponent::setComponentOpMode(uint32_t op_flags)
 {
-    if( (~m_supported_op_flags & op_flags) != 0)
-        return OCSD_ERR_INVALID_PARAM_VAL;
-    m_op_flags = op_flags;
+    m_op_flags = op_flags & m_supported_op_flags;
     return OCSD_OK;
 }
 
 /* End of File trc_component.cpp */
Index: head/contrib/opencsd/decoder/source/trc_core_arch_map.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/trc_core_arch_map.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/trc_core_arch_map.cpp	(revision 362263)
@@ -1,81 +1,99 @@
 /*
  * \file       trc_core_arch_map.cpp
  * \brief      OpenCSD : Map core names to architecture profiles
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "common/trc_core_arch_map.h"
 
-static struct _ap_map_elements {
+typedef struct _ap_map_elements {
     const char *name;
     ocsd_arch_profile_t ap;
-} ap_map_array[] = 
+} ap_map_elem_t;
+
+static ap_map_elem_t ap_map_array[] = 
 {
     { "Cortex-A77", { ARCH_V8r3, profile_CortexA } },
     { "Cortex-A76", { ARCH_V8r3, profile_CortexA } },
     { "Cortex-A75", { ARCH_V8r3, profile_CortexA } },
     { "Cortex-A73", { ARCH_V8, profile_CortexA } },
     { "Cortex-A72", { ARCH_V8, profile_CortexA } },
     { "Cortex-A65", { ARCH_V8r3, profile_CortexA } },
     { "Cortex-A57", { ARCH_V8, profile_CortexA } },
     { "Cortex-A55", { ARCH_V8r3, profile_CortexA } },
     { "Cortex-A53", { ARCH_V8, profile_CortexA } },
     { "Cortex-A35", { ARCH_V8, profile_CortexA } },
     { "Cortex-A32", { ARCH_V8, profile_CortexA } },
     { "Cortex-A17", { ARCH_V7, profile_CortexA } },
     { "Cortex-A15", { ARCH_V7, profile_CortexA } },
     { "Cortex-A12", { ARCH_V7, profile_CortexA } },
     { "Cortex-A9", { ARCH_V7, profile_CortexA } },
     { "Cortex-A8", { ARCH_V7, profile_CortexA } },
     { "Cortex-A7", { ARCH_V7, profile_CortexA } },
     { "Cortex-A5", { ARCH_V7, profile_CortexA } },
     { "Cortex-R52", { ARCH_V8, profile_CortexR } },
     { "Cortex-R8", { ARCH_V7, profile_CortexR } },
     { "Cortex-R7", { ARCH_V7, profile_CortexR } },
     { "Cortex-R5", { ARCH_V7, profile_CortexR } },
     { "Cortex-R4", { ARCH_V7, profile_CortexR } },
     { "Cortex-M33", { ARCH_V8, profile_CortexM } },
     { "Cortex-M23", { ARCH_V8, profile_CortexM } },
     { "Cortex-M0", { ARCH_V7, profile_CortexM } },
     { "Cortex-M0+", { ARCH_V7, profile_CortexM } },
     { "Cortex-M3", { ARCH_V7, profile_CortexM } },
     { "Cortex-M4", { ARCH_V7, profile_CortexM } }
 };   
 
+static ap_map_elem_t arch_map_array[] = 
+{
+    { "ARMv7-A", { ARCH_V7, profile_CortexA } },
+    { "ARMv7-R", { ARCH_V7, profile_CortexR } },
+    { "ARMv7-M", { ARCH_V7, profile_CortexM } },
+    { "ARMv8-A", { ARCH_V8, profile_CortexA } },
+    { "ARMv8.3-A", { ARCH_V8r3, profile_CortexA } },
+    { "ARMv8-R", { ARCH_V8, profile_CortexR } },
+    { "ARMv8-M", { ARCH_V8, profile_CortexM } },
+};
+
 CoreArchProfileMap::CoreArchProfileMap()
 {
-    for(unsigned i = 0; i < sizeof(ap_map_array)/sizeof(_ap_map_elements); i++)
+    unsigned i;
+    for (i = 0; i < sizeof(ap_map_array) / sizeof(_ap_map_elements); i++)
     {
         core_profiles[ap_map_array[i].name] = ap_map_array[i].ap;
+    }
+    for (i = 0; i < sizeof(arch_map_array) / sizeof(_ap_map_elements); i++)
+    {
+        arch_profiles[arch_map_array[i].name] = arch_map_array[i].ap;
     }
 }
 
 /* End of File trc_core_arch_map.cpp */
Index: head/contrib/opencsd/decoder/source/trc_gen_elem.cpp
===================================================================
--- head/contrib/opencsd/decoder/source/trc_gen_elem.cpp	(revision 362262)
+++ head/contrib/opencsd/decoder/source/trc_gen_elem.cpp	(revision 362263)
@@ -1,259 +1,282 @@
 /*
  * \file       trc_gen_elem.cpp
  * \brief      OpenCSD : 
  * 
  * \copyright  Copyright (c) 2015, ARM Limited. All Rights Reserved.
  */
 
 /* 
  * Redistribution and use in source and binary forms, with or without modification, 
  * are permitted provided that the following conditions are met:
  * 
  * 1. Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer.
  * 
  * 2. Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
  * 
  * 3. Neither the name of the copyright holder nor the names of its contributors 
  * may be used to endorse or promote products derived from this software without 
  * specific prior written permission. 
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND 
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
 #include "common/trc_gen_elem.h"
 
 #include <string>
 #include <sstream>
 #include <iomanip>
 
 static const char *s_elem_descs[][2] =  
 {
     {"OCSD_GEN_TRC_ELEM_UNKNOWN","Unknown trace element - default value or indicate error in stream to client."},
     {"OCSD_GEN_TRC_ELEM_NO_SYNC","Waiting for sync - either at start of decode, or after overflow / bad packet"},
     {"OCSD_GEN_TRC_ELEM_TRACE_ON","Start of trace - beginning of elements or restart after discontinuity (overflow, trace filtering)."},
     {"OCSD_GEN_TRC_ELEM_EO_TRACE","End of the available trace in the buffer."},
     {"OCSD_GEN_TRC_ELEM_PE_CONTEXT","PE status update / change (arch, ctxtid, vmid etc)."},
     {"OCSD_GEN_TRC_ELEM_INSTR_RANGE","Traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key"},
+    {"OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH","Traced N instructions in a range, but incomplete information as to program execution path from start to end of range"},
     {"OCSD_GEN_TRC_ELEM_ADDR_NACC","Tracing in inaccessible memory area."},
     {"OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN","Tracing unknown address area."},
     {"OCSD_GEN_TRC_ELEM_EXCEPTION","Exception"},
     {"OCSD_GEN_TRC_ELEM_EXCEPTION_RET","Exception return"},
     {"OCSD_GEN_TRC_ELEM_TIMESTAMP","Timestamp - preceding elements happeded before this time."},
     {"OCSD_GEN_TRC_ELEM_CYCLE_COUNT","Cycle count - cycles since last cycle count value - associated with a preceding instruction range."},
     {"OCSD_GEN_TRC_ELEM_EVENT","Event - numbered event or trigger"},
     {"OCSD_GEN_TRC_ELEM_SWTRACE","Software trace packet - may contain data payload."},
     {"OCSD_GEN_TRC_ELEM_CUSTOM","Fully custom packet type."}
 };
 
 static const char *instr_type[] = {
     "--- ",
     "BR  ",
     "iBR ",
     "ISB ",
-    "DSB.DMB"
+    "DSB.DMB",
+    "WFI.WFE"
 };
 
 #define T_SIZE (sizeof(instr_type) / sizeof(const char *))
 
 static const char *instr_sub_type[] = {
     "--- ",
     "b+link ",
     "A64:ret ",
     "A64:eret ",
     "V7:impl ret",
 };
 
 #define ST_SIZE (sizeof(instr_sub_type) / sizeof(const char *))
 
 static const char *s_trace_on_reason[] = {
     "begin or filter",
     "overflow",
     "debug restart"
 };
 
 
 static const char *s_isa_str[] = {
    "A32",      /**< V7 ARM 32, V8 AArch32 */  
    "T32",          /**< Thumb2 -> 16/32 bit instructions */  
    "A64",      /**< V8 AArch64 */
    "TEE",          /**< Thumb EE - unsupported */  
    "Jaz",      /**< Jazelle - unsupported in trace */ 
    "Cst",      /**< ISA custom */
    "Unk"       /**< ISA not yet known */
 };
 
+static const char *s_unsync_reason[] = {
+    "undefined",            // UNSYNC_UNKNOWN - unknown /undefined
+    "init-decoder",         // UNSYNC_INIT_DECODER - decoder intialisation - start of trace.
+    "reset-decoder",        // UNSYNC_RESET_DECODER - decoder reset.
+    "overflow",             // UNSYNC_OVERFLOW - overflow packet - need to re-sync
+    "discard",              // UNSYNC_DISCARD - specl trace discard - need to re-sync
+    "bad-packet",           // UNSYNC_BAD_PACKET - bad packet at input - resync to restart.
+    "end-of-trace",         // UNSYNC_EOT - end of trace info.
+};
+
 void OcsdTraceElement::toString(std::string &str) const
 {
     std::ostringstream oss;
-    int num_str = ((sizeof(s_elem_descs) / sizeof(const char *)) / 2);
+    int num_str = sizeof(s_elem_descs) / sizeof(s_elem_descs[0]);
     int typeIdx = (int)this->elem_type;
     if(typeIdx < num_str)
     {
         oss << s_elem_descs[typeIdx][0] << "(";
         switch(elem_type)
         {
         case OCSD_GEN_TRC_ELEM_INSTR_RANGE:
             oss << "exec range=0x" << std::hex << st_addr << ":[0x" << en_addr << "] ";
             oss << "num_i(" << std::dec << num_instr_range << ") ";
             oss << "last_sz(" << last_instr_sz << ") ";
             oss << "(ISA=" << s_isa_str[(int)isa] << ") ";
             oss << ((last_instr_exec == 1) ? "E " : "N ");
             if((int)last_i_type < T_SIZE)
                 oss << instr_type[last_i_type];
             if((last_i_subtype != OCSD_S_INSTR_NONE) && ((int)last_i_subtype < ST_SIZE))
                 oss << instr_sub_type[last_i_subtype];
             if (last_instr_cond)
                 oss << " <cond>";
             break;
 
         case OCSD_GEN_TRC_ELEM_ADDR_NACC:
             oss << " 0x" << std::hex << st_addr << " ";
             break;
 
+        case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH:
+            oss << "first 0x" << std::hex << st_addr << ":[next 0x" << en_addr << "] ";
+            oss << "num_i(" << std::dec << num_instr_range << ") ";
+            break;
+
         case OCSD_GEN_TRC_ELEM_EXCEPTION:
             if (excep_ret_addr == 1)
             {
                 oss << "pref ret addr:0x" << std::hex << en_addr; 
                 if (excep_ret_addr_br_tgt)
                 {
                     oss << " [addr also prev br tgt]";
                 }
                 oss << "; ";
             }
             oss << "excep num (0x" << std::setfill('0') << std::setw(2) << std::hex << exception_number << ") ";
             break;
 
         case OCSD_GEN_TRC_ELEM_PE_CONTEXT:
             oss << "(ISA=" << s_isa_str[(int)isa] << ") ";
             if((context.exception_level > ocsd_EL_unknown) && (context.el_valid))
             {
                 oss << "EL" << std::dec << (int)(context.exception_level);
             }
             oss << (context.security_level == ocsd_sec_secure ? "S; " : "N; ") << (context.bits64 ? "64-bit; " : "32-bit; ");
             if(context.vmid_valid)
                 oss << "VMID=0x" << std::hex << context.vmid << "; ";
             if(context.ctxt_id_valid)
                 oss << "CTXTID=0x" << std::hex << context.context_id << "; ";
             break;
 
         case  OCSD_GEN_TRC_ELEM_TRACE_ON:
             oss << " [" << s_trace_on_reason[trace_on_reason] << "]";
             break;
 
         case OCSD_GEN_TRC_ELEM_TIMESTAMP:
             oss << " [ TS=0x" << std::setfill('0') << std::setw(12) << std::hex << timestamp << "]; "; 
             break;
 
         case OCSD_GEN_TRC_ELEM_SWTRACE:
             printSWInfoPkt(oss);
             break;
 
         case OCSD_GEN_TRC_ELEM_EVENT:
             if(trace_event.ev_type == EVENT_TRIGGER)
                 oss << " Trigger; ";
             else if(trace_event.ev_type == EVENT_NUMBERED)
                 oss << " Numbered:" << std::dec << trace_event.ev_number << "; ";
+            break;
+
+        case OCSD_GEN_TRC_ELEM_EO_TRACE:
+        case OCSD_GEN_TRC_ELEM_NO_SYNC:
+            if (unsync_eot_info <= UNSYNC_EOT)
+                oss << " [" << s_unsync_reason[unsync_eot_info] << "]";
             break;
 
         default: break;
         }
         if(has_cc)
             oss << std::dec << " [CC=" << cycle_count << "]; ";
         oss << ")";
     }
     else
     {
         oss << "OCSD_GEN_TRC_ELEM??: index out of range.";
     }
     str = oss.str();
 }
 
 OcsdTraceElement &OcsdTraceElement::operator =(const ocsd_generic_trace_elem* p_elem)
 {
     *dynamic_cast<ocsd_generic_trace_elem*>(this) = *p_elem;
     return *this;
 }
 
 
 void OcsdTraceElement::printSWInfoPkt(std::ostringstream & oss) const
 {
     if (!sw_trace_info.swt_global_err)
     {
         if (sw_trace_info.swt_id_valid)
         {
             oss << " (Ma:0x" << std::setfill('0') << std::setw(2) << std::hex << sw_trace_info.swt_master_id << "; ";
             oss << "Ch:0x" << std::setfill('0') << std::setw(2) << std::hex << sw_trace_info.swt_channel_id << ") ";
         }
         else
             oss << "(Ma:0x??; Ch:0x??" << ") ";
 
         if (sw_trace_info.swt_payload_pkt_bitsize > 0)
         {
             oss << "0x" << std::setfill('0') << std::hex;
             if (sw_trace_info.swt_payload_pkt_bitsize == 4)
             {
                 oss << std::setw(1);
                 oss << (uint16_t)(((uint8_t *)ptr_extended_data)[0] & 0xF);
             }
             else
             {
                 switch (sw_trace_info.swt_payload_pkt_bitsize)
                 {
                 case 8:
                     // force uint8 to uint16 so oss 'sees' them as something to be stringised, rather than absolute char values
                     oss << std::setw(2) << (uint16_t)((uint8_t *)ptr_extended_data)[0];
                     break;
                 case 16:
                     oss << std::setw(4) << ((uint16_t *)ptr_extended_data)[0];
                     break;
                 case 32:
                     oss << std::setw(8) << ((uint32_t *)ptr_extended_data)[0];
                     break;
                 case 64:
                     oss << std::setw(16) << ((uint64_t *)ptr_extended_data)[0];
                     break;
                 default:
                     oss << "{Data Error : unsupported bit width.}";
                     break;
                 }
             }
             oss << "; ";
         }
         if (sw_trace_info.swt_marker_packet)
             oss << "+Mrk ";
         if (sw_trace_info.swt_trigger_event)
             oss << "Trig ";
         if (sw_trace_info.swt_has_timestamp)
             oss << " [ TS=0x" << std::setfill('0') << std::setw(12) << std::hex << timestamp << "]; ";
         if (sw_trace_info.swt_frequency)
             oss << "Freq";
         if (sw_trace_info.swt_master_err)
             oss << "{Master Error.}";
     }
     else
     {
         oss << "{Global Error.}";
     }
 }
 
 /*
 void OcsdTraceElement::toString(const ocsd_generic_trace_elem *p_elem, std::string &str)
 {
     OcsdTraceElement elem;
     elem = p_elem;
     elem.toString(str);
 }
 */
 /* End of File trc_gen_elem.cpp */
Index: head/contrib/opencsd
===================================================================
--- head/contrib/opencsd	(revision 362262)
+++ head/contrib/opencsd	(revision 362263)

Property changes on: head/contrib/opencsd
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,56 ##
   Merged /projects/elftoolchain-update-r3130/contrib/opencsd:r276164,276167,276170-276172
   Merged /projects/clang900-import/contrib/opencsd:r351317-353352
   Merged /projects/clang800-import/contrib/opencsd:r343202-344778
   Merged /projects/clang700-import/contrib/opencsd:r336870-341824
   Merged /projects/clang400-import/contrib/opencsd:r311132-314524
   Merged /projects/clang500-import/contrib/opencsd:r316992-321352
   Merged /projects/clang600-import/contrib/opencsd:r326936-327339,327341-327933
   Merged /projects/lldb-r201577/contrib/opencsd:r262185-262527
   Merged /user/ngie/bsnmp_cleanup/contrib/opencsd:r295193
   Merged /projects/bsnmp-improved-ipv6-support/contrib/opencsd:r301868
   Merged /user/delphij/zfs-arc-rebase/contrib/opencsd:r281754
   Merged /user/ngie/bug203673/contrib/opencsd:r289470-289489
   Merged /projects/clang360-import/contrib/opencsd:r277327-280030
   Merged /projects/zfsd/head/contrib/opencsd:r266519,269993
   Merged /projects/multi-fibv6/head/contrib/opencsd:r230929-231848
   Merged /projects/clang380-import/contrib/opencsd:r292913-296412
   Merged /projects/pms/contrib/opencsd:r285199-285661
   Merged /projects/fuse2/contrib/opencsd:r344558-350621,350944,350955
   Merged /projects/random_number_generator/contrib/opencsd:r254613-256243
   Merged /vendor/opencsd/dist:r353393-362220
   Merged /projects/cxl_iscsi/contrib/opencsd:r291227-291228,292618
   Merged /projects/import-googletest-1.8.1/contrib/opencsd:r344081-345031,345036,345038,345042,345045,345047
   Merged /projects/contrib-netbsd-update-12/contrib/opencsd:r303899-303984
   Merged /user/ngie/more-tests/contrib/opencsd:r281427-281428,281430,281432,281450,281460,281464-281465,281485,281489-281491,281515,281519,281589,281593-281597,281619,284388,288316,288321-288327,288422,288476,288478-288481,288483,288578,288650-288651,288655-288656,288659-288661,288663,288673-288676,288680,288828,288930-288932
   Merged /projects/bsd_rdma_4_9/contrib/opencsd:r319973-326168
   Merged /projects/release-arm-redux/contrib/opencsd:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
   Merged /projects/pf/head/contrib/opencsd:r263908
   Merged /projects/clang-trunk/contrib/opencsd:r283596-287505
   Merged /projects/building-blocks/contrib/opencsd:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Merged /user/ngie/socket-tests/contrib/opencsd:r293882-293885,294103,294117,294119-294120,294245-294247,294488,294555,294643-294644
   Merged /vendor/resolver/dist/contrib/opencsd:r1540-186085
   Merged /projects/clang350-import/contrib/opencsd:r274961-275126,275128-275133,275135-276476
   Merged /projects/clang370-import/contrib/opencsd:r287506-288928
   Merged /projects/openssl111/contrib/opencsd:r339079
   Merged /projects/elftoolchain/contrib/opencsd:r260687-261245
   Merged /projects/quota64/contrib/opencsd:r184125-207707
   Merged /user/ngie/release-pkg-fix-tests/contrib/opencsd:r298865-299093
   Merged /projects/clang390-import/contrib/opencsd:r303250-308866,308868-309123
   Merged /projects/clang391-import/contrib/opencsd:r309166-310192
   Merged /projects/ipfw/contrib/opencsd:r267383-272837
   Merged /user/ngie/make_check/contrib/opencsd:r291879-295379
   Merged /projects/mpsutil/contrib/opencsd:r286179-290100
   Merged /user/ngie/more-tests2/contrib/opencsd:r288935-289179,289223-289224,289226-289227,289230,289236,289325,289437,289440,289478,289484-289486,290904,290921
   Merged /projects/netbsd-tests-upstream-01-2017/contrib/opencsd:r312125-313435
   Merged /projects/clang-sparc64/contrib/opencsd:r262258-262612
   Merged /vendor/device-tree/dist/contrib/opencsd:r303380
   Merged /projects/clang1000-import/contrib/opencsd:r356848-358850
   Merged /projects/vnet/contrib/opencsd:r295220
   Merged /projects/bectl/contrib/opencsd:r336666-337662
   Merged /projects/release-embedded/contrib/opencsd:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Merged /projects/release-pkg/contrib/opencsd:r274131-298104
   Merged /projects/largeSMP/contrib/opencsd:r221273-222812,222815-223757
   Merged /projects/collation/contrib/opencsd:r286424-290491
   Merged /projects/netbsd-tests-update-12/contrib/opencsd:r303985-305318
   Merged /projects/head_mfi/contrib/opencsd:r233621
   Merged /projects/release-arm64/contrib/opencsd:r281786,281788,281792
Index: head/lib/libopencsd/Makefile
===================================================================
--- head/lib/libopencsd/Makefile	(revision 362262)
+++ head/lib/libopencsd/Makefile	(revision 362263)
@@ -1,177 +1,176 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
 OPENCSDSRC=	${SRCTOP}/contrib/opencsd
 
 .PATH:	${OPENCSDSRC}/decoder/source/etmv4/		\
 	${OPENCSDSRC}/decoder/source/etmv3/		\
 	${OPENCSDSRC}/decoder/source/pkt_printers/	\
 	${OPENCSDSRC}/decoder/source/mem_acc/		\
 	${OPENCSDSRC}/decoder/source/i_dec/		\
 	${OPENCSDSRC}/decoder/source/c_api/		\
 	${OPENCSDSRC}/decoder/source/ptm/		\
 	${OPENCSDSRC}/decoder/source/stm/		\
 	${OPENCSDSRC}/decoder/source/			\
 	${OPENCSDSRC}/decoder/include/opencsd/etmv4/	\
 	${OPENCSDSRC}/decoder/include/opencsd/etmv3/	\
 	${OPENCSDSRC}/decoder/include/opencsd/stm/	\
 	${OPENCSDSRC}/decoder/include/opencsd/ptm/	\
 	${OPENCSDSRC}/decoder/include/opencsd/c_api/	\
 	${OPENCSDSRC}/decoder/include/opencsd/		\
 	${OPENCSDSRC}/decoder/include
 
 LIB=	opencsd
 SHLIB_MAJOR=0
 
 # ETMv3
 SRCS=	\
 	trc_cmp_cfg_etmv3.cpp		\
 	trc_pkt_decode_etmv3.cpp	\
 	trc_pkt_elem_etmv3.cpp		\
 	trc_pkt_proc_etmv3.cpp		\
 	trc_pkt_proc_etmv3_impl.cpp
 
 # ETMv4
 SRCS+=	\
 	trc_cmp_cfg_etmv4.cpp			\
 	trc_etmv4_stack_elem.cpp		\
 	trc_pkt_decode_etmv4i.cpp		\
-	trc_pkt_elem_etmv4d.cpp			\
 	trc_pkt_elem_etmv4i.cpp			\
-	trc_pkt_proc_etmv4.cpp			\
-	trc_pkt_proc_etmv4i_impl.cpp
+	trc_pkt_proc_etmv4i.cpp
 
 # PKT_PRINTERS
 SRCS+=	\
 	raw_frame_printer.cpp			\
 	trc_print_fact.cpp
 
 # PTM
 SRCS+=	\
 	trc_cmp_cfg_ptm.cpp			\
 	trc_pkt_decode_ptm.cpp			\
 	trc_pkt_elem_ptm.cpp			\
 	trc_pkt_proc_ptm.cpp
 
 # STM
 SRCS+=	\
 	trc_pkt_decode_stm.cpp			\
 	trc_pkt_elem_stm.cpp			\
 	trc_pkt_proc_stm.cpp
 
 # C_API
 SRCS+=	\
 	ocsd_c_api_custom_obj.cpp		\
 	ocsd_c_api.cpp
 
 # SRC
 SRCS+=	\
 	ocsd_code_follower.cpp			\
 	ocsd_dcd_tree.cpp			\
 	ocsd_error.cpp				\
 	ocsd_error_logger.cpp			\
 	ocsd_gen_elem_list.cpp			\
+	ocsd_gen_elem_stack.cpp			\
 	ocsd_lib_dcd_register.cpp		\
 	ocsd_msg_logger.cpp			\
 	ocsd_version.cpp			\
 	trc_component.cpp			\
 	trc_core_arch_map.cpp			\
 	trc_frame_deformatter.cpp		\
 	trc_gen_elem.cpp			\
 	trc_printable_elem.cpp			\
 	trc_ret_stack.cpp
 
 # MEM_ACC
 SRCS+=	\
 	trc_mem_acc_base.cpp			\
 	trc_mem_acc_cache.cpp			\
 	trc_mem_acc_cb.cpp			\
 	trc_mem_acc_mapper.cpp			\
 	trc_mem_acc_bufptr.cpp			\
 	trc_mem_acc_file.cpp
 
 # I_DEC
 SRCS+=	\
 	trc_i_decode.cpp			\
 	trc_idec_arminst.cpp
 
 CFLAGS+=	\
 	-I${OPENCSDSRC}/decoder/include/	\
 	-I${.CURDIR}
 
 INCS=	\
 	ocsd_if_types.h			\
 	ocsd_if_version.h		\
 	trc_gen_elem_types.h		\
 	trc_pkt_types.h
 
 INCSDIR=${INCLUDEDIR}/opencsd
 
 APIINCS=	\
 	ocsd_c_api_cust_fact.h		\
 	ocsd_c_api_cust_impl.h		\
 	ocsd_c_api_custom.h		\
 	ocsd_c_api_types.h		\
 	opencsd_c_api.h
 
 APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/
 
 ETMV4INCS=	\
 	etmv4_decoder.h			\
 	trc_cmp_cfg_etmv4.h		\
 	trc_dcd_mngr_etmv4i.h		\
 	trc_etmv4_stack_elem.h		\
 	trc_pkt_decode_etmv4i.h		\
-	trc_pkt_elem_etmv4d.h		\
 	trc_pkt_elem_etmv4i.h		\
 	trc_pkt_proc_etmv4.h		\
+	trc_pkt_proc_etmv4i.h		\
 	trc_pkt_types_etmv4.h
 
 ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/
 
 ETMV3INCS=	\
 	etmv3_decoder.h			\
 	trc_cmp_cfg_etmv3.h		\
 	trc_dcd_mngr_etmv3.h		\
 	trc_pkt_decode_etmv3.h		\
 	trc_pkt_elem_etmv3.h		\
 	trc_pkt_proc_etmv3.h		\
 	trc_pkt_types_etmv3.h
 
 ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/
 
 PTMINCS=	\
 	ptm_decoder.h			\
 	trc_cmp_cfg_ptm.h		\
 	trc_dcd_mngr_ptm.h		\
 	trc_pkt_decode_ptm.h		\
 	trc_pkt_elem_ptm.h		\
 	trc_pkt_proc_ptm.h		\
 	trc_pkt_types_ptm.h
 
 PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/
 
 STMINCS=	\
 	stm_decoder.h			\
 	trc_cmp_cfg_stm.h		\
 	trc_dcd_mngr_stm.h		\
 	trc_pkt_decode_stm.h		\
 	trc_pkt_elem_stm.h		\
 	trc_pkt_proc_stm.h		\
 	trc_pkt_types_stm.h
 
 STMINCSDIR=${INCLUDEDIR}/opencsd/stm/
 
 INCSGROUPS=INCS APIINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS
 
 LIBADD= cxxrt
 
 WARNS?= 1
 
 HAS_TESTS=
 
 .include <bsd.lib.mk>